From f9b6b6067b4a44a231a38984f1c6e3fe2e661606 Mon Sep 17 00:00:00 2001
From: Philip Tzou <philip@users.mediawiki.org>
Date: Mon, 16 Mar 2009 19:35:02 +0000
Subject: [PATCH] Update the Chinese conversion tables.

---
 includes/ZhConversion.php                   | 3 ++-
 includes/zhtable/Makefile.py                | 5 +++--
 includes/zhtable/simpphrases_exclude.manual | 3 ++-
 includes/zhtable/tradphrases.manual         | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 53428f853c..ba50a39a35 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -3851,6 +3851,8 @@ $zh2Hant = array(
 '台历' => '台曆',
 '台历史' => '台歷史',
 '右后' => '右後',
+'叶 恭弘' => '叶 恭弘',
+'叶　恭弘' => '叶　恭弘',
 '叶恭弘' => '叶恭弘',
 '叶音' => '叶音',
 '叶韵' => '叶韻',
@@ -12135,7 +12137,6 @@ $zh2Hans = array(
 '戀著稱' => '恋著称',
 '戀著者' => '恋著者',
 '戀著述' => '恋著述',
-'恐嚇' => '恐嚇',
 '恩威並著' => '恩威并著',
 '悠著' => '悠着',
 '悠著書' => '悠著书',
diff --git a/includes/zhtable/Makefile.py b/includes/zhtable/Makefile.py
index 8cc1400bea..19436457b1 100644
--- a/includes/zhtable/Makefile.py
+++ b/includes/zhtable/Makefile.py
@@ -209,6 +209,7 @@ def GetDefaultWordsTable( src_wordlist, src_tomany, char_conv_table, char_reconv
     return word_reconv_table
 
 def GetManualWordsTable( src_wordlist, conv_table ):
+    src_wordlist = [items.split('#')[0].strip() for items in src_wordlist]
     wordlist = list( set( src_wordlist ) )
     wordlist.sort( key = len, reverse = True )
     reconv_table = {}
@@ -368,12 +369,12 @@ def main():
     s2t_1to1_supp.update( CustomRules( 'simp2trad_supp_set.manual' ) )
     # simpphrases.manual
     text = ReadFile( 'simpphrases.manual' )
-    s_wordlist_manual = text.split()
+    s_wordlist_manual = text.split('\n')
     t2s_word2word_manual = GetManualWordsTable(s_wordlist_manual, s2t_1to1_supp)
     t2s_word2word_manual.update( CustomRules( 'toSimp.manual' ) )
     # tradphrases.manual
     text = ReadFile( 'tradphrases.manual' )
-    t_wordlist_manual = text.split()
+    t_wordlist_manual = text.split('\n')
     s2t_word2word_manual = GetManualWordsTable(t_wordlist_manual, t2s_1to1_supp)
     s2t_word2word_manual.update( CustomRules( 'toTrad.manual' ) )
     # t2s_word2word
diff --git a/includes/zhtable/simpphrases_exclude.manual b/includes/zhtable/simpphrases_exclude.manual
index eff33352b9..8a55345a64 100644
--- a/includes/zhtable/simpphrases_exclude.manual
+++ b/includes/zhtable/simpphrases_exclude.manual
@@ -9,4 +9,5 @@
 对於
 属於
 夥计
-薹
\ No newline at end of file
+薹
+嚇
\ No newline at end of file
diff --git a/includes/zhtable/tradphrases.manual b/includes/zhtable/tradphrases.manual
index 4885d38e51..da856eace6 100644
--- a/includes/zhtable/tradphrases.manual
+++ b/includes/zhtable/tradphrases.manual
@@ -1330,6 +1330,8 @@
 叶韻
 叶音
 叶恭弘
+叶 恭弘
+叶　恭弘
 於1
 於2
 於3
-- 
2.20.1