[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Some minor corrections for CCE/JMCE



Hi, all out there;

My corrections are put here:
ftp://ftp.gnuchina.org/pub/linux/chinese/inputmothod/console/
And here is a small attachment about 46KB. Hope it's not a
spam. :)

I've modified the pinyin.cin|pinyin.map|sysphrase.txt and
modified the pkg to a better package.sh. Since CCE/JMCE are
same source, so that could affect all. Other Chinese platform
based CCE could be affected as well, such as Unicon(TLC),
HappyCon(HappyLinux),CCE in COSIXLinux/CLE/Debian...etc. Hope 
this could help some. Could foka modify the package.sh for a 
deb format package maker? It still needs more hack, I think. :)

BTW:I've tried wget cle-0.9p1-1.i386.iso for almost a week
from ftp://cle.linux.org.tw but till now it's only 19.xM. God my...
Is there any faster mirror? I seeked mirrors sites around
TaiWan,HongKong,MainLand and couldn't get one. :( Guys have
ask me for that a few days. Maybe they'll beat me or even eat me. 


Happy hacking GNU/Linux...

Rat@2000.11.09
================End========================================
diff -Nru jmce/Makefile jmce-0.37/Makefile
--- jmce/Makefile	Fri Aug 20 11:29:34 1999
+++ jmce-0.37/Makefile	Wed Nov  8 23:32:45 2000
@@ -15,6 +15,7 @@
 	done
 
 clean:
+	@rm -f *~ *.bak core tags
 	@for i in $(SUBDIRS);\
 	do (cd $$i && echo cleaning all in $$i && $(MAKE) clean) || exit;\
 	done
diff -Nru jmce/Makefile.linux jmce-0.37/Makefile.linux
--- jmce/Makefile.linux	Fri Aug 20 11:29:34 1999
+++ jmce-0.37/Makefile.linux	Wed Nov  8 23:32:45 2000
@@ -15,6 +15,7 @@
 	done
 
 clean:
+	@rm -f *~ *.bak core tags
 	@for i in $(SUBDIRS);\
 	do (cd $$i && echo cleaning all in $$i && $(MAKE) clean) || exit;\
 	done
diff -Nru jmce/README jmce-0.37/README
--- jmce/README	Sat Aug 26 23:24:12 2000
+++ jmce-0.37/README	Wed Nov  8 23:07:12 2000
@@ -1,3 +1,10 @@
+===============Begin of README===============
+
+0. ATTENTION:
+   This version of JMCE could not be compiled by some version of gcc.
+   Such as the gcc included in RedHat 7.0, SuSE 6.4, Mandrake 7.1.
+   You'd better get the RPM/DEB binary version to use. 
+
 1. How to install JMCE ?
 --------------------------
 
@@ -66,4 +73,4 @@
 
                                  kevin
                                Aug 26,2k
-
+===============End of README===============
diff -Nru jmce/README.big5 jmce-0.37/README.big5
--- jmce/README.big5	Fri Aug 20 11:29:34 1999
+++ jmce-0.37/README.big5	Thu Nov  9 02:00:00 2000
@@ -3,7 +3,7 @@
 
 ¤@¡B«e¨¥
 
-   CCE (Console Chinese Environment) ¬° Rui He, <herui@cs.duke.edu> 
+   CCE (Console Chinese Environment) ¬° ¦ó¾U¡A<herui@cs.duke.edu> 
 ¼¶¼gªº¤¤¤å²×ºÝ¾÷¨t²Î (§ï¼g¦ÛµÛ¦Wªº kon)¡A¦ý¥Ø«e¶È¤ä´©Â²Åé(GB)ªº¿é¤J
 ¤è¦¡¡C ¥Ñ©ó CCE ¤ä´© Mouse (Copy & Paste) ¥H¤Î multiple-terminal¡A
 °t¦X Frame Buffer Åã¥Ü³t«×¬Û·í§Ö³t¡AÆZ§Æ±æ¯àÅý¨Ï¥ÎÁcÅé(Big5)ªº 
diff -Nru jmce/config.linux jmce-0.37/config.linux
--- jmce/config.linux	Fri Aug 20 11:29:34 1999
+++ jmce-0.37/config.linux	Thu Nov  9 02:43:58 2000
@@ -6,12 +6,13 @@
 FONTDIR = $(TOPDIR)/usr/lib/jmce
 JMCECFG  = jmce.cfg
 
+CC	= gcc
 #OPTS    = -DHAS_MOUSE -D__Use_lrmi__ -DCONFIG_NAME=\"$(LIBDIR)/$(JMCECFG)\" -I$(INCDIR) \
 #          -DJMCELIB=\"$(LIBDIR)\" 
-OPTS    = -DHAS_MOUSE -DCONFIG_NAME=\"/etc/$(JMCECFG)\" -I$(INCDIR) \
+OPTS    = -DHAS_MOUSE -DCONFIG_NAME=\"$(LIBDIR)/$(JMCECFG)\" -I$(INCDIR) \
           -DJMCELIB=\"$(LIBDIR)\" 
 CFLAGS  = -ggdb -O2 -W $(OPTS) 
-LD      = gcc $(CFLAGS) 
+LD      = $(CC) $(CFLAGS) 
 RM      = rm -f
 INSTALL = install -c
 
diff -Nru jmce/fonts/Makefile jmce-0.37/fonts/Makefile
--- jmce/fonts/Makefile	Fri Aug 20 11:29:35 1999
+++ jmce-0.37/fonts/Makefile	Wed Nov  8 23:14:07 2000
@@ -24,7 +24,7 @@
 	$(CC) $(CFLAGS) -M *.c > .depend
 
 clean:
-	$(RM) $(EXECPROGS) $(PROGS) *.o *~ .depend
+	$(RM) $(EXECPROGS) $(PROGS) *.o *~ *.bak .depend core tags
 
 install: $(PROGS) $(EXECPROGS)
 	$(INSTALL) -o root -g $(GROUP) -m 755 -d $(FONTDIR)
diff -Nru jmce/fonts/Makefile.linux jmce-0.37/fonts/Makefile.linux
--- jmce/fonts/Makefile.linux	Fri Aug 20 11:29:35 1999
+++ jmce-0.37/fonts/Makefile.linux	Wed Nov  8 23:14:07 2000
@@ -24,7 +24,7 @@
 	$(CC) $(CFLAGS) -M *.c > .depend
 
 clean:
-	$(RM) $(EXECPROGS) $(PROGS) *.o *~ .depend
+	$(RM) $(EXECPROGS) $(PROGS) *.o *~ *.bak .depend core tags
 
 install: $(PROGS) $(EXECPROGS)
 	$(INSTALL) -o root -g $(GROUP) -m 755 -d $(FONTDIR)
diff -Nru jmce/inputs/Makefile jmce-0.37/inputs/Makefile
--- jmce/inputs/Makefile	Sat Aug 26 18:50:42 2000
+++ jmce-0.37/inputs/Makefile	Wed Nov  8 23:15:46 2000
@@ -58,7 +58,7 @@
 
 clean:
 	rm -f $(EXECPROGS)
-	rm -f *.tab *.tab.lx *.tab.phr *.idx *.dat
+	rm -f *.tab *.tab.lx *.tab.phr *.idx *.dat *.bak *~ .depend tags core
 
 install: $(PROGS)
 	$(INSTALL) -o root -g $(GROUP) -m 755 -d $(LIBDIR)
diff -Nru jmce/inputs/Makefile.linux jmce-0.37/inputs/Makefile.linux
--- jmce/inputs/Makefile.linux	Sat Aug 26 18:50:42 2000
+++ jmce-0.37/inputs/Makefile.linux	Wed Nov  8 23:15:46 2000
@@ -58,7 +58,7 @@
 
 clean:
 	rm -f $(EXECPROGS)
-	rm -f *.tab *.tab.lx *.tab.phr *.idx *.dat
+	rm -f *.tab *.tab.lx *.tab.phr *.idx *.dat *.bak *~ .depend tags core
 
 install: $(PROGS)
 	$(INSTALL) -o root -g $(GROUP) -m 755 -d $(LIBDIR)
diff -Nru jmce/inputs/README jmce-0.37/inputs/README
--- jmce/inputs/README	Sat Aug 26 18:47:43 2000
+++ jmce-0.37/inputs/README	Thu Jan  1 08:00:00 1970
@@ -1,31 +0,0 @@
-Two Input Method Systems Here:
-
-1. Pinyin
-
-  pinyin.map      pinyin->char mapping, txt file
-  sysphrase.txt   system phrases txt file
-  usrphrase.txt   user phrases txt file
-  sysphrase.tab   system phrases binary file
-  usrphrase.tab   user phrases binary file
-
-  txt2tab         convert txt phrases to tab  
-           (read table and generate single chars, used for system phrases)
-  txt2tab1        convert txt phrases to tab
-                   (without single chars)
-
-  tab2txt          tab->txt without single chars
-  tab2txt1         tab->txt with single chars
-
-  How to add the user phrases into system phrases?
-
-   (1) edit sysphrase.txt and execute txt2tab
-   (2)  tab2txt usrphrase.tab usrphrase.txt
-        cat usrphrase.txt >> sysphrase.txt
-        txt2tab sysphrase.txt sysphrase.tab
-
-    Idea:  Tab->Txt, combine ->Tab
-
- 2. Biao3 Ge2
-
-  cin2tab          cin->tab
-  tab2cin          tab->cin
diff -Nru jmce/inputs/pinyin.cin jmce-0.37/inputs/pinyin.cin
--- jmce/inputs/pinyin.cin	Sat Aug 26 18:47:42 2000
+++ jmce-0.37/inputs/pinyin.cin	Thu Nov  9 09:35:41 2000
@@ -91,7 +91,7 @@
 aihu °®»¤
 aijin °¤½ü
 aimei êÓÃÁ
-aimu °®Ä»
+aimu °®Ä½
 aiqing °®Çé
 aiqiu °§Çó
 airen °®ÈË
@@ -9403,6 +9403,7 @@
 lianjie Áª½á
 lianjie Á¬½Ó
 lianjie Áª½Ó
+lianjie Á´½Ó
 lianjie Á®½à
 lianjun Áª¾ü
 lianlei Á¬ÀÛ
@@ -10607,6 +10608,7 @@
 mingsheng ÃûÉù
 mingtang ÃûÌÃ
 mingtian Ã÷Ìì
+minguo Ãñ¹ú
 mingwang ÃûÍû
 mingwen Ã÷ÎÄ
 mingxi Ã÷ϸ
@@ -20157,7 +20159,7 @@
 zhizu Öª×ã
 zhizuo ÖÆ×÷
 zhm ×ߺóÃÅ
-zhmg ÖлªÃñ¹ú
+zouhoumen ×ߺóÃÅ
 zhmz ÖлªÃñ×å
 zhong ÖÐ
 zhong ÖÖ
diff -Nru jmce/inputs/pinyin.map jmce-0.37/inputs/pinyin.map
--- jmce/inputs/pinyin.map	Thu Nov  9 12:25:43 2000
+++ jmce-0.37/inputs/pinyin.map	Thu Nov  9 09:28:52 2000
@@ -55,12 +55,13 @@
 cuo	´í´ë´ê´ì´é´èõãïóáÏëâðîðûõºØÈï±
 da	´ó´ò´ï´ð´î´ñàªí³ÞÇñ×÷²óÎ÷°âòæ§ßÕðã
 dai	´ú´ø´ý´÷´ü´ô´û´þ´õ´ù÷쵡çéá·åÊ´öß¾ææçªÜ¤ß°
-dan	µ«µ¥µ£µ¯µ­µ©µ°µ¨µ®µ¤µ¢µ¬íñà¢å£µ§ééóìð÷êæðãñõµªÝ̵¦ÙÙ
+dan	µ«µ¥µ£µ¯µ­µ©µ°µ¨µ®µ¤µ¢µ¬íñà¢å£µ§ééóìð÷êæðãñõµªÝ̵¦ÙÙØé
 dang	µ±µ³µ´µµµ²ñÉîõå´ÛÊÝÐÚÔí¸
 dao	µ½µÀµ¼µ¹µºµ¶µ¿µÁµ¸µ·µ»ß¶µ¾âáàüë®ôî
