Hello community, here is the log from the commit of package texlive-specs-z for openSUSE:Factory checked in at 2016-07-26 13:00:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-z (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-z.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-z" Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-z/texlive-specs-z.changes 2016-04-22 16:22:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-z.new/texlive-specs-z.changes 2016-07-26 13:12:49.000000000 +0200 @@ -1,0 +2,38 @@ +Fri Jul 15 10:02:40 UTC 2016 - [email protected] + +- Avoid missing dependencies due upstream package splits + +------------------------------------------------------------------- +Mon Jun 20 15:00:31 UTC 2016 - [email protected] + +- Avoid extend spec sciptlets for changing language hyphen file + but write out the pieces of the hyphen entries into seperate + files to be able to generate the final language hyphen files (boo#984878) + +------------------------------------------------------------------- +Mon Jun 20 07:47:44 UTC 2016 - [email protected] + +- Move spectra.data.tex from doc to main package of pgf-spectra (boo#985578) + +------------------------------------------------------------------- +Wed Jun 8 07:08:27 UTC 2016 - [email protected] + +- Update to TeXLive 2016 +- Delete dvipdfmx.post and xetex.post and use the upstream perl scripts +- Modify the patches + kpathsea_cnf.dif + latex2man_tmphandling.dif + luaotfload_varfonts.dif + musixtex_various.dif + tetex_scripts.dif + texconfig_scripts.dif + texdoc_cnf.dif + texdraw_info.dif + texlive-specs.changes + +------------------------------------------------------------------- +Mon Apr 11 14:04:41 UTC 2016 - [email protected] + +- There is no texlive-misc with null.tex anymore but texlive-knuth-lib + +------------------------------------------------------------------- Old: ---- york-thesis.doc.tar.xz york-thesis.tar.xz New: ---- zhmetrics-uptex.doc.tar.xz zhmetrics-uptex.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-z.spec ++++++ ++++ 1310 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-z/texlive-specs-z.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-z.new/texlive-specs-z.spec ++++++ youngtab.doc.tar.xz ++++++ ++++++ youngtab.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/youngtab.tlpobj new/tlpkg/tlpobj/youngtab.tlpobj --- old/tlpkg/tlpobj/youngtab.tlpobj 2015-04-13 02:52:54.000000000 +0200 +++ new/tlpkg/tlpobj/youngtab.tlpobj 2016-04-14 20:09:43.000000000 +0200 @@ -1,14 +1,16 @@ name youngtab category Package revision 17635 -shortdesc Typeset Young-Tableaux. +shortdesc Typeset Young-Tableaux relocated 1 longdesc A package for typesetting Young-Tableaux, mathematical symbols longdesc for the representations of groups, providing two macros, longdesc \yng(1) and \young(1) to generate the whole Young-Tableaux. runfiles size=2 RELOC/tex/latex/youngtab/youngtab.sty +catalogue-also young ytableau catalogue-ctan /macros/latex/contrib/youngtab -catalogue-date 2012-04-16 12:07:42 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl1 +catalogue-topics maths catalogue-version 1.1 ++++++ yplan.doc.tar.xz ++++++ ++++++ yplan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/yplan.tlpobj new/tlpkg/tlpobj/yplan.tlpobj --- old/tlpkg/tlpobj/yplan.tlpobj 2015-04-13 02:52:54.000000000 +0200 +++ new/tlpkg/tlpobj/yplan.tlpobj 2016-04-14 20:09:43.000000000 +0200 @@ -1,7 +1,7 @@ name yplan category Package revision 34398 -shortdesc Daily planner type calendar. +shortdesc Daily planner type calendar longdesc Prints two six-monthly vertical-type daily planner (i.e., longdesc months along the top, days downwards), with each 6-month period longdesc fitting onto a single A4 (or US letter) sheet. The package @@ -15,5 +15,6 @@ texmf-dist/scripts/yplan/yplan texmf-dist/tex/latex/yplan/yplan.sty catalogue-ctan /macros/latex/contrib/yplan -catalogue-date 2012-04-16 12:15:05 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl +catalogue-topics calendar ++++++ ytableau.doc.tar.xz ++++++ ++++++ ytableau.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ytableau.tlpobj new/tlpkg/tlpobj/ytableau.tlpobj --- old/tlpkg/tlpobj/ytableau.tlpobj 2015-04-13 02:52:55.000000000 +0200 +++ new/tlpkg/tlpobj/ytableau.tlpobj 2016-04-14 20:09:44.000000000 +0200 @@ -1,7 +1,7 @@ name ytableau category Package revision 27430 -shortdesc Many-featured Young tableaux and Young diagrams. +shortdesc Many-featured Young tableaux and Young diagrams relocated 1 longdesc The package provides several functions for drawing Young longdesc tableaux and Young diagrams, extending the young and youngtab @@ -10,7 +10,9 @@ longdesc both at package load and configurably. runfiles size=3 RELOC/tex/latex/ytableau/ytableau.sty +catalogue-also youngtab young catalogue-ctan /macros/latex/contrib/ytableau -catalogue-date 2014-02-26 23:03:13 +0100 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl1.2 +catalogue-topics maths catalogue-version 1.3 ++++++ zapfchan.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zapfchan.tlpobj new/tlpkg/tlpobj/zapfchan.tlpobj --- old/tlpkg/tlpobj/zapfchan.tlpobj 2015-04-13 02:52:55.000000000 +0200 +++ new/tlpkg/tlpobj/zapfchan.tlpobj 2016-04-14 20:09:44.000000000 +0200 @@ -2,7 +2,7 @@ category Package revision 31835 catalogue urw-base35 -shortdesc URW "Base 35" font pack for LaTeX. +shortdesc URW "Base 35" font pack for LaTeX relocated 1 longdesc A set of fonts for use as "drop-in" replacements for Adobe's longdesc basic set, comprising: Century Schoolbook (substituting for @@ -44,6 +44,8 @@ RELOC/tex/latex/zapfchan/ot1uzc.fd RELOC/tex/latex/zapfchan/t1uzc.fd RELOC/tex/latex/zapfchan/ts1uzc.fd +catalogue-also tex-gyre catalogue-ctan /fonts/urw/base35 -catalogue-date 2014-06-07 20:47:53 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license gpl +catalogue-topics font font-type1 font-collection ++++++ zapfding.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zapfding.tlpobj new/tlpkg/tlpobj/zapfding.tlpobj --- old/tlpkg/tlpobj/zapfding.tlpobj 2015-04-13 02:52:55.000000000 +0200 +++ new/tlpkg/tlpobj/zapfding.tlpobj 2016-04-14 20:09:44.000000000 +0200 @@ -2,7 +2,7 @@ category Package revision 31835 catalogue urw-base35 -shortdesc URW "Base 35" font pack for LaTeX. +shortdesc URW "Base 35" font pack for LaTeX relocated 1 longdesc A set of fonts for use as "drop-in" replacements for Adobe's longdesc basic set, comprising: Century Schoolbook (substituting for @@ -25,6 +25,8 @@ RELOC/fonts/type1/urw/zapfding/uzdr.pfb RELOC/fonts/type1/urw/zapfding/uzdr.pfm RELOC/tex/latex/zapfding/uuzd.fd +catalogue-also tex-gyre catalogue-ctan /fonts/urw/base35 -catalogue-date 2014-06-07 20:47:53 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license gpl +catalogue-topics font font-type1 font-collection ++++++ zed-csp.doc.tar.xz ++++++ ++++++ zed-csp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zed-csp.tlpobj new/tlpkg/tlpobj/zed-csp.tlpobj --- old/tlpkg/tlpobj/zed-csp.tlpobj 2015-04-13 02:52:56.000000000 +0200 +++ new/tlpkg/tlpobj/zed-csp.tlpobj 2016-04-14 20:09:44.000000000 +0200 @@ -1,13 +1,15 @@ name zed-csp category Package revision 17258 -shortdesc Typesetting Z and CSP format specifications. +shortdesc Typesetting Z and CSP format specifications relocated 1 longdesc The package supports real-time CSP and incorporates the longdesc functionality of Spivey's original Z package, written for LaTeX longdesc 2.09. runfiles size=8 RELOC/tex/latex/zed-csp/zed-csp.sty +catalogue-also objectz catalogue-ctan /macros/latex/contrib/zed-csp -catalogue-date 2012-03-30 15:19:52 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license other-free +catalogue-topics formal-spec ++++++ zhmetrics.doc.tar.xz ++++++ ++++++ zhmetrics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhmetrics.tlpobj new/tlpkg/tlpobj/zhmetrics.tlpobj --- old/tlpkg/tlpobj/zhmetrics.tlpobj 2015-04-13 02:52:56.000000000 +0200 +++ new/tlpkg/tlpobj/zhmetrics.tlpobj 2016-04-14 20:09:45.000000000 +0200 @@ -1,7 +1,7 @@ name zhmetrics category Package revision 22207 -shortdesc TFM subfont files for using Chinese fonts in 8-bit TeX. +shortdesc TFM subfont files for using Chinese fonts in 8-bit TeX relocated 1 longdesc These are metrics to use existing Chinese TrueType fonts in longdesc workflows that use LaTeX & dvipdfmx, or pdfLaTeX. The fonts @@ -4947,6 +4947,7 @@ RELOC/tex/latex/zhmetrics/c70zhsong.fd RELOC/tex/latex/zhmetrics/c70zhyou.fd catalogue-ctan /fonts/psfonts/zhmetrics -catalogue-date 2014-02-26 23:03:13 +0100 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl +catalogue-topics font-use font-cjk chinese catalogue-version r206 ++++++ zhnumber.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zhnumber/README new/doc/latex/zhnumber/README --- old/doc/latex/zhnumber/README 2015-06-20 00:32:13.000000000 +0200 +++ new/doc/latex/zhnumber/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,71 +0,0 @@ -Introduction ------------- -The zhnumber package provides commands to typeset Chinese representations of -numbers. The main difference between this package and 'CJKnumb' is that commands -provided by this package is expandable in the proper way. So, it seems that -zhnumber is a good alternative to CJKnumb package. - -It may be distributed and/or modified under the conditions of the -LaTeX Project Public License (LPPL), either version 1.3c of this license or -(at your option) any later version. The latest version of this license is in - - http://www.latex-project.org/lppl.txt - -and version 1.3 or later is part of all distributions of LaTeX version -2005/12/01 or later. - -This work has the LPPL maintenance status "maintained". -The Current Maintainer of this work is Qing Lee. - -This work consists of the file zhnumber.dtx, - and the derived files zhnumber.pdf, - zhnumber.sty, - zhnumber-utf8.cfg, - zhnumber-gbk.cfg, - zhnumber-big5.cfg, - zhnumber.ins and - README (this file). - -Basic Usage ------------ -The package provides the following macros: - - \zhnumber{number} - Convert `number' to a full Chinese representation. - - \zhnum{counter} - Similar to \arabic{counter}, but representation of 'counter' as Chinese numerals. - - \zhdigits{number} - \zhdigits*{number} - Handle `number' as a string of digits and convert each of them into the - corresponding Chinese digit. The starred version uses the Chinese circle glyph - for digit zero; the unstarred version uses the traditional glyph. - -You can read the package manual (in Chinese) for more detailed explanations. - -Author ------- -Qing Lee -Email: [email protected] - -If you are interested in the process of development you may observe - - https://github.com/CTeX-org/ctex-kit - -Installation ------------- -The package is supplied in dtx format and as a pre-extracted zip file, -zhnumber.tds.zip. The later is most convenient for most users: simply -unzip this in your local texmf directory and run texhash to update the -database of file locations. If you want to unpack the dtx yourself, -running "xetex zhnumber.dtx" will extract the package whereas -"xelatex zhnumber.dtx" will typeset the documentation. - -The package requires LaTeX3 support as provided in the l3kernel and l3packages -bundles. Both of these are available on CTAN as ready-to-install zip files. -Suitable versions are available in the latest version of MiKTeX and TeX Live -(updating the relevant packages online may be necessary). - -To compile the documentation without error, you will need the xeCJK package -and some specific Chinese Simplified fonts (TrueType or OpenType). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zhnumber/README.md new/doc/latex/zhnumber/README.md --- old/doc/latex/zhnumber/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/zhnumber/README.md 2016-05-15 00:03:58.000000000 +0200 @@ -0,0 +1,65 @@ +zhnumber +======== + +The `zhnumber` package provides commands to typeset Chinese representations of +numbers. The main difference between this package and `CJKnumb` is that commands +provided by this package is expandable in the proper way. So, it seems that +zhnumber is a good alternative to `CJKnumb` package. + +Basic Usage +----------- +The package provides the following macros: + + \zhnumber{<number>} + +Convert `<number>` to a full Chinese representation. + + \zhnum{<counter>} + +Similar to `\arabic{<counter>}`, but representation of `<counter>` +as Chinese numerals. + + \zhdigits{<number>} + \zhdigits*{<number>} + +Handle `<number>` as a string of digits and convert each of them into the +corresponding Chinese digit. The starred version uses the Chinese circle glyph +for digit zero; the unstarred version uses the traditional glyph. + +You can read the package manual (in Chinese) for more detailed explanations. + +Contributing +------------ + +This package is a part of the [ctex-kit](https://github.com/CTeX-org/ctex-kit) project. + +Issues and pull requests are welcome. + +Copyright and Licence +--------------------- + + Copyright (C) 2012, 2014-2016 by Qing Lee <[email protected]> + ---------------------------------------------------------------------- + + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either + version 1.3c of this license or (at your option) any later + version. This version of this license is in + http://www.latex-project.org/lppl/lppl-1-3c.txt + and the latest version of this license is in + http://www.latex-project.org/lppl.txt + and version 1.3 or later is part of all distributions of + LaTeX version 2005/12/01 or later. + + This work has the LPPL maintenance status `maintained'. + + The Current Maintainer of this work is Qing Lee. + + This package consists of the file zhnumber.dtx, + and the derived files zhnumber.pdf, + zhnumber.sty, + zhnumber-utf8.cfg, + zhnumber-gbk.cfg, + zhnumber-big5.cfg, + zhnumber.ins and + README.md (this file). Files old/doc/latex/zhnumber/zhnumber.pdf and new/doc/latex/zhnumber/zhnumber.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhnumber.doc.tlpobj new/tlpkg/tlpobj/zhnumber.doc.tlpobj --- old/tlpkg/tlpobj/zhnumber.doc.tlpobj 2015-06-20 03:22:21.000000000 +0200 +++ new/tlpkg/tlpobj/zhnumber.doc.tlpobj 2016-05-15 03:21:48.000000000 +0200 @@ -1,8 +1,8 @@ name zhnumber.doc category Package -revision 37614 +revision 41123 shortdesc doc files of zhnumber relocated 1 -docfiles size=82 - RELOC/doc/latex/zhnumber/README +docfiles size=72 + RELOC/doc/latex/zhnumber/README.md RELOC/doc/latex/zhnumber/zhnumber.pdf ++++++ zhnumber.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhnumber/zhnumber-big5.cfg new/tex/latex/zhnumber/zhnumber-big5.cfg --- old/tex/latex/zhnumber/zhnumber-big5.cfg 2015-06-20 00:32:13.000000000 +0200 +++ new/tex/latex/zhnumber/zhnumber-big5.cfg 2016-05-15 00:03:58.000000000 +0200 @@ -6,24 +6,29 @@ %% %% zhnumber.dtx (with options: `config,big5') %% -%% Copyright (C) 2012, 2014, 2015 by Qing Lee <[email protected]> +%% Copyright (C) 2012, 2014-2016 by Qing Lee <[email protected]> %% -------------------------------------------------------------------------- -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. %% -%% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Qing Lee. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. %% -\GetIdInfo$Id: zhnumber.dtx 42dbb38 2015-05-21 23:20:32 +0800 Qing Lee <[email protected]> $ +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Qing Lee. +%% +%% -------------------------------------------------------------------------- +%% +\GetIdInfo$Id: zhnumber.dtx e19bfb4 2016-05-14 12:23:34 +0800 Qing Lee <[email protected]> $ {Chinese numerals with Big5 encoding} -\ProvidesExplFile - {\ExplFileName-big5.cfg} - {\ExplFileDate}{2.2}{\ExplFileDescription} +\ProvidesExplFile{\ExplFileName-big5.cfg} + {\ExplFileDate}{2.4}{\ExplFileDescription} \zhnum_set_digits_map:nn { minus } { �t } \zhnum_set_digits_map:nn { 0 } { �s } \zhnum_set_digits_map:nn { null } { �� } @@ -100,13 +105,13 @@ \zhnum_set_dizhi_map:nn { 11 } { �� } \zhnum_set_dizhi_map:nn { 12 } { �� } %% -%% This package consists of the file zhnumber.dtx, -%% and the derived files zhnumber.pdf, -%% zhnumber.sty, -%% zhnumber-utf8.cfg, -%% zhnumber-gbk.cfg, -%% zhnumber-big5.cfg, -%% zhnumber.ins and -%% README. +%% This package consists of the file zhnumber.dtx, +%% and the derived files zhnumber.pdf, +%% zhnumber.sty, +%% zhnumber-utf8.cfg, +%% zhnumber-gbk.cfg, +%% zhnumber-big5.cfg, +%% zhnumber.ins and +%% README.md. %% %% End of file `zhnumber-big5.cfg'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhnumber/zhnumber-gbk.cfg new/tex/latex/zhnumber/zhnumber-gbk.cfg --- old/tex/latex/zhnumber/zhnumber-gbk.cfg 2015-06-20 00:32:13.000000000 +0200 +++ new/tex/latex/zhnumber/zhnumber-gbk.cfg 2016-05-15 00:03:58.000000000 +0200 @@ -6,24 +6,29 @@ %% %% zhnumber.dtx (with options: `config,gbk') %% -%% Copyright (C) 2012, 2014, 2015 by Qing Lee <[email protected]> +%% Copyright (C) 2012, 2014-2016 by Qing Lee <[email protected]> %% -------------------------------------------------------------------------- -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. %% -%% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Qing Lee. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. %% -\GetIdInfo$Id: zhnumber.dtx 42dbb38 2015-05-21 23:20:32 +0800 Qing Lee <[email protected]> $ +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Qing Lee. +%% +%% -------------------------------------------------------------------------- +%% +\GetIdInfo$Id: zhnumber.dtx e19bfb4 2016-05-14 12:23:34 +0800 Qing Lee <[email protected]> $ {Chinese numerals with GBK encoding} -\ProvidesExplFile - {\ExplFileName-gbk.cfg} - {\ExplFileDate}{2.2}{\ExplFileDescription} +\ProvidesExplFile{\ExplFileName-gbk.cfg} + {\ExplFileDate}{2.4}{\ExplFileDescription} \zhnum_set_digits_map:nnn { minus } { simp } { �� } \zhnum_set_digits_map:nnn { minus } { trad } { ؓ } \zhnum_set_digits_map:nn { 0 } { �� } @@ -110,13 +115,13 @@ \zhnum_set_dizhi_map:nn { 11 } { �� } \zhnum_set_dizhi_map:nn { 12 } { �� } %% -%% This package consists of the file zhnumber.dtx, -%% and the derived files zhnumber.pdf, -%% zhnumber.sty, -%% zhnumber-utf8.cfg, -%% zhnumber-gbk.cfg, -%% zhnumber-big5.cfg, -%% zhnumber.ins and -%% README. +%% This package consists of the file zhnumber.dtx, +%% and the derived files zhnumber.pdf, +%% zhnumber.sty, +%% zhnumber-utf8.cfg, +%% zhnumber-gbk.cfg, +%% zhnumber-big5.cfg, +%% zhnumber.ins and +%% README.md. %% %% End of file `zhnumber-gbk.cfg'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhnumber/zhnumber-utf8.cfg new/tex/latex/zhnumber/zhnumber-utf8.cfg --- old/tex/latex/zhnumber/zhnumber-utf8.cfg 2015-06-20 00:32:13.000000000 +0200 +++ new/tex/latex/zhnumber/zhnumber-utf8.cfg 2016-05-15 00:03:58.000000000 +0200 @@ -6,24 +6,29 @@ %% %% zhnumber.dtx (with options: `config,utf8') %% -%% Copyright (C) 2012, 2014, 2015 by Qing Lee <[email protected]> +%% Copyright (C) 2012, 2014-2016 by Qing Lee <[email protected]> %% -------------------------------------------------------------------------- -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. %% -%% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Qing Lee. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. %% -\GetIdInfo$Id: zhnumber.dtx 42dbb38 2015-05-21 23:20:32 +0800 Qing Lee <[email protected]> $ +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Qing Lee. +%% +%% -------------------------------------------------------------------------- +%% +\GetIdInfo$Id: zhnumber.dtx e19bfb4 2016-05-14 12:23:34 +0800 Qing Lee <[email protected]> $ {Chinese numerals with UTF8 encoding} -\ProvidesExplFile - {\ExplFileName-utf8.cfg} - {\ExplFileDate}{2.2}{\ExplFileDescription} +\ProvidesExplFile{\ExplFileName-utf8.cfg} + {\ExplFileDate}{2.4}{\ExplFileDescription} \zhnum_set_digits_map:nnn { minus } { simp } { 负 } \zhnum_set_digits_map:nnn { minus } { trad } { 負 } \zhnum_set_digits_map:nn { 0 } { 零 } @@ -110,13 +115,13 @@ \zhnum_set_dizhi_map:nn { 11 } { 戌 } \zhnum_set_dizhi_map:nn { 12 } { 亥 } %% -%% This package consists of the file zhnumber.dtx, -%% and the derived files zhnumber.pdf, -%% zhnumber.sty, -%% zhnumber-utf8.cfg, -%% zhnumber-gbk.cfg, -%% zhnumber-big5.cfg, -%% zhnumber.ins and -%% README. +%% This package consists of the file zhnumber.dtx, +%% and the derived files zhnumber.pdf, +%% zhnumber.sty, +%% zhnumber-utf8.cfg, +%% zhnumber-gbk.cfg, +%% zhnumber-big5.cfg, +%% zhnumber.ins and +%% README.md. %% %% End of file `zhnumber-utf8.cfg'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhnumber/zhnumber.sty new/tex/latex/zhnumber/zhnumber.sty --- old/tex/latex/zhnumber/zhnumber.sty 2015-06-20 00:32:13.000000000 +0200 +++ new/tex/latex/zhnumber/zhnumber.sty 2016-05-15 00:03:58.000000000 +0200 @@ -6,26 +6,31 @@ %% %% zhnumber.dtx (with options: `package') %% -%% Copyright (C) 2012, 2014, 2015 by Qing Lee <[email protected]> +%% Copyright (C) 2012, 2014-2016 by Qing Lee <[email protected]> %% -------------------------------------------------------------------------- -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. %% -%% This work has the LPPL maintenance status "maintained". -%% The Current Maintainer of this work is Qing Lee. +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either +%% version 1.3c of this license or (at your option) any later +%% version. This version of this license is in +%% http://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of +%% LaTeX version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Qing Lee. +%% +%% -------------------------------------------------------------------------- %% \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\GetIdInfo$Id: zhnumber.dtx 42dbb38 2015-05-21 23:20:32 +0800 Qing Lee <[email protected]> $ +\GetIdInfo$Id: zhnumber.dtx e19bfb4 2016-05-14 12:23:34 +0800 Qing Lee <[email protected]> $ {Typesetting numbers with Chinese glyphs} -\ProvidesExplPackage - {\ExplFileName} - {\ExplFileDate}{2.2}{\ExplFileDescription} +\ProvidesExplPackage{\ExplFileName} + {\ExplFileDate}{2.4}{\ExplFileDescription} \msg_new:nnn { zhnumber } { l3-too-old } { Support~package~'expl3'~too~old. \\\\ @@ -33,7 +38,7 @@ 'l3kernel'~and~'l3packages'\\\\ using~your~TeX~package~manager~or~from~CTAN. } -\@ifpackagelater { expl3 } { 2014/08/25 } { } +\@ifpackagelater { expl3 } { 2015/09/24 } { } { \msg_error:nn { zhnumber } { l3-too-old } } \RequirePackage { xparse , l3keys2e } \DeclareExpandableDocumentCommand \zhnumber { +o +m } @@ -118,7 +123,9 @@ { \__zhnum_counter_error:n {#1} } } \cs_new:Npn \__zhnum_counter_error:n #1 - { \__msg_expandable_error:n { `#1'~is~not~a~LaTeX~counter. } } + { \msg_expandable_error:nnn { zhnumber } { not-counter } {#1} } +\msg_new:nnn { zhnumber } { not-counter } + { `#1'~is~not~a~LaTeX~counter. } \cs_new:Npn \zhnum_int:n #1 { \int_compare:nNnTF {#1} > \c_zero @@ -133,12 +140,13 @@ } } \cs_generate_variant:Nn \zhnum_int:n { c } +\cs_new_nopar:Npn \@zhnum { \zhnum_int:n } \cs_new:Npn \zhnum_integer:n #1 { \exp_after:wN \__zhnum_read_integer:www \tex_number:D \exp_after:wN \__zhnum_read_sign_loop:N - \tex_romannumeral:D -`0 \use:n + \exp:w \exp_end_continue_f:w \use:n #1 \exp_stop_f: \q_recursion_tail \q_recursion_stop \__zhnum_result:nn { \c_zero } { } ; } @@ -146,10 +154,10 @@ { \if:w + \if:w - \exp_not:N #1 + \fi: \exp_not:N #1 \exp_after:wN \__zhnum_read_sign_loop:N - \tex_romannumeral:D -`0 \exp_after:wN \use:n + \exp:w \exp_end_continue_f:w \exp_after:wN \use:n \else: 1 \exp_after:wN ; - \tex_romannumeral:D -`0 + \exp:w \exp_end_continue_f:w \exp_after:wN \__zhnum_read_zeros_loop:N \exp_after:wN #1 \fi: @@ -158,7 +166,7 @@ { \if:w 0 \exp_not:N #1 \exp_after:wN \__zhnum_read_zeros_loop:N - \tex_romannumeral:D -`0 \exp_after:wN \use:n + \exp:w \exp_end_continue_f:w \exp_after:wN \use:n \else: \exp_after:wN \__zhnum_read_abs_loop:Nw \exp_after:wN #1 @@ -170,7 +178,7 @@ { \__zhnum_output:nnwnn { + \c_one } #1 } { \quark_if_recursion_tail_stop_do:Nn #1 { \__zhnum_loop_end:wnn } } \exp_after:wN \__zhnum_read_abs_loop:Nw - \tex_romannumeral:D -`0 \use:n #2 \q_recursion_stop + \exp:w \exp_end_continue_f:w \use:n #2 \q_recursion_stop } \cs_new:Npn \__zhnum_output:nnwnn #1#2#3 \__zhnum_result:nn #4#5 { #3 \__zhnum_result:nn { #4#1 } { #5#2 } } @@ -280,6 +288,27 @@ } \int_compare:nNnF {#4} = \c_zero { \zhnum_digit_map:n {#4} } } +\DeclareExpandableDocumentCommand \zhdig { +o +m } + { + \IfNoValueTF {#1} + { \zhnum_digits_counter:n } + { \zhdigwithoptions {#1} } + {#2} + } +\NewDocumentCommand \zhdigwithoptions { +m +m } + { + \group_begin: + \keys_set:nn { zhnum / options } {#1} + \zhnum_digits_counter:n #1 {#2} + \group_end: + } +\cs_new:Npn \zhnum_digits_counter:n #1 + { + \int_if_exist:cTF { c@#1 } + { \zhnum_digits_null:v { c@#1 } } + { \__zhnum_counter_error:n {#1} } + } +\cs_new_nopar:Npn \@zhdig #1 { \zhnum_digits_null:f { \int_eval:n {#1} } } \DeclareExpandableDocumentCommand \zhdigits { +s +o +m } { \IfNoValueTF {#2} @@ -298,20 +327,20 @@ { \zhnum_digits:Nn \BooleanTrue } \cs_new_nopar:Npn \zhnum_digits_null:n { \zhnum_digits:Nn \BooleanFalse } -\cs_generate_variant:Nn \zhnum_digits_null:n { V } +\cs_generate_variant:Nn \zhnum_digits_null:n { V , v , f } \cs_new:Npn \zhnum_digits:Nn #1#2 { \exp_after:wN \__zhnum_read_digits:w \tex_number:D \exp_after:wN \__zhnum_read_sign_loop:NN \exp_after:wN #1 - \tex_romannumeral:D -`0 \use:n + \exp:w \exp_end_continue_f:w \use:n #2 \exp_stop_f: \q_recursion_tail \q_recursion_stop } \cs_new:Npn \__zhnum_read_sign_loop:NN #1#2 { \if:w + \if:w - \exp_not:N #2 + \fi: \exp_not:N #2 \exp_after:wN \__zhnum_read_sign_loop:NN \exp_after:wN #1 - \tex_romannumeral:D -`0 \exp_after:wN \use:n + \exp:w \exp_end_continue_f:w \exp_after:wN \use:n \else: 1 \exp_after:wN ; \exp_after:wN \__zhnum_read_digits_loop:NN @@ -328,7 +357,7 @@ \if:w .\exp_not:N #2 \exp_after:wN \c__zhnum_dot_tl \fi: } \exp_after:wN \__zhnum_read_digits_loop:NN \exp_after:wN #1 - \tex_romannumeral:D -`0 \use:n + \exp:w \exp_end_continue_f:w \use:n } \cs_new:Npn \__zhnum_read_digits:w #1 ; { @@ -354,19 +383,24 @@ { \__zhnum_week_day:www #2 \q_stop } } \cs_new:Npn \__zhnum_date:www #1/#2/#3 \q_stop - { - \zhnum_check_time:Nn \zhnum_digits_null:n {#1} \c__zhnum_year_tl - \zhnum_check_time:Nn \zhnum_int:n {#2} \c__zhnum_month_tl - \zhnum_check_time:Nn \zhnum_int:n {#3} \c__zhnum_day_tl - } + { \__zhnum_date_aux:nnn {#1} {#2} {#3} } \cs_new_nopar:Npn \zhtoday + { \__zhnum_date_aux:Vnn \tex_year:D \tex_month:D \tex_day:D } +\cs_new_nopar:Npn \__zhnum_date_aux:nnn { - \zhnum_check_time:Nn \zhnum_digits_null:V \tex_year:D \c__zhnum_year_tl - \zhnum_check_time:Nn \zhnum_int:n \tex_month:D \c__zhnum_month_tl - \zhnum_check_time:Nn \zhnum_int:n \tex_day:D \c__zhnum_day_tl + \bool_if:NTF \l__zhnum_time_bool + { \__zhnum_date_aux:NNnnnn \zhnum_digits_null:n \zhnum_int:n { } } + { \__zhnum_date_aux:Nnnnn \int_to_arabic:n { \l__zhnum_arabic_sep_tl } } + } +\cs_new:Npn \__zhnum_date_aux:Nnnnn #1 + { \__zhnum_date_aux:NNnnnn #1#1 } +\cs_new:Npn \__zhnum_date_aux:NNnnnn #1#2#3#4#5#6 + { + #1 {#4} #3 \c__zhnum_year_tl #3 + #2 {#5} #3 \c__zhnum_month_tl #3 + #2 {#6} #3 \c__zhnum_day_tl } -\cs_new:Npn \zhnum_check_time:Nn #1 - { \bool_if:NTF \l__zhnum_time_bool {#1} { \int_to_arabic:n } } +\cs_generate_variant:Nn \__zhnum_date_aux:nnn { V } \cs_new:Npn \zhweekday #1 { \__zhnum_week_day:www #1 \q_stop } \cs_new:Npn \__zhnum_week_day:www #1/#2/#3 \q_stop @@ -427,23 +461,27 @@ } \cs_new:Npn \zhtime #1 { \__zhnum_time:ww #1 \q_stop } -\group_begin: -\char_set_lccode:nn { `\; } { `\: } -\tl_to_lowercase:n +\use:x { - \group_end: - \cs_new:Npn \__zhnum_time:ww #1 ; #2 \q_stop - { - \zhnum_check_time:Nn \zhnum_int:n {#1} \c__zhnum_hour_tl - \zhnum_check_time:Nn \zhnum_int:n {#2} \c__zhnum_minute_tl - } + \cs_new:Npn \exp_not:N \__zhnum_time:ww ##1 \c_colon_str ##2 \exp_not:N \q_stop } + { \__zhnum_time_aux:nn {#1} {#2} } \cs_new_nopar:Npn \zhcurrtime { - \zhnum_check_time:Nn \zhnum_int:n - { \int_div_truncate:nn \tex_time:D { 60 } } \c__zhnum_hour_tl - \zhnum_check_time:Nn \zhnum_int:n - { \int_mod:nn \tex_time:D { 60 } } \c__zhnum_minute_tl + \__zhnum_time_aux:nn + { \int_div_truncate:nn \tex_time:D { 60 } } + { \int_mod:nn \tex_time:D { 60 } } + } +\cs_new_nopar:Npn \__zhnum_time_aux:nn + { + \bool_if:NTF \l__zhnum_time_bool + { \__zhnum_time_aux:Nnnn \zhnum_int:n { } } + { \__zhnum_time_aux:Nnnn \int_to_arabic:n { \l__zhnum_arabic_sep_tl } } + } +\cs_new:Npn \__zhnum_time_aux:Nnnn #1#2#3#4 + { + #1 {#3} #2 \c__zhnum_hour_tl #2 + #1 {#4} #2 \c__zhnum_minute_tl } \cs_new:Npn \zhnum_digit_map:n #1 { \use:c { c__zhnum_ #1 _tl } } @@ -733,16 +771,16 @@ { \cs_set_eq:NN \zhnum_set_alias:NN \tl_set_eq:NN } \cs_new_protected:Npn \zhnum_load_cfg:n #1 { - \zhnum_set_cfg_name:Nn \l__zhnum_cfg_tl {#1} - \tl_if_eq:NNF \l__zhnum_cfg_tl \l__zhnum_last_cfg_tl + \zhnum_set_cfg_name:Nn \l__zhnum_cfg_str {#1} + \str_if_eq:NNF \l__zhnum_cfg_str \l__zhnum_last_cfg_str { \zhnum_update_cfg:n {#1} } \zhnum_parse_config: } \cs_generate_variant:Nn \zhnum_load_cfg:n { o } \cs_new_protected:Npn \zhnum_update_cfg:n #1 { - \prop_if_exist:cTF { g__zhnum_cfg_ \l__zhnum_cfg_tl _prop } - { \tl_set_eq:NN \l__zhnum_last_cfg_tl \l__zhnum_cfg_tl } + \prop_if_exist:cTF { g__zhnum_cfg_ \l__zhnum_cfg_str _prop } + { \str_set_eq:NN \l__zhnum_last_cfg_str \l__zhnum_cfg_str } { \zhnum_input_cfg:n {#1} } \__zhnum_update_cfg_prop:N \prop_set_eq:Nc } @@ -764,10 +802,10 @@ } \cs_new_protected:Npn \__zhnum_update_cfg_prop:N #1 { - #1 \l__zhnum_cfg_map_prop { g__zhnum_cfg_ \l__zhnum_cfg_tl _prop } - #1 \l__zhnum_cfg_map_var_prop { g__zhnum_cfg_var_ \l__zhnum_cfg_tl _prop } - #1 \l__zhnum_cfg_map_finan_prop { g__zhnum_cfg_finan_ \l__zhnum_cfg_tl _prop } - #1 \l__zhnum_cfg_map_ganzhi_prop { g__zhnum_cfg_ganzhi_ \l__zhnum_cfg_tl _prop } + #1 \l__zhnum_cfg_map_prop { g__zhnum_cfg_ \l__zhnum_cfg_str _prop } + #1 \l__zhnum_cfg_map_var_prop { g__zhnum_cfg_var_ \l__zhnum_cfg_str _prop } + #1 \l__zhnum_cfg_map_finan_prop { g__zhnum_cfg_finan_ \l__zhnum_cfg_str _prop } + #1 \l__zhnum_cfg_map_ganzhi_prop { g__zhnum_cfg_ganzhi_ \l__zhnum_cfg_str _prop } } \cs_new_protected:Npn \__zhnum_prop_initial:Nn #1#2 { @@ -776,8 +814,8 @@ } \cs_new_protected:Npn \__zhnum_prop_gset_eq:Nn #1#2 { \prop_gset_eq:cN {#2} #1 } -\tl_new:N \l__zhnum_cfg_tl -\tl_new:N \l__zhnum_last_cfg_tl +\str_new:N \l__zhnum_cfg_str +\str_new:N \l__zhnum_last_cfg_str \bool_new:N \l__zhnum_reset_bool \msg_new:nnnn { zhnumber } { file-not-found } { File~`#1'~not~found. } @@ -785,13 +823,12 @@ The~requested~file~could~not~be~found~in~the~current~directory,~ in~the~TeX~search~path~or~in~the~LaTeX~search~path. } -\pdftex_if_engine:TF +\bool_if:nTF { - \str_if_eq_x:nnTF - { \token_to_str:N \kchar } - { \token_to_meaning:N \kchar } + \sys_if_engine_xetex_p: || + \sys_if_engine_luatex_p: || + \sys_if_engine_uptex_p: } - { \use_i:nn } { \cs_new_eq:NN \zhnum_if_unicode_engine_p: \c_true_bool \cs_new_eq:NN \zhnum_if_unicode_engine:TF \use_i:nn @@ -804,8 +841,8 @@ \cs_new_eq:NN \zhnum_set_catcode: \prg_do_nothing: \cs_new_protected:Npn \zhnum_set_cfg_name:Nn #1#2 { - \tl_set:Nx \l__zhnum_encoding_tl {#2} - \tl_set:Nx #1 { \tl_to_str:N \l__zhnum_encoding_tl } + \str_set:Nx \l__zhnum_encoding_str {#2} + \str_set_eq:NN #1 \l__zhnum_encoding_str } \cs_new_eq:NN \zhnum_reset_config: \zhnum_parse_config: \else: @@ -813,7 +850,7 @@ { \bool_if:NT \l__zhnum_active_char_bool { \zhnum_set_active: } } \cs_new_protected_nopar:Npn \zhnum_set_active: { - \str_case:onTF { \l__zhnum_encoding_tl } + \str_case:onTF { \l__zhnum_encoding_str } { { gbk } { \int_set:Nn \l__zhnum_byte_min_int { "81 } } { big5 } { \int_set:Nn \l__zhnum_byte_min_int { "A1 } } @@ -831,16 +868,15 @@ \int_new:N \l__zhnum_byte_max_int \cs_new_protected:Npn \zhnum_set_cfg_name:Nn #1#2 { - \tl_set:Nx \l__zhnum_encoding_tl {#2} - \tl_set:Nx #1 + \str_set:Nx \l__zhnum_encoding_str {#2} + \str_set:Nx #1 { - \tl_to_str:N \l__zhnum_encoding_tl - \bool_if:NT \l__zhnum_active_char_bool - { \tl_to_str:n { _active } } + \l__zhnum_encoding_str + \bool_if:NT \l__zhnum_active_char_bool { _active } } } \cs_new_protected_nopar:Npn \zhnum_reset_config: - { \zhnum_load_cfg:o { \l__zhnum_encoding_tl } } + { \zhnum_load_cfg:o { \l__zhnum_encoding_str } } \bool_new:N \l__zhnum_active_char_bool \bool_set_true:N \l__zhnum_active_char_bool \fi: @@ -849,9 +885,9 @@ encoding .choices:nn = { UTF8 , GBK , Big5 } { - \exp_args:Nx \tex_lowercase:D - { \tl_set:Nn \exp_not:N \l__zhnum_encoding_tl { \l_keys_choice_tl } } - \zhnum_load_cfg:o { \l__zhnum_encoding_tl } + \str_set:Nx \l__zhnum_encoding_str + { \str_fold_case:V \l_keys_choice_tl } + \zhnum_load_cfg:o { \l__zhnum_encoding_str } } , encoding .default:n = { GBK } , encoding / Bg5 .meta:n = { encoding = Big5 } , @@ -889,8 +925,9 @@ ganzhi-cyclic / false.code:n = { \cs_set_eq:NN \zhnum_ganzhi:nnn \zhnum_ganzhi_normal:nnn } , ganzhi-cyclic .default:n = { true } , + arabicsep .tl_set:N = \l__zhnum_arabic_sep_tl } -\tl_new:N \l__zhnum_encoding_tl +\str_new:N \l__zhnum_encoding_str \msg_new:nnnn { zhnumber } { encoding-invalid } { The~encoding~`#1'~is~invalid. } { Available~encodings~are~`UTF8',~`GBK'~and~`Big5'. } @@ -899,22 +936,22 @@ \keys_set:nn { zhnum / options } {#1} \tex_ignorespaces:D } -\keys_set:nn { zhnum / options } { style , time } +\keys_set:nn { zhnum / options } { style , time , arabicsep = { ~ } } \ProcessKeysOptions { zhnum / options } -\tl_if_empty:NT \l__zhnum_encoding_tl +\str_if_empty:NT \l__zhnum_encoding_str { \zhnum_if_unicode_engine:TF { \keys_set:nn { zhnum / options } { encoding = UTF8 } } { \keys_set:nn { zhnum / options } { encoding = GBK } } } %% -%% This package consists of the file zhnumber.dtx, -%% and the derived files zhnumber.pdf, -%% zhnumber.sty, -%% zhnumber-utf8.cfg, -%% zhnumber-gbk.cfg, -%% zhnumber-big5.cfg, -%% zhnumber.ins and -%% README. +%% This package consists of the file zhnumber.dtx, +%% and the derived files zhnumber.pdf, +%% zhnumber.sty, +%% zhnumber-utf8.cfg, +%% zhnumber-gbk.cfg, +%% zhnumber-big5.cfg, +%% zhnumber.ins and +%% README.md. %% %% End of file `zhnumber.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhnumber.tlpobj new/tlpkg/tlpobj/zhnumber.tlpobj --- old/tlpkg/tlpobj/zhnumber.tlpobj 2015-06-20 03:22:21.000000000 +0200 +++ new/tlpkg/tlpobj/zhnumber.tlpobj 2016-05-15 03:21:48.000000000 +0200 @@ -1,7 +1,7 @@ name zhnumber category Package -revision 37614 -shortdesc Typeset Chinese representations of numbers. +revision 41123 +shortdesc Typeset Chinese representations of numbers relocated 1 longdesc The package provides commands to typeset Chinese longdesc representations of numbers. The main difference between this @@ -13,7 +13,7 @@ RELOC/tex/latex/zhnumber/zhnumber-utf8.cfg RELOC/tex/latex/zhnumber/zhnumber.sty catalogue-ctan /macros/latex/contrib/zhnumber -catalogue-date 2015-06-19 14:01:03 +0200 +catalogue-date 2016-05-14 08:32:24 +0200 catalogue-license lppl1.3 catalogue-topics chinese numbers -catalogue-version 2.2 +catalogue-version 2.4 ++++++ zhspacing.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/zhspacing/README.md new/doc/generic/zhspacing/README.md --- old/doc/generic/zhspacing/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/zhspacing/README.md 2016-05-15 17:30:11.000000000 +0200 @@ -0,0 +1,46 @@ +zhspacing +========= + +`zhspacing` is a package for typesetting CJK documents in XeTeX +for plain TeX, LaTeX and ConTeXt. + +Contributing +------------ + +This package is a part of the [ctex-kit](https://github.com/CTeX-org/ctex-kit) project. + +Issues and pull requests are welcome. + +Copyright and Licence +--------------------- + + Copyright (C) 2007--2009 by Yin Dian <[email protected]> + Copyright (C) 2010--2012 by Leo Liu <[email protected]> + Copyright (C) 2016 by Qing Lee <[email protected]> + ---------------------------------------------------------------------- + + This work may be distributed and/or modified under the + conditions of the LaTeX Project Public License, either + version 1.3c of this license or (at your option) any later + version. This version of this license is in + http://www.latex-project.org/lppl/lppl-1-3c.txt + and the latest version of this license is in + http://www.latex-project.org/lppl.txt + and version 1.3 or later is part of all distributions of + LaTeX version 2005/12/01 or later. + + This work has the LPPL maintenance status `maintained'. + + The Current Maintainer of this work is Qing Lee. + + This package consists of the files zhspacing.sty, + zhsmyclass.sty, + zhsusefulmacros.sty, + zhfont.sty, + zhmath.sty, + zhulem.sty, + t-zhspacing.tex, + zhs-man.tex, + zhspacing-context-test.tex, + README.md (this file), + and the derived files zhs-man.pdf. Files old/doc/generic/zhspacing/zhs-man.pdf and new/doc/generic/zhspacing/zhs-man.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/zhspacing/zhs-man.tex new/doc/generic/zhspacing/zhs-man.tex --- old/doc/generic/zhspacing/zhs-man.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/zhspacing/zhs-man.tex 2016-05-15 17:30:11.000000000 +0200 @@ -0,0 +1,534 @@ +% Hist: 070824 First document out. All but Implementation written. +% In the evening fixed some typos. +\documentclass[12pt]{ltxdoc} +%\usepackage[margin=1.5in]{geometry} +\usepackage{fontspec} +\defaultfontfeatures{Mapping=tex-text} +\usepackage{hologo} +\def\eTeX{\hologo{eTeX}} +\def\XeTeX{\hologo{XeTeX}} +\def\XeLaTeX{\hologo{XeLaTeX}} +\usepackage{zhspacing} +\usepackage[fakebold]{zhfont} +\usepackage[noactive]{zhmath} +\usepackage{hyperref} +\newfontfamily\zhcjkextafont{Sun-ExtA} +\newfontfamily\zhcjkextbfont{Sun-ExtB} +\zhspacing +\usepackage{fancyvrb} +\DefineVerbatimEnvironment{verbatim}{Verbatim}{baselinestretch=0.9}%,fontsize=\footnotesize} +\usepackage{pst-all} +\setlength\parskip{0.5em plus 0.5em minus 0.5em} +\newcommand\q[1]{``\hbox spread -0.2em{#1}''} +\newcommand\name[1]{\hbox{#1}} +\newcommand\fntname[1]{\texttt{#1}} +\newcommand\NFSS{\textsf{NFSS}} +\newcommand\mymacro[1]{\ifvmode\noindent\else\setbox0=\lastbox\fi\llap{$\bullet$}\cmd#1\\\indent} +\makeatletter +\@addtoreset{section}{part} +\makeatother +\begin{document} +\title{Typesetting Chinese in \XeTeX: |zhspacing| user's +manual\thanks{Revision: \zhspacingrevision.}} +\author{\textsc{Yin} Dian\footnote{Lab.\ of Network Comm. System \& +Control, Univ.\ of Sci.\ \& Tech.\ of China.}} +\date{2016/05/14} +\maketitle +\tableofcontents +\newpage + +\part{zhspacing.sty} +\section{Introduction} +\XeTeX\ is a new \TeX\ engine by Jonathan Kew and SIL International, which combines +\eTeX\ with pervasive Unicode support and advanced font support\footnote{Words +copied from the ConTeXt Wiki.}. Using \XeTeX, it is possible to typeset scripts +of any languages whose glyphs are contained in the font in use, without the +help of any extra packages, such as |CJK|\footnote{|CJK| is a LaTeX 2e macro +package which enables the use of CJK scripts (Chinese/Japanese/Korean) in +various encodings, written by Werner Lemberg.}. + +However, \XeTeX\ itself does not solve all the problems. Some details in +Chinese typesetting have not been dealt with by \XeTeX, such as the automatic +font switch between Chinese and Western characters, the skip adjustment of +fullwidth punctuations, the automatic skip insertion between Chinese and +Western characters or math formulas, etc. + +To meet the need of easy and high quality typesetting of Chinese documents +using \XeTeX, the package |zhspacing| is coded, utilizing the new primitive of +\cs{XeTeXinterchartoks} provided in \XeTeX\ version 0.997. + +\section{Getting Started} +|zhspacing| can be used in both plain \XeTeX\ or \XeLaTeX. The usage is quite +straightforward. For instance, in plain \XeTeX, +{\emptyskipscheme +\begin{verbatim} + \input zhspacing.sty + \zhspacing + 这是中文测 试。中文和English的混排。中 + 文和$E=mc^2$的混排。 + \bye +\end{verbatim} +} +And in \XeLaTeX, +{\emptyskipscheme +\begin{verbatim} + \documentclass{article} + \usepackage{zhspacing} + \zhspacing + \begin{document} + 这是中文测 试。中文和English的混排。中 + 文和$E=mc^2$的混排。 + \end{document} +\end{verbatim} +} +Both of the examples above produce the same result as follows, +\begin{center} +这是中文测 试。中文和English的混排。中 +文和$E=mc^2$的混排。 +\end{center} + +As you can see, spaces after Chinese characters are always ignored. Moreover, a +noticable skip is inserted between Chinese characters and English characters as +well as math formulas. In fact, all of the following inputs can produce mixed +langauge output with skip automatically inserted between Chinese and English +characters, +\begin{center} +\emptyskipscheme |中Eng文|,\quad |中 Eng文|,\quad |中Eng 文|\quad and\quad |中 Eng 文|. +\end{center} +And their corresponding output is, +\begin{center} +中Eng文,\quad 中 Eng文,\quad 中Eng 文\quad and\quad 中 Eng 文. +\end{center} + +Look close and you'll find, that the first and second input generates exactly +the same output, and so does the third and fourth. However, the skip between +|Eng| and |文| in the last two cases is wider than the skip between |中| and +|Eng|. That is because the space is produced by the space token after the +letter |g|, not the skip automatically inserted by |zhspacing|'s skip +mechanism. + +The space ignoring and skip auto-inserting ability of |zhspacing| can make +writing documents much comfortable. You don't need to worry about the manual +insertion of skips such as adding the annoying |~| in |CJK|. + +Now come to the topic of punctuation skip adjustment. Proper Chinese +typesetting requires consecutive fullwidth punctuations be compressed, and a +linebreak before or after a fullwidth punctuation will cut off the blank spaces +of this punctuation, making it align to the margin. |zhspacing| does have +solved these problems, as well as proper prohibitions(禁则). Here's an example. +\begin{center} +\begin{minipage}{21em} +他强调，“三个代表”重要思想是在新的历史条件下运用马克思主义的立场、观点和方法的 +典范，是我们学习马克思主义的立场、观点和方法最现实、最生动的教材。“三个代表” +重要思想是与时俱进的理论。 +\end{minipage} +\end{center} + +\section{Advanced Usage} +\subsection{Fonts} +|zhspacing| uses an extensible way of selecting fonts. The rules can be +summarized as follows, +\begin{itemize} + \item Western characters, i.e.\ those that are not CJKV ideographies nor + CJKV punctuations, use the same font as default. + \item Chinese characters use seperate fonts. Font changes in the + document does not affect the font used to display Chinese, + unless you are using \NFSS\ and change the font series or shape. + \item On displaying basic Chinese ideographies, execute the command + \cs{zhfont}. + \item On displaying Chinese punctuations, execute the command + \cs{zhpunctfont}. + \item On displaying CJK Ext-A characters, execute the command + \cs{zhcjkextafont}. + \item On displaying CJK Ext-B characters, execute the command + \cs{zhcjkextbfont}. + \item When switching from non-Chinese characters to Chinese characters, + execute \cs{zhs@savefont}. When switching back, execute + \cs{zhs@restorefont}. +\end{itemize} + +When importing |zhspacing| from plain \XeTeX, the default definitions of the +above commands are, +\begin{verbatim} + \font\zhfont="SimSun" at 10pt + \font\zhpunctfont="SimSun" at 10pt + \def\zhcjkextafont{\message{CJK Ext-A}} + \def\zhcjkextbfont{\message{CJK Ext-B}} + \let\zhs@savefont=\begingroup + \let\zhs@restorefont=\endgroup +\end{verbatim} + +When imported from \XeLaTeX, the defaults are, +\begin{verbatim} + \newfontfamily\zhfont[BoldFont=SimHei]{SimSun} + \newfontfamily\zhpunctfont{SimSun} + \def\zhcjkextafont{\message{CJK Ext-A}} + \def\zhcjkextbfont{\message{CJK Ext-B}} + \def\zhs@savefont{\zhs@savef@nt{old}} + \def\zhs@restorefont{\zhs@restoref@nt{old}} +\end{verbatim} +Here \cs{zhs@savef@nt} and \cs{zhs@restoref@nt} are internal macros to save and +restore the \NFSS\ info of the current font to specified places. + +CJK Ext-A/B fonts have not been defined by default in consideration that not +every user has installed the particular fonts. I recommend to use +\fntname{Sun-ExtA} and \fntname{Sun-ExtB} as the corresponding fonts. You can +define the ext-font macros manually in a similar way to the definition of +\cs{zhfont}. + +An example of mixed typesetting of various classes of characters is as follows, +cited from \emph{The Tale of Kiều}\footnote{《金云翘传》，or \emph{Truyện Kiều}, +a Vietnamese \emph{lục bát} poem written in \emph{chữ Nôm}. \emph{Chữ Nôm} is +a system of ideographies created by the Vietnamese laboring people, most of +which are encoded in CJK Ext-A\hskip -0.2em/B area, or not even included in +Unicode.}. +\begin{center} +\parbox{21em}{ +\fontspec{Times New Roman} +𤾓𢆥𥪝𡎝𠊛些 +Trăm năm, trong cõi người ta, +𡨸才𡨸命𡑛罗恄𠑬 +Chữ tài, chữ mệnh, khéo là ghét nhau. +𣦆戈𠬠局𣷭橷 +Trải qua một cuộc bể dâu, +仍條𥉩𧡊𦓡𤴬疸𢚸 +Những điều trông thấy mà đau đớn lòng. +\footnotemark +} +\end{center} +\footnotetext{Some of the ideographies are replaced by similar characters due +to the limitation of character set. A picture of the original manuscript can be found at +\href{http://bbs.gophor.cn/cjkv/attachment/14_2_b44e05d28a68271.jpg}{\emph{this +link}}.}% or Fig.~\ref{fig:kieu}.} +\subsection{More on Fonts} +Sometimes it may be desirable to use different Chinese fonts for different +\NFSS\ font families in \LaTeX. This can be done by changing the definition of +\cs{zhs@savefont} and \cs{zhfont}, without modifying the |zhspacing| source. + +Here is the way to do it.\footnote{See zhfont.sty later for convenient ways.} +\begin{verbatim} +\makeatletter +\g@addto@macro\zhs@savefont{% + \long\edef\zhs@tmpmacro{\f@family}% + \def\zhs@curr@fam{0}% + \ifx\zhs@tmpmacro\sfdefault + \def\zhs@curr@fam{1}% + \else\ifx\zhs@tmpmacro\ttdefault + \def\zhs@curr@fam{2}% + \fi\fi + \edef\zhs@tmpmacro{\f@family}% + \ifx\zhs@tmpmacro\sfdefault + \def\zhs@curr@fam{1}% + \else\ifx\zhs@tmpmacro\ttdefault + \def\zhs@curr@fam{2}% + \fi\fi +} +\newfontfamily\zhrmfont[BoldFont=SimHei, + ItalicFont=KaiTi]{SimSun} +\newfontfamily\zhsffont{SimHei} +\newfontfamily\zhttfont[BoldFont=SimHei]{KaiTi} +\def\zhfont{\ifcase\zhs@curr@fam\zhrmfont\or\zhsffont + \or\zhttfont\else\zhrmfont\fi} +\end{verbatim} +\subsection{Skips} +The skip mechanism in |zhspacing| is also flexible. |zhspacing| utilizes the +following skip commands. Note that they are defined as macros instead of skip +register values, in order that the skip varies according to font size changes. +\begin{description} + \item[\mdseries\cs{skipzh}] + Skip between adjacent Chinese characters. + \item[\mdseries\cs{skipenzh}] + Skip between a Chinese character and a Western character or a + math formula. + \item[\mdseries\cs{skipzhopen}] + Skip before fullwidth opening punctuations, such as \q{“}, + \q{（}, \q{《}, etc. + \item[\mdseries\cs{skipzhinteropen}] + Skip before a fullwidth opening punctuation when preceded by + another fullwidth punctuation. + \item[\mdseries\cs{skipzhlinestartopen}] + Skip before a fullwidth opening punctuation when it occurs at + the start of a line. + \item[\mdseries\cs{skipzhclose}] + Skip after fullwidth closing punctuations, such as \q{”}, + \q{）}, \q{》}, etc. + \item[\mdseries\cs{skipzhinterclose}] + Skip after a fullwidth closing punctuation when followed by + another fullwidth punctuation. + \item[\mdseries\cs{skipzhlineendclose}] + Skip after a fullwidth closing punctuation when it occurs at + the end of a line. + \item[\mdseries\cs{skipzhfullstop}] + Skip after fullwidth fullstop punctuations, such as \q{；}, + \q{．}, \q{。}, etc. + \item[\mdseries\cs{skipzhinterfullstop}] + Skip after a fullwidth fullstop punctuation when followed by + another fullwidth punctuation. + \item[\mdseries\cs{skipzhlineendfullstop}] + Skip after a fullwidth fullstop punctuation when it occurs at + the end of a line. + \item[\mdseries\cs{skipzhhalfstop}] + Skip after fullwidth halfstop punctuations, such as \q{、}, + \q{，}, \q{：}, etc. + \item[\mdseries\cs{skipzhinterhalfstop}] + Skip after a fullwidth halfstop punctuation when followed by + another fullwidth punctuation. + \item[\mdseries\cs{skipzhlineendhalfstop}] + Skip after a fullwidth halfstop punctuation when it occurs at + the end of a line. + \item[\mdseries\cs{skipnegzhlinestartopen}] + Negative skip to \cs{skipzhlinestartopen}. + \item[\mdseries\cs{skipnegzhlineendclose}] + Negative skip to \cs{skipzhlineendclose}. + \item[\mdseries\cs{skipnegzhlineendfullstop}] + Negative skip to \cs{skipzhlineendfullstop}. + \item[\mdseries\cs{skipnegzhlineendhalfstop}] + Negative skip to \cs{skipzhlineendhalfstop}. +\end{description} + +All of the skip commands above are defined in the pattern \\ +\vadjust{}\hfil |\def\skipxxx{\hskip xxxxx}|. + +|zhspacing| comes with three pre-defined skip schemes, namely +\cs{simsunskipscheme}, \cs{emptyskipscheme} and \cs{haltskipscheme}. The +first scheme should be suitable for font \fntname{SimSun} and other popular +Chinese fonts used in China, which does not support OpenType features of +|halt|, and needs negative spaces be inserted before opening punctuations and +after closing or judou punctuations. The second scheme simply addes zero +length. And the last one should be fit for OpenType Chinese fonts supporting +|halt| feature such as Adobe Song Std, where positive spaces should be inserted +before or after certain punctuations. You can define your own skip schemes for +customization, of course. +\subsection{Vertical Chinese} +Vertical Chinese can be achieved by adding raw feature |vertical| to the +specified font. An example could be, \hfil +\setbox0=\hbox to 0pt{\vbox{\noindent +\newfontlanguage{Chinese}{CHN} +\newfontfamily\zhfont[Script=CJK,Language=Chinese,Vertical=RotatedGlyphs, + BoldFont=SimHei]{SimSun} +\let\zhpunctfont\zhfont +\haltskipscheme +\rotatebox{-90}{\fbox{\raise 0.8em\hbox{我是中国人，我爱自己的祖国。}}} +}\hss} +\dp0=0pt \raise 0.8em\box0 + +\begin{verbatim} + \documentclass[12pt]{article} + \usepackage{graphicx} + \usepackage{zhspacing} + \newfontlanguage{Chinese}{CHN} + \newfontfamily\zhfont[ + Script=CJK, Language=Chinese, + Vertical=RotatedGlyphs]{SimSun} + \let\zhpunctfont\zhfont + \haltskipscheme + \zhspacing + \begin{document} + \rotatebox{-90}{我是中国人，我爱自己的祖国。} + \end{document} +\end{verbatim} + +Note that in this example, in order to have proper vertical punctuations, we +set \cs{zhpunctfont} to use the Adobe one supporting |vert| feature, and change +the skip scheme to \cs{haltskipscheme} to match the |vhal| feature specified. + +However, there exists some bug in typesetting vertical Chinese containing +punctuations using some fonts such as \fntname{KaiTi\_GB2312} etc. I've told +this bug to \name{jjgod} in May, but it seems that he hasn't solved the problem +yet. Moreover, the baseline of vertical Chinese is not correct, so mixed +typesetting of Chinese and English in vertical mode generates ugly results, and +thus should be avoided. +\subsection{Compatibility} +Theoretically, |zhspacing| should be compatible with all macro packages, except +those who change the definition of \cs{hskip} and \cs{penalty}, in which case +special treatment should be applied. I haven't found any conflict when using +common packages such as |hyperref| and |fancyhdr|. However, |ulem| redefineds +\cs{hskip} and \cs{penalty}, and causes unexpected output\footnote{I was using +\cs{begingroup} and \cs{endgroup} as the font saving/restoring commands. +However, I found |ulem| redefines \cs{hskip} and \cs{penalty} to end the +current hbox group and start a new hbox, and thus group mismatch occurs. So I +changed the font saving/restoring commands when used in \LaTeX, using \NFSS\ info +instead of groups. But in the new hbox group, no Chinese font is applied by +default so the Chinese characters disappears. Therefore I changed the +definitions of |ulem|'s new \cs{hskip} and \cs{penalty} in |zhulem|, and advice +users to use this modified one.}. Use |zhulem| provided along with +|zhspacing| instead. + +|zhspacing| may be not compatible with macro packages which use +\cs{XeTeXinterchartoks} faculty. For example, the |polyglossia| package (some +languages). + +\subsection{Working with other Chinese package} + +|zhspacing| is not compatible with |xeCJK|. The latter can be only used in +\LaTeX\ format. |zhspacing| is now supposed to be mainly used in Plain \TeX\ +format; in \LaTeX, |xeCJK| is a better choice. + +The |ctex| package, made by \href{http://www.ctex.org}{|ctex.org|}, is a widely +used Chinese document framework which hides the underlying Chinese processing +details to the user, which enables portability between different Chinese +processing packages or systems. New version of |ctex| package supports \XeTeX\ +through |xeCJK| package, |zhspacing| is not necessary. + +To use |zhspacing| in |cxetex|, a slight modification of the file |ctexcjk.clo| +should be made. Change the corresponding lines to the followes (\% means the +original lines). +\begin{verbatim} +%\XeTeXlinebreaklocale "zh" +%\XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt +%\setmainfont[BoldFont={cwTeXHeiBold}, +% ItalicFont={cwTeXKaiItalic}, +% Mapping=tex-text]{cwTeXMing} +%\setsansfont[BoldFont={cwTeXHeiBold},Mapping=tex-text]{cwTeXYen} +%\setmonofont{cwTeXFangSongTT} +\usepackage{zhspacing} +\newfontfamily\zhfont[BoldFont=SimHei]{SimSun} +\newfontfamily\zhcjkextafont{Sun-ExtA} +\newfontfamily\zhcjkextbfont{Sun-ExtB} +\zhspacing +\end{verbatim} + +You can surely change these lines to your own taste. + +\section{Getting \texttt{zhspacing}} + +You can get latest stable version of |zhspacing| on CTAN. + +|zhspacing| was hosted on an open-source project at googlecode. The old project +homepage is \url{http://code.google.com/p/zhspacing/}. + +Now |zhspacing| is part of |ctex-kit| project (\url{https://github.com/CTeX-org/ctex-kit/}). +You can get the lastest source via Git. + +\goodbreak +\part{zhfont.sty} +\section{Introduction} +To simplify the complex font setting to use \NFSS\ in \LaTeX, the package +|zhfont| is coded. It also adds simple interface to define fonts with fake +slant, and also supports fake bold. +\section{Package Options} +|zhfont| currently has only one option --- |fakebold|. This option sets +Chinese show fake boldface when the current series is bold. +\section{Provided Macros} +\mymacro\zhrmfont +\mymacro\zhsffont +\mymacro\zhttfont +The font commands to be executed according to the current font family. +You can redefine them to customize your fonts. + +\mymacro\setzhmainfont +\mymacro\setzhsansfont +\mymacro\setzhmonofont +Simply macro to set \cs{zh\{rm/sf/tt\}font} using \cs{newfontfamily}. + +\mymacro\newfontfamilywithslant +Create a font family with fake slant. Take one argument as the font name. + +Example: |\newfontfamilywithslant\zhrmfont{SimSun}| + +\mymacro\newfontfamilywithslantandbold +Create a font family with fake slant, and specify another font for its +boldface. Take two arguments as the font name and bold font name. + +Example:\\\quad |\newfontfamilywithslantandbold\zhrmfont{SimSun}{SimHei}| +\section{Examples} +The following example is generated with |zhfont| loaded with option +|fakebold|. + +{\emptyskipscheme +\begin{verbatim} +\newfontfamilywithslant\zhrmfont{SimSun} +中文\textbf{测试}。\textit{中文\textbf{测试}。} +\newfontfamilywithslant\zhrmfont{FangSong} +中文\textbf{测试}。\textit{中文\textbf{测试}。} +\end{verbatim} +} +\nobreak +{ +\newfontfamilywithslant\zhrmfont{SimSun} +中文\textbf{测试}。\textit{中文\textbf{测试}。} +\newfontfamilywithslant\zhrmfont{FangSong} +中文\textbf{测试}。\textit{中文\textbf{测试}。} +} +\goodbreak + +\part{zhmath.sty} +\section{Introduction} +|zhmath| is a generic package which allows the Chinese characters to be +displayed in math formulas. It also allows changing the math font for alphas +and numbers. + +|zhmath| only sets the basic Chinese characters to be displayable, not CJK +Ext-A/B ones, as they are seldom used and discouraged in math. You can use +\cs{hbox} to let |zhspacing| display them, however. +\section{Package Options} +In \LaTeX, |zhmath| has two options --- |active| and |noactive|. They set the +method to implement Chinese character displaying in math. The default is +|noactive|. + +When |active| is set, the Chinese characters in math formulas are set to +active, which, when executed, display the corresponding characters in +\cs{zhmathfont}. This behavior is much like that of the package |mathcjk|. The +font size in different styles are also set in \cs{mathcjksizea}/|b|/|c|/|d|. + +When |noactive| is set, the mathcodes of Chinese characters are set to use a +special math font family to display them. This way is more native than to use +active characters. + +Both |active| and |noactive| have disadvantages. In |active| mode the Chinese +math font sizes are determined by \cs{mathcjksizea}/|b|/|c|/|d|, so they are +somewhat independent with the main text size, which means their size cannot +change when the main font size changes, which gives ugly results. However, in +|noactive| mode, although Chinese math font size varies with the main font +size, Chinese inside \cs{mathrm} etc cannot be displayed, because the math +font family are set to \cs{mathrm}'s. So choose the option to your own need. + +In plain \TeX\ no package options are available. +\section{Provided Macros} +\mymacro\setzhmathfont +Set the math font used to display Chinese. Take one argument as the font +command. Preamble only. + +\mymacro\zhmathfont +The font command which determines the math font for Chinese. However, if you +use |noactive| option in \LaTeX, or you're in plain \TeX, they are not +executed when Chinese in math occur, but when \cs{setzhmathfont} is invoked. +So you should always call |\setzhmathfont\zhmathfont| after the change. + +\mymacro\usecustommathfonts +Enable the use of custom math fonts for alphas and numbers. The default is +Times New Roman. + +\mymacro\setalphanummathfonts +Set the math font used to display alphas and numbers. Preamble only. Take one +argument as the font family in \LaTeX, and two argument as the font command +for alphas and numbers accordingly in plain \TeX. + +\mymacro\zhmathalphanumfont +The font command which determines the math font for alphas and numbers in +\LaTeX. Should always call |\setalphanummathfonts\zhmathalphanumfont| after +it changes. + +\mymacro\zhmathletterfont +\mymacro\zhmathnumberfont +The font command which determines the math font for alphas and numbers in plain +\TeX. After their change \cs{setalphanummathfonts} with corresponding +arguments should be called. +\section{Examples} +{\emptyskipscheme +\begin{verbatim} +{ +$中文 in math 测_试$ +\usecustommathfonts +\Large $能量E = mc^2$, $s_总 = {1 \over 2} at^2$ +} +\end{verbatim} +} +\nobreak +{ +$中文 in math 测_试$ +\usecustommathfonts +\Large $能量E = mc^2$, $s_总 = {1 \over 2} at^2$ +} +\goodbreak +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/zhspacing/zhspacing-context-test.tex new/doc/generic/zhspacing/zhspacing-context-test.tex --- old/doc/generic/zhspacing/zhspacing-context-test.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/generic/zhspacing/zhspacing-context-test.tex 2016-05-15 17:30:11.000000000 +0200 @@ -0,0 +1,45 @@ +\usemodule[zhspacing] + + +这是中文测试。中文和English的混排。中 +文和$E=mc^2$的混排。 + +九齿钉耙学名上宝沁晶耙，是俺的武器。九齿钉耙并非普通的农具，而是由 +太上老君\footnote{太上老君，三清之第三位。又称“道德天尊”、 +“混元老君”、“降生天尊”、“太清大帝”等。}用神冰铁亲自锤炼，借五方五 +帝、六丁六甲之力锻造而成，有诗为证： + +九齿钉耙学名上宝沁晶耙，是俺的武器。九齿钉耙并非普通的农具，而是由 +太上老君\footnote{太上老君，三清之第三位。又称“道德天尊”、 +“混元老君”、“降生天尊”、“太清大帝”等。}用神冰铁亲自锤炼，借五方五 +帝、六丁六甲之力锻造而成，有诗为证： + +\rm\tf roman \it italic \bf bold \bi bolditalic \sc smallcaps + +\ss\tf roman \it italic \bf bold \bi bolditalic \sc smallcaps + +\tt\tf roman \it italic \bf bold \bi bolditalic \sc smallcaps + +\blank + +\rm\tf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\rm\it 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\rm\bf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\rm\bi 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par + +\blank + +\ss\tf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\ss\it 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\ss\bf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\ss\bi 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par + +\blank + +\tt\tf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\tt\it 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\tt\bf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par +\tt\bi 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par + + +\bye \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/zhspacing/README new/doc/xetex/zhspacing/README --- old/doc/xetex/zhspacing/README 2010-07-16 02:48:11.000000000 +0200 +++ new/doc/xetex/zhspacing/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -zhspacing is a package for typesetting CJK documents in XeTeX -for plain TeX, LaTeX and ConTeXt. - -This package is licensed in LPPL. - -If you are interested in the process of development you -may observe - - http://code.google.com/p/ctex-kit/updates/list - -- Yin Dian ([email protected]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/zhspacing/test/zhspacing-context-test.tex new/doc/xetex/zhspacing/test/zhspacing-context-test.tex --- old/doc/xetex/zhspacing/test/zhspacing-context-test.tex 2012-03-15 00:24:55.000000000 +0100 +++ new/doc/xetex/zhspacing/test/zhspacing-context-test.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ -\usemodule[zhspacing] - - -这是中文测试。中文和English的混排。中 -文和$E=mc^2$的混排。 - -九齿钉耙学名上宝沁晶耙，是俺的武器。九齿钉耙并非普通的农具，而是由 -太上老君\footnote{太上老君，三清之第三位。又称“道德天尊”、 -“混元老君”、“降生天尊”、“太清大帝”等。}用神冰铁亲自锤炼，借五方五 -帝、六丁六甲之力锻造而成，有诗为证： - -九齿钉耙学名上宝沁晶耙，是俺的武器。九齿钉耙并非普通的农具，而是由 -太上老君\footnote{太上老君，三清之第三位。又称“道德天尊”、 -“混元老君”、“降生天尊”、“太清大帝”等。}用神冰铁亲自锤炼，借五方五 -帝、六丁六甲之力锻造而成，有诗为证： - -\rm\tf roman \it italic \bf bold \bi bolditalic \sc smallcaps - -\ss\tf roman \it italic \bf bold \bi bolditalic \sc smallcaps - -\tt\tf roman \it italic \bf bold \bi bolditalic \sc smallcaps - -\blank - -\rm\tf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\rm\it 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\rm\bf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\rm\bi 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par - -\blank - -\ss\tf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\ss\it 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\ss\bf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\ss\bi 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par - -\blank - -\tt\tf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\tt\it 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\tt\bf 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par -\tt\bi 兡也包因沘氓侷柵苗孫孫財 text 兡也包因沘氓侷柵苗孫孫財\par - - -\bye \ No newline at end of file Files old/doc/xetex/zhspacing/zhs-man.pdf and new/doc/xetex/zhspacing/zhs-man.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/zhspacing/zhs-man.tex new/doc/xetex/zhspacing/zhs-man.tex --- old/doc/xetex/zhspacing/zhs-man.tex 2012-03-15 00:24:55.000000000 +0100 +++ new/doc/xetex/zhspacing/zhs-man.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,527 +0,0 @@ -% Hist: 070824 First document out. All but Implementation written. -% In the evening fixed some typos. -\documentclass[12pt]{ltxdoc} -%\usepackage[margin=1.5in]{geometry} -\usepackage{fontspec} -\defaultfontfeatures{Mapping=tex-text} -\usepackage[no-sscript]{xltxtra} -\usepackage{zhspacing} -\usepackage[fakebold]{zhfont} -\usepackage[noactive]{zhmath} -\usepackage{hyperref} -\newfontfamily\zhcjkextafont{Sun-ExtA} -\newfontfamily\zhcjkextbfont{Sun-ExtB} -\zhspacing -\usepackage{fancyvrb} -\DefineVerbatimEnvironment{verbatim}{Verbatim}{baselinestretch=0.9}%,fontsize=\footnotesize} -\usepackage{pst-all} -\setlength\parskip{0.5em plus 0.5em minus 0.5em} -\newcommand\q[1]{``\hbox spread -0.2em{#1}''} -\newcommand\name[1]{\hbox{#1}} -\newcommand\fntname[1]{\texttt{#1}} -\newcommand\NFSS{\textsf{NFSS}} -\newcommand\mymacro[1]{\ifvmode\noindent\else\setbox0=\lastbox\fi\llap{$\bullet$}\cmd#1\\\indent} -\makeatletter -\@addtoreset{section}{part} -\makeatother -\begin{document} -\title{Typesetting Chinese in \XeTeX: |zhspacing| user's -manual\thanks{Revision: \zhspacingrevision.}} -\author{\textsc{Yin} Dian\footnote{Lab.\ of Network Comm. System \& -Control, Univ.\ of Sci.\ \& Tech.\ of China.}} -\date{2012/03/14} -\maketitle -\tableofcontents -\newpage - -\part{zhspacing.sty} -\section{Introduction} -\XeTeX\ is a new \TeX\ engine by Jonathan Kew and SIL International, which combines -\eTeX\ with pervasive Unicode support and advanced font support\footnote{Words -copied from the ConTeXt Wiki.}. Using \XeTeX, it is possible to typeset scripts -of any languages whose glyphs are contained in the font in use, without the -help of any extra packages, such as |CJK|\footnote{|CJK| is a LaTeX 2e macro -package which enables the use of CJK scripts (Chinese/Japanese/Korean) in -various encodings, written by Werner Lemberg.}. - -However, \XeTeX\ itself does not solve all the problems. Some details in -Chinese typesetting have not been dealt with by \XeTeX, such as the automatic -font switch between Chinese and Western characters, the skip adjustment of -fullwidth punctuations, the automatic skip insertion between Chinese and -Western characters or math formulas, etc. - -To meet the need of easy and high quality typesetting of Chinese documents -using \XeTeX, the package |zhspacing| is coded, utilizing the new primitive of -\cs{XeTeXinterchartoks} provided in \XeTeX\ version 0.997. - -\section{Getting Started} -|zhspacing| can be used in both plain \XeTeX\ or \XeLaTeX. The usage is quite -straightforward. For instance, in plain \XeTeX, -{\emptyskipscheme -\begin{verbatim} - \input zhspacing.sty - \zhspacing - 这是中文测 试。中文和English的混排。中 - 文和$E=mc^2$的混排。 - \bye -\end{verbatim} -} -And in \XeLaTeX, -{\emptyskipscheme -\begin{verbatim} - \documentclass{article} - \usepackage{zhspacing} - \zhspacing - \begin{document} - 这是中文测 试。中文和English的混排。中 - 文和$E=mc^2$的混排。 - \end{document} -\end{verbatim} -} -Both of the examples above produce the same result as follows, -\begin{center} -这是中文测 试。中文和English的混排。中 -文和$E=mc^2$的混排。 -\end{center} - -As you can see, spaces after Chinese characters are always ignored. Moreover, a -noticable skip is inserted between Chinese characters and English characters as -well as math formulas. In fact, all of the following inputs can produce mixed -langauge output with skip automatically inserted between Chinese and English -characters, -\begin{center} -\emptyskipscheme |中Eng文|,\quad |中 Eng文|,\quad |中Eng 文|\quad and\quad |中 Eng 文|. -\end{center} -And their corresponding output is, -\begin{center} -中Eng文,\quad 中 Eng文,\quad 中Eng 文\quad and\quad 中 Eng 文. -\end{center} - -Look close and you'll find, that the first and second input generates exactly -the same output, and so does the third and fourth. However, the skip between -|Eng| and |文| in the last two cases is wider than the skip between |中| and -|Eng|. That is because the space is produced by the space token after the -letter |g|, not the skip automatically inserted by |zhspacing|'s skip -mechanism. - -The space ignoring and skip auto-inserting ability of |zhspacing| can make -writing documents much comfortable. You don't need to worry about the manual -insertion of skips such as adding the annoying |~| in |CJK|. - -Now come to the topic of punctuation skip adjustment. Proper Chinese -typesetting requires consecutive fullwidth punctuations be compressed, and a -linebreak before or after a fullwidth punctuation will cut off the blank spaces -of this punctuation, making it align to the margin. |zhspacing| does have -solved these problems, as well as proper prohibitions(禁则). Here's an example. -\begin{center} -\begin{minipage}{21em} -他强调，“三个代表”重要思想是在新的历史条件下运用马克思主义的立场、观点和方法的 -典范，是我们学习马克思主义的立场、观点和方法最现实、最生动的教材。“三个代表” -重要思想是与时俱进的理论。 -\end{minipage} -\end{center} - -\section{Advanced Usage} -\subsection{Fonts} -|zhspacing| uses an extensible way of selecting fonts. The rules can be -summarized as follows, -\begin{itemize} - \item Western characters, i.e.\ those that are not CJKV ideographies nor - CJKV punctuations, use the same font as default. - \item Chinese characters use seperate fonts. Font changes in the - document does not affect the font used to display Chinese, - unless you are using \NFSS\ and change the font series or shape. - \item On displaying basic Chinese ideographies, execute the command - \cs{zhfont}. - \item On displaying Chinese punctuations, execute the command - \cs{zhpunctfont}. - \item On displaying CJK Ext-A characters, execute the command - \cs{zhcjkextafont}. - \item On displaying CJK Ext-B characters, execute the command - \cs{zhcjkextbfont}. - \item When switching from non-Chinese characters to Chinese characters, - execute \cs{zhs@savefont}. When switching back, execute - \cs{zhs@restorefont}. -\end{itemize} - -When importing |zhspacing| from plain \XeTeX, the default definitions of the -above commands are, -\begin{verbatim} - \font\zhfont="SimSun" at 10pt - \font\zhpunctfont="SimSun" at 10pt - \def\zhcjkextafont{\message{CJK Ext-A}} - \def\zhcjkextbfont{\message{CJK Ext-B}} - \let\zhs@savefont=\begingroup - \let\zhs@restorefont=\endgroup -\end{verbatim} - -When imported from \XeLaTeX, the defaults are, -\begin{verbatim} - \newfontfamily\zhfont[BoldFont=SimHei]{SimSun} - \newfontfamily\zhpunctfont{SimSun} - \def\zhcjkextafont{\message{CJK Ext-A}} - \def\zhcjkextbfont{\message{CJK Ext-B}} - \def\zhs@savefont{\zhs@savef@nt{old}} - \def\zhs@restorefont{\zhs@restoref@nt{old}} -\end{verbatim} -Here \cs{zhs@savef@nt} and \cs{zhs@restoref@nt} are internal macros to save and -restore the \NFSS\ info of the current font to specified places. - -CJK Ext-A/B fonts have not been defined by default in consideration that not -every user has installed the particular fonts. I recommend to use -\fntname{Sun-ExtA} and \fntname{Sun-ExtB} as the corresponding fonts. You can -define the ext-font macros manually in a similar way to the definition of -\cs{zhfont}. - -An example of mixed typesetting of various classes of characters is as follows, -cited from \emph{The Tale of Kiều}\footnote{《金云翘传》，or \emph{Truyện Kiều}, -a Vietnamese \emph{lục bát} poem written in \emph{chữ Nôm}. \emph{Chữ Nôm} is -a system of ideographies created by the Vietnamese laboring people, most of -which are encoded in CJK Ext-A\hskip -0.2em/B area, or not even included in -Unicode.}. -\begin{center} -\parbox{21em}{ -\fontspec{Times New Roman} -𤾓𢆥𥪝𡎝𠊛些 -Trăm năm, trong cõi người ta, -𡨸才𡨸命𡑛罗恄𠑬 -Chữ tài, chữ mệnh, khéo là ghét nhau. -𣦆戈𠬠局𣷭橷 -Trải qua một cuộc bể dâu, -仍條𥉩𧡊𦓡𤴬疸𢚸 -Những điều trông thấy mà đau đớn lòng. -\footnotemark -} -\end{center} -\footnotetext{Some of the ideographies are replaced by similar characters due -to the limitation of character set. A picture of the original manuscript can be found at -\href{http://bbs.gophor.cn/cjkv/attachment/14_2_b44e05d28a68271.jpg}{\emph{this -link}}.}% or Fig.~\ref{fig:kieu}.} -\subsection{More on Fonts} -Sometimes it may be desirable to use different Chinese fonts for different -\NFSS\ font families in \LaTeX. This can be done by changing the definition of -\cs{zhs@savefont} and \cs{zhfont}, without modifying the |zhspacing| source. - -Here is the way to do it.\footnote{See zhfont.sty later for convenient ways.} -\begin{verbatim} -\makeatletter -\g@addto@macro\zhs@savefont{% - \long\edef\zhs@tmpmacro{\f@family}% - \def\zhs@curr@fam{0}% - \ifx\zhs@tmpmacro\sfdefault - \def\zhs@curr@fam{1}% - \else\ifx\zhs@tmpmacro\ttdefault - \def\zhs@curr@fam{2}% - \fi\fi - \edef\zhs@tmpmacro{\f@family}% - \ifx\zhs@tmpmacro\sfdefault - \def\zhs@curr@fam{1}% - \else\ifx\zhs@tmpmacro\ttdefault - \def\zhs@curr@fam{2}% - \fi\fi -} -\newfontfamily\zhrmfont[BoldFont=SimHei, - ItalicFont=KaiTi]{SimSun} -\newfontfamily\zhsffont{SimHei} -\newfontfamily\zhttfont[BoldFont=SimHei]{KaiTi} -\def\zhfont{\ifcase\zhs@curr@fam\zhrmfont\or\zhsffont - \or\zhttfont\else\zhrmfont\fi} -\end{verbatim} -\subsection{Skips} -The skip mechanism in |zhspacing| is also flexible. |zhspacing| utilizes the -following skip commands. Note that they are defined as macros instead of skip -register values, in order that the skip varies according to font size changes. -\begin{description} - \item[\mdseries\cs{skipzh}] - Skip between adjacent Chinese characters. - \item[\mdseries\cs{skipenzh}] - Skip between a Chinese character and a Western character or a - math formula. - \item[\mdseries\cs{skipzhopen}] - Skip before fullwidth opening punctuations, such as \q{“}, - \q{（}, \q{《}, etc. - \item[\mdseries\cs{skipzhinteropen}] - Skip before a fullwidth opening punctuation when preceded by - another fullwidth punctuation. - \item[\mdseries\cs{skipzhlinestartopen}] - Skip before a fullwidth opening punctuation when it occurs at - the start of a line. - \item[\mdseries\cs{skipzhclose}] - Skip after fullwidth closing punctuations, such as \q{”}, - \q{）}, \q{》}, etc. - \item[\mdseries\cs{skipzhinterclose}] - Skip after a fullwidth closing punctuation when followed by - another fullwidth punctuation. - \item[\mdseries\cs{skipzhlineendclose}] - Skip after a fullwidth closing punctuation when it occurs at - the end of a line. - \item[\mdseries\cs{skipzhfullstop}] - Skip after fullwidth fullstop punctuations, such as \q{；}, - \q{．}, \q{。}, etc. - \item[\mdseries\cs{skipzhinterfullstop}] - Skip after a fullwidth fullstop punctuation when followed by - another fullwidth punctuation. - \item[\mdseries\cs{skipzhlineendfullstop}] - Skip after a fullwidth fullstop punctuation when it occurs at - the end of a line. - \item[\mdseries\cs{skipzhhalfstop}] - Skip after fullwidth halfstop punctuations, such as \q{、}, - \q{，}, \q{：}, etc. - \item[\mdseries\cs{skipzhinterhalfstop}] - Skip after a fullwidth halfstop punctuation when followed by - another fullwidth punctuation. - \item[\mdseries\cs{skipzhlineendhalfstop}] - Skip after a fullwidth halfstop punctuation when it occurs at - the end of a line. - \item[\mdseries\cs{skipnegzhlinestartopen}] - Negative skip to \cs{skipzhlinestartopen}. - \item[\mdseries\cs{skipnegzhlineendclose}] - Negative skip to \cs{skipzhlineendclose}. - \item[\mdseries\cs{skipnegzhlineendfullstop}] - Negative skip to \cs{skipzhlineendfullstop}. - \item[\mdseries\cs{skipnegzhlineendhalfstop}] - Negative skip to \cs{skipzhlineendhalfstop}. -\end{description} - -All of the skip commands above are defined in the pattern \\ -\vadjust{}\hfil |\def\skipxxx{\hskip xxxxx}|. - -|zhspacing| comes with three pre-defined skip schemes, namely -\cs{simsunskipscheme}, \cs{emptyskipscheme} and \cs{haltskipscheme}. The -first scheme should be suitable for font \fntname{SimSun} and other popular -Chinese fonts used in China, which does not support OpenType features of -|halt|, and needs negative spaces be inserted before opening punctuations and -after closing or judou punctuations. The second scheme simply addes zero -length. And the last one should be fit for OpenType Chinese fonts supporting -|halt| feature such as Adobe Song Std, where positive spaces should be inserted -before or after certain punctuations. You can define your own skip schemes for -customization, of course. -\subsection{Vertical Chinese} -Vertical Chinese can be achieved by adding raw feature |vertical| to the -specified font. An example could be, \hfil -\setbox0=\hbox to 0pt{\vbox{\noindent -\newfontfamily\zhfont[RawFeature={script=hani:language=CHN:vertical:+vert}, - BoldFont=SimHei]{SimSun} -\let\zhpunctfont\zhfont -\haltskipscheme -\rotatebox{-90}{\fbox{\raise 0.8em\hbox{我是中国人，我爱自己的祖国。}}} -}\hss} -\dp0=0pt \raise 0.8em\box0 - -\begin{verbatim} - \documentclass[12pt]{article} - \usepackage{graphicx} - \usepackage{zhspacing} - \zhspacing - \begin{document} - \newfontfamily\zhfont[ - RawFeature={script=hani:language=CHN:vertical:+vert}]{SimSun} - \let\zhpunctfont\zhfont - \haltskipscheme - \rotatebox{-90}{我是中国人，我爱自己的祖国。} - \end{document} -\end{verbatim} - -Note that in this example, in order to have proper vertical punctuations, we -set \cs{zhpunctfont} to use the Adobe one supporting |vert| feature, and change -the skip scheme to \cs{haltskipscheme} to match the |vhal| feature specified. - -However, there exists some bug in typesetting vertical Chinese containing -punctuations using some fonts such as \fntname{KaiTi\_GB2312} etc. I've told -this bug to \name{jjgod} in May, but it seems that he hasn't solved the problem -yet. Moreover, the baseline of vertical Chinese is not correct, so mixed -typesetting of Chinese and English in vertical mode generates ugly results, and -thus should be avoided. -\subsection{Compatibility} -Theoretically, |zhspacing| should be compatible with all macro packages, except -those who change the definition of \cs{hskip} and \cs{penalty}, in which case -special treatment should be applied. I haven't found any conflict when using -common packages such as |hyperref| and |fancyhdr|. However, |ulem| redefineds -\cs{hskip} and \cs{penalty}, and causes unexpected output\footnote{I was using -\cs{begingroup} and \cs{endgroup} as the font saving/restoring commands. -However, I found |ulem| redefines \cs{hskip} and \cs{penalty} to end the -current hbox group and start a new hbox, and thus group mismatch occurs. So I -changed the font saving/restoring commands when used in \LaTeX, using \NFSS\ info -instead of groups. But in the new hbox group, no Chinese font is applied by -default so the Chinese characters disappears. Therefore I changed the -definitions of |ulem|'s new \cs{hskip} and \cs{penalty} in |zhulem|, and advice -users to use this modified one.}. Use |zhulem| provided along with -|zhspacing| instead. - -|zhspacing| may be not compatible with macro packages which use -\cs{XeTeXinterchartoks} faculty. For example, the |polyglossia| package (some -languages). - -\subsection{Working with other Chinese package} - -|zhspacing| is not compatible with |xeCJK|. The latter can be only used in -\LaTeX\ format. |zhspacing| is now supposed to be mainly used in Plain \TeX\ -format; in \LaTeX, |xeCJK| is a better choice. - -The |ctex| package, made by \href{http://www.ctex.org}{|ctex.org|}, is a widely -used Chinese document framework which hides the underlying Chinese processing -details to the user, which enables portability between different Chinese -processing packages or systems. New version of |ctex| package supports \XeTeX\ -through |xeCJK| package, |zhspacing| is not necessary. - -To use |zhspacing| in |cxetex|, a slight modification of the file |ctexcjk.clo| -should be made. Change the corresponding lines to the followes (\% means the -original lines). -\begin{verbatim} -%\XeTeXlinebreaklocale "zh" -%\XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt -%\setmainfont[BoldFont={cwTeXHeiBold}, -% ItalicFont={cwTeXKaiItalic}, -% Mapping=tex-text]{cwTeXMing} -%\setsansfont[BoldFont={cwTeXHeiBold},Mapping=tex-text]{cwTeXYen} -%\setmonofont{cwTeXFangSongTT} -\usepackage{zhspacing} -\newfontfamily\zhfont[BoldFont=SimHei]{SimSun} -\newfontfamily\zhcjkextafont{Sun-ExtA} -\newfontfamily\zhcjkextbfont{Sun-ExtB} -\zhspacing -\end{verbatim} - -You can surely change these lines to your own taste. - -\section{Getting \texttt{zhspacing}} - -You can get latest stable version of |zhspacing| on CTAN. - -|zhspacing| was hosted on an open-source project at googlecode. The old project -homepage is \url{http://code.google.com/p/zhspacing/}. - -Now |zhspacing| is part of |ctex-kit| project (\url{http://code.google.com/p/ctex-kit/}). You can get the lastest source via SVN. - -\goodbreak -\part{zhfont.sty} -\section{Introduction} -To simplify the complex font setting to use \NFSS\ in \LaTeX, the package -|zhfont| is coded. It also adds simple interface to define fonts with fake -slant, and also supports fake bold. -\section{Package Options} -|zhfont| currently has only one option --- |fakebold|. This option sets -Chinese show fake boldface when the current series is bold. -\section{Provided Macros} -\mymacro\zhrmfont -\mymacro\zhsffont -\mymacro\zhttfont -The font commands to be executed according to the current font family. -You can redefine them to customize your fonts. - -\mymacro\setzhmainfont -\mymacro\setzhsansfont -\mymacro\setzhmonofont -Simply macro to set \cs{zh\{rm/sf/tt\}font} using \cs{newfontfamily}. - -\mymacro\newfontfamilywithslant -Create a font family with fake slant. Take one argument as the font name. - -Example: |\newfontfamilywithslant\zhrmfont{SimSun}| - -\mymacro\newfontfamilywithslantandbold -Create a font family with fake slant, and specify another font for its -boldface. Take two arguments as the font name and bold font name. - -Example:\\\quad |\newfontfamilywithslantandbold\zhrmfont{SimSun}{SimHei}| -\section{Examples} -The following example is generated with |zhfont| loaded with option -|fakebold|. - -{\emptyskipscheme -\begin{verbatim} -\newfontfamilywithslant\zhrmfont{SimSun} -中文\textbf{测试}。\textit{中文\textbf{测试}。} -\newfontfamilywithslant\zhrmfont{FangSong} -中文\textbf{测试}。\textit{中文\textbf{测试}。} -\end{verbatim} -} -\nobreak -{ -\newfontfamilywithslant\zhrmfont{SimSun} -中文\textbf{测试}。\textit{中文\textbf{测试}。} -\newfontfamilywithslant\zhrmfont{FangSong} -中文\textbf{测试}。\textit{中文\textbf{测试}。} -} -\goodbreak - -\part{zhmath.sty} -\section{Introduction} -|zhmath| is a generic package which allows the Chinese characters to be -displayed in math formulas. It also allows changing the math font for alphas -and numbers. - -|zhmath| only sets the basic Chinese characters to be displayable, not CJK -Ext-A/B ones, as they are seldom used and discouraged in math. You can use -\cs{hbox} to let |zhspacing| display them, however. -\section{Package Options} -In \LaTeX, |zhmath| has two options --- |active| and |noactive|. They set the -method to implement Chinese character displaying in math. The default is -|noactive|. - -When |active| is set, the Chinese characters in math formulas are set to -active, which, when executed, display the corresponding characters in -\cs{zhmathfont}. This behavior is much like that of the package |mathcjk|. The -font size in different styles are also set in \cs{mathcjksizea}/|b|/|c|/|d|. - -When |noactive| is set, the mathcodes of Chinese characters are set to use a -special math font family to display them. This way is more native than to use -active characters. - -Both |active| and |noactive| have disadvantages. In |active| mode the Chinese -math font sizes are determined by \cs{mathcjksizea}/|b|/|c|/|d|, so they are -somewhat independent with the main text size, which means their size cannot -change when the main font size changes, which gives ugly results. However, in -|noactive| mode, although Chinese math font size varies with the main font -size, Chinese inside \cs{mathrm} etc cannot be displayed, because the math -font family are set to \cs{mathrm}'s. So choose the option to your own need. - -In plain \TeX\ no package options are available. -\section{Provided Macros} -\mymacro\setzhmathfont -Set the math font used to display Chinese. Take one argument as the font -command. Preamble only. - -\mymacro\zhmathfont -The font command which determines the math font for Chinese. However, if you -use |noactive| option in \LaTeX, or you're in plain \TeX, they are not -executed when Chinese in math occur, but when \cs{setzhmathfont} is invoked. -So you should always call |\setzhmathfont\zhmathfont| after the change. - -\mymacro\usecustommathfonts -Enable the use of custom math fonts for alphas and numbers. The default is -Times New Roman. - -\mymacro\setalphanummathfonts -Set the math font used to display alphas and numbers. Preamble only. Take one -argument as the font family in \LaTeX, and two argument as the font command -for alphas and numbers accordingly in plain \TeX. - -\mymacro\zhmathalphanumfont -The font command which determines the math font for alphas and numbers in -\LaTeX. Should always call |\setalphanummathfonts\zhmathalphanumfont| after -it changes. - -\mymacro\zhmathletterfont -\mymacro\zhmathnumberfont -The font command which determines the math font for alphas and numbers in plain -\TeX. After their change \cs{setalphanummathfonts} with corresponding -arguments should be called. -\section{Examples} -{\emptyskipscheme -\begin{verbatim} -{ -$中文 in math 测_试$ -\usecustommathfonts -\Large $能量E = mc^2$, $s_总 = {1 \over 2} at^2$ -} -\end{verbatim} -} -\nobreak -{ -$中文 in math 测_试$ -\usecustommathfonts -\Large $能量E = mc^2$, $s_总 = {1 \over 2} at^2$ -} -\goodbreak -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhspacing.doc.tlpobj new/tlpkg/tlpobj/zhspacing.doc.tlpobj --- old/tlpkg/tlpobj/zhspacing.doc.tlpobj 2015-04-13 02:53:03.000000000 +0200 +++ new/tlpkg/tlpobj/zhspacing.doc.tlpobj 2016-05-16 00:52:55.000000000 +0200 @@ -1,10 +1,10 @@ name zhspacing.doc category Package -revision 25644 +revision 41145 shortdesc doc files of zhspacing relocated 1 -docfiles size=45 - RELOC/doc/xetex/zhspacing/README - RELOC/doc/xetex/zhspacing/test/zhspacing-context-test.tex - RELOC/doc/xetex/zhspacing/zhs-man.pdf - RELOC/doc/xetex/zhspacing/zhs-man.tex +docfiles size=50 + RELOC/doc/generic/zhspacing/README.md + RELOC/doc/generic/zhspacing/zhs-man.pdf + RELOC/doc/generic/zhspacing/zhs-man.tex + RELOC/doc/generic/zhspacing/zhspacing-context-test.tex ++++++ zhspacing.tar.xz ++++++ ++++ 3141 lines of diff (skipped) ++++++ ziffer.doc.tar.xz ++++++ ++++++ ziffer.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ziffer.tlpobj new/tlpkg/tlpobj/ziffer.tlpobj --- old/tlpkg/tlpobj/ziffer.tlpobj 2015-04-13 02:53:04.000000000 +0200 +++ new/tlpkg/tlpobj/ziffer.tlpobj 2016-04-14 20:09:51.000000000 +0200 @@ -1,7 +1,7 @@ name ziffer category Package revision 32279 -shortdesc Conversion of punctuation in maths mode. +shortdesc Conversion of punctuation in maths mode relocated 1 longdesc The package modifies the behaviour of characters in maths mode longdesc so that: '.' is used as a one-thousand separator (as is common @@ -11,7 +11,9 @@ longdesc switched on and off. runfiles size=1 RELOC/tex/latex/ziffer/ziffer.sty +catalogue-also icomma catalogue-ctan /macros/latex/contrib/ziffer -catalogue-date 2012-05-09 18:20:59 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl +catalogue-topics numbers catalogue-version 2.1 ++++++ zlmtt.doc.tar.xz ++++++ ++++++ zlmtt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zlmtt.tlpobj new/tlpkg/tlpobj/zlmtt.tlpobj --- old/tlpkg/tlpobj/zlmtt.tlpobj 2015-04-13 02:53:04.000000000 +0200 +++ new/tlpkg/tlpobj/zlmtt.tlpobj 2016-04-14 20:09:51.000000000 +0200 @@ -1,7 +1,7 @@ name zlmtt category Package revision 34485 -shortdesc Use Latin Modern Typewriter fonts. +shortdesc Use Latin Modern Typewriter fonts relocated 1 longdesc The package allows selection of Latin Modern Typewriter fonts longdesc with scaling and access to all its features. The package @@ -27,6 +27,7 @@ RELOC/tex/latex/zlmtt/ts1zlmvtt.fd RELOC/tex/latex/zlmtt/zlmtt.sty catalogue-ctan /fonts/zlmtt -catalogue-date 2014-06-29 13:20:21 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl1.3 +catalogue-topics font-supp catalogue-version 1.01 ++++++ zwgetfdate.doc.tar.xz ++++++ ++++++ zwgetfdate.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zwgetfdate.tlpobj new/tlpkg/tlpobj/zwgetfdate.tlpobj --- old/tlpkg/tlpobj/zwgetfdate.tlpobj 2015-04-13 02:53:04.000000000 +0200 +++ new/tlpkg/tlpobj/zwgetfdate.tlpobj 2016-04-14 20:09:52.000000000 +0200 @@ -1,7 +1,7 @@ name zwgetfdate category Package revision 15878 -shortdesc Get package or file date. +shortdesc Get package or file date relocated 1 longdesc The package can fetch the date declaration of packages and longdesc files used by a document, and then provide the information in @@ -11,5 +11,6 @@ runfiles size=1 RELOC/tex/latex/zwgetfdate/zwgetfdate.sty catalogue-ctan /macros/latex/contrib/zwgetfdate -catalogue-date 2014-02-26 23:03:13 +0100 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl1.3 +catalogue-topics file-mgmt ++++++ zwpagelayout.doc.tar.xz ++++++ ++++++ zwpagelayout.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zwpagelayout.tlpobj new/tlpkg/tlpobj/zwpagelayout.tlpobj --- old/tlpkg/tlpobj/zwpagelayout.tlpobj 2015-04-13 02:53:05.000000000 +0200 +++ new/tlpkg/tlpobj/zwpagelayout.tlpobj 2016-04-14 20:09:52.000000000 +0200 @@ -1,7 +1,7 @@ name zwpagelayout category Package revision 28846 -shortdesc Page layout and crop-marks. +shortdesc Page layout and crop-marks relocated 1 longdesc This package was developed as a typographers' toolbox offering longdesc important basic features for everyday work. It allows setting @@ -11,7 +11,9 @@ longdesc (x)dvipdfm(x)), and with pdfTeX. runfiles size=9 RELOC/tex/latex/zwpagelayout/zwpagelayout.sty +catalogue-also geometry crop catalogue-ctan /macros/latex/contrib/zwpagelayout -catalogue-date 2014-02-26 23:03:13 +0100 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license lppl +catalogue-topics geometry production catalogue-version 1.4d ++++++ zxjafbfont.doc.tar.xz ++++++ ++++++ zxjafbfont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjafbfont.tlpobj new/tlpkg/tlpobj/zxjafbfont.tlpobj --- old/tlpkg/tlpobj/zxjafbfont.tlpobj 2015-04-13 02:53:05.000000000 +0200 +++ new/tlpkg/tlpobj/zxjafbfont.tlpobj 2016-04-14 20:09:52.000000000 +0200 @@ -1,11 +1,12 @@ name zxjafbfont category Package revision 28539 -shortdesc Fallback CJK font support for xeCJK. +shortdesc Fallback CJK font support for xeCJK relocated 1 runfiles size=1 RELOC/tex/latex/zxjafbfont/zxjafbfont.sty catalogue-ctan /language/japanese/zxjafbfont -catalogue-date 2014-02-26 23:03:13 +0100 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license other-free +catalogue-topics font-supp chinese japanese korean xetex catalogue-version 0.2 ++++++ zxjafont.doc.tar.xz ++++++ ++++++ zxjafont.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjafont.tlpobj new/tlpkg/tlpobj/zxjafont.tlpobj --- old/tlpkg/tlpobj/zxjafont.tlpobj 2015-05-09 03:24:52.000000000 +0200 +++ new/tlpkg/tlpobj/zxjafont.tlpobj 2016-04-14 20:09:53.000000000 +0200 @@ -1,11 +1,12 @@ name zxjafont category Package revision 37281 -shortdesc Set up Japanese font families for XeLaTeX. +shortdesc Set up Japanese font families for XeLaTeX relocated 1 runfiles size=4 RELOC/tex/latex/zxjafont/zxjafont.sty catalogue-ctan /language/japanese/zxjafont -catalogue-date 2015-05-08 19:12:12 +0200 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license other-free +catalogue-topics japanese font-supp xetex catalogue-version 0.3 ++++++ zxjatype.doc.tar.xz ++++++ ++++++ zxjatype.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjatype.tlpobj new/tlpkg/tlpobj/zxjatype.tlpobj --- old/tlpkg/tlpobj/zxjatype.tlpobj 2015-04-13 02:53:05.000000000 +0200 +++ new/tlpkg/tlpobj/zxjatype.tlpobj 2016-04-14 20:09:53.000000000 +0200 @@ -1,11 +1,12 @@ name zxjatype category Package revision 28541 -shortdesc Standard conforming typesetting of Japanese, for XeLaTeX. +shortdesc Standard conforming typesetting of Japanese, for XeLaTeX relocated 1 runfiles size=8 RELOC/tex/latex/zxjatype/zxjatype.sty catalogue-ctan /language/japanese/zxjatype -catalogue-date 2014-02-26 23:03:13 +0100 +catalogue-date 2015-08-03 05:43:12 +0200 catalogue-license other-free +catalogue-topics std-conform japanese xetex catalogue-version 0.6
