CVS update: PyukiWiki-Devel-UTF8/plugin (Pyukiwiki-cvs 0008357) - PyukiWiki

Index: PyukiWiki-Devel-UTF8/plugin/color.pl
diff -u PyukiWiki-Devel-UTF8/plugin/color.pl:1.315 PyukiWiki-Devel-UTF8/plugin/color.pl:1.316

--- PyukiWiki-Devel-UTF8/plugin/color.pl:1.315	Wed Mar 14 02:28:22 2012
+++ PyukiWiki-Devel-UTF8/plugin/color.pl	Thu Mar 15 05:55:22 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # color.pl - This is PyukiWiki, yet another Wiki clone.
-# $Id: color.pl,v 1.315 2012/03/13 17:28:22 papu Exp $
+# $Id: color.pl,v 1.316 2012/03/14 20:55:22 papu Exp $
 #
 # "PyukiWiki" version 0.2.0-p3-dev1 $$
 # Author: Nekyo http://nekyo.qp.land.to/
@@ -16,13 +16,17 @@
 # modify it under the same terms as Perl itself.
 # Return:LF Code=UTF-8 1TAB=4Spaces
 ######################################################################
+# Usage: &color(color,bgcolor) { body };
+# Usage: &color(color) { body };
+# Usage: &color(,bgcolor) { body };
+# v0.2.0-p3 : èƒŒæ™¯è‰²ã®ã¿ã®è¨å®šã‚’ã§ãã‚‹ã‚ˆã†ã«ã—ãŸã€‚
+######################################################################
 
 use strict;
 package color;
 
 sub plugin_inline {
 	my @args = split(/,/, shift);
-	my $bgcolor = '';
 	my ($color, $bgcolor, $body);
 
 	if (@args == 3) {
@@ -39,14 +43,16 @@
 	} else {
 		return '';
 	}
-	if ($color eq '' or $body eq '') {
+	if ($color eq '' && $bgcolor eq '' || $body eq '') {
 		return '';
 	}
-	if ($bgcolor ne '') {
-		$color .= ';background-color:'.$bgcolor;
-	}
-	return "<span style=\"color:$color\">$body</span>";
+	my $style;
+	$style="color:$color" if($color ne '');
+	$style="background-color:$bgcolor" if($bgcolor ne '');
+
+	return "<span style=\"$style\">$body</span>";
 }
+
 1;
 __END__
 
@@ -59,6 +65,7 @@
  &color(color, [background-color]){text};
  &color(red){Sample Text};
  &color(#ff0000,#000000){Sample Text};
+ &color(,white){Sample Text};
 
 =head1 DESCRIPTION
 
Index: PyukiWiki-Devel-UTF8/plugin/color.pl.ja.pod
diff -u PyukiWiki-Devel-UTF8/plugin/color.pl.ja.pod:1.311 PyukiWiki-Devel-UTF8/plugin/color.pl.ja.pod:1.312
--- PyukiWiki-Devel-UTF8/plugin/color.pl.ja.pod:1.311	Wed Mar 14 02:28:22 2012
+++ PyukiWiki-Devel-UTF8/plugin/color.pl.ja.pod	Thu Mar 15 05:55:22 2012
@@ -1,4 +1,4 @@
-#$Id: color.pl.ja.pod,v 1.311 2012/03/13 17:28:22 papu Exp $
+#$Id: color.pl.ja.pod,v 1.312 2012/03/14 20:55:22 papu Exp $
 
 __END__
 =encoding utf-8
@@ -12,6 +12,7 @@
  &color(color, [background-color]){text};
  &color(red){èµ¤ã§è¡¨ç¤º};
  &color(#ff0000,#000000){æ–‡å—èµ¤ã€èƒŒæ™¯é»’ã§è¡¨ç¤º};
+ &color(,white){èƒŒæ™¯ç™½ã§è¡¨ç¤º};
 
 =head1 èª¬æ˜Ž
 
Index: PyukiWiki-Devel-UTF8/plugin/edit.inc.pl
diff -u PyukiWiki-Devel-UTF8/plugin/edit.inc.pl:1.316 PyukiWiki-Devel-UTF8/plugin/edit.inc.pl:1.317
--- PyukiWiki-Devel-UTF8/plugin/edit.inc.pl:1.316	Wed Mar 14 02:28:22 2012
+++ PyukiWiki-Devel-UTF8/plugin/edit.inc.pl	Thu Mar 15 05:55:22 2012
@@ -1,6 +1,6 @@
 #######################################################################
 # edit.inc.pl - This is PyukiWiki, yet another Wiki clone.
-# $Id: edit.inc.pl,v 1.316 2012/03/13 17:28:22 papu Exp $
+# $Id: edit.inc.pl,v 1.317 2012/03/14 20:55:22 papu Exp $
 #
 # "PyukiWiki" version 0.2.0-p3-dev1 $$
 # Author: Nekyo http://nekyo.qp.land.to/
@@ -348,6 +348,14 @@
 <a href="javascript:insTag('[[',']]','wikipage');">[[]]</a>
 <a href="javascript:insTag('','~\\n','');">&lt;br&gt;</a>
 <a href="javascript:insTag('\\n----\\n','','');"><b>--</b></a>
+<a href="javascript:insTag('&size(20){','};','big');"><b>BIG</b></a>
+EOD
+	foreach("black", "red", "green", "blue") {
+		$body.=<<EOD;
+<a href="javascript:insTag('&color($_){','};','$_');"><span style="color:$_;backgroud-color:$_;">&nbsp;</span></a>
+EOD
+	}
+	$body.=<<EOD;
 </div>
 EOD
 	return $body;
Index: PyukiWiki-Devel-UTF8/plugin/size.pl
diff -u PyukiWiki-Devel-UTF8/plugin/size.pl:1.315 PyukiWiki-Devel-UTF8/plugin/size.pl:1.316
--- PyukiWiki-Devel-UTF8/plugin/size.pl:1.315	Wed Mar 14 02:28:22 2012
+++ PyukiWiki-Devel-UTF8/plugin/size.pl	Thu Mar 15 05:55:22 2012
@@ -1,6 +1,6 @@
 ######################################################################
 # size.pl - This is PyukiWiki, yet another Wiki clone.
-# $Id: size.pl,v 1.315 2012/03/13 17:28:22 papu Exp $
+# $Id: size.pl,v 1.316 2012/03/14 20:55:22 papu Exp $
 #
 # "PyukiWiki" version 0.2.0-p3-dev1 $$
 # Author: Nekyo http://nekyo.qp.land.to/
@@ -27,6 +27,7 @@
 	}
 	return "<span style=\"font-size:" . $size . "px;display:inline-block;line-height:130%;text-indent:0px\">$body</span>";
 }
+
 1;
 __END__
 


PyukiWiki

[Pyukiwiki-cvs 0008357] CVS update: PyukiWiki-Devel-UTF8/plugin