Use script to format Chinese pages before processing

CVS version numbers

chinese/Make.lang: 1.45 -> 1.46 
chinese/contact.wml: 1.39 -> 1.40 
chinese/donations.wml: 1.7 -> 1.8 
chinese/index.wml: 1.68 -> 1.69 
chinese/social_contract.wml: 1.27 -> 1.28 
chinese/support.wml: 1.32 -> 1.33 
chinese/Bugs/index.wml: 1.23 -> 1.24 
chinese/Bugs/pseudo-packages.wml: 1.2 -> 1.3 
chinese/CD/index.wml: 1.12 -> 1.13 
chinese/CD/artwork/index.wml: 1.8 -> 1.9 
chinese/CD/faq/index.wml: 1.18 -> 1.19 
chinese/CD/releases/index.wml: 1.7 -> 1.8 
chinese/MailingLists/index.wml: 1.8 -> 1.9 
chinese/News/2000/20000521.wml: 1.4 -> 1.5 
chinese/News/2000/20000523.wml: 1.4 -> 1.5 
chinese/News/2000/20000815.wml: 1.23 -> 1.24 
chinese/News/2007/20070408.wml: 1.3 -> 1.4 
chinese/News/2009/20090214.wml: 1.5 -> 1.6 
chinese/News/2011/20110205a.wml: 1.4 -> 1.5 
chinese/News/2011/20110401.wml: 1.6 -> 1.7 
chinese/News/weekly/index.wml: 1.18 -> 1.19 
chinese/News/weekly/2000/4/index.wml: 1.7 -> 1.8 
chinese/News/weekly/2002/47/index.wml: 1.16 -> 1.17 
chinese/News/weekly/2002/48/index.wml: 1.9 -> 1.10 
chinese/News/weekly/2002/49/index.wml: 1.14 -> 1.15 
chinese/News/weekly/2002/50/index.wml: 1.12 -> 1.13 
chinese/News/weekly/2002/51/index.wml: 1.11 -> 1.12 
chinese/News/weekly/2003/01/index.wml: 1.8 -> 1.9 
chinese/News/weekly/2003/02/index.wml: 1.10 -> 1.11 
chinese/News/weekly/2003/03/index.wml: 1.11 -> 1.12 
chinese/News/weekly/2003/05/index.wml: 1.12 -> 1.13 
chinese/News/weekly/2003/07/index.wml: 1.9 -> 1.10 
chinese/News/weekly/2003/09/index.wml: 1.11 -> 1.12 
chinese/News/weekly/2003/10/index.wml: 1.9 -> 1.10 
chinese/News/weekly/2003/11/index.wml: 1.8 -> 1.9 
chinese/News/weekly/2003/12/index.wml: 1.11 -> 1.12 
chinese/News/weekly/2003/18/index.wml: 1.6 -> 1.7 
chinese/News/weekly/2003/19/index.wml: 1.8 -> 1.9 
chinese/News/weekly/2003/22/index.wml: 1.8 -> 1.9 
chinese/News/weekly/2003/35/index.wml: 1.8 -> 1.9 
chinese/News/weekly/2005/06/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2005/08/index.wml: 1.5 -> 1.6 
chinese/News/weekly/2005/10/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2005/11/index.wml: 1.5 -> 1.6 
chinese/News/weekly/2005/12/index.wml: 1.7 -> 1.8 
chinese/News/weekly/2005/16/index.wml: 1.5 -> 1.6 
chinese/News/weekly/2005/21/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2005/22/index.wml: 1.5 -> 1.6 
chinese/News/weekly/2005/25/index.wml: 1.4 -> 1.5 
chinese/News/weekly/2005/26/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2006/22/index.wml: 1.6 -> 1.7 
chinese/News/weekly/2006/23/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2006/24/index.wml: 1.4 -> 1.5 
chinese/News/weekly/2006/25/index.wml: 1.7 -> 1.8 
chinese/News/weekly/2006/26/index.wml: 1.5 -> 1.6 
chinese/News/weekly/2006/27/index.wml: 1.5 -> 1.6 
chinese/News/weekly/2006/28/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2006/29/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2006/30/index.wml: 1.2 -> 1.3 
chinese/News/weekly/2006/31/index.wml: 1.2 -> 1.3 
chinese/News/weekly/2006/32/index.wml: 1.3 -> 1.4 
chinese/News/weekly/2008/15/index.wml: 1.8 -> 1.9 
chinese/News/weekly/2008/16/index.wml: 1.5 -> 1.6 
chinese/bin/format_zh.pl: INITIAL -> 1.1 
chinese/devel/index.wml: 1.59 -> 1.60 
chinese/devel/website/index.wml: 1.3 -> 1.4 
chinese/devel/website/translating.wml: 1.6 -> 1.7 
chinese/devel/website/translation_coordinators.wml: 1.4 -> 1.5 
chinese/distrib/archive.wml: 1.12 -> 1.13 
chinese/distrib/index.wml: 1.28 -> 1.29 
chinese/distrib/netinst.wml: 1.7 -> 1.8 
chinese/distrib/packages.wml: 1.20 -> 1.21 
chinese/distrib/pre-installed.wml: 1.5 -> 1.6 
chinese/doc/index.wml: 1.25 -> 1.26 
chinese/international/Chinese/about.wml: 1.5 -> 1.6 
chinese/international/Chinese/download.wml: 1.20 -> 1.21 
chinese/international/Chinese/index.wml: 1.22 -> 1.23 
chinese/international/Chinese/mailing_lists.wml: 1.8 -> 1.9 
chinese/international/Chinese/related_links.wml: 1.14 -> 1.15 
chinese/international/Chinese/software.wml: 1.13 -> 1.14 
chinese/international/Chinese/software_non-free.wml: 1.14 -> 1.15 
chinese/international/Chinese/thanks.wml: 1.9 -> 1.10 
chinese/international/Chinese/News/index.wml: 1.38 -> 1.39 
chinese/international/Chinese/devel/doc_translate.wml: 1.12 -> 1.13 
chinese/international/Chinese/devel/groups.wml: 1.10 -> 1.11 
chinese/international/Chinese/devel/join.wml: 1.11 -> 1.12 
chinese/international/Chinese/devel/www_translate.wml: 1.8 -> 1.9 
chinese/international/Chinese/devel/zhongwenhua.wml: 1.12 -> 1.13 
chinese/international/Chinese/doc/index.wml: 1.12 -> 1.13 
chinese/international/Chinese/faq/index.wml: 1.21 -> 1.22 
chinese/international/Chinese/screenshot/index.wml: 1.20 -> 1.21 
chinese/intro/about.wml: 1.35 -> 1.36 
chinese/intro/cn.wml: 1.24 -> 1.25 
chinese/intro/cooperation.wml: 1.2 -> 1.3 
chinese/intro/free.wml: 1.5 -> 1.6 
chinese/intro/help.wml: 1.3 -> 1.4 
chinese/intro/organization.wml: 1.2 -> 1.3 
chinese/intro/search.wml: 1.5 -> 1.6 
chinese/intro/why_debian.wml: 1.24 -> 1.25 
chinese/mirror/list.wml: 1.3 -> 1.4 
chinese/misc/index.wml: 1.2 -> 1.3 
chinese/releases/etch/index.wml: 1.9 -> 1.10 
chinese/releases/etch/installmanual.wml: 1.4 -> 1.5 
chinese/releases/etch/releasenotes.wml: 1.5 -> 1.6 
chinese/releases/hamm/HOWTO.upgrade.wml: 1.8 -> 1.9 
chinese/releases/hamm/errata.wml: 1.8 -> 1.9 
chinese/releases/lenny/index.wml: 1.7 -> 1.8 
chinese/releases/lenny/releasenotes.wml: 1.3 -> 1.4 
chinese/releases/potato/credits.wml: 1.3 -> 1.4 
chinese/releases/potato/errata.wml: 1.5 -> 1.6 
chinese/releases/potato/reportingbugs.wml: 1.2 -> 1.3 
chinese/releases/slink/running-kernel-2.2.wml: 1.6 -> 1.7 
chinese/releases/woody/credits.wml: 1.2 -> 1.3 
chinese/releases/woody/reportingbugs.wml: 1.2 -> 1.3 
chinese/searchtmpl/search.wml: 1.2 -> 1.3 
chinese/security/index.wml: 1.22 -> 1.23 
chinese/security/2002/dsa-200.wml: 1.2 -> 1.3 
chinese/security/2002/dsa-202.wml: 1.2 -> 1.3 
chinese/security/2002/dsa-203.wml: 1.2 -> 1.3 
chinese/security/2002/dsa-204.wml: 1.3 -> 1.4 
chinese/security/2009/dsa-1904.wml: 1.4 -> 1.5 
chinese/security/2009/dsa-1905.wml: 1.2 -> 1.3 
chinese/security/2009/dsa-1906.wml: 1.3 -> 1.4 
chinese/security/2009/dsa-1907.wml: 1.4 -> 1.5 
chinese/security/2009/dsa-1908.wml: 1.3 -> 1.4 
chinese/y2k/index.wml: 1.8 -> 1.9

