diff options
Diffstat (limited to 'Master/texmf-dist/doc/generic')
77 files changed, 423 insertions, 255 deletions
diff --git a/Master/texmf-dist/doc/generic/tracklang/CHANGES b/Master/texmf-dist/doc/generic/tracklang/CHANGES index e7c4e645840..83d6319d5cf 100644 --- a/Master/texmf-dist/doc/generic/tracklang/CHANGES +++ b/Master/texmf-dist/doc/generic/tracklang/CHANGES @@ -1,3 +1,44 @@ +v1.3.1 (2016-10-08): + + * Added missing files from tracklang.tds.zip + +v1.3 (2016-10-07): + + * New files tracklang-scripts.tex, tracklang-scripts.sty + tracklang-region-codes.tex + + * tracklang.tex: + + - Now sets and restores category code for @ if it's not initially 11 + (no change if it's already 11) + + - New command \TrackLocale{POSIX locale} + and \TrackLanguageTag{BCP47 language tag} + + - New command \TrackLangFromEnv. (Queries locale environment + variable using \TrackLangQueryEnv and, if successful, + then parses and tracks the dialect. Also sets + \TrackLangEnvLang, \TrackLangEnvTerritory, + \TrackLangEnvCodeSet and \TrackLangEnvModifier.) + + - New command \TrackLangQueryEnv (queries the environment + variables LC_ALL or LANG, if shell escape or \directlua + available, and sets \TrackLangEnv) + + - New command \TrackLangQueryOtherEnv (like the above + but queries an extra environment variable) + + - New command \TrackLangParseFromEnv (parses \TrackLangEnv, + if defined and not empty, and sets \TrackLangEnvLang, + \TrackLangEnvTerritory, \TrackLangEnvCodeSet and + \TrackLangEnvModifier) + + - Many other new commands. See Changes section of manual. + + - New language and dialect options + + - Bug fix: corrected ISO 639-1 language code in usorbian + v1.2 (2015/03/23): * New package options: diff --git a/Master/texmf-dist/doc/generic/tracklang/README b/Master/texmf-dist/doc/generic/tracklang/README index eb6bc113749..976629f1fe6 100644 --- a/Master/texmf-dist/doc/generic/tracklang/README +++ b/Master/texmf-dist/doc/generic/tracklang/README @@ -1,6 +1,6 @@ -Generic TeX Bundle : tracklang v1.2 +Generic TeX Bundle : tracklang v1.3.1 -Last Modified : 2015-03-23 +Last Modified : 2016-10-08 Author : Nicola Talbot diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-GB.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-GB.ldf index b306547956a..ad4e2021a01 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-GB.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-GB.ldf @@ -1,8 +1,10 @@ -\input{animals-english.ldf} +\TrackLangProvidesResource{en-GB}[2016/10/06 v1.2] -\providecommand*{\englishGBanimals}{% +\TrackLangRequireResource{english} + +\providecommand*{\enGBanimals}{% \englishanimals \renewcommand*{\ladybirdname}{ladybird}% } -\englishGBanimals +\TrackLangAddToCaptions\enGBanimals diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-US.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-US.ldf index fbef2a4a02d..66489a0330a 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-US.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-US.ldf @@ -1,8 +1,10 @@ -\input{animals-english.ldf} +\TrackLangProvidesResource{en-US}[2016/10/06 v1.2] -\providecommand*{\englishUSanimals}{% +\TrackLangRequireResource{english}% + +\providecommand*{\enUSanimals}{% \englishanimals \renewcommand*{\ladybirdname}{ladybug}% } -\englishUSanimals +\TrackLangAddToCaptions\enUSanimals diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-english.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-english.ldf index 56edbe73d70..5b40d67d206 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-english.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-english.ldf @@ -1,7 +1,9 @@ +\TrackLangProvidesResource{english}[2016/10/06 v1.2] + \providecommand*{\englishanimals}{% \renewcommand*{\catname}{cat}% \renewcommand*{\dogname}{dog}% \renewcommand*{\ladybirdname}{bishy-barney-bee}% } -\englishanimals +\TrackLangAddToCaptions\englishanimals diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-german.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-german.ldf new file mode 100644 index 00000000000..45f4852b4bc --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-german.ldf @@ -0,0 +1,9 @@ +\TrackLangProvidesResource{german}[2016/10/06 v1.2] + +\providecommand*{\germananimals}{% + \renewcommand*{\catname}{Katze}% + \renewcommand*{\dogname}{Hund}% + \renewcommand*{\ladybirdname}{Marienk\"afer}% +} + +\TrackLangAddToCaptions\germananimals diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals.sty b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals.sty index c4b3a6a8ccc..8b14d3b4ee4 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals.sty +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals.sty @@ -1,8 +1,13 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{animals}[2014/09/28 v1.0 (NLCT) Sample package to test tracklang.sty] +\ProvidesPackage{animals}[2016/10/06 v1.2 (NLCT) Sample package to test tracklang.sty] -\RequirePackage{tracklang} +\RequirePackage{tracklang}[2016/10/07] +\DeclareOption*{\TrackLanguageTag{\CurrentOption}} +\ProcessOptions + + +% default definitions \newcommand\catname{cat} \newcommand\dogname{dog} \newcommand\ladybirdname{bishy-barney-bee} @@ -10,18 +15,7 @@ \AnyTrackedLanguages {% \ForEachTrackedDialect{\this@dialect}{% - \IfTrackedLanguageFileExists{\this@dialect}% - {animals-}% prefix - {.ldf}% - {% - \PackageInfo{animals}{Loading `animals-\CurrentTrackedTag.ldf' - for language `\this@dialect'}% - \input{animals-\CurrentTrackedTag.ldf}% - }% - {% - \PackageWarning{animals}% - {No support for language `\this@dialect'}% - }% + \TrackLangRequireDialect{animals}{\this@dialect}% }% } {% no tracked languages, default already set up diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-GB.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-GB.ldf index 60ca9bf6892..8e0d7424259 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-GB.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-GB.ldf @@ -1,10 +1,17 @@ -\ProvidesAnimalsLang{en-GB} +\TrackLangProvidesResource{en-GB}[2016/10/06 v1.2] -\RequireAnimalsLang{english}% - -\providecommand*{\englishGBanimals}{% +\providecommand*{\enGBanimals}{% \englishanimals \renewcommand*{\ladybirdname}{ladybird}% } -\englishGBanimals +\TrackLangRequireResourceOrDo{english}% +{ + \TrackLangAddToCaptions{% + \renewcommand*{\ladybirdname}{ladybird}% + } +} +{ + \TrackLangAddToCaptions\enGBanimals +} + diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-US.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-US.ldf index b2117ce38f8..ccc76729037 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-US.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-US.ldf @@ -1,10 +1,16 @@ -\ProvidesAnimalsLang{en-US} +\TrackLangProvidesResource{en-US}[2016/10/06 v1.2] -\RequireAnimalsLang{english}% - -\providecommand*{\englishUSanimals}{% +\providecommand*{\enUSanimals}{% \englishanimals \renewcommand*{\ladybirdname}{ladybug}% } -\englishUSanimals +\TrackLangRequireResourceOrDo{english} +{ + \TrackLangAddToCaptions{% + \renewcommand*{\ladybirdname}{ladybird}% + } +} +{ + \TrackLangAddToCaptions\enUSanimals +} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-english.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-english.ldf index 120c1617780..5b40d67d206 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-english.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-english.ldf @@ -1,4 +1,4 @@ -\ProvidesAnimalsLang{english} +\TrackLangProvidesResource{english}[2016/10/06 v1.2] \providecommand*{\englishanimals}{% \renewcommand*{\catname}{cat}% @@ -6,4 +6,4 @@ \renewcommand*{\ladybirdname}{bishy-barney-bee}% } -\englishanimals +\TrackLangAddToCaptions\englishanimals diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-german.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-german.ldf new file mode 100644 index 00000000000..45f4852b4bc --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-german.ldf @@ -0,0 +1,9 @@ +\TrackLangProvidesResource{german}[2016/10/06 v1.2] + +\providecommand*{\germananimals}{% + \renewcommand*{\catname}{Katze}% + \renewcommand*{\dogname}{Hund}% + \renewcommand*{\ladybirdname}{Marienk\"afer}% +} + +\TrackLangAddToCaptions\germananimals diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2.sty b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2.sty index ba8a3295a72..88ca25139a3 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2.sty +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2.sty @@ -1,35 +1,36 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{animals2}[2014/09/28 v1.0 (NLCT) Sample package to test tracklang.sty] +\ProvidesPackage{animals2}[2016/10/06 v1.2 (NLCT) Sample package to test tracklang.sty] -\RequirePackage{tracklang} +\RequirePackage{tracklang}[2016/10/07] + +\DeclareOption*{\TrackLanguageTag{\CurrentOption}} +\ProcessOptions + +\AnyTrackedLanguages +{} +{% fetch locale information from the operating system + \ifx\TeXOSQueryLangTag\undefined + \TrackLangFromEnv + \else + % texosquery v1.2 available + \TeXOSQueryLangTag{\langtag} + \TrackLanguageTag{\langtag} + \fi +} % default definitions \newcommand\catname{cat} \newcommand\dogname{dog} \newcommand\ladybirdname{bishy-barney-bee} - -\newcommand*{\RequireAnimalsLang}[1]{% - \@ifundefined{ver@animals2-#1.ldf}{\input{animals2-#1.ldf}}{}% -} - -\newcommand*{\ProvidesAnimalsLang}[1]{% - \ProvidesFile{animals2-#1.ldf}% +\newcommand*{\RequireAnimalsDialect}[1]{% + \TrackLangRequireDialect{animals2}{#1}% } \AnyTrackedLanguages {% \ForEachTrackedDialect{\this@dialect}{% - \IfTrackedLanguageFileExists{\this@dialect}% - {animals2-}% prefix - {.ldf}% - {% - \RequireAnimalsLang{\CurrentTrackedTag}% - }% - {% - \PackageWarning{animals2}% - {No support for language `\this@dialect'}% - }% + \RequireAnimalsDialect\this@dialect }% } {% no tracked languages, default already set up diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-GB.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-GB.ldf deleted file mode 100644 index 3bd31cf3425..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-GB.ldf +++ /dev/null @@ -1,23 +0,0 @@ -\ProvidesAnimalsLang{en-GB} - -\RequireAnimalsLang{english}% - -\providecommand*{\englishGBanimals}{% - \englishanimals - \renewcommand*{\ladybirdname}{ladybird}% -} - -\englishGBanimals - -\@ifundefined{captions\CurrentTrackedDialect} -{% - \@ifundefined{captions\CurrentTrackedLanguage}{}% - {% - \expandafter\g@addto@macro - \csname captions\CurrentTrackedLanguage\endcsname{\englishGBanimals}% - } -}% -{% - \expandafter\g@addto@macro - \csname captions\CurrentTrackedDialect\endcsname{\englishGBanimals}% -} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-US.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-US.ldf deleted file mode 100644 index d9a81bf3fc8..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-US.ldf +++ /dev/null @@ -1,23 +0,0 @@ -\ProvidesAnimalsLang{en-US} - -\RequireAnimalsLang{english}% - -\providecommand*{\englishUSanimals}{% - \englishanimals - \renewcommand*{\ladybirdname}{ladybug}% -} - -\englishUSanimals - -\@ifundefined{captions\CurrentTrackedDialect}% -{% - \@ifundefined{captions\CurrentTrackedLanguage}{}% - {% - \expandafter\g@addto@macro - \csname captions\CurrentTrackedLanguage\endcsname{\englishUSanimals}% - } -}% -{% - \expandafter\g@addto@macro - \csname captions\CurrentTrackedDialect\endcsname{\englishUSanimals}% -} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-english.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-english.ldf deleted file mode 100644 index 8760b373527..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-english.ldf +++ /dev/null @@ -1,21 +0,0 @@ -\ProvidesAnimalsLang{english} - -\providecommand*{\englishanimals}{% - \renewcommand*{\catname}{cat}% - \renewcommand*{\dogname}{dog}% - \renewcommand*{\ladybirdname}{bishy-barney-bee}% -} - -\englishanimals - -\@ifundefined{captionsenglish}% -{% - \@ifundefined{captions\CurrentTrackedDialect}{}% - {% - \expandafter\g@addto@macro - \csname captions\CurrentTrackedDialect\endcsname{\englishanimals}% - } -}% -{% - \g@addto@macro\captionsenglish{\englishanimals}% -} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-german.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-german.ldf deleted file mode 100644 index 209e96ea29f..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-german.ldf +++ /dev/null @@ -1,21 +0,0 @@ -\ProvidesAnimalsLang{german} - -\providecommand*{\germananimals}{% - \renewcommand*{\catname}{Katze}% - \renewcommand*{\dogname}{Hund}% - \renewcommand*{\ladybirdname}{Marienk\"afer}% -} - -\germananimals - -\@ifundefined{captionsgerman}% -{% - \@ifundefined{captions\CurrentTrackedDialect}{}% - {% - \expandafter\g@addto@macro - \csname captions\CurrentTrackedDialect\endcsname{\germananimals}% - } -}% -{% - \g@addto@macro\captionsgerman{\germananimals}% -} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3.sty b/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3.sty deleted file mode 100644 index dc2f06d528e..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3.sty +++ /dev/null @@ -1,41 +0,0 @@ -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{animals3}[2014/09/28 v1.0 (NLCT) Sample package to test tracklang.sty] - -\RequirePackage{tracklang} - -% default definitions -\newcommand\catname{cat} -\newcommand\dogname{dog} -\newcommand\ladybirdname{bishy-barney-bee} - -\newcommand*{\RequireAnimalsDialect}[1]{% - \IfTrackedLanguageFileExists{#1}% - {animals3-}% prefix - {.ldf}% - {% - \RequireAnimalsLang{\CurrentTrackedTag}% - }% - {% - \PackageWarning{animals3}% - {No support for language `#1'}% - }% -} - -\newcommand*{\RequireAnimalsLang}[1]{% - \@ifundefined{ver@animals3-#1.ldf}{\input{animals3-#1.ldf}}{}% -} - -\newcommand*{\ProvidesAnimalsLang}[1]{% - \ProvidesFile{animals3-#1.ldf}% -} - -\AnyTrackedLanguages -{% - \ForEachTrackedDialect{\this@dialect}{% - \RequireAnimalsDialect\this@dialect - }% -} -{% no tracked languages, default already set up -} - -\endinput diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf Binary files differnew file mode 100644 index 00000000000..552af54218c --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.tex index 0ff5bd16d79..962e00f5227 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.tex @@ -1,19 +1,23 @@ % arara: pdflatex -\documentclass[a4paper]{article} +\documentclass[american,german,british]{article} -\usepackage[british,american]{babel} - -\usepackage{animals3} +\usepackage{babel} +\usepackage{animals} \begin{document} +\selectlanguage{american} -\selectlanguage{british} +\catname. +\dogname. +\ladybirdname. + +\selectlanguage{german} \catname. \dogname. \ladybirdname. -\selectlanguage{american} +\selectlanguage{british} \catname. \dogname. diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf Binary files differnew file mode 100644 index 00000000000..ce04fe77c32 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.tex index f43249ac4f9..bb96c76cd4e 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.tex @@ -4,7 +4,7 @@ \usepackage{polyglossia} \setmainlanguage{german} -\usepackage{animals3} +\usepackage{animals} \begin{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf Binary files differindex de30ea349d4..b9c3652bd1e 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.tex index 2ac5fb79e05..ec24e8ee514 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.tex @@ -3,7 +3,7 @@ \usepackage[ngerman]{babel} -\usepackage{animals3} +\usepackage{animals} \begin{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf Binary files differnew file mode 100644 index 00000000000..325d787c76c --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.tex index 3a9e6c5be79..33b7f4e93bc 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.tex @@ -2,9 +2,9 @@ \documentclass[british,a4paper]{article} \usepackage{polyglossia} -\setmainlanguage[variant=british]{english} +\setmainlanguage[variant=uk]{english} -\usepackage{animals3} +\usepackage{animals} \begin{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf Binary files differindex 6f03c5a721c..7304d9cf606 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.tex index a0aa2667419..85dc4dddf99 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.tex @@ -1,9 +1,16 @@ % arara: pdflatex -\documentclass[british,a4paper]{article} +\documentclass[british,american,a4paper]{article} \usepackage{animals} \begin{document} +\enGBanimals + +\catname. +\dogname. +\ladybirdname. + +\enUSanimals \catname. \dogname. diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf Binary files differindex dd9d175ac62..aeea3968eec 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de2.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.tex new file mode 100644 index 00000000000..20158ec8f4e --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.tex @@ -0,0 +1,14 @@ +% arara: pdflatex +\documentclass[a4paper]{article} + +\usepackage[ngerman]{babel} + +\usepackage{animals2} + +\begin{document} + +\catname. +\dogname. +\ladybirdname. + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf Binary files differnew file mode 100644 index 00000000000..186ee2ed1b7 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de2.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.tex index 2540d318730..3792d8f2717 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de2.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.tex @@ -3,7 +3,7 @@ \usepackage{ngerman} -\usepackage{animals3} +\usepackage{animals2} \begin{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf Binary files differindex cd93d5d6e0e..36e7da904de 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de3.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de3.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.tex index 5def7f9a232..3895f3c3a18 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de3.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.tex @@ -3,7 +3,7 @@ \usepackage[ngerman]{translator} -\usepackage{animals3} +\usepackage{animals2} \begin{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf Binary files differnew file mode 100644 index 00000000000..9e71298774b --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.tex new file mode 100644 index 00000000000..c7747182097 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.tex @@ -0,0 +1,15 @@ +% arara: xelatex +\documentclass[a4paper]{article} + +\usepackage{polyglossia} +\setmainlanguage{german} + +\usepackage{animals2} + +\begin{document} + +\catname. +\dogname. +\ladybirdname. + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf Binary files differnew file mode 100644 index 00000000000..dd88d1544af --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.tex new file mode 100644 index 00000000000..626556afb78 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.tex @@ -0,0 +1,15 @@ +% arara: xelatex +\documentclass[british,a4paper]{article} + +\usepackage{polyglossia} +\setmainlanguage[variant=uk]{english} + +\usepackage{animals2} + +\begin{document} + +\catname. +\dogname. +\ladybirdname. + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf Binary files differindex 728a7eb15e4..de60e31ba65 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.tex b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.tex index 206afeb5cf8..e4ed01e5b0e 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.tex @@ -1,17 +1,19 @@ % arara: pdflatex -\documentclass[british,american,a4paper]{article} +\documentclass[a4paper]{article} + +\usepackage[american,british]{babel} \usepackage{animals2} \begin{document} -\englishGBanimals +\selectlanguage{british} \catname. \dogname. \ladybirdname. -\englishUSanimals +\selectlanguage{american} \catname. \dogname. diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.pdf Binary files differdeleted file mode 100644 index 5935d1614f5..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.pdf Binary files differdeleted file mode 100644 index 55e0516a1e9..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.pdf Binary files differdeleted file mode 100644 index 6f402f4f10b..00000000000 --- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-BE.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-BE.ldf index 6a5e0d87b14..7e8887518f6 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-BE.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-BE.ldf @@ -1,7 +1,9 @@ +\TrackLangProvidesResource{BE}[2016/10/06 v1.2] + \providecommand*{\BEunits}{% \renewcommand*{\weightunit}{kg}% \renewcommand*{\lengthunit}{mm}% \renewcommand*{\currencyunit}{EUR}% } -\BEunits +\TrackLangAddToCaptions\BEunits diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-CA.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-CA.ldf index cfef4759bd5..709a6371b72 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-CA.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-CA.ldf @@ -1,7 +1,9 @@ +\TrackLangProvidesResource{CA}[2016/10/06 v1.2] + \providecommand*{\CAunits}{% \renewcommand*{\weightunit}{kg}% \renewcommand*{\lengthunit}{mm}% \renewcommand*{\currencyunit}{CAD}% } -\CAunits +\TrackLangAddToCaptions\CAunits diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-GB.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-GB.ldf index aea04a1a8ee..85fe6d97131 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-GB.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-GB.ldf @@ -1,7 +1,9 @@ +\TrackLangProvidesResource{GB}[2016/10/06 v1.2] + \providecommand*{\GBunits}{% \renewcommand*{\weightunit}{kg}% \renewcommand*{\lengthunit}{mm}% \renewcommand*{\currencyunit}{GBP}% } -\GBunits +\TrackLangAddToCaptions\GBunits diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-IM.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-IM.ldf new file mode 100644 index 00000000000..e39500087ac --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-IM.ldf @@ -0,0 +1,9 @@ +\TrackLangProvidesResource{IM}[2016/10/06 v1.2] + +\providecommand*{\IMunits}{% + \renewcommand*{\weightunit}{kg}% + \renewcommand*{\lengthunit}{mm}% + \renewcommand*{\currencyunit}{M\pounds}% +} + +\TrackLangAddToCaptions\IMunits diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-US.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-US.ldf index 51c574578af..ec69edfe01d 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-US.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-US.ldf @@ -1,7 +1,9 @@ +\TrackLangProvidesResource{US}[2016/10/06 v1.2] + \providecommand*{\USunits}{% \renewcommand*{\weightunit}{lb}% \renewcommand*{\lengthunit}{in}% \renewcommand*{\currencyunit}{USD}% } -\USunits +\TrackLangAddToCaptions\USunits diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-dutch.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-dutch.ldf index 6a3cf7a3639..0c4384d27f9 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-dutch.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-dutch.ldf @@ -1,5 +1,7 @@ +\TrackLangProvidesResource{dutch}[2016/10/06 v1.2] + \providecommand*{\dutchnames}{% \renewcommand*{\unitname}{meeteenheden}% } -\dutchnames +\TrackLangAddToCaptions\dutchnames diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-english.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-english.ldf index 7f5d7a41e8f..2be20b808ba 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-english.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-english.ldf @@ -1,5 +1,7 @@ +\TrackLangProvidesResource{english}[2016/10/06 v1.2] + \providecommand*{\englishnames}{% \renewcommand*{\unitname}{units}% } -\englishnames +\TrackLangAddToCaptions\englishnames diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-french.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-french.ldf index 51100a3e6fd..53392fc3c74 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-french.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-french.ldf @@ -1,5 +1,7 @@ +\TrackLangProvidesResource{french}[2016/10/06 v1.2] + \providecommand*{\frenchnames}{% \renewcommand*{\unitname}{unit\'es}% } -\frenchnames +\TrackLangAddToCaptions\frenchnames diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-german.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-german.ldf index b76cbb07fcf..3be14616938 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-german.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-german.ldf @@ -1,5 +1,7 @@ +\TrackLangProvidesResource{german}[2016/10/06 v1.2] + \providecommand*{\germannames}{% \renewcommand*{\unitname}{Ma\ss einheiten}% } -\germannames +\TrackLangAddToCaptions\germannames diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-italian.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-italian.ldf index afeaedab9fd..ddbe9de4339 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-italian.ldf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-italian.ldf @@ -1,3 +1,5 @@ +\TrackLangProvidesResource{italian}[2016/10/06 v1.2] + \providecommand*{\italiannames}{% \renewcommand*{\unitname}{unit\`a di misura}% } diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-manx.ldf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-manx.ldf new file mode 100644 index 00000000000..2426d43b327 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions-manx.ldf @@ -0,0 +1,7 @@ +\TrackLangProvidesResource{manx}[2016/10/06 v1.2] + +\providecommand*{\manxnames}{% + \renewcommand*{\unitname}{Ennym}% not right, but I don't know any Manx! +} + +\TrackLangAddToCaptions\manxnames diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions.sty b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions.sty index 8cbea2d488d..3b942c4172d 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions.sty +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions.sty @@ -1,7 +1,21 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{regions}[2014/09/29 v1.0 (NLCT) Sample package to test tracklang.sty] +\ProvidesPackage{regions}[2016/10/06 v1.2 (NLCT) Sample package to test tracklang.sty] -\RequirePackage{tracklang} +\RequirePackage{tracklang}[2016/10/07] + +\DeclareOption*{\TrackLanguageTag{\CurrentOption}} +\ProcessOptions + +\AnyTrackedLanguages +{} +{% fetch locale information from the operating system + \ifx\TeXOSQueryLangTag\undefined + \TrackLangFromEnv + \else + \TeXOSQueryLangTag{\langtag} + \TrackLanguageTag{\langtag} + \fi +} \newcommand*{\weightunit}{kg} \newcommand*{\lengthunit}{mm} @@ -9,27 +23,18 @@ \newcommand*{\unitname}{units} +\newcommand*{\RequireRegionsDialect}[1]{% + \TrackLangRequireDialect + [\TrackLangRequireResource{\CurrentTrackedTag}% + \TrackLangRequireResource{\CurrentTrackedLanguage}% + ]% + {regions}{#1}% +} + \AnyTrackedLanguages {% \ForEachTrackedDialect{\this@dialect}{% - \IfTrackedLanguageFileExists{\this@dialect}% - {regions-}% prefix - {.ldf}% - {% - \PackageInfo{regions}{Loading `regions-\CurrentTrackedTag.ldf' - for language `\this@dialect'}% - \input{regions-\CurrentTrackedTag.ldf}% - \InputIfFileExists{regions-\CurrentTrackedLanguage.ldf}% - {}% - {% - \PackageWarning{regions}{No support for language - `\CurrentTrackedLanguage'}% - }% - }% - {% - \PackageWarning{regions}% - {No support for language `\this@dialect'}% - }% + \RequireRegionsDialect\this@dialect }% } {% no tracked languages, default already set up diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions2.sty b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions2.sty index a387fecee84..d7d0d997572 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions2.sty +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/regions2.sty @@ -1,7 +1,10 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{regions2}[2014/09/29 v1.0 (NLCT) Sample package to test tracklang.sty] +\ProvidesPackage{regions2}[2016/10/06 v1.2 (NLCT) Sample package to test tracklang.sty] -\RequirePackage{tracklang} +\RequirePackage{tracklang}[2016/10/07] + +\DeclareOption*{\TrackLanguageTag{\CurrentOption}} +\ProcessOptions \newcommand*{\weightunit}{kg} \newcommand*{\lengthunit}{mm} @@ -15,31 +18,26 @@ \renewcommand*{\currencyunit}{EUR}% } -\AnyTrackedLanguages -{% - \ForEachTrackedDialect{\this@dialect}{% - \IfTrackedLanguageFileExists{\this@dialect}% - {regions-}% prefix - {.ldf}% - {% - \PackageInfo{regions2}{Loading `regions-\CurrentTrackedTag.ldf' - for language `\this@dialect'}% - \input{regions-\CurrentTrackedTag.ldf}% +\newcommand*{\RequireRegionsDialect}[1]{% + \TrackLangRequireDialect + [\TrackLangRequireResource{\CurrentTrackedTag}% \ifx\CurrentTrackedTag\CurrentTrackedLanguage - \defaultunits + \ifx\CurrentTrackedRegion\empty + \TrackLangAddToCaptions{\defaultunits}% + \else + \TrackLangRequireResource{\CurrentTrackedRegion}% + \fi \else - \InputIfFileExists{regions-\CurrentTrackedLanguage.ldf}% - {}% - {% - \PackageWarning{regions2}{No support for language - `\CurrentTrackedLanguage'}% - }% + \TrackLangRequireResource{\CurrentTrackedLanguage}% \fi - }% - {% - \PackageWarning{regions2}% - {No support for language `\this@dialect'}% - }% + ]% + {regions}{#1}% +} + +\AnyTrackedLanguages +{% + \ForEachTrackedDialect{\this@dialect}{% + \RequireRegionsDialect\this@dialect }% } {% no tracked languages, default already set up diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf Binary files differindex 6eeb399c124..b77f11c9acc 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.tex b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.tex index 533a842e58d..8c6caa71164 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.tex @@ -1,7 +1,8 @@ % arara: pdflatex %\documentclass[USenglish]{article} %\documentclass[canadian]{article} -\documentclass[canadien]{article} +%\documentclass[canadien]{article} +\documentclass{article} \usepackage{regions} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf Binary files differnew file mode 100644 index 00000000000..4487046f64d --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.tex b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.tex new file mode 100644 index 00000000000..6ac72343edd --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.tex @@ -0,0 +1,10 @@ +% arara: pdflatex +\documentclass[manx]{article} + +\usepackage{regions2} + +\begin{document} + +\unitname: \weightunit, \lengthunit, \currencyunit. + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf Binary files differnew file mode 100644 index 00000000000..09df98bfbd3 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.tex b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.tex new file mode 100644 index 00000000000..b32c9eb1305 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.tex @@ -0,0 +1,32 @@ +% arara: pdflatex +\documentclass{article} + +\usepackage{tracklang} + +\TrackLanguageTag{de-US-1996} +\SetTrackedDialectLabelMap{\TrackLangLastTrackedDialect}{ngerman} + +\TrackLanguageTag{en-MT} +\SetTrackedDialectLabelMap{\TrackLangLastTrackedDialect}{british} + +\usepackage[main=ngerman,british]{babel} +\usepackage{regions2} + +\newcommand{\test}[1]{% + \section{#1} + \selectlanguage{#1}% + \SetCurrentTrackedDialect{#1}% + Language tag: \CurrentTrackedLanguageTag. + (tracklang dialect label: \CurrentTrackedDialect.) + + \unitname: \weightunit, \lengthunit, \currencyunit. +} + + +\begin{document} + +\test{ngerman} + +\test{british} + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf Binary files differnew file mode 100644 index 00000000000..610f7cc1fc2 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.tex b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.tex new file mode 100644 index 00000000000..e746f875d5c --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.tex @@ -0,0 +1,29 @@ +% arara: pdflatex +\documentclass{article} + +\usepackage{tracklang} + +\TrackLanguageTag{de-US-1996} +\SetTrackedDialectLabelMap{\TrackLangLastTrackedDialect}{ngerman} + +\TrackLanguageTag{en-MT} + +\usepackage[main=ngerman,english]{babel} +\usepackage{regions2} + +\newcommand{\test}[1]{% + \section{#1} + \selectlanguage{#1}% + \SetCurrentTrackedDialect{#1}% + Language tag: \CurrentTrackedLanguageTag. + (tracklang dialect label: \CurrentTrackedDialect.) + + \unitname: \weightunit, \lengthunit, \currencyunit. +} + +\begin{document} +\test{ngerman} + +\test{english} + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf Binary files differnew file mode 100644 index 00000000000..6852f0604b2 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.tex b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.tex new file mode 100644 index 00000000000..a7ad0336138 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.tex @@ -0,0 +1,23 @@ +% arara: pdflatex +\documentclass[ngermanDE,USenglish]{article} + +\usepackage[main=ngerman]{babel} +\usepackage{regions2} + +\newcommand{\test}[1]{% + \section{#1} + \selectlanguage{#1}% + \SetCurrentTrackedDialect{#1}% + Language: \CurrentTrackedLanguageTag. + + \unitname: \weightunit, \lengthunit, \currencyunit. +} + + + +\begin{document} +\test{USenglish} + +\test{ngerman} + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf Binary files differnew file mode 100644 index 00000000000..3314660bd96 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.tex b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.tex new file mode 100644 index 00000000000..f949bff8f35 --- /dev/null +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.tex @@ -0,0 +1,21 @@ +% arara: pdflatex +\documentclass{article} + +\usepackage[main=ngerman,british]{babel} +\usepackage{regions2} + +\newcommand{\test}[1]{% + \section{#1} + \selectlanguage{#1}% + \SetCurrentTrackedDialect{#1}% + Language: \CurrentTrackedLanguageTag. + + \unitname: \weightunit, \lengthunit, \currencyunit. +} + +\begin{document} +\test{ngerman} + +\test{british} + +\end{document} diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf Binary files differindex d052e8dca8a..98eee51469c 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.tex b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.tex index fbfa8f6dad8..3ffe08c6643 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.tex @@ -4,6 +4,7 @@ \usepackage{regions2} \begin{document} +Language: \languagename. \unitname: \weightunit, \lengthunit, \currencyunit. diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf Binary files differindex f8d71a6463f..6de8d39baf6 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf Binary files differindex 4789d22c0de..6a6db004ec5 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf Binary files differindex decf712af54..3a0112bf2ea 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf Binary files differindex 5aa89bf1ef4..14de7fa936f 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf Binary files differindex 7fea1f5e92e..3cb3d467574 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf Binary files differindex 8a003859cb8..1791b46eca2 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.tex b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.tex index 82c07ab69a9..6f174f4a02a 100644 --- a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.tex +++ b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.tex @@ -1,8 +1,13 @@ % arara: pdftex -\catcode `\@11\relax \input tracklang -\catcode `\@12\relax + +\TrackLangFromEnv % lookup LC_ALL or LANG +Environment query results: +language: \TrackLangEnvLang, +territory: \TrackLangEnvTerritory, +codeset: \TrackLangEnvCodeSet, +modifier: \TrackLangEnvModifier. \TrackPredefinedDialect{british} \TrackPredefinedDialect{american} @@ -10,10 +15,18 @@ \TrackPredefinedDialect{canadien} \TrackPredefinedDialect{belgique} +\TrackLocale{de-NA@new} + +\TrackLocale{manx} + Dialect Regions: \ForEachTrackedDialect{\ThisDialect}{\ThisDialect: - \TrackedIsoCodeFromLanguage{\TwoLetterIsoCountryCode}{\ThisDialect}. } + \TrackedIsoCodeFromLanguage{\TwoLetterIsoCountryCode}{\ThisDialect}% + \IfHasTrackedDialectModifier\ThisDialect + { (\GetTrackedDialectModifier\ThisDialect)}% + {}. +} Language Codes: diff --git a/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf b/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf Binary files differindex 0cc55587406..a86a5271d37 100644 --- a/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf +++ b/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf |