OSDN Git Service

(root) / linuxjf / JF.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4fd6e55)
change html page encoding to UTF-8
authorMasanori Kobayasi <yasikoba@users.sourceforge.jp>
Sat, 15 Jan 2011 14:59:23 +0000 (23:59 +0900)
committerMasanori Kobayasi <yasikoba@users.sourceforge.jp>
Sat, 15 Jan 2011 14:59:23 +0000 (23:59 +0900)
Makefile patch | blob | history
bin/mkcontriblist.pl patch | blob | history
bin/mknewidx.pl patch | blob | history
www/Makefile patch | blob | history
www/announcement/Makefile patch | blob | history
www/index.m4 patch | blob | history
www/jf_www.m4 patch | blob | history
www/workshop/Makefile patch | blob | history

diff --git a/Makefile b/Makefile
index 705388b..4315e35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -70,12 +70,12 @@ $(WORKDIR)/txt/JFdocs/INDEX-JF.txt: $(JFINDEXDB)
 
 $(WORKDIR)/html/JFdocs/INDEX-JF.html: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
-       @(cd $(@D); $(MKNEWINDEX) -t HTML | nkf -j > $@ )
+       @(cd $(@D); $(MKNEWINDEX) -t HTML | nkf -w > $@ )
        @echo "done."
 
 $(WORKDIR)/sgml/JFdocs/INDEX-JF.txt: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
-       @(cd $(@D); $(MKNEWINDEX) -t TEXT | nkf -j > $@ )
+       @(cd $(@D); $(MKNEWINDEX) -t TEXT | nkf -w > $@ )
        @echo "done."
 
 $(WORKDIR)/contrib/INDEX.txt: $(JFINDEXDB)
@@ -85,7 +85,7 @@ $(WORKDIR)/contrib/INDEX.txt: $(JFINDEXDB)
 
 $(WORKDIR)/contrib/index.html: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
-       @(cd $(@D); $(MKCONTRIBINDEX) -t HTML | nkf -j > $@ )
+       @(cd $(@D); $(MKCONTRIBINDEX) -t HTML | nkf -w > $@ )
        @echo "done."
 
 $(WORKDIR)/txt/JFtxt.tar.gz: $(JFINDEXDB)
@@ -124,25 +124,25 @@ $(WORKDIR)/sgml/JFsgml.tar.bz2: $(JFINDEXDB)
 
 $(WWW_ROOT)/JFdocs/INDEX-JF.html: $(JFINDEXDB)
        @echo -n "JF: Creating $@..."
-       @(cd $(@D); $(MKNEWINDEX) -t HTML -w | nkf -j > $@ )
+       @(cd $(@D); $(MKNEWINDEX) -t HTML -w | nkf -w > $@ )
        @echo "done."
        @(cd $(@D); \
        for C in $(CATEGORIES); do \
          echo -n "JF: Creating $(@D)/INDEX-$${C}.html..."; \
-         $(MKNEWINDEX) -t HTML -c $${C} -w | nkf -j > INDEX-$${C}.html;\
+         $(MKNEWINDEX) -t HTML -c $${C} -w | nkf -w > INDEX-$${C}.html;\
          echo "done."; \
        done)
        @(cd $(@D); \
        for K in $(KINDS); do \
          echo -n "JF: Creating $(@D)/INDEX-$${K}.html..."; \
-         $(MKNEWINDEX) -t HTML -k $${K} -w | nkf -j > INDEX-$${K}.html;\
+         $(MKNEWINDEX) -t HTML -k $${K} -w | nkf -w > INDEX-$${K}.html;\
          echo "done."; \
        done)
 
 $(WWW_ROOT)/contrib/index.html: $(JFINDEXDB)
        @(cd $(@D); \
            echo -n "JF: Creating $@..."; \
-           $(MKCONTRIBINDEX) -t HTML -w | nkf -j > $@;\
+           $(MKCONTRIBINDEX) -t HTML -w | nkf -w > $@;\
            echo "done.")
 
 $(WWW_ROOT)/JFdocs/JFtxt.tar.gz: $(WORKDIR)/txt/JFtxt.tar.gz
diff --git a/bin/mkcontriblist.pl b/bin/mkcontriblist.pl
index cc4ab9b..b0e0a46 100755 (executable)
--- a/bin/mkcontriblist.pl
+++ b/bin/mkcontriblist.pl
@@ -176,7 +176,7 @@ print <<"-HEADER-ONE-";
   "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="ja" dir="ltr">
 <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>JF-INDEX: ³°Éô Project ¤«¤é¤Î´ó£ʸ½ñ</title>
  <meta name="author" lang="en" content="JF Project Members">
  <meta name="copyright" content="(C) 1998-2011 JF Project.">
