zhspacing (14mar12)

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

9 files changed, 51 insertions, 37 deletions

diff --git a/Master/texmf-dist/doc/xetex/zhspacing/zhspacing-context-test.tex b/Master/texmf-dist/doc/xetex/zhspacing/test/zhspacing-context-test.tex
index 1f6c528d25c..1f6c528d25c 100644
--- a/Master/texmf-dist/doc/xetex/zhspacing/zhspacing-context-test.tex
+++ b/Master/texmf-dist/doc/xetex/zhspacing/test/zhspacing-context-test.tex
diff --git a/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf b/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf
index c0a828fb9f3..30a336d2ddc 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 0ec7e478aba..6959a38d641 100644
--- a/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.tex
+++ b/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.tex
@@ -8,7 +8,7 @@
 \usepackage{zhspacing}
 \usepackage[fakebold]{zhfont}
 \usepackage[noactive]{zhmath}
-\usepackage[dvipdfmx]{hyperref}
+\usepackage{hyperref}
 \newfontfamily\zhcjkextafont{Sun-ExtA}
 \newfontfamily\zhcjkextbfont{Sun-ExtB}
 \zhspacing
@@ -26,10 +26,10 @@
 \makeatother
 \begin{document}
 \title{Typesetting Chinese in \XeTeX: |zhspacing| user's
-manual\footnote{Revision: \zhspacingrevision.}}
+manual\thanks{Revision: \zhspacingrevision.}}
 \author{\textsc{Yin} Dian\footnote{Lab.\ of Network Comm. System \&
 Control, Univ.\ of Sci.\ \& Tech.\ of China.}}
-\date{2007.12.11.}
+\date{2012/03/14}
 \maketitle
 \tableofcontents
 \newpage
@@ -221,9 +221,9 @@ Here is the way to do it.\footnote{See zhfont.sty later for convenient ways.}
   \fi\fi
 }
 \newfontfamily\zhrmfont[BoldFont=SimHei,
-  ItalicFont=KaiTi_GB2312]{SimSun}
+  ItalicFont=KaiTi]{SimSun}
 \newfontfamily\zhsffont{SimHei}
-\newfontfamily\zhttfont[BoldFont=SimHei]{KaiTi_GB2312}
+\newfontfamily\zhttfont[BoldFont=SimHei]{KaiTi}
 \def\zhfont{\ifcase\zhs@curr@fam\zhrmfont\or\zhsffont
   \or\zhttfont\else\zhrmfont\fi}
 \end{verbatim}
@@ -300,8 +300,9 @@ customization, of course.
 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={vertical:},BoldFont=SimHei]{SimSun}
-\newfontfamily\zhpunctfont[RawFeature={vertical:+vert:+vhal}]{[AdobeSongStd-Light.otf]}
+\newfontfamily\zhfont[RawFeature={script=hani:language=CHN:vertical:+vert},
+  BoldFont=SimHei]{SimSun}
+\let\zhpunctfont\zhfont
 \haltskipscheme
 \rotatebox{-90}{\fbox{\raise 0.8em\hbox{我是中国人，我爱自己的祖国。}}}
 }\hss}
@@ -309,13 +310,13 @@ specified font. An example could be, \hfil
 
 \begin{verbatim}
   \documentclass[12pt]{article}
-  \usepackage[dvipdfm]{graphicx}
+  \usepackage{graphicx}
   \usepackage{zhspacing}
   \zhspacing
   \begin{document}
-  \newfontfamily\zhfont[RawFeature={vertical:}]{SimSun}
-  \newfontfamily\zhpunctfont[RawFeature={vertical:
-              +vert:+vhal}]{[AdobeSongStd-Light.otf]}
+  \newfontfamily\zhfont[
+    RawFeature={script=hani:language=CHN:vertical:+vert}]{SimSun}
+  \let\zhpunctfont\zhfont
   \haltskipscheme
   \rotatebox{-90}{我是中国人，我爱自己的祖国。}
   \end{document}
@@ -347,13 +348,21 @@ 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.
 
