summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-24 21:35:50 +0000
committerKarl Berry <karl@freefriends.org>2018-05-24 21:35:50 +0000
commit7f3c84d5d08d7a3c4047e31edfb3164ef787de97 (patch)
tree3a2143921e1eae624611bc3c1df190c533825c2c /Master/texmf-dist/tex/latex/glossaries-extra
parentdda5f2b19723c40bd75b36316e7651896f74013d (diff)
glossaries-extra (24may18)
git-svn-id: svn://tug.org/texlive/trunk@47827 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries-extra')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty76
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty2
4 files changed, 78 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
index 4b0c1cc3a89..58083081301 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-bib2gls}[2018/05/09 v1.31 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2018/05/24 v1.32 (NLCT)]
\newcommand*{\glshex}{\string\u}
\newcommand*{\glscapturedgroup}{\string\$}
\newcommand*{\GlsXtrIfHasNonZeroChildCount}[3]{%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
index 195583b6bac..298703659f6 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2018/05/09 v1.31 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2018/05/24 v1.32 (NLCT)]
\newcommand*{\@glsxtr@loadstyles}{}
\DeclareOption{all}{%
\appto\@glsxtr@loadstyles{%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
index 35d8c1382a1..b663a132301 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2018/05/09 v1.31 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2018/05/24 v1.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -1005,6 +1005,80 @@
}%
{#5}%
}
+\ifdef\foreignlanguage
+{
+ \ifdef\GetTrackedDialectFromLanguageTag
+ {
+ \newcommand{\GlsXtrForeignText}[2]{%
+ \let\@glsxtr@org@currentfieldvalue\glscurrentfieldvalue
+ \glsxtrifhasfield{\GlsXtrForeignTextField}{#1}%
+ {%
+ \expandafter\GetTrackedDialectFromLanguageTag\expandafter
+ {\glscurrentfieldvalue}{\@glsxtr@dialect}%
+ \let\@glsxtr@locale\glscurrentfieldvalue
+ \let\glscurrentfieldvalue\@glsxtr@org@currentfieldvalue
+ \ifdefempty\@glsxtr@dialect
+ {%
+ \ifundef\TrackedDialectClosestSubMatch
+ {%
+ \GlossariesExtraWarning{Can't obtain dialect label
+ (tracklang v1.3.6+ required)}%
+ }%
+ {\let\@glsxtr@dialect\TrackedDialectClosestSubMatch}%
+ }%
+ {}%
+ \ifdefempty\@glsxtr@dialect
+ {%
+ }%
+ {%
+ \ifcsundef{captions\@glsxtr@dialect}{}%
+ {%
+ \IfTrackedDialectHasMapping{\@glsxtr@dialect}%
+ {%
+ \edef\@glsxtr@dialect{%
+ \GetTrackedDialectToMapping{\@glsxtr@dialect}}%
+ \ifcsundef{captions\@glsxtr@dialect}{}%
+ {%
+ \ifcsundef{captions\@tracklang@lang}{}%
+ {%
+ \let\@glsxtr@dialect\@tracklang@lang
+ }%
+ }%
+ }%
+ {%
+ \ifcsundef{captions\@tracklang@lang}{}%
+ {%
+ \let\@glsxtr@dialect\@tracklang@lang
+ }%
+ }%
+ }%
+ }%
+ \ifdefempty\@glsxtr@dialect
+ {%
+ \GlsXtrUnknownDialectWarning{\@glsxtr@locale}{\@tracklang@lang}%
+ #2%
+ }%
+ {\foreignlanguage{\@glsxtr@dialect}{#2}}%
+ }%
+ {#2}% key not set
+ }
+ }
+ {
+ \newcommand{\GlsXtrForeignText}[2]{%
+ \GlossariesExtraWarning{Can't encapsulate foreign text:
+ tracklang v1.3.6+ required}%
+ #2%
+ }
+ }
+}
+{
+ \newcommand{\GlsXtrForeignText}[2]{#2}
+}
+\newcommand*{\GlsXtrForeignTextField}{userii}
+\newcommand*{\GlsXtrUnknownDialectWarning}[2]{%
+ \GlossariesExtraWarning{Can't determine valid dialect label
+ for locale `#1' (root language: #2)}%
+}
\ifdef\GlsEntryCounterLabelPrefix
{%
\newcommand*{\glsxtrpageref}[1]{%
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
index 8c3d5bd66f2..461d0469b20 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2018/05/09 v1.31 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2018/05/24 v1.32 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\newcommand{\glsxtrbookindexcols}{2}