tracklang (24nov14)

git-svn-id: svn://tug.org/texlive/trunk@35656 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 1243 insertions, 182 deletions

diff --git a/Master/texmf-dist/source/latex/tracklang/tracklang.dtx b/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
index a1f651a3acb..6c1a6ba42cc 100644
--- a/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
+++ b/Master/texmf-dist/source/latex/tracklang/tracklang.dtx
@@ -6,7 +6,7 @@
 %   -doc "tracklang-manual.tex"
 %   -author "Nicola Talbot"
 %   tracklang
-% Created on 2014/9/29 15:50
+% Created on 2014/11/24 14:35
 %\fi
 %\iffalse
 %<*package>
@@ -33,7 +33,7 @@
 % \fi
 % \iffalse
 %<*driver>
-\documentclass{nlctdoc}
+\documentclass[widecs]{nlctdoc}
 
 \usepackage{alltt}
 \usepackage{graphicx}
@@ -46,7 +46,7 @@
             pdftitle={tracklang: tracking language options}]{hyperref}
 
 
-\CheckSum{1685}
+\CheckSum{1978}
 
 \renewcommand*{\usage}[1]{\hyperpage{#1}}
 \renewcommand*{\main}[1]{\hyperpage{#1}}
@@ -61,11 +61,11 @@
 %
 %\MakeShortVerb{"}
 %
-%\title{tracklang v1.0:
+%\title{tracklang v1.1:
 %tracking language options}
 %\author{Nicola L. C. Talbot\\\url{http://www.dickimaw-books.com/}}
 %
-%\date{2014-09-29}
+%\date{2014-11-21}
 %\maketitle
 %
 %\begin{abstract}
@@ -103,8 +103,8 @@
 %language, either define the translations or warn the user that
 %there's no translation for that language.
 %
-%This package works best with \sty{ngerman} and recent versions of \sty{babel},
-%and next best when the language options are specified
+%This package works best with \sty{ngerman} or with recent versions
+%of \sty{babel} or when the language options are specified
 %in the document class option list. It works fairly well with
 %\sty{translator} but will additionally assume the root language was
 %also requested when a dialect is specified. So, for example,
@@ -119,14 +119,46 @@
 %\end{verbatim}
 %This means that \ics{ForEachTrackedDialect} will iterate
 %through the list ``english,british'' instead of just
-%``british''.
+%``british'', which can result in some redundancy.
 %
 %Unfortunately I can't work out how to pick up the language variant
 %from \sty{polyglossia}, so only the root languages are detected,
 %which is suboptimal but at least provides some information.
 %
 %If the \sty{ngerman} package has been loaded, \styfmt{tracklang}
-%sets the root language to ``german'' and the dialect to ``ngerman''.
+%sets the root language to ``german'' and the dialect to ``ngerman'',
+%but it doesn't set the country code.
+%
+%If any document class or package options are passed to
+%\styfmt{tracklang}, then \styfmt{tracklang} won't bother checking
+%for \sty{babel}, \sty{translator}, \sty{ngerman} or
+%\sty{polyglossia}. So, if the above example is changed to:
+%\begin{verbatim}
+%\documentclass[british]{article}
+%\usepackage{translator}
+%\usepackage{tracklang}
+%\end{verbatim}
+%then the dialect list will just consist of ``british'' rather than
+%``english,british''. This does, however, mean that if the user mixes
+%class and package options, only the class options will be detected.
+%For example:
+%\begin{verbatim}
+%\documentclass[british]{article}
+%\usepackage[french]{babel}
+%\usepackage{tracklang}
+%\end{verbatim}
+%In this case, only the ``british'' option will be detected. The user
+%can therefore use the document class option (or \styfmt{tracklang}
+%package option) to override the dialect and set the country code
+%(where provided). For example:
+%\begin{verbatim}
+%\documentclass[es-MX]{article}
+%\usepackage[spanish]{babel}
+%\usepackage{tracklang}
+%\end{verbatim}
+%This sets the dialect to ``mexicanspanish'' and the root language to
+%``spanish''.  See \texttt{tracklang.tex} (\sectionref{sec:predefined}) 
+%for all predefined options.
 %
 %Section~\ref{sec:user} is for package writers who want to
 %add multilingual support to their package and need to know which
@@ -147,21 +179,27 @@
 %has requested \texttt{british}, the root language label is
 %\texttt{english} and the dialect is \texttt{british}, whereas if the
 %user requested \texttt{UKenglish}, the root language label is
-%\texttt{english} and the dialect is \texttt{UKenglish}.
+%\texttt{english} and the dialect is \texttt{UKenglish}. The
+%exceptions to this are the \styfmt{tracklang} package options that have been
+%specified in the form \meta{iso lang}-\meta{iso country}. For
+%example, the package option \texttt{en-GB} behaves as though the
+%user requested the package option \texttt{british}.
 %
 %In addition to the root language label and the dialect identifier,
-%most of the language options also have corresponding ISO codes. In
+%many of the language options also have corresponding ISO codes. In
 %most cases there is an ISO~639-1 or an ISO~639-2 code (or both), and in some
 %cases there is an ISO~3166-1 code identifying the dialect region.
 %
 %When \styfmt{tracklang} is loaded, it first attempts to find the
 %language options through the package options supplied to
 %\styfmt{tracklang}. This means that any languages that have been
-%supplied in the document class options should get identified.
-%If no languages have been supplied in this way, \styfmt{tracklang} then
-%attempts to identify any \sty{babel} language options and failing that
-%it will try the \sty{translator} language options. It will then
-%check if \sty{ngerman} or \sty{polyglossia} have been loaded.
+%supplied in the document class options should get identified
+%(provided that the document class has used the standard option
+%declaration mechanism).  If no languages have been supplied in this
+%way, \styfmt{tracklang} then attempts to identify any \sty{babel}
+%language options and failing that it will try the \sty{translator}
+%language options. It will then check if \sty{ngerman} or
+%\sty{polyglossia} have been loaded.
 %
 %Each identified language and dialect is added to the \emph{tracked
 %language} and \emph{tracked dialect} lists. Note that the tracked
@@ -430,7 +468,7 @@
 % have an ISO~639-2 code, then this code is fetched and stored
 % in \ics{CurrentTrackedIsoCode}.
 %
-% \item If is no ISO~639-1 and no ISO~636-2 code:
+% \item If there is no ISO~639-1 and no ISO~636-2 code:
 %
 %  \begin{enumerate}
 %  \item If there is also no ISO~3166-1 code (\ics{CurrentTrackedRegion}
@@ -449,7 +487,7 @@
 % \item If \ics{CurrentTrackedRegion} is empty (no ISO~3166-1 code)
 % then \meta{tag} (\ics{CurrentTrackedTag}) is set to just
 % \ics{CurrentTrackedIsoCode} and if the file
-% \meta{prefix}\marg{tag}\meta{suffix} exists, the condition will
+% \meta{prefix}\meta{tag}\meta{suffix} exists, the condition will
 % evaluate to \emph{true}. If the file doesn't exist and
 % \ics{CurrentTrackedIsoCode} was set to the ISO~639-1 code, then
 % the test will be repeated with the ISO~639-2 code. If that test
@@ -544,15 +582,28 @@
 %{% no languages detected so use defaults
 %}
 %\end{verbatim}
-%If \ics{ThisDialect} is \texttt{british}, then the file search will
-%be: \texttt{mypackage-british.ldf}, \texttt{mypackage-en-GB.ldf},
-%\texttt{mypackage-eng-GB.ldf}, \texttt{mypackage-en.ldf},
-%\texttt{mypackage-eng.ldf}, \texttt{mypackage-GB.ldf},
-%\texttt{mypackage-english.ldf}.
 %
-%If \ics{ThisDialect} is \texttt{francais}, then the file search will
-%be: \texttt{mypackage-francais.ldf}, \texttt{mypackage-fr.ldf}
-%\texttt{mypackage-fra.ldf}, \texttt{mypackage-french.ldf}.
+%If, for example, \ics{ThisDialect} is \texttt{british}, then the file search will
+%be in the order:
+%\begin{enumerate}
+%\item \texttt{mypackage-british.ldf}
+%\item \texttt{mypackage-en-GB.ldf}
+%\item \texttt{mypackage-eng-GB.ldf}
+%\item \texttt{mypackage-en.ldf}
+%\item \texttt{mypackage-eng.ldf}
+%\item \texttt{mypackage-GB.ldf}
+%\item \texttt{mypackage-english.ldf}
+%\end{enumerate}
+%
+%If, for example, \ics{ThisDialect} is \texttt{francais}, then the file search will
+%be in the order: 
+%\begin{enumerate}
+%\item \texttt{mypackage-francais.ldf}
+%\item \texttt{mypackage-fr.ldf}
+%\item \texttt{mypackage-fra.ldf}
+%\item \texttt{mypackage-french.ldf}
+%\end{enumerate}
+%This is because the predefined \texttt{francais} option has no region assigned to it.
 %
 %Alternatively, if you're only providing support for the root
 %languages:
@@ -592,7 +643,7 @@
 %The supported languages are defined in files
 %with the prefix \texttt{animals-} and the suffix \texttt{.ldf}.
 %
-%Here's the code for the \texttt{animals.sty}:
+%Here's the code for \texttt{animals.sty}:
 %\begin{verbatim}
 %\NeedsTeXFormat{LaTeX2e}
 %\ProvidesPackage{animals}
@@ -610,7 +661,7 @@
 %    {animals-}% prefix
 %    {.ldf}%
 %    {%
-%      \PackageInfo{tracklang}{Loading `animals-\CurrentTrackedTag.ldf'
+%      \PackageInfo{animals}{Loading `animals-\CurrentTrackedTag.ldf'
 %      for language `\this@dialect'}%
 %      \input{animals-\CurrentTrackedTag.ldf}%
 %    }%
@@ -919,7 +970,7 @@
 %will work with other English dialects (although it may not produce
 %the correct translations for the given region). You'll have to
 %decide on the most appropriate default translations for the 
-%root language.
+%root language given no regional information.
 %
 %The complete code for the \texttt{animals3.sty} package is as
 %follows:
@@ -1131,12 +1182,18 @@
 %Earlier, I~mentioned the search order for
 %\ics{IfTrackedLanguageFileExists} where if, for example, the dialect
 %is \texttt{british}, the file search will be:
-%\texttt{mypackage-british.ldf}, \texttt{mypackage-en-GB.ldf},
-%\texttt{mypackage-eng-GB.ldf}, \texttt{mypackage-en.ldf},
-%\texttt{mypackage-eng.ldf}, \texttt{mypackage-GB.ldf},
-%\texttt{mypackage-english.ldf}. You may have wondered why
-%\texttt{mypackage-GB.ldf} is included in the search. Since some
-%countries have multiple official languages, the country code on its
+%\begin{enumerate}
+%\item \texttt{mypackage-british.ldf}
+%\item \texttt{mypackage-en-GB.ldf}
+%\item \texttt{mypackage-eng-GB.ldf}
+%\item \texttt{mypackage-en.ldf}
+%\item \texttt{mypackage-eng.ldf}
+%\item \texttt{mypackage-GB.ldf}
+%\item \texttt{mypackage-english.ldf}
+%\end{enumerate}
+%You may have wondered why
+%\texttt{mypackage-GB.ldf} is included in the search given that some
+%countries have multiple official languages, which means that the country code on its
 %own may not indicate the language.
 %
 %The reason for including just the country code as the \meta{tag} in the 
@@ -1145,9 +1202,10 @@
 %to know whether to use imperial or metric measurements in the
 %document, but I also want to provide multilingual support. The
 %language alone won't tell me whether to use imperial or metric (for
-%example, the US uses imperial and the UK uses metric). I could
-%provide \texttt{.ldf} files for every language and region
-%combination, but this would result in a lot redundancy.
+%example, the US uses imperial and the UK uses metric for most
+%product attributes). I could provide \texttt{.ldf} files for every
+%language and region combination, but this would result in a lot
+%redundancy.
 %
 %The example package (\texttt{regions.sty}) below illustrates this.
 %\begin{verbatim}
@@ -1169,7 +1227,7 @@
 %    {regions-}% prefix
 %    {.ldf}%
 %    {%
-%      \PackageInfo{tracklang}{Loading `regions-\CurrentTrackedTag.ldf'
+%      \PackageInfo{regions}{Loading `regions-\CurrentTrackedTag.ldf'
 %      for language `\this@dialect'}%
 %      \input{regions-\CurrentTrackedTag.ldf}%
 %      \InputIfFileExists{regions-\CurrentTrackedLanguage.ldf}%
@@ -1336,7 +1394,7 @@
 %    {regions-}% prefix
 %    {.ldf}%
 %    {%
-%      \PackageInfo{tracklang}{Loading `regions-\CurrentTrackedTag.ldf'
+%      \PackageInfo{regions}{Loading `regions-\CurrentTrackedTag.ldf'
 %      for language `\this@dialect'}%
 %      \input{regions-\CurrentTrackedTag.ldf}%
 %      \ifx\CurrentTrackedTag\CurrentTrackedLanguage
@@ -1363,7 +1421,7 @@
 %\end{verbatim} 
 %
 %As with the trivial example in the previous section, this package
-%hasn't hooked into \isty{babel}'s caption mechanism, but this can be
+%hasn't hooked into \sty{babel}'s caption mechanism, but this can be
 %implemented for this example in a similar manner to the final
 %example package in the previous section.
 %
@@ -1402,8 +1460,8 @@
 %where \meta{code type} is the ISO code type (for example, 639-1),
 %\meta{code} is the code (for example, ``en'') and \meta{label} is
 %the language or dialect label. (The root language label for
-%ISO~639-1 or ISO~639-2 and the dialect label for the country
-%code ISO~3166-1.
+%ISO~639-1 or ISO~639-2, and the dialect label for the country
+%code ISO~3166-1.)
 %
 %For example:
 %\begin{verbatim}
@@ -1446,6 +1504,9 @@
 %\ics{TrackPredefinedDialect}\marg{dialect label}
 %\end{definition}
 %This will add the dialect and the ISO codes.
+%(See \texttt{tracklang.tex}, \sectionref{sec:predefined}, 
+%for all predefined options. These are all the control sequences in the form
+%\cs{@tracklang@add@}\meta{dialect label}.)
 %
 %For non-LaTeX packages, you can input \texttt{tracklang.tex} provided 
 %the category code for \texttt{@} has been set to 11:
@@ -1455,6 +1516,22 @@
 %\end{verbatim}
 %(Remember to revert it back afterwards if necessary.)
 %
+%If you want some means of tracking each predefined option, you can
+%define
+%\begin{definition}
+%\cs{@tracklang@declareoption}\marg{dialect label}
+%\end{definition}
+%before loading \texttt{tracklang.tex}. For example,
+%\texttt{tracklang.sty} has the following code:
+%\begin{verbatim}
+%\newcommand*{\@tracklang@declareoption}[1]{%
+%  \DeclareOption{#1}{\TrackPredefinedDialect{#1}}%
+%}
+%\input{tracklang}
+%\end{verbatim}
+%which ensures that each predefined dialect is also declared
+%as a package option.
+%
 %\section{Plain \TeX\ Example}
 %\label{sec:plain}
 %
@@ -1507,7 +1584,17 @@
 %\end{quotation}
 %
 %\clearpage
-%\StopEventually{\PrintIndex}
+%\addtolength{\marginparwidth}{40pt}
+%\addtolength{\oddsidemargin}{40pt}
+%\addtolength{\evensidemargin}{40pt}
+%\StopEventually{\clearpage
+%\addtolength{\marginparwidth}{-60pt}
+%\addtolength{\oddsidemargin}{-60pt}
+%\addtolength{\evensidemargin}{-60pt}
+%\addtolength{\textwidth}{80pt}
+%\addtolength{\linewidth}{80pt}
+%\addtolength{\hsize}{80pt}
+%\PrintIndex}
 %
 %
 %\section{The Code}
@@ -1518,158 +1605,43 @@
 %\fi
 %\changes{1.0}{2014-09-29}{Initial release}
 %\subsection{\LaTeX\ Code (\texttt{tracklang.sty})}
+% To ensure maximum portability this file only uses \LaTeX\ kernel
+% commands, rather than using more convenient commands provided by
+% packages such as \styfmt{etoolbox}.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tracklang}[2014/09/29 v1.0 (NLCT) Track Languages]
+\ProvidesPackage{tracklang}[2014/11/21 v1.1 (NLCT) Track Languages]
 %    \end{macrocode}
+%\begin{macro}{\@tracklang@declareoption}
+% Set up package options.
+%    \begin{macrocode}
+\providecommand*{\@tracklang@declareoption}[1]{%
+  \DeclareOption{#1}{\TrackPredefinedDialect{#1}}%
+}
+%    \end{macrocode}
+%\end{macro}
 % Load generic code:
 %    \begin{macrocode}
 \input{tracklang}
 %    \end{macrocode}
-% Define package/class options:
-%    \begin{macrocode}
-\DeclareOption{acadian}{\@tracklang@add@acadian}
-\DeclareOption{afrikaans}{\@tracklang@add@afrikaans}
-\DeclareOption{albanian}{\@tracklang@add@albanian}
-\DeclareOption{american}{\@tracklang@add@american}
-\DeclareOption{amharic}{\@tracklang@add@amharic}
-\DeclareOption{anglosaxon}{\@tracklang@add@anglosaxon}
-\DeclareOption{apache}{\@tracklang@add@apache}
-\DeclareOption{arabic}{\@tracklang@add@arabic}
-\DeclareOption{armenian}{\@tracklang@add@armenian}
-\DeclareOption{asturian}{\@tracklang@add@asturian}
-\DeclareOption{australian}{\@tracklang@add@australian}
-\DeclareOption{austrian}{\@tracklang@add@austrian}
-\DeclareOption{bahasa}{\@tracklang@add@bahasa}
-\DeclareOption{bahasai}{\@tracklang@add@bahasai}
-\DeclareOption{bahasam}{\@tracklang@add@bahasam}
-\DeclareOption{basque}{\@tracklang@add@basque}
-\DeclareOption{belgique}{\@tracklang@add@belgique}
-\DeclareOption{bengali}{\@tracklang@add@bengali}
-\DeclareOption{brazil}{\@tracklang@add@brazil}
-\DeclareOption{brazilian}{\@tracklang@add@brazilian}
-\DeclareOption{breton}{\@tracklang@add@breton}
-\DeclareOption{british}{\@tracklang@add@british}
-\DeclareOption{bulgarian}{\@tracklang@add@bulgarian}
-\DeclareOption{canadian}{\@tracklang@add@canadian}
-\DeclareOption{canadien}{\@tracklang@add@canadien}
-\DeclareOption{catalan}{\@tracklang@add@catalan}
-\DeclareOption{coptic}{\@tracklang@add@coptic}
-\DeclareOption{croatian}{\@tracklang@add@croatian}
-\DeclareOption{cymraeg}{\@tracklang@add@cymraeg}
-\DeclareOption{czech}{\@tracklang@add@czech}
-\DeclareOption{danish}{\@tracklang@add@danish}
-\DeclareOption{deutsch}{\@tracklang@add@deutsch}
-\DeclareOption{divehi}{\@tracklang@add@divehi}
-\DeclareOption{dutch}{\@tracklang@add@dutch}
-\DeclareOption{english}{\@tracklang@add@english}
-\DeclareOption{esperanto}{\@tracklang@add@esperanto}
-\DeclareOption{estonian}{\@tracklang@add@estonian}
-\DeclareOption{farsi}{\@tracklang@add@farsi}
-\DeclareOption{finnish}{\@tracklang@add@finnish}
-\DeclareOption{flemish}{\@tracklang@add@flemish}
-\DeclareOption{francais}{\@tracklang@add@francais}
-\DeclareOption{french}{\@tracklang@add@french}
-\DeclareOption{frenchb}{\@tracklang@add@frenchb}
-\DeclareOption{friulan}{\@tracklang@add@friulan}
-\DeclareOption{friulano}{\@tracklang@add@friulano}
-\DeclareOption{friulian}{\@tracklang@add@friulian}
-\DeclareOption{gaeilge}{\@tracklang@add@gaeilge}
-\DeclareOption{galician}{\@tracklang@add@galician}
-\DeclareOption{galicien}{\@tracklang@add@galicien}
-\DeclareOption{german}{\@tracklang@add@german}
-\DeclareOption{greek}{\@tracklang@add@greek}
-\DeclareOption{hebrew}{\@tracklang@add@hebrew}
-\DeclareOption{hindi}{\@tracklang@add@hindi}
-\DeclareOption{hungarian}{\@tracklang@add@hungarian}
-\DeclareOption{icelandic}{\@tracklang@add@icelandic}
-\DeclareOption{indon}{\@tracklang@add@indon}
-\DeclareOption{indonesian}{\@tracklang@add@indonesian}
-\DeclareOption{interlingua}{\@tracklang@add@interlingua}
-\DeclareOption{irish}{\@tracklang@add@irish}
-\DeclareOption{italian}{\@tracklang@add@italian}
-\DeclareOption{kannada}{\@tracklang@add@kannada}
-\DeclareOption{lao}{\@tracklang@add@lao}
-\DeclareOption{latin}{\@tracklang@add@latin}
-\DeclareOption{latein}{\@tracklang@add@latein}
-\DeclareOption{latvian}{\@tracklang@add@latvian}
-\DeclareOption{lithuanian}{\@tracklang@add@lithuanian}
-\DeclareOption{lsorbian}{\@tracklang@add@lsorbian}
-\DeclareOption{magyar}{\@tracklang@add@magyar}
-\DeclareOption{malay}{\@tracklang@add@malay}
-\DeclareOption{malayalam}{\@tracklang@add@malayalam}
-\DeclareOption{marathi}{\@tracklang@add@marathi}
-\DeclareOption{meyalu}{\@tracklang@add@meyalu}
-\DeclareOption{naustrian}{\@tracklang@add@naustrian}
-\DeclareOption{ngerman}{\@tracklang@add@ngerman}
-\DeclareOption{lowersorbian}{\@tracklang@add@lowersorbian}
-\DeclareOption{newzealand}{\@tracklang@add@newzealand}
-\DeclareOption{nko}{\@tracklang@add@nko}
-\DeclareOption{norsk}{\@tracklang@add@norsk}
-\DeclareOption{norwegian}{\@tracklang@add@norwegian}
-\DeclareOption{nynorsk}{\@tracklang@add@nynorsk}
-\DeclareOption{occitan}{\@tracklang@add@occitan}
-\DeclareOption{persian}{\@tracklang@add@persian}
-\DeclareOption{piedmontese}{\@tracklang@add@piedmontese}
-\DeclareOption{piemonteis}{\@tracklang@add@piemonteis}
-\DeclareOption{polish}{\@tracklang@add@polish}
-\DeclareOption{polutoniko}{\@tracklang@add@polutoniko}
-\DeclareOption{polutonikogreek}{\@tracklang@add@polutonikogreek}
-\DeclareOption{portuges}{\@tracklang@add@portuges}
-\DeclareOption{portuguese}{\@tracklang@add@portuguese}
-\DeclareOption{romanche}{\@tracklang@add@romanche}
-\DeclareOption{romanian}{\@tracklang@add@romanian}
-\DeclareOption{romansh}{\@tracklang@add@romansh}
-\DeclareOption{romansch}{\@tracklang@add@romansch}
-\DeclareOption{rumantsch}{\@tracklang@add@rumantsch}
-\DeclareOption{russian}{\@tracklang@add@russian}
-\DeclareOption{russianb}{\@tracklang@add@russianb}
-\DeclareOption{samin}{\@tracklang@add@samin}
-\DeclareOption{sanskrit}{\@tracklang@add@sanskrit}
-\DeclareOption{scottish}{\@tracklang@add@scottish}
-\DeclareOption{gaelic}{\@tracklang@add@gaelic}
-\DeclareOption{serbian}{\@tracklang@add@serbian}
-\DeclareOption{slovak}{\@tracklang@add@slovak}
-\DeclareOption{slovene}{\@tracklang@add@slovene}
-\DeclareOption{slovenian}{\@tracklang@add@slovenian}
-\DeclareOption{spanish}{\@tracklang@add@spanish}
-\DeclareOption{swedish}{\@tracklang@add@swedish}
-\DeclareOption{syriac}{\@tracklang@add@syriac}
-\DeclareOption{tamil}{\@tracklang@add@tamil}
-\DeclareOption{telugu}{\@tracklang@add@telugu}
-\DeclareOption{tai}{\@tracklang@add@tai}
-\DeclareOption{thai}{\@tracklang@add@thai}
-\DeclareOption{tibetan}{\@tracklang@add@tibetan}
-\DeclareOption{turkish}{\@tracklang@add@turkish}
-\DeclareOption{turkmen}{\@tracklang@add@turkmen}
-\DeclareOption{UKenglish}{\@tracklang@add@UKenglish}
-\DeclareOption{ukrainian}{\@tracklang@add@ukrainian}
-\DeclareOption{ukraineb}{\@tracklang@add@ukraineb}
-\DeclareOption{ukraine}{\@tracklang@add@ukraine}
-\DeclareOption{urdu}{\@tracklang@add@urdu}
-\DeclareOption{usorbian}{\@tracklang@add@usorbian}
-\DeclareOption{uppersorbian}{\@tracklang@add@uppersorbian}
-\DeclareOption{USenglish}{\@tracklang@add@USenglish}
-\DeclareOption{valencian}{\@tracklang@add@valencian}
-\DeclareOption{valencien}{\@tracklang@add@valencien}
-\DeclareOption{vietnamese}{\@tracklang@add@vietnamese}
-\DeclareOption{walloon}{\@tracklang@add@walloon}
-\DeclareOption{welsh}{\@tracklang@add@welsh}
-%    \end{macrocode}
-%
 %    \begin{macrocode}
 \let\@tracklang@declaredoptions\@declaredoptions
 \ProcessOptions
 %    \end{macrocode}
+% Unset \cs{@tracklang@declareoption}:
+%    \begin{macrocode}
+\let\@tracklang@declareoption\@gobble
+%    \end{macrocode}
 %
 % In the event that the language hasn't been supplied through the
 % package options (or through the class options, which the package
-% options should process) we need to check if any of the known
+% options should process provided the document class has used the
+% standard option declarations) we need to check if any of the known
 % language packages have been loaded. This is a bit dangerous as it
 % relies on the packages not changing their internal language
 % macros. It would be easier if all the language packages could
-% provide a reliable user interface to determine which languages have been
-% loaded.
+% provide a reliable user interface to determine which languages
+% (and variants) have been loaded.
 %
 %    \begin{macrocode}
 \ifx\@tracklang@languages\@empty
@@ -1720,6 +1692,8 @@
               {%
                \@ifundefined{@tracklang@add@\this@language}%
                {%
+                 \PackageWarning{tracklang}%
+                    {Adding unknown language `\this@language'}%
                  \AddTrackedLanguage\this@language
                }%
                {%
@@ -1978,6 +1952,8 @@
 %    \end{macrocode}
 %\end{macro}
 %
+%\subsubsection{Internal Lists}
+%
 %\begin{macro}{\@tracklang@languages}
 % Provide a list to keep track of all the languages.
 %    \begin{macrocode}
@@ -2097,6 +2073,8 @@
 %    \end{macrocode}
 %\end{macro}
 %
+%\subsubsection{Mappings}
+%
 %\begin{macro}{\AddTrackedIsoLanguage}
 %\begin{definition}
 %\cs{AddTrackedIsoLanguage}\marg{code type}\marg{code}\marg{language}
@@ -2186,9 +2164,11 @@
 %    \end{macrocode}
 %\end{macro}
 %
+%\subsubsection{Predefined Dialects}\label{sec:predefined}
+%
 % The ISO 639-1 and 639-2 codes are used to map the root language name to the
-% ISO language code. The 3166-1 codes are used to map the dialect
-% language to the ISO country code. The country code is
+% ISO language code. The 3166-1 codes are used to map the
+% dialect\slash variant to the ISO country code. The country code is
 % omitted if ambiguous (for example, the language is spoken in
 % multiple countries). Some ``dialects'' are just synonyms for a
 % language name, such as ``francais'' or ``frenchb''.  Some of the
@@ -2211,12 +2191,28 @@
 %    \end{macrocode}
 %\end{macro}
 %
+% Provide some predefined languages/dialects.
+%\begin{macro}{\@tracklang@declareoption}
+%\changes{1.1}{2014-11-21}{new}
+% Provide a hook to declare a predefined setting as a package
+% option. This is defined by tracklang.sty before loading
+% tracklang.tex but if this file isn't load through tracklang.sty
+% provide a definition that ignores its argument if not already
+% defined.
+%    \begin{macrocode}
+\ifx\@tracklang@declareoption\undefined
+  \def\@tracklang@declareoption#1{}
+\fi
+%    \end{macrocode}
+%\end{macro}
+%
 %\begin{macro}{\@tracklang@add@acadian}
 %    \begin{macrocode}
 \def\@tracklang@add@acadian{%
   \AddTrackedDialect{acadian}{french}%
   \AddTrackedIsoLanguage{639-1}{fr}{french}%
 }
+\@tracklang@declareoption{acadian}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\@tracklang@add@afrikaans}
@@ -2226,6 +2222,7 @@
   \AddTrackedIsoLanguage{639-1}{af}{afrikaans}%
   \AddTrackedIsoLanguage{639-2}{afr}{afrikaans}%
 }
+\@tracklang@declareoption{afrikaans}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2238,6 +2235,7 @@
   \AddTrackedIsoLanguage{639-2-T}{sqi}{albanian}%
   \AddTrackedIsoLanguage{639-2}{sqi}{albanian}%
 }
+\@tracklang@declareoption{albanian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2248,6 +2246,7 @@
   \AddTrackedIsoLanguage{639-1}{am}{amharic}%
   \AddTrackedIsoLanguage{639-2}{amh}{amharic}%
 }
+\@tracklang@declareoption{amharic}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2257,6 +2256,7 @@
   \AddTrackedLanguage{anglosaxon}%
   \AddTrackedIsoLanguage{639-2}{ang}{anglosaxon}%
 }
+\@tracklang@declareoption{anglosaxon}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2266,6 +2266,7 @@
   \AddTrackedLanguage{apache}%
   \AddTrackedIsoLanguage{639-2}{apa}{apache}%
 }
+\@tracklang@declareoption{apache}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2276,6 +2277,7 @@
   \AddTrackedIsoLanguage{639-1}{ar}{arabic}%
   \AddTrackedIsoLanguage{639-2}{ara}{arabic}%
 }
+\@tracklang@declareoption{arabic}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2288,6 +2290,7 @@
   \AddTrackedIsoLanguage{639-2-T}{hye}{armenian}%
   \AddTrackedIsoLanguage{639-2}{hye}{armenian}%
 }
+\@tracklang@declareoption{armenian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2297,6 +2300,7 @@
   \AddTrackedLanguage{asturian}%
   \AddTrackedIsoLanguage{639-2}{ast}{asturian}%
 }
+\@tracklang@declareoption{asturian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2308,6 +2312,7 @@
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
   \AddTrackedIsoLanguage{3166-1}{US}{american}%
 }
+\@tracklang@declareoption{american}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2319,6 +2324,7 @@
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
   \AddTrackedIsoLanguage{3166-1}{AU}{australian}%
 }
+\@tracklang@declareoption{australian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2332,6 +2338,7 @@
   \AddTrackedIsoLanguage{639-2}{deu}{german}%
   \AddTrackedIsoLanguage{3166-1}{AT}{austrian}%
 }
+\@tracklang@declareoption{austrian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2345,6 +2352,7 @@
   \AddTrackedIsoLanguage{639-2}{deu}{german}%
   \AddTrackedIsoLanguage{3166-1}{AT}{naustrian}%
 }
+\@tracklang@declareoption{naustrian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2356,6 +2364,7 @@
   \AddTrackedIsoLanguage{639-2}{ind}{bahasai}%
   \AddTrackedIsoLanguage{3166-1}{IN}{bahasa}%
 }
+\@tracklang@declareoption{bahasa}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2367,6 +2376,7 @@
   \AddTrackedIsoLanguage{639-2}{ind}{bahasai}%
   \AddTrackedIsoLanguage{3166-1}{IN}{bahasai}%
 }
+\@tracklang@declareoption{bahasai}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2380,6 +2390,7 @@
   \AddTrackedIsoLanguage{639-2}{msa}{bahasam}%
   \AddTrackedIsoLanguage{3166-1}{MY}{bahasam}%
 }
+\@tracklang@declareoption{bahasam}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2392,6 +2403,7 @@
   \AddTrackedIsoLanguage{639-2-T}{eus}{basque}%
   \AddTrackedIsoLanguage{639-2}{eus}{basque}%
 }
+\@tracklang@declareoption{basque}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2402,6 +2414,7 @@
   \AddTrackedIsoLanguage{639-1}{bn}{bengali}%
   \AddTrackedIsoLanguage{639-2}{ben}{bengali}%
 }
+\@tracklang@declareoption{bengali}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2413,6 +2426,7 @@
   \AddTrackedIsoLanguage{639-2}{por}{portuges}%
   \AddTrackedIsoLanguage{3166-1}{BR}{brazil}%
 }
+\@tracklang@declareoption{brazil}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2424,6 +2438,7 @@
   \AddTrackedIsoLanguage{639-2}{por}{portuges}%
   \AddTrackedIsoLanguage{3166-1}{BR}{brazilian}%
 }