-\subsection{Working with the \texttt{ctex} package}
+|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, such as |CCT| and |CJK|. \name{Jjgod} has made
-a \XeTeX\ port of the |ctex| package, named |cxetex|, which can be found at
-\url{http://www.newsmth.net/att.php?s.460.257121.452.bz2}.
+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
@@ -376,9 +385,13 @@ original lines).
 You can surely change these lines to your own taste.
 
 \section{Getting \texttt{zhspacing}}
-|zhspacing| is hosted on an open-source project at googlecode. The project
-homepage is \url{http://code.google.com/p/zhspacing/}. You can get the lastest
-source from the download page or via SVN.
+
+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}
@@ -419,7 +432,7 @@ The following example is generated with |zhfont| loaded with option
 \begin{verbatim}
 \newfontfamilywithslant\zhrmfont{SimSun}
 中文\textbf{测试}。\textit{中文\textbf{测试}。}
-\newfontfamilywithslant\zhrmfont{FangSong_GB2312}
+\newfontfamilywithslant\zhrmfont{FangSong}
 中文\textbf{测试}。\textit{中文\textbf{测试}。}
 \end{verbatim}
 }
@@ -427,7 +440,7 @@ The following example is generated with |zhfont| loaded with option
 {
 \newfontfamilywithslant\zhrmfont{SimSun}
 中文\textbf{测试}。\textit{中文\textbf{测试}。}
-\newfontfamilywithslant\zhrmfont{FangSong_GB2312}
+\newfontfamilywithslant\zhrmfont{FangSong}
 中文\textbf{测试}。\textit{中文\textbf{测试}。}
 }
 \goodbreak
diff --git a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhmath.sty b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhmath.sty
index 88e69f60d7f..88e69f60d7f 100644
--- a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhmath.sty
+++ b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhmath.sty
diff --git a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhsmyclass.sty b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhsmyclass.sty
index fc80762f09d..3f336c54e42 100644
--- a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhsmyclass.sty
+++ b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhsmyclass.sty
@@ -8,7 +8,9 @@
 %		071019	Added \getclassnum
 %		071210	Changed \@foreach to \@for.
 \catcode`\@=11
-\ifx\@myclass@defined\@undefined
+\ifx\@myclass@defined\@undefined\else
+  \expandafter\endinput
+\fi
 \def\@myclass@defined{\relax}
 \input zhsusefulmacros.sty
 \catcode`\@=11
@@ -147,4 +149,4 @@
     }%
   }%
 }
-\fi
+
diff --git a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhspacing.sty b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhspacing.sty
index 36a13bb5139..7202dbcf494 100644
--- a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhspacing.sty
+++ b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhspacing.sty
@@ -71,6 +71,7 @@
 %			hanzi protected.
 %       090720  Rename usefulmacros.sty and myclass.sty to
 %           zhsusefulmacros.sty and zhsmyclass.sty.
+%       2012/03/14  Fix bug for Plain format.
 % Note:	1.	Catcode test requires letter 'a' to be in category 11, and '!' 
 %		to be in category 12. So don't change the default catcodes.
 %	2.	To speed up processing long Chinese documents, set \skipzh to
@@ -85,7 +86,7 @@
   \errmessage{XeTeX 0.997 or above required to use zhspacing}%
 \fi
 \ifx\zhspacingrevision\@undefined
-\def\zhspacingrevision{2008/01/02}
+\def\zhspacingrevision{2012/03/14}
 \input zhsusefulmacros.sty
 \newif\ifzhs@ambiwide
 \zhs@ambiwidetrue
