zhspacing (14may16)

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

6 files changed, 50 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/xetex/zhspacing/README b/Master/texmf-dist/doc/xetex/zhspacing/README
deleted file mode 100644
index b5b4223d953..00000000000
--- a/Master/texmf-dist/doc/xetex/zhspacing/README
+++ /dev/null
@@ -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
-
-    https://github.com/CTeX-org/ctex-kit/
-
-- Yin Dian (yindian@gmail.com)
diff --git a/Master/texmf-dist/doc/xetex/zhspacing/README.md b/Master/texmf-dist/doc/xetex/zhspacing/README.md
new file mode 100644
index 00000000000..f4e52f372d9
--- /dev/null
+++ b/Master/texmf-dist/doc/xetex/zhspacing/README.md
@@ -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 <yindian@gmail.com>
+    Copyright (C) 2010--2012 by Leo Liu <leoliu.pku@gmail.com>
+    Copyright (C) 2016 by Qing Lee <sobenlee@gmail.com>
+    ----------------------------------------------------------------------
+
+    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.
diff --git a/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf b/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf
index e2539e11888..195afe6284b 100644
--- a/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf
+++ b/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf
diff --git a/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.tex b/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.tex
index e4d16a710e6..57c50fa8224 100644
--- a/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.tex
+++ b/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.tex
@@ -32,7 +32,7 @@
 manual\thanks{Revision: \zhspacingrevision.}}
 \author{\textsc{Yin} Dian\footnote{Lab.\ of Network Comm. System \&
 Control, Univ.\ of Sci.\ \& Tech.\ of China.}}
-\date{2016/02/10}
+\date{2016/05/14}
 \maketitle
 \tableofcontents
 \newpage
diff --git a/Master/texmf-dist/tex/xetex/zhspacing/zhspacing.sty b/Master/texmf-dist/tex/xetex/zhspacing/zhspacing.sty
index 71eb6aac262..0c2826d5e83 100644
--- a/Master/texmf-dist/tex/xetex/zhspacing/zhspacing.sty
+++ b/Master/texmf-dist/tex/xetex/zhspacing/zhspacing.sty
@@ -89,7 +89,7 @@
   \errmessage{XeTeX 0.997 or above required to use zhspacing}%
 \fi
 \ifx\zhspacingrevision\@undefined
-\def\zhspacingrevision{2016/02/10}
+\def\zhspacingrevision{2016/05/14}
 \input zhsusefulmacros.sty
 \newif\ifzhs@ambiwide
 \zhs@ambiwidetrue
@@ -784,6 +784,7 @@
 
 \def\zhs@loadxetexclasses{%
   \chardef\XeTeXcharclassID = 1 %
+  \chardef\XeTeXcharclassCJ = 1 %
   \chardef\XeTeXcharclassOP = 2 %
   \chardef\XeTeXcharclassCL = 3 %
   \chardef\XeTeXcharclassEX = 3 %
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index fbc90fa800e..2a6ef77f12e 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -71,7 +71,7 @@ sub ctaninfo {
   # erroneous or problematic tds files (when new, tell CTAN and author)
   $erroneous_tds = join ("|",
     qw(alertmessage countriesofeurope dad ebproof engpron gost
-       hacm imtekda mathdesign tufte-latex xassoccnt),
+       hacm imtekda mathdesign tufte-latex xassoccnt zhspacing),
     );
   
   # Heiko's tds files (don't propagate through CTAN fast enough).