+\@tracklang@declareoption{brazilian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2435,6 +2450,7 @@
   \AddTrackedIsoLanguage{639-2}{bre}{breton}%
   \AddTrackedIsoLanguage{3166-1}{FR}{breton}%
 }
+\@tracklang@declareoption{breton}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2446,6 +2462,7 @@
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
   \AddTrackedIsoLanguage{3166-1}{GB}{british}%
 }
+\@tracklang@declareoption{british}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2456,6 +2473,7 @@
   \AddTrackedIsoLanguage{639-1}{bg}{bulgarian}%
   \AddTrackedIsoLanguage{639-2}{bul}{bulgarian}%
 }
+\@tracklang@declareoption{bulgarian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2467,6 +2485,7 @@
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
   \AddTrackedIsoLanguage{3166-1}{CA}{canadian}%
 }
+\@tracklang@declareoption{canadian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2480,6 +2499,7 @@
   \AddTrackedIsoLanguage{639-2}{fra}{french}%
   \AddTrackedIsoLanguage{3166-1}{CA}{canadien}%
 }
+\@tracklang@declareoption{canadien}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2490,6 +2510,7 @@
   \AddTrackedIsoLanguage{639-1}{ca}{catalan}%
   \AddTrackedIsoLanguage{639-2}{cat}{catalan}%
 }