-de	µÄµÃµÂï½
+de	µÄµØµÃµÂï½
 deng	µÈµÇµÆµËµÊµÉµÅàâíãê­ïëô£áØ
-di	µØµÚÌáµ×µÍµÛµÜµÐµÖµÝµÎµÏµÙµÌµÑµÞµÓàÖÚ®ÚеÒÛ¡íûµÕµÔíÆæ·é¦Ý¶ôÆÛæèÜêë÷¾Øµç°ïáíÚÙá
+dei     µÃ
+di	µØµÄµÚÌáµ×µÍµÛµÜµÐµÖµÝµÎµÏµÙµÌµÑµÞµÓàÖÚ®ÚеÒÛ¡íûµÕµÔíÆæ·é¦Ý¶ôÆÛæèÜêë÷¾Øµç°ïáíÚÙá
 dia	àÇ
 dian	µãµçµêµäµßµéµíµæµîµáµìµëµàµâñ²áÛõÚµèçèô¡ÚçÛãµåîäñ°Ø¼
 diao	µ÷µôµõµñµóµöµòµðõõµïï¢îööô
@@ -76,7 +77,7 @@
 duo	¶à¶á¶ä¶ã¶æ¶éõâßͶå¶ß¶ç¶è¶âÍÔ¶ÞîìñÖßáç¶ãõèÞ
 e	¶î¶í¶ñ¶öŶ¶ì¶ó㵶ôج¶ð¶ëßÀ¶ò¶õ¶ï湶êéîò¦öùïÉÚÌåíï°ãÕÛÑëñÜÃðÊÝàÝ­
 ei	ÚÀ
-en	¶÷ÞôÝì
+en	¶÷ÞôÝìàÅßí
 er	¶ø¶þ¶ù¶û¶úåǶü¶ýð¹çíîïöÜ·¡Ù¦
 fa	·¢·¨·£·¦·¥·§íÀ·¤ÛÒ·©
 fan	·´·¹·¸·­·¶·²·³·µ·¬···±·º·«·ªá¦èó·®ìÜެ°ÞÀ·¯õì
@@ -128,7 +129,7 @@
 ji	¼¸¸ø¼º»ú¼Ç¼°¼Æ¼´»ù¼Ã¼­¼¶¼«¼Ä¼Ê¼¼¼¯¼Í»÷Ææ¼±¼¤¼Ì¼È»ý¼®¼¦¼ª¼·¼£¼¾¼Å¼¨¼²¼¢¼À¼©¼É¼Á»ø¼§í¶¼¡¼µ¼¥½åß´¼¹¼½»ü¼Ë¼¬æ÷»û¼»¼³¼Â᧼¿óÅõÒñ¤Ø½Úµôßö«î¿ð¢ÙÊêªïúé®ßóöê÷ÙÜù»þêéÝðçÜò±ì´éêÛÔÙ¥Þáܸآ÷äÞªßÒáÕÜÁóÇßâä©ØÀê«åìØÞõÕçáöÝêåê÷
 jia	¼Ò¼Ó¼Û¼Ù¼Ü¼×¼Ñ¼Ý¼Ð¼Þ¼Î¼Ö¼ÚÇÑٮЮ¼Õð¨½Ä¼Ïçìê©åÈÙ¤ä¤ðèëÎóÕ¼ÔÝç¼ØïØØÅÛ£ÞØáµáèäÐë¸ôÂðýí¢îòñÊòÌõÊ
 jian	¼û¼ä¼þ½¨¼ò¼á¼à¼õ½¥¼ì½¡¼æ½£¼è¼ç¼ü¼ö¼â¼ø¼ô¼ù¼é¼ñ¼ý½¢¼ð¼ú½¦¼å¼ó¼÷¼î¼ß¼ê¼ë¼ã¼íÚÉå¿ÙÔ½§ÝÑåÀ¼ïíúïµ½¤ë¦öä÷µÝóÞöÚÙàîäÕçÌèÅê¯ê§êùñÐóÈôåõÂé¥êððÏëìõÝ
-jiang	½«½²Ç¿½­½±½µ½¯½®½´½ª½¬½©½³êñçÖç­½°ñðíää®ôøÜüôÝ
+jiang	½«½²½­½±½µ½¯½®½´½ª½¬½©½³Ç¿êñçÖç­½°ñðíää®ôøÜüôÝ
 jiao	½Ì½»¾õУ½Ð½Ï½Ç½Å½¹½¾½¼½Î½Á½À½º½É½Ê½È½·½Ã½¿Ù®½Æ½½õÓ毽ѽ˽Ä𨽶½Í½¸öÞáèäÐë¸ÙÕðÔá½òÔ½ÂÜ´ÜúÞØàÝõ´
 jie	½ç½â½Ó½á½Ú½Ö½ã½×½é½è½ä½Ü½ì½Ô½Ý½Ø½à½Ò½Ù½ß½å½Þ½ëàµÞ×æÝíÙ½ÕÚµèî½æÙÊò¡Ú¦ðܽêæ¼ôÉöÚò»÷ºà®
 jin	½ø½ñ½ð½ü¾¡½ö½ô½û¾¢½ò½ï½÷½õ½î½ú½í½þ½óèªñæ½ùçƽýàäêîâËÝÀñÆÝ£âÛæ¡ÚáêáéÈ
@@ -250,7 +251,7 @@
 qi	ÆðÆäÆÚÆøÆßÆæÆÞÆóÆ÷ÆûÆåÆëÆìÆúÆôÆïÆÛÆçÆñÆÝÆàÆüÆõç÷ÆòÆíÆáÆùÆêÆÜÆãì÷ÆéÆîçùõèÆöí¬ä¿ãàؽç²ÆýàÒáªÝÂÙ¹è½ÜÎÜùêÈéÊñýÜ»á¨ì¥èçôìݽòÓòàôë÷¢÷èÞ­ÆâØÁæëÝÝÆèÛßíÓ
 qia	Ç¡Ç¢ÆþÙ¤ñÊÝÖ÷Ä
 qian	ǰǮǧǩǷǣdzDZǨǫDzǸÏËǶǬǴǦò¯Ç¯å¹Ù»ÇµÇ­Þçã¥Ü·ç×í©Ý¡ÜÍÚäÙÝåºå½ëÉǥǪêùîÔá©óé÷ÜǤã»èý
-qiang	ǹǽÇÀǻǺïÏõÄǼǾãÞñßéÉìÁòÞæÍïºê¨ôÇïê
+qiang	ǹǽǿÇÀǻǺïÏõÄǼǾãÞñßéÉìÁòÞæÍïºê¨ôÇïê
 qiao	ÇÅÇÄÇÇÇÉÇÈÇÆÇÃÇÌÇÎÇÏÇÍÇÂÇËõÎã¾éÔÇÊÇÁÚ½ã¸ÚÛÜñá½çØíÍ÷³Øä
 qie	ÇÐÇÒÇÔÇÓÇÑôòæªÆöã«Ù¤ïÆêüÛ§óæã»
 qin	Ç×ÇÕÇÙÇÖÇØÇÚÇÛÇÜÇÞñûÇßÇÝàßÞìéÕï·ÜËàºòûôÀâÛäÚßÄ
@@ -268,7 +269,7 @@
 ren	ÈËÈÎÈÏÈÌÈÊÈÍÈÐÈÒâ¿ÈÉØðïþÝØÜóÈÑéíñÅ
 reng	ÈÔÈÓ
 ri	ÈÕ
-rong	ÈÝÈÙÈÚÈØÈÜÈÞÈÛéÅÈÖáÉÈ×ÈßëÀòîáõ
+rong	ÈÝÈÙÈÚÈØÈÜÈÞÈÛéÅÈÖáÉÈ×ÈßëÀòîáõéF
 rou	ÈâÈáÈàõå÷·ôÛ
 ru	ÈçÈëÈèÈåÈéÈêÈìàéÈãå¦ÈäÈæçÈñàò¬Þ¸Ýêä²äáï¨
 ruan	ÈíÈîëÃ
@@ -376,7 +377,7 @@
 ze	ÔòÔðÔóÔñÕ¦ßõØÆåÅóÐóåô·àýØÓê¾
 zei	Ôô
 zen	ÔõÚÚ
-zeng	ÔöÔùÔ÷çÕîÀêµï­
+zeng	ÔøÔöÔùÔ÷çÕîÀêµï­
 zha	Õ¨ÔúÕ¦Õ©Õ§Õ£ÔüÔýÕ¤ÔþÕ¢Õ¥ÔûÞê×õé«ßî߸աíÄ÷þßåðäòÆ
 zhai	ÕªÕ®Õ¬Õ­Õ«Õ¯µÔíÎñ©
 zhan	Õ½Õ¹Õ¾Õ¼Õ´Õ¶Õ·Õ³ÕµÕ¸Õ°ÕÀÕºÕ¿Õ²Õ±Õ»ÚÞÞøì¹
diff -Nru jmce/inputs/sysphrase.txt jmce-0.37/inputs/sysphrase.txt
--- jmce/inputs/sysphrase.txt	Sat Aug 26 18:47:43 2000
+++ jmce-0.37/inputs/sysphrase.txt	Thu Nov  9 09:28:52 2000
@@ -1,30 +1,37 @@
 °¢°Ö a ba  0
 °¢±¦ a bao  0
-°¢¶û a er  0
 °¡¹þ a ha  0
+°¢Ùê a hong  0
 °¢Àï a li  0
 °¢Âü a man  0
-°¢Ã« a mao  0
-°¢Ã÷ a ming  0
+°¢ÃÅ a men  0
 °¢ÆÅ a po  0
+°¢Ìç a ti  0
 °¢ÒÌ a yi  0
+ëçÅH a za  0
 °¢¶û±°Ë¹É½Âö a er bei si shan mai  0
 °¢¶û°ÍÄáÑÇ a er ba ni ya  0
 °¢¶û¼°¶û a er ji er  0
 °¢¶û¼°ÀûÑÇ a er ji li ya  0
 °¢¶û̩ɽ a er tai shan  0
 °¢¸»º¹ a fu han  0
+°¢·²Ìá a fan ti  0
 °¢¸ùÍ¢ a gen ting  0
+°¢À­²® a la bo  0
 °¢À­·¨ÌØ a la fa te  0
 °¢Ë¹ÌØ a si te  0
 °¢¿ËËÕ a ke su  0
 °§ÀÖ ai yue  0
+°§Ô¹ ai yuan  0
+°§±ø±Ø°Ü ai bing bi bai  0
 °®µÏÉú ai di sheng  0
 °®¶ûÀ¼ ai er lan  0
 °®¹úÈËÊ¿ ai guo ren shi  0
 °®¹úÖ÷Òå ai guo zhu yi  0
 °®¹úÎÀÉúÔ˶¯ ai guo wei sheng yun dong  0
 °«¸Ñ×÷Îï ai gan zuo wu  0
+°§¸æ ai gao  0
+°§ºè±éÒ°  ai hong bian ye  0
 °®ºÃÕß ai hao zhe  0
 °¤´ò ai da  0
 Þß´ò ai da  0
@@ -41,8 +48,10 @@
 °®ºÃ ai hao  0
 °®»¤ ai hu  0
 °§³î ai chou  0
+°§´Ç ai ci  0
 °£¼° ai ji  0
 Þß½ü ai jin  0
+°§ñæ ai jin  0
 °®Áµ ai lian  0
 °¤Âî ai ma  0
 °®Ãñ ai min  0
@@ -66,6 +75,7 @@
 °¥Ó´ ai yo  0
 °§ÀÖ ai le  0
 °®Ô÷ ai zeng  0
+°®Ô÷·ÖÃ÷ ai zeng fen ming  0
 °¦Éù̾Æø ai sheng tan qi  0
 °®Òò˹̹ ai yin si tan  0
 °²¶¨ an ding  0
@@ -203,11 +213,14 @@
 °Ã»Ú ao hui  0
 °ÂÁÖ ao lin  0
 °ÂÃî ao miao  0
+°ÂÒå ao yi  0
 °ÄÃÅ ao men  0
 °ÂÃØ ao mi  0
 °ÁÂý ao man  0
 °ÃÄÕ ao nao  0
 °ÃÉ¥ ao sang  0
