diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-10-04 16:45:24 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-10-04 16:45:24 +0000 |
commit | cfdf5d163458644f3d6783534c560ec6753c8fba (patch) | |
tree | 5aa9ac5e42179dfc2e15149d46b9a0be56387862 /Build/source/texk/cjkutils | |
parent | 3817bdb7c9936db23e18b74cf16fb234c1957a32 (diff) |
cjkutils: Update from git
git-svn-id: svn://tug.org/texlive/trunk@24190 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/cjkutils')
11 files changed, 116 insertions, 72 deletions
diff --git a/Build/source/texk/cjkutils/ChangeLog b/Build/source/texk/cjkutils/ChangeLog index 3c3935b2df9..25672bd98b3 100644 --- a/Build/source/texk/cjkutils/ChangeLog +++ b/Build/source/texk/cjkutils/ChangeLog @@ -1,3 +1,8 @@ +2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + Updates from http://git.savannah.gnu.org/r/cjk.git. + * tests/cefsconv.cjk, tests/sjisconv.cjk: Adapted. + 2011-09-16 Peter Breitenlohner <peb@mppmu.mpg.de> Add simple CJK conversion tests. diff --git a/Build/source/texk/cjkutils/cefsconv.c b/Build/source/texk/cjkutils/cefsconv.c index a276f9aefe6..38b091b3d13 100644 --- a/Build/source/texk/cjkutils/cefsconv.c +++ b/Build/source/texk/cjkutils/cefsconv.c @@ -2,7 +2,7 @@ "cefsconv (CJK ver. 4.8.2)" \ /*2:*/ -#line 108 "./cjkutils-4.8.2/CEFconv/cefsconv.w" +#line 111 "./cjkutils-4.8.2/CEFconv/cefsconv.w" #include <ctype.h> #include <stdio.h> @@ -20,7 +20,7 @@ fprintf(stdout,"\\def\\CNSpreproc{%s}",banner); ch= fgetc(stdin); while(!feof(stdin)) -{if((ch>=0x81&&ch<=0x9F)||(ch>=0xE0&&ch<=0xFC)) +{if((ch>=0x81&&ch<=0x9F)||(ch>=0xE0&&ch<=0xEF)) {fprintf(stdout,"\177%c\177",ch); ch= fgetc(stdin); diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog index 317380cf7da..6a7a7ded1f6 100644 --- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog +++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/ChangeLog @@ -1,3 +1,12 @@ +2011-10-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-08-SJISconv (removed): The user-defined character area of + SJIS is not supported because it is not portable. + + Updates from http://git.savannah.gnu.org/r/cjk.git. + * patch-09-from-git (new): From Werner Lemberg <wl@gnu.org>. + Update test results tests/{cefs,sjis}conv.cjk. + 2011-09-17 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-07-CEFconv (new): Make sure that, as advertised, diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-08-SJISconv b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-08-SJISconv deleted file mode 100644 index 3d30e3792e3..00000000000 --- a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-08-SJISconv +++ /dev/null @@ -1,26 +0,0 @@ - Correct upper limit for first byte of Kanji SJIS (CP 292) codes. - -diff -ur cjkutils-4.8.2.orig/CEFconv/cefsconv.w cjkutils-4.8.2/CEFconv/cefsconv.w ---- cjkutils-4.8.2.orig/CEFconv/cefsconv.w 2011-09-16 21:49:46.000000000 +0200 -+++ cjkutils-4.8.2/CEFconv/cefsconv.w 2011-09-16 21:59:48.000000000 +0200 -@@ -122,7 +122,7 @@ - ch = fgetc(stdin);@# - - while(!feof(stdin)) -- {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xEF)) -+ {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xFC)) - {fprintf(stdout, "\177%c\177", ch);@# - - ch = fgetc(stdin); -diff -ur cjkutils-4.8.2.orig/SJISconv/sjisconv.w cjkutils-4.8.2/SJISconv/sjisconv.w ---- cjkutils-4.8.2.orig/SJISconv/sjisconv.w 2010-12-17 20:41:37.000000000 +0100 -+++ cjkutils-4.8.2/SJISconv/sjisconv.w 2011-09-16 21:59:15.000000000 +0200 -@@ -103,7 +103,7 @@ - ch = fgetc(stdin);@# - - while(!feof(stdin)) -- {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xEF)) -+ {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xFC)) - {fprintf(stdout, "\177%c\177", ch);@# - - ch = fgetc(stdin); diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-09-from-git b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-09-from-git new file mode 100644 index 00000000000..f8577d4f7f4 --- /dev/null +++ b/Build/source/texk/cjkutils/cjkutils-4.8.2-PATCHES/patch-09-from-git @@ -0,0 +1,86 @@ +diff -ur cjkutils-4.8.2.orig/CEFconv/cefsconv.w cjkutils-4.8.2/CEFconv/cefsconv.w +--- cjkutils-4.8.2.orig/CEFconv/cefsconv.w 2011-09-16 21:49:46.000000000 +0200 ++++ cjkutils-4.8.2/CEFconv/cefsconv.w 2011-10-04 11:13:43.000000000 +0200 +@@ -102,6 +102,9 @@ + 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)" + +diff -ur cjkutils-4.8.2.orig/SJISconv/sjisconv.w cjkutils-4.8.2/SJISconv/sjisconv.w +--- cjkutils-4.8.2.orig/SJISconv/sjisconv.w 2010-12-17 20:41:37.000000000 +0100 ++++ cjkutils-4.8.2/SJISconv/sjisconv.w 2011-10-04 11:13:43.000000000 +0200 +@@ -87,6 +87,9 @@ + 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)" + +diff -ur cjkutils-4.8.2.orig/hbf2gf/hbf2gf.1 cjkutils-4.8.2/hbf2gf/hbf2gf.1 +--- cjkutils-4.8.2.orig/hbf2gf/hbf2gf.1 2008-12-29 00:00:00.000000000 +0100 ++++ cjkutils-4.8.2/hbf2gf/hbf2gf.1 2011-10-04 11:13:43.000000000 +0200 +@@ -554,12 +554,6 @@ + is for Win32 systems). + . + .SS kpathsea +-Please note that older versions of +-.B kpathsea +-(<3.2) have no special means to seach for program related files. +-Additionally, versions older than 3.3 have no default path for miscellaneous +-fonts, thus we use the paths for PostScript related stuff if necessary for +-fonts resp. configuration files. + The actual version of kpathsea is displayed on screen if you call + .B hbf2gf + .BR \-\-version . +@@ -568,8 +562,6 @@ + .B kpathsea + variables. + .PP +-Version\ 3.3 and newer (this won't change again in the future!): +-.PP + .in +4m + .ta 2i + .br +@@ -577,34 +569,6 @@ + .br + .C "\&.cfg HBF2GFINPUTS" + .PP +-Version\ 3.2: +-.PP +-.in +4m +-.ta 2i +-.br +-.C "\&.hbf T1FONTS" +-.br +-.C "\&.cfg HBF2GFINPUTS" +-.PP +-And here the same for pre-3.2-versions of +-.B kpathsea: +-.PP +-.in +4m +-.ta 2i +-.br +-.C "\&.hbf T1FONTS" +-.br +-.C "\&.cfg TEXCONFIG" +-.PP +-Finally, the same for versions\ \(<=2.6: +-.PP +-.in +4m +-.ta 2i +-.br +-.C "\&.hbf DVIPSHEADERS" +-.br +-.C "\&.cfg TEXCONFIG" +-.PP + Please consult the info files of + .B kpathsea + for details on these variables. diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w index 802aff4cd91..196dba4347f 100644 --- a/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w +++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/CEFconv/cefsconv.w @@ -102,6 +102,9 @@ 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)" @@ -122,7 +125,7 @@ int main(int argc, char *argv[]) ch = fgetc(stdin);@# while(!feof(stdin)) - {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xFC)) + {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xEF)) {fprintf(stdout, "\177%c\177", ch);@# ch = fgetc(stdin); diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w index fac5beb4825..4b7feeb961c 100644 --- a/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w +++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/SJISconv/sjisconv.w @@ -87,6 +87,9 @@ 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)" @@ -103,7 +106,7 @@ int main(int argc, char *argv[]) ch = fgetc(stdin);@# while(!feof(stdin)) - {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xFC)) + {if((ch >= 0x81 && ch <= 0x9F) || (ch >= 0xE0 && ch <= 0xEF)) {fprintf(stdout, "\177%c\177", ch);@# ch = fgetc(stdin); diff --git a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1 b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1 index 0ccb6648f56..bfae8a41d99 100644 --- a/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1 +++ b/Build/source/texk/cjkutils/cjkutils-4.8.2/hbf2gf/hbf2gf.1 @@ -554,12 +554,6 @@ i.e., MS-DOS, OS/2, Windows; is for Win32 systems). . .SS kpathsea -Please note that older versions of -.B kpathsea -(<3.2) have no special means to seach for program related files. -Additionally, versions older than 3.3 have no default path for miscellaneous -fonts, thus we use the paths for PostScript related stuff if necessary for -fonts resp. configuration files. The actual version of kpathsea is displayed on screen if you call .B hbf2gf .BR \-\-version . @@ -568,8 +562,6 @@ Here is a table of the file type and the corresponding .B kpathsea variables. .PP -Version\ 3.3 and newer (this won't change again in the future!): -.PP .in +4m .ta 2i .br @@ -577,34 +569,6 @@ Version\ 3.3 and newer (this won't change again in the future!): .br .C "\&.cfg HBF2GFINPUTS" .PP -Version\ 3.2: -.PP -.in +4m -.ta 2i -.br -.C "\&.hbf T1FONTS" -.br -.C "\&.cfg HBF2GFINPUTS" -.PP -And here the same for pre-3.2-versions of -.B kpathsea: -.PP -.in +4m -.ta 2i -.br -.C "\&.hbf T1FONTS" -.br -.C "\&.cfg TEXCONFIG" -.PP -Finally, the same for versions\ \(<=2.6: -.PP -.in +4m -.ta 2i -.br -.C "\&.hbf DVIPSHEADERS" -.br -.C "\&.cfg TEXCONFIG" -.PP Please consult the info files of .B kpathsea for details on these variables. diff --git a/Build/source/texk/cjkutils/sjisconv.c b/Build/source/texk/cjkutils/sjisconv.c index a844dd101eb..b92195129da 100644 --- a/Build/source/texk/cjkutils/sjisconv.c +++ b/Build/source/texk/cjkutils/sjisconv.c @@ -2,7 +2,7 @@ "sjisconv (CJK ver. 4.8.2)" \ /*2:*/ -#line 93 "./cjkutils-4.8.2/SJISconv/sjisconv.w" +#line 96 "./cjkutils-4.8.2/SJISconv/sjisconv.w" #include <stdio.h> #include <stdlib.h> @@ -16,7 +16,7 @@ fprintf(stdout,"\\def\\CJKpreproc{%s}",banner); ch= fgetc(stdin); while(!feof(stdin)) -{if((ch>=0x81&&ch<=0x9F)||(ch>=0xE0&&ch<=0xFC)) +{if((ch>=0x81&&ch<=0x9F)||(ch>=0xE0&&ch<=0xEF)) {fprintf(stdout,"\177%c\177",ch); ch= fgetc(stdin); diff --git a/Build/source/texk/cjkutils/tests/cefsconv.cjk b/Build/source/texk/cjkutils/tests/cefsconv.cjk index b4e06bdfbe9..74d2b948a3f 100644 --- a/Build/source/texk/cjkutils/tests/cefsconv.cjk +++ b/Build/source/texk/cjkutils/tests/cefsconv.cjk @@ -3,8 +3,8 @@ 0x9f 0x5c:Ÿ92 0xe0 0x7d:à125 0xef 0x64:ï100 -0xf0 0x64:ð100 -0xfc 0x64:ü100 +0xf0 0x64:ðd +0xfc 0x64:üd 0xfd 0x64:ýd 0xa0 0x64: d 0xdf 0x64:ßd diff --git a/Build/source/texk/cjkutils/tests/sjisconv.cjk b/Build/source/texk/cjkutils/tests/sjisconv.cjk index f40b0944f04..c299710dc0a 100644 --- a/Build/source/texk/cjkutils/tests/sjisconv.cjk +++ b/Build/source/texk/cjkutils/tests/sjisconv.cjk @@ -3,8 +3,8 @@ 0x9f 0x5c:Ÿ92 0xe0 0x7d:à125 0xef 0x64:ï100 -0xf0 0x64:ð100 -0xfc 0x64:ü100 +0xf0 0x64:ðd +0xfc 0x64:üd 0xfd 0x64:ýd 0xa0 0x64: d 0xdf 0x64:ßd |