From cf33605f6174a20f9879464a82a79702f2e7241e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 30 Jun 2020 21:28:11 +0000 Subject: tracklang (30jun20) git-svn-id: svn://tug.org/texlive/trunk@55707 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/tracklang/CHANGES | 8 +++ Master/texmf-dist/doc/generic/tracklang/README | 27 ++++---- .../samples/animals/sample-animals-babel.pdf | Bin 14843 -> 14855 bytes .../samples/animals/sample-animals-de-poly.pdf | Bin 3821 -> 3820 bytes .../samples/animals/sample-animals-de.pdf | Bin 13613 -> 13625 bytes .../samples/animals/sample-animals-poly.pdf | Bin 3556 -> 3556 bytes .../samples/animals/sample-animals-sr-poly.pdf | Bin 0 -> 7547 bytes .../tracklang/samples/animals/sample-animals.pdf | Bin 12644 -> 12656 bytes .../samples/animals/sample-animals2-de.pdf | Bin 13613 -> 13625 bytes .../samples/animals/sample-animals2-de2.pdf | Bin 13613 -> 13625 bytes .../samples/animals/sample-animals2-de3.pdf | Bin 13595 -> 13607 bytes .../samples/animals/sample-animals2-de4.pdf | Bin 3817 -> 3820 bytes .../samples/animals/sample-animals2-poly.pdf | Bin 3556 -> 3560 bytes .../tracklang/samples/animals/sample-animals2.pdf | Bin 12644 -> 12656 bytes .../tracklang/samples/regions/sample-regions.pdf | Bin 13148 -> 13161 bytes .../samples/regions/sample-regions2-manx.pdf | Bin 19773 -> 21945 bytes .../samples/regions/sample-regions2-map.pdf | Bin 25988 -> 26000 bytes .../samples/regions/sample-regions2-map2.pdf | Bin 25840 -> 25852 bytes .../samples/regions/sample-regions2-map3.pdf | Bin 24912 -> 24924 bytes .../samples/regions/sample-regions2-nomap.pdf | Bin 25456 -> 25468 bytes .../tracklang/samples/regions/sample-regions2.pdf | Bin 14704 -> 14716 bytes .../generic/tracklang/samples/sample-tracklang.pdf | Bin 19540 -> 19552 bytes .../tracklang/samples/sample-tracklang2.pdf | Bin 19790 -> 19802 bytes .../tracklang/samples/sample-tracklang3.pdf | Bin 19802 -> 19814 bytes .../tracklang/samples/sample-tracklang4.pdf | Bin 6198 -> 6202 bytes .../tracklang/samples/sample-tracklang5.pdf | Bin 16902 -> 16914 bytes .../tracklang/samples/sample-tracklang6.pdf | Bin 19885 -> 19897 bytes .../texmf-dist/doc/generic/tracklang/tracklang.pdf | Bin 738081 -> 742279 bytes .../source/latex/tracklang/tracklang.dtx | 69 +++++++++++++++------ .../source/latex/tracklang/tracklang.ins | 4 +- .../generic/tracklang/tracklang-region-codes.tex | 4 +- .../tex/generic/tracklang/tracklang-scripts.tex | 4 +- .../texmf-dist/tex/generic/tracklang/tracklang.tex | 37 ++++++++--- .../tex/latex/tracklang/tracklang-scripts.sty | 4 +- .../texmf-dist/tex/latex/tracklang/tracklang.sty | 4 +- 35 files changed, 113 insertions(+), 48 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-sr-poly.pdf (limited to 'Master') diff --git a/Master/texmf-dist/doc/generic/tracklang/CHANGES b/Master/texmf-dist/doc/generic/tracklang/CHANGES index 452a7d0727d..8725ee915d7 100644 --- a/Master/texmf-dist/doc/generic/tracklang/CHANGES +++ b/Master/texmf-dist/doc/generic/tracklang/CHANGES @@ -1,3 +1,11 @@ +v1.5 (2020-06-30): + + * Removed redundant code and added debug message to + \TrackLangAddToHook and \TrackLangRedefHook + + * Bug fix: removed spurious {\fi} from \@tracklang@test@if@file@exists@for@langII + https://www.dickimaw-books.com/bugtracker.php?action=view&key=165 + v1.4 (2019-11-30): * tracklang.tex: diff --git a/Master/texmf-dist/doc/generic/tracklang/README b/Master/texmf-dist/doc/generic/tracklang/README index b3e7de27b16..caac438bc4d 100644 --- a/Master/texmf-dist/doc/generic/tracklang/README +++ b/Master/texmf-dist/doc/generic/tracklang/README @@ -1,14 +1,17 @@ -Generic TeX Bundle : tracklang v1.4 +Generic TeX Bundle : tracklang v1.5 -Last Modified : 2019-11-30 +Last Modified : 2020-06-30 -Author : Nicola Talbot +Author : Nicola Talbot (dickimaw-books.com/contact) -LaTeX usage: \usepackage{tracklang} +Licence: -TeX usage: \input tracklang +This material is subject to the LaTeX Project Public License. +See http://www.ctan.org/license/lppl1.3 for the details of that license. -LaTeX code is in tracklang.sty. Generic TeX code is in tracklang.tex. +Copyright 2014-2020 Nicola Talbot + +Description: The tracklang package is provided for package developers who want a simple interface to find out which languages the user has requested @@ -16,12 +19,12 @@ through packages such as babel and polyglossia. *This package doesn't provide any translations.* Its purpose is simply to track which languages have been requested by the user. -Related article: "Localisation of TeX documents: tracklang." -TUGBoat, Volume 37 (2016), No. 3. -http://www.tug.org/TUGboat/tb37-3/tb117talbot.pdf +LaTeX usage: \usepackage{tracklang} -This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/license/lppl1.3 for the details of that license. +TeX usage: \input tracklang -http://www.dickimaw-books.com/ +LaTeX code is in tracklang.sty. Generic TeX code is in tracklang.tex. +Related article: "Localisation of TeX documents: tracklang." +TUGBoat, Volume 37 (2016), No. 3. +http://www.tug.org/TUGboat/tb37-3/tb117talbot.pdf 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 index 2485ee53c7f..35cb1263859 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf differ 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 index 88669915f9d..73ce65645d5 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf index 07962fd91a5..6ee9ea4efaa 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf differ 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 index 476f2f418da..19144645ce2 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-sr-poly.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-sr-poly.pdf new file mode 100644 index 00000000000..7e746cba6ac Binary files /dev/null and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-sr-poly.pdf differ 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 3ec9a8145cc..89632f165a1 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf index a509e008666..5f22dca624a 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf differ 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 index c6a6e94de9e..b2277b8b985 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf index 09f9b2eb4d5..069a48e10ce 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf differ 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 index 271acfcba43..ce6a514e5c0 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf differ 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 index 5f1807767c3..8809c66b85e 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf differ 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 8ef941783ad..fbd7a234d66 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf differ 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 index 78c1c87385f..fab8f6977ba 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf differ 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 index 83340a0ce7b..93f3428fb3e 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf differ 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 index 635f2c1f798..db876967341 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf differ 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 index e664c008771..4784228ed83 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf differ 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 index aac08c391da..90546af2b0c 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf differ 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 index df2d0bc468d..167a38fcf7c 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf differ 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 index 0b26023e241..d7393715ff9 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf index aca2dd6c84d..6d5a7dbf532 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf index ef391b99123..d2f16a3e3e6 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf index fa54737ec55..8966ec23fa3 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf index ec3ffb3d4d6..b65563f2fdf 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf index 48c0ad786bb..3446d96ec53 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf index 037e2dade1b..1f3cce82ecb 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf and b/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf differ diff --git a/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf b/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf index 8f0aeee5fcb..a498800ab0c 100644 Binary files a/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf and b/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf differ diff --git a/Master/texmf-dist/source/latex/tracklang/tracklang.dtx b/Master/texmf-dist/source/latex/tracklang/tracklang.dtx index e071563fe3e..22dd36860ef 100644 --- a/Master/texmf-dist/source/latex/tracklang/tracklang.dtx +++ b/Master/texmf-dist/source/latex/tracklang/tracklang.dtx @@ -1,16 +1,16 @@ %\iffalse % tracklang.dtx generated using makedtx version 1.2 (c) Nicola Talbot % Command line args: -% -doc "tracklang-manual.tex" -% -author "Nicola Talbot" % -src "tracklang.sty\Z=>tracklang.sty" % -src "tracklang.tex\Z=>tracklang.tex" % -src "tracklang-region-codes.tex\Z=>tracklang-region-codes.tex" % -src "tracklang-scripts.sty\Z=>tracklang-scripts.sty" % -src "tracklang-scripts.tex\Z=>tracklang-scripts.tex" +% -author "Nicola Talbot" +% -doc "tracklang-manual.tex" % -section "chapter" % tracklang -% Created on 2019/12/1 17:41 +% Created on 2020/6/30 11:55 %\fi %\iffalse %<*package> @@ -33,7 +33,7 @@ %\fi % \iffalse % Doc-Source file to use with LaTeX2e -% Copyright (C) 2019 Nicola Talbot, all rights reserved. +% Copyright (C) 2020 Nicola Talbot, all rights reserved. % \fi % \iffalse %<*driver> @@ -59,7 +59,7 @@ pdfauthor={Nicola L.C. Talbot}, pdftitle={tracklang: tracking language options}]{hyperref} -\CheckSum{6156} +\CheckSum{6210} \appto\MacroFont{\scriptsize} \renewcommand*{\usage}[1]{\textit{\hyperpage{#1}}} @@ -278,11 +278,11 @@ and~\ref{tab:nonisoopts}} % %\MakeShortVerb{"} % -%\title{tracklang v1.4: +%\title{tracklang v1.5: %tracking language options} %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}} % -%\date{2019-11-30} +%\date{2020-06-30} %\maketitle % %\begin{abstract} @@ -3583,7 +3583,7 @@ and~\ref{tab:nonisoopts}} % packages such as \styfmt{etoolbox}. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang}[2019/11/30 v1.4 (NLCT) Track Languages] +\ProvidesPackage{tracklang}[2020/06/30 v1.5 (NLCT) Track Languages] % \end{macrocode} %\begin{macro}{\@tracklang@declareoption} % Set up package options. @@ -3879,7 +3879,7 @@ and~\ref{tab:nonisoopts}} % Version info. % \begin{macrocode} \expandafter\def\csname ver@tracklang.tex\endcsname{% - 2019/11/30 v1.4 (NLCT) Track Languages Generic Code} + 2020/06/30 v1.5 (NLCT) Track Languages Generic Code} % \end{macrocode} % Define a long command for determining the existence of a control % sequence by its name. (\cs{relax} is considered undefined.) @@ -11374,9 +11374,9 @@ and~\ref{tab:nonisoopts}} }% \fi }% - {% - \fi - }% +% \end{macrocode} +%\changes{1.5}{2020-06-30}{removed spurious code block} +% \begin{macrocode} }% {% \let\@tracklang@test@if@file@exists@next\@tracklang@test@if@file@exists@for@langIII @@ -11597,16 +11597,19 @@ and~\ref{tab:nonisoopts}} % %\begin{macro}{\IfTrackedLanguageFileExists@orig} %\changes{1.4}{2019-11-30}{new} +%\changes{1.5}{2020-06-30}{added verbose messages} %The new definition of \cs{IfTrackedLanguageFileExists} has a %different order of priority. If the original behaviour is %specifically required, this has the pre version 1.4 definition. % \begin{macrocode} \long\def\IfTrackedLanguageFileExists@orig#1#2#3#4#5{% + \@tracklang@verbose{Finding file for dialect `#1' (pre-v1.4)}% \def\CurrentTrackedTag{}% \SetCurrentTrackedDialect{#1}% \IfTrackedDialect{#1}% {% \edef\CurrentTrackedTag{#1}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% @@ -11618,6 +11621,7 @@ and~\ref{tab:nonisoopts}} {639-1}{\CurrentTrackedLanguage}}% \ifx\CurrentTrackedRegion\empty \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4} {% @@ -11628,21 +11632,25 @@ and~\ref{tab:nonisoopts}} \TrackedIsoCodeFromLanguage {639-2}{\CurrentTrackedLanguage}}% \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% \else \edef\CurrentTrackedTag{% \CurrentTrackedIsoCode-\CurrentTrackedRegion}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4} {% @@ -11655,25 +11663,30 @@ and~\ref{tab:nonisoopts}} {639-2}{\CurrentTrackedLanguage}}% \edef\CurrentTrackedTag{% \CurrentTrackedIsoCode-\CurrentTrackedRegion}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\org@currenttrackedisocode \let\org@currenttrackedisocode\CurrentTrackedIsoCode \let\CurrentTrackedIsoCode\CurrentTrackedTag + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4} {% \let\CurrentTrackedIsoCode\org@currenttrackedisocode \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% @@ -11682,14 +11695,17 @@ and~\ref{tab:nonisoopts}} }% {% \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% @@ -11720,40 +11736,49 @@ and~\ref{tab:nonisoopts}} \ifx\CurrentTrackedIsoCode\empty \ifx\CurrentTrackedRegion\empty \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% \else \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% \fi \else \ifx\CurrentTrackedRegion\empty \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% \else \edef\CurrentTrackedTag{% \CurrentTrackedIsoCode-\CurrentTrackedRegion}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% @@ -11890,9 +11915,11 @@ and~\ref{tab:nonisoopts}} \@tracklang@ifundef{#2\CurrentTrackedLanguage}% {% % \end{macrocode} -% No captions hook. Do the code now. +% No captions hook. Do nothing (it's possible no language package +% has been loaded). +%\changes{1.5}{2020-06-30}{removed redundant code and added verbose message} % \begin{macrocode} - #1% + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@addtohook{#2}{\CurrentTrackedLanguage}{#1}% @@ -11911,6 +11938,7 @@ and~\ref{tab:nonisoopts}} % \end{macrocode} % No captions hook. % \begin{macrocode} + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@addtohook{#2}{\CurrentTrackedLanguage}{#1}% @@ -12001,9 +12029,11 @@ and~\ref{tab:nonisoopts}} \@tracklang@ifundef{#2\CurrentTrackedLanguage}% {% % \end{macrocode} -% No captions hook. Do the code now. +% No captions hook. Do nothing (it's possible no language package +% has been loaded). +%\changes{1.5}{2020-06-30}{removed redundant code and added verbose message} % \begin{macrocode} - #1% + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@redefhook{#2}{\CurrentTrackedLanguage}{#1}% @@ -12022,6 +12052,7 @@ and~\ref{tab:nonisoopts}} % \end{macrocode} % No captions hook. % \begin{macrocode} + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@redefhook{#2}{\CurrentTrackedLanguage}{#1}% @@ -12406,7 +12437,7 @@ and~\ref{tab:nonisoopts}} % Version info. % \begin{macrocode} \expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{% - 2019/11/30 v1.4 (NLCT) Track Languages Regions}% + 2020/06/30 v1.5 (NLCT) Track Languages Regions}% % \end{macrocode} % %\begin{macro}{\TrackLangRegionMap} @@ -12799,7 +12830,7 @@ and~\ref{tab:nonisoopts}} %\changes{1.3}{2016-10-07}{added tracklang-scripts.sty} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang-scripts}[2019/11/30 v1.4 (NLCT) Track +\ProvidesPackage{tracklang-scripts}[2020/06/30 v1.5 (NLCT) Track Language Scripts (LaTeX)] \RequirePackage{tracklang} \input{tracklang-scripts} @@ -12841,7 +12872,7 @@ Language Scripts (LaTeX)] % Version info. % \begin{macrocode} \expandafter\def\csname ver@tracklang-scripts.tex\endcsname{% - 2019/11/30 v1.4 (NLCT) Track Languages Scripts (Generic)}% + 2020/06/30 v1.5 (NLCT) Track Languages Scripts (Generic)}% % \end{macrocode} % %\begin{macro}{\TrackLangScriptsMap} diff --git a/Master/texmf-dist/source/latex/tracklang/tracklang.ins b/Master/texmf-dist/source/latex/tracklang/tracklang.ins index 019b391cd1f..4b7bca1dded 100644 --- a/Master/texmf-dist/source/latex/tracklang/tracklang.ins +++ b/Master/texmf-dist/source/latex/tracklang/tracklang.ins @@ -1,10 +1,10 @@ -% tracklang.ins generated using makedtx version 1.2 2019/12/1 17:41 +% tracklang.ins generated using makedtx version 1.2 2020/6/30 11:55 \input docstrip \preamble tracklang.dtx - Copyright 2019 Nicola Talbot + Copyright 2020 Nicola Talbot 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/generic/tracklang/tracklang-region-codes.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex index ceb4dbc9ab4..410dc7182ff 100644 --- a/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex +++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex @@ -7,7 +7,7 @@ %% tracklang.dtx (with options: `tracklang-region-codes.tex,package') %% %% tracklang.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -64,7 +64,7 @@ \expandafter\endinput \fi \expandafter\def\csname ver@tracklang-region-codes.tex\endcsname{% - 2019/11/30 v1.4 (NLCT) Track Languages Regions}% + 2020/06/30 v1.5 (NLCT) Track Languages Regions}% \def\TrackLangRegionMap#1#2#3{% \@tracklang@enamedef{@tracklang@region@numtoalphaii@#1}{#2}% \@tracklang@enamedef{@tracklang@region@numtoalphaiii@#1}{#3}% diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex index bd9e454eb83..4b672af05d5 100644 --- a/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex +++ b/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex @@ -7,7 +7,7 @@ %% tracklang.dtx (with options: `tracklang-scripts.tex,package') %% %% tracklang.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -64,7 +64,7 @@ \expandafter\endinput \fi \expandafter\def\csname ver@tracklang-scripts.tex\endcsname{% - 2019/11/30 v1.4 (NLCT) Track Languages Scripts (Generic)}% + 2020/06/30 v1.5 (NLCT) Track Languages Scripts (Generic)}% \def\TrackLangScriptMap#1#2#3#4#5{% \@tracklang@enamedef{TrackLangScript#1}{#1}% \@tracklang@enamedef{@tracklang@script@numtoalpha@#2}{#1}% diff --git a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex index edac76e31be..5198d0b8e6b 100644 --- a/Master/texmf-dist/tex/generic/tracklang/tracklang.tex +++ b/Master/texmf-dist/tex/generic/tracklang/tracklang.tex @@ -7,7 +7,7 @@ %% tracklang.dtx (with options: `tracklang.tex,package') %% %% tracklang.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -64,7 +64,7 @@ \expandafter\endinput \fi \expandafter\def\csname ver@tracklang.tex\endcsname{% - 2019/11/30 v1.4 (NLCT) Track Languages Generic Code} + 2020/06/30 v1.5 (NLCT) Track Languages Generic Code} \long\def\@tracklang@ifundef#1#2#3{% \ifcsname#1\endcsname \expandafter\ifx\csname #1\endcsname\relax @@ -3288,9 +3288,6 @@ }% \fi }% - {% - \fi - }% }% {% \let\@tracklang@test@if@file@exists@next\@tracklang@test@if@file@exists@for@langIII @@ -3458,11 +3455,13 @@ {}% } \long\def\IfTrackedLanguageFileExists@orig#1#2#3#4#5{% + \@tracklang@verbose{Finding file for dialect `#1' (pre-v1.4)}% \def\CurrentTrackedTag{}% \SetCurrentTrackedDialect{#1}% \IfTrackedDialect{#1}% {% \edef\CurrentTrackedTag{#1}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% @@ -3474,6 +3473,7 @@ {639-1}{\CurrentTrackedLanguage}}% \ifx\CurrentTrackedRegion\empty \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4} {% @@ -3484,21 +3484,25 @@ \TrackedIsoCodeFromLanguage {639-2}{\CurrentTrackedLanguage}}% \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% \else \edef\CurrentTrackedTag{% \CurrentTrackedIsoCode-\CurrentTrackedRegion}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4} {% @@ -3511,25 +3515,30 @@ {639-2}{\CurrentTrackedLanguage}}% \edef\CurrentTrackedTag{% \CurrentTrackedIsoCode-\CurrentTrackedRegion}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\org@currenttrackedisocode \let\org@currenttrackedisocode\CurrentTrackedIsoCode \let\CurrentTrackedIsoCode\CurrentTrackedTag + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4} {% \let\CurrentTrackedIsoCode\org@currenttrackedisocode \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% @@ -3538,14 +3547,17 @@ }% {% \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% @@ -3576,40 +3588,49 @@ \ifx\CurrentTrackedIsoCode\empty \ifx\CurrentTrackedRegion\empty \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% \else \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% \fi \else \ifx\CurrentTrackedRegion\empty \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% \else \edef\CurrentTrackedTag{% \CurrentTrackedIsoCode-\CurrentTrackedRegion}% + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedIsoCode + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedRegion + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}% {#4}% {% \let\CurrentTrackedTag\CurrentTrackedLanguage + \@tracklang@verbose{Testing tag `\CurrentTrackedTag'}% \@tracklang@IfFileExists{#2\CurrentTrackedTag#3}{#4}{#5}% }% }% @@ -3678,7 +3699,7 @@ {% \@tracklang@ifundef{#2\CurrentTrackedLanguage}% {% - #1% + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@addtohook{#2}{\CurrentTrackedLanguage}{#1}% @@ -3691,6 +3712,7 @@ {% \@tracklang@ifundef{#2\CurrentTrackedLanguage}% {% + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@addtohook{#2}{\CurrentTrackedLanguage}{#1}% @@ -3724,7 +3746,7 @@ {% \@tracklang@ifundef{#2\CurrentTrackedLanguage}% {% - #1% + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@redefhook{#2}{\CurrentTrackedLanguage}{#1}% @@ -3737,6 +3759,7 @@ {% \@tracklang@ifundef{#2\CurrentTrackedLanguage}% {% + \@tracklang@verbose{no hook found for \CurrentTrackedDialect}% }% {% \@tracklang@redefhook{#2}{\CurrentTrackedLanguage}{#1}% diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty index 63bbe797e9c..ca265e138c8 100644 --- a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty +++ b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty @@ -7,7 +7,7 @@ %% tracklang.dtx (with options: `tracklang-scripts.sty,package') %% %% tracklang.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -51,7 +51,7 @@ %% do code now to initialise %% Pass all options to tracklang: \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang-scripts}[2019/11/30 v1.4 (NLCT) Track +\ProvidesPackage{tracklang-scripts}[2020/06/30 v1.5 (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 91a9b7a31f5..1719390e199 100644 --- a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty +++ b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty @@ -7,7 +7,7 @@ %% tracklang.dtx (with options: `tracklang.sty,package') %% %% tracklang.dtx -%% Copyright 2019 Nicola Talbot +%% Copyright 2020 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -51,7 +51,7 @@ %% do code now to initialise %% Pass all options to tracklang: \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang}[2019/11/30 v1.4 (NLCT) Track Languages] +\ProvidesPackage{tracklang}[2020/06/30 v1.5 (NLCT) Track Languages] \providecommand*{\@tracklang@declareoption}[1]{% \DeclareOption{#1}{\TrackPredefinedDialect{#1}}% } -- cgit v1.2.3