From 46b6afccfb82f1ff6df7c22ce307fb1902928cba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Feb 2020 22:29:38 +0000 Subject: translations (28feb20) git-svn-id: svn://tug.org/texlive/trunk@53962 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/translations/README | 4 +- .../doc/latex/translations/translations_en.pdf | Bin 504516 -> 496892 bytes .../doc/latex/translations/translations_en.tex | 45 +++++++----- .../translations-basic-dictionary-catalan.trsl | 2 +- .../translations-basic-dictionary-dutch.trsl | 2 +- .../translations-basic-dictionary-english.trsl | 2 +- .../translations-basic-dictionary-french.trsl | 2 +- .../translations-basic-dictionary-german.trsl | 2 +- .../translations-basic-dictionary-spanish.trsl | 2 +- .../tex/latex/translations/translations.sty | 76 +++++++++++++-------- 10 files changed, 83 insertions(+), 54 deletions(-) diff --git a/Master/texmf-dist/doc/latex/translations/README b/Master/texmf-dist/doc/latex/translations/README index ce94dac6bb1..a944202cc20 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.7a - 2017/08/31 +the TRANSLATIONS package v1.8 - 2020/02/28 internationalization of LaTeX2e packages -------------------------------------------------------------------------- @@ -7,7 +7,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/translations E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2012-2017 Clemens Niederberger +Copyright 2012--2020 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/doc/latex/translations/translations_en.pdf b/Master/texmf-dist/doc/latex/translations/translations_en.pdf index 425752712fc..7087da4bdc9 100644 Binary files a/Master/texmf-dist/doc/latex/translations/translations_en.pdf and b/Master/texmf-dist/doc/latex/translations/translations_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/translations/translations_en.tex b/Master/texmf-dist/doc/latex/translations/translations_en.tex index a39561bdc2e..2b04600d0d7 100644 --- a/Master/texmf-dist/doc/latex/translations/translations_en.tex +++ b/Master/texmf-dist/doc/latex/translations/translations_en.tex @@ -1,7 +1,7 @@ -% !arara: pdflatex: { shell: on } +% arara: pdflatex: { shell: on, interaction: nonstopmode } % !arara: biber -% arara: pdflatex -% arara: pdflatex +% !arara: pdflatex +% !arara: pdflatex % -------------------------------------------------------------------------- % the TRANSLATIONS package % @@ -12,7 +12,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -31,8 +31,10 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\documentclass[load-preamble+,french,spanish,ngerman,english]{cnltx-doc} +\documentclass[load-preamble]{cnltx-doc} +\usepackage[french,spanish,ngerman,english]{babel} % ---------------------------------------------------------------------------- +\usepackage{imakeidx} % document layout and typographic features \setcnltx{ package = {translations} , @@ -81,13 +83,19 @@ \microtypesetup{tracking=scshape} -\defbibheading{bibliography}[\bibname]{\addsec{#1}} - +\usepackage[ + backend=biber, + style=cnltx, + sortlocale=en_US, + indexing=cite]{biblatex} \usepackage{csquotes} +\addbibresource{cnltx.bib} + +\usepackage[biblatex]{embrac} +\ChangeEmph{[}[,.02em]{]}[.055em,-.08em] +\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] -\usepackage{embrac}[2012/06/29] - \ChangeEmph{[}[,.02em]{]}[.055em,-.08em] - \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em] +\defbibheading{bibliography}{\section{References}} % ---------------------------------------------------------------------------- % other packages, bibliography, index @@ -420,7 +428,7 @@ Commands without the marker aren't expandable. \meta{false} if the current \pkg{babel} language is \code{american}. \expandable\command{ifcurrentbaselanguage}[\marg{lang}\marg{true}\marg{false}] \sinceversion{1.2}Places \meta{true} in the input stream if the current - language is \meta{lang}. Note: a dialect does notcount as a language of + language is \meta{lang}. Note: a dialect does not count as a language of it's own here. If the current \pkg{babel} language is \code{american} then \cs{ifcurrentbaselanguage}\Marg{English} will be \meta{true}. \end{commands} @@ -488,7 +496,7 @@ provided. If the user \emph{has} loaded one of the language packages but has chosen a language for which no translation is defined the language `fallback' will be used, \ie, the translation provided with \cs{DeclareTranslationFallback}. If no fallback translation is provided -either the translation will expand to the literal string. +either, the translation will expand to the literal string. The following three examples should make this concept clear: @@ -618,10 +626,13 @@ Every dictionary file \emph{must} contain the declaration \item German, and \item Spanish. \end{itemize} -The corresponding dictionary is loaded automatically if the document language -is one of these languages. If you'd like to contribute and add the basic -dictionary in your language this is more than welcome and highly appreciated! -The easiest way to do this would be to copy one of the existing files +The corresponding dictionary\footnote{Or dictionaries if more than one of + these languages are loaded in a document. This works since v0.18.} is loaded +automatically if the document language is one of these languages. + +\emph{If you'd like to contribute and add the basic dictionary in your + language this is more than welcome and highly appreciated!} The easiest way +to do this would be to copy one of the existing files \code{translations-basic-dictionary-\meta{lang}.trsl} and modify the file accordingly. You can then send me the file via email and I'll add it to \translations. @@ -775,4 +786,6 @@ case. Should you miss a language please send me an email so I can add it to % \section{Implementation} % \lstinputlisting[style=cnltx]{translations.sty} +\printbibliography + \end{document} diff --git a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-catalan.trsl b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-catalan.trsl index d136677d9ec..dd9fe5409b0 100644 --- a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-catalan.trsl +++ b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-catalan.trsl @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-dutch.trsl b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-dutch.trsl index a9b8a61b007..5d70d9dfb95 100644 --- a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-dutch.trsl +++ b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-dutch.trsl @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-english.trsl b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-english.trsl index a01c359094e..13c12392b8e 100644 --- a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-english.trsl +++ b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-english.trsl @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-french.trsl b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-french.trsl index d40b0d6ca54..ed0a99cd668 100644 --- a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-french.trsl +++ b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-french.trsl @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-german.trsl b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-german.trsl index db4405016c1..1bda332224f 100644 --- a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-german.trsl +++ b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-german.trsl @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-spanish.trsl b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-spanish.trsl index ef948814078..38d4dcf8276 100644 --- a/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-spanish.trsl +++ b/Master/texmf-dist/tex/latex/translations/translations-basic-dictionary-spanish.trsl @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/translations/translations.sty b/Master/texmf-dist/tex/latex/translations/translations.sty index 6c5e03bbf28..5875db674bf 100644 --- a/Master/texmf-dist/tex/latex/translations/translations.sty +++ b/Master/texmf-dist/tex/latex/translations/translations.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/translations % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2012-2017 Clemens Niederberger +% Copyright 2012--2020 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -25,8 +25,8 @@ % If you have any ideas, questions, suggestions or bugs to report, please % feel free to contact me. % -------------------------------------------------------------------------- -\newcommand*\@trnslt@date{2017/08/31} -\newcommand*\@trnslt@version{v1.7a} +\newcommand*\@trnslt@date{2018/02/28} +\newcommand*\@trnslt@version{v1.8} \newcommand*\@trnslt@packageinfo{internationalization of LaTeX2e packages} \ProvidesPackage{translations}[% @@ -143,7 +143,9 @@ \@trnslt@if@language{#1} {}{% \csdef{@trnslt@language@#1}{#1}% - \listeadd\@trnslt@languages{#1}% + \@trnslt@if@dialect{#1} + {} + {\listeadd\@trnslt@languages{#1}}% }% } @@ -838,6 +840,29 @@ \DeclareLanguage{vietnamese} \DeclareLanguage{welsh} +\DeclareLanguageDialect{british}{english} +\DeclareLanguageDialect{australian}{english} +\DeclareLanguageDialect{american}{english} +\DeclareLanguageDialect{acadian}{french} +\DeclareLanguageDialect{canadien}{french} +\DeclareLanguageDialect{canadian}{english} +\DeclareLanguageDialect{newzealand}{english} +\DeclareLanguageDialect{irish}{gaelic} +\DeclareLanguageDialect{scottish}{gaelic} +\DeclareLanguageDialect{austrian}{german} +\DeclareLanguageDialect{hindi}{hindustani} +\DeclareLanguageDialect{urdu}{hindustani} +\DeclareLanguageDialect{indonesian}{malay} +\DeclareLanguageDialect{brazil}{portuges} +\DeclareLanguageDialect{serbian}{serbocroatian} +\DeclareLanguageDialect{croatian}{serbocroatian} +\DeclareLanguageDialect{lowersorbian}{sorbian} +\DeclareLanguageDialect{uppersorbian}{sorbian} +\DeclareLanguageDialect{swissgerman}{german} +\DeclareLanguageDialect{swissfrench}{french} +\DeclareLanguageDialect{swissitalian}{italian} +\DeclareLanguageDialect{swissromansh}{romansh} + % -------------------------------------------------------------------------- % aliases and dialects: \DeclareLanguageAlias {Afrikaans}{afrikaans} @@ -866,32 +891,23 @@ \DeclareLanguageAlias {Finnish}{finnish} \DeclareLanguageAlias {francais}{french} \DeclareLanguageAlias {Francais}{francais} -\DeclareLanguageDialect{canadien}{french} \DeclareLanguageAlias {Canadien}{canadien} \DeclareLanguageAlias {French}{french} -\DeclareLanguageDialect{acadian}{french} \DeclareLanguageAlias {Acadian}{acadian} \DeclareLanguageAlias {frenchle}{french} -\DeclareLanguageDialect{american}{english} \DeclareLanguageAlias {American}{american} -\DeclareLanguageDialect{australian}{english} \DeclareLanguageAlias {Australian}{australian} -\DeclareLanguageDialect{british}{english} \DeclareLanguageAlias {British}{british} -\DeclareLanguageDialect{canadian}{english} \DeclareLanguageAlias {Canadian}{canadian} \DeclareLanguageAlias {English}{english} \DeclareLanguageAlias {UKenglish}{british} \DeclareLanguageAlias {USenglish}{american} -\DeclareLanguageDialect{newzealand}{english} \DeclareLanguageAlias {Newzealand}{newzealand} \DeclareLanguageAlias {Ethiop}{ethiop} \DeclareLanguageAlias {Esperanto}{esperanto} \DeclareLanguageAlias {Estonian}{estonian} \DeclareLanguageAlias {Friulan}{friulan} \DeclareLanguageAlias {Gaelic}{gaelic} -\DeclareLanguageDialect{irish}{gaelic} -\DeclareLanguageDialect{scottish}{gaelic} \DeclareLanguageAlias {Irish}{irish} \DeclareLanguageAlias {irish gaelic}{irish} \DeclareLanguageAlias {Irish Gaelic}{irish} @@ -902,7 +918,6 @@ \DeclareLanguageAlias {German}{german} \DeclareLanguageAlias {germanb}{german} \DeclareLanguageAlias {ngerman}{german} -\DeclareLanguageDialect{austrian}{german} \DeclareLanguageAlias {Austrian}{austrian} \DeclareLanguageAlias {naustrian}{austrian} \DeclareLanguageAlias {Greek}{greek} @@ -913,9 +928,7 @@ \DeclareLanguageAlias {Hindustani}{hindustani} \DeclareLanguageAlias {hindi-urdu}{hindustani} \DeclareLanguageAlias {Hindi-Urdu}{hindi-urdu} -\DeclareLanguageDialect{hindi}{hindustani} \DeclareLanguageAlias {Hindi}{hindi} -\DeclareLanguageDialect{urdu}{hindustani} \DeclareLanguageAlias {Urdu}{urdu} \DeclareLanguageAlias {Hungarian}{hungarian} \DeclareLanguageAlias {magyar}{hungarian} @@ -949,7 +962,6 @@ \DeclareLanguageAlias {Bahasai}{bahasai} \DeclareLanguageAlias {bahasam}{bahasa} \DeclareLanguageAlias {Bahasam}{bahasam} -\DeclareLanguageDialect{indonesian}{malay} \DeclareLanguageAlias {Indonesian}{indonesian} \DeclareLanguageAlias {indon}{indonesian} % @@ -975,7 +987,6 @@ \DeclareLanguageAlias {Piemonteis}{piemonteis} \DeclareLanguageAlias {Pinyin}{pinyin} \DeclareLanguageAlias {Polish}{polish} -\DeclareLanguageDialect{brazil}{portuges} \DeclareLanguageAlias {Brazil}{brazil} \DeclareLanguageAlias {brazilian}{brazil} \DeclareLanguageAlias {Brazilian}{brazilian} @@ -998,18 +1009,14 @@ \DeclareLanguageAlias {Serbocroatian}{serbocroatian} \DeclareLanguageAlias {serbo-croatian}{serbocroatian} \DeclareLanguageAlias {Serbo-Croatian}{serbocroatian} -\DeclareLanguageDialect{serbian}{serbocroatian} \DeclareLanguageAlias {Serbian}{serbian} \DeclareLanguageAlias {serbianc}{serbian} -\DeclareLanguageDialect{croatian}{serbocroatian} \DeclareLanguageAlias {Croatian}{croatian} \DeclareLanguageAlias {Slovak}{slovak} \DeclareLanguageAlias {Slovenian}{slovenian} \DeclareLanguageAlias {slovene}{slovenian} \DeclareLanguageAlias {Slovene}{slovene} \DeclareLanguageAlias {Sorbian}{sorbian} -\DeclareLanguageDialect{lowersorbian}{sorbian} -\DeclareLanguageDialect{uppersorbian}{sorbian} \DeclareLanguageAlias {Lowersorbian}{lowersorbian} \DeclareLanguageAlias {Uppersorbian}{uppersorbian} \DeclareLanguageAlias {lsorbian}{lowersorbian} @@ -1023,10 +1030,6 @@ \DeclareLanguageAlias {Spanglish}{spanglish} \DeclareLanguageAlias {Spanish}{spanish} \DeclareLanguageAlias {Swedish}{swedish} -\DeclareLanguageDialect{swissgerman}{german} -\DeclareLanguageDialect{swissfrench}{french} -\DeclareLanguageDialect{swissitalian}{italian} -\DeclareLanguageDialect{swissromansh}{romansh} \DeclareLanguageAlias {Swissgerman}{swissgerman} \DeclareLanguageAlias {swiss german}{swissgerman} \DeclareLanguageAlias {Swiss German}{swissgerman} @@ -1060,11 +1063,22 @@ % OK, we have everything, do we? No, wait: let's load the basic dictionary % that is part of this package if it is available for the document language % -------------------------------------------------------------------------- -% load basic dictionary if available +% load basic dictionaries if available \AtBeginDocument{% - \@trnslt@load@dictionary@silent@for - {translations-basic-dictionary} - \@trnslt@current@language + \@ifpackageloaded{babel} + {\let\@trnslt@loaded@languages\bbl@loaded} + {}% + \@ifpackageloaded{polyglossia} + {\let\@trnslt@loaded@languages\xpg@loaded} + {}% + \ifdefined\@trnslt@loaded@languages\else + \let\@trnslt@loaded@languages\@trnslt@current@language + \fi + \expanded{% + \noexpand\forcsvlist + {\noexpand\@trnslt@load@dictionary@silent@for{translations-basic-dictionary}} + {\expandonce\@trnslt@loaded@languages}% + }% } \endinput @@ -1158,3 +1172,5 @@ 2017/07/03 v1.6a - fix issue #6 (bug in \@trnslt@save@translation@for) 2017/07/06 v1.7 - return translation values in \unexpanded 2017/08/31 v1.7a - add missing dependency on pdftexcmds +2020/02/28 v1.8 - load basic dictionary for each loaded language (if + available) -- cgit v1.2.3