From ed4534197eb59eaaf55a6254c40708e64bfc6890 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Mar 2012 23:24:55 +0000 Subject: zhspacing (14mar12) git-svn-id: svn://tug.org/texlive/trunk@25644 c570f23f-e606-0410-a88d-b1316a301751 --- .../zhspacing/test/zhspacing-context-test.tex | 45 +++++++++++++++++ Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf | Bin 192721 -> 151236 bytes Master/texmf-dist/doc/xetex/zhspacing/zhs-man.tex | 53 +++++++++++++-------- .../doc/xetex/zhspacing/zhspacing-context-test.tex | 45 ----------------- 4 files changed, 78 insertions(+), 65 deletions(-) create mode 100644 Master/texmf-dist/doc/xetex/zhspacing/test/zhspacing-context-test.tex delete mode 100644 Master/texmf-dist/doc/xetex/zhspacing/zhspacing-context-test.tex (limited to 'Master/texmf-dist/doc/xetex') diff --git a/Master/texmf-dist/doc/xetex/zhspacing/test/zhspacing-context-test.tex b/Master/texmf-dist/doc/xetex/zhspacing/test/zhspacing-context-test.tex new file mode 100644 index 00000000000..1f6c528d25c --- /dev/null +++ b/Master/texmf-dist/doc/xetex/zhspacing/test/zhspacing-context-test.tex @@ -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 --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 Binary files a/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf and b/Master/texmf-dist/doc/xetex/zhspacing/zhs-man.pdf differ 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/doc/xetex/zhspacing/zhspacing-context-test.tex b/Master/texmf-dist/doc/xetex/zhspacing/zhspacing-context-test.tex deleted file mode 100644 index 1f6c528d25c..00000000000 --- a/Master/texmf-dist/doc/xetex/zhspacing/zhspacing-context-test.tex +++ /dev/null @@ -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 -- cgit v1.2.3