From: Shinjiman <shinjiman@users.mediawiki.org>
Date: Tue, 12 Aug 2008 02:40:17 +0000 (+0000)
Subject: Update the Chinese conversion tables
X-Git-Tag: 1.31.0-rc.0~45942
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=eee89dfad8238e97b6a39581ccf3e33f237b4c96;p=lhc%2Fweb%2Fwiklou.git

Update the Chinese conversion tables
Last minute changes for the release branch 1.13
---

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index d06be4e90c..c0cff89394 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -4130,6 +4130,7 @@ $zh2Hant = array(
 "打斗" => 	"打鬥",
 "扞御" => 	"扞禦",
 "扯面" => 	"扯麵",
+"批准的" => 	"批准的",
 "批复" => 	"批複",
 "批注" => 	"批註",
 "批斗" => 	"批鬥",
@@ -4638,6 +4639,7 @@ $zh2Hant = array(
 "柱梁" => 	"柱樑",
 "校准" => 	"校準",
 "校雠学" => 	"校讎學",
+"核准的" => 	"核准的",
 "格于" => 	"格於",
 "格范" => 	"格範",
 "格斗" => 	"格鬥",
diff --git a/includes/zhtable/Makefile b/includes/zhtable/Makefile
index b35e6a1682..1407c93c4c 100644
--- a/includes/zhtable/Makefile
+++ b/includes/zhtable/Makefile
@@ -202,7 +202,11 @@ simpphrases.notsure: simpphrases_2.t simpphrases_3.t simpphrases_4.t t2s_1tomany
 	for i in `$(SED) 's/"\(.\).*/\1/' t2s_1tomany.t ` ; do $(GREP) $$i t ; done | $(DIFF) t - | $(GREP) '>' | $(SED) 's/> //' > simpphrases.notsure
 
 trad2simp1to1.t: t2s_1tomany.t t2s_1to1.t trad2simp_noconvert.manual
-	$(SED)  's/\(.......\).*/\1",/' t2s_1tomany.t > trad2simp1to1.t
+	$(SED)  's/\(.......\).*/\1",/' t2s_1tomany.t > tt
+	colrm 1 7 < trad2simp.manual | colrm 3 > trad2simpcharsrc.t
+	colrm 1 17 < trad2simp.manual | colrm 3 > trad2simpchardest.t
+	cat trad2simpcharsrc.t | $(GREP) -f trad2simpchardest.t > trad2simprepeatedchar.t
+	cat tt | $(GREP) -vf trad2simprepeatedchar.t > trad2simp1to1.t
 	cat t2s_1to1.t >> trad2simp1to1.t
 	cat trad2simp1to1.t | $(GREP) -vf trad2simp_noconvert.manual > tt
 	mv tt trad2simp1to1.t
@@ -217,9 +221,10 @@ simp2trad1to1.t: s2t_1tomany.t s2t_1to1.t simp2trad.manual simp2trad_noconvert.m
 	cat simp2trad1to1.t | $(GREP) -vf simp2trad_noconvert.manual > tt
 	mv tt simp2trad1to1.t
 
-trad2simp.php: trad2simp1to1.t tradphrases.t trad2simp_supp_unset.manual
+trad2simp.php: trad2simp1to1.t tradphrases.t trad2simp_supp_unset.manual trad2simp_supp_set.manual
 	printf '<?php\n$$trad2simp=array(' > trad2simp.php
 	cat trad2simp1to1.t >> trad2simp.php
+	$(SED) 's/\(.*\)\t\(.*\)/"\1" => "\2",/' trad2simp_supp_set.manual >> trad2simp.php
 	printf ');\n$$str=\n"' >> trad2simp.php
 	cat tradphrases.t >> trad2simp.php
 	printf '";\n$$t=strtr($$str, $$trad2simp);\necho $$t;\n?>' >> trad2simp.php
@@ -242,10 +247,13 @@ simp2trad.phrases.t: trad2simp.php tradphrases.t simp2trad_supp_set.manual
 	cat trad2simp.php | $(GREP) -vf simp2trad_supp_noconvert.t > trad2simp.tt
 	mv trad2simp.tt trad2simp.php
 
-trad2simp.phrases.t: simp2trad.php simpphrases.t
+trad2simp.phrases.t: simp2trad.php simpphrases.t trad2simp_supp_set.manual
 	php -f simp2trad.php | $(SED)  's/\(.*\)/"\1" => /' > tmp1
 	cat simpphrases.t | $(SED)  's/\(.*\)/"\1",/' > tmp2
 	paste tmp1 tmp2 > trad2simp.phrases.t
+	colrm 3 < trad2simp_supp_set.manual > trad2simp_supp_noconvert.t
+	cat simp2trad.php | $(GREP) -vf trad2simp_supp_noconvert.t > simp2trad.tt
+	mv simp2trad.tt simp2trad.php
 
 toHans.dict: trad2simp1to1.t trad2simp.phrases.t toSimp.manual
 	cat trad2simp1to1.t | $(SED) 's/[, \t]//g' | $(SED) 's/=>/\t/' > toHans.dict
diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index 7e1cd58c89..f13ce6bf58 100644
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -1476,6 +1476,8 @@
 筑邦
 筑陽
 南筑
+批准的
+核准的
 為準
 擺鐘
 編鐘