summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/xetex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-03-14 23:24:55 +0000
committerKarl Berry <karl@freefriends.org>2012-03-14 23:24:55 +0000
commited4534197eb59eaaf55a6254c40708e64bfc6890 (patch)
tree1a1df807cfbb555c3e6429864f4f0d7b0cf06db4 /Master/texmf-dist/tex/xetex
parent7ae8d02f3d6d6c4c97fc8c8cba605d61c863a2b8 (diff)
zhspacing (14mar12)
git-svn-id: svn://tug.org/texlive/trunk@25644 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/xetex')
-rw-r--r--Master/texmf-dist/tex/xetex/zhspacing/generic/zhmath.sty (renamed from Master/texmf-dist/tex/xetex/zhspacing/plain/zhmath.sty)0
-rw-r--r--Master/texmf-dist/tex/xetex/zhspacing/generic/zhsmyclass.sty (renamed from Master/texmf-dist/tex/xetex/zhspacing/plain/zhsmyclass.sty)6
-rw-r--r--Master/texmf-dist/tex/xetex/zhspacing/generic/zhspacing.sty (renamed from Master/texmf-dist/tex/xetex/zhspacing/plain/zhspacing.sty)3
-rw-r--r--Master/texmf-dist/tex/xetex/zhspacing/generic/zhsusefulmacros.sty (renamed from Master/texmf-dist/tex/xetex/zhspacing/plain/zhsusefulmacros.sty)9
-rw-r--r--Master/texmf-dist/tex/xetex/zhspacing/latex/zhfont.sty15
5 files changed, 17 insertions, 16 deletions
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}