+°¼Í¹ ao tu  0
+°¼Í¹²»Æ½ ao tu bu ping  0
 °ÄÖÞ ao zhou  0
 °¿Ïè ao xiang  0
 åÛÓÎ ao you  0
@@ -216,7 +229,8 @@
 °Â˹ÌØ ao si te  0
 °ÂÔË»á ao yun hui  0
 °ÂÊÏÌå ao shi ti  0
-°Â˹¾ ao si lu  0
+°Â˹½ ao si lu  0
+÷éÕ½  ao zhan  0
 °Í°Í ba ba  0
 °Ö°Ö ba ba  0
 °Ë±¦ ba bao  0
@@ -246,6 +260,7 @@
 °Ñ³Ö ba chi  0
 °Î³ý ba chu  0
 °Õ÷í ba chu  0
+°ËØÔ ba gua  0
 °Å½¶ ba jiao  0
 °Ë½Ç ba jiao  0
 °Õ½Ì ba jiao  0
@@ -2543,6 +2558,7 @@
 ²ð¿ª chai kai  0
 ²òÀÇ chai lang  0
 ²ñÃ× chai mi  0
+²ñÃ×ÓÍÑÎ chai mi you yan  0
 ²ðÉ¢ chai san  0
 ²ð̨ chai tai  0
 ²ð×° chai zhuang  0
@@ -2646,7 +2662,7 @@
 ³¤³æ chang chong  0
 ³¤´¦ chang chu  0
 ³¤½­ chang jiang  0
-³¡Ç¿ chang jiang  0
+³¡Ç¿ chang qiang  0
 ³ª»ú chang ji  0
 æ½¼Ë chang ji  0
 ³£¼û chang jian  0
@@ -3030,7 +3046,7 @@
 ³Ç½¼ cheng jiao  0
 ³É½» cheng jiao  0
 ³Î½­ cheng jiang  0
-³ÑÇ¿ cheng jiang  0
+³ÑÇ¿ cheng qiang  0
 ³É¼û cheng jian  0
 ³Ë¼ä cheng jian  0
 ³É¾Í cheng jiu  0
@@ -3771,7 +3787,7 @@
 ´ÅÅÌ ci pan  0
 ´ÎÆ· ci pin  0
 ´Äƺ ci ping  0
-´Å³¡Ç¿¶È ci chang jiang du  0
+´Å³¡Ç¿¶È ci chang qiang du  0
 ´ÉÆ÷ ci qi  0
 ´ÇÈ¥ ci qu  0
 ´ÊÇú ci qu  0
@@ -3838,7 +3854,7 @@
 ´ÅЧӦ ci xiao ying  0
 ´ÆÐÛÒìÖê ci xiong yi zhu  0
 ´ÎҪì¶Ü ci yao mao dun  0
-´Å¸ÐӦǿ¶È ci gan ying jiang du  0
+´Å¸ÐӦǿ¶È ci gan ying qiang du  0
 ´ÊÕÂ ci zhang  0
 ´Ó²» cong bu  0
 ´Ó´Ë cong ci  0
@@ -5003,6 +5019,7 @@
 µÃÐÄÓ¦ÊÖ de xin ying shou  0
 µÂÒâÖ¾ de yi zhi  0
 µÃÒâÑóÑó de yi yang yang  0
+µÃ¿÷ dei kui  0
 µÈ±ÈÊýÁÐ deng bi shu lie  0
 µÇ·åÔ켫 deng feng zao ji  0
 µÇ°¶ deng an  0
@@ -5034,6 +5051,7 @@
 µÈÁ¿ deng liang  0
 µÆÁý deng long  0
 怫 deng lu  0
+怬 deng lu  0
 µÇÃÅ deng men  0
 µÆÅÝ deng pao  0
 µÈÆ· deng pin  0
@@ -5357,6 +5375,7 @@
 µÚÈýµÈ¼¶ di san deng ji  0
 µØ»ù³ÐÔØÁ¦ di ji cheng zai li  0
 µØÖʱ༠di zhi bian lu  0
+àÇÉùàÇÆø dia sheng dia qi  0
 µç±ùÏä dian bing xiang  0
 µç´Å²¨ dian ci bo  0
 µç´Å·øÉä dian ci fu she  0
@@ -5392,7 +5411,7 @@
 µçÁ÷¼Æ dian liu ji  0
 µçÁ÷¼ÌµçÆ÷ dian liu ji dian qi  0
 µçÀëÄÜ dian li neng  0
-µçÁ÷Ç¿¶È dian liu jiang du  0
+µçÁ÷Ç¿¶È dian liu qiang du  0
 µç·ͼ dian lu tu  0
 µçÁ¦Íø dian li wang  0
 µçÁ¦Ïß dian li xian  0
@@ -5522,6 +5541,8 @@
 µæ×Ó dian zi  0
 µç×Ó dian zi  0
 µã×Ó dian zi  0
+µç×ÓÉÌÎñ dian zi shang wu  0
+µç×ÓÓʼþ dian zi you jian  0
 µç×ê dian zuan  0
 µç×è dian zu  0
 µè×â dian zu  0
@@ -5865,6 +5886,7 @@
 ¶¯Ô± dong yuan  0
 ¶¯Óà dong yong  0
 ¶´×Ó dong zi  0
+¶±×å dong zu  0
 ¶¯×÷ dong zuo  0
 ¶¯Ì¬·¶Î§ dong tai fan wei  0
 ¶¯Ì¬Æ½ºâ dong tai ping heng  0
@@ -6069,7 +6091,7 @@
 ¶Ï¶ÏÐøÐø duan duan xu xu  0
 ¶Ëµçѹ duan dian ya  0
 ¶Ì´óÒ duan da yi  0
-¶ÏÁÑÇ¿¶È duan lie jiang du  0
+¶ÏÁÑÇ¿¶È duan lie qiang du  0
 ¶ÌƪС˵ duan pian xiao shuo  0
 ¶Îì÷Èð duan qi rui  0
 ¶Ï°¸ duan an  0
@@ -6246,6 +6268,7 @@
 ¶ÙºÓ dun he  0
 ¶ÙºÅ dun hao  0
 ¶Û½Ç dun jiao  0
+¶Û½ÇÈý½ÇÐÎ dun jiao san jiao xing  0
 ¶ÜÅÆ dun pai  0
 ¶ÙÊ× dun shou  0
 ¶Ùʱ dun shi  0
@@ -6268,6 +6291,7 @@
 ¶àÃ×Äá¼Ó duo mi ni jia  0
 ¶àÃæÌå duo mian ti  0
 ¶àÃñ×å¹ú¼Ò duo min zu guo jia  0
+¶àè§ºÓ duo nao he  0
 ¶àÄêÀ´ duo nian lai  0
 ¶àÄêÉú duo nian sheng  0
 ¶á±ê duo biao  0
@@ -6334,11 +6358,11 @@
 ¶àÑù duo yang  0
 ¶àÔÆ duo yun  0
 ¶àÔª duo yuan  0
+¶àÔª»¯ duo yuan hua  0
 ¶àÔ¶ duo yuan  0
 ¶àÓà duo yong  0
 ¶àÓÚ duo yu  0
 ¶àÓà duo yu  0
-¶àÔÛ duo zan  0
 ¶ãÔÚ duo zai  0
 ¶à×ì duo zui  0
 ¶àÆÕÀÕ duo pu le  0
@@ -6899,6 +6923,7 @@
 ·´Éä½Ç fan she jiao  0
 ·½°¸ fang an  0
 ·½·¨ fang fa  0
+·Â·ð fang fu  0
 ·½Ãæ fang mian  0
 ·½Ê½ fang shi  0
 ·½Ê¿ fang shi  0
@@ -7310,7 +7335,7 @@
 ·ÛÌõ fen tiao  0
 ·Ö̯ fen tan  0
 ·Ó̪ fen tai  0
-·Ü·¢Í¼Ç¿ fen fa tu jiang  0
+·Ü·¢Í¼Ç¿ fen fa tu qiang  0
 ·ÖÊÖ fen shou  0
 ·ÖÉè fen she  0
 ·Öʽ fen shi  0
@@ -7533,6 +7558,9 @@
 ·ëÃÎÁú feng meng long  0
 ·ëÑ©·å feng xue feng  0
 ·ëÌØ feng te  0
+·ð½Ì fo jiao  0
+·ðÃÅÊ¥µØ fo men sheng di  0
+·ð·¨ fo fa  0
 ·ñÔò fou ze  0
 ·ñ¶¨ fou ding  0
 ·ñ¾ö fou jue  0
@@ -7644,7 +7672,7 @@
 ¸¶³ö fu chu  0
 ¸©½Ç fu jiao  0
 ¸±½« fu jiang  0
-¸»Ç¿ fu jiang  0
+¸»Ç¿ fu qiang  0
 ·ü»÷ fu ji  0
 ¸º¼« fu ji  0
 ¸£½¨ fu jian  0
@@ -7954,6 +7982,7 @@
 ¸Ë¾ú gan jun  0
 ¸Ì½Û gan ju  0
 ¸ÌéÙ gan ju  0
+¸Ð¾õ gan jue  0
 ¸Ê½á gan jie  0
 ¸É¾» gan jing  0
 ¸Ð¿¹ gan kang  0
@@ -8082,7 +8111,7 @@
 ¸Õë gang mao  0
 ¸ÙÄ¿ gang mu  0
 ¸ÖÅ÷ gang pi  0
-¸ÕÇ¿ gang jiang  0
+¸ÕÇ¿ gang qiang  0
 ¸ÖÇ¥ gang qian  0
 ¸ÖÇÙ gang qin  0
 ¸ÖË¿ gang si  0
@@ -8198,7 +8227,7 @@
 ¸ßÅÊ gao pan  0
 ¸ßƵ gao pin  0
 ¸ßƽ gao ping  0
-¸ßÇ¿ gao jiang  0
+¸ßÇ¿ gao qiang  0
 ¸ßÇò gao qiu  0
 ¸ãÇå gao qing  0
 ¸ßÈÈ gao re  0
@@ -8249,7 +8278,7 @@
 ¸ßÁëÍÁ gao ling tu  0
 ¸ßÁëʯ gao ling shi  0
 ¸ßÃÌËá¼Ø gao meng suan jia  0
-¸ßÇ¿¶È gao jiang du  0
+¸ßÇ¿¶È gao qiang du  0
 ¸ßËÙ¸Ö gao su gang  0
 ¸ß̼¸Ö gao tan gang  0
 ¸ßÉäÅÚ gao she pao  0
@@ -9285,6 +9314,7 @@
 ¹âÄÜ guang neng  0
 ¹ãÄÏ guang nan  0
 ¹âÄê guang nian  0
+¹âÅÌ guang pan  0
 ¹âÆ× guang pu  0
 ¹âÆø guang qi  0
 ¹âȦ guang quan  0
@@ -9297,10 +9327,9 @@
 ¹âÊø guang shu  0
 ¹âÖá guang zhou  0
 ¹ãÖÝ guang zhou  0
-¹âÖÝ guang zhou  0
 ¹âÕÕ guang zhao  0
-¹âÎä guang wu  0
 ¹ãΪ guang wei  0
+¹ãΪÁô´« guang wei liu chuan  0
 ¹ã¶«Ê¡ guang dong sheng  0
 ¹ãÎ÷ guang xi  0
 ¹âÏß guang xian  0
@@ -9336,7 +9365,6 @@
 ¹âÈÙ°ñ guang rong bang  0
 ¹ãÎ÷׳×å guang xi zhuang zu  0
 ë×°±Ëá guang an suan  0
-¹âɽ guang shan  0
 ¹âÈÙ¸ïÃü guang rong ge ming  0
 ¹æ¶¨ gui ding  0
 ¹æ»® gui hua  0
@@ -9480,7 +9508,6 @@
 ¹ú·À¾ü guo fang jun  0
 ¹ú·ÀÁ¦Á¿ guo fang li liang  0
 ¹ú·ÀίԱ»á guo fang wei yuan hui  0
-¹ý¹²Îö¸Ö guo gong xi gang  0
 ¹ú»áÖÆ guo hui zhi  0
 ¹ú²ú»¯ guo chan hua  0
 ¹ú¼Ò±¨ guo jia bao  0
