texlive[67504] Master/texmf-dist: nlctdoc (28jun23)
commits+karl at tug.org
commits+karl at tug.org
Wed Jun 28 22:07:55 CEST 2023
Revision: 67504
http://tug.org/svn/texlive?view=revision&revision=67504
Author: karl
Date: 2023-06-28 22:07:55 +0200 (Wed, 28 Jun 2023)
Log Message:
-----------
nlctdoc (28jun23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/nlctdoc/README
trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls
trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty
Modified: trunk/Master/texmf-dist/doc/latex/nlctdoc/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/nlctdoc/README 2023-06-28 20:07:32 UTC (rev 67503)
+++ trunk/Master/texmf-dist/doc/latex/nlctdoc/README 2023-06-28 20:07:55 UTC (rev 67504)
@@ -1,4 +1,4 @@
-nlctdoc.cls and nlctuserguide.sty v1.08 (2022-10-14):
+nlctdoc.cls and nlctuserguide.sty v1.09 (2023-06-28):
This class and package is provided "as is" solely for the benefit
of anyone who wants to compile the documentation for
Modified: trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls 2023-06-28 20:07:32 UTC (rev 67503)
+++ trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls 2023-06-28 20:07:55 UTC (rev 67504)
@@ -4,7 +4,7 @@
% copy the code here to another file and modify it for your own purposes.
% There's no guarantee that it will work with other packages.
%
-% Copyright 2013-2022 Nicola Talbot
+% Copyright 2013-2023 Nicola Talbot
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,7 +18,7 @@
% for existing documents that use it.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{nlctdoc}[2022/10/14 v1.08 (NLCT)]
+\ProvidesClass{nlctdoc}[2023/06/28 v1.09 (NLCT)]
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
% tex4ht stopped working with koma during TL2013.
Modified: trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty 2023-06-28 20:07:32 UTC (rev 67503)
+++ trunk/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty 2023-06-28 20:07:55 UTC (rev 67504)
@@ -4,7 +4,7 @@
% copy the code here to another file and modify it for your own purposes.
% There's no guarantee that it will work with other packages.
%
-% Copyright 2022 Nicola Talbot
+% Copyright 2022-2023 Nicola Talbot
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nlctuserguide}[2022/10/14 v1.08 (NLCT)]
+\ProvidesPackage{nlctuserguide}[2023/06/28 v1.09 (NLCT)]
\newcommand{\nlctdoc at loadxr}{}
\DeclareOption{xr}{\renewcommand{\nlctdoc at loadxr}{\RequirePackage{xr-hyper}}}
@@ -249,7 +249,7 @@
\MFUexcl{\gallerypage}
\newcommand*{\faqspkg}[1]{%
- \dickimawhref{faqs/#1faq.html}{\styfmt{#1} FAQ}%
+ \dickimawhref{faq.php?category=#1}{\styfmt{#1} FAQ}%
}
\MFUexcl{\faqspkg}
@@ -282,7 +282,7 @@
\newcommand*{\@refslist}[4]{%
\bgroup
\renewcommand{\DTLlistformatitem}{\ref}%
- \renewcommand*{\DTLlistformatsep}{#2}
+ \renewcommand*{\DTLlistformatsep}{#2}%
\renewcommand*{\DTLlistformatlastsep}{#3}%
#1\DTLformatlist{#4}%
\egroup
@@ -420,6 +420,8 @@
\MFUaddmap{\examplesref}{\Examplesref}
\newcommand*{\plabel}[2][]{\protected at edef\@currentlabelname{#1}\label{#2}}
+\newcommand*{\pref}[2][]{on page~\pageref{#2}}
+\newcommand*{\phyperref}[2]{\hyperref[#2]{#1} on page~\pageref{#2}}
\newcommand*{\dash}{\,---\,}
@@ -471,7 +473,9 @@
\fi
}
-\newrobustcmd*{\fnsym}[1]{%
+\newrobustcmd*{\fnsym}{\@ifstar\s at fnsym\@fnsym}
+
+\newcommand{\@fnsym}[1]{%
\tablefnmark
{%
\fnsymmark
@@ -481,6 +485,13 @@
}%
}
+\newcommand{\s at fnsym}[1]{%
+ \tablefnmark
+ {%
+ \fnsymmarker{#1}%
+ }%
+}
+
\newcommand{\tablefns}[1]{\par
\parbox{0.8\linewidth}
{\raggedright
@@ -627,18 +638,22 @@
\newlength\boxtitleshift
\setlength{\boxtitleshift}{-2.5mm}
+\newcounter{icon}
+\newcommand*{\icon}[1]{\stepcounter{icon}\glssymbol[counter=icon]{sym.#1}}
+\newcommand*{\icontext}[1]{\stepcounter{icon}\glstext[counter=icon]{sym.#1}}
+
\newtcolorbox{warning}[1][]{breakable,
- title={\glssymbol{sym.warning}},
+ title={\icon{warning}},
coltitle=red,colbacktitle=red!20!white,
colframe=red,colback=red!5!white,
enhanced,attach boxed title to top right={yshift=\boxtitleshift},#1}
-\newtcolorbox{important}[1][]{breakable,title={\glssymbol{sym.important}},
+\newtcolorbox{important}[1][]{breakable,title={\icon{important}},
coltitle=red,colbacktitle=red!20!white,
colframe=red,colback=red!5!white,
enhanced,attach boxed title to top right={yshift=\boxtitleshift},#1}
-\newtcolorbox{information}[1][]{breakable,title={\glssymbol{sym.information}},
+\newtcolorbox{information}[1][]{breakable,title={\icon{information}},
coltitle=teal,colbacktitle=teal!20!white,
colframe=teal,colback=teal!5!white,
enhanced,attach boxed title to top right={yshift=\boxtitleshift},#1}
@@ -649,7 +664,7 @@
\newcommand{\nlctdefaultafter}{\par\noindent\ignorespacesafterend}
-\newtcolorbox{pinnedbox}[1][]{unbreakable,title={\glssymbol{sym.definition}},
+\newtcolorbox{pinnedbox}[1][]{unbreakable,title={\icon{definition}},
coltitle=black,colbacktitle=defbackground,
colframe=black,colback=defbackground,halign=flush left,
enhanced,attach boxed title to top right={yshift=\boxtitleshift},
@@ -664,7 +679,7 @@
}
-\newtcolorbox{settingsbox}[1][]{title={\glssymbol{sym.valuesetting}},unbreakable,
+\newtcolorbox{settingsbox}[1][]{title={\icon{valuesetting}},unbreakable,
coltitle=black,colbacktitle=defbackground!20!white,
colframe=black,colback=defbackground!20!white,halign=flush left,
enhanced,attach boxed title to top right={yshift=\boxtitleshift},
@@ -672,7 +687,7 @@
#1
}
-\newtcolorbox{terminal}{unbreakable,title={\glssymbol{sym.terminal}},
+\newtcolorbox{terminal}{unbreakable,title={\icon{terminal}},
colframe=black,
enhanced,attach boxed title to top right={yshift=\boxtitleshift},
after={\nlctdefaultafter},
@@ -679,7 +694,7 @@
halign=flush left,fontupper=\ttfamily,before upper={\frenchspacing\obeylines}
}
-\newtcolorbox{transcript}{unbreakable,title={\glssymbol{sym.transcript}},
+\newtcolorbox{transcript}{unbreakable,title={\icon{transcript}},
colframe=black,
enhanced,attach boxed title to top right={yshift=\boxtitleshift},
after={\nlctdefaultafter},
@@ -722,7 +737,7 @@
\definecolor{codebackground}{gray}{0.95}
-\newtcolorbox{codebox}[1][]{title={\glssymbol{sym.code}},
+\newtcolorbox{codebox}[1][]{title={\icon{code}},
enhanced,breakable,attach boxed title to top right={yshift=\boxtitleshift},
halign=flush left,fontupper=\codefont,colback=codebackground,
before upper={%
@@ -734,7 +749,7 @@
#1
}
-\newtcolorbox{codebox*}[1][]{title={\glssymbol{sym.code}},
+\newtcolorbox{codebox*}[1][]{title={\icon{code}},
enhanced,breakable,
attach boxed title to top right={yshift=\boxtitleshift},
halign=flush left,fontupper=\codefont,colback=codebackground,
@@ -745,11 +760,11 @@
}
\newenvironment{badcodebox}%
-{\begin{codebox}[title={\glssymbol{sym.badcode}}]}
+{\begin{codebox}[title={\icon{badcode}}]}
{\end{codebox}\noindent\ignorespacesafterend}
\newenvironment{unicodebox}%
-{\begin{codebox}[title={\glssymbol{sym.unicode}}]}
+{\begin{codebox}[title={\icon{unicode}}]}
{\end{codebox}\noindent\ignorespacesafterend}
\newtcolorbox{compactcodebox}[1][]{%
@@ -772,7 +787,7 @@
\newcommand*{\result at attachtag}{}
-\newtcolorbox{resultbox}[1][]{title={\glssymbol{sym.result}},
+\newtcolorbox{resultbox}[1][]{title={\icon{result}},
coltitle=black,colbacktitle=white,
colframe=black,colback=white,
after={\nlctdefaultafter},
@@ -779,7 +794,7 @@
enhanced,attach boxed title to top right={yshift=\boxtitleshift},#1}
\newtcolorbox{coderesult}[1][]{skin=bicolor,
-title={\glssymbol{sym.code} \glssymbol{sym.result}},
+title={\icon{code} \icon{result}},
attach boxed title to top center={yshift=\boxtitleshift},
sidebyside,
sidebyside align=top,
@@ -797,7 +812,7 @@
}
\newtcolorbox{coderesult*}[1][]{skin=bicolor,
-title={\glssymbol{sym.code} \glssymbol{sym.result}},
+title={\icon{code} \icon{result}},
attach boxed title to top center={yshift=\boxtitleshift},
sidebyside,
sidebyside align=top,
@@ -812,11 +827,11 @@
}
\newenvironment{unicoderesult}%
-{\begin{coderesult}[title={\glssymbol{sym.unicode} \glssymbol{sym.result}}]}
+{\begin{coderesult}[title={\icon{unicode} \icon{result}}]}
{\end{coderesult}\noindent\ignorespacesafterend}
\newenvironment{unicoderesult*}%
-{\begin{coderesult*}[title={\glssymbol{sym.unicode} \glssymbol{sym.result}}]}
+{\begin{coderesult*}[title={\icon{unicode} \icon{result}}]}
{\end{coderesult*}\noindent\ignorespacesafterend}
@@ -1378,17 +1393,11 @@
\newcommand{\Idx}{\dGls}
\newcommand{\Idxpl}{\dGlspl}
\newcommand{\idxc}{\dglslink}
-\newcommand{\idxn}[2][]{%
- \ifglsentryexists{dual.#2}%
- {\glsname[#1]{dual.#2}}%
- {\ifglsentryexists{idx.#2}{\glsname[#1]{idx.#2}}{\glsname[#1]{#2}}}%
-}
-\newcommand{\idxf}[2][]{%
- \ifglsentryexists{dual.#2}%
- {\glsfirst[#1]{dual.#2}}%
- {\ifglsentryexists{idx.#2}{\glsfirst[#1]{idx.#2}}{\glsfirst[#1]{#2}}}%
-}
+\newdglsfield{name}{\idxn}
+\newdglsfield{first}{\idxf}
+\newcommand*{\glscsname}[2][]{\glslink[#1]{#2}{\csfmtfont{#2}}}
+
\newcommand{\optionlistprefix}{opt.}
\newcommand{\optionlistitemformat}[1]{\glsentrytext{#1}}
\newcommand{\optionlisttag}{Option}
@@ -1630,6 +1639,18 @@
{\appto\backmatter{\setupglossaries{numberedsection=nolabel}}}
{}
+\ifdef\appendix
+{
+ \ifdef\chapter
+ {
+ \appto\appendix{%
+ \renewcommand{\Hy at chapapp}{chapter}%
+ }
+ }
+ {}
+}
+{}
+
\ifdef\abstract
{}
{
@@ -1692,6 +1713,14 @@
{\setkeys{printgloss}{target=true}\targetorhyperlink{#1}{\glossentryname{#1}}}%
}
+\newrobustcmd{\aliasref}[1]{\glshyperlink{#1}}
+\newrobustcmd{\initvalref}[1]{\ifglsentryexists{#1}{\glshyperlink{#1}}{\cmd{#1}}}
+\newrobustcmd{\initvalopt}[2]{%
+ \ifstrempty{#1}%
+ {\ifglsentryexists{opt.#2}{\glshyperlink{opt.#2}}{\optfmt{#2}}}%
+ {\ifglsentryexists{opt.#1.#2}{\glshyperlink{opt.#1.#2}}{\optfmt{#2}}}%
+}
+
\newcommand*{\optvaldefcounter}{}
\newcommand*{\inlineidxdef}[1]{%
@@ -1707,16 +1736,18 @@
\egroup
}
+% v1.09: added idx. prefix to \glsunset
\newrobustcmd*{\inlineidxfdef}[1]{%
\mainmatteronly{\mainglsadd{idx.#1}{}}%
\glsxtrglossentryother{}{idx.#1}{first}%
- \glsunset{#1}%
+ \glsunset{idx.#1}%
}
+% v1.09: added idx. prefix to \glsunset
\newrobustcmd*{\inlineidxpdef}[1]{%
\mainmatteronly{\mainglsadd{idx.#1}{}}%
\glsxtrglossentryother{}{idx.#1}{plural}%
- \glsunset{#1}%
+ \glsunset{idx.#1}%
}
\newrobustcmd*{\inlineswitchdef}[1]{%
@@ -1729,6 +1760,11 @@
\glsxtrglossentry{#2}%
}
+\newrobustcmd*{\inlineoptdef}[2][optdef]{%
+ \mainglsadd{opt.#2}{#1}%
+ \glsxtrglossentry{opt.#2}%
+}
+
\newcommand*{\mainglsadd}[3][]{%
\ifstrempty{#3}%
{\def\mainglsaddcounter{}}%
@@ -1777,7 +1813,7 @@
}
\newcommand*{\s at cmddef}[2][]{%
- \def\cmdtitle{\glssymbol{sym.definition}}%
+ \def\cmdtitle{\icon{definition}}%
\def\postnote{}%
\ifnotdefaultstatus{#2}{\def\cmdtitle{\statussym}\def\postnote{\hfill\statustext}}{}%
\begin{pinnedbox}[title=\cmdtitle]
@@ -1870,7 +1906,7 @@
}
\newcommand*{\s at envdef}[2][]{%
- \def\envtitle{\glssymbol{sym.definition}}%
+ \def\envtitle{\icon{definition}}%
\def\postnote{}%
\ifnotdefaultstatus{env.#2}{\def\envtitle{\statussym}\def\postnote{\statustext}}{}%
\begin{pinnedbox}[title=\envtitle]
@@ -1914,7 +1950,7 @@
\newcommand{\pkgnotefmt}[1]{#1}
\newcommand*{\s at pkgdef}[2][]{%
- \def\pkgtitle{\glssymbol{sym.definition}}%
+ \def\pkgtitle{\icon{definition}}%
\def\postnote{}%
\ifnotdefaultstatus{pkg.#2}{\def\pkgtitle{\statussym}\def\postnote{\statustext}}{}%
\begin{pinnedbox}[title=\pkgtitle]
@@ -1956,7 +1992,7 @@
}
\newcommand*{\s at clsdef}[2][]{%
- \def\clstitle{\glssymbol{sym.definition}}%
+ \def\clstitle{\icon{definition}}%
\def\postnote{}%
\ifnotdefaultstatus{cls.#2}{\def\clstitle{\statussym}\def\postnote{\statustext}}{}%
\begin{pinnedbox}[title=\clstitle]
@@ -2036,7 +2072,7 @@
}
\newcommand*{\s at optionvaldef}[2]{%
- \begin{settingsbox}[title={\glssymbol{sym.optionvalue}},
+ \begin{settingsbox}[title={\icon{optionvalue}},
colback=optionvaluedefbackground,
colbacktitle=optionvaluedefbackground
]%
@@ -2043,7 +2079,14 @@
\def\optfmt##1{\textbf{\texttt{##1}}}%
\mainglsadd{optval.#1.#2}{optvaldef}%
\gls!{opt.#1}\dequals\glsxtrglossentry{optval.#1.#2}%
- \ifnotdefaultstatus{optval.#1.#2}{\hfill\statussym}{}%
+ \def\summary at sep{\hfill}%
+ \glsxtrifhasfield*{alias}{optval.#1.#2}%
+ {%
+ \summary at sep\summarytagfmt{alias}%
+ \expandafter\aliasref\expandafter{\glscurrentfieldvalue}%
+ \def\summary at sep{ }%
+ }{}%
+ \ifnotdefaultstatus{optval.#1.#2}{\summary at sep\statussym}{}%
\glsxtrifhasfield{note}{optval.#1.#2}%
{%
\ifx\optnotefmt\@gobble
@@ -2065,7 +2108,7 @@
:\space
\glsxtrifhasfield{alias}{optval.#1.#2}%
{%
- Synonym of \expandafter\glsfmtname\expandafter{\glscurrentfieldvalue}.%
+ Synonym of \expandafter\aliasref\expandafter{\glscurrentfieldvalue}.%
}%
{%
\glossentrydesc{optval.#1.#2}\glspostdescription
@@ -2149,12 +2192,14 @@
\newcommand*{\getinitordefval}[1]{%
\let\currentsyntax\@empty
- \def\settingstitle{\glssymbol{sym.valuesetting}}%
+ \def\settingstitle{\icon{valuesetting}}%
\def\initordefval{}%
\glsxtrifhasfield*{alias}{#1}%
{%
\edef\initordefval{\summarytagfmt{alias}%
- \noexpand\gls{\expandonce\glscurrentfieldvalue}}%
+ \noexpand\aliasref{\expandonce\glscurrentfieldvalue}%
+ \noexpand\global\noexpand\let\noexpand\do at alias\noexpand\@secondoftwo
+ }%
}%
{}%
\glsxtrifhasfield*{syntax}{#1}%
@@ -2175,12 +2220,12 @@
\ifx\currentsyntax\metaboolean
\ifdefstring\glscurrentfieldvalue{true}
{%
- \def\settingstitle{\glssymbol{sym.toggleonsetting}}%
+ \def\settingstitle{\icon{toggleonsetting}}%
}%
{%
\ifdefstring\glscurrentfieldvalue{false}
{%
- \def\settingstitle{\glssymbol{sym.toggleoffsetting}}%
+ \def\settingstitle{\icon{toggleoffsetting}}%
}%
{}%
}%
@@ -2191,7 +2236,7 @@
%\appto\initordefval{\textit{initial:} none}%
}%
}%
- {\def\settingstitle{\glssymbol{sym.novaluesetting}}}%
+ {\def\settingstitle{\icon{novaluesetting}}}%
}
\newcommand*{\ctrdefbookmarklevel}{\cmddefbookmarklevel}
@@ -2205,7 +2250,7 @@
}
\newcommand*{\s at ctrdef}[1]{%
- \def\settingstitle{\glssymbol{sym.counter}}%
+ \def\settingstitle{\icon{counter}}%
\ifnotdefaultstatus{ctr.#1}%
{\appto\settingstitle{\statussym}\def\postnote{\statustext}}%
{}%
@@ -2263,6 +2308,8 @@
\newrobustcmd{\initvalnotefmt}[1]{\textrm{\em #1}}
+\newcommand{\nlctuserguidebibextrapreamble}{}
+
\newcommand*{\nlctuserguidegls}[2][]{%
\bgroup
\let\field\glsbibwritefield
@@ -2279,6 +2326,8 @@
\def\initval{\glsbibwritefield{initvalue}}%
\def\initvalvaries{\glsbibwritefield{initvalue}{\initvalnotefmt{varies}}}%
\def\initvalempty{\glsbibwritefield{initvalue}{\initvalnotefmt{empty}}}%
+ \def\initvalcs##1{\glsbibwritefield{initvalue}{\initvalref{##1}}}%
+ \def\initvalopt##1##2{\glsbibwritefield{initvalue}{\initvalopt{##1}{##2}}}%
\def\note{\glsbibwritefield{note}}%
\def\deprecated{\glsbibwritefield{status}{deprecated}}%
\def\banned{\glsbibwritefield{status}{banned}}%
@@ -2317,6 +2366,8 @@
\def\gapp##1##2{\glsbibwriteentry{application}{app.##1}{\field{name}{\appfmt{##1}}##2}}%
\def\glongswitch##1##2{\glsbibwriteentry{switch}{switch.##1}{\field{name}{\longargfmt{##1}}##2}}%
\def\gshortswitch##1##2{\glsbibwriteentry{switch}{switch.##1}{\field{name}{\shortargfmt{##1}}##2}}%
+ \def\glongswitchpunc##1##2{\glsbibwriteentry{switchpunctuation}{switch.##1}{\field{name}{\longargfmt{##1}}##2}}%
+ \def\gshortswitchpunc##1##2{\glsbibwriteentry{switchpunctuation}{switch.##1}{\field{name}{\shortargfmt{##1}}##2}}%
\def\gterm{\glsbibwriteentry{term}}%
\def\gtermabbr##1##2##3##4{\glsbibwriteentry{termabbreviation}%
{##1}{\field{short}{##2}\field{long}{##3}##4}}%
@@ -2329,7 +2380,10 @@
\immediate\openout\nlctuserguidebib=\jobname-gls.bib\relax
\immediate\write\nlctuserguidebib{\glspercentchar\space Encoding: UTF-8}
\immediate\write\nlctuserguidebib{@preamble{"\string\providecommand*{\string\csfmt}[1]{\string\glsbackslash\string\glsbackslash\glshashchar1}^^J
- \string\providecommand{\string\dhyphen}{-}"}}
+ \string\providecommand{\string\dhyphen}{-}^^J
+ \string\providecommand{\string\longargfmt}{--}^^J
+ \string\providecommand{\string\shortargfmt}{-}^^J
+ \nlctuserguidebibextrapreamble"}}
\immediate\write\nlctuserguidebib{\symboldefinitions}
\glsbibwriteentry{indexplural}{fileformat}{\glsbibwritefield{text}{file format}}
#2%
@@ -2402,7 +2456,7 @@
\newcommand{\nlctuserguideloadgls}[1]{%
\GlsXtrLoadResources[src=\jobname-gls,
- break-at-not-match={original entrytype=(punctuation|command)},
+ break-at-not-match={original entrytype=(switchpunctuation|punctuation|command)},
sort={custom},
sort-rule={\glsxtrIgnorableRules
;\glsxtrcombiningdiacriticrules
@@ -2434,6 +2488,7 @@
application=index,
switch=index,
punctuation=symbol,
+ switchpunctuation=symbol,
icon=symbol,
\nlctuserguidecustomentryaliases
},
@@ -2455,7 +2510,7 @@
loc-counters={chapter,section,subsection,subsubsection,page,figure,table,wrglossary},
save-child-count,save-root-ancestor,
symbol-sort-fallback=name,
- not-match={original entrytype=icon},
+ not-match={original entrytype=(icon|nonindexed)},
#1
]%
\GlsXtrLoadResources[src=\jobname-gls,
@@ -2471,10 +2526,10 @@
% Glossaries, index, summaries etc
-\newcommand{\statusdeprecatedsym}{\glssymbol{sym.deprecated}}
-\newcommand{\statusdeprecatedtext}{\glstext{sym.deprecated}}
-\newcommand{\statusbannedsym}{\glssymbol{sym.banned}}
-\newcommand{\statusbannedtext}{\glstext{sym.banned}}
+\newcommand{\statusdeprecatedsym}{\icon{deprecated}}
+\newcommand{\statusdeprecatedtext}{\icontext{deprecated}}
+\newcommand{\statusbannedsym}{\icon{banned}}
+\newcommand{\statusbannedtext}{\icontext{banned}}
\newcommand{\statusdeprecatedbannedsym}{\statusdeprecatedsym\statusbannedsym}
\newcommand{\statusdeprecatedbannedtext}{\statusdeprecatedtext\ \statusbannedtext}
\newcommand{\statusdefaultsym}{}
@@ -2576,8 +2631,10 @@
\newcommand*{\locationgroupmarkerparagraph}{\S}
\newcommand*{\locationgroupmarkersubparagraph}{\S}
-\newcommand*{\locationgroupmarkertable}{\tablename~}
-\newcommand*{\locationgroupmarkerfigure}{\figurename~}
+\newcommand*{\locationgroupmarkertable}{\Tablerefprefix}
+\newcommand*{\locationgroupmarkertables}{\Tablesrefprefix}
+\newcommand*{\locationgroupmarkerfigure}{\Figurerefprefix}
+\newcommand*{\locationgroupmarkerfigures}{\Figuresrefprefix}
\newcommand*{\locationgroupmarkerpage}{p.~}
\newcommand*{\locationgroupmarkerpages}{pp.~}
@@ -2678,6 +2735,7 @@
\textrm{\ifdefempty\initordefval{}{\initordefval}%
\ifdefempty\optiontag{}{ \optiontag}}%
\gdef\summaryentry at post@fill{ }%
+ \let\do at alias\@secondoftwo
}
\newcommand{\summaryentryoption}[1]{%
@@ -2850,6 +2908,11 @@
\parindent\summarysubitemindent\relax}%
\fi
\glsadd[format=summarylocfmt]{##2}%
+ \glsxtrifhasfield*{alias}{##2}%
+ {\let\do at alias\@firstoftwo
+ \let\aliasval\glscurrentfieldvalue
+ }%
+ {\let\do at alias\@secondoftwo}%
\texttt
{%
\ifcsdef{summaryentry\@this at category}
@@ -2862,11 +2925,11 @@
}%
}%
\ifstrempty{##3}{}{\marginpar{\summaryloc{##3}}}%
- \glsxtrifhasfield*{alias}{##2}%
+ \do at alias
{%
\summaryentry at post@fill
\summarytagfmt{alias}%
- \expandafter\glsfmtname\expandafter{\glscurrentfieldvalue}%
+ \expandafter\aliasref\expandafter{\aliasval}%
\let\summaryentry at post@fill\space
}%
{}%
@@ -2873,8 +2936,15 @@
\ifnotdefaultstatus{##2}%
{\summaryentry at post@fill
\glsxtrifhasfield{useri}{##2}{\glscurrentfieldvalue~}{}\statussym
+ \glsxtrifhasfield*{providedby}{##2}%
+ {\space\providedbyfmt{\glscurrentfieldvalue}}{}%
}%
- {\glsxtrifhasfield{useri}{##2}{\summaryentry at post@fill\glscurrentfieldvalue}{}}%
+ {%
+ \glsxtrifhasfield{useri}{##2}%
+ {\summaryentry at post@fill\glscurrentfieldvalue}{}%
+ \glsxtrifhasfield*{providedby}{##2}%
+ {\space\providedbyfmt{\glscurrentfieldvalue}}{}%
+ }%
\glsxtrifhasfield{note}{##2}{\summarypar\hfill\summarynotefmt\glscurrentfieldvalue}{}%
\fi
\summarypredesc
More information about the tex-live-commits
mailing list.