+\@tracklang@declareoption{catalan}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2499,6 +2520,7 @@
   \AddTrackedLanguage{coptic}%
   \AddTrackedIsoLanguage{639-2}{cop}{coptic}%
 }
+\@tracklang@declareoption{coptic}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2509,6 +2531,43 @@
   \AddTrackedIsoLanguage{639-1}{hr}{croatian}%
   \AddTrackedIsoLanguage{639-2}{hrv}{croatian}%
 }
+\@tracklang@declareoption{croatian}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@croatia}
+%    \begin{macrocode}
+\def\@tracklang@add@croatia{%
+  \AddTrackedDialect{croatia}{croatian}%
+  \AddTrackedIsoLanguage{639-1}{hr}{croatian}%
+  \AddTrackedIsoLanguage{639-2}{hrv}{croatian}%
+  \AddTrackedIsoLanguage{3166-1}{HR}{croatia}%
+}
+\@tracklang@declareoption{croatia}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@istriacountycroatian}
+%    \begin{macrocode}
+\def\@tracklang@add@istriacountycroatian{%
+  \AddTrackedDialect{istriacountycroatian}{croatian}%
+  \AddTrackedIsoLanguage{639-1}{hr}{croatian}%
+  \AddTrackedIsoLanguage{639-2}{hrv}{croatian}%
+  \AddTrackedIsoLanguage{3166-1}{HR}{istriacountycroatian}%
+}
+\@tracklang@declareoption{istriacountycroatian}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@istriacountyitalian}
+%    \begin{macrocode}
+\def\@tracklang@add@istriacountyitalian{%
+  \AddTrackedDialect{istriacountyitalian}{italian}%
+  \AddTrackedIsoLanguage{639-1}{it}{italian}%
+  \AddTrackedIsoLanguage{639-2}{ita}{italian}%
+  \AddTrackedIsoLanguage{3166-1}{HR}{istriacountyitalian}%
+}
+\@tracklang@declareoption{istriacountyitalian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2521,6 +2580,7 @@
   \AddTrackedIsoLanguage{639-2-T}{ces}{czech}%
   \AddTrackedIsoLanguage{639-2}{ces}{czech}%
 }