@@ -9766,6 +9793,7 @@
 º£Ãà hai mian  0
 º£Ãæ hai mian  0
 º£ÄÏ hai nan  0
+º£ÄÏÊ¡ hai nan sheng 0
 º¤ÄÊ hai nai  0
 º£Äù hai nie  0
 º£ÄÚ hai nei  0
@@ -9802,31 +9830,30 @@
 º£Ñà hai yan  0
 »¹Òª hai yao  0
 º£Ô± hai yuan  0
-»¹Ô­ hai yuan  0
+»¹Ô­ huan yuan  0
 º£ÔË hai yun  0
 º£Óò hai yu  0
-»¹Ó¦ hai ying  0
 º¢×Ó hai zi  0
 º£Ôå hai zao  0
 »¹ÔÚ hai zai  0
 º£Äϵº hai nan dao  0
 º£Æ½Ãæ hai ping mian  0
-»¹±¾ hai ben  0
-»¹¸ø hai gei  0
-»¹»÷ hai ji  0
-»¹Çå hai qing  0
-»¹Ë× hai su  0
+»¹±¾ huan ben  0
+»¹¸ø huan gei  0
+»¹»÷ huan ji  0
+»¹Çå huan qing  0
+»¹Ë× huan su  0
 º§ÈËÌýÎÅ hai ren ting wen  0
-»¹ÊÖ hai shou  0
-»¹Õ® hai zhai  0
+»¹ÊÖ huan shou  0
+»¹Õ® huan zhai  0
 º£ÊÂÖٲà hai shi zhong cai  0
 º£ÉÏÔËÊä hai shang yun shu  0
 º£ÍõÐÇ hai wang xing  0
-»¹ÏçÍÅ hai xiang tuan  0
-»¹Ô­¼Á hai yuan ji  0
+»¹ÏçÍÅ huan xiang tuan  0
+»¹Ô­¼Á huan yuan ji  0
 º£ÑóȨ hai yang quan  0
-»¹Ô­È¾ÁÏ hai yuan ran liao  0
-»¹Ô­ÈÛÁ¶ hai yuan rong lian  0
+»¹Ô­È¾ÁÏ huan yuan ran liao  0
+»¹Ô­ÈÛÁ¶ huan yuan rong lian  0
 º¢×ÓÆø hai zi qi  0
 º£µíÇø hai dian qu  0
 º£¹Ø×ÜÊð hai guan zong shu  0
@@ -10014,7 +10041,7 @@
 ºÁë hao mao  0
 ºÀÂõ hao mai  0
 ºÃÆÀ hao ping  0
-ºÀÇ¿ hao jiang  0
+ºÀÇ¿ hao qiang  0
 ºÃÇò hao qiu  0
 ºÀÇé hao qing  0
 ºÃÈË hao ren  0
@@ -10351,7 +10378,7 @@
 ºÜÂý hen man  0
 ºÜÄÑ hen nan  0
 ºÜÆÆ hen po  0
-ºÜÇ¿ hen jiang  0
+ºÜÇ¿ hen qiang  0
 ºÞ͸ hen tou  0
 ºÜÊÜ hen shou  0
 ºÜÉî hen shen  0
@@ -11592,6 +11619,7 @@
 ¼Ä´æ ji cun  0
 ¼±´Ù ji cu  0
 ¼«´ó ji da  0
+»÷´ò ji da  0
 »þ¶· ji dou  0
 ¼±µÄ ji de  0
 ¼ÇµÃ ji de  0
@@ -11676,11 +11704,12 @@
 »ù´¡ ji chu  0
 ¼Æ½Ï ji jiao  0
 ¼´½« ji jiang  0
-¼«Ç¿ ji jiang  0
+¼«Ç¿ ji qiang  0
+¼¼»÷ ji ji  0
 »ù¼« ji ji  0
 »ý¼« ji ji  0
-¼¸¼¸ ji ji  0
 ßóßó ji ji  0
+ßóßóÍáÍá ji ji wai wai  0
 »÷¼ü ji jian  0
 »÷½£ ji jian  0
 »ù½¨ ji jian  0
@@ -11703,6 +11732,7 @@
 »ú¾¯ ji jing  0
 ¼´¾° ji jing  0
 ¼Å¾² ji jing  0
+»ù´¡½¨Éè ji chu jian she  0
 »ù´¡¿Î ji chu ke  0
 ¼´¿É ji ke  0
 ¼´¿Ì ji ke  0
@@ -11712,6 +11742,7 @@
 ¼²¿à ji ku  0
 »÷À£ ji kui  0
 »ù´¡¿Æѧ ji chu ke xue  0
+¼«ÀÖ ji le  0
 ¼«ÁË ji le  0
 ¼¹Áº ji liang  0
 ¼ÁÁ¿ ji liang  0
@@ -11721,6 +11752,7 @@
 ¼«Á¦ ji li  0
 »ù´¡ÀíÂÛ ji chu li lun  0
 ¼ªÁÖ ji lin  0
+¼¦Áý ji long  0
 »÷Âä ji luo  0
 ¼¬ÂÖ ji lun  0
 ¼¤Á÷ ji liu  0
@@ -11845,7 +11877,6 @@
 ¼¬×¦ ji zhua  0
 »ýÎÂ ji wen  0
 ¼¸Íò ji wan  0
-¼ÌÎä ji wu  0
 ¼¥Ð¦ ji xiao  0
 ¼«Ð¡ ji xiao  0
 ¼£Ïó ji xiang  0
@@ -12096,7 +12127,7 @@
 ¼×³æ jia chong  0
 ¼Ð½Ç jia jiao  0
 ¼Î½± jia jiang  0
-¼ÓÇ¿ jia jiang  0
+¼ÓÇ¿ jia qiang  0
 ¼Ð»÷ jia ji  0
 ¼Ó¼± jia ji  0
 ¼×»ù jia ji  0
@@ -12327,7 +12358,7 @@
 ¼ôë»ú jian mao ji  0
 ½¨½» jian jiao  0
 ½¡½« jian jiang  0
-¼áÇ¿ jian jiang  0
+¼áÇ¿ jian qiang  0
 ¼ò¼Ç jian ji  0
 ½¥½¥ jian jian  0
 ê§ê§ jian jian  0
@@ -12449,6 +12480,10 @@
 ¼ìÐÞ jian xiu  0
 ¼éÐÛ jian xiong  0
 ¼ôÏÂ jian xia  0
+½£¿Í jian ke  0
+½£·¨ jian fa  0
+½£ÕÐ jian zhao  0
+½£Æ× jian pu  0
 ½£ÏÀ jian xia  0
 ¼äЪ jian xie  0
 ¼òд jian xie  0
@@ -12505,7 +12540,7 @@
 ¼ø¶¨»á jian ding hui  0
 ¼û¶àʶ¹ã jian duo shi guang  0
 ¼á¹ÌÄÍÓà jian gu nai yong  0
-¼áÇ¿²»Çü jian jiang bu qu  0
+¼áÇ¿²»Çü jian qiang bu qu  0
 ¼æÈÝÐÔ jian rong xing  0
 ¼ûÒåÓÂΪ jian yi yong wei  0
 ¼áÀÎ¶È jian lao du  0
@@ -12520,7 +12555,7 @@
 ½«´Ó jiang cong  0
 ôø¶¹ jiang dou  0
 ½²µ½ jiang dao  0
-Ç¿µÁ jiang dao  0
+Ç¿µÁ qiang dao  0
 ½­¶« jiang dong  0
 ½«¶Ô jiang dui  0
 ½±·£ jiang fa  0
@@ -12528,20 +12563,20 @@
 ½²¸å jiang gao  0
 ½¬¹û jiang guo  0
 ½²¹ý jiang guo  0
-Ç¿¹ú jiang guo  0
+Ç¿¹ú qiang guo  0
 ½«¹Ù jiang guan  0
 ½«¸ø jiang gei  0
 ½­ºÓ jiang he  0
 ½²ºÍ jiang he  0
 ½­ºº jiang han  0
-Ç¿º· jiang han  0
+Ç¿º· qiang han  0
 ½¬ºý jiang hu  0
 ½­ºþ jiang hu  0
 ½«»á jiang hui  0
 ½©»¯ jiang hua  0
 ½­»ª jiang hua  0
 ½²»° jiang hua  0
-Ç¿»¯ jiang hua  0
+Ç¿»¯ qiang hua  0
 ½«ºÚ jiang hei  0
 ½±³Í jiang cheng  0
 ½®³¡ jiang chang  0
@@ -12555,7 +12590,7 @@
 ½©¾Ö jiang ju  0
 ½¯¼Ò jiang jia  0
 ½²¼Û jiang jia  0
-Ç¿¼Ó jiang jia  0
+Ç¿¼Ó qiang jia  0
 ½®½ç jiang jie  0
 ½²½â jiang jie  0
 ½²¿Î jiang ke  0
@@ -12564,7 +12599,7 @@
 ½²ÁË jiang le  0
 ½±Àø jiang li  0
 ½²Àí jiang li  0
-Ç¿Á¦ jiang li  0
+Ç¿Á¦ qiang li  0
 ½«À´ jiang lai  0
 ½«Áì jiang ling  0
 ½­Áê jiang ling  0
@@ -12575,13 +12610,13 @@
 ½­ÄÏ jiang nan  0
 ½­Äþ jiang ning  0
 ½±ÅÆ jiang pai  0
-Ç¿ÅÄ jiang pai  0
+Ç¿ÅÄ qiang pai  0
 ½±Æ· jiang pin  0
 ½¬ÆÉ jiang po  0
-Ç¿ÆÈ jiang po  0
+Ç¿ÆÈ qiang po  0
 ½²ÆÀ jiang ping  0
 ½²Çó jiang qiu  0
-Ç¿Çó jiang qiu  0
+Ç¿Çó qiang qiu  0
 ½³ÈË jiang ren  0
 ½©ËÀ jiang si  0
 ½­ËÕ jiang su  0
@@ -12595,7 +12630,7 @@
 ½±ÊÛ jiang shou  0
 ½²ÊÚ jiang shou  0
 çÖÉþ jiang sheng  0
-Ç¿Ê¢ jiang sheng  0
+Ç¿Ê¢ qiang sheng  0
 ½­ÉÏ jiang shang  0
 ½±ÉÍ jiang shang  0
 ½©Ê¬ jiang shi  0
@@ -12604,13 +12639,13 @@
 ½«ÊÇ jiang shi  0
 ½²Ê¦ jiang shi  0
 ½²Ê· jiang shi  0
-ǿʹ jiang shi  0
+ǿʹ qiang shi  0
 ½­É½ jiang shan  0
 ½²Êö jiang shu  0
 ½«Ë§ jiang shuai  0
 ½­ÖÝ jiang zhou  0
 ½±×´ jiang zhuang  0
-ǿ׳ jiang zhuang  0
+ǿ׳ qiang zhuang  0
 ½±ÕÂ jiang zhang  0
 ½²Îä jiang wu  0
 ½­Î÷ jiang xi  0
@@ -12628,35 +12663,35 @@
 ½­Òõ jiang yin  0
 ½®Óò jiang yu  0
 ½©Ó² jiang ying  0
-Ç¿Ó² jiang ying  0
+Ç¿Ó² qiang ying  0
 ½«ÔÚ jiang zai  0
 ½²×ù jiang zuo  0
-Ç¿×÷ jiang zuo  0
+Ç¿×÷ qiang zuo  0
 ½¯½éʯ jiang jie shi  0
 ½­Î÷Ê¡ jiang xi sheng  0
 ½­ÔóÃñ jiang ze min  0
