summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-10-04 03:01:19 +0000
committerNorbert Preining <norbert@preining.info>2023-10-04 03:01:19 +0000
commitcd7d1e8ab4117911e28e76248fc92bebfbd9fb15 (patch)
tree89537fab82c78efc821942267ec904cf860255e7 /macros
parent75afa6c3d445abbfd4e8c0cb9d2d24eb4d1b71fe (diff)
CTAN sync 202310040301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/homework/homework-demo-cn.pdfbin83787 -> 83800 bytes
-rw-r--r--macros/latex/contrib/homework/homework-demo-de.pdfbin52510 -> 52524 bytes
-rw-r--r--macros/latex/contrib/homework/homework-demo-en.pdfbin51242 -> 51255 bytes
-rw-r--r--macros/latex/contrib/homework/homework-demo-es.pdfbin51849 -> 51865 bytes
-rw-r--r--macros/latex/contrib/homework/homework-demo-fr.pdfbin51583 -> 51601 bytes
-rw-r--r--macros/latex/contrib/homework/homework-demo-jp.pdfbin86966 -> 86982 bytes
-rw-r--r--macros/latex/contrib/homework/homework-demo-tc.pdfbin90669 -> 90681 bytes
-rw-r--r--macros/latex/contrib/homework/homework.cls2
-rw-r--r--macros/latex/contrib/minimalist/minimalist-classical.sty3
-rw-r--r--macros/latex/contrib/minimalist/minimalist-default.sty15
-rw-r--r--macros/latex/contrib/minimalist/minimalist-flow.sty11
-rw-r--r--macros/latex/contrib/minimalist/minimalist-plain.sty15
-rw-r--r--macros/latex/contrib/minimalist/minimalist-stream.sty11
-rw-r--r--macros/latex/contrib/minimalist/minimalist.sty2
-rw-r--r--macros/latex/contrib/minimalist/minimart.cls2
-rw-r--r--macros/latex/contrib/minimalist/minimbook.cls2
-rw-r--r--macros/latex/contrib/nlctdoc/README2
-rw-r--r--macros/latex/contrib/nlctdoc/nlctdoc.cls2
-rw-r--r--macros/latex/contrib/nlctdoc/nlctuserguide.sty106
19 files changed, 102 insertions, 71 deletions
diff --git a/macros/latex/contrib/homework/homework-demo-cn.pdf b/macros/latex/contrib/homework/homework-demo-cn.pdf
index 3bd812c402..7fe3b2a5da 100644
--- a/macros/latex/contrib/homework/homework-demo-cn.pdf
+++ b/macros/latex/contrib/homework/homework-demo-cn.pdf
Binary files differ
diff --git a/macros/latex/contrib/homework/homework-demo-de.pdf b/macros/latex/contrib/homework/homework-demo-de.pdf
index fa13a296aa..babea3d748 100644
--- a/macros/latex/contrib/homework/homework-demo-de.pdf
+++ b/macros/latex/contrib/homework/homework-demo-de.pdf
Binary files differ
diff --git a/macros/latex/contrib/homework/homework-demo-en.pdf b/macros/latex/contrib/homework/homework-demo-en.pdf
index 2bd8f40f4d..759e72359a 100644
--- a/macros/latex/contrib/homework/homework-demo-en.pdf
+++ b/macros/latex/contrib/homework/homework-demo-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/homework/homework-demo-es.pdf b/macros/latex/contrib/homework/homework-demo-es.pdf
index cefbcfed0a..74000d7714 100644
--- a/macros/latex/contrib/homework/homework-demo-es.pdf
+++ b/macros/latex/contrib/homework/homework-demo-es.pdf
Binary files differ
diff --git a/macros/latex/contrib/homework/homework-demo-fr.pdf b/macros/latex/contrib/homework/homework-demo-fr.pdf
index 4d7c3941e8..4ba306c271 100644
--- a/macros/latex/contrib/homework/homework-demo-fr.pdf
+++ b/macros/latex/contrib/homework/homework-demo-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/homework/homework-demo-jp.pdf b/macros/latex/contrib/homework/homework-demo-jp.pdf
index fee9139a2a..7b8a6ae7cb 100644
--- a/macros/latex/contrib/homework/homework-demo-jp.pdf
+++ b/macros/latex/contrib/homework/homework-demo-jp.pdf
Binary files differ
diff --git a/macros/latex/contrib/homework/homework-demo-tc.pdf b/macros/latex/contrib/homework/homework-demo-tc.pdf
index 021d5d0da1..de5ad59d7b 100644
--- a/macros/latex/contrib/homework/homework-demo-tc.pdf
+++ b/macros/latex/contrib/homework/homework-demo-tc.pdf
Binary files differ
diff --git a/macros/latex/contrib/homework/homework.cls b/macros/latex/contrib/homework/homework.cls
index 0cbd119277..a58131df8c 100644
--- a/macros/latex/contrib/homework/homework.cls
+++ b/macros/latex/contrib/homework/homework.cls
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{homework}
- {2023/10/01a} {}
+ {2023/10/01b} {}
{Document class for writing homework}
\keys_define:nn { homework }
diff --git a/macros/latex/contrib/minimalist/minimalist-classical.sty b/macros/latex/contrib/minimalist/minimalist-classical.sty
index 0b88f16fa4..d4777775a2 100644
--- a/macros/latex/contrib/minimalist/minimalist-classical.sty
+++ b/macros/latex/contrib/minimalist/minimalist-classical.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-classical}
- {2023/10/01} {}
+ {2023/10/03} {}
{The "classical" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -738,6 +738,7 @@ heading_suffix "}\n"
\tl_use:c { c_minimalist_r_mathparen_ \l_projlib_language_current_languagetype_tl _tl }
}
+%% Change equation numbers to gray
\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}}
\PassOptionsToPackage { nopatch = eqnum } { microtype }
diff --git a/macros/latex/contrib/minimalist/minimalist-default.sty b/macros/latex/contrib/minimalist/minimalist-default.sty
index bc694fe3b9..1a26892830 100644
--- a/macros/latex/contrib/minimalist/minimalist-default.sty
+++ b/macros/latex/contrib/minimalist/minimalist-default.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-default}
- {2023/10/01} {}
+ {2023/10/03} {}
{The default style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -717,6 +717,7 @@ heading_suffix "}\n"
\tl_use:c { c_minimalist_r_mathparen_ \l_projlib_language_current_languagetype_tl _tl }
}
+%% Change equation numbers to gray
\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}}
\PassOptionsToPackage { nopatch = eqnum } { microtype }
@@ -745,7 +746,7 @@ heading_suffix "}\n"
{
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
@@ -764,7 +765,7 @@ heading_suffix "}\n"
{
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
@@ -784,10 +785,10 @@ heading_suffix "}\n"
{0pt}
{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
\nobreakspace\nobreakspace
- % {\normalfont\textcolor{main-text!27!paper}{---}}
+ % {\normalfont\textcolor{.!27!paper}{---}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
\pushQED{\simpleqed}
@@ -804,10 +805,10 @@ heading_suffix "}\n"
{0pt}
{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
\nobreakspace\nobreakspace
- % {\normalfont\textcolor{main-text!27!paper}{---}}
+ % {\normalfont\textcolor{.!27!paper}{---}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
\pushQED{\simpleqed}
diff --git a/macros/latex/contrib/minimalist/minimalist-flow.sty b/macros/latex/contrib/minimalist/minimalist-flow.sty
index 32adea6440..d5f92db2e2 100644
--- a/macros/latex/contrib/minimalist/minimalist-flow.sty
+++ b/macros/latex/contrib/minimalist/minimalist-flow.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-flow}
- {2023/10/01} {}
+ {2023/10/03} {}
{The "flow" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -728,6 +728,7 @@ heading_suffix "}\n"
\tl_use:c { c_minimalist_r_mathparen_ \l_projlib_language_current_languagetype_tl _tl }
}
+%% Change equation numbers to gray
\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}}
\PassOptionsToPackage { nopatch = eqnum } { microtype }
@@ -756,7 +757,7 @@ heading_suffix "}\n"
{
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
@@ -775,7 +776,7 @@ heading_suffix "}\n"
{
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
@@ -795,7 +796,7 @@ heading_suffix "}\n"
{0pt}
{
{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{.!27!paper}{---}}\nobreakspace\nobreakspace
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
\pushQED{\simpleqed}
@@ -812,7 +813,7 @@ heading_suffix "}\n"
{0pt}
{
{\thmnumber{ \minimalist_apply_title_numbering_style:n { #2 } \hspace{.75em} }\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{main-text!27!paper}{---}}\nobreakspace\nobreakspace
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}\nobreakspace\nobreakspace{\normalfont\textcolor{.!27!paper}{---}}\nobreakspace\nobreakspace
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
\pushQED{\simpleqed}
diff --git a/macros/latex/contrib/minimalist/minimalist-plain.sty b/macros/latex/contrib/minimalist/minimalist-plain.sty
index e58fca161f..27af8941d3 100644
--- a/macros/latex/contrib/minimalist/minimalist-plain.sty
+++ b/macros/latex/contrib/minimalist/minimalist-plain.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-plain}
- {2023/10/01} {}
+ {2023/10/03} {}
{The "plain" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -691,6 +691,7 @@ heading_suffix "}\n"
\tl_use:c { c_minimalist_r_mathparen_ \l_projlib_language_current_languagetype_tl _tl }
}
+%% Change equation numbers to gray
\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}}
\PassOptionsToPackage { nopatch = eqnum } { microtype }
@@ -719,7 +720,7 @@ heading_suffix "}\n"
{
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
@@ -738,7 +739,7 @@ heading_suffix "}\n"
{
\rlap{\vbox{\hbox{\parbox{\linewidth}{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
@@ -758,10 +759,10 @@ heading_suffix "}\n"
{0pt}
{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
\nobreakspace\nobreakspace
- % {\normalfont\textcolor{main-text!27!paper}{---}}
+ % {\normalfont\textcolor{.!27!paper}{---}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
\pushQED{\simpleqed}
@@ -778,10 +779,10 @@ heading_suffix "}\n"
{0pt}
{
{\thmname{#1}\thmnumber{\nobreakspace #2}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\minimalist_bfseries:\minimalist_sffamily: .
\nobreakspace\nobreakspace
- % {\normalfont\textcolor{main-text!27!paper}{---}}
+ % {\normalfont\textcolor{.!27!paper}{---}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
\pushQED{\simpleqed}
diff --git a/macros/latex/contrib/minimalist/minimalist-stream.sty b/macros/latex/contrib/minimalist/minimalist-stream.sty
index 634b940d38..aa3e8e9c23 100644
--- a/macros/latex/contrib/minimalist/minimalist-stream.sty
+++ b/macros/latex/contrib/minimalist/minimalist-stream.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist-stream}
- {2023/10/01} {}
+ {2023/10/03} {}
{The "stream" style of minimalist}
\IfPackageLoadedTF { minimalist } {}
@@ -797,6 +797,7 @@ heading_suffix "}\n"
\tl_use:c { c_minimalist_r_mathparen_ \l_projlib_language_current_languagetype_tl _tl }
}
+%% Change equation numbers to gray
\def\tagform@#1{\maketag@@@{\textcolor{.!39!paper}{(\ignorespaces#1\unskip\@@italiccorr)}}}
\PassOptionsToPackage { nopatch = eqnum } { microtype }
@@ -825,7 +826,7 @@ heading_suffix "}\n"
}
\vspace*{-\baselineskip}
{\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\phantom{q} % To provide something below the baseline
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
@@ -847,7 +848,7 @@ heading_suffix "}\n"
}
\vspace*{-\baselineskip}
{\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
\phantom{q} % To provide something below the baseline
}}\hbox{\strut}\vspace{0pt}}}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
@@ -878,7 +879,7 @@ heading_suffix "}\n"
}
% \minimalist_bfseries:\minimalist_sffamily:
{\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
. \hspace{.5em}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
@@ -898,7 +899,7 @@ heading_suffix "}\n"
}
% \minimalist_bfseries:\minimalist_sffamily:
{\thmname{#1}}
- {\color{main-text!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
+ {\color{.!50!paper}\thmnote{\hspace{.4em} \minimalist_insert_l_mathparen: #3 \minimalist_insert_r_mathparen: }}
. \hspace{.5em}
\bool_if:NT \l__minimalist_theorem_with_qed_bool
{
diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty
index d49f75f375..54ce3304aa 100644
--- a/macros/latex/contrib/minimalist/minimalist.sty
+++ b/macros/latex/contrib/minimalist/minimalist.sty
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplPackage
{minimalist}
- {2023/10/01} {}
+ {2023/10/03} {}
{A simple and clear style for articles and books}
\keys_define:nn { minimalist }
diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls
index 6a5d9f3707..a74973464d 100644
--- a/macros/latex/contrib/minimalist/minimart.cls
+++ b/macros/latex/contrib/minimalist/minimart.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimart}
- {2023/10/01} {}
+ {2023/10/03} {}
{A simple and clear article style}
\tl_const:Nn \l__minimclass_base_class_tl { article }
diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls
index def4f1236c..e90446feed 100644
--- a/macros/latex/contrib/minimalist/minimbook.cls
+++ b/macros/latex/contrib/minimalist/minimbook.cls
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}[2022-06-01]
\ProvidesExplClass
{minimbook}
- {2023/10/01} {}
+ {2023/10/03} {}
{A simple and clear book style}
\tl_const:Nn \l__minimclass_base_class_tl { book }
diff --git a/macros/latex/contrib/nlctdoc/README b/macros/latex/contrib/nlctdoc/README
index dbb9ffafaf..0fddcd3120 100644
--- a/macros/latex/contrib/nlctdoc/README
+++ b/macros/latex/contrib/nlctdoc/README
@@ -1,4 +1,4 @@
-nlctdoc.cls and nlctuserguide.sty v1.09 (2023-06-28):
+nlctdoc.cls and nlctuserguide.sty v1.10 (2023-09-29):
This class and package is provided "as is" solely for the benefit
of anyone who wants to compile the documentation for
diff --git a/macros/latex/contrib/nlctdoc/nlctdoc.cls b/macros/latex/contrib/nlctdoc/nlctdoc.cls
index 8086ada1fb..f48b30f0c5 100644
--- a/macros/latex/contrib/nlctdoc/nlctdoc.cls
+++ b/macros/latex/contrib/nlctdoc/nlctdoc.cls
@@ -18,7 +18,7 @@
% for existing documents that use it.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{nlctdoc}[2023/06/28 v1.09 (NLCT)]
+\ProvidesClass{nlctdoc}[2023/09/29 v1.10 (NLCT)]
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
% tex4ht stopped working with koma during TL2013.
diff --git a/macros/latex/contrib/nlctdoc/nlctuserguide.sty b/macros/latex/contrib/nlctdoc/nlctuserguide.sty
index 156b98fa29..bb474690d2 100644
--- a/macros/latex/contrib/nlctdoc/nlctuserguide.sty
+++ b/macros/latex/contrib/nlctdoc/nlctuserguide.sty
@@ -15,7 +15,7 @@
% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nlctuserguide}[2023/06/28 v1.09 (NLCT)]
+\ProvidesPackage{nlctuserguide}[2023/09/29 v1.10 (NLCT)]
\newcommand{\nlctdoc@loadxr}{}
\DeclareOption{xr}{\renewcommand{\nlctdoc@loadxr}{\RequirePackage{xr-hyper}}}
@@ -517,7 +517,7 @@
\newcommand*{\xrsectionref}[3]{Section~\ref{#1}}
\newcommand{\deflist@item}[1]{\item[]#1}
-\newenvironment{itemdesc}{\par\ignorespaces}{\ignorespacesafterend}
+\newenvironment{itemdesc}{\par\nobreak\ignorespaces}{\ignorespacesafterend}
\newenvironment{deflist}
{\begin{description}\let\itemtitle\deflist@item}
@@ -806,7 +806,7 @@ before upper={%
after upper={\GlsXtrDiscardUnsetBuffering},
halign upper=flush left,halign lower=justify,
valign upper=top,valign lower=top,
-before lower={\renewcommand*{\nlct@preattachments}{\vspace*{-\baselineskip}}},
+before lower={\let\nlct@ex@title@attachments\nlct@ex@narrow@title@attachments},
after lower={\noindent},
#1
}
@@ -978,7 +978,7 @@ halign upper=flush left,halign lower=justify,
\newcommand{\example@label@info}{}
\define@key{nlctexample}{label}{%
- \renewcommand{\example@label@info}{\glspercentchar\space Label: #1^^J}%
+ \renewcommand{\example@label@info}{\glspercentchar\space Label: "#1"^^J}%
\renewcommand*{\example@do@label}{\label{#1}}%
}
@@ -993,6 +993,7 @@ halign upper=flush left,halign lower=justify,
\newcommand{\nlctexamplelets}{%
\let\gls\glsentrytext
+ \let\glscmd\glsentrytext
\let\env\@firstofone
\let\ctr\@firstofone
\let\texorpdfstring\@secondoftwo
@@ -1003,6 +1004,9 @@ halign upper=flush left,halign lower=justify,
\def\comment##1{\glspercentchar\space ##1^^J}%
\def\%{\glspercentchar}%
\edef\#{\expandafter\@gobble\string\#}%
+% v1.10:
+ \edef\${\expandafter\@gobble\string\$}%
+ \edef\_{\expandafter\@gobble\string\_}%
\def\-{}%
\def\codepar{^^J^^J}%
\def\marg##1{\glsopenbrace##1\glsclosebrace}%
@@ -1032,6 +1036,7 @@ halign upper=flush left,halign lower=justify,
{\nlctexamplelets\immediate\write\nlct@exampleout{%
\createexamplefirstline
\glspercentchar\space \Examplename\space \theexample\space\example@title^^J%
+ \example@label@info
\nlct@create@example@precls\nlct@create@example@preamble
#1^^J\string\begin{document}^^J#2^^J%
\string\end{document}}%
@@ -1117,17 +1122,24 @@ halign upper=flush left,halign lower=justify,
\newcommand\nlctexamplefilebasename{%
\jobname-example\ifnum\c@example<10 00\else \ifnum\c@example<100 0\fi\fi\the\c@example}%
-\newcommand*{\nlct@preattachments}{}
-
\newcommand{\nlctexampledisablecmds}{}
\newcommand{\nlctexampletag}{\Examplename~\theexample}
\newcommand{\nlctexampletitlefmt}[1]{%
- \nlctexampletitlefont\raggedright
+ \nlctexampletitlefont
+ \raggedright\exhyphenpenalty 0 % space intended
\nlctexampletag\ifstrempty{#1}{}{: #1}\par
}
+\newcommand{\nlct@ex@title@attachments}[2]{%
+ \nlctexampletitlebox{#1}\hfill#2%
+}
+
+\newcommand{\nlct@ex@narrow@title@attachments}[2]{%
+ \nlctexampletitlefmt{#1}\hfill#2%
+}
+
\newcommand{\nlctexampletitlebox}[2][0.8\linewidth]{%
\parbox[t]{#1}{\nlctexampletitlefmt{#2}}}
@@ -1177,10 +1189,12 @@ halign upper=flush left,halign lower=justify,
\example@do@label
\let\nlct@org@cmd\cmd
\def\cmd##1{\csfmt{##1}}%
+ \def\glscmd##1{\noexpand\glsfmttext{##1}}%
\protected@edef\example@tex@title{\example@title}%
\@loe@disable@cmds
\addtolistofexamples{\example@title}%
\def\cmd##1{\string\\##1}%
+ \let\glscmd\cmd
\let\code\@firstofone
\let\optfmt\@firstofone
\let\styfmt\@firstofone
@@ -1220,42 +1234,44 @@ halign upper=flush left,halign lower=justify,
\immediate\write18{\create@example@tex\space\nlct@example@filebasename.tex}%
\nlct@ifattachsupported
{%
- \nlct@preattachments
\bgroup
- \nlctexampletitlebox{\example@tex@title}\hfill
- \nlctexampletagattachfont
- \textattachfile[mimetype={application/x-tex},
- author={\@pdfauthor},color={0 0 0},
- size={\pdf@filesize{\examplesdir/\nlct@example@filebasename.tex}},
- subject={\example@pdf@title\space (source code)},
- description={\example@attachdesc\space (source code)}]%
- {\examplesdir/\nlct@example@filebasename.tex}{\exampleattachtexicon}%
- \ifnlctdownloadlinks
- \space
- \href{\nlctdownloadlink{\examplesdir/\nlct@example@filebasename.tex}}{\exampledownloadtexicon}
- \fi
- \ifnlctattachpdf
- \IfFileExists{\examplesdir/\nlct@example@filebasename.pdf}
- {%
- \space
- \textattachfile[mimetype={application/pdf},
- author={\@pdfauthor},color={0 0 0},
- size={\pdf@filesize{\examplesdir/\nlct@example@filebasename.pdf}},
- subject={\example@pdf@title\space (PDF)},
- description={\example@attachdesc\space (PDF)}]%
- {\examplesdir/\nlct@example@filebasename.pdf}{\exampleattachpdficon}%
- }%
- {}%
+ \nlct@ex@title@attachments
+ {\example@tex@title}%
+ {%
+ \nlctexampletagattachfont
+ \textattachfile[mimetype={application/x-tex},
+ author={\@pdfauthor},color={0 0 0},
+ size={\pdf@filesize{\examplesdir/\nlct@example@filebasename.tex}},
+ subject={\example@pdf@title\space (source code)},
+ description={\example@attachdesc\space (source code)}]%
+ {\examplesdir/\nlct@example@filebasename.tex}{\exampleattachtexicon}%
\ifnlctdownloadlinks
\space
- \href{\nlctdownloadlink{\examplesdir/\nlct@example@filebasename.pdf}}{\exampledownloadpdficon}
+ \href{\nlctdownloadlink{\examplesdir/\nlct@example@filebasename.tex}}{\exampledownloadtexicon}
\fi
- \else
- \ifnlctdownloadlinks
- \space
- \href{\nlctdownloadlink{\examplesdir/\nlct@example@filebasename.pdf}}{\exampledownloadpdficon}
+ \ifnlctattachpdf
+ \IfFileExists{\examplesdir/\nlct@example@filebasename.pdf}
+ {%
+ \space
+ \textattachfile[mimetype={application/pdf},
+ author={\@pdfauthor},color={0 0 0},
+ size={\pdf@filesize{\examplesdir/\nlct@example@filebasename.pdf}},
+ subject={\example@pdf@title\space (PDF)},
+ description={\example@attachdesc\space (PDF)}]%
+ {\examplesdir/\nlct@example@filebasename.pdf}{\exampleattachpdficon}%
+ }%
+ {}%
+ \ifnlctdownloadlinks
+ \space
+ \href{\nlctdownloadlink{\examplesdir/\nlct@example@filebasename.pdf}}{\exampledownloadpdficon}
+ \fi
+ \else
+ \ifnlctdownloadlinks
+ \space
+ \href{\nlctdownloadlink{\examplesdir/\nlct@example@filebasename.pdf}}{\exampledownloadpdficon}
+ \fi
\fi
- \fi
+ }%
\par\egroup\noindent
}%
{%
@@ -1272,8 +1288,8 @@ halign upper=flush left,halign lower=justify,
}
\newenvironment{example}[2]{%
- \refstepcounter{example}\label{#2}%
\par\vskip10pt\noindent
+ \refstepcounter{example}\label{#2}%
{%
\def\cmd##1{\csfmt{##1}}%
\let\nlctexampletitlefont\nlctexampleenvtitlefont
@@ -1375,7 +1391,9 @@ halign upper=flush left,halign lower=justify,
\newcommand{\codebackslash}{\texorpdfstring{\char`\\}{\string\\}}
\newcommand{\csmetafmt}[3]{%
- \texorpdfstring{\csfmt{#1\meta{#2}#3}}{\string\\#1\string<#2\string>#3}%
+ \texorpdfstring
+ {\csfmt{#1\ifstrempty{#1}{}{\-}\meta{#2}\ifstrempty{#3}{}{\-}#3}}%
+ {\string\\#1\string<#2\string>#3}%
}
\newcommand{\csmetametafmt}[5]{%
\texorpdfstring{\csfmt{#1\meta{#2}#3\meta{#4}#5}}{\string\\#1\string<#2\string>#3\string<#4\string>#5}%
@@ -1765,6 +1783,12 @@ halign upper=flush left,halign lower=justify,
\glsxtrglossentry{opt.#2}%
}
+% v1.10
+\newrobustcmd*{\inlinepkgdef}[2][pkgdef]{%
+ \mainglsadd{pkg.#2}{#1}%
+ \glsxtrglossentry{pkg.#2}%
+}
+
\newcommand*{\mainglsadd}[3][]{%
\ifstrempty{#3}%
{\def\mainglsaddcounter{}}%
@@ -1795,8 +1819,10 @@ halign upper=flush left,halign lower=justify,
\newrobustcmd*{\cmddef}{\@ifstar\s@cmddef\@cmddef}
\newcommand*{\@cmddef}[2][]{%
+ \vskip 1sp plus 2ex\relax
\pdfbookmark[\cmddefbookmarklevel]{\glsentryname{#2}}{csdef.#2}%
\nopagebreak\s@cmddef[#1]{#2}%
+ \nopagebreak\ignorespaces
}
\newcommand*{\cmdnotefmt}[1]{\mbox{#1}}