fix #190 (#194)

Author: pengzhendong

tn/chinese/rules/cardinal.py

@@ -64,11 +64,13 @@ def build_tagger(self):
         number @= self.build_rule(
             cross('二百', '两百')
             | cross('二千', '两千')
-            | cross('二万', '两万'))
-        self.number = accep('约').ques + accep('人均').ques + number.optimize()
+            | cross('二万', '两万')).optimize()
+        percent = insert('百分之') + number + delete('%')
+        self.number = accep('约').ques + accep('人均').ques + (number | percent)
 
         # cardinal string like 127.0.0.1, used in ID, IP, etc.
         cardinal = digits.plus + (dot + digits.plus)**3
+        cardinal |= percent
         # xxxx-xxx-xxx
         cardinal |= digits.plus + (delete('-') + digits.plus)**2
         # xxx-xxxxxxxx

tn/chinese/rules/measure.py

@@ -35,8 +35,6 @@ def build_tagger(self):
         to = cross('-', '到') | cross('~', '到') | accep('到')
 
         number = Cardinal().number
-        percent = insert('百分之') + number + delete('%')
-
         number @= self.build_rule(cross('二', '两'), '[BOS]', '[EOS]')
         # 1-11个，1个-11个
         prefix = number + (rmspace + units).ques + to
@@ -55,8 +53,7 @@ def build_tagger(self):
         prefix = cardinal + (rmspace + unit).ques + to
         annual = prefix.ques + cardinal + unit
 
-        tagger = insert('value: "') + (measure | percent
-                                       | annual) + insert('"')
+        tagger = insert('value: "') + (measure | annual) + insert('"')
 
         # 10km/h
         rmsign = rmspace + delete('/') + rmspace

tn/chinese/test/data/cardinal.txt

@@ -1,4 +1,5 @@
 110 => 幺幺零
+2% => 百分之二
 127.0.0.1 => 一二七点零点零点一
 010-64035547 => 零一零六四零三五五四七
 尾号1702 => 尾号幺七零二

tn/chinese/test/data/measure.txt

@@ -6,6 +6,5 @@
 2两 => 二两
 1kg => 一千克
 1 kg => 一千克
-2% => 百分之二
 10km/h => 每小时十公里
 100兆 => 一百兆