1 files changed, 6 insertions, 2 deletions

diff --git a/chinese/Make.lang b/chinese/Make.lang
index a4cb7398c19..2a30c491865 100644
--- a/chinese/Make.lang
+++ b/chinese/Make.lang
@@ -18,9 +18,12 @@ ICONV = /usr/bin/iconv
 TOCN = $(BIN)/tocn.pl
 TOTW = $(BIN)/totw.pl
 TOHK = $(BIN)/tohk.pl
+FORMAT_ZH = $(BIN)/format_zh.pl
 GENERATE_ZH_VARIANTS = $(BIN)/generate-zh-variants.sh
 ZHTEMPLATE = $(WMLBASE)/template/debian-zh/template.tmpl
 
+COMMON_SCRIPTS = $(TOCN) $(TOTW) $(TOHK) $(FORMAT_ZH) $(GENERATE_ZH_VARIANTS)
+
 # how to include openlogo-nd-50.png here? it's in logos, not in Pics/ ...
 COMMONPICS = debian.png \
 	blue-upperleft.png blue-upperright.png \
@@ -53,6 +56,7 @@ ZHMAGIC = @if `echo $(HTMLDIR) | grep -q '^$(WMLBASE)/$(RELHTMLBASE)/internation
 WMLOUTPUT = -o UNDEFuZH@uCNuCNHKuCNTW:$(*F).zh-cn.html.tmp@g+w \
 	-o UNDEFuZH@uHKuCNHKuHKTWuTWHK:$(*F).zh-hk.html.tmp@g+w \
 	-o UNDEFuZH@uTWuCNTWuHKTWuTWHK:$(*F).zh-tw.html.tmp@g+w
+WMLPROLOG = --prolog=$(FORMAT_ZH)
 WML = wml $(WMLOPTIONS) $(WMLOUTPUT) $(WMLPROLOG) $(WMLEPILOG)
 
 install::
@@ -92,14 +96,14 @@ $(HTMLDIR)/%.zh-tw.html: %.zh-tw.html
 ifndef NOGENERICDEP
 %.zh-cn.html %.zh-hk.html %.zh-tw.html: %.wml \
 		$(TEMPLDIR)/template.wml $(TEMPLDIR)/languages.wml \
-		$(TOCN) $(TOHK) $(TOTW) $(ZHTEMPLATE) $(GETTEXTDEP) \
+		$(COMMON_SCRIPTS) $(ZHTEMPLATE) $(GETTEXTDEP) \
 		$(COMMONPICS_ZH)
 	@echo -n "Processing $(<F): "
 	@$(WML) $(<F)
 	@$(GENERATE_ZH_VARIANTS) $* html
 else
 %.zh-cn.html %.zh-hk.html %.zh-tw.html: %.wml \
-		$(TOCN) $(TOHK) $(TOTW) $(ZHTEMPLATE) $(GETTEXTDEP) \
+		$(COMMON_SCRIPTS) $(ZHTEMPLATE) $(GETTEXTDEP) \
 		$(COMMONPICS_ZH)
 	@echo -n "Processing $(<F): "
 	@cd $(@D) && $(WML) $(notdir $(<))