diff --git a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhsusefulmacros.sty b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhsusefulmacros.sty
index 96b5d720e7c..d42a3efcf6f 100644
--- a/Master/texmf-dist/tex/xetex/zhspacing/plain/zhsusefulmacros.sty
+++ b/Master/texmf-dist/tex/xetex/zhspacing/generic/zhsusefulmacros.sty
@@ -3,12 +3,14 @@
 %	and \futurenonspacelet.
 %	Licensed under LPPL.
 \catcode`\@=11
-\ifx\@usefulmacros@defined\@undefined
+\ifx\@usefulmacros@defined\@undefined\else
+  \expandafter\endinput
+\fi
 \def\@usefulmacros@defined{\relax}
 \def\@usefulmacros@LaTeX@e{LaTeX2e}
 \def\ifLaTeX@e{\ifx\fmtname\@usefulmacros@LaTeX@e}
-%\ifx\LaTeX\@undefined
 \ifLaTeX@e\else
+\def\newtoks{\alloc@5\toks\toksdef\@cclvi}
 \def\@nnil{\@nil}%
 \def\@empty{}%
 \def\@fornoop#1\@@#2#3{}%
@@ -66,7 +68,7 @@
 %
 \def\@namedef#1{\expandafter\def\csname #1\endcsname}
 %
-\fi % end if
+\fi % end of \ifLaTeX@e\else
 
 \def\@BTcs{}
 \let\nexttoken\relax
@@ -94,4 +96,3 @@
   }}%
 }
 \fi
-\fi
diff --git a/Master/texmf-dist/tex/xetex/zhspacing/latex/zhfont.sty b/Master/texmf-dist/tex/xetex/zhspacing/latex/zhfont.sty
index 660f7a1ac2c..cc3f98d382b 100644
--- a/Master/texmf-dist/tex/xetex/zhspacing/latex/zhfont.sty
+++ b/Master/texmf-dist/tex/xetex/zhspacing/latex/zhfont.sty
@@ -58,17 +58,14 @@
   \newfontfamily#1[BoldFont=#3,ItalicFont=#2,ItalicFeatures={RawFeature={slant=0.17}},BoldItalicFont=#3,BoldItalicFeatures={RawFeature={slant=0.17}}]{#2}%
 }
 
-%\newfontfamily\zhrmfont[BoldFont=SimHei,ItalicFont=SimSun,ItalicFeatures={RawFeature={slant=0.17}},BoldItalicFont=SimHei,BoldItalicFeatures={RawFeature={slant=0.17}}]{SimSun}
-%\newfontfamily\zhsffont[ItalicFont=SimHei,ItalicFeatures={RawFeature={slant=0.17}}]{SimHei}
-%\newfontfamily\zhttfont[BoldFont=KaiTi_GB2312,ItalicFont=FangSong_GB2312,ItalicFeatures={RawFeature={slant=0.17}},BoldItalicFont=KaiTi_GB2312,BoldItalicFeatures={RawFeature={slant=0.17}}]{FangSong_GB2312}
 \ifzhfont@fakebold
-\newfontfamilywithslant\zhrmfont{SimSun}
-\newfontfamilywithslant\zhsffont{SimHei}
-\newfontfamilywithslant\zhttfont{FangSong_GB2312}
+  \newfontfamilywithslant\zhrmfont{SimSun}
+  \newfontfamilywithslant\zhsffont{SimHei}
+  \newfontfamilywithslant\zhttfont{[simfang.ttf]}
 \else
-\newfontfamilywithslantandbold\zhrmfont{SimSun}{SimHei}
-\newfontfamilywithslant\zhsffont{SimHei}
-\newfontfamilywithslantandbold\zhttfont{FangSong_GB2312}{KaiTi_GB2312}
+  \newfontfamilywithslantandbold\zhrmfont{SimSun}{SimHei}
+  \newfontfamilywithslant\zhsffont{SimHei}
+  \newfontfamilywithslantandbold\zhttfont{[simfang.ttf]}{[simkai.ttf]}
 \fi
 \def\zhfont{\ifcase\zhs@curr@fam\zhrmfont\or\zhsffont\or\zhttfont\else\zhrmfont\fi}
 
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 67d35cb5c48..b8c0499f3d8 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -4795,7 +4795,7 @@ sub POSTzhspacing {
   print "POST$package - move subdirectories\n";
   my $dstdir = "$DEST/tex/xetex/$package";
   &xmkdir ($dstdir);
-  &SYSTEM ("$MV context latex plain $dstdir/");
+  &SYSTEM ("$MV context latex generic $dstdir/");
   &SYSTEM ("$MV doc/* .; rmdir doc");
 }