summaryrefslogtreecommitdiff
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
parent478ffbd5d9576be24a344bb31a35e3b027800960 (diff)
ctex (9jun14)
git-svn-id: svn://tug.org/texlive/trunk@34313 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.pdfbin226401 -> 226095 bytes
-rw-r--r--Master/texmf-dist/doc/latex/ctex/ctex.tex9
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex2
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex2
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex2
-rw-r--r--Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex2
-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
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds9
19 files changed, 33 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
index af0e0c5d6ca..b939c41674b 100644
--- a/Master/texmf-dist/doc/latex/ctex/ctex.pdf
+++ b/Master/texmf-dist/doc/latex/ctex/ctex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.tex b/Master/texmf-dist/doc/latex/ctex/ctex.tex
index d860808d083..6e3184c04eb 100644
--- a/Master/texmf-dist/doc/latex/ctex/ctex.tex
+++ b/Master/texmf-dist/doc/latex/ctex/ctex.tex
@@ -1,7 +1,7 @@
%# -*- coding: utf-8 -*-
% ctex.tex: manual of ctex package
-\documentclass{ltxdoc}
+\documentclass[a4paper]{ltxdoc}
\usepackage[fntef,hyperref,UTF8]{ctexcap}
\hypersetup{pdfstartview=FitH,bookmarksnumbered}
\usepackage{texnames}
@@ -38,7 +38,7 @@
\title{\bf \ctex{} 宏包说明}
\author{\it \ctexorg\thanks{\url{http://www.ctex.org}}}
-\date{\small 版本号:v1.02c \hskip 2\ccwd 修改日期:2011/03/11}
+\date{\small 版本号:v1.02d \hskip 2\ccwd 修改日期:2014/06/09}
\maketitle
@@ -819,6 +819,11 @@ number & 同右 & \{\cs{Alph}\marg{chapter}\} \\
\begin{description}
+\item[v1.02d 2014/06/09]
+处理修改 |\set@fontsize| 造成的一个 BUG。
+
+处理与 |fontspec| v2.4 的兼容问题。
+
\item[v1.02c 2011/03/11]
修改 \texttt{hyperref} 选项的行为,使 \texttt{hyperref} 宏包可以在用户指定的位
置被调用,以解决个别兼容性问题。修正 XeTeX 编译书签中百分号出错的 BUG。
diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex b/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex
index 1711594d9e3..aea2f4e9fa3 100644
--- a/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex
+++ b/Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex
@@ -1,5 +1,5 @@
%# -*- coding: gbk -*-
-% $Id$
+% $Id: test-cjk.tex 257 2011-03-11 04:56:11Z leoliu.pku@gmail.com $
\documentclass[cs4size,a4paper,fancyhdr,fntef,winfonts,hyperref]{ctexbook}
\usepackage{shortvrb, makeidx}
diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex b/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex
index 444de0e6ae6..4e80b7a4100 100644
--- a/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex
+++ b/Master/texmf-dist/doc/latex/ctex/test/test-cjkutf8.tex
@@ -1,5 +1,5 @@
%# -*- coding: utf-8 -*-
-% $Id$
+% $Id: test-cjkutf8.tex 257 2011-03-11 04:56:11Z leoliu.pku@gmail.com $
\documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,winfonts,hyperref]{ctexbook}
\usepackage{hyperref}
diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex b/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex
index e2e2257fa6a..c29b0da93fb 100644
--- a/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex
+++ b/Master/texmf-dist/doc/latex/ctex/test/test-xetex.tex
@@ -1,5 +1,5 @@
%# -*- coding: utf-8 -*-
-% $Id$
+% $Id: test-xetex.tex 257 2011-03-11 04:56:11Z leoliu.pku@gmail.com $
% test-xetex.tex: XeTeX only test case, use xelatex to run
\documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,adobefonts,hyperref]{ctexbook}
diff --git a/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex b/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex
index a7c3b10c01c..fcf7ffdea80 100644
--- a/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex
+++ b/Master/texmf-dist/doc/latex/ctex/test/test-xetexgbk.tex
@@ -1,5 +1,5 @@
%# -*- coding: gbk -*-
-% $Id$
+% $Id: test-xetexgbk.tex 257 2011-03-11 04:56:11Z leoliu.pku@gmail.com $
% test-xetex.tex: XeTeX only test case, use xelatex to run
\XeTeXinputencoding "GBK"
\documentclass[cs4size,a4paper,fancyhdr,fntef,GBK,winfonts,hyperref]{ctexbook}
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}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index b530d3ba729..aca1c2e62ad 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1156,7 +1156,6 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'cslatex' => '&POST_cstexpkgs',
'csplain' => '&POST_cstexpkgs',
'cstex' => '&POSTcstex',
- 'ctex' => '&POSTctex',
'dehyph-exptl' => '&POSTdehyph_exptl',
'doipubmed' => '&POSTlatex2html',
'download' => '&POST_savepdf',
@@ -5316,14 +5315,6 @@ sub POST_cstexpkgs { # used for csplain and cslatex
&SYSTEM ("$RM $tarfile");
}
-sub POSTctex {
- print "POST$package - move subdirectories\n";
- my $dstdir = "$DEST/tex/latex/$package";
- &xmkdir ($dstdir);
- &SYSTEM ("$MV back cfg def engine fd fontset opt $dstdir/");
- &SYSTEM ("$MV doc/* .; rmdir doc");
-}
-
sub POSTdehyph_exptl {
print "POST$package - *YOU* must update tlpsrc directives, right now!\n";
}