From bec19ad7aea6f3d69d967f735ebc501d4097155d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 21 Feb 2018 23:32:28 +0000 Subject: tracklang (21feb18) git-svn-id: svn://tug.org/texlive/trunk@46703 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/tracklang/tracklang-scripts.sty | 6 ++--- .../texmf-dist/tex/latex/tracklang/tracklang.sty | 31 +++++++++++++++++----- 2 files changed, 27 insertions(+), 10 deletions(-) (limited to 'Master/texmf-dist/tex/latex/tracklang') diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty index 9c1df878c3e..7d192dddddb 100644 --- a/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty +++ b/Master/texmf-dist/tex/latex/tracklang/tracklang-scripts.sty @@ -7,11 +7,11 @@ %% tracklang.dtx (with options: `tracklang-scripts.sty,package') %% %% tracklang.dtx -%% Copyright 2017 Nicola Talbot +%% Copyright 2018 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (at your option) any later version. +%% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX @@ -51,7 +51,7 @@ %% do code now to initialise %% Pass all options to tracklang: \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang-scripts}[2016/11/03 v1.3.3 (NLCT) Track +\ProvidesPackage{tracklang-scripts}[2018/02/21 v1.3.5 (NLCT) Track Language Scripts (LaTeX)] \RequirePackage{tracklang} \input{tracklang-scripts} diff --git a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty index 949543cc732..24949e85efd 100644 --- a/Master/texmf-dist/tex/latex/tracklang/tracklang.sty +++ b/Master/texmf-dist/tex/latex/tracklang/tracklang.sty @@ -7,11 +7,11 @@ %% tracklang.dtx (with options: `tracklang.sty,package') %% %% tracklang.dtx -%% Copyright 2017 Nicola Talbot +%% Copyright 2018 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license of (at your option) any later version. +%% of this license or (at your option) any later version. %% The latest version of this license is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX @@ -51,7 +51,7 @@ %% do code now to initialise %% Pass all options to tracklang: \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{tracklang}[2017/03/25 v1.3.4 (NLCT) Track Languages] +\ProvidesPackage{tracklang}[2018/02/21 v1.3.5 (NLCT) Track Languages] \providecommand*{\@tracklang@declareoption}[1]{% \DeclareOption{#1}{\TrackPredefinedDialect{#1}}% } @@ -76,10 +76,27 @@ {% \@ifpackageloaded{polyglossia} {% - \@for\this@language:=\@tracklang@declaredoptions\do{% - \@ifundefined{\this@language @loaded}% - {}% - {\@nameuse{@tracklang@add@\this@language}}% + \@ifundefined{xpg@loaded}% + {% + \PackageInfo{tracklang}{polyglossia loaded but + \string\xpg@loaded\space not defined. Will attempt + to track known languages.}% + \@for\this@language:=\@tracklang@declaredoptions\do{% + \@ifundefined{\this@language @loaded}% + {}% + {\@nameuse{@tracklang@add@\this@language}}% + }% + }% + {% + \@for\this@language:=\xpg@loaded\do{% + \@ifundefined{@tracklang@add@\this@language}% + {% + \PackageWarning{tracklang}% + {Adding unknown polyglossia language `\this@language'}% + \AddTrackedLangage{\this@language}% + }% + {\@nameuse{@tracklang@add@\this@language}}% + }% }% }% {% -- cgit v1.2.3