texlive[52736] Master/texmf-dist: tracklang (11nov19)
commits+karl at tug.org
commits+karl at tug.org
Mon Nov 11 22:43:16 CET 2019
Revision: 52736
http://tug.org/svn/texlive?view=revision&revision=52736
Author: karl
Date: 2019-11-11 22:43:15 +0100 (Mon, 11 Nov 2019)
Log Message:
-----------
tracklang (11nov19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/tracklang/CHANGES
trunk/Master/texmf-dist/doc/generic/tracklang/README
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf
trunk/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf
trunk/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
trunk/Master/texmf-dist/source/latex/tracklang/tracklang.ins
trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
trunk/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
trunk/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
trunk/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/generic/tracklang/CHANGES 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/doc/generic/tracklang/CHANGES 2019-11-11 21:43:15 UTC (rev 52736)
@@ -1,3 +1,9 @@
+v1.3.9 (2019-11-11):
+
+ * tracklang.tex:
+
+ - added \TrackIfKnownLanguage
+
v1.3.8 (2019-10-06):
* tracklang.tex:
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/tracklang/README 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/doc/generic/tracklang/README 2019-11-11 21:43:15 UTC (rev 52736)
@@ -1,6 +1,6 @@
-Generic TeX Bundle : tracklang v1.3.8
+Generic TeX Bundle : tracklang v1.3.9
-Last Modified : 2019-10-06
+Last Modified : 2019-11-11
Author : Nicola Talbot
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/animals/sample-animals2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/regions/sample-regions2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang2.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang3.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang4.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang5.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/samples/sample-tracklang6.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/tracklang/tracklang.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/tracklang/tracklang.dtx 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/source/latex/tracklang/tracklang.dtx 2019-11-11 21:43:15 UTC (rev 52736)
@@ -2,8 +2,8 @@
% tracklang.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
% -section "chapter"
+% -author "Nicola Talbot"
% -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"
@@ -10,7 +10,7 @@
% -src "tracklang-scripts.sty\Z=>tracklang-scripts.sty"
% -src "tracklang-scripts.tex\Z=>tracklang-scripts.tex"
% tracklang
-% Created on 2019/10/6 15:08
+% Created on 2019/11/11 16:00
%\fi
%\iffalse
%<*package>
@@ -59,7 +59,7 @@
pdfauthor={Nicola L.C. Talbot},
pdftitle={tracklang: tracking language options}]{hyperref}
-\CheckSum{3965}
+\CheckSum{3986}
\appto\MacroFont{\scriptsize}
\renewcommand*{\usage}[1]{\textit{\hyperpage{#1}}}
@@ -278,11 +278,11 @@
%
%\MakeShortVerb{"}
%
-%\title{tracklang v1.3.8:
+%\title{tracklang v1.3.9:
%tracking language options}
%\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}}
%
-%\date{2019-10-06}
+%\date{2019-11-11}
%\maketitle
%
%\begin{abstract}
@@ -936,11 +936,45 @@
%label. (Irregular grandfather tags aren't recognised.)
%This command will fully expand \meta{tag}.
%A warning is issued if the tag is empty.
+%
+%If you want to first check that \meta{tag} includes a valid language
+%code, then you can instead use:
+%\begin{definition}[\DescribeMacro\TrackIfKnownLanguage]
+%\cs{TrackIfKnownLanguage}\marg{tag}\marg{success code}\marg{fail code}
+%\end{definition}
+%This will only track \meta{tag} (and then do \meta{success code}) if
+%\meta{tag} starts with a valid language code (or is a predefined
+%dialect) otherwise it will do \meta{fail code}. Both
+%\cs{TrackLanguageTag} and \cs{TrackIfKnownLanguage} will check if
+%\meta{tag} is a predefined option. (This saves parsing the tag if
+%it's recognised.)
+%
%For example:
%\begin{verbatim}
%\TrackLanguageTag{hy-Latn-IT-arevela}
+%Latn-ME: \TrackIfKnownLanguage{Latn-ME}{success}{fail}.
+%brazilian: \TrackIfKnownLanguage{brazilian}{success}{fail}.
%\end{verbatim}
+%This will track hy-Latn-IT-arevela and brazilian (pt-BR) but not
+%Latn-ME (because it doesn't contain a valid language code) even
+%though it's a valid script and country code. The above is just for
+%illustrative purposes. Typically the language tracking isn't
+%performed within the document text.
%
+%The \sty{datetime2} package assumes that any unknown package option is a
+%language identifier. It could simply do:
+%\begin{verbatim}
+%\TrackLanguageTag{\CurrentOption}
+%\end{verbatim}
+%but users can make mistakes sometimes and this won't provide any
+%helpful information if they, for example, misspelt a package option
+%or forgot the ``\meta{key}='' part of a \meta{key}=\meta{value}
+%setting. Instead (as from v1.5.5) it does:
+%\begin{verbatim}
+%\TrackIfKnownLanguage{\CurrentOption}{...}{\PackageError{...}{...}{...}}
+%\end{verbatim}
+%This will now give the user some guidance.
+%
%If \meta{tag} contains a sub-language tag, this will be set
%as the 639-3 code for the \emph{dialect} label. Note that this is
%different to the root language codes which are set using the
@@ -957,8 +991,7 @@
%ISO 639-3: \TrackedIsoCodeFromLanguage{639-3}{zhcmnHansCN}.
%\end{verbatim}
%
-%Version 1.2 (currently pending) of
-%\sty{texosquery} will have a new command \ics{TeXOSQueryLangTag},
+%Version 1.2 of \sty{texosquery} provides the command \ics{TeXOSQueryLangTag},
%which may be used to fetch the operating system's regional
%information as a language tag. These commands can be used as
%follows:
@@ -3264,7 +3297,7 @@
% packages such as \styfmt{etoolbox}.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2019/10/06 v1.3.8 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2019/11/11 v1.3.9 (NLCT) Track Languages]
% \end{macrocode}
%\begin{macro}{\@tracklang at declareoption}
% Set up package options.
@@ -3560,7 +3593,7 @@
% Version info.
% \begin{macrocode}
\expandafter\def\csname ver at tracklang.tex\endcsname{%
- 2019/10/06 v1.3.8 (NLCT) Track Languages Generic Code}
+ 2019/11/11 v1.3.9 (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.)
@@ -5959,6 +5992,57 @@
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\TrackIfKnownLanguage}
+%\begin{definition}
+%\cs{TrackIfKnownLanguage}\marg{tag}\meta{success code}\marg{fail code}
+%\end{definition}
+%Like \cs{TrackLanguageTag} but does \meta{fail code} if the tag
+%doesn't contain a valid language code. If successful, does
+%\meta{success code} after tracking the language.
+%\changes{1.3.9}{2019-11-11}{new}
+% \begin{macrocode}
+\def\TrackIfKnownLanguage#1#2#3{%
+ \edef\@tracklang at tag{#1}%
+ \ifx\@tracklang at tag\empty
+ #3%
+ \else
+ \expandafter\@TrackIfKnownLanguage\expandafter{\@tracklang at tag}{#2}{#3}%
+ \fi
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@TrackIfKnownLanguage}
+%Argument must be expanded.
+%\changes{1.3.9}{2019-11-11}{new}
+% \begin{macrocode}
+\def\@TrackIfKnownLanguage#1#2#3{%
+% \end{macrocode}
+%First check if it's predefined.
+% \begin{macrocode}
+ \@tracklang at ifundef{@tracklang at add@#1}%
+ {%
+% \end{macrocode}
+%Parse language tag.
+% \begin{macrocode}
+ \@tracklang at parselangtag{#1}%
+% \end{macrocode}
+%Track this information if \cs{@TrackLangEnvLang} is a known ISO
+%language code.
+% \begin{macrocode}
+ \TrackLangIfKnownLangFromIso{\@TrackLangEnvLang}%
+ {\@tracklang at track@locale#2}{#3}%
+ }%
+ {%
+% \end{macrocode}
+%Predefined tag.
+% \begin{macrocode}
+ \@tracklang at nameuse{@tracklang at add@#1}%
+ #2%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\@tracklang at parse@langtag}
%\changes{1.3}{2016-10-07}{new}
% \begin{macrocode}
@@ -10109,7 +10193,7 @@
% Version info.
% \begin{macrocode}
\expandafter\def\csname ver at tracklang-region-codes.tex\endcsname{%
- 2019/10/06 v1.3.8 (NLCT) Track Languages Regions}%
+ 2019/11/11 v1.3.9 (NLCT) Track Languages Regions}%
% \end{macrocode}
%
%\begin{macro}{\TrackLangRegionMap}
@@ -10498,7 +10582,7 @@
%\changes{1.3}{2016-10-07}{added tracklang-scripts.sty}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang-scripts}[2019/10/06 v1.3.8 (NLCT) Track
+\ProvidesPackage{tracklang-scripts}[2019/11/11 v1.3.9 (NLCT) Track
Language Scripts (LaTeX)]
\RequirePackage{tracklang}
\input{tracklang-scripts}
@@ -10540,7 +10624,7 @@
% Version info.
% \begin{macrocode}
\expandafter\def\csname ver at tracklang-scripts.tex\endcsname{%
- 2019/10/06 v1.3.8 (NLCT) Track Languages Scripts (Generic)}%
+ 2019/11/11 v1.3.9 (NLCT) Track Languages Scripts (Generic)}%
% \end{macrocode}
%
%\begin{macro}{\TrackLangScriptsMap}
Modified: trunk/Master/texmf-dist/source/latex/tracklang/tracklang.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/tracklang/tracklang.ins 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/source/latex/tracklang/tracklang.ins 2019-11-11 21:43:15 UTC (rev 52736)
@@ -1,4 +1,4 @@
-% tracklang.ins generated using makedtx version 1.2 2019/10/6 15:08
+% tracklang.ins generated using makedtx version 1.2 2019/11/11 16:00
\input docstrip
\preamble
Modified: trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-region-codes.tex 2019-11-11 21:43:15 UTC (rev 52736)
@@ -64,7 +64,7 @@
\expandafter\endinput
\fi
\expandafter\def\csname ver at tracklang-region-codes.tex\endcsname{%
- 2019/10/06 v1.3.8 (NLCT) Track Languages Regions}%
+ 2019/11/11 v1.3.9 (NLCT) Track Languages Regions}%
\def\TrackLangRegionMap#1#2#3{%
\@tracklang at enamedef{@tracklang at region@numtoalphaii@#1}{#2}%
\@tracklang at enamedef{@tracklang at region@numtoalphaiii@#1}{#3}%
Modified: trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/tex/generic/tracklang/tracklang-scripts.tex 2019-11-11 21:43:15 UTC (rev 52736)
@@ -64,7 +64,7 @@
\expandafter\endinput
\fi
\expandafter\def\csname ver at tracklang-scripts.tex\endcsname{%
- 2019/10/06 v1.3.8 (NLCT) Track Languages Scripts (Generic)}%
+ 2019/11/11 v1.3.9 (NLCT) Track Languages Scripts (Generic)}%
\def\TrackLangScriptMap#1#2#3#4#5{%
\@tracklang at enamedef{TrackLangScript#1}{#1}%
\@tracklang at enamedef{@tracklang at script@numtoalpha@#2}{#1}%
Modified: trunk/Master/texmf-dist/tex/generic/tracklang/tracklang.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tracklang/tracklang.tex 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/tex/generic/tracklang/tracklang.tex 2019-11-11 21:43:15 UTC (rev 52736)
@@ -64,7 +64,7 @@
\expandafter\endinput
\fi
\expandafter\def\csname ver at tracklang.tex\endcsname{%
- 2019/10/06 v1.3.8 (NLCT) Track Languages Generic Code}
+ 2019/11/11 v1.3.9 (NLCT) Track Languages Generic Code}
\long\def\@tracklang at ifundef#1#2#3{%
\ifcsname#1\endcsname
\expandafter\ifx\csname #1\endcsname\relax
@@ -1273,6 +1273,26 @@
\@tracklang at nameuse{@tracklang at add@#1}%
}%
}
+\def\TrackIfKnownLanguage#1#2#3{%
+ \edef\@tracklang at tag{#1}%
+ \ifx\@tracklang at tag\empty
+ #3%
+ \else
+ \expandafter\@TrackIfKnownLanguage\expandafter{\@tracklang at tag}{#2}{#3}%
+ \fi
+}
+\def\@TrackIfKnownLanguage#1#2#3{%
+ \@tracklang at ifundef{@tracklang at add@#1}%
+ {%
+ \@tracklang at parselangtag{#1}%
+ \TrackLangIfKnownLangFromIso{\@TrackLangEnvLang}%
+ {\@tracklang at track@locale#2}{#3}%
+ }%
+ {%
+ \@tracklang at nameuse{@tracklang at add@#1}%
+ #2%
+ }%
+}
\def\@tracklang at parselangtag#1{%
\def\@TrackLangEnvLang{}%
\def\@TrackLangEnvSubLang{}%
Modified: trunk/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty 2019-11-11 21:43:15 UTC (rev 52736)
@@ -51,7 +51,7 @@
%% do code now to initialise
%% Pass all options to tracklang:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang-scripts}[2019/10/06 v1.3.8 (NLCT) Track
+\ProvidesPackage{tracklang-scripts}[2019/11/11 v1.3.9 (NLCT) Track
Language Scripts (LaTeX)]
\RequirePackage{tracklang}
\input{tracklang-scripts}
Modified: trunk/Master/texmf-dist/tex/latex/tracklang/tracklang.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/tracklang/tracklang.sty 2019-11-11 21:40:23 UTC (rev 52735)
+++ trunk/Master/texmf-dist/tex/latex/tracklang/tracklang.sty 2019-11-11 21:43:15 UTC (rev 52736)
@@ -51,7 +51,7 @@
%% do code now to initialise
%% Pass all options to tracklang:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2019/10/06 v1.3.8 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2019/11/11 v1.3.9 (NLCT) Track Languages]
\providecommand*{\@tracklang at declareoption}[1]{%
\DeclareOption{#1}{\TrackPredefinedDialect{#1}}%
}
More information about the tex-live-commits
mailing list