CVS update: PyukiWiki-Devel/build (Pyukiwiki-cvs 0008360) - PyukiWiki

Index: PyukiWiki-Devel/build/build.mk
diff -u PyukiWiki-Devel/build/build.mk:1.503 PyukiWiki-Devel/build/build.mk:1.504

--- PyukiWiki-Devel/build/build.mk:1.503	Wed Mar 14 02:28:11 2012
+++ PyukiWiki-Devel/build/build.mk	Thu Mar 15 05:55:17 2012
@@ -1,5 +1,5 @@
 # release file makefile for pyukiwiki
-# $Id: build.mk,v 1.503 2012/03/13 17:28:11 papu Exp $
+# $Id: build.mk,v 1.504 2012/03/14 20:55:17 papu Exp $
 
 all:
 	@echo "PyukiWIki ${VERSION} Release Builder"
@@ -183,6 +183,7 @@
 
 BUILDFILES=sample/pyukiwiki.ini.cgi \
 			skin/instag.js \
+			skin/instag.css \
 			skin/common.en.js skin/common.ja.js \
 			skin/passwd.js \
 			skin/twitter.js \
@@ -194,6 +195,8 @@
 			sample/mikachan.skin.cgi \
 			skin/blosxom.css \
 			skin/video.js \
+			skin/flowplayer-3.2.6.min.js \
+			skin/jquery.js \
 			skin/videoresize.js \
 			skin/video-js.css \
 			skin/ad.css \
@@ -259,19 +262,26 @@
 	${PERL} ${BUILDDIR}/makesampleini.pl > sample/pyukiwiki.ini.cgi
 
 skin/instag.js: skin/instag.js.src ${BUILDMAKER}
-	${PERL} ${BUILDDIR}/compressfile.pl js skin/instag.js skin/instag.js.src
+	cat skin/instag.js.src skin/jqModal.js.src skin/farbtastic.js.src > tmpjsinstag
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/instag.js tmpjsinstag
+	rm tmpjsinstag
+
+skin/instag.css: skin/jqModal.css.src skin/farbtastic.css.src ${BUILDMAKER}
+	cat skin/jqModal.css.src skin/farbtastic.css.src > tmpcss
+	${PERL} ${BUILDDIR}/compressfile.pl css skin/instag.css tmpcss
+	rm tmpcss
 
 skin/passwd.js: skin/passwd.js.src ${BUILDMAKER}
-	${PERL} ${BUILDDIR}/compressfile.pl js skin/passwd.js skin/passwd.js.src
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/passwd.js skin/passwd.js.src
 
 skin/twitter.js: skin/twitter.js.src ${BUILDMAKER}
 	${PERL} ${BUILDDIR}/compressfile.pl js skin/twitter.js skin/twitter.js.src
 
 skin/common.en.js: skin/common.en.js.src ${BUILDMAKER}
-	${PERL} ${BUILDDIR}/compressfile.pl js skin/common.en.js skin/common.en.js.src
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/common.en.js skin/common.en.js.src
 
 skin/common.ja.js: skin/common.ja.js.src ${BUILDMAKER}
-	${PERL} ${BUILDDIR}/compressfile.pl js skin/common.ja.js skin/common.ja.js.src
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/common.ja.js skin/common.ja.js.src
 
 skin/common.en.js.src: skin/common.lang.js.src ${BUILDMAKER}
 	${PERL} ${BUILDDIR}/lang.pl en skin/common.lang.js.src
@@ -292,12 +302,20 @@
 	${PERL} ${BUILDDIR}/compressfile.pl css skin/video-js.css skin/video-js.css.org
 
 skin/videoresize.js: skin/videoresize.js.src ${BUILDMAKER}
-	${PERL} ${BUILDDIR}/compressfile.pl js skin/videoresize.js skin/videoresize.js.src
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/videoresize.js skin/videoresize.js.src
 
 skin/video.js: skin/video.js.src skin/videoresize.js.src ${BUILDMAKER}