-Ç¿±© jiang bao  0
-Ç¿´ó jiang da  0
-Ç¿µç jiang dian  0
-Ç¿¶È jiang du  0
-Ç¿¶É jiang du  0
-Ç¿·ç jiang feng  0
-Ç¿¹Ì jiang gu  0
-Ç¿¼é jiang jian  0
-Ç¿¼î jiang jian  0
-Ç¿½¡ jiang jian  0
-Ç¿¶È¼«ÏÞ jiang du ji xian  0
-Ç¿ÁÒ jiang lie  0
-ǿȨ jiang quan  0
-Ç¿Èõ jiang ruo  0
-Ç¿Ëá jiang suan  0
-Ç¿Õß jiang zhe  0
-Ç¿ÖÆ jiang zhi  0
-Ç¿Õ¼ jiang zhan  0
-Ç¿ÐÐ jiang xing  0
-Ç¿¼ÓÓÚ jiang jia yu  0
-Ç¿¼ÓÓÚÈË jiang jia yu ren  0
-Ç¿ÓÐÁ¦ jiang you li  0
+Ç¿±© qiang bao  0
+Ç¿´ó qiang da  0
+Ç¿µç qiang dian  0
+Ç¿¶È qiang du  0
+Ç¿¶É qiang du  0
+Ç¿·ç qiang feng  0
+Ç¿¹Ì qiang gu  0
+Ç¿¼é qiang jian  0
+Ç¿¼î qiang jian  0
+Ç¿½¡ qiang jian  0
+Ç¿¶È¼«ÏÞ qiang du ji xian  0
+Ç¿ÁÒ qiang lie  0
+ǿȨ qiang quan  0
+Ç¿Èõ qiang ruo  0
+Ç¿Ëá qiang suan  0
+Ç¿Õß qiang zhe  0
+Ç¿ÖÆ qiang zhi  0
+Ç¿Õ¼ qiang zhan  0
+Ç¿ÐÐ qiang xing  0
+Ç¿¼ÓÓÚ qiang jia yu  0
+Ç¿¼ÓÓÚÈË qiang jia yu ren  0
+Ç¿ÓÐÁ¦ qiang you li  0
 ½«¼Æ¾Í¼Æ jiang ji jiu ji  0
 ½±ÇÚ·£ÀÁ jiang qin fa lan  0
 ½­ËÕÊ¡ jiang su sheng  0
@@ -12785,7 +12820,7 @@
 ½ºÆ¬ jiao pian  0
 ½»Åä jiao pei  0
 ½Éǹ jiao qiang  0
-½ÏÇ¿ jiao jiang  0
+½ÏÇ¿ jiao qiang  0
 ½¿ÆÞ jiao qi  0
 ½¿Æø jiao qi  0
 ½Ïdz jiao qian  0
@@ -12800,6 +12835,7 @@
 ½»ÈÚ jiao rong  0
 ½ºÈé jiao ru  0
 ½ÇÉ« jiao se  0
+½ÇÉ« jue se  0
 ½ÊË÷ jiao suo  0
 ½ÌËô jiao suo  0
 ½ÍËØ jiao su  0
@@ -12863,13 +12899,13 @@
 ½»Òê jiao yi  0
 ½ÌÒå jiao yi  0
 ½ÅÓ¡ jiao yin  0
+½ºÓ¡ jiao yin  0
 ½ÌÔ± jiao yuan  0
 ½ÌÓý jiao yu  0
 ½È×Ó jiao zi  0
 ½Î×Ó jiao zi  0
 ½¹×÷ jiao zuo  0
 ½Ð×ö jiao zuo  0
-½¹´ï·å jiao da feng  0
 ½Ìµ¼Ô± jiao dao yuan  0
 ½ººÏ°å jiao he ban  0
 ½»»á·¨ jiao hui fa  0
@@ -12934,6 +12970,7 @@
 ½â·ÅÕ½Õù jie fang zhan zheng  0
 ½â·ÅÔ˶¯ jie fang yun dong  0
 ½Ò¸Í¶øÆð jie gan er qi  0
+½Õ¸Ë jie gan  0
 ½á¹¹¸Ö jie gou gang  0
 ½á¹¹Ê½ jie gou shi  0
 ½á¹ûÖ¦ jie guo zhi  0
@@ -13754,9 +13791,9 @@
 ¾ÍÈà jiu rang  0
 ¾ÉÈÕ jiu ri  0
 ¾ÍËã jiu suan  0
+¾ÅÈýѧÉç jiu san xue she  0
 ¾ÅÌì jiu tian  0
 ¾ÈÉú jiu sheng  0
-¾ÉÉú jiu sheng  0
 ¾ÅÊ® jiu shi  0
 ¾ÉÊ« jiu shi  0
 ¾Éʱ jiu shi  0
@@ -13767,6 +13804,7 @@
 ¾ÉÊé jiu shu  0
 ¾ÅÖÝ jiu zhou  0
 ¾ÀÕý jiu zheng  0
+¾À´í jiu cuo  0
 ¾ÍÕý jiu zheng  0
 ¾ÅÕ jiu zhang  0
 ¾ÈÖÎ jiu zhi  0
@@ -13822,6 +13860,7 @@
 ¾Û±½ÒÒÏ© ju ben yi xi  0
 ¾Ö´Ù²»°² ju cu bu an  0
 ¾Ó¸ßÁÙÏ ju gao lin xia  0
+¾Ù¹ú»¶Çì ju guo huan qing  0
 ¾Ù¹úÉÏÏÂ ju guo shang xia  0
 ¾ÛºÏ·´Ó¦ ju he fan ying  0
 ¾ÛºÏÎï ju he wu  0
@@ -13921,6 +13960,7 @@
 ¾ÖÍâ ju wai  0
 ¾ÙÊÀÎÅÃû ju shi wen ming  0
 ¾Öί ju wei  0
+¾Óί»á ju wei hui  0
 ¾ÝϤ ju xi  0
 ¾ÖÏÞ ju xian  0
 ¾ÓÐÄ ju xin  0
@@ -13983,6 +14023,8 @@
 ¾ø±Ú jue bi  0
 ¾ö²» jue bu  0
 ¾ö²ß jue ce  0
+¾õµÃ jue de  0
+¾õÐÑ jue xing  0
 ¾ö¶· jue dou  0
 ¾øµØ jue di  0
 ¾ö¶Ï jue duan  0
@@ -14157,6 +14199,7 @@
 ¿­¶÷˹ kai en si  0
 ¿ª·Åµç· kai fang dian lu  0
 ¿ª·Å¸ã»î kai fang gao huo  0
+¿ª·ÅÔ´´úÂë kai fang yuan dai ma  0
 ¿ª»¨½á¹û kai hua jie guo  0
 ¿ª»¨ÆÚ kai hua qi  0
 ¿ª³Ï²¼¹« kai cheng bu gong  0
@@ -14241,6 +14284,8 @@
 ¿ªÑÛ kai yan  0
 ¿ªÔª kai yuan  0
 ¿ªÔ¶ kai yuan  0
+¿ªÔ´ kai yuan  0
+¿ªÔ´Èí¼þ kai yuan ruan jian  0
 ¿ªÃÅ°ìѧ kai men ban xue  0
 ¿ªÄ»´Ê kai mu ci  0
 ¿ªÃÞ»ú kai mian ji  0
@@ -14345,12 +14390,12 @@
 ¿¹Óù kang yu  0
 ¿¹¾úËØ kang jun su  0
 ¿¶¿®¼¤°º kang kai ji ang  0
-¿¹À­Ç¿¶È kang la jiang du  0
+¿¹À­Ç¿¶È kang la qiang du  0
 ¿¹ÄæÐÔ kang ni xing  0
 ¿¹ÈÕÕ½Õù kang ri zhan zheng  0
 ¿µ×¯´óµÀ kang zhuang da dao  0
-¿¹ÕÅÇ¿¶È kang zhang jiang du  0
-¿¹Ñ¹Ç¿¶È kang ya jiang du  0
+¿¹ÕÅÇ¿¶È kang zhang qiang du  0
+¿¹Ñ¹Ç¿¶È kang ya qiang du  0
 ¿µÓÐΪ kang you wei  0
 ¿¿²»×¡ kao bu zhu  0
 ¿¼´Ä»ù kao ci ji  0
@@ -14931,6 +14976,7 @@
 À©¾ü kuo jun  0
 À©¿× kuo kong  0
 À«Æø kuo qi  0
+À©ÈÝ kuo rong  0
 À©É¢ kuo san  0
 À©ÕÅ kuo zhang  0
 À©Õ¹ kuo zhan  0
@@ -15130,7 +15176,7 @@
 ÀͶ¯Ä£·¶ lao dong mo fan  0
 ÀÏ´óÄÑ lao da nan  0
 ÀÏ´óÄï lao da niang  0
-ÀͶ¯Ç¿¶È lao dong jiang du  0
+ÀͶ¯Ç¿¶È lao dong qiang du  0
 ÀͶ¯ÈºÖÚ lao dong qun zhong  0
 ÀͶ¯ÈÕ lao dong ri  0
 ÀͶ¯ÈËÃñ lao dong ren min  0
@@ -15704,6 +15750,7 @@
 Á®¼Û lian jia  0
 Á³¼Õ lian jia  0
 Áª½Ó lian jie  0
+Á´½Ó lian jie  0
 Áª½á lian jie  0
 Á¬½Ó lian jie  0
 Á®½à lian jie  0
@@ -15963,7 +16010,7 @@
 ÁÒÅ® lie nv  0
 ÁÐÄþ lie ning  0
 焮 lie pian  0
-ÁÐÇ¿ lie jiang  0
+ÁÐÇ¿ lie qiang  0
 ÁÔǹ lie qiang  0
 ÁÔÈ® lie quan  0
 ÁÔÈ¡ lie qu  0
@@ -16392,6 +16439,7 @@
 ᱐ lu biao  0
 ¬±È lu bi  0
 ³°à lu ban  0
+³°à½± lu ban jiang  0
 ¶°× lu bai  0
 ᱧ lu bian  0
 ¬²¼ lu bu  0
@@ -16812,6 +16860,7 @@
 ÂéÏß ma xian  0
 ÂéÓÍ ma you  0
 ÂìÒÏ ma yi  0
+Âì»È ma huang  0
 ÂéÒ© ma yao  0
 Âé×Ó ma zi  0
 Âí×Ó ma zi  0
@@ -17356,10 +17405,10 @@
 ÃæÄ¿ mian mu  0
 ÃâƱ mian piao  0
 ÃæƱ mian piao  0
-ÃãÇ¿ mian jiang  0
+ÃãÇ¿ mian qiang  0
 Ãæǽ mian qiang  0
 ÃæÇ° mian qian  0
-ÃãÃãÇ¿Ç¿ mian mian jiang jiang  0
+ÃãÃãÇ¿Ç¿ mian mian qiang qiang  0
 ÃâÈ¥ mian qu  0
 ÃæÈË mian ren  0
 ÃæÈÝ mian rong  0
@@ -17761,7 +17810,7 @@
 ijÊ mou shi  0
 ijÖÖ mou zhong  0
 ijÏî mou xiang  0
-Ä¿µÄ mu de  0
+Ä¿µÄ mu di  0
 Ä¿Ç° mu qian  0
 IJȡ mu qu  0
 ÄÁÇø mu qu  0
@@ -18092,6 +18141,7 @@
 ÄÔÖ­ nao zhi  0
 ÄÖÖÓ nao zhong  0
 ÄÓÑ÷ nao yang  0
+ÄÓÑ÷Ñ÷ nao yang yang  0
 ÄÔÑ× nao yan  0
 ÄÔ×Ó nao zi  0
 ÄÔÁ¦ÀͶ¯ nao li lao dong  0
@@ -18110,7 +18160,6 @@
 ÄÚ½ÓÔ² nei jie yuan  0
 ÄÚÂÞ±Ï nei luo bi  0
 ÄÚĦ²Á nei mo ca  0
-ÄÚÃɹŠnei meng gu  0
 ÄÚÇÐÔ² nei qie yuan  0
 ÄÚÈݺÍÐÎʽ nei rong he xing shi  0
 ÄÚȼ»ú nei ran ji  0
@@ -18118,7 +18167,6 @@
 ÄÚÎñ²¿ nei wu bu  0
 ÄÚÎñ¸® nei wu fu  0
 ÄÚÍâ½»À§ nei wai jiao kun  0
-ÄÚÍâõÓÀ§ nei wai jiao kun  0
 ÄÚõ£°· nei xian an  0
 ÄÚÐÄÊÀ½ç nei xin shi jie  0
 ÄÚÓ¦Á¦ nei ying li  0
@@ -18128,6 +18176,7 @@
 ÄÚ·þ nei fu  0
 ÄÚ¸ó nei ge  0
 ÄÚºÓ nei he  0
