summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/generic/tracklang/samples/animals
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-08 23:34:41 +0000
committerKarl Berry <karl@freefriends.org>2016-10-08 23:34:41 +0000
commit0e25a365d04f0f281f06e0b65397b61142501b12 (patch)
treefb35ddaf228cb6449f36fd8f07c2beb5f3362e64 /Master/texmf-dist/doc/generic/tracklang/samples/animals
parentafce9e93f3a413b814c2b7f5a79dec2290624335 (diff)
tracklang (8oct16)
git-svn-id: svn://tug.org/texlive/trunk@42235 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/generic/tracklang/samples/animals')
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-GB.ldf8
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-en-US.ldf8
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-english.ldf4
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals-german.ldf9
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals.sty22
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-GB.ldf17
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-en-US.ldf16
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-english.ldf4
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2-german.ldf9
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals2.sty39
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-GB.ldf23
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-en-US.ldf23
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-english.ldf21
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3-german.ldf21
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/animals3.sty41
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdfbin0 -> 14855 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.tex (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.tex)16
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdfbin0 -> 3856 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.tex (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.tex)2
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de.pdf)bin13613 -> 13625 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.tex (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de.tex)2
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdfbin0 -> 3594 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.tex (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.tex)4
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdfbin12485 -> 12656 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.tex9
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de2.pdf)bin13613 -> 13625 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.tex14
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdfbin0 -> 13625 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.tex (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de2.tex)2
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de3.pdf)bin13595 -> 13607 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.tex (renamed from Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de3.tex)2
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdfbin0 -> 3856 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.tex15
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdfbin0 -> 3595 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.tex15
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdfbin12644 -> 12656 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.tex8
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.pdfbin3854 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.pdfbin3592 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.pdfbin12644 -> 0 bytes
40 files changed, 157 insertions, 197 deletions
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
new file mode 100644
index 00000000000..552af54218c
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf
Binary files differ
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
new file mode 100644
index 00000000000..ce04fe77c32
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
Binary files differ
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
index 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
Binary files differ
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
new file mode 100644
index 00000000000..325d787c76c
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf
Binary files differ
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
index 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
Binary files differ
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
index 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
Binary files differ
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
new file mode 100644
index 00000000000..186ee2ed1b7
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf
Binary files differ
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
index 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
Binary files differ
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
new file mode 100644
index 00000000000..9e71298774b
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf
Binary files differ
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
new file mode 100644
index 00000000000..dd88d1544af
--- /dev/null
+++ b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf
Binary files differ
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
index 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
Binary files differ
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
deleted file mode 100644
index 5935d1614f5..00000000000
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-de4.pdf
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 55e0516a1e9..00000000000
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3-poly.pdf
+++ /dev/null
Binary files differ
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
deleted file mode 100644
index 6f402f4f10b..00000000000
--- a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals3.pdf
+++ /dev/null
Binary files differ