-	cat skin/videoresize.js.src skin/video.js.src > tmpjs
-	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/video.js tmpjs
-	rm tmpjs
+	cat skin/videoresize.js.src skin/video.js.src > tmpjsvideojs
+	${PERL} ${BUILDDIR}/compressfile.pl js skin/video.js tmpjsvideojs
+	rm tmpjsvideojs
+
+skin/flowplayer-3.2.6.min.js: skin/flowplayer-3.2.6.min.js.src skin/videoresize.js.src ${BUILDMAKER}
+	cat skin/videoresize.js.src skin/flowplayer-3.2.6.min.js.src > tmpjsflowplayer
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/flowplayer-3.2.6.min.js tmpjsflowplayer
+	rm tmpjsflowplayer
+
+skin/jquery.js: skin/jquery.js.src ${BUILDMAKER}
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/jquery.js skin/jquery.js.src
 
 skin/ad.css: skin/ad.css.org ${BUILDMAKER}
 	${PERL} ${BUILDDIR}/compressfile.pl css skin/ad.css skin/ad.css.org
@@ -312,9 +330,9 @@
 	cp skin/pyukiwiki.skin.cgi sample/mikachan.skin.cgi
 
 skin/syntaxhighlighter/shCore.js: skin/syntaxhighlighter/shCore.js.src skin/syntaxhighlighter/XRegExp.js.src ${BUILDMAKER}
-	cat skin/syntaxhighlighter/shCore.js.src skin/syntaxhighlighter/XRegExp.js.src > tmpjs
-	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/syntaxhighlighter/shCore.js tmpjs
-	rm tmpjs
+	cat skin/syntaxhighlighter/shCore.js.src skin/syntaxhighlighter/XRegExp.js.src > tmpjsshcore
+	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/syntaxhighlighter/shCore.js tmpjsshcore
+	rm tmpjsshcore
 
 skin/syntaxhighlighter/shAutoloader.js: skin/syntaxhighlighter/shAutoloader.js.src ${BUILDMAKER}
 	${PERL} ${BUILDDIR}/compressfile.pl js2 skin/syntaxhighlighter/shAutoloader.js skin/syntaxhighlighter/shAutoloader.js.src
Index: PyukiWiki-Devel/build/compressfile.pl
diff -u PyukiWiki-Devel/build/compressfile.pl:1.369 PyukiWiki-Devel/build/compressfile.pl:1.370
--- PyukiWiki-Devel/build/compressfile.pl:1.369	Wed Mar 14 02:28:11 2012
+++ PyukiWiki-Devel/build/compressfile.pl	Thu Mar 15 05:55:20 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # yuicompressor script
-# $Id: compressfile.pl,v 1.369 2012/03/13 17:28:11 papu Exp $
+# $Id: compressfile.pl,v 1.370 2012/03/14 20:55:20 papu Exp $
 
 $mode=$ARGV[0];
 $output=$ARGV[1];
