diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/cjk')
87 files changed, 469 insertions, 348 deletions
diff --git a/Master/texmf-dist/doc/latex/cjk/ChangeLog b/Master/texmf-dist/doc/latex/cjk/ChangeLog index 51d9185d21f..e7c27efe761 100644 --- a/Master/texmf-dist/doc/latex/cjk/ChangeLog +++ b/Master/texmf-dist/doc/latex/cjk/ChangeLog @@ -1,3 +1,243 @@ +2012-05-07 Werner LEMBERG <wl@gnu.org> + + Version 4.8.3 released + ====================== + + Set version to 4.8.3. + + * doc/history.txt: Updated. + + * Makefile (CJK2DVI, LATEX2DVI): Set TFMFONTS. + + Update headers in all text files. + +2012-05-07 Werner LEMBERG <wl@gnu.org> + + * utils/hbf2gf/config.guess, utils/hbf2gf/config.sub, + utils/hbf2gf/install-sh, utils/hbf2gf/mkinstalldirs: Updated to + current versions. + + * utils/hbf2gf/configure: Regenerated with autoconf 2.69. + +2012-05-07 Werner LEMBERG <wl@gnu.org> + + [thai] Update to font-tlwg 0.5. + + * doc/thaifont.txt, utils/thaifont/tools/INSTALL: Updated. + + * utils/thaifont/texmf/fonts/tfm/public/norasi/ftnr8z.tfm, + utils/thaifont/texmf/fonts/tfm/public/norasi/ftnb8z.tfm, + utils/thaifont/texmf/fonts/tfm/public/norasi/ftnbo8z.tfm, + utils/thaifont/texmf/fonts/tfm/public/norasi/ftno8z.tfm, + utils/thaifont/texmf/fonts/tfm/public/garuda/fgdr8z.tfm, + utils/thaifont/texmf/fonts/tfm/public/garuda/fgdb8z.tfm, + utils/thaifont/texmf/fonts/tfm/public/garuda/fgdbo8z.tfm, + utils/thaifont/texmf/fonts/tfm/public/garuda/fgdo8z.tfm: Regenerated + with fontinst. + +2012-05-05 Hin-Tak Leung <htl10@users.sourceforge.net> + + [cjk-enc.el] Accept Thai input in utf-8 encoding. + + * utils/lisp/emacs/cjk-enc.el: Treat Unicode 0x0EXX inputs as Thai. + + * examples/thai_utf8.tex: New sample file. + + * Makefile (DISTTARGETS): Add `thai_utf8.tex'. + (thai_utf8): New target. + + * MANIFEST, texlive/cjk.pl: Updated. + +2012-05-05 Werner LEMBERG <wl@gnu.org> + + Remove xCJK files. + + The stuff is obsolete and no longer works out of the box. Given + that there exists the `xeCJK' package, those files are really + useless today. + + * examples/xCJK.tex, texinput/UTF8/xUTF8.chr, + texinput/UTF8/xUTF8.enc, texinput/xCJK.sty, texinput/xpmC.chr, + texinput/xpmC.enc, doc/xCJK.txt: Removed. + + * MANIFEST, texlive/cjk.pl: Updated. + + * Makefile (XELATEX, xCJK): Removed. + (DISTTARGETS): Updated. + +2012-05-05 Qing Lee <sobenlee@gmail.com> + + [CJKfntef] Fix incompatibility with `ulem.sty'. + + * texinput/CJKfntef.tex (\CJKunderdot): Version 2010-01-21 of + `ulem.sty' silently adds a line which redefines \par (its author + says this was an oversight). This exhibits a bug in \CJKunderdot + which implicitly emits \par by inserting an \hskip command in + vertical mode. Simply omitting this \hskip fixes the issue. + +2012-04-20 Werner LEMBERG <wl@gnu.org> + + * texinput/Bg5/Bg5.cpx, texinput/JIS/JIS.cpx: Fix typos. + +2012-04-20 Werner LEMBERG <wl@gnu.org> + + * texinput/UTF8/zh-Hans.cpx: Synchronize. + +2012-04-20 Jiangsheng Yu <yujs@ittc.ku.edu> + + * texinput/GB/GB.cap, texinput/GB/GB.cpx: Improve. + +2011-12-16 Hin-Tak Leung <htl10@users.sourceforge.net> + + [cjk-enc.el] Make it work with emacs 23 and newer. + + Emacs 23+ introduces native Unicode support and uses a new charset + priority system: `char-charset' and `split-char' preferably now + return the Unicode charset and code points, respectively; + non-Unicode charsets and code points are only used if they have a + higher charset priority. On the other hand, information on the + original charset is preserved in the text property `charset'. + + Another change is the new charset/text-property called `tis620-2533' + (a superset of `ascii' and `thai-tis620'), introduced in emacs 23. + This has the tendency of swallowing up every ASCII character and + goes into an infinite loop with `examples/thai.tex', so we have to + handle this also. + + Tested with emacs 22.3 and 23.3, and + EMACS_PRETEST_24_0_92-142-g559675b on examples/{CJKbabel.tex, + muletest.tex, rubytest.tex, thai.tex}. + + * utils/lisp/emacs/cjk-enc.el [emacs version >= 23]: + `make-coding-system' is deprecated -- use `define-coding-system' + instead. + + Use the `charset' text property instead of the outcome of + `char-charset' to explicitly set the charset priority; this makes + `split-char' work as with emacs 22 and earlier. + + Set new optional `restriction' argument of `char-charset' to avoid + problems with `tis620-2533'. + +2011-12-03 Werner LEMBERG <wl@gnu.org> + + * examples/thai.tex: Improve prologue comments. + +2011-10-04 Werner LEMBERG <wl@gnu.org> + + [CEFconv, SJISconv] Document missing range 0xF0-0xFC. + + * utils/CEFconv/cefsconv.w, utils/SJISconv/sjisconv.w: Do it. + +2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + [cjklatex] Don't include `kpathsea/win32lib.h'. + This is already done from `kpathsea/config.h'. + + * utils/cjklatex/cjklatex.c: Implement it. + +2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + [cefconv] Various fixes. + + * utils/CEFconv/cef5conv.w: Fix output so that it really works as + bg5conv + cefconv. + * utils/CEFconv/cefsconv.w: Fix output so that it really works as + sjisconv + cefconv. + * utils/CEFconv/cefconv.w: Typo. + +2011-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + [cjklatex] Introduce `LATEX' preprocessor macro. + + * utils/cjklatex/cjklatex.c (LATEX): New macro. Use it where + appropriate to remove the hardcoded usage of `latex'. For example, + LATEX can be defined as `pdflatex' (as done in TeXLive). + +2011-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + [cjklatex] Various updates to stay in sync with TeXLive. + + * utils/cjklatex/cjklatex.c: Include kpathsea/win32lib.h instead of + win32lib.h directly. + Decorate with `const'. + (usage_str, CJKtable): Updated. + +2011-09-03 Werner LEMBERG <wl@gnu.org> + + [hbf2gf] Update manpage. + + * utils/hbf2gf/hbf2gf.1, doc/hbf2gf.txt: Remove information on + ancient kpathsea versions. + +2011-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + [hbf2gf] Update kpathsea support. + + * utils/hbf2gf/hbf2gf.w (OLD_KPATHSEA, VERY_OLD_KPATHSEA): Removed. + (DllImport, KPSEDLL): Removed. + [HAVE_CONFIG_H]: Include `c-auto.h'. + +2011-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + [hbf2gf] Decorate with `const'. + + * utils/hbf2gf/hbf2gf.w, utils/hbf2gf/hbf.c: Do it. + +2011-09-03 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt utility programs to ANSI C. + + * utils/Bg5conv/bg5conv.w, utils/CEFconv/cefconv.w, + utils/CEFconv/cef5conv.w, utils/CEFconv/cefsconv.w, + utils/SJISconv/sjisconv.w, utils/extconv/extconv.w, + utils/hbf2gf/hbf.c, utils/hbf2gf/hbf2gf.w: Do it. + +2011-02-07 Werner LEMBERG <wl@gnu.org> + + * doc/CJK.txt: Document possible problems in `tabular' environment. + Problem reported by LI Ruo-Meng <15003990378@163.com>. + +2010-01-04 Werner LEMBERG <wl@gnu.org> + + * doc/CJK.txt: Document Babel bug related to ^^xx notation. + Problem reported by Peter Grzybek <peter.grzybek@uni-graz.at>. + +2009-11-07 Werner LEMBERG <wl@gnu.org> + + Fix line breaks with furigana. + + * texinput/ruby.txt (\ruby): If the furigana is smaller than + the base glyph, really behave as documented, this is, behave like an + ordinary CJK character. + +2009-08-25 Werner LEMBERG <wl@gnu.org> + + * examples/CJKfntef.tex: Updated. + +2009-08-25 Wenchang Sun <sunwch@hotmail.com> + + New macros for CJKfntef.sty. + + * texinput/CJKfntef.sty (\varCJKunderline, \CJKunderanyline, + \CJKunderanysymbol): New macros. + (\CJKunderdot): Fix interaction with XeTeX. + + * doc/history.txt: Document it. + +2009-08-25 Wenchang Sun <sunwch@hotmail.com> + + * texinput/CJKfntef.sty: Replace \global with \CJKf@global. + +2009-01-19 Werner LEMBERG <wl@gnu.org> + + * texlive/cjk-build.pl: Remove unused stuff. + From Karl Berry. + +2009-01-05 Werner LEMBERG <wl@gnu.org> + + * doc/CJK.txt: Document usage of CJKutf8.sty with beamer class. + 2008-12-29 Werner LEMBERG <wl@gnu.org> Version 4.8.2 released @@ -2142,7 +2382,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright (C) 1999, 2001-2012 Werner Lemberg <wl@gnu.org> This file is part of the CJK package for using Asian logographs diff --git a/Master/texmf-dist/doc/latex/cjk/MANIFEST b/Master/texmf-dist/doc/latex/cjk/MANIFEST index 45e61b02336..e7071f1c5e5 100644 --- a/Master/texmf-dist/doc/latex/cjk/MANIFEST +++ b/Master/texmf-dist/doc/latex/cjk/MANIFEST @@ -1,4 +1,4 @@ -Copyright (C) 1994-2008 Werner Lemberg <wl@gnu.org> +Copyright (C) 1994-2012 Werner Lemberg <wl@gnu.org> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -97,7 +97,6 @@ The CJK package contains the following files: doc/ruby.txt doc/thaifont.txt doc/vertical.txt - doc/xCJK.txt examples/Big5.tex examples/Big5vert.tex examples/CEF_test.tex @@ -116,7 +115,7 @@ The CJK package contains the following files: examples/py_test.tex examples/rubytest.tex examples/thai.tex - examples/xCJK.tex + examples/thai_utf8.tex texinput/Bg5/Bg5.cap texinput/Bg5/Bg5.chr texinput/Bg5/Bg5.cpx @@ -291,8 +290,6 @@ The CJK package contains the following files: texinput/UTF8/ko-Hang2.cpx texinput/UTF8/ko-Hang.cpx texinput/UTF8/ko-Hani.cpx - texinput/UTF8/xUTF8.chr - texinput/UTF8/xUTF8.enc texinput/UTF8/zh-Hans.cpx texinput/UTF8/zh-Hant.cpx texinput/extended.chr @@ -313,9 +310,6 @@ The CJK package contains the following files: texinput/thai/c90gar.fd texinput/thai/c90nrsr.fd texinput/thai/thaicjk.ldf - texinput/xCJK.sty - texinput/xpmC.chr - texinput/xpmC.enc texlive/bin-cjkutils.pl texlive/c63mj.fd texlive/c64mj.fd diff --git a/Master/texmf-dist/doc/latex/cjk/Makefile b/Master/texmf-dist/doc/latex/cjk/Makefile index 3ff57b867d9..3b72e119ac9 100644 --- a/Master/texmf-dist/doc/latex/cjk/Makefile +++ b/Master/texmf-dist/doc/latex/cjk/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1994-2008 Werner Lemberg <wl@gnu.org> +# Copyright (C) 1994-2012 Werner Lemberg <wl@gnu.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,13 +27,13 @@ # # o GNU extensions of various utility programs are used. # -# o emacs 22 and the `cweave' program from the `c2cweb' package, -# renamed to `cweavex', are needed. +# o emacs 22 (or newer) and the `cweave' program from the `c2cweb' +# package, renamed to `cweavex', are needed. # # o The TeXLive version of some font definition files are used (in the # `texlive' subdirectory). -version=4.8.2 +version=4.8.3 distdir=cjk-$(version) abs-distdir=$(shell pwd)/$(distdir) @@ -44,6 +44,7 @@ DISTDIRS=$(shell find . -type d | grep -v .git | grep -v $(distdir)) CJK2DVI=\ (cd dvi; \ TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \ + TFMFONTS=$(abs-distdir)/utils/thaifont/texmf/fonts/tfm//: \ texi2dvi -l latex ../cjk/$@.cjk; \ rm -f $@.aux $@.log $@.toc) @@ -53,6 +54,7 @@ LATEX2DVI=\ cp $(1)/$@.tex $(2)/dvi; \ (cd $(2)/dvi; \ TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \ + TFMFONTS=$(abs-distdir)/utils/thaifont/texmf/fonts/tfm//: \ texi2dvi -l latex $@.tex; \ rm -f $@.tex $@.aux $@.log $@.toc) @@ -89,17 +91,6 @@ LATEX=\ cd $(2); \ $(if $(3),$(call DVI2PDF,$(3)),$(call DVI2PDF,letter)) -# XELATEX srcdir targetdir -XELATEX=\ - cd $(distdir); \ - cp $(1)/$@.tex $(2)/pdf; \ - (cd $(2)/pdf; \ - TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \ - xelatex $@.tex; \ - TEXINPUTS=$(abs-distdir)/{texlive,texinput//,contrib/wadalab,utils/pyhyphen}: \ - xelatex $@.tex; \ - rm -f $@.tex $@.aux $@.log $@.toc $@.out $@.ovt) - DISTTARGETS=\ READMEb5 \ @@ -112,7 +103,6 @@ DISTTARGETS=\ CJKutf8 \ CJKspace \ CJKmixed \ - xCJK \ GB \ JIS \ KS \ @@ -123,6 +113,7 @@ DISTTARGETS=\ py_test \ rubytest \ thai \ + thai_utf8 \ c90 @@ -142,12 +133,10 @@ CEF_test: $(call CONVERT,cefconv,examples,examples) SJIS: $(call CONVERT,sjisconv,examples,examples) -CJKbabel muletest rubytest thai: +CJKbabel muletest rubytest thai thai_utf8: $(call MULE,examples,examples) GB JIS KS UTF8 py_test CJKfntef CJKutf8 CJKspace CJKmixed: $(call LATEX,examples,examples) -xCJK: - $(call XELATEX,examples,examples) pytest: $(call LATEX,utils/pyhyphen,examples) c90: diff --git a/Master/texmf-dist/doc/latex/cjk/README b/Master/texmf-dist/doc/latex/cjk/README index f66b64c24ec..6ff91c164e3 100644 --- a/Master/texmf-dist/doc/latex/cjk/README +++ b/Master/texmf-dist/doc/latex/cjk/README @@ -1,4 +1,4 @@ -Welcome to CJK version 4.8.2 (29-Dec-2008), a LaTeX2e macro package which +Welcome to CJK version 4.8.3 (07-May-2012), a LaTeX2e macro package which enables the use of CJK scripts (Chinese/Japanese/Korean) in various encodings, written by Werner Lemberg <wl@gnu.org>. @@ -24,8 +24,8 @@ hosts and its mirrors in the directory <CTAN>/language/chinese. The package comes in two parts: - cjk-4.8.2.tar.gz: The source files. Needed for all platforms. - cjk-4.8.2-doc.tar.gz: Preformatted documentation files: DVI, PS, + cjk-4.8.3.tar.gz: The source files. Needed for all platforms. + cjk-4.8.3-doc.tar.gz: Preformatted documentation files: DVI, PS, output from cjk-enc.el, etc. Note that on CTAN and its mirrors, the `src' archive is unpacked; you must diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt b/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt index 91522cd717d..d8d19c370b0 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/CEF.txt @@ -1,4 +1,4 @@ -This is the file CEF.txt of the CJK macro package ver. 4.8.2 (29-Dec-2008). +This is the file CEF.txt of the CJK macro package ver. 4.8.3 (07-May-2012). The Chinese Encoding Framework (CEF) ------------------------------------ diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt index f242fe030bc..eddd612aef8 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/CJK.txt @@ -1,5 +1,5 @@ -This is the LaTeX2e style package CJK Version 4.8.2 (29-Dec-2008) +This is the LaTeX2e style package CJK Version 4.8.3 (07-May-2012) ================================================================= It is freely distributable under the GNU Public License. @@ -1072,6 +1072,15 @@ Possible errors Alternatively, try to increase \emergencystretch (which is a TeX primitive), setting it to a reasonable value. + o The default definition of \CJKglue can cause problems with CJK + characters within a `tabular' environment since the environment sets + \baselineskip to zero, effectively disabling inter-character glue. + If you need stretching (for example by using \makebox with the `s' + position argument), you must redefine \CJKglue, before entering the + `tabular' environment, to something like this: + + \def\CJKglue{\hskip 0pt plus 1pt} + o It is not possible to start a new encoding inside of a verbatim environment which has not been loaded before (CJK.sty emits an \input ... command which causes the encoding file to be printed @@ -1214,6 +1223,15 @@ Possible errors \fi} \makeatother + o The `beamer' class, if used with the CJKutf8 package, should open + and close the document's `CJK' environment with the \AtBeginDocument + and \AtEndDocument hooks, respectively: + + \AtBeginDocument{% + \begin{CJK*}{UTF8}{...}} + \AtEndDocument{% + \end{CJK*}} + o If you get strange error messages while using the hyperref package, add the `CJKbookmarks' option: @@ -1230,6 +1248,19 @@ Possible errors right before loading fourier.sty . + o Combining the `slovak', `esperanto', or `kurmanji' option of Babel + (tested 2010/01/04) with the CJK package fails as soon as you try to + open a CJK environment. This error is a Babel bug not related to + CJK: After loading one of these language modules, the ^^xx notation + fails due to an incorrect \catcode value of the `^' character (even + outside of those language environments). + + A workaround is to insert the line + + \catcode`\^ 7\relax + + right before a starting a CJK environment. + Author ------ diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt index 05f79f64811..1030026187f 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/CJKnumb.txt @@ -1,5 +1,5 @@ -This is the file CJKnumb.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file CJKnumb.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). CJKnumb.sty ------------ diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt index 45ba2359050..ea9a2ea4dc9 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/CJKspace.txt @@ -1,5 +1,5 @@ -This is the file CJKspace.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file CJKspace.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). CJKspace.sty ------------ diff --git a/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt b/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt index 16ddb1dcdf4..c9d974e5a72 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/CJKutf8.txt @@ -1,5 +1,5 @@ -This is the file CJKutf8.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file CJKutf8.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). CJKutf8.sty ----------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/INSTALL b/Master/texmf-dist/doc/latex/cjk/doc/INSTALL index 55176b62769..867d279d3b0 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/INSTALL +++ b/Master/texmf-dist/doc/latex/cjk/doc/INSTALL @@ -1,4 +1,4 @@ -This is the file INSTALL of the CJK macro package ver. 4.8.2 (29-Dec-2008). +This is the file INSTALL of the CJK macro package ver. 4.8.3 (07-May-2012). Installation Guide ================== @@ -624,11 +624,11 @@ How to get CJK and related software . The documentation bundle of the CJK package is not unpackaged; download it as - get cjk-4.8.2-doc.tar.gz + get cjk-4.8.3-doc.tar.gz or - get cjk-4.8.2-doc.tar.gz cjkdoc.tgz + get cjk-4.8.3-doc.tar.gz cjkdoc.tgz whatever is appropriate for your system. It contains precompiled versions (in DVI, PDF, text format) of all documentation and example files. diff --git a/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt b/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt index a0dd5e05ae4..c700ec405ff 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/TDS.txt @@ -1,4 +1,4 @@ -This is the file TDS.txt of the CJK macro package ver. 4.8.2 (29-Dec-2008). +This is the file TDS.txt of the CJK macro package ver. 4.8.3 (07-May-2012). The TeX Directory Structure (TDS) --------------------------------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt b/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt index 508557f889f..2d9f8858102 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/cjk-enc.txt @@ -1,5 +1,5 @@ -This is the file cjk-enc.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file cjk-enc.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). cjk-enc.el ---------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk b/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk index 376879844ab..24030ebd9a8 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk +++ b/Master/texmf-dist/doc/latex/cjk/doc/cjk/READMEb5.cjk @@ -1,4 +1,4 @@ -\def\CJKpreproc{bg5conv (CJK ver. 4.7.0)}%%% The file READMEb5.tex . This file is part of LaTeX2e CJK package. +\def\CJKpreproc{bg5conv (CJK ver. 4.8.2)}%%% The file READMEb5.tex . This file is part of LaTeX2e CJK package. %%% %%% Note that this document is a very first version. Therefore, lots %%% of installation steps and issues are still left blank. Please be diff --git a/Master/texmf-dist/doc/latex/cjk/doc/commands.txt b/Master/texmf-dist/doc/latex/cjk/doc/commands.txt index 33f4be6846d..9286bdb2a75 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/commands.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/commands.txt @@ -1,5 +1,5 @@ -This is the file commands.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file commands.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). Here is a list of all commands of CJK. diff --git a/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt b/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt index f294ea54db1..8273a462dc2 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/fdxfiles.txt @@ -1,5 +1,5 @@ -This is the file fdxfiles.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file fdxfiles.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). Extended font definition files diff --git a/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt b/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt index 67b271a141d..5f43a9b193a 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/fonts.txt @@ -1,5 +1,5 @@ -This is the file fonts.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file fonts.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). The fonts --------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt b/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt index 5e65f7ac6ad..356d90bb51b 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/hbf2gf.txt @@ -1,5 +1,5 @@ -This is the file hbf2gf.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file hbf2gf.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). Using hbf2gf ------------- @@ -107,12 +107,10 @@ the patched file is found in the path *before* the original MakeTeXPK (or mktexpk) script. First of all, move the HBF files together with the bitmap font files to its -final destination which has to be added to the variables $MISCFONTS -(kpathsea version >= 3.3), or $T1FONTS (kpathsea > 2.6), or $DVIPSHEADERS -(kpathsea <= 2.6), which can be either modified in texmf.cnf or set in the -environment (please read the kpathsea info files how to do that). Now do the -same with all `.cfg' files; the corresponding configuration variable is -$HBF2GFINPUTS (kpathsea >= 3.2) or $TEXCONFIG (kpathsea < 3.2). +final destination which has to be added to the variables $MISCFONTS, which +can be either modified in texmf.cnf or set in the environment (please read +the kpathsea info files how to do that). Now do the same with all `.cfg' +files; the corresponding configuration variable is $HBF2GFINPUTS. Then, create a set of TFM files for the specified CJK bitmap font. This should be done with the hbf2gf configuration parameters `tfm_files yes' and diff --git a/Master/texmf-dist/doc/latex/cjk/doc/history.2_5 b/Master/texmf-dist/doc/latex/cjk/doc/history.2_5 index 5922e4e5bfd..d135922d191 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/history.2_5 +++ b/Master/texmf-dist/doc/latex/cjk/doc/history.2_5 @@ -1,4 +1,4 @@ -This file is part of the CJK package Ver. 4.8.2 (29-Dec-2008). +This file is part of the CJK package Ver. 4.8.3 (07-May-2012). The history of the beta versions of the never released version 2.5 . -------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/history.txt b/Master/texmf-dist/doc/latex/cjk/doc/history.txt index 42f378b6796..53e4c84b760 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/history.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/history.txt @@ -1498,4 +1498,42 @@ Version 4.8.2: vertical mode. +Version 4.8.3: +07-May-2012 + new: + CJKfntef.sty: + New commands \varCJKunderline, \CJKunderanyline, + \CJKunderanysymbol. See the example file `CJKfntef.tex' + for typical usage. + + cjk-enc.el: + Emacs 23 and newer is now supported, thanks to patches + from Leung Hin-Tak. + + Leung Hin-Tak also contributed Thai support for UTF-8 + encoding, making emacs an alternative to Thai word + separator programs like `cttex' or `swath'. See the + example file `thai_utf8.tex' for a typical usage. + + changed: + Special XeTeX support has been removed (file `xCJK.sty' + and others). Please use the separate `xeCJK' package + instead. + + Peter Breitenlohner contributed various minor fixes and + improvements to the many conversion programs like + `cjklatex' or `bg5conv'. + + The Thai metrics files for `norasi' and `garuda' were + updated to version 0.5 of the `font-tlwg' bundle. + + errors: + CJKfntef.sty: + An incompatibility with recent versions of `ulem.sty' + was fixed. + + ruby.sty: + Fix case where furigana is smaller than base glyph. + + ---End of history.txt--- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf Binary files differindex 94f64b78283..e0e82e0ce74 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf +++ b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEb5.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf Binary files differindex f9e96648a83..c7c55f204cb 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf +++ b/Master/texmf-dist/doc/latex/cjk/doc/pdf/READMEgb.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd index 4d98ddc58a8..c078acf9fe2 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd +++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00cwtb.fd @@ -1,6 +1,6 @@ % This is the file c00cwtb.fd of the CJK package -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c00cwtb.fd}[\filedate\space\fileversion] \DeclareFontFamily{C00}{cwtb}{\hyphenchar \font\m@ne} diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd index 5b52f48a534..213f932cac0 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd +++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/Bg5/c00tmpl.fd @@ -1,6 +1,6 @@ % This is the file c00tmpl.fd of the CJK package -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c00tmpl.fd}[\filedate\space\fileversion] \DeclareFontFamily{C00}{tmpl}{\hyphenchar \font\m@ne} diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd index 7a212bc8495..c7cd9a14ce6 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd +++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/GB/c10tmpl.fd @@ -1,6 +1,6 @@ % This is the file c10tmpl.fd of the CJK package -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c10tmpl.fd}[\filedate\space\fileversion] \DeclareFontFamily{C10}{tmpl}{\hyphenchar \font\m@ne} diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd index a26707dd4b9..95eedb90002 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd +++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/JIS/c40tmpl.fd @@ -1,6 +1,6 @@ % This is the file c40tmpl.fd of the CJK package -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c40tmpl.fd}[\filedate\space\fileversion] \DeclareFontFamily{C40}{tmpl}{\hyphenchar \font\m@ne} diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd index 255af2651c6..6268445a2bd 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd +++ b/Master/texmf-dist/doc/latex/cjk/doc/pdfhowto/examples/texinput/SJIS/c49tmpl.fd @@ -1,6 +1,6 @@ % This is the file c49song.fd of the CJK package -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c49song.fd}[\filedate\space\fileversion] \DeclareFontFamily{C49}{song}{\hyphenchar \font\m@ne} diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt b/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt index 34b07e2142c..e287fc138bd 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/pinyin.txt @@ -1,5 +1,5 @@ -This is the file pinyin.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file pinyin.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). pinyin.sty ---------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt b/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt index 6b14b435c56..2e623a5b3a7 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/pyhyphen.txt @@ -1,5 +1,5 @@ -This is the file pyhyphen.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file pyhyphen.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). Hyphenation patterns for unaccented pinyin syllables ---------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt b/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt index 19b3609b99e..05edeb69a70 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/reftex.txt @@ -1,5 +1,5 @@ -This is the file reftex.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file reftex.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). RefTeX ------ diff --git a/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt b/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt index ff6231817d0..ebaf1c7d95e 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/ruby.txt @@ -1,4 +1,4 @@ -This is the file ruby.txt of the CJK macro package ver. 4.8.2 (29-Dec-2008). +This is the file ruby.txt of the CJK macro package ver. 4.8.3 (07-May-2012). What is ruby? ------------- diff --git a/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt b/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt index e150a135334..31ee9e5e23a 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/thaifont.txt @@ -1,10 +1,10 @@ -This is the file thaifont.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file thaifont.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). Thai font support in the CJK package ------------------------------------ -Version 4.8.2 of the CJK package has improved support for Thai. This file +Version 4.8.3 of the CJK package has improved support for Thai. This file describes how to install and use the fonts. Please refer to cjk-enc.txt how to set up cjk-enc.el (which automatically loads thai-word.el for finding word breaks). @@ -28,12 +28,17 @@ Installation . It is assumed that you have already installed the main parts of the CJK package (as described in the doc/INSTALL file). -. Get the latest thailatex package from +. Get the latest fonts-tlwg package from - http://linux.thai.net/projects/thailatex + http://linux.thai.net/projects/thaifonts-scalable and install the Type 1 font families `garuda' and `norasi'. You should use - thailatex version 0.4.2 or newer. Recommended locations are + fonts-tlwg version 0.5 or newer. Note, however, that this bundle no longer + contains pre-compiled AFM files; instead, they are generated (together + with Type 1 and TrueType versions of the font) with a bunch of tools using + a configure script and a Makefile. + + Recommended locations are TEXMF/fonts/type1/public/{garuda,norasi}/ . @@ -42,7 +47,7 @@ Installation garuda.pfb -> TEXMF/fonts/type1/public/garuda/garuda.pfb norasi_bi.pfb -> TEXMF/fonts/type1/public/norasi/norasi_bi.pfb - Note that the TeX metric files of thailatex bundle are incompatible with + Note that the TeX metric files of font-tlwg bundle are incompatible with CJK's Thai implementation. Nevertheless, it is possible to use both at the same time if desired. This is the very reason that the Babel language support file of the CJK package is called `thaicjk.ldf', not `thai.ldf'. diff --git a/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt b/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt index 59b41d182d0..8d45fe9824b 100644 --- a/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt +++ b/Master/texmf-dist/doc/latex/cjk/doc/vertical.txt @@ -1,5 +1,5 @@ -This is the file vertical.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). +This is the file vertical.txt of the CJK macro package ver. 4.8.3 +(07-May-2012). Vertical typesetting diff --git a/Master/texmf-dist/doc/latex/cjk/doc/xCJK.txt b/Master/texmf-dist/doc/latex/cjk/doc/xCJK.txt deleted file mode 100644 index 8038299e6fa..00000000000 --- a/Master/texmf-dist/doc/latex/cjk/doc/xCJK.txt +++ /dev/null @@ -1,73 +0,0 @@ -This is the file xCJK.txt of the CJK macro package ver. 4.8.2 -(29-Dec-2008). - -xCJK.sty --------- - -This file provides support for the CJK package with XeLaTeX: - - . Use the CJK package to deal with CJK characters, especially for - spaces and punctuation, while the font selection is left to XeLaTeX. - - . Specify different default fonts for CJK and other characters, - respectively. - -Usage: - - \documentclass{...} - ... - \usepackage[<options>]{xCJK} - ... - \begin{document} - ... - \begin{CJK*}{UTF8}{...} - ... - \end{CJK*} - ... - \end{document} - - Available values for <options> are - - boldfont simulate bold fonts for CJK characters - italicfont simulate italic fonts for CJK characters - - To make `italicfont' work you need XeTeX version 0.997 or newer. - - -xCJK.sty provides three basic macros for font selection: - - \setCJKmainfont[<font features>]{<font name>} - Set a default font for CJK characters. - - \setCJKfamilyfont{<family name>}[<font features>]{<font name>} - Declare a CJK family and select a font for it. Switching font families - can be done as usual with \CJKfamily. - - \setCJKmonofont[<font features>]{<font name>} - Declare a CJK font to be used in verbatim environments. - -Note that \setCJKmainfont takes precedence over \setmainfont (which is -defined in the standard `fontspec' package for XeLaTeX). - -For a full description of the parameters <font features> and <font name> -please read the documentation of the `fontspec' package; an example input -file is examples/xCJK.tex . - - -Remarks: - - . To make the xCJK package work the following two commands must be called: - - \XeTeXinputencoding "bytes" - \XeTeXdefaultencoding "bytes" - - xCJK.sty automatically does this (using the \AtBeginDocument hook) but - other packages might override it. - - . <font name> must be in English. - - . If you use the `verbatim' package you should call \CJKverbatim to make - the verbatim environment select the CJK font as specified with - \setCJKmonofont automatically (\CJKverbatim redefines \verbatim@font). - ----End of xCJK.txt--- diff --git a/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex b/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex index 0938901f7c9..913cbead365 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/Big5.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % % process this file with bg5latex diff --git a/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex b/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex index be8c1ecff9a..fbfbfc71a23 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/Big5vert.tex @@ -5,7 +5,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass[12pt]{article} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex b/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex index 9c9bd26223d..9c74eb03123 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/CEF_test.tex @@ -1,7 +1,7 @@ % This is the file CEF_test.tex of the CJK package % for testing CEF encoded text with LaTeX2e % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % process this text with ceflatex diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex index 6121951ceb8..891171c9b72 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKbabel.tex @@ -4,7 +4,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % You need Emacs 20 to process this file! diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex index 2245ca543f9..9581e9b31b9 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKfntef.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass[12pt]{article} @@ -17,11 +17,14 @@ \begin{document} -\baselineskip 24pt -\parindent 24pt +\baselineskip 15pt +\parindent 0pt +\parskip 15pt \begin{CJK*}{GB}{gbsn} +\verb|CJKfilltwosides environment:| + \begin{CJKfilltwosides}{40mm} 两端分散对齐\\ 分散对齐 \\ @@ -30,26 +33,52 @@ \vspace{0.3cm} +\verb|\CJKunderdot{...\CJKunderline{...}}|:\\ \CJKunderdot{汉字加点， \CJKunderline{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKunderline*{...\CJKunderdot{...}}|:\\ \CJKunderline*{汉字加点， \CJKunderdot{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKunderdot{...\CJKunderwave{...}}|:\\ \CJKunderdot{汉字加点， \CJKunderwave{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKunderwave*{...\CJKunderdot{...}}|:\\ \CJKunderwave*{汉字加点， \CJKunderdot{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKunderdot{...\CJKunderdblline{...}}|:\\ \CJKunderdot{汉字加点， \CJKunderdblline{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKunderdblline*{...\CJKunderdot{...}}|:\\ \CJKunderdblline*{汉字加点， \CJKunderdot{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKunderdot{...\CJKsout{...}}|:\\ \CJKunderdot{汉字加点， \CJKsout{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKsout*{...\CJKunderdot{...}}|:\\ \CJKsout*{汉字加点， \CJKunderdot{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKunderdot{...\CJKxout{...}}|:\\ \CJKunderdot{汉字加点， \CJKxout{可同时加下划线加下划，线, 自动换行,}} +\verb|\CJKxout*{...\CJKunderdot{...}}|:\\ \CJKxout*{汉字加点， \CJKunderdot{可同时加下划线加下划，线, 自动换行,}} +\newpage + +\verb|\CJKunderline{...}\CJKunderline{...}|:\\ +\CJKunderline{汉字}\CJKunderline{加点} + +\verb|\varCJKunderline{...}\varCJKunderline{...}|:\\ +\varCJKunderline{汉字}\varCJKunderline{加点} + +\verb|\CJKunderanyline{...}{...}{...}%|\\ +\verb|\CJKunderanyline{...}{...}{...}|:\\ +\CJKunderanyline{0.5em}{-}{汉字加点， 可同时}% +\CJKunderanyline{0.5em}{-}{加下划线加下划，线, 自动换行,} + +\verb|\CJKunderanysymbol{...}{...}{...}|:\\ +\CJKunderanysymbol{0.5em}{-}{汉字加点， 可同时加下划线加下划，线, 自动换行,} + \end{CJK*} \end{document} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex index e84e2c2aeb0..6fe53c836ef 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKmixed.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % Vietnamese support for Babel comes with the VnTeX package. diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex index 6d7b82ec4ca..190b5bbcdda 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKspace.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % Read CJKspace.txt for more details. diff --git a/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex b/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex index 8adda3c63a4..0895e9bd157 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/CJKutf8.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % Vietnamese support for Babel comes with the VnTeX package. % diff --git a/Master/texmf-dist/doc/latex/cjk/examples/GB.tex b/Master/texmf-dist/doc/latex/cjk/examples/GB.tex index a66c113a456..6b675f5d356 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/GB.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/GB.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass[12pt]{article} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex b/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex index 200f960b20c..81f3c2daf4f 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/JIS.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass[12pt]{article} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/KS.tex b/Master/texmf-dist/doc/latex/cjk/examples/KS.tex index e4c3e1d8ab4..b79c42fecaf 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/KS.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/KS.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass[12pt]{article} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex b/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex index 0395e2210c9..0bcf9b93dea 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/SJIS.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % % process this file with sjislatex diff --git a/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex b/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex index cbae0d1b04b..b025d36a8ba 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/UTF8.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass[12pt]{article} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk index 6c2b9b3f0bd..dc1b3e5011e 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5.cjk @@ -1,9 +1,9 @@ -\def\CJKpreproc{bg5conv (CJK ver. 4.7.0)}% This is the file Big5.tex of the CJK package +\def\CJKpreproc{bg5conv (CJK ver. 4.8.2)}% This is the file Big5.tex of the CJK package % for testing Chinese (in Big 5 encoding). % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % % process this file with bg5latex diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk index 603b3fa7784..04617cb8a21 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/Big5vert.cjk @@ -1,11 +1,11 @@ -\def\CJKpreproc{bg5conv (CJK ver. 4.7.0)}% This is the file Big5vert.tex of the CJK package +\def\CJKpreproc{bg5conv (CJK ver. 4.8.2)}% This is the file Big5vert.tex of the CJK package % for testing vertical typesetting (in Big 5 encoding). % % process this file with bg5latex % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass[12pt]{article} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk index 3071c38bcad..1e9647ad4b8 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CEF_test.cjk @@ -1,7 +1,7 @@ -\def\CNSpreproc{cefconv (CJK ver. 4.7.0)}% This is the file CEF_test.tex of the CJK package +\def\CNSpreproc{cefconv (CJK ver. 4.8.2)}% This is the file CEF_test.tex of the CJK package % for testing CEF encoded text with LaTeX2e % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % process this text with ceflatex diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk index 41c6b97c943..37cc776d229 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/CJKbabel.cjk @@ -4,7 +4,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % You need Emacs 20 to process this file! diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk index 5a390a699c1..808f5ccfd3d 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/SJIS.cjk @@ -1,9 +1,9 @@ -\def\CJKpreproc{sjisconv (CJK ver. 4.7.0)}% This is the file SJIS.tex of the CJK package +\def\CJKpreproc{sjisconv (CJK ver. 4.8.2)}% This is the file SJIS.tex of the CJK package % for testing Japanese (in SJIS encoding). % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % % % process this file with sjislatex diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk index 13fce7258d3..1c5c4b93a01 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/muletest.cjk @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % You need Emacs 20 (or Mule 2.3) to process this file! diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk index 2a615b67978..3966c02085a 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/rubytest.cjk @@ -3,7 +3,7 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % You need Emacs 20 (or Mule 2.3) to process this file! diff --git a/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk b/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk index ee79a031288..ca58c1b4201 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk +++ b/Master/texmf-dist/doc/latex/cjk/examples/cjk/thai.cjk @@ -3,21 +3,27 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) -% This file should be processed with cjk-enc.el to get +% This file must be processed with cjk-enc.el to get % % . proper word breaks % . font switching between Thai and non-Thai % . intercharacter glue % % Please read cjk-enc.txt for usage instructions. +% +% To process without cjk-enc.el, comment out the line containing +% `\extrasthaicjk'. Note, however, that you get overlong lines, and you +% must manually insert proper Thai word breaks. \documentclass[12pt]{article} \usepackage[thaicjk]{babel} +% \addto\extrasthaicjk{\fontencoding{C90}\selectfont} + \begin{document} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex b/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex index 9939c1513d4..a8232b3bd65 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/muletest.tex @@ -3,7 +3,7 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % You need Emacs 20 (or Mule 2.3) to process this file! diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf Binary files differindex ca516156310..5280c630b90 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf Binary files differindex e87e24c3517..2798011f4ff 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/Big5vert.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf Binary files differindex c36dbb1bbd4..921e267db72 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CEF_test.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf Binary files differindex c30a34789e1..e97dca9ce23 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKbabel.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf Binary files differindex 4ab2bbcdee2..1f29886c451 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKfntef.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf Binary files differindex e59b4ed6923..cf62b94a076 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKmixed.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf Binary files differindex 8c2cf65ffa4..3083afbb9a3 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKspace.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf Binary files differindex 386c00daa75..4357dd3dad3 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/CJKutf8.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf Binary files differindex 383ad799a98..91ab647343e 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/GB.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf Binary files differindex 33f2b247b16..f8c8543629b 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/JIS.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf Binary files differindex 2e15126f470..b2a4ff814d3 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/KS.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf Binary files differindex 5ab133eb6d2..528bd8cf271 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/SJIS.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf Binary files differindex 07b8bda6c1f..9e764ea4818 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/UTF8.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf Binary files differindex 8e399c4078e..fe72b429cad 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/muletest.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf Binary files differindex 49b0c66966f..6f59318eb04 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/py_test.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf Binary files differindex b1666a2452a..72bb3965ea3 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/pytest.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf Binary files differindex 9579723e92f..66dfc45825f 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/rubytest.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf Binary files differindex 2d35c53e4cc..aa3632fe603 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdf Binary files differnew file mode 100644 index 00000000000..1f1277b908c --- /dev/null +++ b/Master/texmf-dist/doc/latex/cjk/examples/pdf/thai_utf8.pdf diff --git a/Master/texmf-dist/doc/latex/cjk/examples/pdf/xCJK.pdf b/Master/texmf-dist/doc/latex/cjk/examples/pdf/xCJK.pdf Binary files differdeleted file mode 100644 index d7856dabf23..00000000000 --- a/Master/texmf-dist/doc/latex/cjk/examples/pdf/xCJK.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex b/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex index 9d7104a9683..c9f727a83d1 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/py_test.tex @@ -3,7 +3,7 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) \documentclass{article} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex b/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex index 4fa4593b8e4..065042a5594 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/rubytest.tex @@ -3,7 +3,7 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % You need Emacs 20 (or Mule 2.3) to process this file! diff --git a/Master/texmf-dist/doc/latex/cjk/examples/thai.tex b/Master/texmf-dist/doc/latex/cjk/examples/thai.tex index 1b490124d92..49362ba2abd 100644 --- a/Master/texmf-dist/doc/latex/cjk/examples/thai.tex +++ b/Master/texmf-dist/doc/latex/cjk/examples/thai.tex @@ -3,21 +3,27 @@ % % written by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) -% This file should be processed with cjk-enc.el to get +% This file must be processed with cjk-enc.el to get % % . proper word breaks % . font switching between Thai and non-Thai % . intercharacter glue % % Please read cjk-enc.txt for usage instructions. +% +% To process without cjk-enc.el, comment out the line containing +% `\extrasthaicjk'. Note, however, that you get overlong lines, and you +% must manually insert proper Thai word breaks. \documentclass[12pt]{article} \usepackage[thaicjk]{babel} +% \addto\extrasthaicjk{\fontencoding{C90}\selectfont} + \begin{document} diff --git a/Master/texmf-dist/doc/latex/cjk/examples/xCJK.tex b/Master/texmf-dist/doc/latex/cjk/examples/xCJK.tex deleted file mode 100644 index 338cf2007e9..00000000000 --- a/Master/texmf-dist/doc/latex/cjk/examples/xCJK.tex +++ /dev/null @@ -1,127 +0,0 @@ -% This is the file xCJK.tex of the CJK package -% for testing the xCJK style file. -% -% written by SUN Wenchang <sunwch@hotmail.com> -% -% Version 4.8.2 (29-Dec-2008) - -% Read xCJK.txt for more details. - -\documentclass[12pt]{article} -\usepackage[bookmarks=true, - bookmarksopen=true, - dvipdfm]{hyperref} - -\usepackage[CJK, overlap]{ruby} -\usepackage[boldfont]{xCJK} -\usepackage{CJKulem} - -\setmainfont{Times New Roman} - - -% You can specify a different default font for CJK characters. -\setCJKmainfont{Bitstream Cyberbit} - -% You can also specify a font for a certain CJK family. -\setCJKfamilyfont{SimpChinese}[BoldFont={SimHei}, - ItalicFont={FZKaiTi}]{SimSun} -\setCJKfamilyfont{TChinese}{FZMingTiB} -\setCJKfamilyfont{Japanese}{MS Gothic} -\setCJKfamilyfont{Korean}{Batang} - -\renewcommand{\rubysep}{-0.3ex} - - -\begin{document} - -\begin{CJK*}{UTF8}{song} - - -Samples for using the font specified with \verb|\setCJKmainfont|. - -\section{鏈父闂棶绛旈泦} - -鏈父闂棶绛旈泦~(FAQ list)~鏄粠涓浜涚粡甯歌闂埌鐨勯棶棰樺強鍏堕傚綋鐨勮В绛斾腑锛屼互鏂 -渚跨殑褰㈠紡鎽樿鑰屽嚭鐨勩俓uline{璺熶笂涓鐗堜笉鍚岀殑鏄紝鍏剁紪鎺掔粨鏋勫凡褰诲簳鏀瑰彉銆倉 -\textbf{鏈夊叧鏂扮粨鏋勭殑缁嗚妭锛屽彲鍙傝冦屽浣曢槄璇绘湰闂瓟闆嗗強浜嗚В鍏剁紪鎺掔粨鏋勩嶈 - 椤逛腑鐨勮鏄庛倉 - - -\section{鏈父鍟忓晱绛旈泦} - -鏈父鍟忓晱绛旈泦~(FAQ list)~鏄緸涓浜涚稉甯歌鍟忓埌鐨勫晱椤屽強鍏堕仼鐣剁殑瑙ｇ瓟涓紝浠ユ柟 -渚跨殑褰㈠紡鎽樿鑰屽嚭鐨勩俓uline{璺熶笂涓鐗堜笉鍚岀殑鏄紝鍏剁法鎺掔祼妲嬪凡寰瑰簳鏀硅畩銆倉 -\textbf{鏈夐棞鏂扮祼妲嬬殑绱扮瘈锛屽彲鍙冭冦屽浣曢柋璁鏈晱绛旈泦鍙婁簡瑙ｅ叾绶ㄦ帓绲愭銆嶈┎ - 闋呬腑鐨勮鏄庛倉 - - -\section{銇撱伄} - -銇撱伄~FAQ~銉偣銉堛伅銆併倛銇忋亗銈嬭唱鍟忋仺銇濄伄绛斻倰闆嗐倎銆佸焦銇珛銇ゃ倛銇嗐伀銇椼仧銈傘伄銇 -銇欍俓uline{銇撱伄~FAQ~銉偣銉堛伄妲嬮犮伅銆佷互鍓嶃伄銈傘伄銇ㄦ瘮銇广仸澶у箙銇鏇淬仌銈屻仸 - 銇勩伨銇欍倉\textbf{\ruby{鏂皚{銇傘仧銈墋銇椼亜妲嬮犮伀闁€仐銇︺伅銆併屻亾銇畘FAQ~ 銇 - 瑾伩鏂广仺銇濄伄妲嬮犮嶃伄闋呯洰銈抃ruby{鍙倉{銇曘倱}\ruby{鐓{銇椼倗銇唥銇椼仸涓嬨仌銇勩倉 - - -\CJKspace -\section{鞚磢 - -鞚 FAQ 鞚 鞛愳＜ 氚橂车霅橂姅 歆堧瓿 攴胳棎 雽頃 雽雼奠潉 臧勲嫧氇呺頃 鞏戩嫕鞙茧 -氇晞 鞐柎臁岇姷雼堧嫟. \uline{鞚 FAQ 鞚 甑“電 歆雮 韺愳棎 牍勴晿鞐 須嶊赴鞝侅溂搿 - 氤瓴诫悩鞐堨姷雼堧嫟.} \textbf{靸侅劯頃 瓴冹潃 鈥滌澊 FAQ 鞚 鞏措柣瓴 鞚届潉 - 瓴冹澑臧鈥 霛茧姅 雽氇╈潉 彀胳“頃橃嫓旮 氚旊瀺雼堧嫟.} - - -\newpage - - -Samples for using fonts specified with \verb|\setCJKfamilyfont|. - -\CJKnospace -\CJKfamily{SimpChinese} -\section{鏈父闂棶绛旈泦} - -鏈父闂棶绛旈泦~(FAQ list)~鏄粠涓浜涚粡甯歌闂埌鐨勯棶棰樺強鍏堕傚綋鐨勮В绛斾腑锛屼互鏂 -渚跨殑褰㈠紡鎽樿鑰屽嚭鐨勩俓uline{璺熶笂涓鐗堜笉鍚岀殑鏄紝鍏剁紪鎺掔粨鏋勫凡褰诲簳鏀瑰彉銆倉 -\textbf{鏈夊叧鏂扮粨鏋勭殑缁嗚妭锛屽彲鍙傝冦屽浣曢槄璇绘湰闂瓟闆嗗強浜嗚В鍏剁紪鎺掔粨鏋勩嶈 - 椤逛腑鐨勮鏄庛倉\textit{鏈父闂棶绛旈泦~(FAQ list)~鏄粠涓浜涚粡甯歌闂埌鐨勯棶棰 - 鍙婂叾閫傚綋鐨勮В绛斾腑锛屼互鏂逛究鐨勫舰寮忔憳瑕佽屽嚭鐨勩倉 - - -\CJKfamily{TChinese} -\section{鏈父鍟忓晱绛旈泦} - -鏈父鍟忓晱绛旈泦~(FAQ list)~鏄緸涓浜涚稉甯歌鍟忓埌鐨勫晱椤屽強鍏堕仼鐣剁殑瑙ｇ瓟涓紝浠ユ柟 -渚跨殑褰㈠紡鎽樿鑰屽嚭鐨勩俓uline{璺熶笂涓鐗堜笉鍚岀殑鏄紝鍏剁法鎺掔祼妲嬪凡寰瑰簳鏀硅畩銆倉 -\textbf{鏈夐棞鏂扮祼妲嬬殑绱扮瘈锛屽彲鍙冭冦屽浣曢柋璁鏈晱绛旈泦鍙婁簡瑙ｅ叾绶ㄦ帓绲愭銆嶈┎ - 闋呬腑鐨勮鏄庛倉 - - -\CJKfamily{Japanese} -\section{銇撱伄} - -銇撱伄~FAQ~銉偣銉堛伅銆併倛銇忋亗銈嬭唱鍟忋仺銇濄伄绛斻倰闆嗐倎銆佸焦銇珛銇ゃ倛銇嗐伀銇椼仧銈傘伄銇 -銇欍俓uline{銇撱伄~FAQ~銉偣銉堛伄妲嬮犮伅銆佷互鍓嶃伄銈傘伄銇ㄦ瘮銇广仸澶у箙銇鏇淬仌銈屻仸 - 銇勩伨銇欍倉\textbf{\ruby{鏂皚{銇傘仧銈墋銇椼亜妲嬮犮伀闁€仐銇︺伅銆併屻亾銇畘FAQ~ 銇 - 瑾伩鏂广仺銇濄伄妲嬮犮嶃伄闋呯洰銈抃ruby{鍙倉{銇曘倱}\ruby{鐓{銇椼倗銇唥銇椼仸涓嬨仌銇勩倉 - - -\CJKspace -\CJKfamily{Korean} -\section{鞚磢 - -鞚 FAQ 鞚 鞛愳＜ 氚橂车霅橂姅 歆堧瓿 攴胳棎 雽頃 雽雼奠潉 臧勲嫧氇呺頃 鞏戩嫕鞙茧 -氇晞 鞐柎臁岇姷雼堧嫟. \uline{鞚 FAQ 鞚 甑“電 歆雮 韺愳棎 牍勴晿鞐 須嶊赴鞝侅溂搿 - 氤瓴诫悩鞐堨姷雼堧嫟.} \textbf{靸侅劯頃 瓴冹潃 鈥滌澊 FAQ 鞚 鞏措柣瓴 鞚届潉 - 瓴冹澑臧鈥 霛茧姅 雽氇╈潉 彀胳“頃橃嫓旮 氚旊瀺雼堧嫟.} - -\end{CJK*} - -\end{document} - - -%%% Local Variables: -%%% coding: utf-8 -%%% mode: latex -%%% TeX-master: t -%%% End: diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl b/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl index 8373988cf90..c0c92b8402f 100755 --- a/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl +++ b/Master/texmf-dist/doc/latex/cjk/texlive/bin-cjkutils.pl @@ -8,7 +8,7 @@ # the ctan2tds perl script. It installs the necessary files from the CJK # package into the correct destinations. # -# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been +# It expects that the CJK packages (cjk-4.8.3 and cjk-4.8.3-doc) have been # unpacked (unmodified) in the current directory. @@ -21,7 +21,7 @@ my $H = "hbf2gf"; # -# cjk-4.8.2 +# cjk-4.8.3 # --------- # @@ -56,7 +56,7 @@ my $H = "hbf2gf"; # -# cjk-4.8.2-doc +# cjk-4.8.3-doc # ------------- # diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl b/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl index 637ba8b71bc..a98e966c6e3 100755 --- a/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl +++ b/Master/texmf-dist/doc/latex/cjk/texlive/c90.pl @@ -8,7 +8,7 @@ # the ctan2tds perl script. It installs the necessary files from the CJK # package into the correct destinations. # -# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been +# It expects that the CJK packages (cjk-4.8.3 and cjk-4.8.3-doc) have been # unpacked (unmodified) in the current directory. my $D = "doc/fonts/enc/c90"; diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl b/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl index a7cc28cffc3..7ee1be68330 100755 --- a/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl +++ b/Master/texmf-dist/doc/latex/cjk/texlive/cjk-build.pl @@ -8,7 +8,7 @@ # the ctan2tds perl script. It installs the necessary files from the CJK # package into the correct destinations. # -# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been +# It expects that the CJK packages (cjk-4.8.3 and cjk-4.8.3-doc) have been # unpacked (unmodified) in the current directory. For installation, it # simply uses `install -d' so that missing subdirectories are created # automatically. @@ -17,14 +17,6 @@ # XXX: This installs files in the Build hierarchy! -$INSTALL = "install -d" - -sub I -{ - my ($s, $d) = @_; - &SYSTEM ("$INSTALL $s $BUILD/source/texk/$d"); -} - my $B = "cjkutils/bat"; my $C = "cjkutils/conv"; my $H = "cjkutils/hbf2gf"; diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl b/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl index 27acfda8c42..1d9e5d02c44 100755 --- a/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl +++ b/Master/texmf-dist/doc/latex/cjk/texlive/cjk.pl @@ -8,11 +8,11 @@ # the ctan2tds perl script. It installs the necessary files from the CJK # package into the correct destinations. # -# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been +# It expects that the CJK packages (cjk-4.8.3 and cjk-4.8.3-doc) have been # unpacked (unmodified) in the current directory. # -# cjk-4.8.2 +# cjk-4.8.3 # --------- # @@ -73,7 +73,6 @@ my $T = "tex/latex/cjk"; &I("doc/TDS.txt", "$D/doc/TDS.txt"); &I("doc/thaifont.txt", "$D/doc/thaifont.txt"); &I("doc/vertical.txt", "$D/doc/vertical.txt"); -&I("doc/xCJK.txt", "$D/doc/xCJK.txt"); &I("doc/chinese/emTeXb5.txt", "$D/doc/chinese/emTeXb5.txt"); &I("doc/chinese/README", "$D/doc/chinese/README"); @@ -122,8 +121,8 @@ my $T = "tex/latex/cjk"; &I("examples/rubytest.tex", "$D/examples/rubytest.tex"); &I("examples/SJIS.tex", "$D/examples/SJIS.tex"); &I("examples/thai.tex", "$D/examples/thai.tex"); +&I("examples/thai_utf8.tex","$D/examples/thai_utf8.tex"); &I("examples/UTF8.tex", "$D/examples/UTF8.tex"); -&I("examples/xCJK.tex", "$D/examples/xCJK.tex"); &I("texinput/CJK.enc", "$T/texinput/CJK.enc"); &I("texinput/CJKfntef.sty", "$T/texinput/CJKfntef.sty"); @@ -143,9 +142,6 @@ my $T = "tex/latex/cjk"; &I("texinput/standard.bdg", "$T/texinput/standard.bdg"); &I("texinput/standard.chr", "$T/texinput/standard.chr"); &I("texinput/standard.enc", "$T/texinput/standard.enc"); -&I("texinput/xCJK.sty", "$T/texinput/xCJK.sty"); -&I("texinput/xpmC.chr", "$T/texinput/xpmC.chr"); -&I("texinput/xpmC.enc", "$T/texinput/xpmC.enc"); &I("texinput/Bg5/Bg5.cap", "$T/texinput/Bg5/Bg5.cap"); &I("texinput/Bg5/Bg5.chr", "$T/texinput/Bg5/Bg5.chr"); @@ -331,8 +327,6 @@ my $T = "tex/latex/cjk"; &I("texinput/UTF8/UTF8.bdg", "$T/texinput/UTF8/UTF8.bdg"); &I("texinput/UTF8/UTF8.chr", "$T/texinput/UTF8/UTF8.chr"); &I("texinput/UTF8/UTF8.enc", "$T/texinput/UTF8/UTF8.enc"); -&I("texinput/UTF8/xUTF8.chr", "$T/texinput/UTF8/xUTF8.chr"); -&I("texinput/UTF8/xUTF8.enc", "$T/texinput/UTF8/xUTF8.enc"); &I("texinput/UTF8/zh-Hans.cpx", "$T/texinput/UTF8/zh-Hans.cpx"); &I("texinput/UTF8/zh-Hant.cpx", "$T/texinput/UTF8/zh-Hant.cpx"); @@ -430,7 +424,7 @@ my $T = "tex/latex/cjk"; # -# cjk-4.8.2-doc +# cjk-4.8.3-doc # ------------- # @@ -489,7 +483,6 @@ my $T = "tex/latex/cjk"; &I("examples/pdf/SJIS.pdf", "$D/examples/pdf/SJIS.pdf"); &I("examples/pdf/thai.pdf", "$D/examples/pdf/thai.pdf"); &I("examples/pdf/UTF8.pdf", "$D/examples/pdf/UTF8.pdf"); -&I("examples/pdf/xCJK.pdf", "$D/examples/pdf/xCJK.pdf"); 1; # EOF diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl b/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl index 2d9923c20d4..6eec863036b 100755 --- a/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl +++ b/Master/texmf-dist/doc/latex/cjk/texlive/dnp.pl @@ -8,7 +8,7 @@ # the ctan2tds perl script. It installs the necessary files from the CJK # package into the correct destinations. # -# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been +# It expects that the CJK packages (cjk-4.8.3 and cjk-4.8.3-doc) have been # unpacked (unmodified) in the current directory. diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl b/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl index a5f6714ad70..b87500e7c97 100755 --- a/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl +++ b/Master/texmf-dist/doc/latex/cjk/texlive/garuda-c90.pl @@ -8,7 +8,7 @@ # the ctan2tds perl script. It installs the necessary files from the CJK # package into the correct destinations. # -# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been +# It expects that the CJK packages (cjk-4.8.3 and cjk-4.8.3-doc) have been # unpacked (unmodified) in the current directory. my $D = "dvips/garuda-c90"; diff --git a/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl b/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl index e85acabe2c5..ddf3321081c 100755 --- a/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl +++ b/Master/texmf-dist/doc/latex/cjk/texlive/norasi-c90.pl @@ -8,7 +8,7 @@ # the ctan2tds perl script. It installs the necessary files from the CJK # package into the correct destinations. # -# It expects that the CJK packages (cjk-4.8.2 and cjk-4.8.2-doc) have been +# It expects that the CJK packages (cjk-4.8.3 and cjk-4.8.3-doc) have been # unpacked (unmodified) in the current directory. my $D = "dvips/norasi-c90"; diff --git a/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex b/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex index 7e694cf433b..33bcd0c6938 100644 --- a/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex +++ b/Master/texmf-dist/doc/latex/cjk/utils/pyhyphen/pytest.tex @@ -3,7 +3,7 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) % %% %% Attention! This will work only if you have created a new format file |