From 648957036106e6e4d004af2952f2b8ce39d6cfcd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Oct 2009 20:50:39 +0000 Subject: ctex 0.95 update (20oct09) git-svn-id: svn://tug.org/texlive/trunk@15848 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ctex/ctex.pdf | Bin 356431 -> 356315 bytes Master/texmf-dist/doc/latex/ctex/ctex.tex | 14 +++++++------- Master/texmf-dist/doc/latex/ctex/test/test-cjk.tex | 2 +- .../doc/latex/ctex/test/test-cjkutf8.tex | 2 +- .../texmf-dist/doc/latex/ctex/test/test-xetex.tex | 2 +- .../doc/latex/ctex/test/test-xetexgbk.tex | 2 +- .../texmf-dist/tex/latex/ctex/back/ctexartutf8.cls | 2 +- .../tex/latex/ctex/back/ctexbookutf8.cls | 2 +- .../texmf-dist/tex/latex/ctex/back/ctexcaputf8.sty | 2 +- .../texmf-dist/tex/latex/ctex/back/ctexreputf8.cls | 2 +- Master/texmf-dist/tex/latex/ctex/back/ctexutf8.sty | 2 +- Master/texmf-dist/tex/latex/ctex/ctex.sty | 2 +- Master/texmf-dist/tex/latex/ctex/ctexart.cls | 2 +- Master/texmf-dist/tex/latex/ctex/ctexbook.cls | 2 +- Master/texmf-dist/tex/latex/ctex/ctexcap.sty | 2 +- Master/texmf-dist/tex/latex/ctex/ctexrep.cls | 2 +- .../tex/latex/ctex/engine/ctex-cjk-engine.def | 6 ++---- .../tex/latex/ctex/engine/ctex-xecjk-engine.def | 6 ++---- .../tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def | 11 ----------- .../tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def | 7 ------- .../tex/latex/ctex/opt/ctex-common-opts.def | 10 +--------- Master/tlpkg/libexec/ctan2tds | 3 +-- 22 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def delete mode 100644 Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.pdf b/Master/texmf-dist/doc/latex/ctex/ctex.pdf index b89b434809f..882ae06e73a 100644 Binary files a/Master/texmf-dist/doc/latex/ctex/ctex.pdf and b/Master/texmf-dist/doc/latex/ctex/ctex.pdf differ diff --git a/Master/texmf-dist/doc/latex/ctex/ctex.tex b/Master/texmf-dist/doc/latex/ctex/ctex.tex index 1e1343d3669..0c81f160d8a 100644 --- a/Master/texmf-dist/doc/latex/ctex/ctex.tex +++ b/Master/texmf-dist/doc/latex/ctex/ctex.tex @@ -37,7 +37,7 @@ \title{\bf \ctex{} 宏包说明} \author{\it \ctexorg\thanks{\url{http://www.ctex.org}}} -\date{\small 版本号:v0.94 \hskip 2\ccwd 修改日期:2009/09/13} +\date{\small 版本号:v0.95 \hskip 2\ccwd 修改日期:2009/10/20} \maketitle @@ -205,12 +205,8 @@ \begin{description} \item[nofonts] 没有中文字库,此时没有中文字体命令可用。 -\item[cjkfonts] 在 CJK 模式(即不使用 Xe\TeX{} 时)使用 CJKfonts 中的两套 -文鼎字库:宋体和楷体。在 xeCJK 模式(即使用 Xe\TeX{} 时),该选项将使用 - adobefonts 选项的设置。 - \item[winfonts] 使用 Windows 的字体设置,默认为六种中易字体:宋体、仿宋、黑体、 -楷体、隶书、幼圆。该选项的结果将和老版本 \ctex{} 宏包完全一致。 +楷体、隶书、幼圆。该选项的结果将和老版本 \ctex{} 宏包完全一致。这是默认设置。 \item[adobefonts] 在 xeCJK 模式中使用 Adobe 的四套字体:宋体、仿宋、黑体、楷体。 在 CJK 模式(即不使用 Xe\TeX{} 时)下,该选项将使用 winfonts 选项的设置。 @@ -802,6 +798,10 @@ number & 同右 & \{\cs{Alph}\marg{chapter}\} \\ \begin{description} +\item[v0.95 2009/10/20] +移除对 CJKnumb 宏包的依赖。去除无用的 cjkfonts 选项,以 winfonts +作为默认值。 + \item[v0.94 2009/09/13] 改进 hyperref 选项的支持 @@ -812,7 +812,7 @@ number & 同右 & \{\cs{Alph}\marg{chapter}\} \\ Add backward compatibility to old ctexutf8 packages \item[v0.91 2009/05/23] -调整宏包结构,增加对各种系统中文字库的支持选项: cjkfonts, winfonts, +调整宏包结构,增加对各种系统中文字库的支持选项:cjkfonts, winfonts, adobefonts \item[v0.9 2009/05/05] 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 bcbb5afb6fd..0c02b5b1465 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: test-cjk.tex 106 2009-05-26 03:22:50Z gzjjgod $ +% $Id$ \documentclass[cs4size,a4paper,fancyhdr,fntef,winfonts]{ctexbook} \usepackage{ifpdf} \usepackage{ifxetex} 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 87e1e771b0f..c5e1070b95d 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: test-cjkutf8.tex 106 2009-05-26 03:22:50Z gzjjgod $ +% $Id$ \documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,winfonts]{ctexbook} \usepackage{ifpdf} \usepackage{ifxetex} 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 03384e916bf..1b430e728d1 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: test-xetex.tex 166 2009-09-12 15:06:49Z gzjjgod $ +% $Id$ % test-xetex.tex: XeTeX only test case, use xelatex to run \documentclass[cs4size,a4paper,fancyhdr,fntef,UTF8,adobefonts]{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 dd5449aab58..0ed490321e4 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: test-xetexgbk.tex 106 2009-05-26 03:22:50Z gzjjgod $ +% $Id$ % test-xetex.tex: XeTeX only test case, use xelatex to run \XeTeXinputencoding "GBK" \documentclass[cs4size,a4paper,fancyhdr,fntef,GBK,winfonts]{ctexbook} diff --git a/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls b/Master/texmf-dist/tex/latex/ctex/back/ctexartutf8.cls index 406d92e2f81..25c6045e0f7 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} - [2009/09/13 v0.94 ctexartutf8 + [2009/10/20 v0.95 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 1c2d037d2bb..383fb5b9623 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} - [2009/09/13 v0.94 ctexbookutf8 + [2009/10/20 v0.95 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 a3fdabd8d8f..1c60f1018ca 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} - [2009/09/13 v0.94 ctexcaputf8 + [2009/10/20 v0.95 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 1f2cbf5046a..dd4391d2fa1 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} - [2009/09/13 v0.94 ctexreputf8 + [2009/10/20 v0.95 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 6057b96e9a6..8252e2050b6 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} - [2009/09/13 v0.94 ctexutf8 + [2009/10/20 v0.95 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 044644c2ac2..12e848b2b03 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} - [2009/09/13 v0.94 ctex + [2009/10/20 v0.95 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 ce70777fe94..a4bdcf734c3 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} - [2009/09/13 v0.94 ctexart + [2009/10/20 v0.95 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 53b037e5ab6..6d387dbcaf6 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} - [2009/09/13 v0.94 ctexbook + [2009/10/20 v0.95 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 7ab3b831253..79d21b10b69 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} - [2009/09/13 v0.94 ctexcap + [2009/10/20 v0.95 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 93203ed3596..731c6f55309 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} - [2009/09/13 v0.94 ctexrep + [2009/10/20 v0.95 ctexrep document class] \def\CTEX@classtoload{report} diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def index 5f3168726b4..05634b7663b 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-cjk-engine.def @@ -47,13 +47,11 @@ \renewcommand*\CTEX@sf@family{gbsn} \renewcommand*\CTEX@tt@family{gbsn} \else - \ifCTEX@cjkfonts - \input{ctex-cjk-cjkfonts.def} - \else\ifCTEX@winfonts + \ifCTEX@winfonts \input{ctex-cjk-winfonts.def} \else\ifCTEX@adobefonts \input{ctex-cjk-adobefonts.def} - \fi\fi\fi + \fi\fi \fi \let\CTEX@save@rmfamily\rmfamily diff --git a/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def b/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def index ac937ccd9bd..8051db417ae 100644 --- a/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def +++ b/Master/texmf-dist/tex/latex/ctex/engine/ctex-xecjk-engine.def @@ -13,13 +13,11 @@ \input{ctex-cjk-common.def} \ifCTEX@nofonts\else - \ifCTEX@cjkfonts - \input{ctex-xecjk-cjkfonts.def} - \else\ifCTEX@winfonts + \ifCTEX@winfonts \input{ctex-xecjk-winfonts.def} \else\ifCTEX@adobefonts \input{ctex-xecjk-adobefonts.def} - \fi\fi\fi + \fi\fi \fi \endinput diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def deleted file mode 100644 index 7441c883f56..00000000000 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-cjk-cjkfonts.def +++ /dev/null @@ -1,11 +0,0 @@ -% ctex-cjk-cjkfonts.def: CJKfonts 的 CJK 字体设置,文鼎的两套字体 -% vim:ft=tex - -\renewcommand*\CTEX@rm@family{gbsn} -\renewcommand*\CTEX@sf@family{gbsn} -\renewcommand*\CTEX@tt@family{gbsn} - -\newcommand*{\songti}{\CJKfamily{gbsn}} % 宋体 -\newcommand*{\kaishu}{\CJKfamily{gkai}} % 楷书 - -\endinput diff --git a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def b/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def deleted file mode 100644 index e1c67b5714f..00000000000 --- a/Master/texmf-dist/tex/latex/ctex/fontset/ctex-xecjk-cjkfonts.def +++ /dev/null @@ -1,7 +0,0 @@ -% ctex-xecjk-cjkfonts.def: CJKfonts 的 xeCJK 字体设置,文鼎的两套字体 -% vim:ft=tex - -% 暂缺 -\input{ctex-xecjk-adobefonts.def} - -\endinput diff --git a/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def b/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def index 19612418d52..f9c52572bfd 100644 --- a/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def +++ b/Master/texmf-dist/tex/latex/ctex/opt/ctex-common-opts.def @@ -8,23 +8,15 @@ % fonts \newif\ifCTEX@nofonts \CTEX@nofontsfalse -\newif\ifCTEX@cjkfonts \CTEX@cjkfontstrue -\newif\ifCTEX@winfonts \CTEX@winfontsfalse +\newif\ifCTEX@winfonts \CTEX@winfontstrue \newif\ifCTEX@adobefonts \CTEX@adobefontsfalse \DeclareOption{nofonts}{\CTEX@nofontstrue - \CTEX@cjkfontsfalse - \CTEX@winfontsfalse - \CTEX@adobefontsfalse} -\DeclareOption{cjkfonts}{\CTEX@cjkfontstrue - \CTEX@nofontsfalse \CTEX@winfontsfalse \CTEX@adobefontsfalse} \DeclareOption{winfonts}{\CTEX@winfontstrue - \CTEX@cjkfontsfalse \CTEX@nofontsfalse \CTEX@adobefontsfalse} \DeclareOption{adobefonts}{\CTEX@adobefontstrue - \CTEX@cjkfontsfalse \CTEX@nofontsfalse \CTEX@winfontsfalse} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 2e274d5e2df..98aa5d2d6de 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -3794,8 +3794,7 @@ sub POSTxetexpstricks sub POSTzhmetrics { - print "POST$package - rm cyberbit, (fail to) handle ttfonts.map\n"; - &SYSTEM ("rm -rf $DEST/fonts/tfm/$package/cyberb"); + print "POST$package - (fail to) handle ttfonts.map\n"; &SYSTEM ("$MV $DEST/fonts/map/ttf2pk/ttfonts.map /tmp"); print "YOU-MUST-DO! update /tmp/ttfonts.map into source/texk/ttf2pk\n"; } -- cgit v1.2.3