diff options
Diffstat (limited to 'Master/texmf-dist/tex/generic')
39 files changed, 161 insertions, 60 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def index a64e10da7c3..661aab5272c 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-ascii.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-ascii.def}[2007/06/14 v1.0 stringenc: US-ASCII] +\ProvidesFile{se-ascii.def}[2007/06/16 v1.1 stringenc: US-ASCII] \expandafter\gdef\csname\SE@PrefixTo ascii\endcsname#1#2#3#4{% \ifnum"#1#2#3<8 % \SE@ResultAdd{#3#4}% @@ -52,18 +52,23 @@ \SE@InvalidCharacter } \expandafter\gdef\csname\SE@PrefixFrom ascii\endcsname#1{% + \let\SE@next\SE@ascii@from \expandafter\SE@ascii@from#1\relax\relax } \gdef\SE@ascii@from#1#2{% \ifx#1\relax + \let\SE@next\relax \else \ifnum"#1>7 % \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \else \SE@ResultAdd{00#1#2}% \fi - \expandafter\SE@ascii@from \fi + \SE@next } \endinput %% diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def index be4329396e6..c3e84e2bfff 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1250.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1250.def}[2007/06/14 v1.0 stringenc: cp1250] +\ProvidesFile{se-cp1250.def}[2007/06/16 v1.1 stringenc: cp1250] \def\SE@this{cp1250} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def index 50d30cc3789..b74c777e6eb 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1251.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1251.def}[2007/06/14 v1.0 stringenc: cp1251] +\ProvidesFile{se-cp1251.def}[2007/06/16 v1.1 stringenc: cp1251] \def\SE@this{cp1251} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def index bf9c530d22f..0be0cb205e8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1252.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1252.def}[2007/06/14 v1.0 stringenc: cp1252] +\ProvidesFile{se-cp1252.def}[2007/06/16 v1.1 stringenc: cp1252] \expandafter\gdef\csname\SE@PrefixTo cp1252\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\SE@zero \ifnum"#3#4<"80 % @@ -64,10 +64,12 @@ \SE@InvalidCharacter } \expandafter\gdef\csname\SE@PrefixFrom cp1252\endcsname#1{% + \let\SE@next\SE@ansinew@from \expandafter\SE@ansinew@from#1\relax\relax } \gdef\SE@ansinew@from#1#2{% \ifx#1\relax + \let\SE@next\relax \else \ifcase\ifnum"#1#2<"80 % \SE@one @@ -82,8 +84,8 @@ \else \SE@ResultAdd{00#1#2}% \fi - \expandafter\SE@ansinew@from \fi + \SE@next } \SE@MapDeclare{cp1252}{80}{20AC}% EURO SIGN \SE@MapDeclare{cp1252}{82}{201A}% SINGLE LOW-9 QUOTATION MARK diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def index a077c41dac6..f83649f71e5 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp1257.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp1257.def}[2007/06/14 v1.0 stringenc: cp1257] +\ProvidesFile{se-cp1257.def}[2007/06/16 v1.1 stringenc: cp1257] \def\SE@this{cp1257} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def index f9f19caa362..a41e4e125ae 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp437.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp437.def}[2007/06/14 v1.0 stringenc: cp437] +\ProvidesFile{se-cp437.def}[2007/06/16 v1.1 stringenc: cp437] \def\SE@this{cp437} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def index 5f5818adc7f..e30e570070d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp850.def @@ -39,8 +39,8 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp437.def}[2007/06/14 v1.0 stringenc: cp850] -\def\SE@this{cp437} +\ProvidesFile{se-cp850.def}[2007/06/16 v1.1 stringenc: cp850] +\def\SE@this{cp850} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general \global\expandafter\let\csname\SE@PrefixSurrogateTo\SE@this\endcsname diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def index b0e04bf1aa2..a62ab1ae935 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp852.def @@ -39,8 +39,8 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp437.def}[2007/06/14 v1.0 stringenc: cp852] -\def\SE@this{cp437} +\ProvidesFile{se-cp852.def}[2007/06/16 v1.1 stringenc: cp852] +\def\SE@this{cp852} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general \global\expandafter\let\csname\SE@PrefixSurrogateTo\SE@this\endcsname diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def index 18eade3f88e..6faa4e877a4 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp855.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp855.def}[2007/06/14 v1.0 stringenc: cp855] +\ProvidesFile{se-cp855.def}[2007/06/16 v1.1 stringenc: cp855] \def\SE@this{cp855} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def index 68e0000274d..bd986eaabf0 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp858.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp858.def}[2007/06/14 v1.0 stringenc: cp858] +\ProvidesFile{se-cp858.def}[2007/06/16 v1.1 stringenc: cp858] \def\SE@this{cp858} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def index 1f11dd831ba..a979f4a4afd 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp865.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp865.def}[2007/06/14 v1.0 stringenc: cp865] +\ProvidesFile{se-cp865.def}[2007/06/16 v1.1 stringenc: cp865] \def\SE@this{cp865} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def index ece78a409a9..64dbc25934a 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-cp866.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-cp866.def}[2007/06/14 v1.0 stringenc: cp866] +\ProvidesFile{se-cp866.def}[2007/06/16 v1.1 stringenc: cp866] \def\SE@this{cp866} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def index 04f77f8ca19..ae824b27955 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-dec-mcs.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-dec-mcs.def}[2007/06/14 v1.0 stringenc: DEC-MCS] +\ProvidesFile{se-dec-mcs.def}[2007/06/16 v1.1 stringenc: DEC-MCS] \def\SE@this{dec-mcs} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def index 17f7a94e855..d2ca66b314b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-1.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-1.def}[2007/06/14 v1.0 stringenc: ISO-8859-1] +\ProvidesFile{se-iso-8859-1.def}[2007/06/16 v1.1 stringenc: ISO-8859-1] \expandafter\gdef\csname\SE@PrefixTo iso-8859-1\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2=\SE@zero \ifnum"#3#4<"80 % @@ -64,10 +64,12 @@ \SE@InvalidCharacter } \expandafter\gdef\csname\SE@PrefixFrom iso-8859-1\endcsname#1{% + \let\SE@next\SE@isoone@from \expandafter\SE@isoone@from#1\relax\relax } \gdef\SE@isoone@from#1#2{% \ifx#1\relax + \let\SE@next\relax \else \ifcase\ifnum"#1#2<"80 % \SE@one @@ -79,11 +81,14 @@ \fi \fi \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \else \SE@ResultAdd{00#1#2}% \fi - \expandafter\SE@isoone@from \fi + \SE@next } \endinput %% diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def index 04b9b1799cb..21b0e851490 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-10.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-10.def}[2007/06/14 v1.0 stringenc: ISO-8859-10] +\ProvidesFile{se-iso-8859-10.def}[2007/06/16 v1.1 stringenc: ISO-8859-10] \def\SE@this{iso-8859-10} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def index 3c429aae8de..bd0c99a007f 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-11.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-11.def}[2007/06/14 v1.0 stringenc: ISO-8859-11] +\ProvidesFile{se-iso-8859-11.def}[2007/06/16 v1.1 stringenc: ISO-8859-11] \def\SE@this{iso-8859-11} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def index e91ae5fede2..7091a9eefb2 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-13.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-13.def}[2007/06/14 v1.0 stringenc: ISO-8859-13] +\ProvidesFile{se-iso-8859-13.def}[2007/06/16 v1.1 stringenc: ISO-8859-13] \def\SE@this{iso-8859-13} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def index e46ba246859..ccf215f97b2 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-14.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-14.def}[2007/06/14 v1.0 stringenc: ISO-8859-14] +\ProvidesFile{se-iso-8859-14.def}[2007/06/16 v1.1 stringenc: ISO-8859-14] \def\SE@this{iso-8859-14} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def index c39dfb5f4cc..7a69f3b6a37 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-15.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-15.def}[2007/06/14 v1.0 stringenc: ISO-8859-15] +\ProvidesFile{se-iso-8859-15.def}[2007/06/16 v1.1 stringenc: ISO-8859-15] \def\SE@this{iso-8859-15} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def index 3345223f3fb..9e373085bce 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-16.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-16.def}[2007/06/14 v1.0 stringenc: ISO-8859-16] +\ProvidesFile{se-iso-8859-16.def}[2007/06/16 v1.1 stringenc: ISO-8859-16] \def\SE@this{iso-8859-16} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def index 4b0118111bb..56d601cd745 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-2.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-2.def}[2007/06/14 v1.0 stringenc: ISO-8859-2] +\ProvidesFile{se-iso-8859-2.def}[2007/06/16 v1.1 stringenc: ISO-8859-2] \def\SE@this{iso-8859-2} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def index fe0e404ae7f..9ae91962b34 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-3.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-3.def}[2007/06/14 v1.0 stringenc: ISO-8859-3] +\ProvidesFile{se-iso-8859-3.def}[2007/06/16 v1.1 stringenc: ISO-8859-3] \def\SE@this{iso-8859-3} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def index 6d781e54303..d7fc3442a18 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-4.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-4.def}[2007/06/14 v1.0 stringenc: ISO-8859-4] +\ProvidesFile{se-iso-8859-4.def}[2007/06/16 v1.1 stringenc: ISO-8859-4] \def\SE@this{iso-8859-4} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def index 1a6cf66aa35..31c5eb2a1e8 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-5.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-5.def}[2007/06/14 v1.0 stringenc: ISO-8859-5] +\ProvidesFile{se-iso-8859-5.def}[2007/06/16 v1.1 stringenc: ISO-8859-5] \def\SE@this{iso-8859-5} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def index a7b14576f91..b8478652157 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-6.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-6.def}[2007/06/14 v1.0 stringenc: ISO-8859-6] +\ProvidesFile{se-iso-8859-6.def}[2007/06/16 v1.1 stringenc: ISO-8859-6] \def\SE@this{iso-8859-6} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def index e2dfea966fe..0857ab35690 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-7.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-7.def}[2007/06/14 v1.0 stringenc: ISO-8859-7] +\ProvidesFile{se-iso-8859-7.def}[2007/06/16 v1.1 stringenc: ISO-8859-7] \def\SE@this{iso-8859-7} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def index 729ff4c1727..ff4a1b4d1b1 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-8.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-8.def}[2007/06/14 v1.0 stringenc: ISO-8859-8] +\ProvidesFile{se-iso-8859-8.def}[2007/06/16 v1.1 stringenc: ISO-8859-8] \def\SE@this{iso-8859-8} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def index 6b3b367626c..4b0a995ba95 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-iso-8859-9.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-iso-8859-9.def}[2007/06/14 v1.0 stringenc: ISO-8859-9] +\ProvidesFile{se-iso-8859-9.def}[2007/06/16 v1.1 stringenc: ISO-8859-9] \def\SE@this{iso-8859-9} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def index 0035d8c96d8..2b06b3c7fa3 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-koi8-r.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-koi8-r.def}[2007/06/14 v1.0 stringenc: KOI8-R] +\ProvidesFile{se-koi8-r.def}[2007/06/16 v1.1 stringenc: KOI8-R] \def\SE@this{koi8-r} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def index e56b12613f5..8dc9795a2d6 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-centeuro.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-centeuro.def}[2007/06/14 v1.0 stringenc: Mac OS Central European] +\ProvidesFile{se-mac-centeuro.def}[2007/06/16 v1.1 stringenc: Mac OS Central European] \def\SE@this{mac-centeuro} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def index a54095a35ba..d3d63f466ea 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-cyrillic.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-cyrillic.def}[2007/06/14 v1.0 stringenc: Mac OS Cyrillic] +\ProvidesFile{se-mac-cyrillic.def}[2007/06/16 v1.1 stringenc: Mac OS Cyrillic] \def\SE@this{mac-cyrillic} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def index 5c8dffed24c..0f3a604dc65 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-mac-roman.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-mac-roman.def}[2007/06/14 v1.0 stringenc: Mac OS Roman] +\ProvidesFile{se-mac-roman.def}[2007/06/16 v1.1 stringenc: Mac OS Roman] \def\SE@this{mac-roman} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def index 27a79349bc6..d1c7f2d8ef4 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-nextstep.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-nextstep.def}[2007/06/14 v1.0 stringenc: NextStep] +\ProvidesFile{se-nextstep.def}[2007/06/16 v1.1 stringenc: NextStep] \def\SE@this{nextstep} \global\expandafter\let\csname\SE@PrefixTo\SE@this\endcsname \SE@to@general diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def index 6ee146e2da9..c91ed403f47 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-pdfdoc.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-pdfdoc.def}[2007/06/14 v1.0 stringenc: PDFDocEncoding] +\ProvidesFile{se-pdfdoc.def}[2007/06/16 v1.1 stringenc: PDFDocEncoding] \expandafter\gdef\csname\SE@PrefixTo pdfdoc\endcsname#1#2#3#4{% \ifcase\ifnum"#1#2#3#4<256 % \ifnum"#1#2#3#4>160 % @@ -68,10 +68,12 @@ \SE@InvalidCharacter } \expandafter\gdef\csname\SE@PrefixFrom pdfdoc\endcsname#1{% + \let\SE@next\SE@pdfdoc@from \expandafter\SE@pdfdoc@from#1\relax\relax } \gdef\SE@pdfdoc@from#1#2{% \ifx#1\relax + \let\SE@next\relax \else \ifcase\ifnum"#1#2>160 % \ifnum"#1#2="AD % @@ -95,9 +97,12 @@ \SE@MapConvertFrom{pdfdoc}{#1#2}% \else \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \fi - \expandafter\SE@pdfdoc@from \fi + \SE@next } \SE@MapDeclare{pdfdoc}{09}{0009} \SE@MapDeclare{pdfdoc}{0A}{000A} diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def index cf8d9eb16dc..c387c965faf 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf16le.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf16le.def}[2007/06/14 v1.0 stringenc: UTF-16LE] +\ProvidesFile{se-utf16le.def}[2007/06/16 v1.1 stringenc: UTF-16LE] \expandafter\gdef\csname\SE@PrefixTo utf16le\endcsname#1#2#3#4{% \SE@ResultAdd{#3#4#1#2}% } diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def index bac2aacc84e..bb380c9942b 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32be.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf32be.def}[2007/06/14 v1.0 stringenc: UTF-32BE] +\ProvidesFile{se-utf32be.def}[2007/06/16 v1.1 stringenc: UTF-32BE] \expandafter\gdef\csname\SE@PrefixTo utf32be\endcsname#1#2#3#4{% \SE@ResultAdd{0000#1#2#3#4}% } @@ -79,14 +79,17 @@ } \gdef\SE@utfxxxii@be@from#1#2#3#4#5#6#7#8{% \ifx#1\relax + \let\SE@next\relax \else \ifx#8\relax + \let\SE@next\relax \SE@InvalidCharacter \else + \let\SE@next\SE@utfxxxii@be@from \SE@utfxxxii@from#1#2#3#4#5#6#7#8% - \expandafter\expandafter\expandafter\SE@utfxxxii@be@from \fi \fi + \SE@next } \gdef\SE@utfxxxii@from#1#2#3#4#5#6#7#8{% \ifcase\ifnum"#1#2>\z@ @@ -107,6 +110,9 @@ \fi \fi \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \else \ifcase"#3#4 % \SE@ResultAdd{#5#6#7#8}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def index b388a506aac..716b7049385 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf32le.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf32le.def}[2007/06/14 v1.0 stringenc: UTF-32LE] +\ProvidesFile{se-utf32le.def}[2007/06/16 v1.1 stringenc: UTF-32LE] \expandafter\gdef\csname\SE@PrefixTo utf32le\endcsname#1#2#3#4{% \SE@ResultAdd{#3#4#1#20000}% } @@ -88,14 +88,17 @@ } \gdef\SE@utfxxxii@le@from#1#2#3#4#5#6#7#8{% \ifx#1\relax + \let\SE@next\relax \else \ifx#8\relax + \let\SE@next\relax \SE@InvalidCharacter \else + \let\SE@next\SE@utfxxxii@le@from \SE@utfxxxii@from#7#8#5#6#3#4#1#2% - \expandafter\expandafter\expandafter\SE@utfxxxii@le@from \fi \fi + \SE@next } \gdef\SE@utfxxxii@from#1#2#3#4#5#6#7#8{% \ifcase\ifnum"#1#2>\z@ @@ -116,6 +119,9 @@ \fi \fi \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \else \ifcase"#3#4 % \SE@ResultAdd{#5#6#7#8}% diff --git a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def index 3750111733d..6f8e680ca5d 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def +++ b/Master/texmf-dist/tex/generic/oberdiek/se-utf8.def @@ -39,7 +39,7 @@ %% se-cp1251.def, se-cp1257.def, stringenc-test1.tex, %% stringenc-test2.tex. %% -\ProvidesFile{se-utf8.def}[2007/06/14 v1.0 stringenc: UTF-8] +\ProvidesFile{se-utf8.def}[2007/06/16 v1.1 stringenc: UTF-8] \expandafter\gdef\csname\SE@PrefixTo utf8\endcsname#1#2#3#4{% \ifnum"#1#2#3#4<"80 % \SE@ResultAdd{#3#4}% @@ -122,12 +122,24 @@ } \expandafter\gdef\csname\SE@PrefixFrom utf8\endcsname#1{% \let\SE@temp\SE@Empty + \let\SE@next\SE@utfviii@filter \expandafter\SE@utfviii@filter#1\relax\relax - \expandafter\SE@utfviii@from\SE@temp\relax\relax\relax\relax - \relax\relax\relax\relax + \ifcase\ifSE@TestMode + \ifSE@invalid + \SE@one + \else + \SE@zero + \fi + \else + \SE@zero + \fi + \expandafter\SE@utfviii@from\SE@temp\relax\relax\relax\relax + \relax\relax\relax\relax + \fi } \gdef\SE@utfviii@filter#1#2{% \ifx#1\relax + \let\SE@next\relax \else \ifcase\ifnum"#1#2>"F4 % \SE@zero @@ -143,11 +155,14 @@ \fi \fi \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \else \edef\SE@temp{\SE@temp#1#2}% \fi - \expandafter\SE@utfviii@filter \fi + \SE@next } \gdef\SE@utfviii@from#1#2#3#4#5#6#7#8{% \ifx#1\relax @@ -159,7 +174,11 @@ \else \ifnum"#1<12 % 10xx xxxx \SE@InvalidCharacter - \def\SE@next{\SE@utfviii@from#3#4#5#6#7#8}% + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \else + \def\SE@next{\SE@utfviii@from#3#4#5#6#7#8}% + \fi \else \ifx#3\relax \let\SE@next\relax @@ -167,7 +186,11 @@ \else \ifcase\SE@utfviii@CheckCont#3% \SE@InvalidCharacter - \def\SE@next{\SE@utfviii@from#3#4#5#6#7#8}% + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \else + \def\SE@next{\SE@utfviii@from#3#4#5#6#7#8}% + \fi \else \ifnum"#1<14 % 110y yyyy 10xx xxxx % 0000 0yyy yyxx xxxx @@ -192,7 +215,11 @@ \else \ifcase\SE@utfviii@CheckCont#5% \SE@InvalidCharacter - \def\SE@next{\SE@utfviii@from#5#6#7#8}% + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \else + \def\SE@next{\SE@utfviii@from#5#6#7#8}% + \fi \else \ifnum"#1=14 % 1110 zzzz 10yy yyyy 10xx xxxx % zzzz yyyy yyxx xxxx @@ -214,7 +241,11 @@ \fi \fi \SE@InvalidCharacter - \def\SE@next{\SE@utfviii@from#7#8}% + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \else + \def\SE@next{\SE@utfviii@from#7#8}% + \fi \else \edef\SE@a{\SE@Nibble@NumToBin{"#3}}% \edef\SE@b{\SE@Nibble@NumToBin{"#5}}% @@ -237,7 +268,11 @@ \else \ifcase\SE@utfviii@CheckCont#7% \SE@InvalidCharacter - \def\SE@next{\SE@utfviii@from#7#8}% + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \else + \def\SE@next{\SE@utfviii@from#7#8}% + \fi \else \let\SE@next\SE@utfviii@from \ifnum"#2<8 % 1111 0uuu 10uu zzzz 10yy yyyy 10xx xxxx @@ -252,9 +287,15 @@ \SE@Add\SE@w{\expandafter"\SE@w}{-1}% \ifnum\SE@w>15 % \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \else \ifnum\SE@w<\SE@zero \SE@InvalidCharacter + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \else \edef\SE@a{\SE@Nibble@NumToBin{"#5}}% \edef\SE@b{\SE@Nibble@NumToBin{"#7}}% @@ -277,6 +318,9 @@ \fi \else \SE@InvalidCharacter + \if\SE@TestMode + \let\SE@next\SE@SkipRemaining + \fi \fi \fi \fi diff --git a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty index 4a440745ffb..dc1df3cb697 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/stringenc.sty @@ -91,7 +91,7 @@ \fi \expandafter\x\csname ver@stringenc.sty\endcsname \ProvidesPackage{stringenc}% - [2007/06/14 v1.0 Converts strings between encodings (HO)] + [2007/06/16 v1.1 Converts strings between encodings (HO)] \expandafter\edef\csname SE@AtEnd\endcsname{% \catcode64 \the\catcode64\relax } @@ -197,10 +197,16 @@ \fi \fi \fi + \ifSE@TestMode + \ifSE@invalid + \let\SE@next\SE@SkipRemaining + \fi + \fi \fi \fi \SE@next } +\def\SE@SkipRemaining#1\relax{} \def\SE@@ScanLow#1#2#3#4{% \ifx#4\relax \SE@InvalidCharacter @@ -216,15 +222,22 @@ \fi \fi \SE@InvalidCharacter - \def\SE@next{% - SE@@ConvertTo#1#2#3#4% - }% + \ifSE@TestMode + \let\SE@next\SE@SkipRemaining + \else + \def\SE@next{SE@@ConvertTo#1#2#3#4}% + \fi \else \ifx\SE@ConvertSurrogate\relax \else \expandafter\SE@ConvertSurrogate\SE@high#1#2#3#4% \fi \let\SE@next\SE@@ConvertTo + \ifSE@TestMode + \ifSE@invalid + \let\SE@next\SE@SkipRemaining + \fi + \fi \fi \fi \SE@next @@ -465,10 +478,16 @@ $ \ifcsname SE->#1@#2\endcsname $ \SE@ResultAdd{\csname SE->#1@#2\endcsname}% $ \else $ \SE@InvalidCharacter +$ \ifSE@TestMode +$ \let\SE@next\SE@SkipRemaining +$ \fi $ \fi & \begingroup\expandafter\expandafter\expandafter\endgroup & \expandafter\ifx\csname SE->#1@#2\endcsname\relax & \SE@InvalidCharacter +& \ifSE@TestMode +& \let\SE@next\SE@SkipRemaining +& \fi & \else & \SE@ResultAdd{\csname SE->#1@#2\endcsname}% & \fi @@ -551,6 +570,13 @@ $ \fi \expandafter\SE@FirstOfTwo \fi } +\def\StringEncodingConvertTest#1#2#3#4{% + \SE@TestModetrue + \StringEncodingConvert{#1}{#2}{#3}{#4}% + \SE@TestModefalse + \StringEncodingSuccessFailure +} +\newif\ifSE@TestMode \PE@sanitize\SE@utfxvi{utf16} \PE@sanitize\SE@utfxvibe{utf16be} \PE@sanitize\SE@utfxvile{utf16le} @@ -681,7 +707,7 @@ $ \fi \SE@temp{mac-centeuro} \SE@temp{mac-cyrillic} \SE@temp{mac-roman} -\SE@temp{mac-nextstep} +\SE@temp{nextstep} \def\SE@EncodingFileList{% ascii,% cp437,% @@ -733,18 +759,20 @@ $ \fi \SE@InvalidCharacter } \def\SE@from@general#1{% + \let\SE@next\SE@@from@general \expandafter\SE@@from@general#1\relax\relax } \def\SE@@from@general#1#2{% \ifx#1\relax + \let\SE@next\relax \else \ifnum"#1<8 % "#1#2<128 \SE@ResultAdd{00#1#2}% \else \SE@MapConvertFrom\SE@encoding{#1#2}% \fi - \expandafter\SE@@from@general \fi + \SE@next } \SE@AtEnd \endinput |