diff --git a/bin/mknewidx.pl b/bin/mknewidx.pl
index 266f09c..4676609 100755 (executable)
--- a/bin/mknewidx.pl
+++ b/bin/mknewidx.pl
@@ -279,7 +279,7 @@ sub print_html_header {
   "http://www.w3.org/TR/html4/loose.dtd">
 <html lang="ja" dir="ltr">
 <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>JF: Index: $title</title>
  <meta name="author" lang="en" content="JF Project Members">
  <meta name="copyright" content="(C) 1998-2011 JF Project.">
diff --git a/www/Makefile b/www/Makefile
index 7e5af0b..e1c0de9 100644 (file)
--- a/www/Makefile
+++ b/www/Makefile
@@ -20,12 +20,12 @@ CONTENTS = links.html index.html news.html copyright.html \
 
 .m4.html:
        nkf -e $*.m4 > /tmp/$*.m4
-       m4 -P -D _WORKDIR=$(WORKDIR) /tmp/$*.m4 | nkf -j > $*.html
+       m4 -P -D _WORKDIR=$(WORKDIR) /tmp/$*.m4 | nkf -w > $*.html
        rm -f /tmp/$*.m4
 
 .m4.xml:
        $(NKF) -e $*.m4 > /tmp/$*.m4
-       m4 -P -D _WORKDIR=$(WORKDIR) /tmp/$*.m4 | $(NKF) -w8 > $*.xml
+       m4 -P -D _WORKDIR=$(WORKDIR) /tmp/$*.m4 | $(NKF) -w > $*.xml
        rm -f /tmp/$*.m4
 
 all: contents
diff --git a/www/announcement/Makefile b/www/announcement/Makefile
index 8e6fd7a..70e647e 100644 (file)
--- a/www/announcement/Makefile
+++ b/www/announcement/Makefile
@@ -8,7 +8,7 @@ OBJS = index.html renewal-1.html renewal-2.html conf22.html Configure.help.html
 .SUFFIXES: .m4 .html
 
 .m4.html:
-       m4 -P $*.m4 | nkf -j > $*.html
+       m4 -P $*.m4 | nkf -w > $*.html
 
 default: $(OBJS)
 
diff --git a/www/index.m4 b/www/index.m4
index 1f3c08d..4428a67 100644 (file)
--- a/www/index.m4
+++ b/www/index.m4
@@ -219,8 +219,8 @@ border="0" alt="Google" align="absmiddle"></a>
 </td>
 <td>
 <input type=text name=q size=31 maxlength=255 value="">
-<input type=hidden name=ie value=ISO-2022-JP>
-<input type=hidden name=oe value=ISO-2022-JP>
+<input type=hidden name=ie value=UTF-8>
+<input type=hidden name=oe value=UTF-8>
 <input type=hidden name=hl value="ja">
 <input type=submit name=btnG value="Google ¸¡º÷">
 <font size=-1>
diff --git a/www/jf_www.m4 b/www/jf_www.m4
index f64f9e8..cf7fd2e 100644 (file)
--- a/www/jf_www.m4
+++ b/www/jf_www.m4
@@ -132,7 +132,7 @@ m4_define(`_HEADER', `
   "http://www.w3.org/TR/html4/loose.dtd">
 <HTML LANG="ja" DIR="LTR">
 <HEAD>
- <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-2022-JP">
+ <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
  m4_ifdef(`_TOP_PAGE', 
  <title>$1</title>,
  <title>JF: $1</title>)
diff --git a/www/workshop/Makefile b/www/workshop/Makefile
index 1a7bd5b..040595a 100644 (file)
--- a/www/workshop/Makefile
+++ b/www/workshop/Makefile
@@ -22,7 +22,7 @@ PROGRESS = JF-in-Progress.html KDoc-2.2-in-Progress.html KDoc-2.4-in-Progress.ht
 .SUFFIXES: .m4 .html
 
 .m4.html:
-       m4 -P $*.m4 | nkf -j > $*.html
+       m4 -P $*.m4 | nkf -w > $*.html
 
 default: $(GUIDANCE) $(PROGRESS) archives/jf-custom.dsl archives/jf-info-check.el
 
Linux JF (Japanese FAQ) Project
About OSDN
Find Software
Develop Software
Help