summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-19 17:47:26 +0000
committerKarl Berry <karl@freefriends.org>2014-06-19 17:47:26 +0000
commite815d4236bb93715bb9a6f65344801fd162b7804 (patch)
treef24faa4ebd6de41ea1654f87e092ce60bbdb51f0 /Master/texmf-dist/tex
parent478ffbd5d9576be24a344bb31a35e3b027800960 (diff)
ctex (9jun14)
git-svn-id: svn://tug.org/texlive/trunk@34313 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctex.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexart.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexbook.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexcap.sty2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/ctexrep.cls2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/def/ctex-common.def2
-rw-r--r--Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-common.def17
12 files changed, 22 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
index 8a309879c08..e58903a0877 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexartutf8}
- [2011/03/11 v1.02c ctexartutf8
+ [2014/06/09 v1.02d ctexartutf8
document class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexart}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls
index b4cc20f292c..26f5ae47229 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexbookutf8.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexbookutf8}
- [2011/03/11 v1.02c ctexbookutf8
+ [2014/06/09 v1.02d ctexbookutf8
document class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty b/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty
index f0f2234525b..d2ecca3932e 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctexcaputf8}
- [2011/03/11 v1.02c ctexcaputf8
+ [2014/06/09 v1.02d ctexcaputf8
macros package]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ctexcap}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls
index f7b25ef5d8c..6d6baa2a575 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexreputf8.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexreputf8}
- [2011/03/11 v1.02c ctexreputf8
+ [2014/06/09 v1.02d ctexreputf8
document class]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexrep}}
diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty b/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty
index f4c3a829f62..3df2a91fb9b 100644
--- a/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty
+++ b/Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctexutf8}
- [2011/03/11 v1.02c ctexutf8
+ [2014/06/09 v1.02d ctexutf8
macros package]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{ctex}}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctex.sty b/Master/texmf-dist/tex/latex/ctex/ctex.sty
index 2fa7c4a90e8..a09da8e7373 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctex.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctex.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctex}
- [2011/03/11 v1.02c ctex
+ [2014/06/09 v1.02d ctex
macros package]
\input{ctex-common-opts.def}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexart.cls b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
index 0665cb9bc04..c6bc963160c 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexart.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexart.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexart}
- [2011/03/11 v1.02c ctexart
+ [2014/06/09 v1.02d ctexart
document class]
\def\CTEX@classtoload{article}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
index 89c54060ae5..accd2ac4be6 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexbook.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexbook}
- [2011/03/11 v1.02c ctexbook
+ [2014/06/09 v1.02d ctexbook
document class]
\def\CTEX@classtoload{book}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
index b13556dff44..1f880e8dbb4 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
+++ b/Master/texmf-dist/tex/latex/ctex/ctexcap.sty
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{ctexcap}
- [2011/03/11 v1.02c ctexcap
+ [2014/06/09 v1.02d ctexcap
macros package]
\input{ctex-common-opts.def}
diff --git a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
index f627f861f5b..557e94fb60e 100644
--- a/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
+++ b/Master/texmf-dist/tex/latex/ctex/ctexrep.cls
@@ -2,7 +2,7 @@
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{ctexrep}
- [2011/03/11 v1.02c ctexrep
+ [2014/06/09 v1.02d ctexrep
document class]
\def\CTEX@classtoload{report}
diff --git a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
index 5b2f0857341..54436e2bed2 100644
--- a/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
+++ b/Master/texmf-dist/tex/latex/ctex/def/ctex-common.def
@@ -75,7 +75,6 @@
\ifCTEX@indent
\AtBeginDocument{\CTEXindent}
\fi
-\def\CTEX@spaceChar{\hskip \f@size \p@}
\def\baselinestretch{1.3}
% About font sizing
@@ -422,4 +421,3 @@
\fi
\endinput
-
diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-common.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-common.def
index 3f76fe44d4a..ad641c45ecf 100644
--- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-common.def
+++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-common.def
@@ -14,13 +14,20 @@
\CTEX@save@set@fontsize{#1}{#2}{#3}%
\CTEXsetfont}
\newcommand*\ziju[1]{% 字距
- \settowidth\@tempdima{\CTEX@spaceChar}%
- \renewcommand{\CJKglue}{\hskip #1\@tempdima\@plus.08\baselineskip\relax}%
- \CTEXsetfont} % is it a good definition?
+ \begingroup
+ \settowidth\@tempdima{\CTEX@spaceChar}%
+ \expandafter\endgroup%
+ \expandafter\renewcommand%
+ \expandafter\CJKglue%
+ \expandafter{\expandafter\hskip\the\dimexpr#1\@tempdima\relax\@plus.08\baselineskip\relax}%
+ \CTEXsetfont} % is it a good definition?
\newdimen\ccwd % 字宽
\newcommand*\CTEXsetfont{%
- \settowidth\ccwd{\CTEX@spaceChar\CJKglue}%
- \ifdim\parindent=0pt\else\parindent2\ccwd\fi}
+ \begingroup
+ \settowidth\ccwd{\CTEX@spaceChar\CJKglue}%
+ \expandafter\endgroup\expandafter\ccwd\the\ccwd\relax
+ \unless\ifdim\parindent=\z@\parindent2\ccwd\fi}
+\def\CTEX@spaceChar{\hskip \f@size \p@\relax}
\ifCTEX@fntef
\def\CTEXunderdot{\CJKunderdot}
\def\CTEXunderline{\CJKunderline}