diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf | bin | 249185 -> 247937 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx | 36 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def | 218 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty | 4 |
4 files changed, 122 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf Binary files differindex b16b1b0ee77..8304e4631dd 100644 --- a/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf +++ b/Master/texmf-dist/doc/latex/xpinyin/xpinyin.pdf diff --git a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx index 5b11fb4a31c..34757cc9032 100644 --- a/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx +++ b/Master/texmf-dist/source/latex/xpinyin/xpinyin.dtx @@ -161,19 +161,19 @@ and some specific Chinese Simplified fonts (TrueType or OpenType). %<*driver|package> \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xpinyin.dtx 746 2014-12-23 13:58:49Z sobenlee@gmail.com $ +\GetIdInfo$Id: xpinyin.dtx 749 2014-12-24 15:05:15Z sobenlee@gmail.com $ {Automatically add pinyin to Chinese characters} %<*driver> \ProvidesExplFile{\ExplFileName.\ExplFileExtension} %</driver> %<package>\ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.0}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} %<*driver> \ExplSyntaxOff %</driver> %</driver|package> %<database>\ProvidesFile{xpinyin-database.def}% -%<database> [2014/12/23 v2.0 xpinyin database] +%<database> [2014/12/24 v2.1 xpinyin database] % %<*driver> \documentclass[full,a4paper]{l3doc} @@ -1295,20 +1295,18 @@ end % % \begin{macrocode} xpinyin = { - svnid = "$Id: xpinyin.dtx 746 2014-12-23 13:58:49Z sobenlee@gmail.com $", + svnid = "$Id: xpinyin.dtx 749 2014-12-24 15:05:15Z sobenlee@gmail.com $", uchar = unicode.utf8.char, - ugsub = unicode.utf8.gsub, readings = { }, fixreadings = { % \end{macrocode} % 为汉字“〇”增加拼音。 % \begin{macrocode} - {"U+3007", "Mandarin", "líng"}, + {"U+3007", "Mandarin", "líng"} + }, % \end{macrocode} -% 修改汉字“女”的错误拼音。 +% % \begin{macrocode} - {"U+5973", "HanyuPinlu", "nǚ(1129) rǔ(37)"} - }, database = { source = "http://www.unicode.org/Public/UNIDATA/Unihan.zip", file = "Unihan_Readings.txt", @@ -1317,15 +1315,6 @@ xpinyin = { dbfile = "xpinyin.db" }, % \end{macrocode} -% \texttt{Unihan} 的 \texttt{kHanyuPinlu} 数据把韵母 |ou| 的音调都标在了 |u| 上。 -% \begin{macrocode} - outones = { - oū = "ōu" , - oú = "óu" , - oǔ = "ǒu" , - où = "òu" - }, -% \end{macrocode} % \pkg{DocStrip} 会将一行开头的 |%%| 替换成 \tn{MetaPrefix},因此我们在行首加了 % 空格,需要把它去掉。 % \begin{macrocode} @@ -1400,7 +1389,7 @@ end % 往拼音表中加入项目。 % \begin{macrocode} function xpinyin.insert (unicode, prop, value) - local index = tonumber(unicode:sub(3), 16) + local index = tonumber(unicode:match("%x+$"), 16) if not xpinyin.readings[index] then xpinyin.readings[index] = { } end @@ -1445,14 +1434,11 @@ function xpinyin.pairsByKeys (t, f) end % \end{macrocode} % -% 按照 \texttt{HanyuPinlu}、\texttt{Mandarin}、\texttt{XHC1983}、\texttt{HanyuPinyin} -% 的顺序选择最常用的拼音。 +% 按照 \texttt{Mandarin}、\texttt{XHC1983}、\texttt{HanyuPinyin} +% 的顺序选择最常用的拼音。\texttt{HanyuPinlu} 的质量较差,不采用。 % \begin{macrocode} function xpinyin.grep (pyt) - if pyt.HanyuPinlu then - return xpinyin.ugsub(pyt.HanyuPinlu:match("[^%(]+"), "o[ūúǔù]$", xpinyin.outones), - "HanyuPinlu" - elseif pyt.Mandarin then + if pyt.Mandarin then return pyt.Mandarin:match("%S+"), "Mandarin" elseif pyt.XHC1983 then return pyt.XHC1983:match(":(%S+)"), "XHC1983" diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def index 09c77ded243..ea8512cd5e8 100644 --- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def +++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin-database.def @@ -21,7 +21,7 @@ %% The Current Maintainer of this work is Qing Lee. %% \ProvidesFile{xpinyin-database.def}% - [2014/12/23 v2.0 xpinyin database] + [2014/12/24 v2.1 xpinyin database] %% %% Do not edit this file! %% Created from Unihan database: @@ -30,7 +30,7 @@ %% Date: 2014-05-09 18:17:02 GMT [JHJ] %% Unicode version: 7.0.0 %% -%% by "texlua xpinyin.lua" on 2014-12-23 22:03:58 +0800 +%% by "texlua xpinyin.lua" on 2014-12-24 23:05:33 +0800 %% \XPYU{〇}{12295}{líng} \XPYU{㐀}{13312}{qiū} @@ -5872,7 +5872,7 @@ \XPYU{之}{20043}{zhī} \XPYU{乌}{20044}{wū} \XPYU{乍}{20045}{zhà} -\XPYU{乎}{20046}{hu} +\XPYU{乎}{20046}{hū} \XPYU{乏}{20047}{fá} \XPYU{乐}{20048}{lè} \XPYU{乑}{20049}{yín} @@ -6011,7 +6011,7 @@ \XPYU{他}{20182}{tā} \XPYU{仗}{20183}{zhàng} \XPYU{付}{20184}{fù} -\XPYU{仙}{20185}{xian} +\XPYU{仙}{20185}{xiān} \XPYU{仚}{20186}{xiān} \XPYU{仛}{20187}{tuō} \XPYU{仜}{20188}{hóng} @@ -6063,7 +6063,7 @@ \XPYU{伊}{20234}{yī} \XPYU{伋}{20235}{jí} \XPYU{伌}{20236}{ài} -\XPYU{伍}{20237}{wu} +\XPYU{伍}{20237}{wǔ} \XPYU{伎}{20238}{jì} \XPYU{伏}{20239}{fú} \XPYU{伐}{20240}{fá} @@ -6104,7 +6104,7 @@ \XPYU{伳}{20275}{xiè} \XPYU{伴}{20276}{bàn} \XPYU{伵}{20277}{xù} -\XPYU{伶}{20278}{ling} +\XPYU{伶}{20278}{líng} \XPYU{伷}{20279}{zhòu} \XPYU{伸}{20280}{shēn} \XPYU{伹}{20281}{qū} @@ -6331,7 +6331,7 @@ \XPYU{倖}{20502}{xìng} \XPYU{倗}{20503}{péng} \XPYU{倘}{20504}{tǎng} -\XPYU{候}{20505}{hou} +\XPYU{候}{20505}{hòu} \XPYU{倚}{20506}{yǐ} \XPYU{倛}{20507}{qī} \XPYU{倜}{20508}{tì} @@ -6439,7 +6439,7 @@ \XPYU{傂}{20610}{zhì} \XPYU{傃}{20611}{sù} \XPYU{傄}{20612}{xiā} -\XPYU{傅}{20613}{fu} +\XPYU{傅}{20613}{fù} \XPYU{傆}{20614}{yuàn} \XPYU{傇}{20615}{rǒng} \XPYU{傈}{20616}{lì} @@ -6625,7 +6625,7 @@ \XPYU{儼}{20796}{yǎn} \XPYU{儽}{20797}{léi} \XPYU{儾}{20798}{nàng} -\XPYU{儿}{20799}{r} +\XPYU{儿}{20799}{ér} \XPYU{兀}{20800}{wù} \XPYU{允}{20801}{yǔn} \XPYU{兂}{20802}{zān} @@ -6644,7 +6644,7 @@ \XPYU{兏}{20815}{cháng} \XPYU{児}{20816}{ér} \XPYU{兑}{20817}{duì} -\XPYU{兒}{20818}{r} +\XPYU{兒}{20818}{ér} \XPYU{兓}{20819}{jīn} \XPYU{兔}{20820}{tù} \XPYU{兕}{20821}{sì} @@ -6977,7 +6977,7 @@ \XPYU{办}{21150}{bàn} \XPYU{功}{21151}{gōng} \XPYU{加}{21152}{jiā} -\XPYU{务}{21153}{wu} +\XPYU{务}{21153}{wù} \XPYU{劢}{21154}{mài} \XPYU{劣}{21155}{liè} \XPYU{劤}{21156}{jìn} @@ -7033,7 +7033,7 @@ \XPYU{勖}{21206}{xù} \XPYU{勗}{21207}{xù} \XPYU{勘}{21208}{kān} -\XPYU{務}{21209}{wu} +\XPYU{務}{21209}{wù} \XPYU{勚}{21210}{yì} \XPYU{勛}{21211}{xūn} \XPYU{勜}{21212}{wěng} @@ -7104,7 +7104,7 @@ \XPYU{匝}{21277}{zā} \XPYU{匞}{21278}{jiàng} \XPYU{匟}{21279}{kàng} -\XPYU{匠}{21280}{jiang} +\XPYU{匠}{21280}{jiàng} \XPYU{匡}{21281}{kuāng} \XPYU{匢}{21282}{hū} \XPYU{匣}{21283}{xiá} @@ -7275,7 +7275,7 @@ \XPYU{又}{21448}{yòu} \XPYU{叉}{21449}{chā} \XPYU{及}{21450}{jí} -\XPYU{友}{21451}{you} +\XPYU{友}{21451}{yǒu} \XPYU{双}{21452}{shuāng} \XPYU{反}{21453}{fǎn} \XPYU{収}{21454}{shōu} @@ -7309,7 +7309,7 @@ \XPYU{只}{21482}{zhǐ} \XPYU{叫}{21483}{jiào} \XPYU{召}{21484}{zhào} -\XPYU{叭}{21485}{ba} +\XPYU{叭}{21485}{bā} \XPYU{叮}{21486}{dīng} \XPYU{可}{21487}{kě} \XPYU{台}{21488}{tái} @@ -7382,7 +7382,7 @@ \XPYU{吳}{21555}{wú} \XPYU{吴}{21556}{wú} \XPYU{吵}{21557}{chǎo} -\XPYU{吶}{21558}{ne} +\XPYU{吶}{21558}{nà} \XPYU{吷}{21559}{xuè} \XPYU{吸}{21560}{xī} \XPYU{吹}{21561}{chuī} @@ -7408,7 +7408,7 @@ \XPYU{呍}{21581}{hōng} \XPYU{呎}{21582}{chǐ} \XPYU{呏}{21583}{shēng} -\XPYU{呐}{21584}{ne} +\XPYU{呐}{21584}{nà} \XPYU{呑}{21585}{tūn} \XPYU{呒}{21586}{fǔ} \XPYU{呓}{21587}{yì} @@ -7472,12 +7472,12 @@ \XPYU{咍}{21645}{hāi} \XPYU{咎}{21646}{jiù} \XPYU{咏}{21647}{yǒng} -\XPYU{咐}{21648}{fu} +\XPYU{咐}{21648}{fù} \XPYU{咑}{21649}{dā} \XPYU{咒}{21650}{zhòu} \XPYU{咓}{21651}{wǎ} \XPYU{咔}{21652}{kā} -\XPYU{咕}{21653}{gu} +\XPYU{咕}{21653}{gū} \XPYU{咖}{21654}{kā} \XPYU{咗}{21655}{zuo} \XPYU{咘}{21656}{bù} @@ -7495,7 +7495,7 @@ \XPYU{咤}{21668}{zhà} \XPYU{咥}{21669}{xì} \XPYU{咦}{21670}{yí} -\XPYU{咧}{21671}{lie} +\XPYU{咧}{21671}{liě} \XPYU{咨}{21672}{zī} \XPYU{咩}{21673}{miē} \XPYU{咪}{21674}{mī} @@ -7561,7 +7561,7 @@ \XPYU{哦}{21734}{ó} \XPYU{哧}{21735}{chī} \XPYU{哨}{21736}{shào} -\XPYU{哩}{21737}{li} +\XPYU{哩}{21737}{lī} \XPYU{哪}{21738}{nǎ} \XPYU{哫}{21739}{zú} \XPYU{哬}{21740}{hé} @@ -7628,7 +7628,7 @@ \XPYU{唩}{21801}{wō} \XPYU{唪}{21802}{fěng} \XPYU{唫}{21803}{jìn} -\XPYU{唬}{21804}{hu} +\XPYU{唬}{21804}{hǔ} \XPYU{唭}{21805}{qì} \XPYU{售}{21806}{shòu} \XPYU{唯}{21807}{wéi} @@ -7773,7 +7773,7 @@ \XPYU{喺}{21946}{xì} \XPYU{喻}{21947}{yù} \XPYU{喼}{21948}{jié} -\XPYU{喽}{21949}{lou} +\XPYU{喽}{21949}{lóu} \XPYU{喾}{21950}{kù} \XPYU{喿}{21951}{zào} \XPYU{嗀}{21952}{hù} @@ -7836,7 +7836,7 @@ \XPYU{嗺}{22010}{zuī} \XPYU{嗻}{22011}{zhē} \XPYU{嗼}{22012}{mò} -\XPYU{嗽}{22013}{sou} +\XPYU{嗽}{22013}{sòu} \XPYU{嗾}{22014}{sǒu} \XPYU{嗿}{22015}{tǎn} \XPYU{嘀}{22016}{dí} @@ -7852,7 +7852,7 @@ \XPYU{嘊}{22026}{ái} \XPYU{嘋}{22027}{xiāo} \XPYU{嘌}{22028}{piào} -\XPYU{嘍}{22029}{lou} +\XPYU{嘍}{22029}{lóu} \XPYU{嘎}{22030}{gā} \XPYU{嘏}{22031}{gǔ} \XPYU{嘐}{22032}{xiāo} @@ -8169,7 +8169,7 @@ \XPYU{均}{22343}{jūn} \XPYU{坈}{22344}{rǒng} \XPYU{坉}{22345}{tún} -\XPYU{坊}{22346}{fang} +\XPYU{坊}{22346}{fāng} \XPYU{坋}{22347}{bèn} \XPYU{坌}{22348}{bèn} \XPYU{坍}{22349}{tān} @@ -8650,7 +8650,7 @@ \XPYU{夨}{22824}{zè} \XPYU{天}{22825}{tiān} \XPYU{太}{22826}{tài} -\XPYU{夫}{22827}{fu} +\XPYU{夫}{22827}{fū} \XPYU{夬}{22828}{guài} \XPYU{夭}{22829}{yāo} \XPYU{央}{22830}{yāng} @@ -8815,7 +8815,7 @@ \XPYU{姍}{22989}{shān} \XPYU{姎}{22990}{yāng} \XPYU{姏}{22991}{mán} -\XPYU{姐}{22992}{jie} +\XPYU{姐}{22992}{jiě} \XPYU{姑}{22993}{gū} \XPYU{姒}{22994}{sì} \XPYU{姓}{22995}{xìng} @@ -8887,7 +8887,7 @@ \XPYU{娕}{23061}{chuò} \XPYU{娖}{23062}{chuò} \XPYU{娗}{23063}{tǐng} -\XPYU{娘}{23064}{niang} +\XPYU{娘}{23064}{niáng} \XPYU{娙}{23065}{xíng} \XPYU{娚}{23066}{nán} \XPYU{娛}{23067}{yú} @@ -9275,7 +9275,7 @@ \XPYU{宙}{23449}{zhòu} \XPYU{定}{23450}{dìng} \XPYU{宛}{23451}{wǎn} -\XPYU{宜}{23452}{yi} +\XPYU{宜}{23452}{yí} \XPYU{宝}{23453}{bǎo} \XPYU{实}{23454}{shí} \XPYU{実}{23455}{shí} @@ -9448,7 +9448,7 @@ \XPYU{屆}{23622}{jiè} \XPYU{屇}{23623}{tián} \XPYU{屈}{23624}{qū} -\XPYU{屉}{23625}{ti} +\XPYU{屉}{23625}{tì} \XPYU{届}{23626}{jiè} \XPYU{屋}{23627}{wū} \XPYU{屌}{23628}{diǎo} @@ -9467,7 +9467,7 @@ \XPYU{屙}{23641}{ē} \XPYU{屚}{23642}{lòu} \XPYU{屛}{23643}{píng} -\XPYU{屜}{23644}{ti} +\XPYU{屜}{23644}{tì} \XPYU{屝}{23645}{fèi} \XPYU{属}{23646}{shǔ} \XPYU{屟}{23647}{xiè} @@ -9875,7 +9875,7 @@ \XPYU{己}{24049}{jǐ} \XPYU{已}{24050}{yǐ} \XPYU{巳}{24051}{sì} -\XPYU{巴}{24052}{ba} +\XPYU{巴}{24052}{bā} \XPYU{巵}{24053}{zhī} \XPYU{巶}{24054}{zhāo} \XPYU{巷}{24055}{xiàng} @@ -9913,7 +9913,7 @@ \XPYU{帗}{24087}{bō} \XPYU{帘}{24088}{lián} \XPYU{帙}{24089}{zhì} -\XPYU{帚}{24090}{zhou} +\XPYU{帚}{24090}{zhǒu} \XPYU{帛}{24091}{bó} \XPYU{帜}{24092}{zhì} \XPYU{帝}{24093}{dì} @@ -10282,7 +10282,7 @@ \XPYU{很}{24456}{hěn} \XPYU{徉}{24457}{yáng} \XPYU{徊}{24458}{huái} -\XPYU{律}{24459}{l̈ù} +\XPYU{律}{24459}{lǜ} \XPYU{後}{24460}{hòu} \XPYU{徍}{24461}{wǎng} \XPYU{徎}{24462}{chěng} @@ -10294,7 +10294,7 @@ \XPYU{徔}{24468}{zhi} \XPYU{徕}{24469}{lái} \XPYU{徖}{24470}{cóng} -\XPYU{得}{24471}{de} +\XPYU{得}{24471}{dé} \XPYU{徘}{24472}{pái} \XPYU{徙}{24473}{xǐ} \XPYU{徚}{24474}{dōng} @@ -10510,7 +10510,7 @@ \XPYU{恬}{24684}{tián} \XPYU{恭}{24685}{gōng} \XPYU{恮}{24686}{quān} -\XPYU{息}{24687}{xi} +\XPYU{息}{24687}{xī} \XPYU{恰}{24688}{qià} \XPYU{恱}{24689}{yuè} \XPYU{恲}{24690}{pēng} @@ -10765,7 +10765,7 @@ \XPYU{慫}{24939}{sǒng} \XPYU{慬}{24940}{qín} \XPYU{慭}{24941}{yìn} -\XPYU{慮}{24942}{l̈ù} +\XPYU{慮}{24942}{lǜ} \XPYU{慯}{24943}{shāng} \XPYU{慰}{24944}{wèi} \XPYU{慱}{24945}{tuán} @@ -10937,7 +10937,7 @@ \XPYU{戗}{25111}{qiāng} \XPYU{战}{25112}{zhàn} \XPYU{戙}{25113}{dòng} -\XPYU{戚}{25114}{qi} +\XPYU{戚}{25114}{qī} \XPYU{戛}{25115}{jiá} \XPYU{戜}{25116}{dié} \XPYU{戝}{25117}{zéi} @@ -11021,7 +11021,7 @@ \XPYU{扫}{25195}{sǎo} \XPYU{扬}{25196}{yáng} \XPYU{扭}{25197}{niǔ} -\XPYU{扮}{25198}{ban} +\XPYU{扮}{25198}{bàn} \XPYU{扯}{25199}{chě} \XPYU{扰}{25200}{rǎo} \XPYU{扱}{25201}{xī} @@ -11110,7 +11110,7 @@ \XPYU{拄}{25284}{zhǔ} \XPYU{担}{25285}{dān} \XPYU{拆}{25286}{chāi} -\XPYU{拇}{25287}{mu} +\XPYU{拇}{25287}{mǔ} \XPYU{拈}{25288}{niān} \XPYU{拉}{25289}{lā} \XPYU{拊}{25290}{fǔ} @@ -11165,7 +11165,7 @@ \XPYU{拻}{25339}{huī} \XPYU{拼}{25340}{pīn} \XPYU{拽}{25341}{zhuāi} -\XPYU{拾}{25342}{shi} +\XPYU{拾}{25342}{shí} \XPYU{拿}{25343}{ná} \XPYU{挀}{25344}{bāi} \XPYU{持}{25345}{chí} @@ -11773,7 +11773,7 @@ \XPYU{敛}{25947}{liǎn} \XPYU{敜}{25948}{niè} \XPYU{敝}{25949}{bì} -\XPYU{敞}{25950}{chang} +\XPYU{敞}{25950}{chǎng} \XPYU{敟}{25951}{diǎn} \XPYU{敠}{25952}{duō} \XPYU{敡}{25953}{yì} @@ -11876,7 +11876,7 @@ \XPYU{旂}{26050}{qí} \XPYU{旃}{26051}{zhān} \XPYU{旄}{26052}{máo} -\XPYU{旅}{26053}{l̈ǔ} +\XPYU{旅}{26053}{lǚ} \XPYU{旆}{26054}{pèi} \XPYU{旇}{26055}{pī} \XPYU{旈}{26056}{liú} @@ -12002,7 +12002,7 @@ \XPYU{晀}{26176}{tiǎo} \XPYU{晁}{26177}{cháo} \XPYU{時}{26178}{shí} -\XPYU{晃}{26179}{huang} +\XPYU{晃}{26179}{huǎng} \XPYU{晄}{26180}{huǎng} \XPYU{晅}{26181}{xuǎn} \XPYU{晆}{26182}{kuí} @@ -12039,7 +12039,7 @@ \XPYU{晥}{26213}{hàn} \XPYU{晦}{26214}{huì} \XPYU{晧}{26215}{hào} -\XPYU{晨}{26216}{chen} +\XPYU{晨}{26216}{chén} \XPYU{晩}{26217}{wǎn} \XPYU{晪}{26218}{tiǎn} \XPYU{晫}{26219}{zhuó} @@ -12244,7 +12244,7 @@ \XPYU{朲}{26418}{rén} \XPYU{朳}{26419}{bā} \XPYU{朴}{26420}{pǔ} -\XPYU{朵}{26421}{duo} +\XPYU{朵}{26421}{duǒ} \XPYU{朶}{26422}{duǒ} \XPYU{朷}{26423}{dāo} \XPYU{朸}{26424}{lì} @@ -12269,7 +12269,7 @@ \XPYU{杋}{26443}{fán} \XPYU{杌}{26444}{wù} \XPYU{杍}{26445}{zǐ} -\XPYU{李}{26446}{li} +\XPYU{李}{26446}{lǐ} \XPYU{杏}{26447}{xìng} \XPYU{材}{26448}{cái} \XPYU{村}{26449}{cūn} @@ -12328,7 +12328,7 @@ \XPYU{枆}{26502}{máo} \XPYU{枇}{26503}{pí} \XPYU{枈}{26504}{bì} -\XPYU{枉}{26505}{wang} +\XPYU{枉}{26505}{wǎng} \XPYU{枊}{26506}{àng} \XPYU{枋}{26507}{fāng} \XPYU{枌}{26508}{fén} @@ -12792,7 +12792,7 @@ \XPYU{楗}{26967}{jiàn} \XPYU{楘}{26968}{mù} \XPYU{楙}{26969}{mào} -\XPYU{楚}{26970}{chu} +\XPYU{楚}{26970}{chǔ} \XPYU{楛}{26971}{hù} \XPYU{楜}{26972}{hú} \XPYU{楝}{26973}{liàn} @@ -13248,7 +13248,7 @@ \XPYU{欟}{27423}{guang} \XPYU{欠}{27424}{qiàn} \XPYU{次}{27425}{cì} -\XPYU{欢}{27426}{huan} +\XPYU{欢}{27426}{huān} \XPYU{欣}{27427}{xīn} \XPYU{欤}{27428}{yú} \XPYU{欥}{27429}{yì} @@ -13311,7 +13311,7 @@ \XPYU{歞}{27486}{è} \XPYU{歟}{27487}{yú} \XPYU{歠}{27488}{chuò} -\XPYU{歡}{27489}{huan} +\XPYU{歡}{27489}{huān} \XPYU{止}{27490}{zhǐ} \XPYU{正}{27491}{zhèng} \XPYU{此}{27492}{cǐ} @@ -13722,7 +13722,7 @@ \XPYU{泹}{27897}{dàn} \XPYU{泺}{27898}{luò} \XPYU{泻}{27899}{xiè} -\XPYU{泼}{27900}{po} +\XPYU{泼}{27900}{pō} \XPYU{泽}{27901}{zé} \XPYU{泾}{27902}{jīng} \XPYU{泿}{27903}{yín} @@ -13856,7 +13856,7 @@ \XPYU{浿}{28031}{pèi} \XPYU{涀}{28032}{xiàn} \XPYU{涁}{28033}{shèn} -\XPYU{涂}{28034}{tu} +\XPYU{涂}{28034}{tú} \XPYU{涃}{28035}{kùn} \XPYU{涄}{28036}{pīng} \XPYU{涅}{28037}{niè} @@ -14319,7 +14319,7 @@ \XPYU{潎}{28494}{pì} \XPYU{潏}{28495}{yù} \XPYU{潐}{28496}{jiào} -\XPYU{潑}{28497}{po} +\XPYU{潑}{28497}{pō} \XPYU{潒}{28498}{dàng} \XPYU{潓}{28499}{huì} \XPYU{潔}{28500}{jié} @@ -15060,10 +15060,10 @@ \XPYU{爴}{29236}{jué} \XPYU{爵}{29237}{jué} \XPYU{父}{29238}{fù} -\XPYU{爷}{29239}{ye} +\XPYU{爷}{29239}{yé} \XPYU{爸}{29240}{bà} \XPYU{爹}{29241}{diē} -\XPYU{爺}{29242}{ye} +\XPYU{爺}{29242}{yé} \XPYU{爻}{29243}{yáo} \XPYU{爼}{29244}{zǔ} \XPYU{爽}{29245}{shuǎng} @@ -15253,7 +15253,7 @@ \XPYU{狵}{29429}{máng} \XPYU{狶}{29430}{xī} \XPYU{狷}{29431}{juàn} -\XPYU{狸}{29432}{li} +\XPYU{狸}{29432}{lí} \XPYU{狹}{29433}{xiá} \XPYU{狺}{29434}{yín} \XPYU{狻}{29435}{suān} @@ -15305,7 +15305,7 @@ \XPYU{猩}{29481}{xīng} \XPYU{猪}{29482}{zhū} \XPYU{猫}{29483}{māo} -\XPYU{猬}{29484}{wei} +\XPYU{猬}{29484}{wèi} \XPYU{猭}{29485}{chuān} \XPYU{献}{29486}{xiàn} \XPYU{猯}{29487}{tuān} @@ -15396,7 +15396,7 @@ \XPYU{玄}{29572}{xuán} \XPYU{玅}{29573}{miào} \XPYU{玆}{29574}{zī} -\XPYU{率}{29575}{l̈ù} +\XPYU{率}{29575}{lǜ} \XPYU{玈}{29576}{lú} \XPYU{玉}{29577}{yù} \XPYU{玊}{29578}{sù} @@ -15811,7 +15811,7 @@ \XPYU{用}{29992}{yòng} \XPYU{甩}{29993}{shuǎi} \XPYU{甪}{29994}{lù} -\XPYU{甫}{29995}{fu} +\XPYU{甫}{29995}{fǔ} \XPYU{甬}{29996}{yǒng} \XPYU{甭}{29997}{béng} \XPYU{甮}{29998}{fèng} @@ -16371,7 +16371,7 @@ \XPYU{睘}{30552}{qióng} \XPYU{睙}{30553}{liè} \XPYU{睚}{30554}{yá} -\XPYU{睛}{30555}{jing} +\XPYU{睛}{30555}{jīng} \XPYU{睜}{30556}{zhēng} \XPYU{睝}{30557}{lí} \XPYU{睞}{30558}{lài} @@ -16513,7 +16513,7 @@ \XPYU{矦}{30694}{hóu} \XPYU{矧}{30695}{shěn} \XPYU{矨}{30696}{yǐng} -\XPYU{矩}{30697}{ju} +\XPYU{矩}{30697}{jǔ} \XPYU{矪}{30698}{zhōu} \XPYU{矫}{30699}{jiǎo} \XPYU{矬}{30700}{cuó} @@ -17108,7 +17108,7 @@ \XPYU{稹}{31289}{zhěn} \XPYU{稺}{31290}{zhì} \XPYU{稻}{31291}{dào} -\XPYU{稼}{31292}{jia} +\XPYU{稼}{31292}{jià} \XPYU{稽}{31293}{jī} \XPYU{稾}{31294}{gǎo} \XPYU{稿}{31295}{gǎo} @@ -17239,7 +17239,7 @@ \XPYU{窼}{31420}{zhāo} \XPYU{窽}{31421}{kuan} \XPYU{窾}{31422}{kuǎn} -\XPYU{窿}{31423}{long} +\XPYU{窿}{31423}{lóng} \XPYU{竀}{31424}{chēng} \XPYU{竁}{31425}{cuì} \XPYU{竂}{31426}{piáo} @@ -17310,7 +17310,7 @@ \XPYU{笃}{31491}{dǔ} \XPYU{笄}{31492}{jī} \XPYU{笅}{31493}{xiáo} -\XPYU{笆}{31494}{ba} +\XPYU{笆}{31494}{bā} \XPYU{笇}{31495}{suàn} \XPYU{笈}{31496}{jí} \XPYU{笉}{31497}{qǐn} @@ -17551,7 +17551,7 @@ \XPYU{篴}{31732}{dí} \XPYU{篵}{31733}{cōng} \XPYU{篶}{31734}{yān} -\XPYU{篷}{31735}{peng} +\XPYU{篷}{31735}{péng} \XPYU{篸}{31736}{cǎn} \XPYU{篹}{31737}{zhuàn} \XPYU{篺}{31738}{pí} @@ -17762,7 +17762,7 @@ \XPYU{糇}{31943}{hóu} \XPYU{糈}{31944}{xǔ} \XPYU{糉}{31945}{zòng} -\XPYU{糊}{31946}{hu} +\XPYU{糊}{31946}{hú} \XPYU{糋}{31947}{jiàn} \XPYU{糌}{31948}{zān} \XPYU{糍}{31949}{cí} @@ -17976,7 +17976,7 @@ \XPYU{綝}{32157}{chēn} \XPYU{綞}{32158}{duǒ} \XPYU{綟}{32159}{lì} -\XPYU{綠}{32160}{l̈ù} +\XPYU{綠}{32160}{lǜ} \XPYU{綡}{32161}{liáng} \XPYU{綢}{32162}{chóu} \XPYU{綣}{32163}{quǎn} @@ -17996,7 +17996,7 @@ \XPYU{綱}{32177}{gāng} \XPYU{網}{32178}{wǎng} \XPYU{綳}{32179}{bēng} -\XPYU{綴}{32180}{zhui} +\XPYU{綴}{32180}{zhuì} \XPYU{綵}{32181}{cǎi} \XPYU{綶}{32182}{guǒ} \XPYU{綷}{32183}{cuì} @@ -18127,7 +18127,7 @@ \XPYU{縴}{32308}{qiàn} \XPYU{縵}{32309}{màn} \XPYU{縶}{32310}{zhí} -\XPYU{縷}{32311}{l̈ǔ} +\XPYU{縷}{32311}{lǚ} \XPYU{縸}{32312}{mù} \XPYU{縹}{32313}{piǎo} \XPYU{縺}{32314}{lián} @@ -18327,8 +18327,8 @@ \XPYU{综}{32508}{zōng} \XPYU{绽}{32509}{zhàn} \XPYU{绾}{32510}{wǎn} -\XPYU{绿}{32511}{l̈ù} -\XPYU{缀}{32512}{zhui} +\XPYU{绿}{32511}{lǜ} +\XPYU{缀}{32512}{zhuì} \XPYU{缁}{32513}{zī} \XPYU{缂}{32514}{kè} \XPYU{缃}{32515}{xiāng} @@ -18349,7 +18349,7 @@ \XPYU{缒}{32530}{zhuì} \XPYU{缓}{32531}{huǎn} \XPYU{缔}{32532}{dì} -\XPYU{缕}{32533}{l̈ǔ} +\XPYU{缕}{32533}{lǚ} \XPYU{编}{32534}{biān} \XPYU{缗}{32535}{mín} \XPYU{缘}{32536}{yuán} @@ -18426,7 +18426,7 @@ \XPYU{罟}{32607}{gǔ} \XPYU{罠}{32608}{mín} \XPYU{罡}{32609}{gāng} -\XPYU{罢}{32610}{ba} +\XPYU{罢}{32610}{bà} \XPYU{罣}{32611}{guà} \XPYU{罤}{32612}{tí} \XPYU{罥}{32613}{juàn} @@ -18447,7 +18447,7 @@ \XPYU{罴}{32628}{pí} \XPYU{罵}{32629}{mà} \XPYU{罶}{32630}{liǔ} -\XPYU{罷}{32631}{ba} +\XPYU{罷}{32631}{bà} \XPYU{罸}{32632}{fá} \XPYU{罹}{32633}{lí} \XPYU{罺}{32634}{cháo} @@ -18978,7 +18978,7 @@ \XPYU{膇}{33159}{zhuì} \XPYU{膈}{33160}{gé} \XPYU{膉}{33161}{yì} -\XPYU{膊}{33162}{bo} +\XPYU{膊}{33162}{bó} \XPYU{膋}{33163}{liáo} \XPYU{膌}{33164}{jí} \XPYU{膍}{33165}{pí} @@ -19551,7 +19551,7 @@ \XPYU{菄}{33732}{dōng} \XPYU{菅}{33733}{jiān} \XPYU{菆}{33734}{zōu} -\XPYU{菇}{33735}{gu} +\XPYU{菇}{33735}{gū} \XPYU{菈}{33736}{lā} \XPYU{菉}{33737}{lù} \XPYU{菊}{33738}{jú} @@ -19887,7 +19887,7 @@ \XPYU{蔔}{34068}{bó} \XPYU{蔕}{34069}{dì} \XPYU{蔖}{34070}{cuó} -\XPYU{蔗}{34071}{zhe} +\XPYU{蔗}{34071}{zhè} \XPYU{蔘}{34072}{shēn} \XPYU{蔙}{34073}{xuàn} \XPYU{蔚}{34074}{wèi} @@ -20201,7 +20201,7 @@ \XPYU{虎}{34382}{hǔ} \XPYU{虏}{34383}{lǔ} \XPYU{虐}{34384}{nüè} -\XPYU{虑}{34385}{l̈ù} +\XPYU{虑}{34385}{lǜ} \XPYU{虒}{34386}{sī} \XPYU{虓}{34387}{xiāo} \XPYU{虔}{34388}{qián} @@ -20283,7 +20283,7 @@ \XPYU{蚠}{34464}{fén} \XPYU{蚡}{34465}{fén} \XPYU{蚢}{34466}{háng} -\XPYU{蚣}{34467}{gong} +\XPYU{蚣}{34467}{gōng} \XPYU{蚤}{34468}{zǎo} \XPYU{蚥}{34469}{fù} \XPYU{蚦}{34470}{rán} @@ -20447,7 +20447,7 @@ \XPYU{蝄}{34628}{wǎng} \XPYU{蝅}{34629}{cán} \XPYU{蝆}{34630}{yǎng} -\XPYU{蝇}{34631}{ying} +\XPYU{蝇}{34631}{yíng} \XPYU{蝈}{34632}{guō} \XPYU{蝉}{34633}{chán} \XPYU{蝊}{34634}{dìng} @@ -20471,7 +20471,7 @@ \XPYU{蝜}{34652}{fù} \XPYU{蝝}{34653}{yuán} \XPYU{蝞}{34654}{mèi} -\XPYU{蝟}{34655}{wei} +\XPYU{蝟}{34655}{wèi} \XPYU{蝠}{34656}{fú} \XPYU{蝡}{34657}{rú} \XPYU{蝢}{34658}{xié} @@ -20574,7 +20574,7 @@ \XPYU{蟃}{34755}{wàn} \XPYU{蟄}{34756}{zhé} \XPYU{蟅}{34757}{zhè} -\XPYU{蟆}{34758}{ma} +\XPYU{蟆}{34758}{má} \XPYU{蟇}{34759}{má} \XPYU{蟈}{34760}{guō} \XPYU{蟉}{34761}{liú} @@ -20637,7 +20637,7 @@ \XPYU{蠂}{34818}{shè} \XPYU{蠃}{34819}{luǒ} \XPYU{蠄}{34820}{qín} -\XPYU{蠅}{34821}{ying} +\XPYU{蠅}{34821}{yíng} \XPYU{蠆}{34822}{chài} \XPYU{蠇}{34823}{lì} \XPYU{蠈}{34824}{zéi} @@ -20809,7 +20809,7 @@ \XPYU{袮}{34990}{ni} \XPYU{袯}{34991}{bó} \XPYU{袰}{34992}{bō} -\XPYU{袱}{34993}{fu} +\XPYU{袱}{34993}{fú} \XPYU{袲}{34994}{chǐ} \XPYU{袳}{34995}{chǐ} \XPYU{袴}{34996}{kù} @@ -20857,7 +20857,7 @@ \XPYU{裞}{35038}{shuì} \XPYU{裟}{35039}{shā} \XPYU{裠}{35040}{qún} -\XPYU{裡}{35041}{li} +\XPYU{裡}{35041}{lǐ} \XPYU{裢}{35042}{lián} \XPYU{裣}{35043}{liǎn} \XPYU{裤}{35044}{kù} @@ -21015,7 +21015,7 @@ \XPYU{襼}{35196}{yì} \XPYU{襽}{35197}{lan} \XPYU{襾}{35198}{yà} -\XPYU{西}{35199}{xi} +\XPYU{西}{35199}{xī} \XPYU{覀}{35200}{xī} \XPYU{要}{35201}{yào} \XPYU{覂}{35202}{fěng} @@ -21163,7 +21163,7 @@ \XPYU{訐}{35344}{jié} \XPYU{訑}{35345}{yí} \XPYU{訒}{35346}{rèn} -\XPYU{訓}{35347}{xun} +\XPYU{訓}{35347}{xùn} \XPYU{訔}{35348}{yín} \XPYU{訕}{35349}{shàn} \XPYU{訖}{35350}{qì} @@ -21196,7 +21196,7 @@ \XPYU{許}{35377}{xǔ} \XPYU{訲}{35378}{yì} \XPYU{訳}{35379}{yì} -\XPYU{訴}{35380}{su} +\XPYU{訴}{35380}{sù} \XPYU{訵}{35381}{chī} \XPYU{訶}{35382}{hē} \XPYU{訷}{35383}{shēn} @@ -21488,7 +21488,7 @@ \XPYU{譕}{35669}{wú} \XPYU{譖}{35670}{zèn} \XPYU{譗}{35671}{zhá} -\XPYU{識}{35672}{shi} +\XPYU{識}{35672}{shí} \XPYU{譙}{35673}{qiào} \XPYU{譚}{35674}{tán} \XPYU{譛}{35675}{zèn} @@ -21573,7 +21573,7 @@ \XPYU{讪}{35754}{shàn} \XPYU{讫}{35755}{qì} \XPYU{讬}{35756}{tuō} -\XPYU{训}{35757}{xun} +\XPYU{训}{35757}{xùn} \XPYU{议}{35758}{yì} \XPYU{讯}{35759}{xùn} \XPYU{记}{35760}{jì} @@ -21598,10 +21598,10 @@ \XPYU{诃}{35779}{hē} \XPYU{评}{35780}{píng} \XPYU{诅}{35781}{zǔ} -\XPYU{识}{35782}{shi} +\XPYU{识}{35782}{shí} \XPYU{诇}{35783}{xiòng} \XPYU{诈}{35784}{zhà} -\XPYU{诉}{35785}{su} +\XPYU{诉}{35785}{sù} \XPYU{诊}{35786}{zhěn} \XPYU{诋}{35787}{dǐ} \XPYU{诌}{35788}{zhōu} @@ -22471,7 +22471,7 @@ \XPYU{輬}{36652}{liáng} \XPYU{輭}{36653}{ruǎn} \XPYU{輮}{36654}{róu} -\XPYU{輯}{36655}{ji} +\XPYU{輯}{36655}{jí} \XPYU{輰}{36656}{yáng} \XPYU{輱}{36657}{xián} \XPYU{輲}{36658}{chuán} @@ -22569,7 +22569,7 @@ \XPYU{辎}{36750}{zī} \XPYU{辏}{36751}{còu} \XPYU{辐}{36752}{fú} -\XPYU{辑}{36753}{ji} +\XPYU{辑}{36753}{jí} \XPYU{辒}{36754}{wēn} \XPYU{输}{36755}{shū} \XPYU{辔}{36756}{pèi} @@ -23044,7 +23044,7 @@ \XPYU{酩}{37225}{mǐng} \XPYU{酪}{37226}{lào} \XPYU{酫}{37227}{chuò} -\XPYU{酬}{37228}{chou} +\XPYU{酬}{37228}{chóu} \XPYU{酭}{37229}{yòu} \XPYU{酮}{37230}{tóng} \XPYU{酯}{37231}{zhǐ} @@ -23385,7 +23385,7 @@ \XPYU{銾}{37566}{hòng} \XPYU{銿}{37567}{zhōng} \XPYU{鋀}{37568}{tōu} -\XPYU{鋁}{37569}{l̈ǔ} +\XPYU{鋁}{37569}{lǚ} \XPYU{鋂}{37570}{méi} \XPYU{鋃}{37571}{láng} \XPYU{鋄}{37572}{wǎn} @@ -23762,7 +23762,7 @@ \XPYU{鐷}{37943}{yè} \XPYU{鐸}{37944}{duó} \XPYU{鐹}{37945}{guǒ} -\XPYU{鐺}{37946}{dang} +\XPYU{鐺}{37946}{dāng} \XPYU{鐻}{37947}{jù} \XPYU{鐼}{37948}{fén} \XPYU{鐽}{37949}{dá} @@ -23923,9 +23923,9 @@ \XPYU{铘}{38104}{yé} \XPYU{铙}{38105}{náo} \XPYU{铚}{38106}{zhì} -\XPYU{铛}{38107}{dang} +\XPYU{铛}{38107}{dāng} \XPYU{铜}{38108}{tóng} -\XPYU{铝}{38109}{l̈ǔ} +\XPYU{铝}{38109}{lǚ} \XPYU{铞}{38110}{diào} \XPYU{铟}{38111}{yīn} \XPYU{铠}{38112}{kǎi} @@ -25205,7 +25205,7 @@ \XPYU{駚}{39386}{yǎng} \XPYU{駛}{39387}{shǐ} \XPYU{駜}{39388}{bì} -\XPYU{駝}{39389}{tuo} +\XPYU{駝}{39389}{tuó} \XPYU{駞}{39390}{tuó} \XPYU{駟}{39391}{sì} \XPYU{駠}{39392}{liú} @@ -25338,7 +25338,7 @@ \XPYU{驟}{39519}{zhòu} \XPYU{驠}{39520}{yàn} \XPYU{驡}{39521}{lóng} -\XPYU{驢}{39522}{l̈ú} +\XPYU{驢}{39522}{lǘ} \XPYU{驣}{39523}{téng} \XPYU{驤}{39524}{xiāng} \XPYU{驥}{39525}{jì} @@ -25356,7 +25356,7 @@ \XPYU{驱}{39537}{qū} \XPYU{驲}{39538}{rì} \XPYU{驳}{39539}{bó} -\XPYU{驴}{39540}{l̈ú} +\XPYU{驴}{39540}{lǘ} \XPYU{驵}{39541}{zǎng} \XPYU{驶}{39542}{shǐ} \XPYU{驷}{39543}{sì} @@ -25364,7 +25364,7 @@ \XPYU{驹}{39545}{jū} \XPYU{驺}{39546}{zōu} \XPYU{驻}{39547}{zhù} -\XPYU{驼}{39548}{tuo} +\XPYU{驼}{39548}{tuó} \XPYU{驽}{39549}{nú} \XPYU{驾}{39550}{jià} \XPYU{驿}{39551}{yì} @@ -26122,7 +26122,7 @@ \XPYU{鵯}{40303}{bēi} \XPYU{鵰}{40304}{diāo} \XPYU{鵱}{40305}{lù} -\XPYU{鵲}{40306}{que} +\XPYU{鵲}{40306}{què} \XPYU{鵳}{40307}{jiān} \XPYU{鵴}{40308}{jú} \XPYU{鵵}{40309}{tù} @@ -26145,7 +26145,7 @@ \XPYU{鶆}{40326}{lái} \XPYU{鶇}{40327}{dōng} \XPYU{鶈}{40328}{qī} -\XPYU{鶉}{40329}{chun} +\XPYU{鶉}{40329}{chún} \XPYU{鶊}{40330}{gēng} \XPYU{鶋}{40331}{jū} \XPYU{鶌}{40332}{jué} @@ -26338,14 +26338,14 @@ \XPYU{鹇}{40519}{xián} \XPYU{鹈}{40520}{tí} \XPYU{鹉}{40521}{wǔ} -\XPYU{鹊}{40522}{que} +\XPYU{鹊}{40522}{què} \XPYU{鹋}{40523}{miáo} \XPYU{鹌}{40524}{ān} \XPYU{鹍}{40525}{kūn} \XPYU{鹎}{40526}{bēi} \XPYU{鹏}{40527}{péng} \XPYU{鹐}{40528}{qiān} -\XPYU{鹑}{40529}{chun} +\XPYU{鹑}{40529}{chún} \XPYU{鹒}{40530}{gēng} \XPYU{鹓}{40531}{yuān} \XPYU{鹔}{40532}{sù} diff --git a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty index c0f2eb0c7dd..a8ee4120b31 100644 --- a/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty +++ b/Master/texmf-dist/tex/latex/xpinyin/xpinyin.sty @@ -21,10 +21,10 @@ %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: xpinyin.dtx 746 2014-12-23 13:58:49Z sobenlee@gmail.com $ +\GetIdInfo$Id: xpinyin.dtx 749 2014-12-24 15:05:15Z sobenlee@gmail.com $ {Automatically add pinyin to Chinese characters} \ProvidesExplPackage{\ExplFileName} - {\ExplFileDate}{2.0}{\ExplFileDescription} + {\ExplFileDate}{2.1}{\ExplFileDescription} \msg_new:nnn { xpinyin } { no-LuaTeX } { The~xpinyin~package~is~not~supported~in~LuaTeX.\\\\ |