OSDN Git Service

(root) / linuxjf / JF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b694c27)
change the encoding of JF documents to UTF-8
authorMasanori Kobayasi <yasikoba@users.sourceforge.jp>
Mon, 17 Jan 2011 02:30:13 +0000 (11:30 +0900)
committerMasanori Kobayasi <yasikoba@users.sourceforge.jp>
Mon, 17 Jan 2011 02:30:13 +0000 (11:30 +0900)
16 files changed:
admin/Greenroom/Greenroom.rules patch | blob | history
admin/Greenroom/JF-CVS-README/JF-CVS-README.sgml patch | blob | history
admin/Greenroom/Makefile patch | blob | history
admin/template/docbook/Makefile.sgml21html.tmpl patch | blob | history
bin/sgml21html patch | blob | history
docs/530deLinux/Makefile patch | blob | history
docs/Anonymous-UUCP/Makefile patch | blob | history
docs/JE-HOWTO/Makefile patch | blob | history
docs/JPprinting-mini-HOWTO/Makefile patch | blob | history
docs/Term-HOWTO/Makefile patch | blob | history
docs/kisochi5.txt/Makefile patch | blob | history
docs/loadlin/Makefile patch | blob | history
docs/tutri1_3/Makefile patch | blob | history
rules/docbook-sgml.rules patch | blob | history
rules/docbook-xml.rules patch | blob | history
rules/linuxdoc.rules patch | blob | history

diff --git a/admin/Greenroom/Greenroom.rules b/admin/Greenroom/Greenroom.rules
index 403db37..f2b4e2d 100644 (file)
--- a/admin/Greenroom/Greenroom.rules
+++ b/admin/Greenroom/Greenroom.rules
@@ -10,8 +10,8 @@ DEST_WWW_HTML=$(WWW_ROOT)/Greenroom
 .sgml.html:
        $(SGML2HTML) $<
        for f in *.html; do \
-       nkf -j $$f > $$f.jis; \
-       mv $$f.jis $$f; done
+       nkf -w $$f > $$f.utf-8; \
+       mv $$f.utf-8 $$f; done
 
 all: $(BASENAME).html
 
diff --git a/admin/Greenroom/JF-CVS-README/JF-CVS-README.sgml b/admin/Greenroom/JF-CVS-README/JF-CVS-README.sgml
index be53ced..e77e0d3 100644 (file)
--- a/admin/Greenroom/JF-CVS-README/JF-CVS-README.sgml
+++ b/admin/Greenroom/JF-CVS-README/JF-CVS-README.sgml
@@ -813,9 +813,9 @@ echo "patch -o Configure.help-2.2.18 < ORIG-Configure.help.diffs/2.2.17-2.2.18.d
     ¥ê¥Ý¥¸¥È¥ê¤Ë HTML ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ç³ÊǼ¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Ï¡¢
     ¤¢¤Þ¤ê¹¹¿·ÉÑÅ٤ι⤯¤Ê¤¤¡¢Èæ³ÓŪ¥¹¥¿¥Æ¥£¥Ã¥¯¤Ê¥Ú¡¼¥¸¤Ç¤¹¡£
     ¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤ÏľÀÜÊÔ½¸¤·¤Æ¹½¤¤¤Þ¤»¤ó¡£
-    ¤¿¤À¤·¡¢Ê¸»ú¥³¡¼¥É¤ò ISO-2022-JP ¤ÇÊݸ¤¹¤ë¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤ 
+    ¤¿¤À¤·¡¢Ê¸»ú¥³¡¼¥É¤ò UTF-8 ¤ÇÊݸ¤¹¤ë¤³¤È¤ò˺¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤ 
     JF ¤Î¥ê¥Ý¥¸¥È¥ê¤ËÆþ¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ç¡¢
