diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/translations/README | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/translations/translations_en.pdf | bin | 496892 -> 500141 bytes | |||
| -rw-r--r-- | Master/texmf-dist/tex/latex/translations/translations.sty | 81 |
3 files changed, 45 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/latex/translations/README b/Master/texmf-dist/doc/latex/translations/README index a944202cc20..d4031943781 100644 --- a/Master/texmf-dist/doc/latex/translations/README +++ b/Master/texmf-dist/doc/latex/translations/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the TRANSLATIONS package v1.8 - 2020/02/28 +the TRANSLATIONS package v1.8a - 2020/04/26 internationalization of LaTeX2e packages -------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/translations/translations_en.pdf b/Master/texmf-dist/doc/latex/translations/translations_en.pdf Binary files differindex 7087da4bdc9..27d71b446ad 100644 --- a/Master/texmf-dist/doc/latex/translations/translations_en.pdf +++ b/Master/texmf-dist/doc/latex/translations/translations_en.pdf diff --git a/Master/texmf-dist/tex/latex/translations/translations.sty b/Master/texmf-dist/tex/latex/translations/translations.sty index 5875db674bf..d013842825a 100644 --- a/Master/texmf-dist/tex/latex/translations/translations.sty +++ b/Master/texmf-dist/tex/latex/translations/translations.sty @@ -25,8 +25,8 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\newcommand*\@trnslt@date{2018/02/28} -\newcommand*\@trnslt@version{v1.8} +\newcommand*\@trnslt@date{2020/04/26} +\newcommand*\@trnslt@version{v1.8a} \newcommand*\@trnslt@packageinfo{internationalization of LaTeX2e packages} \ProvidesPackage{translations}[% @@ -557,52 +557,38 @@ \@trnslt@load@dictionary@for@dialect{#2}{#1}} \@onlypreamble\LoadDictionaryFor -% #1: name -% #2: lang -% #3: false -\newrobustcmd*\@trnslt@input@if@dictionary@exists[3]{% - \AtBeginDocument{% - \InputIfFileExists{#1-\@trnslt@language{#2}.trsl} - {\@trnslt@check@dictionary{#1}{#2}} - {#3}% - }% +\newcommand*\@trnslt@dictionaries{} + +\edef\@trnslt@catcodes{% + \catcode\number`\<=\the\catcode`\<\relax + \catcode\number`\>=\the\catcode`\>\relax + \catcode\number`\|=\the\catcode`\|\relax } +\catcode`\<=3 +\catcode`\>=3 +\catcode`\|=7 + % #1: name % #2: lang % #3: false -\newrobustcmd*\@trnslt@load@dictionary@for@F[3]{% - \@trnslt@input@if@dictionary@exists{#1}{#2}{#3}% +\newrobustcmd*\@trnslt@input@if@dictionary[2]{% + \expanded{\ifinlist{<#1|\@trnslt@language{#2}>}}{\@trnslt@dictionaries} + {} + {\listxadd\@trnslt@dictionaries{<#1|\@trnslt@language{#2}>}}% } % #1: name % #2: lang -\newrobustcmd*\@trnslt@load@dictionary@for@dialect[2]{% - \@trnslt@load@dictionary@for@F{#1}{#2} - {% - \@trnslt@warning{dictionary file `#1-\@trnslt@language{#2}.trsl' not - found.}% - }% +% #3: false +\newrobustcmd*\@trnslt@load@dictionary@for[2]{% + \@trnslt@input@if@dictionary{#1}{#2}% } % #1: name % #2: lang -\newrobustcmd*\@trnslt@load@dictionary@for[2]{% - \@trnslt@load@dictionary@for@F{#1}{#2} - {% - \@trnslt@load@dictionary@for@F{#1}{\baselanguage{#2}} - {% - \@trnslt@warning{neither dictionary file - `#1-\@trnslt@language{#2}.trsl' nor `#1-\baselanguage{#2}.trsl' - found.}% - }% - }% -} - -\newrobustcmd*\@trnslt@load@dictionary@silent@for[2]{% - \@trnslt@load@dictionary@for@F{#1}{#2}{% - \@trnslt@load@dictionary@for@F{#1}{\baselanguage{#2}}{}% - }% +\newrobustcmd*\@trnslt@load@dictionary@for@dialect[2]{% + \@trnslt@load@dictionary@for{#1}{#2} } % #1: name @@ -620,6 +606,22 @@ }% } +\protected\def\@trnslt@input@dictionary<#1|#2>\q@stop{% + \InputIfFileExists{#1-#2.trsl} + {\@trnslt@check@dictionary{#1}{#2}} + {% + \@trnslt@if@dialect{#2} + {% + \InputIfFileExists{#1-\baselanguage{#2}.trsl} + {\@trnslt@check@dictionary{#1}{#2}} + {\@trnslt@info{no dictionary file `#1-\baselanguage{#2}.trsl' found.}} + }% + {\@trnslt@info{no dictionary file `#1-#2.trsl' found.}} + }% +} + +\@trnslt@catcodes + % -------------------------------------------------------------------------- % the contents of a dictionary; let's declare that is one. % #1: lang @@ -662,7 +664,7 @@ @trnslt@dictionary@\@trnslt@dictionary@name @\@trnslt@dictionary@lang @{#1}{\detokenize{#2}}% }{{#1}{#2}}% - \listcsadd + \listcsgadd {@trnslt@dictionary@\@trnslt@dictionary@name @\@trnslt@dictionary@lang} {{#1}{#2}}% } @@ -1076,9 +1078,12 @@ \fi \expanded{% \noexpand\forcsvlist - {\noexpand\@trnslt@load@dictionary@silent@for{translations-basic-dictionary}} + {\noexpand\@trnslt@load@dictionary@for{translations-basic-dictionary}} {\expandonce\@trnslt@loaded@languages}% }% + \def\do#1{\@trnslt@input@dictionary#1\q@stop} + \dolistloop\@trnslt@dictionaries + \let\do\@gobble } \endinput @@ -1174,3 +1179,5 @@ 2017/08/31 v1.7a - add missing dependency on pdftexcmds 2020/02/28 v1.8 - load basic dictionary for each loaded language (if available) +2020/04/26 v1.8a - fix problem with loading of dictionaries in some + circumstances |