summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-29 21:16:01 +0000
committerKarl Berry <karl@freefriends.org>2018-07-29 21:16:01 +0000
commitf1d5ff4d5041a7f804fb723d4634d41f410d7f60 (patch)
treed7bba6f3b058b81a68dab54b0f63bc59826226ce /Master/texmf-dist/tex/latex/glossaries-extra
parent844aa1bb2859867c52f86f383203db56607bd74c (diff)
glossaries-extra (29jul18)
git-svn-id: svn://tug.org/texlive/trunk@48308 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.sty43
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty2
4 files changed, 38 insertions, 11 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 3355dbd3335..85267c272db 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/07/26 v1.33 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2018/07/29 v1.34 (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 ff696ed1ed9..b63a0371724 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/07/26 v1.33 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2018/07/29 v1.34 (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 646793c654f..ebbf6643cde 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/07/26 v1.33 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2018/07/29 v1.34 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -361,13 +361,15 @@
\newcommand*{\@glsxtrdocdeffalse}{\def\@glsxtr@docdefval{0}}
\define@choicekey{glossaries-extra.sty}{docdef}
[\@glsxtr@docdefsetting\@glsxtr@docdefval]%
- {false,true,restricted}[true]%
+ {false,true,restricted,atom}[true]%
{%
- \ifnum\@glsxtr@docdefval=2\relax
+ \ifnum\@glsxtr@docdefval>1\relax
\renewcommand*{\@glsdoifexistsorwarn}{\glsdoifexists}%
+ \else
+ \renewcommand*{\@glsdoifexistsorwarn}{\glsdoifexistsorwarn}%
\fi
}
-\newcommand*{\if@glsxtrdocdefrestricted}{\ifnum\@glsxtr@docdefval=2 }
+\newcommand*{\if@glsxtrdocdefrestricted}{\ifnum\@glsxtr@docdefval>1 }
\newcommand*{\@glsdoifexistsorwarn}{\glsdoifexistsorwarn}
\define@boolkey{glossaries-extra.sty}[@glsxtr]{indexcrossrefs}[true]{%
\if@glsxtrindexcrossrefs
@@ -578,6 +580,7 @@
\@glsxtr@declareoption{accsupp}{%
\renewcommand*{\@glsxtr@doaccsupp}{\RequirePackage{glossaries-accsupp}}}
\newcommand{\glsxtrNoGlossaryWarning}[1]{%
+ \GlossariesExtraWarning{Glossary `#1' is missing}%
\@glsxtr@defaultnoglossarywarning{#1}%
}
\define@choicekey{glossaries-extra.sty}{nomissingglstext}
@@ -771,8 +774,10 @@
\disable@keys{glossaries-extra.sty}{abbreviations,docdef,record}%
\def\@glsxtrundeftag{\glsxtrundeftag}%
}
-\renewcommand*{\ifglsused}[3]{%
- \glsdoifexists{#1}{\ifbool{glo@\glsdetoklabel{#1}@flag}{#2}{#3}}%
+\newcommand*{\GlsXtrIfUnusedOrUndefined}[3]{%
+ \ifglsentryexists{#1}%
+ {\ifbool{glo@\glsdetoklabel{#1}@flag}{#3}{#2}}%
+ {#2}%
}
\newcommand{\glsxtrifemptyglossary}[3]{%
\ifcsdef{glolist@#1}%
@@ -1133,6 +1138,9 @@
\GlossariesExtraWarning{Glossary `#1' is not defined}%
}%
}
+\renewcommand*{\ifglsused}[3]{%
+ \glsdoifexists{#1}{\ifbool{glo@\glsdetoklabel{#1}@flag}{#2}{#3}}%
+}
\renewcommand*{\longnewglossaryentry}{%
\@ifstar\@glsxtr@s@longnewglossaryentry\@glsxtr@longnewglossaryentry
}
@@ -1576,10 +1584,29 @@
\@gls@restoreat
\undef\@gls@restoreat
\gls@defdocnewglossaryentry
+ \else
+ \ifnum\@glsxtr@docdefval=3\relax
+ \@gls@enablesavenonumberlist
+ \let\gls@checkseeallowed\relax
+ \let\newglossaryentry\new@atom@glossaryentry
+ \global\newwrite\@gls@deffile
+ \immediate\openout\@gls@deffile=\jobname.glsdefs
+ \forallglsentries{\@glsentry}{\@gls@writedef{\@glsentry}}%
+ \fi
\fi
}
}
-{}
+{%
+ \ifnum\@glsxtr@docdefval=3\relax
+ \PackageError{glossaries-extra}{Package option
+ `docdef=\@glsxtr@docdefsetting' requires at least version 4.37
+ of the base glossaries.sty package}{}
+ \fi
+}
+\newrobustcmd{\new@atom@glossaryentry}[2]{%
+ \gls@defglossaryentry{#1}{#2}%
+ \@gls@writedef{#1}%
+}
\let\glsxtr@orgmakenoidxglossaries\makenoidxglossaries
\renewcommand{\makenoidxglossaries}{%
\ifdefequal\@glsxtr@record@setting\@glsxtr@record@setting@off
@@ -1634,7 +1661,7 @@
\or
\let\gls@checkseeallowed\relax
\let\newglossaryentry\new@glossaryentry
- \or
+ \else
\let\gls@checkseeallowed\relax
\fi
}%
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 a65f76b902a..c0d50d84cc0 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/07/26 v1.33 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2018/07/29 v1.34 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\newcommand{\glsxtrbookindexcols}{2}