summaryrefslogtreecommitdiff
path: root/macros/generic
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-12 03:01:13 +0000
committerNorbert Preining <norbert@preining.info>2019-11-12 03:01:13 +0000
commita6d73b76eb19794e956fe1f3ab1f9bab3915cd7a (patch)
tree26a9e14dec31508c4c4bd3ec69dfccef8c39bad2 /macros/generic
parent0e71c26d9aa79c6e92c3095d6c71f28a566e6054 (diff)
CTAN sync 201911120301
Diffstat (limited to 'macros/generic')
-rw-r--r--macros/generic/tracklang/CHANGES6
-rw-r--r--macros/generic/tracklang/README4
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals-babel.pdfbin14855 -> 14843 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdfbin3820 -> 3817 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals-de.pdfbin13625 -> 13613 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals-poly.pdfbin3559 -> 3555 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals.pdfbin12656 -> 12644 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals2-de.pdfbin13625 -> 13613 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals2-de2.pdfbin13625 -> 13613 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals2-de3.pdfbin13607 -> 13595 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals2-de4.pdfbin3822 -> 3818 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals2-poly.pdfbin3558 -> 3556 bytes
-rw-r--r--macros/generic/tracklang/samples/animals/sample-animals2.pdfbin12656 -> 12644 bytes
-rw-r--r--macros/generic/tracklang/samples/regions/sample-regions.pdfbin13161 -> 13148 bytes
-rw-r--r--macros/generic/tracklang/samples/regions/sample-regions2-manx.pdfbin19785 -> 19773 bytes
-rw-r--r--macros/generic/tracklang/samples/regions/sample-regions2-map.pdfbin26000 -> 25988 bytes
-rw-r--r--macros/generic/tracklang/samples/regions/sample-regions2-map2.pdfbin25852 -> 25840 bytes
-rw-r--r--macros/generic/tracklang/samples/regions/sample-regions2-map3.pdfbin24924 -> 24912 bytes
-rw-r--r--macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdfbin25468 -> 25456 bytes
-rw-r--r--macros/generic/tracklang/samples/regions/sample-regions2.pdfbin14716 -> 14704 bytes
-rw-r--r--macros/generic/tracklang/samples/sample-tracklang.pdfbin19552 -> 19540 bytes
-rw-r--r--macros/generic/tracklang/samples/sample-tracklang2.pdfbin19802 -> 19790 bytes
-rw-r--r--macros/generic/tracklang/samples/sample-tracklang3.pdfbin19814 -> 19802 bytes
-rw-r--r--macros/generic/tracklang/samples/sample-tracklang4.pdfbin6202 -> 6199 bytes
-rw-r--r--macros/generic/tracklang/samples/sample-tracklang5.pdfbin16914 -> 16902 bytes
-rw-r--r--macros/generic/tracklang/samples/sample-tracklang6.pdfbin19897 -> 19885 bytes
-rw-r--r--macros/generic/tracklang/tracklang.dtx108
-rw-r--r--macros/generic/tracklang/tracklang.ins2
-rw-r--r--macros/generic/tracklang/tracklang.pdfbin676481 -> 678702 bytes
29 files changed, 105 insertions, 15 deletions
diff --git a/macros/generic/tracklang/CHANGES b/macros/generic/tracklang/CHANGES
index 416116d3ee..90d299adc3 100644
--- a/macros/generic/tracklang/CHANGES
+++ b/macros/generic/tracklang/CHANGES
@@ -1,3 +1,9 @@
+v1.3.9 (2019-11-11):
+
+ * tracklang.tex:
+
+ - added \TrackIfKnownLanguage
+
v1.3.8 (2019-10-06):
* tracklang.tex:
diff --git a/macros/generic/tracklang/README b/macros/generic/tracklang/README
index bdbfd53bed..6c9b86401c 100644
--- a/macros/generic/tracklang/README
+++ b/macros/generic/tracklang/README
@@ -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
diff --git a/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf b/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf
index 135162fdda..330ff6a026 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals-babel.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf b/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
index b041feba54..509be5eb63 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals-de-poly.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals-de.pdf b/macros/generic/tracklang/samples/animals/sample-animals-de.pdf
index 0fd701147b..d1448c319d 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals-de.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals-de.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf b/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf
index 7c14bbe47f..1075134907 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals-poly.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals.pdf b/macros/generic/tracklang/samples/animals/sample-animals.pdf
index f3b1cc7ba8..c799fb8f3a 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf
index b2d5afa233..07c8bf0ec6 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals2-de.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf
index 40a16a442a..292dcd486f 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals2-de2.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf
index c90e064f31..095c57d130 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals2-de3.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf
index 6ff1942239..86802c70d3 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals2-de4.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf b/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf
index 78d5ec39e0..d0faec29a6 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals2-poly.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/animals/sample-animals2.pdf b/macros/generic/tracklang/samples/animals/sample-animals2.pdf
index f6e3e8525a..bd3e154a86 100644
--- a/macros/generic/tracklang/samples/animals/sample-animals2.pdf
+++ b/macros/generic/tracklang/samples/animals/sample-animals2.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/regions/sample-regions.pdf b/macros/generic/tracklang/samples/regions/sample-regions.pdf
index 2adf3b9d03..693d8b75e9 100644
--- a/macros/generic/tracklang/samples/regions/sample-regions.pdf
+++ b/macros/generic/tracklang/samples/regions/sample-regions.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf
index e3fdc40f47..40eab364f8 100644
--- a/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf
+++ b/macros/generic/tracklang/samples/regions/sample-regions2-manx.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf
index badfd23383..033fec24ce 100644
--- a/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf
+++ b/macros/generic/tracklang/samples/regions/sample-regions2-map.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf
index 6d659b6bc5..85f8f1f150 100644
--- a/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf
+++ b/macros/generic/tracklang/samples/regions/sample-regions2-map2.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf
index 690bbf07de..bbd85ced7b 100644
--- a/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf
+++ b/macros/generic/tracklang/samples/regions/sample-regions2-map3.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf b/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
index 5d9a7c1c5c..46f836a3e3 100644
--- a/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
+++ b/macros/generic/tracklang/samples/regions/sample-regions2-nomap.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/regions/sample-regions2.pdf b/macros/generic/tracklang/samples/regions/sample-regions2.pdf
index a2f66edfa4..6c39680885 100644
--- a/macros/generic/tracklang/samples/regions/sample-regions2.pdf
+++ b/macros/generic/tracklang/samples/regions/sample-regions2.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/sample-tracklang.pdf b/macros/generic/tracklang/samples/sample-tracklang.pdf
index 1f5c6ea8c1..a2c23d601b 100644
--- a/macros/generic/tracklang/samples/sample-tracklang.pdf
+++ b/macros/generic/tracklang/samples/sample-tracklang.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/sample-tracklang2.pdf b/macros/generic/tracklang/samples/sample-tracklang2.pdf
index 258262f906..b8bad2af52 100644
--- a/macros/generic/tracklang/samples/sample-tracklang2.pdf
+++ b/macros/generic/tracklang/samples/sample-tracklang2.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/sample-tracklang3.pdf b/macros/generic/tracklang/samples/sample-tracklang3.pdf
index 2609984b35..61b4f28c70 100644
--- a/macros/generic/tracklang/samples/sample-tracklang3.pdf
+++ b/macros/generic/tracklang/samples/sample-tracklang3.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/sample-tracklang4.pdf b/macros/generic/tracklang/samples/sample-tracklang4.pdf
index 894b62d507..d42a97d715 100644
--- a/macros/generic/tracklang/samples/sample-tracklang4.pdf
+++ b/macros/generic/tracklang/samples/sample-tracklang4.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/sample-tracklang5.pdf b/macros/generic/tracklang/samples/sample-tracklang5.pdf
index 1253e87c1b..8c05bc36f1 100644
--- a/macros/generic/tracklang/samples/sample-tracklang5.pdf
+++ b/macros/generic/tracklang/samples/sample-tracklang5.pdf
Binary files differ
diff --git a/macros/generic/tracklang/samples/sample-tracklang6.pdf b/macros/generic/tracklang/samples/sample-tracklang6.pdf
index e8462de248..47c5c053fd 100644
--- a/macros/generic/tracklang/samples/sample-tracklang6.pdf
+++ b/macros/generic/tracklang/samples/sample-tracklang6.pdf
Binary files differ
diff --git a/macros/generic/tracklang/tracklang.dtx b/macros/generic/tracklang/tracklang.dtx
index b3415f2e22..e7e28decc4 100644
--- a/macros/generic/tracklang/tracklang.dtx
+++ b/macros/generic/tracklang/tracklang.dtx
@@ -2,15 +2,15 @@
% tracklang.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
% -section "chapter"
-% -doc "tracklang-manual.tex"
% -author "Nicola Talbot"
+% -doc "tracklang-manual.tex"
% -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"
% 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 @@ and~\ref{tab:nonisoopts}}
%
%\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,10 +936,44 @@ and~\ref{tab:nonisoopts}}
%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
@@ -957,8 +991,7 @@ and~\ref{tab:nonisoopts}}
%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 @@ and~\ref{tab:nonisoopts}}
% 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@declareoption}
% Set up package options.
@@ -3560,7 +3593,7 @@ and~\ref{tab:nonisoopts}}
% Version info.
% \begin{macrocode}
\expandafter\def\csname ver@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 @@ and~\ref{tab:nonisoopts}}
% \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@tag{#1}%
+ \ifx\@tracklang@tag\empty
+ #3%
+ \else
+ \expandafter\@TrackIfKnownLanguage\expandafter{\@tracklang@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@ifundef{@tracklang@add@#1}%
+ {%
+% \end{macrocode}
+%Parse language tag.
+% \begin{macrocode}
+ \@tracklang@parselangtag{#1}%
+% \end{macrocode}
+%Track this information if \cs{@TrackLangEnvLang} is a known ISO
+%language code.
+% \begin{macrocode}
+ \TrackLangIfKnownLangFromIso{\@TrackLangEnvLang}%
+ {\@tracklang@track@locale#2}{#3}%
+ }%
+ {%
+% \end{macrocode}
+%Predefined tag.
+% \begin{macrocode}
+ \@tracklang@nameuse{@tracklang@add@#1}%
+ #2%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\@tracklang@parse@langtag}
%\changes{1.3}{2016-10-07}{new}
% \begin{macrocode}
@@ -10109,7 +10193,7 @@ and~\ref{tab:nonisoopts}}
% Version info.
% \begin{macrocode}
\expandafter\def\csname ver@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 @@ and~\ref{tab:nonisoopts}}
%\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 @@ Language Scripts (LaTeX)]
% Version info.
% \begin{macrocode}
\expandafter\def\csname ver@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}
diff --git a/macros/generic/tracklang/tracklang.ins b/macros/generic/tracklang/tracklang.ins
index ae7dc0eb5a..19adb1e4f4 100644
--- a/macros/generic/tracklang/tracklang.ins
+++ b/macros/generic/tracklang/tracklang.ins
@@ -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
diff --git a/macros/generic/tracklang/tracklang.pdf b/macros/generic/tracklang/tracklang.pdf
index c7e9645d51..5aef4affc3 100644
--- a/macros/generic/tracklang/tracklang.pdf
+++ b/macros/generic/tracklang/tracklang.pdf
Binary files differ