+ÄÚºË nei he  0
 ÄÚÐÐ nei xing  0
 ÄÚº¬ nei han  0
 ÄÚº­ nei han  0
@@ -18146,6 +18195,7 @@
 ÄÚ¾ nei lu  0
 ÄÚÂë nei ma  0
 ÄÚÃÉ nei meng  0
+ÄÚÃɹŠnei meng gu  0
 ÄÚÄ» nei mu  0
 ÄÚÄÜ nei neng  0
 ÄÚƤ nei pi  0
@@ -18285,7 +18335,7 @@
 Ä꼶 nian ji  0
 Äê¼Í nian ji  0
 ÄêÁä nian ling  0
-Ä긻Á¦Ç¿ nian fu li jiang  0
+Ä긻Á¦Ç¿ nian fu li qiang  0
 ð¤ºÏ¼Á nian he ji  0
 Äê²úÁ¿ nian chan liang  0
 ÄêÁäÌØÕ÷ nian ling te zheng  0
@@ -18979,7 +19029,7 @@
 Æ¢Ôà pi zang  0
 Ƥ×Ó pi zi  0
 Æ£Àͼ«ÏÞ pi lao ji xian  0
-Æ£ÀÍÇ¿¶È pi lao jiang du  0
+Æ£ÀÍÇ¿¶È pi lao qiang du  0
 ÅúÁ¿Éú²ú pi liang sheng chan  0
 ÅúÅÐµØ pi pan di  0
 ÅúÆÀ¼Ò pi ping jia  0
@@ -19339,6 +19389,7 @@
 ÆÐÈø pu sa  0
 ÆÓËØ pu su  0
 ÆÕÌØ pu te  0
+ÆÕÌìͬÇì pu tian tong qing  0
 ÆÏÌÇ pu tang  0
 ÆÏÌÑ pu tao  0
 ÆÓʵ pu shi  0
@@ -19352,6 +19403,7 @@
 ÆÕÏ£½ð pu xi jin  0
 ÆÕÆÕͨͨ pu pu tong tong  0
 ÆÓËØΨÎïÖ÷Òå pu su wei wu zhu yi  0
+Ææ¹Ö qi guai  0
 Æä´Î qi ci  0
 ÆÚ¼ä qi jian  0
 Æä¼ä qi jian  0
@@ -19562,6 +19614,7 @@
 ÆßÒ» qi yi  0
 ÆäÒ» qi yi  0
 ÆðÒå qi yi  0
+ÆæÒì qi yi  0
 ÆøÑæ qi yan  0
 ÆßÒô qi yin  0
 ÆðÒò qi yin  0
@@ -19714,7 +19767,7 @@
 Ç°Äê qian nian  0
 Ç°ÅÅ qian pai  0
 Ç°ÇÅ qian qiao  0
-ǣǿ qian jiang  0
+ǣǿ qian qiang  0
 Ç°ÆÚ qian qi  0
 dzdz qian qian  0
 Ç°ÇØ qian qin  0
@@ -21110,22 +21163,25 @@
 Èí¹Ü ruan guan  0
 Èí¹¦ ruan gong  0
 Èí¹Ç ruan gu  0
+Èí¹ÇÍ· ruan gu tou 0
 Èí»¯ ruan hua  0
 Èí¼þ ruan jian  0
 Èíľ ruan mu  0
 ÈíÅÌ ruan pan  0
+ÈíÇý ruan qu  0
 ÈíÈõ ruan ruo  0
 ÈíË® ruan shui  0
 ÈíÈõÐÔ ruan ruo xing  0
 ÈíÓ² ruan ying  0
+ÈíÓ²²»³Ô ruan ying bu chi  0
 ÈíÌ嶯Îï ruan ti dong wu  0
 ÈíÖ¬Ëá ruan zhi suan  0
 ÈíÓ²¼æÊ© ruan ying jian shi  0
 Èí¼þ°ü ruan jian bao  0
+Èñ½Ç rui jiao  0
 Èñ½ÇÈý½ÇÐÎ rui jiao san jiao xing  0
 Èðµä rui dian  0
 Èð³Î rui cheng  0
-Èñ½Ç rui jiao  0
 Èð½ð rui jin  0
 ÈðÀû rui li  0
 ÈñÀû rui li  0
@@ -22600,7 +22656,7 @@
 ʦÄï shi niang  0
 ÊÆÄÜ shi neng  0
 ʹŮ shi nv  0
-Ê¿Å® shi nv  0
+ÊËÅ® shi nv  0
 ÊÌÅ® shi nv  0
 ÊÐÄÚ shi nei  0
 ÊÒÄÚ shi nei  0
@@ -23382,6 +23438,7 @@
 Ë®³ß shui chi  0
 Ë®²ú shui chan  0
 Ë®¼î shui jian  0
+˯¾õ shui jiao  0
 Ë°½ð shui jin  0
 Ë®¾ü shui jun  0
 Ë®½â shui jie  0
@@ -23396,6 +23453,7 @@
 Ë®Àä shui leng  0
 Ë®Àû shui li  0
 Ë®Á¦ shui li  0
+˯Á« shui lian  0
 Ë®Âä shui luo  0
 Ë®Á÷ shui liu  0
 ˮ· shui lu  0
@@ -24113,7 +24171,7 @@
 Ì«ÄÑ tai nan  0
 Ì¥ÅÌ tai pan  0
 ̫ƽ tai ping  0
-Ì«Ç¿ tai jiang  0
+Ì«Ç¿ tai qiang  0
 ̧Æð tai qi  0
 ̨ǰ tai qian  0
 ̨Çò tai qiu  0
@@ -24181,6 +24239,7 @@
 ̸µ½ tan dao  0
 ̽·Ã tan fang  0
 ̯·· tan fan  0
+µ¯ÛÀ tan he  0
 Ì¿»ð tan huo  0
 ̱»¾ tan huan  0
 Ì»»¤ tan hu  0
@@ -24334,6 +24393,8 @@
 Ìͳö tao chu  0
 ÌÒ½­ tao jiang  0
 Ì×¼ä tao jian  0
+Ì×¼þ tao jian  0
+Ì××° tao zhuang  0
 ÌÒÀî tao li  0
 Ì×· tao lu  0
 ÌÓÃü tao ming  0
@@ -24357,6 +24418,7 @@
 ÌÓÍö tao wang  0
 ÌÕÒ± tao ye  0
 ÌÓÒÝ tao yi  0
+ÌÕÒÕ tao yi  0
 ÌÖÑá tao yan  0
 Ì×Ó¡ tao yin  0
 ÌÒÔ´ tao yuan  0
@@ -24691,11 +24753,11 @@
 ÌììñµÛ tian zuo di  0
 ÌìÒÂÎÞ·ì tian yi wu feng  0
 ÌìÔÖÈË»ö tian zai ren huo  0
-Ìì°²ÃÅʼþ tian an men shi jian  0
 Ìì°²ÃŹ㳡 tian an men guang chang  0
 µ÷ÖÊ tiao zhi  0
 ÌõÖ§ tiao zhi  0
 µ÷Òô tiao yin  0
+µ÷Õû tiao zheng 0
 Ìõ¼þ tiao jian  0
 Ìô²¦Àë¼ä tiao bo li jian  0
 Ìõ°¸ tiao an  0
@@ -25162,6 +25224,7 @@
 ÍÁºÀÁÓÉð tu hao lie shen  0
 ͼ½â·¨ tu jie fa  0
 ͳ·¬ tu lu fan  0
+ͳ·¬ÅèµØ tu lu fan pen di  0
 ͹ÂÖÖá tu lun zhou  0
 ÍÁùËØ tu mei su  0
 Í»Äá˹ tu ni si  0
@@ -25259,7 +25322,6 @@
 ÍÁÎÂ tu wen  0
 ͻأ tu wu  0
 ͻΧ tu wei  0
-ͼΪ tu wei  0
 ͼÏñ tu xiang  0
 ͼÏó tu xiang  0
 ͻϮ tu xi  0
@@ -25268,12 +25330,10 @@
 ͽÐÌ tu xing  0
 ÍÁÐÔ tu xing  0
 ͼÑù tu yang  0
-ͼһ tu yi  0
 ͹Ե tu yuan  0
 ÍÃ×Ó tu zi  0
 ÍÀÔ× tu zai  0
 ÍÁ×å tu zu  0
-ͽ³¤Ö¦ tu chang zhi  0
 ÍÁÑó²¢¾Ù tu yang bing ju  0
 ÍÁÑó½áºÏ tu yang jie he  0
 ÍÀÔ׳¡ tu zai chang  0
@@ -25294,6 +25354,7 @@
 ÍÅÌå²Ù tuan ti cao  0
 ÍÅÌåÈü tuan ti sai  0
 ÍÅÖ§²¿ tuan zhi bu  0
+ÍÅÖ§Êé tuan zhi shu  0
 Í˳ö tui chu  0
 ÍƳö tui chu  0
 ÍÉ»¯±äÖÊ tui hua bian zhi  0
@@ -25518,7 +25579,6 @@
 Íâ¹ú wai guo  0
 Íâ¹Û wai guan  0
 Í⹫ wai gong  0
-ÍâÐÐ wai xing  0
 ÍâÐÎ wai xing  0
 ÍâºÅ wai hao  0
 Í⺣ wai hai  0
@@ -25540,11 +25600,13 @@
 ÍâÁ÷ wai liu  0
 Íâò wai mao  0
 Íâó wai mao  0
+ÍâÃɹŠwai meng gu  0
 ÍâÃæ wai mian  0
 ÍâÆÅ wai po  0
 ÍâÇÈ wai qiao  0
 ÍâÆÝ wai qi  0
 ÍâÆó wai qi  0
+ÍâÇÐÏß wai qie xian  0
 ÍâÇÚ wai qin  0
 ÍáÇú wai qu  0
 ÍâÈË wai ren  0
@@ -25646,7 +25708,7 @@
 ÍòÄê wan nian  0
 ÍæŪ wan nong  0
 ÍçƤ wan pi  0
-ÍçÇ¿ wan jiang  0
+ÍçÇ¿ wan qiang  0
 ÍíÆÚ wan qi  0
 Íòǧ wan qian  0
 ÍíÇï wan qiu  0
@@ -26009,6 +26071,7 @@
 ΡȻ wei ran  0
 δȻ wei ran  0
 ΧÈÆ wei rao  0
+΢Èí wei ruan  0
 ΢Èõ wei ruo  0
 ήËõ wei suo  0
 ηËõ wei suo  0
@@ -26241,6 +26304,7 @@
 Ý«Ý« wo wo  0
 ÎÒÏë wo xiang  0
 ÎÓÐý wo xuan  0
+ÎÐäö wo xuan  0
 ÎÒÔÚ wo zai  0
 ä×Ì«»ª wo tai hua  0
 ÎÔн³¢µ¨ wo xin chang dan  0
@@ -26387,6 +26451,7 @@
 ÎÚ»¸ wu huan  0
 Îغô wu hu  0
 Îߺþ wu hu  0
+ÎåºþËĺ£ wu hu si hai  0
 ÎÛ»à wu hui  0
 Îè»á wu hui  0
 Îó»á wu hui  0
@@ -26525,7 +26590,7 @@
 ÎÛË® wu shui  0
 ÎÞË® wu shui  0
 Îç˯ wu shui  0
-ÎÞÉÏ×° wu shang zhuang  0
+Îäѧ wu xue  0
 ÎàÖÝ wu zhou  0
 ÎåÖÞ wu zhou  0
 Îä×° wu zhuang  0
@@ -26813,6 +26878,7 @@
 Ϫˮ xi shui  0
 ä»Ë® xi shui  0
 Ï´Ë¢ xi shua  0
+ó¬ó° xi shuai  0
 Î÷ÖÜ xi zhou  0
 Î÷×° xi zhuang  0
 ϸÖ xi zhi  0
@@ -26843,6 +26909,7 @@
 ϦÑô xi yang  0
 Î÷Ò½ xi yi  0
 Ï´ÒÂ xi yi  0
+òáòæ xi yi  0
 ÎüÑÌ xi yan  0
 Î÷Ò© xi yao  0
 ÎüÒý xi yin  0
@@ -27013,6 +27080,7 @@
 ÏÁÒå xia yi  0
 ÏÂÓê xia yu  0
 ÏÂÓü xia yu  0