@@ -15,7 +15,66 @@
 $convert{euc}="perl ./build/Jcode-convert.pl euc";
 
 if($ARGV[3] eq '') {
-	$top="/* \@\@PYUKIWIKIVERSION\@\@ */\n/* \$Id\$ */\n\n";
+	$top="/* \@\@PYUKIWIKIVERSION\@\@\n";
+	$top.=" * \$Id\$\n";
+
+	$top.=<<EOM
+ *
+ * SyntaxHighlighter3.0.83 (July 02 2010)
+ * Copyright (C) 2004-2010 Alex Gorbatchev.
+ * Dual licensed under the MIT and GPL licenses.
+EOM
+		if($output=~/syntaxhighlighter/);
+
+	$top.=<<EOM
+ *
+ * Video.js - HTML5 Video Player
+ * Version 3.0.7
+ * This file is part of Video.js. Copyright 2011 Zencoder, Inc.
+ * LGPL v3 LICENSE INFO
+EOM
+		if($output=~/video.js/);
+
+	$top.=<<EOM
+ *
+ * Copyright 2009 Brandon Leonardo & Ryan McGrath
+ * Released under an MIT style license
+EOM
+		if($output=~/twitter.js/);
+
+	$top.=<<EOM
+ *
+ * jQuery JavaScript Library v1.7.1
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Includes Sizzle.js
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+EOM
+		if($output=~/jquery.js/);
+
+	$top.=<<EOM
+ *
+ * jqModal - Minimalist Modaling with jQuery
+ * Copyright (c) 2007,2008 Brice Burgess
+ * Dual licensed under the MIT and GPL licenses:
+ *
+ * Farbtastic Color Picker 1.2
+ * (c)2008 Steven Wittens
+ * License GPL2
+EOM
+		if($output=~/instag.js/ || $output=~/instag.css/);
+
+	$top.=<<EOM
+ *
+ * flowplayer.js 3.2.6. The Flowplayer API
+ * Copyright 2009-2011 Flowplayer Oy
+ * License GPL3
+EOM
+		if($output=~/flowplayer/);
+
+	$top.=" */\n\n";
+
 #	$top="/* \@charset \"Shift_JIS\"; */\n/* If use japanese font, use @charset */\n"
 #		. $top
 #		if($mode eq "css");
Index: PyukiWiki-Devel/build/facemark.regex
diff -u PyukiWiki-Devel/build/facemark.regex:1.26 PyukiWiki-Devel/build/facemark.regex:1.27
--- PyukiWiki-Devel/build/facemark.regex:1.26	Wed Mar 14 02:28:11 2012
+++ PyukiWiki-Devel/build/facemark.regex	Thu Mar 15 05:55:20 2012
@@ -1,44 +1,63 @@
 ##################################################################
-# $Id: facemark.regex,v 1.26 2012/03/13 17:28:11 papu Exp $
+# $Id: facemark.regex,v 1.27 2012/03/14 20:55:20 papu Exp $
 ##################################################################
 # Šç•¶Žš
 ##################################################################
 
 %::_facemark = (
-	' :)'		=> 'smile',
-	' (^^)'		=> 'smile',
-	' :D'		=> 'bigsmile',
-	' (^-^)'	=> 'bigsmile',
-	' :p'		=> 'huh',
-	' :d'		=> 'huh',
-	' XD'		=> 'oh',
-	' X('		=> 'oh',
-	' ;)'		=> 'oh',
-	' (;'		=> 'wink',
-	' (^_-)'	=> 'wink',
-	' ;('		=> 'sad',
-	' :('		=> 'sad',
-	' (--;)'	=> 'sad',
-	' (^^;)'	=> 'worried',
-	'&heart;'	=> 'heart',
+	' :)'		=> 'smile.png',
+	' (^^)'		=> 'smile.png',
+	' :D'		=> 'bigsmile.png',
+	' (^-^)'	=> 'bigsmile.png',
+	' :p'		=> 'huh.png',
+	' :d'		=> 'huh.png',
+	' XD'		=> 'oh.png',
+	' X('		=> 'oh.png',
+	' ;)'		=> 'oh.png',
+	' (;'		=> 'wink.png',
+	' (^_-)'	=> 'wink.png',
+	' ;('		=> 'sad.png',
+	' :('		=> 'sad.png',
+	' (--;)'	=> 'sad.png',
+	' (^^;)'	=> 'worried.png',
+	'&heart;'	=> 'heart.png',
 );
 %::_facemark_puki = (
-	'&bigsmile;'=> 'bigsmile',
-	'&huh;'		=> 'huh',
-	'&oh;'		=> 'oh',
-	'&sad;'		=> 'sad',
-	'&smile;'	=> 'smile',
-	'&wink;'	=> 'wink',
-	'&worried;' => 'worried',
+	'&bigsmile;'=> 'bigsmile.png',
+	'&huh;'		=> 'huh.png',
+	'&oh;'		=> 'oh.png',
+	'&sad;'		=> 'sad.png',
+	'&smile;'	=> 'smile.png',
+	'&wink;'	=> 'wink.png',
+	'&worried;' => 'worried.png',
+
+# ˆÈ‰º PukiWiki Plus‚æ‚è
+	'&big;'			=> 'extend_bigsmile.png',
+	'&big_plus;'	=> 'extend_bigsmile.png',
+	'&heart2;'		=> 'extend_heart.png',
+	'&heartplus;'	=> 'extend_heart.png',
+	'&oh2;'			=> 'extend_oh.png',
+	'&ohplus;'		=> 'extend_oh.png',
+	'&sad2;'		=> 'extend_sad.png',
+	'&sadplus;'		=> 'extend_sad.png',
+	'&smile2;'		=> 'extend_smile.png',
+	'&smileplus;'	=> 'extend_smile.png',
+	'&wink2;'		=> 'extend_wink.png',
+	'&winkplus;'	=> 'extend_wink.png',
+	'&worried2;'	=> 'extend_worried.png',
+	'&worriedplus;'	=> 'extend_worried.png',
+	'&ummr;'		=> 'umm.png',
+	'&star;'		=> 'star.gif',
+	'&tear;'		=> 'tear.png',
 );
 
 $::_facemark=join('|',sort keys %::_facemark);
-$::_facemark=~s/([&;^;:() ])/\\$1/g;
+$::_facemark=~s/([\.&;^;:() \_])/\\$1/g;
 $::_facemark="($::_facemark)";
-$::_facemark_puki=join('|',sort keys %::_facemark_puki);
-$::_facemark_puki=~s/([&;^;:() ])/\\$1/g;
+$::_facemark_puki='|' . join('|',sort keys %::_facemark_puki);
+$::_facemark_puki=~s/([\.&;^;:() \_])/\\$1/g;
 $::_facemark_puki="($::_facemark_puki)";
 
 #print '$::_facemark=q{' . $::_facemark . "};\n";
-print $::_facemark;
 #print '$::_facemark.=q{' . $::_facemark_puki . "} if(\$::usePukiWikiStyle eq 1);\n";
+print $::_facemark;
Index: PyukiWiki-Devel/build/facemark_puki.regex
diff -u PyukiWiki-Devel/build/facemark_puki.regex:1.26 PyukiWiki-Devel/build/facemark_puki.regex:1.27
--- PyukiWiki-Devel/build/facemark_puki.regex:1.26	Wed Mar 14 02:28:11 2012
+++ PyukiWiki-Devel/build/facemark_puki.regex	Thu Mar 15 05:55:20 2012
@@ -1,42 +1,61 @@
 ##################################################################
-# $Id: facemark_puki.regex,v 1.26 2012/03/13 17:28:11 papu Exp $
+# $Id: facemark_puki.regex,v 1.27 2012/03/14 20:55:20 papu Exp $
 ##################################################################
 # Šç•¶Žš
 ##################################################################
 
 %::_facemark = (
-	' :)'		=> 'smile',
-	' (^^)'		=> 'smile',
-	' :D'		=> 'bigsmile',
-	' (^-^)'	=> 'bigsmile',
-	' :p'		=> 'huh',
-	' :d'		=> 'huh',
-	' XD'		=> 'oh',
-	' X('		=> 'oh',
-	' ;)'		=> 'oh',
-	' (;'		=> 'wink',
-	' (^_-)'	=> 'wink',
-	' ;('		=> 'sad',
-	' :('		=> 'sad',
-	' (--;)'	=> 'sad',
-	' (^^;)'	=> 'worried',
-	'&heart;'	=> 'heart',
+	' :)'		=> 'smile.png',
+	' (^^)'		=> 'smile.png',
+	' :D'		=> 'bigsmile.png',
+	' (^-^)'	=> 'bigsmile.png',
+	' :p'		=> 'huh.png',
+	' :d'		=> 'huh.png',
+	' XD'		=> 'oh.png',
+	' X('		=> 'oh.png',
+	' ;)'		=> 'oh.png',
+	' (;'		=> 'wink.png',
+	' (^_-)'	=> 'wink.png',
+	' ;('		=> 'sad.png',
+	' :('		=> 'sad.png',
+	' (--;)'	=> 'sad.png',
+	' (^^;)'	=> 'worried.png',
+	'&heart;'	=> 'heart.png',
 );
 %::_facemark_puki = (
-	'&bigsmile;'=> 'bigsmile',
-	'&huh;'		=> 'huh',
-	'&oh;'		=> 'oh',
-	'&sad;'		=> 'sad',
-	'&smile;'	=> 'smile',
-	'&wink;'	=> 'wink',
-	'&worried;' => 'worried',
+	'&bigsmile;'=> 'bigsmile.png',
+	'&huh;'		=> 'huh.png',
+	'&oh;'		=> 'oh.png',
+	'&sad;'		=> 'sad.png',
+	'&smile;'	=> 'smile.png',
+	'&wink;'	=> 'wink.png',
+	'&worried;' => 'worried.png',
+
+# ˆÈ‰º PukiWiki Plus‚æ‚è
+	'&big;'			=> 'extend_bigsmile.png',
+	'&big_plus;'	=> 'extend_bigsmile.png',
+	'&heart2;'		=> 'extend_heart.png',
+	'&heartplus;'	=> 'extend_heart.png',
+	'&oh2;'			=> 'extend_oh.png',
+	'&ohplus;'		=> 'extend_oh.png',
+	'&sad2;'		=> 'extend_sad.png',
+	'&sadplus;'		=> 'extend_sad.png',
+	'&smile2;'		=> 'extend_smile.png',
+	'&smileplus;'	=> 'extend_smile.png',
+	'&wink2;'		=> 'extend_wink.png',
+	'&winkplus;'	=> 'extend_wink.png',
+	'&worried2;'	=> 'extend_worried.png',
+	'&worriedplus;'	=> 'extend_worried.png',
+	'&ummr;'		=> 'umm.png',
+	'&star;'		=> 'star.gif',
+	'&tear;'		=> 'tear.png',
 );
 
 $::_facemark=join('|',sort keys %::_facemark);
-$::_facemark=~s/([&;^;:() ])/\\$1/g;
+$::_facemark=~s/([\.&;^;:() \_])/\\$1/g;
 $::_facemark="($::_facemark)";
 $::_facemark_puki='|' . join('|',sort keys %::_facemark_puki);
-$::_facemark_puki=~s/([&;^;:() ])/\\$1/g;
+$::_facemark_puki=~s/([\.&;^;:() \_])/\\$1/g;
 $::_facemark_puki="($::_facemark_puki)";
 
 #print '$::_facemark=q{' . $::_facemark . "};\n";
Index: PyukiWiki-Devel/build/sgmlescape.regex
diff -u PyukiWiki-Devel/build/sgmlescape.regex:1.26 PyukiWiki-Devel/build/sgmlescape.regex:1.27
--- PyukiWiki-Devel/build/sgmlescape.regex:1.26	Wed Mar 14 02:28:11 2012
+++ PyukiWiki-Devel/build/sgmlescape.regex	Thu Mar 15 05:55:20 2012
@@ -1,7 +1,107 @@
 ##################################################################
-# $Id: sgmlescape.regex,v 1.26 2012/03/13 17:28:11 papu Exp $
+# $Id: sgmlescape.regex,v 1.27 2012/03/14 20:55:20 papu Exp $
 ##################################################################
 # SGML Escape
 ##################################################################
 
-print q(amp|nbsp|iexcl|cent|pound|curren|yen|brvbar|sect|uml|copy|ordf|laquo|not|shy|reg|macr|deg|plusmn|sup2|sup3|acute|micro|para|middot|cedil|sup1|ordm|raquo|frac14|frac12|frac34|iquest|Agrave|Aacute|Acirc|Atilde|Auml|Aring|AElig|Ccedil|Egrave|Eacute|Ecirc|Euml|Igrave|Iacute|Icirc|Iuml|ETH|Ntilde|Ograve|Oacute|Ocirc|Otilde|Oumltimes|Oslash|Ugrave|Uacute|Ucirc|Uuml|Yacute|THORN|szlig|agrave|aacute|acirc|atilde|auml|aring|aelig|ccedil|egrave|eacute|ecirc|euml|igrave|iacute|icirc|iuml|eth|ntilde|ograve|oacute|ocirc|otilde|ouml|divide|oslash|ugrave|uacute|ucirc|uuml|yacute|thorn|yuml|euro|dagger|Dagger|bull|trade|permil|lsquo|rsquo|sbquo|ldquo|rdquo|bdquo|mdash|ndash|smile|bigsmile|huh|oh|wink|sad|worried|heart);
+$table=q(amp|nbsp|iexcl|cent|pound|curren|yen|brvbar|sect|uml|copy|ordf|laquo|not|shy|reg|macr|deg|plusmn|sup2|sup3|acute|micro|para|middot|cedil|sup1|ordm|raquo|frac14|frac12|frac34|iquest|Agrave|Aacute|Acirc|Atilde|Auml|Aring|AElig|Ccedil|Egrave|Eacute|Ecirc|Euml|Igrave|Iacute|Icirc|Iuml|ETH|Ntilde|Ograve|Oacute|Ocirc|Otilde|Oumltimes|Oslash|Ugrave|Uacute|Ucirc|Uuml|Yacute|THORN|szlig|agrave|aacute|acirc|atilde|auml|aring|aelig|ccedil|egrave|eacute|ecirc|euml|igrave|iacute|icirc|iuml|eth|ntilde|ograve|oacute|ocirc|otilde|ouml|divide|oslash|ugrave|uacute|ucirc|uuml|yacute|thorn|yuml|euro|dagger|Dagger|bull|trade|permil|lsquo|rsquo|sbquo|ldquo|rdquo|bdquo|mdash|ndash|smile|bigsmile|huh|oh|wink|sad|worried|heart);
+
+
+%::_facemark = (
+	' :)'		=> 'smile.png',
+	' (^^)'		=> 'smile.png',
+	' :D'		=> 'bigsmile.png',
+	' (^-^)'	=> 'bigsmile.png',
+	' :p'		=> 'huh.png',
+	' :d'		=> 'huh.png',
+	' XD'		=> 'oh.png',
+	' X('		=> 'oh.png',
+	' ;)'		=> 'oh.png',
+	' (;'		=> 'wink.png',
+	' (^_-)'	=> 'wink.png',
+	' ;('		=> 'sad.png',
+	' :('		=> 'sad.png',
+	' (--;)'	=> 'sad.png',
+	' (^^;)'	=> 'worried.png',
+	'&heart;'	=> 'heart.png',
+);
+%::_facemark_puki = (
+	'&bigsmile;'=> 'bigsmile.png',
+	'&huh;'		=> 'huh.png',
+	'&oh;'		=> 'oh.png',
+	'&sad;'		=> 'sad.png',
+	'&smile;'	=> 'smile.png',
+	'&wink;'	=> 'wink.png',
+	'&worried;' => 'worried.png',
+
+# ä»¥ä¸‹ PukiWiki Plusã‚ˆã‚Š
+	'&big;'			=> 'extend_bigsmile.png',
+	'&big_plus;'	=> 'extend_bigsmile.png',
+	'&heart2;'		=> 'extend_heart.png',
+	'&heartplus;'	=> 'extend_heart.png',
+	'&oh2;'			=> 'extend_oh.png',
+	'&ohplus;'		=> 'extend_oh.png',
+	'&sad2;'		=> 'extend_sad.png',
+	'&sadplus;'		=> 'extend_sad.png',
+	'&smile2;'		=> 'extend_smile.png',
+	'&smileplus;'	=> 'extend_smile.png',
+	'&wink2;'		=> 'extend_wink.png',
+	'&winkplus;'	=> 'extend_wink.png',
+	'&worried2;'	=> 'extend_worried.png',
+	'&worriedplus;'	=> 'extend_worried.png',
+	'&ummr;'		=> 'umm.png',
+	'&star;'		=> 'star.gif',
+	'&tear;'		=> 'tear.png',
+);
+
+my @sgml;
+foreach $s(split(/\|/,$table)) {
+	$flg=0;
+	foreach(@sgml) {
+		$flg=1 if($s eq $_);
+	}
+	push(@sgml,$_)
+		if($flg eq 0);
+}
+
+foreach $s(split(/\|/,$table)) {
+	$flg=0;
+	foreach(@sgml) {
+		$flg=1 if(lc $s eq lc $_);
+	}
+	push(@sgml,$s)
+		if($flg eq 0);
+}
+
+foreach $s(keys %::_facemark) {
+	next if($s!~/^\&/);
+	$s=~s/\&//g;
+	$s=~s/\;//g;
+	$flg=0;
+	foreach(@sgml) {
+		$flg=1 if(lc $s eq lc $_);
+	}
+	push(@sgml,$s)
+		if($flg eq 0);
+}
+
+foreach $s(keys %::_facemark_puki) {
+	next if($s!~/^\&/);
+	$s=~s/\&//g;
+	$s=~s/\;//g;
+	$flg=0;
+	foreach(@sgml) {
+		$flg=1 if(lc $s eq lc $_);
+	}
+	push(@sgml,$s)
+		if($flg eq 0);
+}
+
+ ＠ sgml=sort @sgml;
+
+foreach(@sgml) {
+	next if($_ eq '');
+	$regex.="$_|";
+}
+$regex=~s/\|$//g;
+print lc $regex;


PyukiWiki

[Pyukiwiki-cvs 0008360] CVS update: PyukiWiki-Devel/build