zhnumber (23nov12)

git-svn-id: svn://tug.org/texlive/trunk@28347 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 34 insertions, 30 deletions

diff --git a/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf b/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf
index c57b314c996..b1a9a7fd982 100644
--- a/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf
+++ b/Master/texmf-dist/doc/latex/zhnumber/zhnumber.pdf
diff --git a/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx b/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx
index 559498c7c57..8fd4b479293 100644
--- a/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx
+++ b/Master/texmf-dist/source/latex/zhnumber/zhnumber.dtx
@@ -154,11 +154,11 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %</driver>
 \RequirePackage{expl3}
 %</driver|package>
-%<package|config>\GetIdInfo$Id: zhnumber.dtx 351 2012-07-20 05:30:58Z sobenlee $
-%<package>          {package for typesetting numbers with Chinese glyphs}
-%<config&utf8>          {Chinese numerals with UTF8 encoding}
-%<config&big5>          {Chinese numerals with Big5 encoding}
-%<config&gbk>          {Chinese numerals with Big5 encoding}
+%<package|config>\GetIdInfo$Id: zhnumber.dtx 367 2012-11-23 04:45:50Z sobenlee $
+%<package>  {Typesetting numbers with Chinese glyphs}
+%<config&utf8>  {Chinese numerals with UTF8 encoding}
+%<config&big5>  {Chinese numerals with Big5 encoding}
+%<config&gbk>  {Chinese numerals with Big5 encoding}
 %<package>\ProvidesExplPackage{\ExplFileName}{\ExplFileDate}{1.6}{\ExplFileDescription}
 %<config>\ProvidesExplFile
 %<config&utf8>  {\ExplFileName-utf8.cfg}
@@ -167,17 +167,18 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %<config>  {\ExplFileDate} {1.6} {\ExplFileDescription}
 %
 %<*driver>
-\documentclass{l3doc}
+\documentclass[full,a4paper]{l3doc}
 \usepackage{amsmath}
 \usepackage{xeCJK}
 \usepackage{zhnumber}
 \usepackage{fvrb-ex}
 \usepackage{metalogo}
+\usepackage{geometry}
+\geometry{includemp,hmargin={0mm,15mm},vmargin=15mm,footskip=7mm}
+\BeforeBeginEnvironment{SideBySideExample}{\vskip1ex\relax}
 \hypersetup{pdfstartview=FitH}
 \setlist{nosep}
 \linespread{1.1}