+\@tracklang@declareoption{czech}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2531,6 +2591,7 @@
   \AddTrackedIsoLanguage{639-1}{da}{danish}%
   \AddTrackedIsoLanguage{639-2}{dan}{danish}%
 }
+\@tracklang@declareoption{danish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2541,6 +2602,7 @@
   \AddTrackedIsoLanguage{639-1}{dv}{divehi}%
   \AddTrackedIsoLanguage{639-2}{div}{divehi}%
 }
+\@tracklang@declareoption{divehi}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2553,6 +2615,22 @@
   \AddTrackedIsoLanguage{639-2-T}{nld}{dutch}%
   \AddTrackedIsoLanguage{639-2}{nld}{dutch}%
 }
+\@tracklang@declareoption{dutch}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@netherlands}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@netherlands{%
+  \AddTrackedDialect{netherlands}{dutch}%
+  \AddTrackedIsoLanguage{639-1}{nl}{dutch}%
+  \AddTrackedIsoLanguage{639-2-B}{dut}{dutch}%
+  \AddTrackedIsoLanguage{639-2-T}{nld}{dutch}%
+  \AddTrackedIsoLanguage{639-2}{nld}{dutch}%
+  \AddTrackedIsoLanguage{3166-1}{NL}{netherlands}%
+}
+\@tracklang@declareoption{netherlands}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2563,6 +2641,7 @@
   \AddTrackedIsoLanguage{639-1}{en}{english}%
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
 }
+\@tracklang@declareoption{english}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2573,6 +2652,7 @@
   \AddTrackedIsoLanguage{639-1}{eo}{esperanto}%
   \AddTrackedIsoLanguage{639-2}{epo}{esperanto}%
 }
+\@tracklang@declareoption{esperanto}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2583,6 +2663,7 @@
   \AddTrackedIsoLanguage{639-1}{et}{estonian}%
   \AddTrackedIsoLanguage{639-2}{est}{estonian}%
 }
+\@tracklang@declareoption{estonian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2595,6 +2676,7 @@
   \AddTrackedIsoLanguage{639-2-T}{fas}{farsi}%
   \AddTrackedIsoLanguage{639-2}{fas}{farsi}%
 }
+\@tracklang@declareoption{farsi}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2607,6 +2689,7 @@
   \AddTrackedIsoLanguage{639-2-T}{fas}{farsi}%
   \AddTrackedIsoLanguage{639-2}{fas}{farsi}%
 }
+\@tracklang@declareoption{persian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2617,6 +2700,7 @@
   \AddTrackedIsoLanguage{639-1}{fi}{finnish}%
   \AddTrackedIsoLanguage{639-2}{fin}{finnish}%
 }
