diff options
| author | Karl Berry <karl@freefriends.org> | 2012-05-10 23:17:21 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-05-10 23:17:21 +0000 |
| commit | 0a769c255a96dee782256ee0fd1da9692acb54f0 (patch) | |
| tree | 748e90a622aeb028ce45a7de9191dee27a9c0dd0 /Master/texmf-dist/source | |
| parent | 4794c97c02d3e609dd5efee71ed059c1e347dda7 (diff) | |
cjk (9may12)
git-svn-id: svn://tug.org/texlive/trunk@26296 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
37 files changed, 174 insertions, 124 deletions
diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada index 17b2475f302..f89d19091f6 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada @@ -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 diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl index db9c8ce170a..330622b0f39 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/fixwada2.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# 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 @@ -18,7 +18,7 @@ # MA 02110-1301 USA # This script fixes the Wadalab fonts which have been created with the -# `makefont' script version 1.0 (from CJK 4.8.2), or which have been updated +# `makefont' script version 1.0 (from CJK 4.8.3), or which have been updated # with the `fixwada' script. # # . Make all glyph names compliant to the Adobe Glyph List (AGL) to diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont index deb9310a326..9dad8935824 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makefont @@ -1,6 +1,6 @@ #!/bin/sh # -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl index cbf4ca6d306..8671f3e0601 100644 --- a/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl +++ b/Master/texmf-dist/source/latex/cjk/contrib/wadalab/makeuniwada.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl -w # -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd index 4e1f2517437..a67e039a1bd 100644 --- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd +++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c63mj.fd @@ -3,10 +3,10 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c63mj.fd}[\filedate\space\fileversion] % Korean characters (Hangul) diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd index 2ce62b47110..1f9c66a1224 100644 --- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd +++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c64mj.fd @@ -3,10 +3,10 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c64mj.fd}[\filedate\space\fileversion] % Korean characters (Symbols) diff --git a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd index 80068369028..7179dad1edb 100644 --- a/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd +++ b/Master/texmf-dist/source/latex/cjk/texinput/KS/HLaTeX/c65mj.fd @@ -3,10 +3,10 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) -\def\fileversion{4.8.2} -\def\filedate{2008/12/29} +\def\fileversion{4.8.3} +\def\filedate{2012/05/07} \ProvidesFile{c65mj.fd}[\filedate\space\fileversion] % Korean characters (Hanja) diff --git a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w index ed6214a42f6..23f520f181f 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5conv.w @@ -1,6 +1,6 @@ -% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.2 29-Dec-2008 +% This is the cweb file bg5conv.w of the CJK Package Ver. 4.8.3 07-May-2012 -% 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 @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{bg5conv (CJK Version 4.8.2)} +\def\title{bg5conv (CJK Version 4.8.3)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont bg5conv} program} \vskip 20pt - \centerline{(CJK Version 4.8.2)} + \centerline{(CJK Version 4.8.3)} \vfill} \def\botofcontents{ @@ -89,17 +89,14 @@ which will see the output of \.{bg5conv} complains loudly if something is wrong. @d banner -"bg5conv (CJK ver. 4.8.2)" +"bg5conv (CJK ver. 4.8.3)" @c #include <stdio.h> #include <stdlib.h>@# -int main(argc, argv) - int argc; - char *argv[]; - +int main(int argc, char *argv[]) {int ch; fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@# diff --git a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd index a4800ee4821..8901d844830 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/Bg5conv/bg5latex.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\ bg5latex.cmd - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu> + Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu> 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w index f70de15004d..c8630fdc8b9 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5conv.w @@ -1,6 +1,6 @@ -% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.2 29-Dec-2008 +% This is the cweb file cef5conv.w of the CJK Package Ver. 4.8.3 07-May-2012 -% 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 @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{cef5conv (CJK Version 4.8.2)} +\def\title{cef5conv (CJK Version 4.8.3)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont cef5conv} program} \vskip 20pt - \centerline{(CJK Version 4.8.2)} + \centerline{(CJK Version 4.8.3)} \vfill} \def\botofcontents{ @@ -103,7 +103,7 @@ which will see the output of \.{cef5conv} complains loudly if something is wrong. @d banner -"cef5conv (CJK ver. 4.8.2)" +"cef5conv (CJK ver. 4.8.3)" @c #include <ctype.h> @@ -111,10 +111,7 @@ wrong. #include <stdlib.h>@# -int main(argc, argv) - int argc; - char *argv[]; - +int main(int argc, char *argv[]) {int ch, i; unsigned char in[16]; unsigned char out[32]; @@ -175,6 +172,7 @@ int main(argc, argv) goto no_macro;@# *(outp++) = '\177'; + *(outp++) = '\177'; *(outp++) = '\"'; *(outp++) = '0';@# @@ -191,7 +189,6 @@ int main(argc, argv) goto no_macro;@# *(outp++) = '\177'; - *(outp++) = '\177'; *(outp++) = '\"'; *(outp++) = '0';@# diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd index 6edd12690ed..94308d9e39a 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cef5ltx.cmd @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------*\ cef5ltx.cmd - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu> + Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu> 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w index 07c7fb2854c..909f93ec2d3 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefconv.w @@ -1,6 +1,6 @@ -% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.2 29-Dec-2008 +% This is the cweb file cefconv.w of the CJK Package Ver. 4.8.3 07-May-2012 -% 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 @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{cefconv (CJK Version 4.8.2)} +\def\title{cefconv (CJK Version 4.8.3)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont cefconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.2)} + \centerline{(CJK Version 4.8.3)} \vfill} \def\botofcontents{ @@ -80,7 +80,7 @@ the CNS planes 1--7, C0 for Big~5 encoding, an encoding CX reserved for IRIZ, a private encoding CY, and U for Unicode encoding; \.{yyzz} is a hexadecimal representation of the code point in this plane) with \medskip -\quad\.{\char94 \char94 7f72\char94 \char94 ffXX\char94 \char94 7f% +\quad\.{\char94 \char94 7f72\char94 \char94 7fXX\char94 \char94 7f% \char94 \char94 7f"0yy\char94 \char94 7f"0zz\char94 \char94 7f}\quad. \medskip \.{XX} is the corresponding CJK encoding of \.{xx}; the number `72' @@ -95,7 +95,7 @@ which will see the output of \.{cefconv} complains loudly if something is wrong. @d banner -"cefconv (CJK ver. 4.8.2)" +"cefconv (CJK ver. 4.8.3)" @c #include <ctype.h> @@ -103,10 +103,7 @@ wrong. #include <stdlib.h>@# -int main(argc, argv) - int argc; - char *argv[]; - +int main(int argc, char *argv[]) {int ch, i; unsigned char in[16]; unsigned char out[32]; diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd index d1f6eed43fc..f13611be741 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/ceflatex.cmd @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------*\ ceflatex.cmd - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu> + Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu> 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w index d0c51012915..bcb7118a84e 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsconv.w @@ -1,6 +1,6 @@ -% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.2 29-Dec-2008 +% This is the cweb file cefsconv.w of the CJK Package Ver. 4.8.3 07-May-2012 -% 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 @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{cefsconv (CJK Version 4.8.2)} +\def\title{cefsconv (CJK Version 4.8.3)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont cefsconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.2)} + \centerline{(CJK Version 4.8.3)} \vfill} \def\botofcontents{ @@ -102,8 +102,11 @@ The following code is very simple. No error detection is done because \TeX\ which will see the output of \.{cefsconv} complains loudly if something is wrong. +Note that the user-defined character area of SJIS (with the first bytes in +the range 0xF0--0xFC) is not supported because it is not portable. + @d banner -"cefsconv (CJK ver. 4.8.2)" +"cefsconv (CJK ver. 4.8.3)" @c #include <ctype.h> @@ -111,10 +114,7 @@ wrong. #include <stdlib.h>@# -int main(argc, argv) - int argc; - char *argv[]; - +int main(int argc, char *argv[]) {int ch, i; unsigned char in[16]; unsigned char out[32]; @@ -175,6 +175,7 @@ int main(argc, argv) goto no_macro;@# *(outp++) = '\177'; + *(outp++) = '\177'; *(outp++) = '\"'; *(outp++) = '0';@# @@ -191,7 +192,6 @@ int main(argc, argv) goto no_macro;@# *(outp++) = '\177'; - *(outp++) = '\177'; *(outp++) = '\"'; *(outp++) = '0';@# diff --git a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd index 011732c6ee4..4ed1398ca9a 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/CEFconv/cefsltx.cmd @@ -1,11 +1,11 @@ /*----------------------------------------------------------------------*\ cefsltx.cmd - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu> + Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu> 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w index 4de2e6032c0..8d81c07081f 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisconv.w @@ -1,6 +1,6 @@ -% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.2 29-Dec-2008 +% This is the cweb file sjisconv.w of the CJK Package Ver. 4.8.3 07-May-2012 -% 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 @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{sjisconv (CJK Version 4.8.2)} +\def\title{sjisconv (CJK Version 4.8.3)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont sjisconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.2)} + \centerline{(CJK Version 4.8.3)} \vfill} \def\botofcontents{ @@ -87,18 +87,18 @@ The following code is very simple. No error detection is done because \TeX\ which will see the output of \.{sjisconv} complains loudly if something is wrong. +Note that the user-defined character area of SJIS (with the first bytes in +the range 0xF0--0xFC) is not supported because it is not portable. + @d banner -"sjisconv (CJK ver. 4.8.2)" +"sjisconv (CJK ver. 4.8.3)" @c #include <stdio.h> #include <stdlib.h>@# -int main(argc, argv) - int argc; - char *argv[]; - +int main(int argc, char *argv[]) {int ch; fprintf(stdout, "\\def\\CJKpreproc{%s}", banner);@# diff --git a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd index ff8955dfba2..f903a188256 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/SJISconv/sjisltx.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\ sjisltx.cmd - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu> + Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu> 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd b/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd index 64b768ee178..78c1b8c6a9a 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/extconv/bg5pltx.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\ bg5pltx.cmd - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu> + Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu> 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w b/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w index adfcc9c7b10..f415466a4fb 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w +++ b/Master/texmf-dist/source/latex/cjk/utils/extconv/extconv.w @@ -1,6 +1,6 @@ -% This is the cweb file extconv.w of the CJK Package Ver. 4.8.2 29-Dec-2008 +% This is the cweb file extconv.w of the CJK Package Ver. 4.8.3 07-May-2012 -% 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 @@ -26,13 +26,13 @@ % output rules (look at the position of braces below!) the author (it's me % too :-) prefer. Otherwise this file will be formatted traditionally. -\def\title{extconv (CJK Version 4.8.2)} +\def\title{extconv (CJK Version 4.8.3)} \def\topofcontents{ \null\vfill \centerline{\titlefont The {\ttitlefont extconv} program} \vskip 20pt - \centerline{(CJK Version 4.8.2)} + \centerline{(CJK Version 4.8.3)} \vfill} \def\botofcontents{ @@ -89,17 +89,14 @@ which will see the output of \.{extconv} complains loudly if something is wrong. @d banner -"extconv (CJK ver. 4.8.2)" +"extconv (CJK ver. 4.8.3)" @c #include <stdio.h> #include <stdlib.h>@# -int main(argc, argv) - int argc; - char *argv[]; - +int main(int argc, char *argv[]) {int ch; diff --git a/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd b/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd index 7f19637ade8..6afe95e83f1 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd +++ b/Master/texmf-dist/source/latex/cjk/utils/extconv/gbklatex.cmd @@ -1,9 +1,9 @@ /*----------------------------------------------------------------------*\ gbklatex.cmd - This file is part of the CJK macro package for LaTeX2e ver. 4.8.2 + This file is part of the CJK macro package for LaTeX2e ver. 4.8.3 - Copyright (C) 1994-2008 Wonkoo Kim <wkim+@pitt.edu> + Copyright (C) 1994-2012 Wonkoo Kim <wkim+@pitt.edu> 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu index 6ecf115b5dd..f33001dac15 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu +++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.gnu @@ -1,6 +1,6 @@ -# This file is part of the CJK package Version 4.8.2 (29-Dec-2008) +# This file is part of the CJK package Version 4.8.3 (07-May-2012) -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in index ece2f79c89a..7f40c2c6080 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in +++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/Makefile.in @@ -1,6 +1,6 @@ # Makefile for hbf2gf -- wl@gnu.org -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h index 5e589e23426..05f9ed04ff0 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h +++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/c-auto.h @@ -1,12 +1,12 @@ /* * c-auto.h * - * 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 * */ /* - 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm index daeba96f01c..dba59adb309 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm +++ b/Master/texmf-dist/source/latex/cjk/utils/hbf2gf/dvidrv.btm @@ -1,6 +1,6 @@ setdos /y1 :: -:: 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el index 6084fa245b5..8c39b3f1499 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjkspace.el @@ -1,7 +1,7 @@ ;;; cjkspace.el --- provide a tilde character if you type a space. ;;; use this file with AUCTeX. -;; 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 @@ -18,7 +18,7 @@ ;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ;; MA 02110-1301 USA -;; This file is part of the CJK package Version 4.8.2 (29-Dec-2008) +;; This file is part of the CJK package Version 4.8.3 (07-May-2012) ;; Insert tilde characters instead of spaces for LaTeX CJK documents. ;; If `CJK-space-after-space' is non-nil, typing a space yields a space. diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el index 805b3427f00..d91c8eb44c1 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/cjktilde.el @@ -1,6 +1,6 @@ ;;; cjktilde.el -- minor mode exchanging `~' and ` ' keys. -;; 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 @@ -17,7 +17,7 @@ ;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ;; MA 02110-1301 USA -;; This file is part of the CJK package Version 4.8.2 (29-Dec-2008) +;; This file is part of the CJK package Version 4.8.3 (07-May-2012) ;; Function `cjk-tilde-mode' activates a minor mode (`cjk-tilde-minor-mode') ;; which exchanges the tilde key with the space key. This is useful for diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el index 4d1bae51072..b55b54a242f 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/emacs/cjk-enc.el @@ -4,6 +4,7 @@ ;; Author: Kenichi HANDA <handa@etl.go.jp> ;; Werner LEMBERG <wl@gnu.org> +;; Hin-Tak Leung <htl10@users.sourceforge.net> ;; Keywords: CJK package, LaTeX2e, emacs, xemacs @@ -22,7 +23,7 @@ ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;; -;; CJK Version 4.8.2 (29-Dec-2008) +;; CJK Version 4.8.3 (07-May-2012) ;; ;;; Code @@ -549,12 +550,44 @@ "Coding-system for LaTeX2e CJK Package" '(mnemonic "CJK" pre-write-conversion cjk-encode)) - (make-coding-system - 'cjk-coding 0 ?c - "Coding-system for LaTeX2e CJK Package" - nil - '((pre-write-conversion . cjk-encode)))) - + (if (< emacs-major-version 23) + (make-coding-system + 'cjk-coding 0 ?c + "Coding-system for LaTeX2e CJK Package" + nil + '((pre-write-conversion . cjk-encode))) + (define-coding-system + 'cjk-coding + "Coding-system for LaTeX2e CJK Package" + :mnemonic ?c + :coding-type 'emacs-mule + :default-char ? + :charset-list '(ascii + latin-iso8859-1 + latin-iso8859-2 + latin-iso8859-3 + latin-iso8859-4 + cyrillic-iso8859-5 + greek-iso8859-7 + thai-tis620 + vietnamese-viscii-lower + vietnamese-viscii-upper + latin-jisx0201 + katakana-jisx0201 + japanese-jisx0208 + japanese-jisx0212 + korean-ksc5601 + chinese-gb2312 + chinese-big5-1 + chinese-big5-2 + chinese-cns11643-1 + chinese-cns11643-2 + chinese-cns11643-3 + chinese-cns11643-4 + chinese-cns11643-5 + chinese-cns11643-6 + chinese-cns11643-7) + :pre-write-conversion 'cjk-encode))) ;; XEmacs doesn't have set-buffer-multibyte. ;; @@ -602,11 +635,40 @@ (setq prev-charset 'ascii) (while (not (eobp)) + ;; In emacs 23+, the `charset' property holds the original + ;; encoding value; in emacs 22 and earlier, we get `nil'. + (setq tpch (get-text-property (point) 'charset)) (setq ch (following-char)) (set-buffer work-buf) ;; Set CHARSET to the character set of the current character. - (setq charset (char-charset ch)) + ;; Use text property in preference to `char-charset'. + (if (not (eq tpch nil)) + (setq charset tpch) + (setq charset (char-charset ch))) + + ;; Avoid `tis620-2533' (new with emacs 23+); we replace it with + ;; Thai and ASCII (as a new optional argument to + ;; `char-charset'. + (if (eq charset 'tis620-2533) + (setq charset (char-charset ch '(thai-tis620 ascii)))) + + ;; Check whether we have Unicode based input. + (if (eq charset 'unicode) + (let ((l (split-char ch))) + (progn + ;; Unicode 0x0E00-0x0E7F is Thai. Transform back to TIS620 + (setq ch2 (nth 2 l) + ch3 (nth 3 l)) + (if (and (eq ch2 14) (< ch3 128)) + (setq charset 'thai-tis620 + ch (encode-char ch 'thai-tis620)))))) + + ;; `split-char' in emacs 23+ is sensitive to charset priority. + (cond ((> emacs-major-version 22) + (if (not (eq charset 'ascii)) + (set-charset-priority charset)))) + (if (eq charset 'ascii) ;; Not a multibyte character. (progn diff --git a/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el b/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el index 75fddbc2199..0e9fdc9a738 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el +++ b/Master/texmf-dist/source/latex/cjk/utils/lisp/mule-2.3/cjk-enc.el @@ -22,7 +22,7 @@ ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ;; -;; CJK Version 4.8.2 (29-Dec-2008) +;; CJK Version 4.8.3 (07-May-2012) ;; ;;; Code diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c index bee8aab5ef2..2389c1c3672 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.c @@ -1,7 +1,7 @@ /* - This is the file pinyin.c of the CJK macro package ver. 4.8.2 - (29-Dec-2008). + This is the file pinyin.c of the CJK macro package ver. 4.8.3 + (07-May-2012). Use this file to generate a hyphenation input file for patgen. @@ -12,7 +12,7 @@ */ /* - 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr index e367dc116ec..a382079c85a 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pinyin.tr @@ -5,9 +5,9 @@ % %% created by Werner Lemberg <wl@gnu.org> %% -%% Version 4.8.2 (29-Dec-2008) +%% Version 4.8.3 (07-May-2012) %% -%% 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex index 80300a6fe59..06850bcb9d3 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex +++ b/Master/texmf-dist/source/latex/cjk/utils/pyhyphen/pyhyph.tex @@ -7,9 +7,9 @@ % % created by Werner Lemberg <wl@gnu.org> % -% Version 4.8.2 (29-Dec-2008) +% Version 4.8.3 (07-May-2012) -% 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 @@ -26,7 +26,7 @@ % Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, % MA 02110-1301 USA -\message{Hyphenation patterns for unaccented pinyin syllables (CJK 4.8.2)} +\message{Hyphenation patterns for unaccented pinyin syllables (CJK 4.8.3)} \begingroup diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl index 41ed9b19d7f..0133a4bd7c0 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/clonevf.pl @@ -13,7 +13,7 @@ # # perl clonevf.pl bsmiuv bsmilpv -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl index 3d759801333..2c71aa4bba8 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/hlatex2agl.pl @@ -28,7 +28,7 @@ # # perl hlatex2agl.pl wmj umj UKS-HLaTeX.sfd -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl index 30892290ecb..bbc08b2d0b5 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/makefdx.pl @@ -39,7 +39,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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 @@ -110,10 +110,10 @@ my $oldfh = select(FDX); print("% This is the file $fdxfile of the CJK package % for using Asian logographs (Chinese/Japanese/Korean) with LaTeX2e % -% created by the script makefdx.pl for CJK Version 4.8.2 (29-Dec-2008). +% created by the script makefdx.pl for CJK Version 4.8.3 (07-May-2012). -\\def\\fileversion{4.8.2} -\\def\\filedate{2008/12/29} +\\def\\fileversion{4.8.3} +\\def\\filedate{2012/05/07} \\ProvidesFile{$fdxfile}[\\filedate\\space\\fileversion] \\CJKvdef{fullheight}{1em} diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl index d9cbba0ac7c..7f3cfdeaaa9 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/sfd2uni.pl @@ -26,7 +26,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe b/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe index ba01a97d19e..cbf72cfac26 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/subfonts.pe @@ -9,7 +9,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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 diff --git a/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl b/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl index 722a3cf33ed..247a3bf0cdf 100644 --- a/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl +++ b/Master/texmf-dist/source/latex/cjk/utils/subfonts/uni2sfd.pl @@ -24,7 +24,7 @@ # A collection of useful subfont definition files for CJK fonts can be found # in the ttf2pk package. -# 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 |