-\addtolength{\voffset}{-5\baselineskip}
-\addtolength\textheight{8\baselineskip}
 \setmainfont{TeX Gyre Pagella}
 \setmonofont{Inconsolata}
 \xeCJKDeclareCharClass{CJK}{ "25CB }
@@ -193,7 +194,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 \def\TFF{true\orvar\defaultvar{false}}
 \def\orvar{\char`\|}
 \let\defaultvar\textbf
-\def\argbrace#1{\char`\{#1\char`\}}
+\def\argbrace#1{\{#1\}}
 \@addtoreset{CodelineNo}{section}
 \makeatother
 \def\indexname{代码索引}
@@ -204,10 +205,13 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
   数字表示对应项使用时所在的行号。}
 \begin{document}
   \DocInput{\jobname.dtx}
+  \newgeometry{margin=15mm,footskip=7mm}
+  \PrintIndex
 \end{document}
 %</driver>
 % \fi
 %
+% \CheckSum{844}
 % \GetFileInfo{\jobname.sty}
 %
 % \title{\bfseries\pkg{zhnumber} 宏包}
@@ -241,7 +245,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %   \begin{syntax}
 %     \cs{zhnumber} \marg{number}
 %   \end{syntax}
-%   以中文格式输出数字。这里的数字可以是整数、小数和分数。例如\\[1ex]
+%   以中文格式输出数字。这里的数字可以是整数、小数和分数。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhnumber{2012020120}\\
 %     \zhnumber{2 012 020 120}\\
@@ -261,7 +265,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %     \cs{zhdigits} \marg{number}
 %   \end{syntax}
 %   将阿拉伯数字转换为中文数字串。缺省状态下，|\zhdigits| 将 0 映射为〇，如果需要
-%   将其映射为零，可以使用 |\zhdigits*|。例如\\[1ex]
+%   将其映射为零，可以使用 |\zhdigits*|。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhdigits{2012020120}\\
 %     \zhdigits*{2012020120}
@@ -272,7 +276,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %   \begin{syntax}
 %     \cs{zhnum} \marg{counter}
 %   \end{syntax}
-%   与 |\roman| 等类似，用于将 \LaTeX 计数器的值转换为中文数字。例如\\[1ex]
+%   与 |\roman| 等类似，用于将 \LaTeX 计数器的值转换为中文数字。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhnum{section}
 %   \end{SideBySideExample}
@@ -282,7 +286,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %   \begin{syntax}
 %     \cs{zhweekday} \Arg{yyyy/mm/dd}
 %   \end{syntax}
-%   输出日期当天的星期。例如\\[1ex]
+%   输出日期当天的星期。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhweekday{2012/5/20}
 %   \end{SideBySideExample}
@@ -293,7 +297,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %     \cs{zhdate}  \Arg{yyyy/mm/dd}
 %     \cs{zhdate*} \Arg{yyyy/mm/dd}
 %   \end{syntax}
-%   以中文格式输出日期，其中带 |*| 的命令还输出星期。例如\\[1ex]
+%   以中文格式输出日期，其中带 |*| 的命令还输出星期。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhdate{2012/5/21}\\
 %     \zhdate*{2012/5/21}
@@ -301,7 +305,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 % \end{function}
 %
 % \begin{function}[added=2012-5-25]{\zhtoday}
-%   与 |\today| 类似，以中文输出当天的日期。例如\\[1ex]
+%   与 |\today| 类似，以中文输出当天的日期。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhtoday
 %   \end{SideBySideExample}
@@ -311,14 +315,14 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %   \begin{syntax}
 %     \cs{zhtime} \Arg{hh:mm}
 %   \end{syntax}
-%   以中文格式输出时间。例如\\[1ex]
+%   以中文格式输出时间。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhtime{23:56}
 %   \end{SideBySideExample}
 % \end{function}
 %
 % \begin{function}[added=2012-5-25]{\zhcurrtime}
-%   输出当前的时间。例如\\[1ex]
+%   输出当前的时间。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhcurrtime
 %   \end{SideBySideExample}
@@ -346,7 +350,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %     time =  \argbrace{\meta{Arabic}\orvar\meta{Chinese}}
 %   \end{syntax}
 %   设置日期和时间的数字格式，\meta{Arabic} 为阿拉伯数字，而 \meta{Chinese} 为中文数字。
-%   默认使用阿拉伯数字。例如\\[1ex]
+%   默认使用阿拉伯数字。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.6\linewidth,gobble=5]
 %     \zhnumsetup{time=Chinese}
 %     \zhtoday\zhcurrtime
@@ -365,7 +369,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %     \item[Financial]  以大写形式输出中文数字；
 %     \item[Ancient] 以廿输出 20，以卅输出 30，以卌输出 40，以皕输出 200。
 %   \end{itemize}
-%   可以设置 |style| 为其中一个，也可以是前三个与后两个的适当组合，默认是简体小写。例如\\[1ex]
+%   可以设置 |style| 为其中一个，也可以是前三个与后两个的适当组合，默认是简体小写。例如
 %   \begin{SideBySideExample}[frame=single,numbers=left,xrightmargin=.4\linewidth,gobble=5]
 %     \zhnumsetup{style={Traditional,Financial}}
 %     \zhnumber{62012.3}\\
@@ -420,6 +424,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %
 % \end{documentation}
 %
+% \StopEventually{}
 %
 % \begin{implementation}
 %
@@ -961,7 +966,7 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
       {
         \int_incr:N \l_tmpa_int
         \tl_set:Nx \l_tmpa_tl
-          { c_zhnum_scale_ \zhnum_int_to_word:n {  \l_tmpa_int + \c_eleven } _tl }
+          { c_zhnum_scale_ \zhnum_int_to_word:n { \l_tmpa_int + \c_eleven } _tl }
         \tl_if_exist:cF \l_tmpa_tl { \int_incr:N \g_zhnum_scale_int }
         \tl_set:cn { \l_tmpa_tl } {##1}
       }
@@ -1382,7 +1387,6 @@ and some specific Chinese Simplified fonts (TrueType or OpenType).
 %
 % \end{implementation}
 %
-% \PrintIndex
 % \Finale
 %
 \endinput
diff --git a/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-big5.cfg b/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-big5.cfg
index 77e0aa94e1c..8768ba36c21 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-big5.cfg
+++ b/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-big5.cfg
@@ -19,8 +19,8 @@
 %%    This work has the LPPL maintenance status "maintained".
 %%    The Current Maintainer of this work is Qing Lee.
 %% 
-\GetIdInfo$Id: zhnumber.dtx 351 2012-07-20 05:30:58Z sobenlee $
-          {Chinese numerals with Big5 encoding}
+\GetIdInfo$Id: zhnumber.dtx 367 2012-11-23 04:45:50Z sobenlee $
+  {Chinese numerals with Big5 encoding}
 \ProvidesExplFile
   {\ExplFileName-big5.cfg}
   {\ExplFileDate} {1.6} {\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-gbk.cfg b/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-gbk.cfg
index ddb11b0af3c..677c43e8ecc 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-gbk.cfg
+++ b/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-gbk.cfg
@@ -19,8 +19,8 @@
 %%    This work has the LPPL maintenance status "maintained".
 %%    The Current Maintainer of this work is Qing Lee.
 %% 
-\GetIdInfo$Id: zhnumber.dtx 351 2012-07-20 05:30:58Z sobenlee $
-          {Chinese numerals with Big5 encoding}
+\GetIdInfo$Id: zhnumber.dtx 367 2012-11-23 04:45:50Z sobenlee $
+  {Chinese numerals with Big5 encoding}
 \ProvidesExplFile
   {\ExplFileName-gbk.cfg}
   {\ExplFileDate} {1.6} {\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-utf8.cfg b/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-utf8.cfg
index 56ef8ea5cdf..99d563fa506 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-utf8.cfg
+++ b/Master/texmf-dist/tex/latex/zhnumber/config/zhnumber-utf8.cfg
@@ -19,8 +19,8 @@
 %%    This work has the LPPL maintenance status "maintained".
 %%    The Current Maintainer of this work is Qing Lee.
 %% 
-\GetIdInfo$Id: zhnumber.dtx 351 2012-07-20 05:30:58Z sobenlee $
-          {Chinese numerals with UTF8 encoding}
+\GetIdInfo$Id: zhnumber.dtx 367 2012-11-23 04:45:50Z sobenlee $
+  {Chinese numerals with UTF8 encoding}
 \ProvidesExplFile
   {\ExplFileName-utf8.cfg}
   {\ExplFileDate} {1.6} {\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty b/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty
index d46e95263d4..64d6ecab90c 100644
--- a/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty
+++ b/Master/texmf-dist/tex/latex/zhnumber/zhnumber.sty
@@ -21,8 +21,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{expl3}
-\GetIdInfo$Id: zhnumber.dtx 351 2012-07-20 05:30:58Z sobenlee $
-          {package for typesetting numbers with Chinese glyphs}
+\GetIdInfo$Id: zhnumber.dtx 367 2012-11-23 04:45:50Z sobenlee $
+  {Typesetting numbers with Chinese glyphs}
 \ProvidesExplPackage{\ExplFileName}{\ExplFileDate}{1.6}{\ExplFileDescription}
 \msg_new:nnn { zhnumber } { l3-too-old }
   {
@@ -364,7 +364,7 @@
       {
         \int_incr:N \l_tmpa_int
         \tl_set:Nx \l_tmpa_tl
-          { c_zhnum_scale_ \zhnum_int_to_word:n {  \l_tmpa_int + \c_eleven } _tl }
+          { c_zhnum_scale_ \zhnum_int_to_word:n { \l_tmpa_int + \c_eleven } _tl }
         \tl_if_exist:cF \l_tmpa_tl { \int_incr:N \g_zhnum_scale_int }
         \tl_set:cn { \l_tmpa_tl } {##1}
       }