+\@tracklang@declareoption{finnish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2630,6 +2714,7 @@
   \AddTrackedIsoLanguage{639-2}{nld}{dutch}%
   \AddTrackedIsoLanguage{3166-1}{BE}{flemish}%
 }
+\@tracklang@declareoption{flemish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2642,6 +2727,7 @@
   \AddTrackedIsoLanguage{639-2-T}{fra}{french}%
   \AddTrackedIsoLanguage{639-2}{fra}{french}%
 }
+\@tracklang@declareoption{francais}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2654,6 +2740,7 @@
   \AddTrackedIsoLanguage{639-2-T}{fra}{french}%
   \AddTrackedIsoLanguage{639-2}{fra}{french}%
 }
+\@tracklang@declareoption{frenchb}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2666,6 +2753,22 @@
   \AddTrackedIsoLanguage{639-2-T}{fra}{french}%
   \AddTrackedIsoLanguage{639-2}{fra}{french}%
 }
+\@tracklang@declareoption{french}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@france}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@france{%
+  \AddTrackedDialect{france}{french}%
+  \AddTrackedIsoLanguage{639-1}{fr}{french}%
+  \AddTrackedIsoLanguage{639-2-B}{fre}{french}%
+  \AddTrackedIsoLanguage{639-2-T}{fra}{french}%
+  \AddTrackedIsoLanguage{639-2}{fra}{french}%
+  \AddTrackedIsoLanguage{3166-1}{FR}{france}%
+}
+\@tracklang@declareoption{france}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2679,6 +2782,21 @@
   \AddTrackedIsoLanguage{639-2}{fra}{french}%
   \AddTrackedIsoLanguage{3166-1}{BE}{belgique}%
 }
+\@tracklang@declareoption{belgique}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@belgiangerman}
+%    \begin{macrocode}
+\def\@tracklang@add@belgiangerman{%
+  \AddTrackedDialect{belgiangerman}{german}%
+  \AddTrackedIsoLanguage{639-1}{de}{german}%
+  \AddTrackedIsoLanguage{639-2-B}{ger}{german}%
+  \AddTrackedIsoLanguage{639-2-T}{deu}{german}%
+  \AddTrackedIsoLanguage{639-2}{deu}{german}%
+  \AddTrackedIsoLanguage{3166-1}{BE}{belgiangerman}%
+}
+\@tracklang@declareoption{belgiangerman}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2689,6 +2807,7 @@
   \AddTrackedIsoLanguage{639-2}{fur}{friulan}%
   \AddTrackedIsoLanguage{3166-1}{IT}{friulan}%
 }
+\@tracklang@declareoption{friulan}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2699,6 +2818,7 @@
   \AddTrackedIsoLanguage{639-2}{fur}{friulan}%
   \AddTrackedIsoLanguage{3166-1}{IT}{friulan}%
 }
+\@tracklang@declareoption{friulian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2709,6 +2829,7 @@
   \AddTrackedIsoLanguage{639-2}{fur}{friulan}%
   \AddTrackedIsoLanguage{3166-1}{IT}{friulan}%
 }
+\@tracklang@declareoption{friulano}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2719,6 +2840,7 @@
   \AddTrackedIsoLanguage{639-1}{gl}{galician}%
   \AddTrackedIsoLanguage{639-2}{glg}{galician}%
 }
+\@tracklang@declareoption{galician}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2729,6 +2851,7 @@
   \AddTrackedIsoLanguage{639-1}{gl}{galician}%
   \AddTrackedIsoLanguage{639-2}{glg}{galician}%
 }
+\@tracklang@declareoption{galicien}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2741,6 +2864,7 @@
   \AddTrackedIsoLanguage{639-2-T}{deu}{german}%
   \AddTrackedIsoLanguage{639-2}{deu}{german}%
 }
+\@tracklang@declareoption{german}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2753,6 +2877,7 @@
   \AddTrackedIsoLanguage{639-2-T}{deu}{german}%
   \AddTrackedIsoLanguage{639-2}{deu}{german}%
 }
+\@tracklang@declareoption{deutsch}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2765,6 +2890,22 @@
   \AddTrackedIsoLanguage{639-2-T}{deu}{german}%
   \AddTrackedIsoLanguage{639-2}{deu}{german}%
 }
+\@tracklang@declareoption{ngerman}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@ngermanDE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@ngermanDE{%
+  \AddTrackedDialect{ngerman}{german}%
+  \AddTrackedIsoLanguage{639-1}{de}{german}%
+  \AddTrackedIsoLanguage{639-2-B}{ger}{german}%
+  \AddTrackedIsoLanguage{639-2-T}{deu}{german}%
+  \AddTrackedIsoLanguage{639-2}{deu}{german}%
+  \AddTrackedIsoLanguage{3166-1}{DE}{germany}%
+}
+\@tracklang@declareoption{ngermanDE}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2777,6 +2918,7 @@
   \AddTrackedIsoLanguage{639-2-T}{ell}{greek}%
   \AddTrackedIsoLanguage{639-2}{ell}{greek}%
 }
+\@tracklang@declareoption{greek}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2787,6 +2929,7 @@
   \AddTrackedIsoLanguage{639-1}{he}{hebrew}%
   \AddTrackedIsoLanguage{639-2}{heb}{hebrew}%
 }
+\@tracklang@declareoption{hebrew}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2797,6 +2940,7 @@
   \AddTrackedIsoLanguage{639-1}{hi}{hindi}%
   \AddTrackedIsoLanguage{639-2}{hin}{hindi}%
 }
+\@tracklang@declareoption{hindi}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2808,6 +2952,7 @@
   \AddTrackedIsoLanguage{639-2}{hun}{magyar}%
   \AddTrackedIsoLanguage{3166-1}{HU}{hungarian}%
 }
+\@tracklang@declareoption{hungarian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2818,6 +2963,7 @@
   \AddTrackedIsoLanguage{639-1}{hu}{magyar}%
   \AddTrackedIsoLanguage{639-2}{hun}{magyar}%
 }
+\@tracklang@declareoption{magyar}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2830,6 +2976,7 @@
   \AddTrackedIsoLanguage{639-2-T}{isl}{icelandic}%
   \AddTrackedIsoLanguage{639-2}{isl}{icelandic}%
 }
+\@tracklang@declareoption{icelandic}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2841,6 +2988,7 @@
   \AddTrackedIsoLanguage{639-2}{ind}{bahasai}%
   \AddTrackedIsoLanguage{3166-1}{IN}{indon}%
 }
+\@tracklang@declareoption{indon}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2852,6 +3000,7 @@
   \AddTrackedIsoLanguage{639-2}{ind}{bahasai}%
   \AddTrackedIsoLanguage{3166-1}{IN}{indonesian}%
 }
+\@tracklang@declareoption{indonesian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2862,6 +3011,7 @@
   \AddTrackedIsoLanguage{639-1}{ia}{interlingua}%
   \AddTrackedIsoLanguage{639-2}{ina}{interlingua}%
 }
+\@tracklang@declareoption{interlingua}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2872,6 +3022,7 @@
   \AddTrackedIsoLanguage{639-1}{ga}{irish}%
   \AddTrackedIsoLanguage{639-2}{gle}{irish}%
 }
+\@tracklang@declareoption{irish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2882,6 +3033,7 @@
   \AddTrackedIsoLanguage{639-1}{ga}{irish}%
   \AddTrackedIsoLanguage{639-2}{gle}{irish}%
 }
+\@tracklang@declareoption{gaeilge}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2892,6 +3044,111 @@
   \AddTrackedIsoLanguage{639-1}{it}{italian}%
   \AddTrackedIsoLanguage{639-2}{ita}{italian}%
 }
+\@tracklang@declareoption{italian}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@italy}
+%    \begin{macrocode}
+\def\@tracklang@add@italy{%
+  \AddTrackedDialect{italy}{italian}%
+  \AddTrackedIsoLanguage{639-1}{it}{italian}%
+  \AddTrackedIsoLanguage{639-2}{ita}{italian}%
+  \AddTrackedIsoLanguage{3166-1}{IT}{italy}%
+}
+\@tracklang@declareoption{italy}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@vatican}
+%    \begin{macrocode}
+\def\@tracklang@add@vatican{%
+  \AddTrackedDialect{vatican}{italian}%
+  \AddTrackedIsoLanguage{639-1}{it}{italian}%
+  \AddTrackedIsoLanguage{639-2}{ita}{italian}%
+  \AddTrackedIsoLanguage{3166-1}{VA}{vatican}%
+}
+\@tracklang@declareoption{vatican}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@sanmarino}
+%    \begin{macrocode}
+\def\@tracklang@add@sanmarino{%
+  \AddTrackedDialect{sanmarino}{italian}%
+  \AddTrackedIsoLanguage{639-1}{it}{italian}%
+  \AddTrackedIsoLanguage{639-2}{ita}{italian}%
+  \AddTrackedIsoLanguage{3166-1}{SM}{sanmarino}%
+}
+\@tracklang@declareoption{sanmarino}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@sloveneistriaitalian}
+%    \begin{macrocode}
+\def\@tracklang@add@sloveneistriaitalian{%
+  \AddTrackedDialect{sloveneistriaitalian}{italian}%
+  \AddTrackedIsoLanguage{639-1}{it}{italian}%
+  \AddTrackedIsoLanguage{639-2}{ita}{italian}%
+  \AddTrackedIsoLanguage{3166-1}{SI}{sloveneistriaitalian}%
+}
+\@tracklang@declareoption{sloveneistriaitalian}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@jerseyenglish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@jerseyenglish{%
+  \AddTrackedDialect{jerseyenglish}{english}%
+  \AddTrackedIsoLanguage{639-1}{en}{english}%
+  \AddTrackedIsoLanguage{639-2}{eng}{english}%
+  \AddTrackedIsoLanguage{3166-1}{JE}{jerseyenglish}%
+}
+\@tracklang@declareoption{jerseyenglish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@jerseyfrench}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@jerseyfrench{%
+  \AddTrackedDialect{jerseyfrench}{french}%
+  \AddTrackedIsoLanguage{639-1}{fr}{french}%
+  \AddTrackedIsoLanguage{639-2-B}{fre}{french}%
+  \AddTrackedIsoLanguage{639-2-T}{fra}{french}%
+  \AddTrackedIsoLanguage{639-2}{fra}{french}%
+  \AddTrackedIsoLanguage{3166-1}{JE}{jerseyfrench}%
+}
+\@tracklang@declareoption{jerseyfrench}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@guernseyenglish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@guernseyenglish{%
+  \AddTrackedDialect{guernseyenglish}{english}%
+  \AddTrackedIsoLanguage{639-1}{en}{english}%
+  \AddTrackedIsoLanguage{639-2}{eng}{english}%
+  \AddTrackedIsoLanguage{3166-1}{GG}{guernseyenglish}%
+}
+\@tracklang@declareoption{guernseyenglish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@guernseyfrench}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@guernseyfrench{%
+  \AddTrackedDialect{guernseyfrench}{french}%
+  \AddTrackedIsoLanguage{639-1}{fr}{french}%
+  \AddTrackedIsoLanguage{639-2-B}{fre}{french}%
+  \AddTrackedIsoLanguage{639-2-T}{fra}{french}%
+  \AddTrackedIsoLanguage{639-2}{fra}{french}%
+  \AddTrackedIsoLanguage{3166-1}{GG}{guernseyfrench}%
+}
+\@tracklang@declareoption{guernseyfrench}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2902,6 +3159,7 @@
   \AddTrackedIsoLanguage{639-1}{kn}{kannada}%
   \AddTrackedIsoLanguage{639-2}{kan}{kannada}%
 }