+ÏÂÔØ xia zai  0
 ÏÂ×ß xia zou  0
 Ϲ×Ó xia zi  0
 Ϻ×Ó xia zi  0
@@ -27545,6 +27613,7 @@
 ЦÁ³ xiao lian  0
 ЦÁÖ xiao lin  0
 Ïú· xiao lu  0
+ЧÂÊ xiao lv  0
 СÃ× xiao mi  0
 Сè xiao mao  0
 Сë xiao mao  0
@@ -28235,6 +28304,7 @@
 ÐßÀ¢ xiu kui  0
 ÐÞÀí xiu li  0
 ÐãÀö xiu li  0
+ÐÞÁ¶ xiu lian  0
 ÐÞ· xiu lu  0
 ÐÝÃß xiu mian  0
 ÐÝÚÓ xiu mo  0
@@ -28261,6 +28331,7 @@
 ÐÞÖþ xiu zhu  0
 ÐÝÏë xiu xiang  0
 ÐÝÏ¢ xiu xi  0
+ÐÞÏ° xiu xi  0
 ÐÝÏÐ xiu xian  0
 ÐÞÐÞ xiu xiu  0
 ÐÝѧ xiu xue  0
@@ -28412,7 +28483,6 @@
 Ðýת xuan zhuan  0
 Ñ¡ÖÐ xuan zhong  0
 Ñ¡ÖÖ xuan zhong  0
-ÐýÎÐ xuan wo  0
 äöÎÐ xuan wo  0
 ÐûÎä xuan wu  0
 ÐúÏù xuan xiao  0
@@ -28436,6 +28506,7 @@
 ѧϰ xue xi  0
 ѧϵ xue xi  0
 Ѫϴ xue xi  0
+ѧÎÞÖ¹¾³ xue wu zhi jing 0
 Ѧ±¦îÎ xue bao chai  0
 Ѧ¸£³É xue fu cheng  0
 Ѫºìµ°°× xue hong dan bai  0
@@ -28546,6 +28617,7 @@
 ѵÁ·°à xun lian ban  0
 Ѱ˼ xun si  0
 áß˽ xun si  0
+áß˽Îè±× xun si wu bi  0
 Ѳ²¶ xun bu  0
 ѵµ¼ xun dao  0
 Ñ°·Ã xun fang  0
@@ -28638,7 +28710,7 @@
 ÑÆÃÕ ya mi  0
 ѻƬ ya pian  0
 ѹÆÈ ya po  0
-ѹǿ ya jiang  0
+ѹǿ ya qiang  0
 ѹÆø ya qi  0
 ÑÇÈÈ ya re  0
 ÑÅÈË ya ren  0
@@ -28962,6 +29034,7 @@
 Ñî÷ yang mei  0
 ÑòƤ yang pi  0
 ÑùÆ· yang pin  0
+ÑóÆÖ½­ yang pu jiang  0
 Ñõ»¯Ç¦ yang hua qian  0
 ÑïÆú yang qi  0
 ÑõÆø yang qi  0
@@ -29082,7 +29155,7 @@
 Ò©³§ yao chang  0
 Òª³å yao chong  0
 Òª½« yao jiang  0
-Ҫǿ yao jiang  0
+Ҫǿ yao qiang  0
 Ñû¼¯ yao ji  0
 Ò©¼Á yao ji  0
 Òª¼þ yao jian  0
@@ -29271,7 +29344,6 @@
 Һѹ»ú ye ya ji  0
 Ò¹ÒÔ¼ÌÈÕ ye yi ji ri  0
 ҺѹÓÍ ye ya you  0
-Ò¶×ÚÁô ye zong liu  0
 Ò¶×ÓÑÌ ye zi yan  0
 ÒµÎñÁªÏµ ye wu lian xi  0
 һĿʮÐÐ yi mu shi hang  0
@@ -29484,6 +29556,7 @@
 ÒÅ½Ì yi jiao  0
 Òƽ» yi jiao  0
 Ò»¼ä yi jian  0
+Ò»¼þ yi jian  0
 Òâ¼û yi jian  0
 Ò¿½ð yi jin  0
 Ò½ó yi jin  0
@@ -29753,6 +29826,7 @@
 ÒâʶÐÎ̬ yi shi xing tai  0
 һʱһ¿Ì yi shi yi ke  0
 ÒÔÉí×÷Ôò yi shen zuo ze  0
+Ò»ÑÔΪ¶¨ yi yan wei ding  0
 ÒÖÖƼÁ yi zhi ji  0
 ÒÑÖªÊý yi zhi shu  0
 ÒÒÖÖάÉúËØ yi zhong wei sheng su  0
@@ -30518,6 +30592,7 @@
 ÓÐÊÑÎÞ¿Ö you shi wu kong  0
 ÓÅÉúѧ you sheng xue  0
 ÓÐÉùÓÐÉ« you sheng you se  0
+ÓÐÑÔÔÚÏÈ you yan zai xian  0
 ÓÊÕþ±àÂë you zheng bian ma  0
 ÓÅÖÊ¸Ö you zhi gang  0
 ÓÐÖ¾Æø you zhi qi  0
@@ -31475,7 +31550,7 @@
 Ôö¼Ó zeng jia  0
 ÔöÁ¿ zeng liang  0
 ÔùÆ· zeng pin  0
-ÔöÇ¿ zeng jiang  0
+ÔöÇ¿ zeng qiang  0
 ÔùËÍ zeng song  0
 ÔöÌí zeng tian  0
 ÔöÉè zeng she  0
@@ -31491,7 +31566,7 @@
 ÔöÔ® zeng yuan  0
 ÔùÓë zeng yu  0
 Ôö²ú½ÚÔ¼ zeng chan jie yue  0
-ÔöÇ¿ËÜÁÏ zeng jiang su liao  0
+ÔöÇ¿ËÜÁÏ zeng qiang su liao  0
 ÔöËܼÁ zeng su ji  0
 Ôö³¤ËÙ¶È zeng chang su du  0
 ÔöÑõ»ú zeng yang ji  0
@@ -31951,6 +32026,7 @@
 ÕæÕý zhen zheng  0
 Õò³¤ zhen chang  0
 ÕæÖª zhen zhi  0
+ÕæÖª×Ƽû zhen zhi zhuo jian  0
 ÕæÖ¿ zhen zhi  0
 ÕëÖ¯ zhen zhi  0
 ÕïÖÎ zhen zhi  0
@@ -32615,63 +32691,42 @@
 ÖªÃûÈËÊ¿ zhi ming ren shi  0
 ÖÃÖ®¶ÈÍâ zhi zhi du wai  0
 Öйú zhong guo  0
-ÖØ°æ zhong ban  0
-Öز¥ zhong bo  0
 Öв¨ zhong bo  0
-Öصþ zhong die  0
-ÖØ·ê zhong feng  0
 Öзæ zhong feng  0
 Öзç zhong feng  0
-ÖØ·µ zhong fan  0
 Öз¹ zhong fan  0
-Öظ´ zhong fu  0
 Öظº zhong fu  0
-ÖØºÏ zhong he  0
 ÖÐºÍ zhong he  0
 ÖØ»î zhong huo  0
-ÖØ»é zhong hun  0
-ÖØÖØ zhong zhong  0
 ÖÖÖÖ zhong zhong  0
 Öؽ± zhong jiang  0
 Öн« zhong jiang  0
-Öؽ¨ zhong jian  0
 Öмá zhong jian  0
 Öмä zhong jian  0
-ÖØÂë zhong ma  0
 ÖÖÂé zhong ma  0
 ÖÖÂí zhong ma  0
-ÖØÇì zhong qing  0
 ÖÐÇé zhong qing  0
 ÖÔÇé zhong qing  0
 ÖØÈË zhong ren  0
 ÖÐÈË zhong ren  0
 ÖØÈÎ zhong ren  0
 ÖÚÈË zhong ren  0
-ÖØÉê zhong shen  0
 ÖÕÉí zhong shen  0
 ÖÕÉó zhong shen  0
-ÖØÎÂ zhong wen  0
 ÖÐÎÄ zhong wen  0
-ÖØΧ zhong wei  0
 ÖÐί zhong wei  0
 ÖÐξ zhong wei  0
 ÖÐÎÀ zhong wei  0
-ÖØÏÖ zhong xian  0
 ÖÐÏß zhong xian  0
-ÖØÐÂ zhong xin  0
 ÖÐÐÄ zhong xin  0
 ÖÒÐÄ zhong xin  0
 ÖÒÐÅ zhong xin  0
 ÖÔÐÄ zhong xin  0
 ÖØÐÄ zhong xin  0
-ÖØÐÞ zhong xiu  0
-ÖØÑó zhong yang  0
 ÖÐÑë zhong yang  0
-ÖØÑÝ zhong yan  0
 ÖØÒô zhong yin  0
-ÖØÓ¡ zhong yin  0
 ÖØÔØ zhong zai  0
-ÖØÕûÆì¹Ä zhong zheng qi gu  0
+ÖØÕûÆì¹Ä chong zheng qi gu  0
 ÖвÝÒ© zhong cao yao  0
 Öж̲¨ zhong duan bo  0
 Öصª»¯ zhong dan hua  0
@@ -33001,6 +33056,7 @@
 Ö÷ÕÅ zhu zhang  0
 Ö÷ÈÎ zhu ren  0
 Ö÷ÈË zhu ren  0
+ÖìéF»ù zhu rong ji 0
 Ö÷¶¯È¨ zhu dong quan  0
 Ö÷¶¯Öá zhu dong zhou  0
 Öì¶ûµä zhu er dian  0
@@ -33025,6 +33081,7 @@
 Öý±Ò zhu bi  0
 Öñ°å zhu ban  0
 Ö÷°ì zhu ban  0
+Ö÷°å zhu ban  0
 Ö鱦 zhu bao  0
 Ö÷±à zhu bian  0
 Öð²½ zhu bu  0
@@ -33109,6 +33166,7 @@
 Öñ½Ú zhu jie  0
 ×¢½â zhu jie  0
 ס¾© zhu jing  0
+פ¾© zhu jing  0
 ס¿Ú zhu kou  0
 Öð¿Í zhu ke  0
 Ö÷¿Í zhu ke  0
@@ -33659,6 +33717,7 @@
 ×ÔÐò zi xu  0
 ×ÓÏÄ zi xia  0
 ×ÔÓÉ zi you  0
+×ÔÓÉÈí¼þ zi you ruan jian  0
 ×ÓÒ¶ zi ye  0
 ×ÓÒ¹ zi ye  0
 ×ÌÑø zi yang  0
@@ -34054,7 +34113,6 @@
 ×î×î zui zui  0
 ×îа汾 zui xin ban ben  0
 ×î¸ßÈËÃñ·¨Ôº zui gao ren min fa yuan  0
-×î´óƽ·ÉËÙ¶È zui da ping fei su du  0
 ×𳤠zun zhang  0
 ×ð±° zun bei  0
 ×ñ´Ó zun cong  0