-    Ê¸»ú¥³¡¼¥É¤¬ ISO-2022-JP ¤Ê¤Î¤Ï HTML Ê¸½ñ¤À¤±¤Ç¤¹¡£
+    Ê¸»ú¥³¡¼¥É¤¬ UTF-8 ¤Ê¤Î¤Ï HTML Ê¸½ñ¤À¤±¤Ç¤¹¡£
     ¤³¤ì°Ê³°¤Ï¤¹¤Ù¤ÆÆüËܸì EUC ¤Çµ­½Ò¤·¤Þ¤¹¡£
     ¤³¤Î¸å¤Ë½Ò¤Ù¤ë M4 ¥Õ¥¡¥¤¥ë¤â ÆüËܸì EUC ¤Ç¤¹¡£
 <sect1>M4 ¥Õ¥¡¥¤¥ë¤ÎÊÔ½¸
@@ -1594,7 +1594,7 @@ Java does not hold promise as a portable language.
   <enum>
     <item><p>¤â¤Ã¤È¤â¿¤¤¤Î¤Ïʸ»ú¥³¡¼¥É¤Î¥ß¥¹¤Ç¤¹¡£
           JF ¤Î¥ê¥Ý¥¸¥È¥ê¤ËÆþ¤Ã¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î¤¦¤Á¡¢
-         ³ÈÄ¥»Ò¤¬ <tt>.html</tt> ¤Î¤â¤Î¤Ï ISO-2022-JP ¤Çµ­½Ò¤·¤Þ¤¹¡£
+         ³ÈÄ¥»Ò¤¬ <tt>.html</tt> ¤Î¤â¤Î¤Ï UTF-8 ¤Çµ­½Ò¤·¤Þ¤¹¡£
          ¤½¤ì°Ê³°¤ÏÁ´¤ÆÆüËܸì EUC ¤Çµ­½Ò¤·¤Þ¤¹¡£
          ³ÈÄ¥»Ò¤¬ <tt>.sgml</tt> ¤Î¥Õ¥¡¥¤¥ë¤ò
          ¤Þ¤Á¤¬¤Ã¤Æ Shift-JIS ¤ä ISO-2022-JP ¤Çµ­½Ò¤¹¤ë¤È
diff --git a/admin/Greenroom/Makefile b/admin/Greenroom/Makefile
index bf1ccf5..4b4c1e8 100644 (file)
--- a/admin/Greenroom/Makefile
+++ b/admin/Greenroom/Makefile
@@ -5,7 +5,7 @@ DEST_WWW_HTML=$(WWW_ROOT)/Greenroom
 .SUFFIXES: .m4 .html
 
 .m4.html:
-       m4 -P $*.m4 | nkf -j > $*.html
+       m4 -P $*.m4 | nkf -w > $*.html
 
 all: contents cvs-readme gofer-task committers
 
diff --git a/admin/template/docbook/Makefile.sgml21html.tmpl b/admin/template/docbook/Makefile.sgml21html.tmpl
index 805b064..6bf81cf 100644 (file)
--- a/admin/template/docbook/Makefile.sgml21html.tmpl
+++ b/admin/template/docbook/Makefile.sgml21html.tmpl
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/bin/sgml21html b/bin/sgml21html
index eee13de..b4929b9 100755 (executable)
--- a/bin/sgml21html
+++ b/bin/sgml21html
@@ -27,7 +27,7 @@ my $S2H = "sgml2html"; # used to convert SGML -> HTML initially
 my @optS2H = (); # for jLinuxdoc-SGML (linuxdoc-sgml-ja) 1.5.1
 # my @optS2H = ("-l", "ja", "-c", "nippon"); # for sgml-tools-ja 1.0.9
 
-my $NKF = "nkf -j"; # used to convert JP code to jis
+my $NKF = "nkf -w"; # used to convert JP code to UTF-8
 # my $NKF = "kcc -j"; # if you don't have nkf but have kcc, use this line.
 
 my $DATE = "date"; # used to get date output
@@ -41,7 +41,7 @@ my $TMPF ="./sgml21html$$.tmp.html"; # temporary file name
 my $DEFAULT_HEAD = <<END_OF_HEADER;
 <HTML>
 <HEAD>
- <META http-equiv="Content-Type" content="text/html; charset=ISO-2022-JP">
+ <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <TITLE>
 SGML_TITLE
 </TITLE>
diff --git a/docs/530deLinux/Makefile b/docs/530deLinux/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/530deLinux/Makefile
+++ b/docs/530deLinux/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/docs/Anonymous-UUCP/Makefile b/docs/Anonymous-UUCP/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/Anonymous-UUCP/Makefile
+++ b/docs/Anonymous-UUCP/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/docs/JE-HOWTO/Makefile b/docs/JE-HOWTO/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/JE-HOWTO/Makefile
+++ b/docs/JE-HOWTO/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/docs/JPprinting-mini-HOWTO/Makefile b/docs/JPprinting-mini-HOWTO/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/JPprinting-mini-HOWTO/Makefile
+++ b/docs/JPprinting-mini-HOWTO/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/docs/Term-HOWTO/Makefile b/docs/Term-HOWTO/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/Term-HOWTO/Makefile
+++ b/docs/Term-HOWTO/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/docs/kisochi5.txt/Makefile b/docs/kisochi5.txt/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/kisochi5.txt/Makefile
+++ b/docs/kisochi5.txt/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/docs/loadlin/Makefile b/docs/loadlin/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/loadlin/Makefile
+++ b/docs/loadlin/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/docs/tutri1_3/Makefile b/docs/tutri1_3/Makefile
index 805b064..6bf81cf 100644 (file)
--- a/docs/tutri1_3/Makefile
+++ b/docs/tutri1_3/Makefile
@@ -27,6 +27,6 @@ endif
        rm -f *.html
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml >index.html
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
diff --git a/rules/docbook-sgml.rules b/rules/docbook-sgml.rules
index 920724e..7291b8b 100644 (file)
--- a/rules/docbook-sgml.rules
+++ b/rules/docbook-sgml.rules
@@ -1,5 +1,3 @@
-# $Id: docbook-sgml.rules,v 1.1 2004/09/23 11:15:28 mdk Exp $
-
 #
 #  Makefile rules for docbook SGML documents
 #
@@ -87,8 +85,8 @@ endif
        find . -name '*.html' | xargs rm -f
        $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(BASENAME).sgml
        find . -name '*.html' | while read f; do \
-               $(NKF) -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               $(NKF) -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
 
 $(BASENAME).txt: $(BASENAME).sgml info
diff --git a/rules/docbook-xml.rules b/rules/docbook-xml.rules
index cfc6014..6b057e3 100644 (file)
--- a/rules/docbook-xml.rules
+++ b/rules/docbook-xml.rules
@@ -1,5 +1,3 @@
-# $Id: docbook-xml.rules,v 1.2 2004/12/19 11:32:48 mdk Exp $
-
 #
 #  Makefile rules for docbook XML documents
 #
@@ -95,8 +93,8 @@ endif
        $(ENCODING) $(JADE) $(JADE_OPTION) $(JADE_ADD_OPTION) $(XMLDCL) \
         $(BASENAME).xml
        find . -name '*.html' | while read f; do \
-               $(NKF) -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               $(NKF) -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
 
 $(BASENAME).txt: $(BASENAME).xml info
diff --git a/rules/linuxdoc.rules b/rules/linuxdoc.rules
index f653e70..4a475b6 100644 (file)
--- a/rules/linuxdoc.rules
+++ b/rules/linuxdoc.rules
@@ -1,5 +1,3 @@
-# $Id: linuxdoc.rules,v 1.2 2002/11/12 10:58:30 mdk Exp $
-
 #
 #  Makefile rules for linuxdoc SGML documents
 #
@@ -75,8 +73,8 @@ ifneq ($(NODELETE_OLDDOCS), yes)
 endif
        $(SGML2HTML) $<
        for f in *.html; do \
-               nkf -j $$f > $$f.jis; \
-               mv $$f.jis $$f; done
+               nkf -w $$f > $$f.utf-8; \
+               mv $$f.utf-8 $$f; done
        touch $(LAST_MODIFIED)
 
 .sgml.txt:
Linux JF (Japanese FAQ) Project
About OSDN
Find Software
Develop Software
Help