From 4c13b78957a91b800c9ed56fbc7fb3478424f08d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 11 Nov 2021 21:07:58 +0000 Subject: nomencl (11nov21) git-svn-id: svn://tug.org/texlive/trunk@61029 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/nomencl/README | 3 +++ Master/texmf-dist/doc/latex/nomencl/nomencl.pdf | Bin 342134 -> 363825 bytes Master/texmf-dist/doc/latex/nomencl/sample01.pdf | Bin 34412 -> 36869 bytes Master/texmf-dist/doc/latex/nomencl/sample02.pdf | Bin 80170 -> 86634 bytes Master/texmf-dist/doc/latex/nomencl/sample03.pdf | Bin 81770 -> 96319 bytes Master/texmf-dist/doc/latex/nomencl/sample04.pdf | Bin 48313 -> 52608 bytes Master/texmf-dist/doc/latex/nomencl/sample05.pdf | Bin 34043 -> 36496 bytes Master/texmf-dist/source/latex/nomencl/nomencl.drv | 2 +- Master/texmf-dist/source/latex/nomencl/nomencl.dtx | 18 ++++++++++-------- Master/texmf-dist/tex/latex/nomencl/nomencl.sty | 6 +++--- 10 files changed, 17 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/nomencl/README b/Master/texmf-dist/doc/latex/nomencl/README index 3968e401003..ad97c2bf519 100644 --- a/Master/texmf-dist/doc/latex/nomencl/README +++ b/Master/texmf-dist/doc/latex/nomencl/README @@ -46,3 +46,6 @@ VERSION HISTORY v5.5 2020/12/29 Catalan option + v5.6 2021/11/10 Nomentbl no longer uses the s column for units and + thus works with the new versions of siunitx + package. \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf b/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf index 6159e7288e1..ffb368151fc 100644 Binary files a/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf and b/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf differ diff --git a/Master/texmf-dist/doc/latex/nomencl/sample01.pdf b/Master/texmf-dist/doc/latex/nomencl/sample01.pdf index 2c8cc5a4291..70dc4cebcbf 100644 Binary files a/Master/texmf-dist/doc/latex/nomencl/sample01.pdf and b/Master/texmf-dist/doc/latex/nomencl/sample01.pdf differ diff --git a/Master/texmf-dist/doc/latex/nomencl/sample02.pdf b/Master/texmf-dist/doc/latex/nomencl/sample02.pdf index dfdfe26eb2e..4e9c95fe96a 100644 Binary files a/Master/texmf-dist/doc/latex/nomencl/sample02.pdf and b/Master/texmf-dist/doc/latex/nomencl/sample02.pdf differ diff --git a/Master/texmf-dist/doc/latex/nomencl/sample03.pdf b/Master/texmf-dist/doc/latex/nomencl/sample03.pdf index 57c1219b870..19ad09b3a91 100644 Binary files a/Master/texmf-dist/doc/latex/nomencl/sample03.pdf and b/Master/texmf-dist/doc/latex/nomencl/sample03.pdf differ diff --git a/Master/texmf-dist/doc/latex/nomencl/sample04.pdf b/Master/texmf-dist/doc/latex/nomencl/sample04.pdf index 8473f6a624a..2d6b4f2d98b 100644 Binary files a/Master/texmf-dist/doc/latex/nomencl/sample04.pdf and b/Master/texmf-dist/doc/latex/nomencl/sample04.pdf differ diff --git a/Master/texmf-dist/doc/latex/nomencl/sample05.pdf b/Master/texmf-dist/doc/latex/nomencl/sample05.pdf index 0965d8e7c3a..ce7ee643530 100644 Binary files a/Master/texmf-dist/doc/latex/nomencl/sample05.pdf and b/Master/texmf-dist/doc/latex/nomencl/sample05.pdf differ diff --git a/Master/texmf-dist/source/latex/nomencl/nomencl.drv b/Master/texmf-dist/source/latex/nomencl/nomencl.drv index 252b66fc09b..dd16f684c58 100644 --- a/Master/texmf-dist/source/latex/nomencl/nomencl.drv +++ b/Master/texmf-dist/source/latex/nomencl/nomencl.drv @@ -16,7 +16,7 @@ %% version 1.2 of the license, or (at your option) any later version. %% \ProvidesFile{nomencl.drv}% - [2020/12/29 v5.5 Nomenclature package] + [2021/11/10 v5.6 Nomenclature package] \documentclass[11pt]{ltxdoc}% \RequirePackage{fancyvrb}% \RequirePackage{hypdoc}% diff --git a/Master/texmf-dist/source/latex/nomencl/nomencl.dtx b/Master/texmf-dist/source/latex/nomencl/nomencl.dtx index 3b9326f74b3..c291392a202 100644 --- a/Master/texmf-dist/source/latex/nomencl/nomencl.dtx +++ b/Master/texmf-dist/source/latex/nomencl/nomencl.dtx @@ -1,6 +1,6 @@ % \iffalse % File nomencl.dtx -% Copyright 1996-2020 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +% Copyright 1996-2021 Boris Veytsman, Bernd Shandl, Lee Netherton, CV % Radhakrishnan, Brian Elmegaard % % @@ -28,7 +28,7 @@ %<*package|driver> % \fi % \ProvidesFile{nomencl.dtx}% - [2020/12/29 v5.5 Nomenclature package] + [2021/11/10 v5.6 Nomenclature package] % % \iffalse % @@ -579,7 +579,7 @@ or another one % \DescribeMacro{\setnomtableformat} % The list is wrapped in a |longtable| with the default format % \begin{center} -% |lp{0.4\textwidth}sp{0.3\textwidth}@{}l| +% |lp{0.4\textwidth}cp{0.3\textwidth}@{}l| % \end{center} % The command % \cs{setnomtableformat}\marg{format} can be used to change it, for @@ -590,8 +590,7 @@ or another one % % Note that the table has five columns: symbol, description, units, % note, and reference. If you do not use references, you may suppress -% the last column using |@{}l| declaration. The |s| column is used -% for units in the \package{siunitx} format. +% the last column using |@{}l| declaration. % % Figure~\ref{fig:nomentbl} provides an example of this option. % @@ -1429,6 +1428,8 @@ follows easily. % \begin{macro}{\@@@nomenclature} % \changes{v2.7 (1999/05/14)}{1999/05/11}{More robust by using \cs{nom@verb}} % \changes{v5.0}{2018/12/28}{Nomentbl option} +% \changes{v5.6}{2021/11/10}{Nomentbl option now does not use the +% deprecated |s| columnstyle} % If \cs{makenomenclature} was already executed, then \cs{@nomenclature} % calls the macro \cs{@@@nomenclature} which writes to the nomenclature file. % It puts the prefix in front of the entry, adds brackets |[]| around the @@ -1446,7 +1447,7 @@ follows easily. \def\@tempa{#2}\def\@tempb{#3}% \protected@write\@nomenclaturefile{}% {\string\nomenclatureentry{#1\nom@verb\@tempa @&{\nom@verb\@tempa}&% - \begingroup\nom@verb\@tempb\endgroup &\begingroup#4\endgroup&% + \begingroup\nom@verb\@tempb\endgroup &\unit{#4}&% \begingroup#5\endgroup&\begingroup\protect\nomeqref{\theequation}% |nompageref}{\thepage}}% \endgroup @@ -1553,13 +1554,14 @@ follows easily. % \end{macro} % % \begin{macro}{\setnomtableformat} -%\changes{v5.0}{2018/12/28}{Added macro} +% \changes{v5.0}{2018/12/28}{Added macro} +% \changes{v5.6}{2021/11/10}{Switched to |c| column for units} % The format of the nomenclature table. We insert an empty left % column due to the way \TeX\ sees \cs{multicolumn} in \cs{nomgroup} % command. % \begin{macrocode} \def\setnomtableformat#1{\def\@nomtableformat{l@{}#1}} -\setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l} +\setnomtableformat{lp{0.45\textwidth}cp{0.3\textwidth}@{}l} % \end{macrocode} % % \end{macro} diff --git a/Master/texmf-dist/tex/latex/nomencl/nomencl.sty b/Master/texmf-dist/tex/latex/nomencl/nomencl.sty index f1a100a915a..5feb5d8b423 100644 --- a/Master/texmf-dist/tex/latex/nomencl/nomencl.sty +++ b/Master/texmf-dist/tex/latex/nomencl/nomencl.sty @@ -16,7 +16,7 @@ %% version 1.2 of the license, or (at your option) any later version. %% \ProvidesPackage{nomencl}% - [2020/12/29 v5.5 Nomenclature package] + [2021/11/10 v5.6 Nomenclature package] \NeedsTeXFormat{LaTeX2e} \RequirePackage{xkeyval} \RequirePackage{ifthen} @@ -229,7 +229,7 @@ \def\@tempa{#2}\def\@tempb{#3}% \protected@write\@nomenclaturefile{}% {\string\nomenclatureentry{#1\nom@verb\@tempa @&{\nom@verb\@tempa}&% - \begingroup\nom@verb\@tempb\endgroup &\begingroup#4\endgroup&% + \begingroup\nom@verb\@tempb\endgroup &\unit{#4}&% \begingroup#5\endgroup&\begingroup\protect\nomeqref{\theequation}% |nompageref}{\thepage}}% \endgroup @@ -288,7 +288,7 @@ \newskip\nomitemsep \nomitemsep\itemsep \def\setnomtableformat#1{\def\@nomtableformat{l@{}#1}} -\setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l} +\setnomtableformat{lp{0.45\textwidth}cp{0.3\textwidth}@{}l} \def\thenomenclature{% \providecommand*{\listofnlsname}{\nomname}% \if@nomencl@tocbasic -- cgit v1.2.3