diff -Nru jmce/jmce-0.37.spec jmce-0.37/jmce-0.37.spec
--- jmce/jmce-0.37.spec	Thu Jan  1 08:00:00 1970
+++ jmce-0.37/jmce-0.37.spec	Thu Nov  9 03:04:57 2000
@@ -0,0 +1,72 @@
+Summary: A Chinese Console System for Big5 display/input.
+Name: jmce
+Version: 0.37
+Release: 0903Y2K
+Copyright: GPL
+Group: Chinese/Terminals
+Packager: GNU/Linux Research Center, TsingHua Uni <linuxrat@gnuchina.org>
+Source: jmce-0.37.tar.gz
+BuildRoot: /tmp/jmce
+
+Summary(zh_CN.EUC): [ÖÐÎÄ] ÖÐÎÄ×Ö·ûÖÕ¶Ë
+Summary(zh_TW.Big5): [¤¤¤å] ¤¤¤å¦r²Å²×ºÝ
+
+%description
+This is a Chinese Console System for Big5 including some input-methods.
+Type 'jmce' to start it. Report bugs to the author of this version at:
+jauming@yahoo.com. For help in details , run 'man jmce'. Happy jmceing!
+
+%prep
+%setup -n jmce-0.37
+
+%build
+make prefix=/usr exec-prefix=/usr/bin RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+
+%install
+mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/usr/lib
+mkdir -p $RPM_BUILD_ROOT/usr/man/man1 
+make install TOPDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -fr $RPM_BUILD_ROOT
+
+%dir 
+/usr/bin
+/usr/lib/jmce
+/usr/man/man1
+
+%files
+/usr/bin/jmce
+/usr/lib/jmce/8x16.bin
+/usr/lib/jmce/array30.def
+/usr/lib/jmce/asx.def
+/usr/lib/jmce/bdf2bin
+/usr/lib/jmce/cin2tab
+/usr/lib/jmce/cj.def
+/usr/lib/jmce/gb16fs.bin
+/usr/lib/jmce/hku-ch16.bin
+/usr/lib/jmce/jmce.cfg
+/usr/lib/jmce/jmce.cfg.gb
+/usr/lib/jmce/kc16.bin
+/usr/lib/jmce/phone.def
+/usr/lib/jmce/pinyin.def
+/usr/lib/jmce/pinyin.map
+/usr/lib/jmce/pinyin.tab
+/usr/lib/jmce/pinyin.tab.lx
+/usr/lib/jmce/pinyin.tab.phr
+/usr/lib/jmce/sharefont
+/usr/lib/jmce/shuangpin.tab
+/usr/lib/jmce/shuangpin.tab.lx
+/usr/lib/jmce/shuangpin.tab.phr
+/usr/lib/jmce/sysphrase.tab
+/usr/lib/jmce/tab2cin
+/usr/lib/jmce/tab2txt
+/usr/lib/jmce/txt2tab
+/usr/lib/jmce/usrphrase.tab
+/usr/lib/jmce/wubi.tab
+/usr/lib/jmce/wubi.tab.lx
+/usr/lib/jmce/wubi.tab.phr
+/usr/lib/jmce/ziranma.tab
+/usr/lib/jmce/ziranma.tab.lx
+/usr/lib/jmce/ziranma.tab.phr
+/usr/man/man1/jmce.1
diff -Nru jmce/package.sh jmce-0.37/package.sh
--- jmce/package.sh	Thu Jan  1 08:00:00 1970
+++ jmce-0.37/package.sh	Thu Nov  9 02:40:02 2000
@@ -0,0 +1,104 @@
+#!/bin/bash
+# ********************************************************************
+# Script modified by Linuxrat<linuxrat@gnuchina.org> to make         
+# specific format package(s) easily. Modify it freely as you like. :)
+# ********************************************************************
+
+#Function to package tar.gz
+pkg.tgz() {
+	echo -n "Tar-packaging jmce-0.37..."
+	make clean
+	cd ..
+	rm -f jmce*.tar.gz
+	tar cvf jmce-0.37.tar jmce-0.37
+	echo -en "********************Wait while gzipping********************\n"
+	echo -en "** Gzipping "
+	gzip -v -9 jmce-0.37.tar
+	echo -en "*********************Gzipping got done*********************\n"
+	ls -l jmce-0.37.tar.gz
+	echo -en "*********************Got the file size?********************\n"
+	enjoy
+}
+
+#Function to package both rpm and srpm
+pkg.rpms() {
+	echo -en "SRPM/RPM-packaging jmce-0.37...\n"
+	rpm -ba jmce-0.37.spec
+	echo -en "\nGo /usr/src/redhat/{SRPMS}|{RPMS/i386} for your jmce-0.37\n"
+	enjoy
+}
+
+
+#Function to package rpm
+pkg.rpm() {
+	echo -en "RPM-packaging jmce-0.37...\n"
+	rpm -bb jmce-0.37.spec
+	echo -en "\nGo /usr/src/redhat/RPMS/i386/ for your jmce-0.37*rpm\n"
+	enjoy
+}
+
+#Function to package srpm
+pkg.srpm() {
+	echo -en "SRPM-packaging jmce-0.37...\n"
+	rpm -bs jmce-0.37.spec
+	echo -en "\nGo /usr/src/redhat/SRPMS/ for your jmce-0.37*srpm\n"
+	enjoy
+}
+
+#Function to package deb
+pkg.deb() {
+	echo -en "Not available yet. Help me please. :)\n"
+	enjoy
+}
+
+#Function for usage of this script
+usage() {
+	echo -en "\nUsage:  $0 {tgz|rpms|rpm|srpm|deb}\n\n"
+	echo -en "\t tgz:\t Make tar.gz format package(Needed).\n"
+	echo -en "\trpms:\t Make both SRPM & RPM format packages.(Needs tgz)\n"
+	echo -en "\t rpm:\t Make Binary RPM format package only.(Needs tgz)\n"
+	echo -en "\tsrpm:\t Make Source RPM format package only(Needs tgz.\n"
+	echo -en "\t deb:\t Make deb format package only(Not avaible yet).\n"
+	echo -en "\nNOTICE: To make RPMS, you must make tar.gz packge first!!!\n"
+	enjoy
+}
+
+enjoy() {
+	echo -en "\nEnjoy JMCE & CCE! Happy hacking FreeOS!\n\n"
+}
+
+case "$1" in
+  [tT][gG][zZ])
+	echo -en "\nReady to tar-package jmce-0.37...\n\n"
+	pkg.tgz
+	echo ""
+	;;
+
+  [rR][pP][mM][sS])
+	echo -en "\nReady to SRPM/RPM-package jmce-0.37...\n\n"
+	pkg.rpms
+	echo ""
+	;;
+
+  [rR][pP][mM])
+	echo -en "\nReady to RPM-package jmce-0.37...\n\n"
+	pkg.rpm
+	echo ""
+	;;
+
+  [sS][rR][pP][mM])
+	echo -en "\nReady to SRPM-package jmce-0.37...\n\n"
+	pkg.srpm
+	echo ""
+	;;
+
+  [dD][eE][bB])
+	echo -en "\nReady to DEB-packaging jmce-0.37...\n\n"
+	pkg.deb
+	echo ""
+	;;
+
+  *)
+	usage
+	exit 1
+esac
diff -Nru jmce/pkg jmce-0.37/pkg
--- jmce/pkg	Sat Aug 26 23:22:02 2000
+++ jmce-0.37/pkg	Thu Jan  1 08:00:00 1970
@@ -1,7 +0,0 @@
-#!/bin/sh
-make clean
-cd ..
-rm -f jmce*.tar.gz
-tar cvf jmce037.tar jmce
-gzip -9 jmce037.tar
-ls -l jmce037.tar.gz
diff -Nru jmce/src/Makefile jmce-0.37/src/Makefile
--- jmce/src/Makefile	Sat Aug 26 21:11:14 2000
+++ jmce-0.37/src/Makefile	Thu Nov  9 02:43:27 2000
@@ -15,17 +15,20 @@
 	$(CC) $(CFLAGS) -M *.c > .depend
 
 clean:
-	$(RM) -f *.o $(JMCE) *~ .depend core
+	$(RM) -f *.o $(JMCE) *~ *.bak .depend core tags
 
 install: $(JMCE)
 	$(INSTALL) -o root -g $(GROUP) -s -m 4755 $(JMCE) $(BINDIR)
 	$(INSTALL) -o root -g $(GROUP) -m 755 -d $(LIBDIR)
-	$(INSTALL) -o root -g $(GROUP) -m 644 $(JMCECFG) $(DESTDIR)/etc/$(JMCECFG)
+	$(INSTALL) -o root -g $(GROUP) -m 644 jmce.cfg.gb $(LIBDIR)/jmce.cfg.gb
+	$(INSTALL) -o root -g $(GROUP) -m 644 jmce.cfg $(LIBDIR)/jmce.cfg
 	$(INSTALL)  ../doc/jmce.1 $(MANDIR)
 
 uninstall:
 	rm -f $(BINDIR)/$(JMCE)
 	rm -f $(LIBDIR)/$(JMCECFG)
+	rm -f $(LIBDIR)/jmce.cfg.gb
+	rm -f $(LIBDIR)/jmce.cfg
 	rm -f $(MANDIR)/jmce.1
 
 ifeq (.depend, $(wildcard .depend))
diff -Nru jmce/src/Makefile.linux jmce-0.37/src/Makefile.linux
--- jmce/src/Makefile.linux	Sat Aug 26 21:11:14 2000
+++ jmce-0.37/src/Makefile.linux	Thu Nov  9 02:43:27 2000
@@ -15,17 +15,20 @@
 	$(CC) $(CFLAGS) -M *.c > .depend
 
 clean:
-	$(RM) -f *.o $(JMCE) *~ .depend core
+	$(RM) -f *.o $(JMCE) *~ *.bak .depend core tags
 
 install: $(JMCE)
 	$(INSTALL) -o root -g $(GROUP) -s -m 4755 $(JMCE) $(BINDIR)
 	$(INSTALL) -o root -g $(GROUP) -m 755 -d $(LIBDIR)
-	$(INSTALL) -o root -g $(GROUP) -m 644 $(JMCECFG) $(DESTDIR)/etc/$(JMCECFG)
+	$(INSTALL) -o root -g $(GROUP) -m 644 jmce.cfg.gb $(LIBDIR)/jmce.cfg.gb
+	$(INSTALL) -o root -g $(GROUP) -m 644 jmce.cfg $(LIBDIR)/jmce.cfg
 	$(INSTALL)  ../doc/jmce.1 $(MANDIR)
 
 uninstall:
 	rm -f $(BINDIR)/$(JMCE)
 	rm -f $(LIBDIR)/$(JMCECFG)
+	rm -f $(LIBDIR)/jmce.cfg.gb
+	rm -f $(LIBDIR)/jmce.cfg
 	rm -f $(MANDIR)/jmce.1
 
 ifeq (.depend, $(wildcard .depend))
diff -Nru jmce/src/jmce.cfg jmce-0.37/src/jmce.cfg
--- jmce/src/jmce.cfg	Sun Sep  3 17:04:23 2000
+++ jmce-0.37/src/jmce.cfg	Thu Nov  9 09:41:32 2000
@@ -25,6 +25,12 @@
 #   ISO8895-[123456789], JISX0201.1976-0
 #   BIG5.HKU-0, GB2312.1980-1, JISX0208.1983-0, KSC5601.1987-0
 #   EUC, SJIS
+############################################################
+# Coding means active, xCoding means inactive.  Default to 
+# make zh_TW.big5:Coding as a pair, default to display Big5. 
+# Change to zh_TW.big5:xCoding and zh_CN.ugb:Coding will
+# activate GB display. Others use the same rule. Got it?
+#############################################################
 
 ja_JP.ujis: 
 	JISX0201.1976-0 JISX0208.1983-0 EUC
diff -Nru jmce/src/jmce.cfg.big5 jmce-0.37/src/jmce.cfg.big5
--- jmce/src/jmce.cfg.big5	Sat Aug 26 23:26:03 2000
+++ jmce-0.37/src/jmce.cfg.big5	Thu Nov  9 09:41:32 2000
@@ -25,6 +25,12 @@
 #   ISO8895-[123456789], JISX0201.1976-0
 #   BIG5.HKU-0, GB2312.1980-1, JISX0208.1983-0, KSC5601.1987-0
 #   EUC, SJIS
+############################################################
+# Coding means active, xCoding means inactive.  Default to 
+# make zh_TW.big5:Coding as a pair, default to display Big5. 
+# Change to zh_TW.big5:xCoding and zh_CN.ugb:Coding will
+# activate GB display. Others use the same rule. Got it?
+#############################################################
 
 ja_JP.ujis: 
 	JISX0201.1976-0 JISX0208.1983-0 EUC
Binary files jmce/utils/big2gb and jmce-0.37/utils/big2gb differ
diff -Nru jmce/utils/big2gb.c jmce-0.37/utils/big2gb.c
--- jmce/utils/big2gb.c	Fri Aug 20 11:29:35 1999
+++ jmce-0.37/utils/big2gb.c	Thu Nov  9 01:54:29 2000
@@ -369,6 +369,7 @@
   /* no option, use stdin and stdout */
   if (argc == 1)
   {
+    fprintf(stderr, "Without options, use stdin and stdout\n");
     exit(ConvertBig5ToGBStdio(pFlag));
   }
 

Reply to: