texlive[74447] branches/branch2024.final/Master/texmf-dist: nlctdoc
commits+karl at tug.org
commits+karl at tug.org
Tue Mar 4 22:15:21 CET 2025
Revision: 74447
https://tug.org/svn/texlive?view=revision&revision=74447
Author: karl
Date: 2025-03-04 22:15:21 +0100 (Tue, 04 Mar 2025)
Log Message:
-----------
nlctdoc (branch) (4mar25)
Modified Paths:
--------------
branches/branch2024.final/Master/texmf-dist/doc/latex/nlctdoc/README
branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls
branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty
Modified: branches/branch2024.final/Master/texmf-dist/doc/latex/nlctdoc/README
===================================================================
--- branches/branch2024.final/Master/texmf-dist/doc/latex/nlctdoc/README 2025-03-04 21:15:11 UTC (rev 74446)
+++ branches/branch2024.final/Master/texmf-dist/doc/latex/nlctdoc/README 2025-03-04 21:15:21 UTC (rev 74447)
@@ -1,4 +1,4 @@
-nlctdoc.cls and nlctuserguide.sty v1.12 (2025-01-03):
+nlctdoc.cls and nlctuserguide.sty v1.13 (2025-03-04):
This class and package is provided "as is" solely for the benefit
of anyone who wants to compile the documentation for
Modified: branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls
===================================================================
--- branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls 2025-03-04 21:15:11 UTC (rev 74446)
+++ branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctdoc.cls 2025-03-04 21:15:21 UTC (rev 74447)
@@ -18,7 +18,7 @@
% for existing documents that use it.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{nlctdoc}[2025/01/03 v1.12 (NLCT)]
+\ProvidesClass{nlctdoc}[2025/03/04 v1.13 (NLCT)]
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
% tex4ht stopped working with koma during TL2013.
Modified: branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty
===================================================================
--- branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty 2025-03-04 21:15:11 UTC (rev 74446)
+++ branches/branch2024.final/Master/texmf-dist/tex/latex/nlctdoc/nlctuserguide.sty 2025-03-04 21:15:21 UTC (rev 74447)
@@ -15,7 +15,7 @@
% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nlctuserguide}[2025/01/03 v1.12 (NLCT)]
+\ProvidesPackage{nlctuserguide}[2025/03/04 v1.13 (NLCT)]
\newcommand{\nlctdoc at loadxr}{}
\DeclareOption{xr}{\renewcommand{\nlctdoc at loadxr}{\RequirePackage{xr-hyper}}}
@@ -1320,6 +1320,7 @@
\let\env\@firstofone
\let\ctr\@firstofone
\let\texorpdfstring\@secondoftwo
+ \let\glsxtrtitleorpdforheading\@thirdofthree
\def\starredcs##1{\glsentrytext{##1}*}%
\def\cmd##1{\glsbackslash##1}%
\def\csfmt##1{\glsbackslash##1}%
@@ -1789,8 +1790,29 @@
\newcommand{\thectr}[1]{\glslink{ctr.#1}{\csfmt{the#1}}} % v1.11
\newcommand{\theHctr}[1]{\glslink{ctr.#1}{\csfmt{theH#1}}} % v1.11
-\newcommand*{\glscsname}[2][]{\glslink[#1]{#2}{\csfmtfont{#2}}}
+% v1.13
+\ExplSyntaxOn
+\cs_new:Nn \__nlctdoc_glscsname:nnn
+ {
+ \glslink [ #1 ] { #2 } { \csfmtfont { #3 } }
+ }
+\tl_new:N \l__nlctdoc_label_tl
+\NewDocumentCommand \glscsname { O{} m }
+ {
+ \group_begin:
+ \cs_set:Npn \_ { }
+ \tl_set:Ne \l__nlctdoc_label_tl { #2 }
+ \exp_args:NNnV
+ \group_end:
+ \__nlctdoc_glscsname:nnn
+ { #1 }
+ \l__nlctdoc_label_tl
+ { #2 }
+ }
+
+\ExplSyntaxOff
+
% v1.11
\NewDocumentCommand{\predcs}{O{}m}{%
\glsxtrifhasfield{explsuffix}{#2}%
@@ -2262,15 +2284,19 @@
}
\newcommand*{\mainglsadd}[3][]{%
- \ifstrempty{#3}%
- {\def\mainglsaddcounter{}}%
+ \glsxtrifhasfield{alias}{#2}%
+ {\glsadd[#1]{#2}}%
{%
- \ifcsdef{#3counter}%
- {\letcs\mainglsaddcounter{#3counter}}%
- {\let\mainglsaddcounter\currentcounter}%
+ \ifstrempty{#3}%
+ {\def\mainglsaddcounter{}}%
+ {%
+ \ifcsdef{#3counter}%
+ {\letcs\mainglsaddcounter{#3counter}}%
+ {\let\mainglsaddcounter\currentcounter}%
+ }%
+ \ifdefempty\mainglsaddcounter{}{\glsadd[counter=\mainglsaddcounter,format=mainfmt]{#2}}%
+ \glsadd[format=mainfmt,#1]{#2}%
}%
- \ifdefempty\mainglsaddcounter{}{\glsadd[counter=\mainglsaddcounter,format=mainfmt]{#2}}%
- \glsadd[format=mainfmt,#1]{#2}%
}
% standalone targets
@@ -2854,6 +2880,7 @@
\glsaddstoragekey{modifiers}{}{\modifiers}
\glsaddstoragekey{variants}{}{\variants}
\glsaddstoragekey{base}{}{\fnbase}
+\glsaddstoragekey{fnsuffix}{}{\fnsuffix}
\glsaddstoragekey{explsuffix}{}{\explsuffixfield}
\glsaddstoragekey{syntax}{}{\syntax}
\glsaddstoragekey{defaultvalue}{}{\optdefval}
@@ -2919,7 +2946,8 @@
\def\gcond##1##2{\glsbibwriteentry{command}{##1}{\field{name}{\csfmt{##1}}\syntax{\conditionsyntax}##2}}%
\def\gexplcond##1##2##3{\glsbibwriteentry{command}{##1:##2}{\field{name}{\csfmt{##1\explsuffix:##2\explTFsuffix}}##3}}%
\def\gexplpred##1##2##3{\glsbibwriteentry{command}{##1:##2}{\field{name}{\csfmt{##1\explsuffix:##2\explTFsuffix}}\field{explsuffix}{\dsb p}##3}}%
- \def\gfn##1##2##3##4{\glsbibwriteentry{command}{##1}{\field{name}{\csfmt{##1:##2}}\field{variants}{##3}\field{base}{##1}##4}}%
+ \def\gfn##1##2##3##4{\glsbibwriteentry{command}{##1}{\field{name}{\csfmt{##1:##2}}\field{variants}{##3}\field{fnsuffix}{##2}\field{base}{##1}##4}}%
+ \def\gfnsuffix##1##2##3##4{\glsbibwriteentry{command}{##1:##2}{\field{name}{\csfmt{##1:##2}}\field{variants}{##3}\field{fnsuffix}{##2}\field{base}{##1}##4}}%
\def\gcmdmeta##1##2##3##4{\glsbibwriteentry{command}{##1##2##3}{\field{name}{\csmetafmt{##1}{##2}{##3}}##4}}%
\def\gcmdmetameta##1##2##3##4##5##6{\glsbibwriteentry{command}{##1##2##3##4##5}{\field{name}{\csmetametafmt{##1}{##2}{##3}{##4}{##5}}##6}}%
\def\gmod##1##2{\glsbibwriteentry{punctuation}{idx.mod.##1}{##2}}%
@@ -2927,6 +2955,7 @@
\def\gcmdsp##1##2{\glsbibwriteentry{command}{##1}{\field{name}{\csfmt{##1}}\field{modifiers}{*,+}##2}}%
\def\gpunccmd##1##2##3{\glsbibwriteentry{punctuation}{##1}{\field{name}{\csfmt{##2}}##3}}%
\def\gpkg##1##2{\glsbibwriteentry{package}{pkg.##1}{\field{name}{\styfmt{##1}}##2}}%
+ \def\gmodule##1##2{\glsbibwriteentry{module}{pkg.##1}{\field{name}{\styfmt{##1}}##2}}%
\def\gcls##1##2{\glsbibwriteentry{class}{cls.##1}{\field{name}{\clsfmt{##1}}##2}}%
\def\genv##1##2{\glsbibwriteentry{environment}{env.##1}{\field{name}{\envfmt{##1}}##2}}%
\def\gctr##1##2{\glsbibwriteentry{counter}{ctr.##1}{\field{name}{\ctrfmt{##1}}##2}}%
@@ -3062,6 +3091,7 @@
file=index,
command=index,
package=index,
+ module=index,
class=index,
environment=index,
counter=index,
@@ -3588,8 +3618,11 @@
\global\advance\totalpkgopts by 1\relax
\glsxtrifhasfield{parent}{#1}%
{%
- \GlsXtrIfInGlossary{\glscurrentfieldvalue}{pkgoptlist}{}%
- {\glsxtrcopytoglossary*{\glscurrentfieldvalue}{pkgoptlist}}%
+ \expandafter\GlsXtrIfInGlossary\expandafter
+ {\glscurrentfieldvalue}{pkgoptlist}{}%
+ {%
+ \glsxtrcopytoglossary*{\glscurrentfieldvalue}{pkgoptlist}%
+ }%
}%
{}%
\glsxtrcopytoglossary*{#1}{pkgoptlist}%
@@ -3604,7 +3637,8 @@
\global\advance\totalclsopts by 1\relax
\glsxtrifhasfield{parent}{#1}%
{%
- \GlsXtrIfInGlossary{\glscurrentfieldvalue}{clsoptlist}{}%
+ \expandafter\GlsXtrIfInGlossary\expandafter
+ {\glscurrentfieldvalue}{clsoptlist}{}%
{\glsxtrcopytoglossary*{\glscurrentfieldvalue}{clsoptlist}}%
}%
{}%
@@ -3618,13 +3652,16 @@
\glsxtrifhasfield{parent}{#1}%
{%
\let\@currentparent\glscurrentfieldvalue
- \GlsXtrIfInGlossary{\@currentparent}{clsoptlist}%
+ \expandafter\GlsXtrIfInGlossary\expandafter
+ {\@currentparent}{clsoptlist}%
{\glsxtrcopytoglossary*{#1}{clsoptlist}}%
{%
- \GlsXtrIfInGlossary{\@currentparent}{pkgoptlist}%
+ \expandafter\GlsXtrIfInGlossary\expandafter
+ {\@currentparent}{pkgoptlist}%
{\glsxtrcopytoglossary*{#1}{pkgoptlist}}%
{%
- \GlsXtrIfInGlossary{\@currentparent}{envlist}%
+ \expandafter\GlsXtrIfInGlossary\expandafter
+ {\@currentparent}{envlist}%
{\glsxtrcopytoglossary*{#1}{envlist}}%
{%
\glsifcategory{\@currentparent}{command}%
@@ -3677,9 +3714,13 @@
% Package option list
\def\printunsrtglossarypredoglossary{\entrycountprehook\totalpkgopts}%
\glsxtrifemptyglossary{pkgoptlist}{}%
- {\printunsrtglossary*[type=pkgoptlist,style=summary,title=Package Option Summary,
- label={styoptsummary}]%
- {\showsummarytopgroupheadersfalse}%
+ {%
+ \printunsrtglossary*
+ [type=pkgoptlist,style=summary,title=Package Option Summary,
+ label={styoptsummary}]%
+ {%
+ \showsummarytopgroupheadersfalse
+ }%
}%
}%
}
More information about the tex-live-commits
mailing list.