+\@tracklang@declareoption{kannada}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2912,6 +3170,7 @@
   \AddTrackedIsoLanguage{639-1}{lo}{lao}%
   \AddTrackedIsoLanguage{639-2}{lao}{lao}%
 }
+\@tracklang@declareoption{lao}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2922,6 +3181,7 @@
   \AddTrackedIsoLanguage{639-1}{la}{latin}%
   \AddTrackedIsoLanguage{639-2}{lat}{latin}%
 }
+\@tracklang@declareoption{latin}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2932,6 +3192,7 @@
   \AddTrackedIsoLanguage{639-1}{la}{latin}%
   \AddTrackedIsoLanguage{639-2}{lat}{latin}%
 }
+\@tracklang@declareoption{latein}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2942,6 +3203,7 @@
   \AddTrackedIsoLanguage{639-1}{lv}{latvian}%
   \AddTrackedIsoLanguage{639-2}{lav}{latvian}%
 }
+\@tracklang@declareoption{latvian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2952,6 +3214,7 @@
   \AddTrackedIsoLanguage{639-1}{lt}{lithuanian}%
   \AddTrackedIsoLanguage{639-2}{lit}{lithuanian}%
 }
+\@tracklang@declareoption{lithuanian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2962,6 +3225,7 @@
   \AddTrackedIsoLanguage{639-2}{dsb}{lsorbian}%
   \AddTrackedIsoLanguage{3166-1}{DE}{lsorbian}%
 }
+\@tracklang@declareoption{lsorbian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2972,6 +3236,7 @@
   \AddTrackedIsoLanguage{639-2}{dsb}{lsorbian}%
   \AddTrackedIsoLanguage{3166-1}{DE}{lowersorbian}%
 }
+\@tracklang@declareoption{lowersorbian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2985,6 +3250,7 @@
   \AddTrackedIsoLanguage{639-2}{msa}{bahasam}%
   \AddTrackedIsoLanguage{3166-1}{MY}{malay}%
 }
+\@tracklang@declareoption{malay}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -2998,6 +3264,45 @@
   \AddTrackedIsoLanguage{639-2}{msa}{bahasam}%
   \AddTrackedIsoLanguage{3166-1}{MY}{meyalu}%
 }
+\@tracklang@declareoption{meyalu}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@maltese}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@maltese{%
+  \AddTrackedLanguage{maltese}%
+  \AddTrackedIsoLanguage{639-1}{mt}{maltese}%
+  \AddTrackedIsoLanguage{639-2}{mlt}{maltese}%
+}
+\@tracklang@declareoption{maltese}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@maltamaltese}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@maltamaltese{%
+  \AddTrackedDialect{maltamaltese}{maltese}%
+  \AddTrackedIsoLanguage{639-1}{mt}{maltese}%
+  \AddTrackedIsoLanguage{639-2}{mlt}{maltese}%
+  \AddTrackedIsoLanguage{3166-1}{MT}{maltamaltese}%
+}
+\@tracklang@declareoption{maltamaltese}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@maltaenglish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@maltaenglish{%
+  \AddTrackedDialect{maltaenglish}{english}%
+  \AddTrackedIsoLanguage{639-1}{en}{english}%
+  \AddTrackedIsoLanguage{639-2}{eng}{english}%
+  \AddTrackedIsoLanguage{3166-1}{MT}{maltaenglish}%
+}
+\@tracklang@declareoption{maltaenglish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3008,6 +3313,7 @@
   \AddTrackedIsoLanguage{639-1}{ml}{malayalam}%
   \AddTrackedIsoLanguage{639-2}{mal}{malayalam}%
 }
+\@tracklang@declareoption{malayalam}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3018,6 +3324,7 @@
   \AddTrackedIsoLanguage{639-1}{mr}{marathi}%
   \AddTrackedIsoLanguage{639-2}{mar}{marathi}%
 }
+\@tracklang@declareoption{marathi}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3029,6 +3336,33 @@
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
   \AddTrackedIsoLanguage{3166-1}{NZ}{newzealand}%
 }
+\@tracklang@declareoption{newzealand}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@isleofmanenglish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@isleofmanenglish{%
+  \AddTrackedDialect{isleofmanenglish}{english}%
+  \AddTrackedIsoLanguage{639-1}{en}{english}%
+  \AddTrackedIsoLanguage{639-2}{eng}{english}%
+  \AddTrackedIsoLanguage{3166-1}{IM}{isleofmanenglish}%
+}
+\@tracklang@declareoption{isleofmanenglish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@manx}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@manx{%
+  \AddTrackedLanguage{manx}%
+  \AddTrackedIsoLanguage{639-1}{gv}{manx}%
+  \AddTrackedIsoLanguage{639-2}{glv}{manx}%
+  \AddTrackedIsoLanguage{3166-1}{IM}{manx}%
+}
+\@tracklang@declareoption{manx}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3038,6 +3372,7 @@
   \AddTrackedLanguage{nko}%
   \AddTrackedIsoLanguage{639-2}{nqo}{nko}%
 }
+\@tracklang@declareoption{nko}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3049,6 +3384,7 @@
   \AddTrackedIsoLanguage{639-2}{nno}{norsk}%
   \AddTrackedIsoLanguage{3166-1}{NO}{nynorsk}%
 }
+\@tracklang@declareoption{nynorsk}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3060,6 +3396,7 @@
   \AddTrackedIsoLanguage{639-2}{nno}{norsk}%
   \AddTrackedIsoLanguage{3166-1}{NO}{norwegian}%
 }
+\@tracklang@declareoption{norwegian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3071,6 +3408,7 @@
   \AddTrackedIsoLanguage{639-2}{nno}{norsk}%
   \AddTrackedIsoLanguage{3166-1}{NO}{norsk}%
 }
+\@tracklang@declareoption{norsk}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3081,6 +3419,7 @@
   \AddTrackedIsoLanguage{639-1}{oc}{occitan}%
   \AddTrackedIsoLanguage{639-2}{oci}{occitan}%
 }
+\@tracklang@declareoption{occitan}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3090,6 +3429,7 @@
   \AddTrackedLanguage{piedmontese}%
   \AddTrackedIsoLanguage{3166-1}{IT}{piedmontese}%
 }
+\@tracklang@declareoption{piedmontese}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3099,6 +3439,7 @@
   \AddTrackedDialect{piemonteis}{piedmontese}%
   \AddTrackedIsoLanguage{3166-1}{IT}{piemonteis}%
 }
+\@tracklang@declareoption{piemonteis}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3109,6 +3450,7 @@
   \AddTrackedIsoLanguage{639-1}{pl}{polish}%
   \AddTrackedIsoLanguage{639-2}{pol}{polish}%
 }
+\@tracklang@declareoption{polish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3121,6 +3463,7 @@
   \AddTrackedIsoLanguage{639-2-T}{ell}{greek}%
   \AddTrackedIsoLanguage{639-2}{ell}{greek}%
 }
+\@tracklang@declareoption{polutonikogreek}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3133,6 +3476,7 @@
   \AddTrackedIsoLanguage{639-2-T}{ell}{greek}%
   \AddTrackedIsoLanguage{639-2}{ell}{greek}%
 }
+\@tracklang@declareoption{polutoniko}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3143,6 +3487,7 @@
   \AddTrackedIsoLanguage{639-1}{pt}{portuges}%
   \AddTrackedIsoLanguage{639-2}{por}{portuges}%
 }
+\@tracklang@declareoption{portuguese}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3153,6 +3498,20 @@
   \AddTrackedIsoLanguage{639-1}{pt}{portuges}%
   \AddTrackedIsoLanguage{639-2}{por}{portuges}%
 }
+\@tracklang@declareoption{portuges}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@portugal}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@portugal{%
+  \AddTrackedDialect{portgual}{portuges}%
+  \AddTrackedIsoLanguage{639-1}{pt}{portuges}%
+  \AddTrackedIsoLanguage{639-2}{por}{portuges}%
+  \AddTrackedIsoLanguage{3166-1}{PT}{portugal}%
+}
+\@tracklang@declareoption{portugal}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3165,6 +3524,7 @@
   \AddTrackedIsoLanguage{639-2-T}{ron}{romanian}%
   \AddTrackedIsoLanguage{639-2}{ron}{romanian}%
 }
+\@tracklang@declareoption{romanian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3175,6 +3535,7 @@
   \AddTrackedIsoLanguage{639-1}{rm}{romansh}%
   \AddTrackedIsoLanguage{639-2}{roh}{romansh}%
 }
