summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-04 21:36:39 +0000
committerKarl Berry <karl@freefriends.org>2016-11-04 21:36:39 +0000
commit5e93f6d5bb5d6bb986f74910796cdc2337304d44 (patch)
tree72c4d81318afb789aa89816dcdb237e62896404c /Master/texmf-dist/tex
parenta878396fa23ebc5b9f51cb5e92e6766433b0f696 (diff)
tracklang (4nov16)
git-svn-id: svn://tug.org/texlive/trunk@42435 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex2
-rw-r--r--Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex2
-rw-r--r--Master/texmf-dist/tex/generic/tracklang/tracklang.tex53
-rw-r--r--Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tracklang/tracklang.sty2
5 files changed, 42 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
index b7691bbe4a7..7b0da76c2fb 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
@@ -63,7 +63,7 @@
\@tracklang@regions@restore@at
\expandafter\endinput
\fi
-\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/10/11 v1.3.2
+\expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{2016/11/03 v1.3.3
(NLCT) Track Languages Regions}%
\def\TrackLangRegionMap#1#2#3{%
\@tracklang@enamedef{@tracklang@region@numtoalphaii@#1}{#2}%
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
index fd1c500fd96..181ce13c6a0 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
@@ -63,7 +63,7 @@
\@tracklang@scripts@restore@at
\expandafter\endinput
\fi
-\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/10/11 v1.3.2
+\expandafter\def\csname ver@tracklang-scripts.tex\endcsname{2016/11/03 v1.3.3
(NLCT) Track Languages Scripts (Generic)}%
\def\TrackLangScriptMap#1#2#3#4#5{%
\@tracklang@enamedef{TrackLangScript#1}{#1}%
diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
index 8b61a93462e..989e33c565a 100644
--- a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
+++ b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
@@ -63,7 +63,7 @@
\@tracklang@restore@at
\expandafter\endinput
\fi
-\expandafter\def\csname ver@tracklang.tex\endcsname{2016/10/11 v1.3.2
+\expandafter\def\csname ver@tracklang.tex\endcsname{2016/11/03 v1.3.3
(NLCT) Track Languages Generic Code}
\long\def\@tracklang@ifundef#1#2#3{%
\ifcsname#1\endcsname
@@ -818,18 +818,38 @@
{-\csname @tracklang@extra@#1\endcsname}%
}
\def\SetCurrentTrackedDialect#1{%
- \edef\CurrentTrackedDialect{\GetTrackedDialectFromMapping{#1}}%
+ \edef\CurrentTrackedDialect{#1}%
\IfTrackedDialect{\CurrentTrackedDialect}%
{}%
{%
- \IfTrackedLanguage{#1}%
+ \IfHookHasMappingFromTrackedDialect{\CurrentTrackedDialect}%
{%
- \edef\@tracklang@dialects{\TrackedDialectsFromLanguage{#1}}%
- \@tracklang@for\@tracklang@dialect:=\@tracklang@dialects\do{%
- \let\CurrentTrackedDialect\@tracklang@dialect
+ \IfTrackedDialect{\GetTrackedDialectFromMapping\CurrentTrackedDialect}%
+ {%
+ \edef\CurrentTrackedDialect{\GetTrackedDialectFromMapping
+ {\CurrentTrackedDialect}}%
+ }%
+ {%
+ \IfTrackedLanguage{#1}%
+ {%
+ \edef\@tracklang@dialects{\TrackedDialectsFromLanguage{#1}}%
+ \@tracklang@for\@tracklang@dialect:=\@tracklang@dialects\do{%
+ \let\CurrentTrackedDialect\@tracklang@dialect
+ }%
+ }%
+ {}%
}%
}%
- {}%
+ {%
+ \IfTrackedLanguage{#1}%
+ {%
+ \edef\@tracklang@dialects{\TrackedDialectsFromLanguage{#1}}%
+ \@tracklang@for\@tracklang@dialect:=\@tracklang@dialects\do{%
+ \let\CurrentTrackedDialect\@tracklang@dialect
+ }%
+ }%
+ {}%
+ }%
}%
\IfTrackedDialect{\CurrentTrackedDialect}%
{%
@@ -2229,7 +2249,7 @@
\IfTrackedDialectHasMapping{\CurrentTrackedDialect}%
{%
\edef\@tracklang@tmp{%
- \csname @tracklang@dialectmap@to@\CurrentTrackedDialect\endcsname}%
+ \csname @tracklang@dialectmap@tohook@\CurrentTrackedDialect\endcsname}%
\@tracklang@ifundef{#2\@tracklang@tmp}%
{%
\@tracklang@ifundef{#2\CurrentTrackedLanguage}%
@@ -2265,19 +2285,22 @@
}
\def\TrackLangAddToCaptions#1{\TrackLangAddToHook{#1}{captions}}
\def\SetTrackedDialectLabelMap#1#2{%
- \@tracklang@enamedef{@tracklang@dialectmap@to@#1}{#2}%
- \@tracklang@enamedef{@tracklang@dialectmap@from@#2}{#1}%
+ \@tracklang@enamedef{@tracklang@dialectmap@tohook@#1}{#2}%
+ \@tracklang@enamedef{@tracklang@dialectmap@fromhook@#2}{#1}%
}
\def\IfTrackedDialectHasMapping#1#2#3{%
- \@tracklang@ifundef{@tracklang@dialectmap@to@#1}{#3}{#2}%
+ \@tracklang@ifundef{@tracklang@dialectmap@tohook@#1}{#3}{#2}%
+}
+\def\IfHookHasMappingFromTrackedDialect#1#2#3{%
+ \@tracklang@ifundef{@tracklang@dialectmap@fromhook@#1}{#3}{#2}%
}
\def\GetTrackedDialectToMapping#1{%
- \@tracklang@ifundef{@tracklang@dialectmap@to@#1}{#1}%
- {\csname @tracklang@dialectmap@to@#1\endcsname}%
+ \@tracklang@ifundef{@tracklang@dialectmap@tohook@#1}{#1}%
+ {\csname @tracklang@dialectmap@tohook@#1\endcsname}%
}
\def\GetTrackedDialectFromMapping#1{%
- \@tracklang@ifundef{@tracklang@dialectmap@from@#1}{#1}%
- {\csname @tracklang@dialectmap@from@#1\endcsname}%
+ \@tracklang@ifundef{@tracklang@dialectmap@fromhook@#1}{#1}%
+ {\csname @tracklang@dialectmap@fromhook@#1\endcsname}%
}
\def\TrackLangRequireResource{\noop@TrackLangRequireResource}
\def\noop@TrackLangRequireResource#1{%
diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
index 7bfb31cc4a1..5f01915e890 100644
--- a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
+++ b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
@@ -51,7 +51,7 @@
%% do code now to initialise
%% Pass all options to tracklang:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang-scripts}[2016/10/11 v1.3.2 (NLCT) Track
+\ProvidesPackage{tracklang-scripts}[2016/11/03 v1.3.3 (NLCT) Track
Language Scripts (LaTeX)]
\RequirePackage{tracklang}
\input{tracklang-scripts}
diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
index 69a0dfc99ce..a16ad3bcc0d 100644
--- a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
+++ b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
@@ -51,7 +51,7 @@
%% do code now to initialise
%% Pass all options to tracklang:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2016/10/11 v1.3.2 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2016/11/03 v1.3.3 (NLCT) Track Languages]
\providecommand*{\@tracklang@declareoption}[1]{%
\DeclareOption{#1}{\TrackPredefinedDialect{#1}}%
}