diff options
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/euptexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/euptexdir/euptex.defines | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/ptexdir/pbibtex.ch | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/kanji.h | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/upbibtex.ch | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/uptexdir/uptex.defines | 1 |
8 files changed, 16 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog index 0c730933bf6..44f50dc779d 100644 --- a/Build/source/texk/web2c/euptexdir/ChangeLog +++ b/Build/source/texk/web2c/euptexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-08-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * euptex.defines: Remove setptexencuptex. + 2011-08-24 Peter Breitenlohner <peb@mppmu.mpg.de> Imported e-upTeX into TeX Live, based on the W32TeX version diff --git a/Build/source/texk/web2c/euptexdir/euptex.defines b/Build/source/texk/web2c/euptexdir/euptex.defines index ac1174a2b60..9de987e72be 100644 --- a/Build/source/texk/web2c/euptexdir/euptex.defines +++ b/Build/source/texk/web2c/euptexdir/euptex.defines @@ -10,7 +10,6 @@ @define function setencstring (); @define procedure setpriorfileenc; @define function isinternalUPTEX; -@define procedure setptexencuptex; @define function iskanji1 (); @define function is1stchr (); diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog index fca40b0347e..7e89b61286f 100644 --- a/Build/source/texk/web2c/ptexdir/ChangeLog +++ b/Build/source/texk/web2c/ptexdir/ChangeLog @@ -1,3 +1,7 @@ +2011-08-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * pbibtex.ch: Use nil, not 0 as arg of set_enc_string(). + 2011-08-23 Peter Breitenlohner <peb@mppmu.mpg.de> * pbibtex.ch, pdvitype.ch, ppltotf.ch, ptftopl.ch, ptex.defines: diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.ch b/Build/source/texk/web2c/ptexdir/pbibtex.ch index 95ec3d47b91..7cfad468a70 100644 --- a/Build/source/texk/web2c/ptexdir/pbibtex.ch +++ b/Build/source/texk/web2c/ptexdir/pbibtex.ch @@ -220,7 +220,7 @@ begin procedure get_the_top_level_aux_file_name; label aux_found,@!aux_not_found; begin - if (not set_enc_string (0,'EUC')) then uexit(1); + if (not set_enc_string (nil,'EUC')) then uexit(1); @<Process a possible command line@> @z @@ -535,7 +535,7 @@ const n_options = 6; {Pascal won't count array lengths for us.} end; {Else it was a flag; |getopt| has already done the assignment.} @y end else if argument_is ('kanji') then begin - if (not set_enc_string(optarg, 0)) then + if (not set_enc_string(optarg, nil)) then write_ln('Bad kanji encoding "', stringcast(optarg), '".'); end; {Else it was a flag; |getopt| has already done the assignment.} diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog index 15e1e82a1e7..157d48cf4b8 100644 --- a/Build/source/texk/web2c/uptexdir/ChangeLog +++ b/Build/source/texk/web2c/uptexdir/ChangeLog @@ -1,3 +1,8 @@ +2011-08-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * kanji.h, uptex.defines: Remove setptexencuptex. + * upbibtex.ch: Use nil, not 0 as arg of set_enc_string(). + 2011-08-24 Peter Breitenlohner <peb@mppmu.mpg.de> Imported upTeX into TeX Live, based on the W32TeX version diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h index 71faa43f3e0..68b2b50a2d5 100644 --- a/Build/source/texk/web2c/uptexdir/kanji.h +++ b/Build/source/texk/web2c/uptexdir/kanji.h @@ -43,8 +43,6 @@ extern void init_default_kanji (const_string file_str, const_string internal_str /* for upBibTeX, upDVItype, upPLtoTF, and upTFtoPL */ #define initkanji() init_default_kanji("utf8", "uptex") -#define setptexencuptex() set_enc_string("utf8", "uptex"); - /* number of rest of multi-char for kcode_pos */ #define nrestmultichr(x) ( (x)!=0 ? ((x) / 8) + 2 - ((x) % 8) : -1 ) diff --git a/Build/source/texk/web2c/uptexdir/upbibtex.ch b/Build/source/texk/web2c/uptexdir/upbibtex.ch index efa8a9b389b..51acd5f5cc0 100644 --- a/Build/source/texk/web2c/uptexdir/upbibtex.ch +++ b/Build/source/texk/web2c/uptexdir/upbibtex.ch @@ -300,7 +300,7 @@ const n_options = 7; {Pascal won't count array lengths for us.} end; {Else it was a flag; |getopt| has already done the assignment.} @y end else if argument_is ('kanji-internal') then begin - if (not (set_enc_string(0,optarg) and + if (not (set_enc_string(nil,optarg) and (is_internalEUC or is_internalUPTEX))) then write_ln('Bad internal kanji encoding "', stringcast(optarg), '".'); diff --git a/Build/source/texk/web2c/uptexdir/uptex.defines b/Build/source/texk/web2c/uptexdir/uptex.defines index 635039307ea..53b133a2e20 100644 --- a/Build/source/texk/web2c/uptexdir/uptex.defines +++ b/Build/source/texk/web2c/uptexdir/uptex.defines @@ -11,7 +11,6 @@ @define procedure setpriorfileenc; @define function isinternalUPTEX; @define function isinternalEUC; -@define procedure setptexencuptex; @define function iskanji1 (); @define function is1stchr (); |