+\@tracklang@declareoption{romansh}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3185,6 +3546,7 @@
   \AddTrackedIsoLanguage{639-1}{rm}{romansh}%
   \AddTrackedIsoLanguage{639-2}{roh}{romansh}%
 }
+\@tracklang@declareoption{romansch}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3195,6 +3557,7 @@
   \AddTrackedIsoLanguage{639-1}{rm}{romansh}%
   \AddTrackedIsoLanguage{639-2}{roh}{romansh}%
 }
+\@tracklang@declareoption{rumantsch}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3205,6 +3568,7 @@
   \AddTrackedIsoLanguage{639-1}{rm}{romansh}%
   \AddTrackedIsoLanguage{639-2}{roh}{romansh}%
 }
+\@tracklang@declareoption{romanche}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3215,6 +3579,7 @@
   \AddTrackedIsoLanguage{639-1}{ru}{russian}%
   \AddTrackedIsoLanguage{639-2}{rus}{russian}%
 }
+\@tracklang@declareoption{russian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3225,6 +3590,7 @@
   \AddTrackedIsoLanguage{639-1}{ru}{russian}%
   \AddTrackedIsoLanguage{639-2}{rus}{russian}%
 }
+\@tracklang@declareoption{russianb}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3235,6 +3601,7 @@
   \AddTrackedIsoLanguage{639-1}{se}{samin}%
   \AddTrackedIsoLanguage{639-2}{sme}{samin}%
 }
+\@tracklang@declareoption{samin}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3245,6 +3612,7 @@
   \AddTrackedIsoLanguage{639-1}{sa}{sanskrit}%
   \AddTrackedIsoLanguage{639-2}{san}{sanskrit}%
 }
+\@tracklang@declareoption{sanskrit}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3255,6 +3623,7 @@
   \AddTrackedIsoLanguage{639-1}{gd}{scottish}%
   \AddTrackedIsoLanguage{639-2}{gla}{scottish}%
 }
+\@tracklang@declareoption{scottish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3265,6 +3634,7 @@
   \AddTrackedIsoLanguage{639-1}{gd}{scottish}%
   \AddTrackedIsoLanguage{639-2}{gla}{scottish}%
 }
+\@tracklang@declareoption{gaelic}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3275,6 +3645,7 @@
   \AddTrackedIsoLanguage{639-1}{sr}{serbian}%
   \AddTrackedIsoLanguage{639-2}{srp}{serbian}%
 }
+\@tracklang@declareoption{serbian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3287,6 +3658,7 @@
   \AddTrackedIsoLanguage{639-2-T}{slk}{slovak}%
   \AddTrackedIsoLanguage{639-2}{slk}{slovak}%
 }
+\@tracklang@declareoption{slovak}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3297,6 +3669,7 @@
   \AddTrackedIsoLanguage{639-1}{sl}{slovene}%
   \AddTrackedIsoLanguage{639-2}{slv}{slovene}%
 }
+\@tracklang@declareoption{slovene}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3307,6 +3680,31 @@
   \AddTrackedIsoLanguage{639-1}{sl}{slovene}%
   \AddTrackedIsoLanguage{639-2}{slv}{slovene}%
 }
+\@tracklang@declareoption{slovenian}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@slovenia}
+%    \begin{macrocode}
+\def\@tracklang@add@slovenia{%
+  \AddTrackedDialect{slovenia}{slovene}%
+  \AddTrackedIsoLanguage{639-1}{sl}{slovene}%
+  \AddTrackedIsoLanguage{639-2}{slv}{slovene}%
+  \AddTrackedIsoLanguage{3166-1}{SI}{slovenia}%
+}
+\@tracklang@declareoption{slovenia}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@sloveneistriaslovenian}
+%    \begin{macrocode}
+\def\@tracklang@add@sloveneistriaslovenian{%
+  \AddTrackedDialect{sloveneistriaslovenian}{slovenian}%
+  \AddTrackedIsoLanguage{639-1}{sl}{slovene}%
+  \AddTrackedIsoLanguage{639-2}{slv}{slovene}%
+  \AddTrackedIsoLanguage{3166-1}{SI}{sloveneistriaslovenian}%
+}
+\@tracklang@declareoption{sloveneistriaslovenian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3317,6 +3715,267 @@
   \AddTrackedIsoLanguage{639-1}{es}{spanish}%
   \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
 }
+\@tracklang@declareoption{spanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@spainspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@spainspanish{%
+  \AddTrackedDialect{spainspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{ES}{spainspanish}%
+}
+\@tracklang@declareoption{spainspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@argentinespanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@argentinespanish{%
+  \AddTrackedDialect{argentinespanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{AR}{argentinespanish}%
+}
+\@tracklang@declareoption{argentinespanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@bolivianspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@bolivianspanish{%
+  \AddTrackedDialect{bolivianspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{BO}{bolivianspanish}%
+}
+\@tracklang@declareoption{bolivianspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@chilianspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@chilianspanish{%
+  \AddTrackedDialect{chilianspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{CL}{chilianspanish}%
+}
+\@tracklang@declareoption{chilianspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@columbianspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@columbianspanish{%
+  \AddTrackedDialect{columbianspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{CO}{columbianspanish}%
+}
+\@tracklang@declareoption{columbianspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@costaricanspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@costaricanspanish{%
+  \AddTrackedDialect{costaricanspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{CR}{costaricanspanish}%
+}
+\@tracklang@declareoption{costaricanspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@cubanspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@cubanspanish{%
+  \AddTrackedDialect{cubanspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{CU}{cubanspanish}%
+}
+\@tracklang@declareoption{cubanspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@dominicanspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@dominicanspanish{%
+  \AddTrackedDialect{dominicanspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{DO}{dominicanspanish}%
+}
+\@tracklang@declareoption{dominicanspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@ecudorianspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@ecudorianspanish{%
+  \AddTrackedDialect{ecudorianspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{EC}{ecudorianspanish}%
+}
+\@tracklang@declareoption{ecudorianspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@elsalvadorspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@elsalvadorspanish{%
+  \AddTrackedDialect{elsalvadorspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{SV}{elsalvadorspanish}%
+}
+\@tracklang@declareoption{elsalvadorspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@guatemalanspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@guatemalanspanish{%
+  \AddTrackedDialect{guatemalanspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{GT}{guatemalanspanish}%
+}
+\@tracklang@declareoption{guatemalanspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@honduranspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@honduranspanish{%
+  \AddTrackedDialect{honduranspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{HN}{honduranspanish}%
+}
+\@tracklang@declareoption{honduranspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@mexicanspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@mexicanspanish{%
+  \AddTrackedDialect{mexicanspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{MX}{mexicanspanish}%
+}
+\@tracklang@declareoption{mexicanspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@nicaraguanspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@nicaraguanspanish{%
+  \AddTrackedDialect{nicaraguanspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{NI}{nicaraguanspanish}%
+}
+\@tracklang@declareoption{nicaraguanspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@panamaspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@panamaspanish{%
+  \AddTrackedDialect{panamaspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{PA}{panamaspanish}%
+}
+\@tracklang@declareoption{panamaspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@paraguayspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@paraguayspanish{%
+  \AddTrackedDialect{paraguayspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{PY}{paraguayspanish}%
+}
+\@tracklang@declareoption{paraguayspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@peruvianspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@peruvianspanish{%
+  \AddTrackedDialect{peruvianspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{PE}{peruvianspanish}%
+}
+\@tracklang@declareoption{peruvianspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@puertoricospanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@puertoricospanish{%
+  \AddTrackedDialect{puertoricospanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{PR}{puertoricospanish}%
+}
+\@tracklang@declareoption{puertoricospanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@uruguayspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@uruguayspanish{%
+  \AddTrackedDialect{uruguayspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{UY}{uruguayspanish}%
+}
+\@tracklang@declareoption{uruguayspanish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@venezuelanspanish}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@venezuelanspanish{%
+  \AddTrackedDialect{venezuelanspanish}{spanish}%
+  \AddTrackedIsoLanguage{639-1}{es}{spanish}%
+  \AddTrackedIsoLanguage{639-2}{spa}{spanish}%
+  \AddTrackedIsoLanguage{3166-1}{VE}{venezuelanspanish}%
+}
+\@tracklang@declareoption{venezuelanspanish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3327,6 +3986,63 @@
   \AddTrackedIsoLanguage{639-1}{sv}{swedish}%
   \AddTrackedIsoLanguage{639-2}{swe}{swedish}%
 }
+\@tracklang@declareoption{swedish}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@swissgerman}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@swissgerman{%
+  \AddTrackedDialect{swissgerman}{german}%
+  \AddTrackedIsoLanguage{639-1}{de}{german}%
+  \AddTrackedIsoLanguage{639-2-B}{ger}{german}%
+  \AddTrackedIsoLanguage{639-2-T}{deu}{german}%
+  \AddTrackedIsoLanguage{639-2}{deu}{german}%
+  \AddTrackedIsoLanguage{3166-1}{CH}{swissgerman}%
+}
+\@tracklang@declareoption{swissgerman}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@swissfrench}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@swissfrench{%
+  \AddTrackedDialect{swissfrench}{french}%
+  \AddTrackedIsoLanguage{639-1}{fr}{french}%
+  \AddTrackedIsoLanguage{639-2-B}{fre}{french}%
+  \AddTrackedIsoLanguage{639-2-T}{fra}{french}%
+  \AddTrackedIsoLanguage{639-2}{fra}{french}%
+  \AddTrackedIsoLanguage{3166-1}{CH}{swissfrench}%
+}
+\@tracklang@declareoption{swissfrench}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@swissitalian}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@swissitalian{%
+  \AddTrackedDialect{swissitalian}{italian}%
+  \AddTrackedIsoLanguage{639-1}{it}{italian}%
+  \AddTrackedIsoLanguage{639-2}{ita}{italian}%
+  \AddTrackedIsoLanguage{3166-1}{CH}{swissitalian}%
+}
+\@tracklang@declareoption{swissitalian}
+%    \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@tracklang@add@swissromansh}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\@tracklang@add@swissromansh{%
+  \AddTrackedDialect{swissromansh}{romansh}%
+  \AddTrackedIsoLanguage{639-1}{rm}{romansh}%
+  \AddTrackedIsoLanguage{639-2}{roh}{romansh}%
+  \AddTrackedIsoLanguage{3166-1}{CH}{swissromansh}%
+}
+\@tracklang@declareoption{swissromansh}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3336,6 +4052,7 @@
   \AddTrackedLanguage{syriac}%
   \AddTrackedIsoLanguage{639-2}{syr}{syriac}%
 }
+\@tracklang@declareoption{syriac}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3346,6 +4063,7 @@
   \AddTrackedIsoLanguage{639-1}{ta}{tamil}%
   \AddTrackedIsoLanguage{639-2}{tam}{tamil}%
 }
+\@tracklang@declareoption{tamil}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3356,6 +4074,7 @@
   \AddTrackedIsoLanguage{639-1}{te}{telugu}%
   \AddTrackedIsoLanguage{639-2}{tel}{telugu}%
 }
+\@tracklang@declareoption{telugu}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3365,6 +4084,7 @@
   \AddTrackedLanguage{tai}%
   \AddTrackedIsoLanguage{639-2}{tai}{tai}%
 }
+\@tracklang@declareoption{tai}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3375,6 +4095,7 @@
   \AddTrackedIsoLanguage{639-1}{th}{thai}%
   \AddTrackedIsoLanguage{639-2}{tha}{thai}%
 }
+\@tracklang@declareoption{thai}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3387,6 +4108,7 @@
   \AddTrackedIsoLanguage{639-2-T}{bod}{tibetan}%
   \AddTrackedIsoLanguage{639-2}{bod}{tibetan}%
 }
+\@tracklang@declareoption{tibetan}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3397,6 +4119,7 @@
   \AddTrackedIsoLanguage{639-1}{tr}{turkish}%
   \AddTrackedIsoLanguage{639-2}{tur}{turkish}%
 }
+\@tracklang@declareoption{turkish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3407,6 +4130,7 @@
   \AddTrackedIsoLanguage{639-1}{tk}{turkmen}%
   \AddTrackedIsoLanguage{639-2}{tuk}{turkmen}%
 }
+\@tracklang@declareoption{turkmen}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3418,6 +4142,7 @@
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
   \AddTrackedIsoLanguage{3166-1}{GB}{UKenglish}%
 }
+\@tracklang@declareoption{UKenglish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3429,6 +4154,7 @@
   \AddTrackedIsoLanguage{639-2}{ukr}{ukrainian}%
   \AddTrackedIsoLanguage{3166-1}{UA}{ukrainian}%
 }
+\@tracklang@declareoption{ukrainian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3440,6 +4166,7 @@
   \AddTrackedIsoLanguage{639-2}{ukr}{ukrainian}%
   \AddTrackedIsoLanguage{3166-1}{UA}{ukraineb}%
 }
+\@tracklang@declareoption{ukraineb}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3451,6 +4178,7 @@
   \AddTrackedIsoLanguage{639-2}{ukr}{ukrainian}%
   \AddTrackedIsoLanguage{3166-1}{UA}{ukraine}%
 }
+\@tracklang@declareoption{ukraine}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3461,6 +4189,7 @@
   \AddTrackedIsoLanguage{639-1}{ur}{urdu}%
   \AddTrackedIsoLanguage{639-2}{urd}{urdu}%
 }
+\@tracklang@declareoption{urdu}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3471,6 +4200,7 @@
   \AddTrackedIsoLanguage{639-2}{dsb}{usorbian}%
   \AddTrackedIsoLanguage{3166-1}{DE}{usorbian}%
 }
+\@tracklang@declareoption{usorbian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3481,6 +4211,7 @@
   \AddTrackedIsoLanguage{639-2}{hsb}{usorbian}%
   \AddTrackedIsoLanguage{3166-1}{DE}{uppersorbian}%
 }
+\@tracklang@declareoption{uppersorbian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3492,6 +4223,7 @@
   \AddTrackedIsoLanguage{639-2}{eng}{english}%
   \AddTrackedIsoLanguage{3166-1}{US}{USenglish}%
 }
+\@tracklang@declareoption{USenglish}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3502,6 +4234,7 @@
   \AddTrackedIsoLanguage{639-1}{ca}{catalan}%
   \AddTrackedIsoLanguage{639-2}{cat}{catalan}%
 }
+\@tracklang@declareoption{valencian}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3512,6 +4245,7 @@
   \AddTrackedIsoLanguage{639-1}{ca}{catalan}%
   \AddTrackedIsoLanguage{639-2}{cat}{catalan}%
 }
+\@tracklang@declareoption{valencien}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3522,16 +4256,21 @@
   \AddTrackedIsoLanguage{639-1}{vi}{vietnamese}%
   \AddTrackedIsoLanguage{639-2}{vie}{vietnamese}%
 }
+\@tracklang@declareoption{vietnamese}
 %    \end{macrocode}
 %\end{macro}
 %
 %\begin{macro}{\@tracklang@add@walloon}
+% No country code as Walloon is spoken in multiple regions
+% (Wallonia in Belgium, some villages in Northern France and northeast of
+% Wisconsin.) Not the same as Belgian French.
 %    \begin{macrocode}
 \def\@tracklang@add@walloon{%
   \AddTrackedLanguage{walloon}%
   \AddTrackedIsoLanguage{639-1}{wa}{walloon}%
   \AddTrackedIsoLanguage{639-2}{wln}{walloon}%
 }
+\@tracklang@declareoption{walloon}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3544,6 +4283,7 @@
   \AddTrackedIsoLanguage{639-2-T}{cym}{welsh}%
   \AddTrackedIsoLanguage{639-2}{cym}{welsh}%
 }
+\@tracklang@declareoption{welsh}
 %    \end{macrocode}
 %\end{macro}
 %
@@ -3556,9 +4296,330 @@
   \AddTrackedIsoLanguage{639-2-T}{cym}{welsh}%
   \AddTrackedIsoLanguage{639-2}{cym}{welsh}%
 }
+\@tracklang@declareoption{cymraeg}
 %    \end{macrocode}
 %\end{macro}
 %
+% Add some dialect synonyms:
+%\begin{macro}{\LetTrackLangOption}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\def\LetTrackLangOption#1#2{%
+  \expandafter\let\csname @tracklang@add@#1\expandafter\endcsname
+    \csname @tracklang@add@#2\endcsname
+  \@tracklang@declareoption{#1}%
+}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-US}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-US}{american}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-GB}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-GB}{british}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-AU}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-AU}{australian}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-NZ}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-NZ}{newzealand}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-CA}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-CA}{canadian}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@fr-CA}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{fr-CA}{canadien}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@fr-BE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{fr-BE}{belgique}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@pt-BR}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{pt-BR}{brazilian}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@it-HR}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{it-HR}{istriacountyitalian}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@nl-BE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{nl-BE}{flemish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@fr-FR}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{fr-FR}{france}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@de-DE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{de-DE}{ngermanDE}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@de-BE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{de-BE}{belgiangerman}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-GG}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-GG}{guernseyenglish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@fr-GG}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{fr-GG}{guernseyfrench}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@it-IT}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{it-IT}{italy}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@mt-MT}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{mt-MT}{maltamaltese}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-MT}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-MT}{maltaenglish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-IM}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-IM}{isleofmanenglish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@en-JE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{en-JE}{jerseyenglish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@fr-JE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{fr-JE}{jerseyfrench}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@nl-NL}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{nl-NL}{netherlands}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@pt-PT}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{pt-PT}{portugal}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@it-SM}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{it-SM}{sanmarino}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@sl-SI}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{sl-SI}{slovenia}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@it-SI}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{it-SI}{sloveneistriaitalian}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-ES}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-ES}{spainspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-AR}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-AR}{argentinespanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-BO}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-BO}{bolivianspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-CL}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-CL}{chilianspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-CO}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-CO}{columbianspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-CR}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-CR}{costaricanspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-CU}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-CU}{cubanspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-DO}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-DO}{dominicanspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-EC}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-EC}{ecudorianspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-SV}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-SV}{elsalvadorspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-GT}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-GT}{guatemalanspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-HN}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-HN}{honduranspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-MX}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-MX}{mexicanspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-NI}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-NI}{nicaraguanspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-PA}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-PA}{panamaspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-PY}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-PY}{paraguayspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-PE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-PE}{peruvianspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-PR}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-PR}{puertoricospanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-UY}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-UY}{uruguayspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@es-VE}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{es-VE}{venezuelanspanish}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@de-CH}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{de-CH}{swissgerman}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@fr-CH}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{fr-CH}{swissfrench}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@it-CH}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{it-CH}{swissitalian}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@rm-CH}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{rm-CH}{swissromansh}
+%    \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@tracklang@add@it-VA}
+%\changes{1.1}{2014-11-21}{new}
+%    \begin{macrocode}
+\LetTrackLangOption{it-VA}{vatican}
+%    \end{macrocode}
+%\end{macro}
+%
+%\subsubsection{Conditionals and Loops}
+%
 %\begin{macro}{\IfTrackedLanguage}
 %\begin{definition}
 %\cs{IfTrackedLanguage}\marg{language}\marg{true part}\marg{false
diff --git a/Master/texmf-dist/source/latex/tracklang/tracklang.ins b/Master/texmf-dist/source/latex/tracklang/tracklang.ins
index 273053c1a22..85b60663550 100644
--- a/Master/texmf-dist/source/latex/tracklang/tracklang.ins
+++ b/Master/texmf-dist/source/latex/tracklang/tracklang.ins
@@ -1,4 +1,4 @@
-% tracklang.ins generated using makedtx version 1.1 2014/9/29 15:50
+% tracklang.ins generated using makedtx version 1.1 2014/11/24 14:35
 \input docstrip
 
 \preamble