summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/nomencl/README2
-rw-r--r--Master/texmf-dist/doc/latex/nomencl/nomencl.pdfbin330880 -> 332808 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nomencl/sample01.pdfbin34412 -> 34412 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nomencl/sample02.pdfbin80166 -> 80166 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nomencl/sample03.pdfbin81763 -> 81763 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nomencl/sample04.pdfbin48310 -> 48310 bytes
-rw-r--r--Master/texmf-dist/doc/latex/nomencl/sample05.pdfbin34041 -> 34041 bytes
-rw-r--r--Master/texmf-dist/source/latex/nomencl/nomencl.drv2
-rw-r--r--Master/texmf-dist/source/latex/nomencl/nomencl.dtx63
-rw-r--r--Master/texmf-dist/tex/latex/nomencl/nomencl.sty39
10 files changed, 85 insertions, 21 deletions
diff --git a/Master/texmf-dist/doc/latex/nomencl/README b/Master/texmf-dist/doc/latex/nomencl/README
index 61945881831..741bfa1b751 100644
--- a/Master/texmf-dist/doc/latex/nomencl/README
+++ b/Master/texmf-dist/doc/latex/nomencl/README
@@ -35,3 +35,5 @@ VERSION HISTORY
v5.1 2019/02/08 Compatibility changes for KOMA-Script
Bugs fixes
+ v5.2 2019/05/05 More compatibility changes: tocbasic call
+ is now optional \ 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 78a69727b06..46861da40ae 100644
--- a/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf
+++ b/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nomencl/sample01.pdf b/Master/texmf-dist/doc/latex/nomencl/sample01.pdf
index 73b101b5eec..00fb04cf992 100644
--- a/Master/texmf-dist/doc/latex/nomencl/sample01.pdf
+++ b/Master/texmf-dist/doc/latex/nomencl/sample01.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nomencl/sample02.pdf b/Master/texmf-dist/doc/latex/nomencl/sample02.pdf
index 834f17f6dd5..15b9672a6c4 100644
--- a/Master/texmf-dist/doc/latex/nomencl/sample02.pdf
+++ b/Master/texmf-dist/doc/latex/nomencl/sample02.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nomencl/sample03.pdf b/Master/texmf-dist/doc/latex/nomencl/sample03.pdf
index 87ff498a03a..770f22e34d8 100644
--- a/Master/texmf-dist/doc/latex/nomencl/sample03.pdf
+++ b/Master/texmf-dist/doc/latex/nomencl/sample03.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nomencl/sample04.pdf b/Master/texmf-dist/doc/latex/nomencl/sample04.pdf
index c239c6359ff..b3721f11205 100644
--- a/Master/texmf-dist/doc/latex/nomencl/sample04.pdf
+++ b/Master/texmf-dist/doc/latex/nomencl/sample04.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/nomencl/sample05.pdf b/Master/texmf-dist/doc/latex/nomencl/sample05.pdf
index 3181af6967c..a87bfe10368 100644
--- a/Master/texmf-dist/doc/latex/nomencl/sample05.pdf
+++ b/Master/texmf-dist/doc/latex/nomencl/sample05.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/nomencl/nomencl.drv b/Master/texmf-dist/source/latex/nomencl/nomencl.drv
index 307ea99f7d6..4436130f0cf 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}%
- [2019/02/08 v5.1 Nomenclature package]
+ [2019/05/05 v5.2 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 59f3b474999..97ab1588d86 100644
--- a/Master/texmf-dist/source/latex/nomencl/nomencl.dtx
+++ b/Master/texmf-dist/source/latex/nomencl/nomencl.dtx
@@ -28,7 +28,7 @@
%<*package|driver>
% \fi
% \ProvidesFile{nomencl.dtx}%
- [2019/02/08 v5.1 Nomenclature package]
+ [2019/05/05 v5.2 Nomenclature package]
%
% \iffalse
%</package|driver>
@@ -94,6 +94,7 @@
% \changes{v4.1 (2005/04/27)}{2005/04/27}{Improvements to the documentation,
% including hyperref support}
% \changes{v5.0}{2018/12/28}{Rewrote documentation}
+% \changes{v5.2}{2019/05/05}{New options: tocbasic, notocbasic}
%
% \GetFileInfo{nomencl.dtx}
%
@@ -333,6 +334,11 @@ follows easily.
% \item[nocfg] The configuration file is not loaded.
% \item[intoc] Inserts the nomenclature in the Table of Contents.
% \item[notintoc] No entry for the nomenclature in the Table of Contents. (default)
+% \item[tocbasic] Use \textsl{tocbasic} package from KOMA script
+% bundle for TOC handling (default)
+% \item[notocbasic] Do not use \textsl{tocbasic} package from KOMA
+% script. You may need this option if \textsl{tocbasic} conflicts
+% with other packages like \textsl{pgfopts}.
% \item[compatible] Run in compatibility mode. Older tex files may
% need this option selected to be able to compile. In the latest
% version of \package{nomencl} the commands |\makeglossary| and
@@ -1059,9 +1065,6 @@ follows easily.
% \begin{macrocode}
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
-\RequirePackage{tocbasic}
-\addtotoclist[nomencl]{nlo}
-\addtotoclist[nomencl]{nls}
% \end{macrocode}
%
%
@@ -1086,6 +1089,17 @@ follows easily.
\newif\if@compatibilitymode
% \end{macrocode}
% \end{macro}
+%
+% \begin{macro}{\if@nomencl@tocbasic}
+% \changes{v5.2}{2019/05/05}{Reintroduced macro}
+% Whether we are to use tocbasic
+% \begin{macrocode}
+\newif\if@nomencl@tocbasic
+\@nomencl@tocbasictrue
+% \end{macrocode}
+%
+% \end{macro}
+%
% And the options to set these switches globally.
% \begin{macrocode}
\DeclareOptionX{refeq}{\@printeqreftrue}
@@ -1096,6 +1110,8 @@ follows easily.
\DeclareOptionX{notintoc}{\@intocfalse}
\DeclareOptionX{compatible}{\@compatibilitymodetrue}
\DeclareOptionX{noncompatible}{\@compatibilitymodefalse}
+\DeclareOptionX{tocbasic}{\@nomencl@tocbasictrue}
+\DeclareOptionX{notocbasic}{\@nomencl@tocbasicfalse}
% \end{macrocode}
% \begin{macro}{\nomprefix}
% It might make sense to add the prefix ``a'' to every sortkey, see
@@ -1138,7 +1154,6 @@ follows easily.
% \end{macrocode}
% \end{macro}
%
-%
% \begin{macro}{\eqdeclaration}
% \begin{macro}{\pagedeclaration}
% \begin{macro}{\nomname}
@@ -1263,7 +1278,7 @@ follows easily.
% \end{macro}\end{macro}\end{macro}\end{macro}
% Finally set the default options and process everything.
% \begin{macrocode}
-\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups}
+\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups,tocbasic}
\ProcessOptionsX\relax
% \end{macrocode}
%
@@ -1274,10 +1289,22 @@ follows easily.
\fi
% \end{macrocode}
%
+% In |tocbasic| mode we need to load \textsl{tocbasic}
+% \begin{macrocode}
+\if@nomencl@tocbasic
+ \RequirePackage{tocbasic}
+ \addtotoclist[nomencl]{nlo}
+ \addtotoclist[nomencl]{nls}
+\fi
+% \end{macrocode}
+%
+%
% Checking whether we need nomenclature in toc
% \begin{macrocode}
\if@intoc
-\setuptoc{nls}{totoc}
+ \if@nomencl@tocbasic
+ \setuptoc{nls}{totoc}
+ \fi
\fi
% \end{macrocode}
%
@@ -1503,7 +1530,8 @@ follows easily.
% \begin{environment}{thenomenclature}
%\changes{v5.1}{2019/01/27}{Changed \cs{markboth} to \cs{@mkboth} for
% chapters}
-%\changes{v5.1}{2019/02/08}{Added tocbasic}
+% \changes{v5.1}{2019/02/08}{Added tocbasic}
+% \changes{v5.2}{2019/05/05}{Made tocbasic optional}
% The |thenomenclature| environment formats its title and optionally
% inserts an item in the TOC, both are dependant on
% whether the \cs{chapter} command is available or not. After
@@ -1517,9 +1545,22 @@ follows easily.
% \begin{macrocode}
\def\thenomenclature{%
\providecommand*{\listofnlsname}{\nomname}%
- \let\list@fname\listofnlsname
- \def\@currext{nls}%
- \tocbasic@listhead{\list@fname}%
+ \if@nomencl@tocbasic
+ \let\list@fname\listofnlsname
+ \def\@currext{nls}%
+ \tocbasic@listhead{\list@fname}%
+ \else
+ \@ifundefined{chapter}%
+ {
+ \section*{\nomname}
+ \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+ }%
+ {
+ \chapter*{\nomname}
+ \@mkboth{\nomname}{\nomname}%
+ \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+ }%
+ \fi
\nompreamble
\if@nomentbl
\let\itemOrig=\item
diff --git a/Master/texmf-dist/tex/latex/nomencl/nomencl.sty b/Master/texmf-dist/tex/latex/nomencl/nomencl.sty
index d1001164e95..fe9765ef454 100644
--- a/Master/texmf-dist/tex/latex/nomencl/nomencl.sty
+++ b/Master/texmf-dist/tex/latex/nomencl/nomencl.sty
@@ -16,17 +16,16 @@
%% version 1.2 of the license, or (at your option) any later version.
%%
\ProvidesPackage{nomencl}%
- [2019/02/08 v5.1 Nomenclature package]
+ [2019/05/05 v5.2 Nomenclature package]
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
-\RequirePackage{tocbasic}
-\addtotoclist[nomencl]{nlo}
-\addtotoclist[nomencl]{nls}
\newif\if@printeqref
\newif\if@printpageref
\newif\if@intoc
\newif\if@compatibilitymode
+\newif\if@nomencl@tocbasic
+\@nomencl@tocbasictrue
\DeclareOptionX{refeq}{\@printeqreftrue}
\DeclareOptionX{norefeq}{\@printeqreffalse}
\DeclareOptionX{refpage}{\@printpagereftrue}
@@ -35,6 +34,8 @@
\DeclareOptionX{notintoc}{\@intocfalse}
\DeclareOptionX{compatible}{\@compatibilitymodetrue}
\DeclareOptionX{noncompatible}{\@compatibilitymodefalse}
+\DeclareOptionX{tocbasic}{\@nomencl@tocbasictrue}
+\DeclareOptionX{notocbasic}{\@nomencl@tocbasicfalse}
\DeclareOptionX{prefix}{\def\nomprefix{a}}
\DeclareOptionX{noprefix}{\def\nomprefix{}}
\newif\if@nomentbl
@@ -144,13 +145,20 @@
\def\nomXname{\CYRV\cyre\cyrr\cyrh\cyrn\cyrii\
\cyrii\cyrn\cyrd\cyre\cyrk\cyrs\cyri}%
\def\nomZname{\CYRII\cyrn\cyrd\cyre\cyrk\cyrs\cyri}}
-\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups}
+\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups,tocbasic}
\ProcessOptionsX\relax
\if@nomentbl
\RequirePackage{array,longtable, siunitx}
\fi
+\if@nomencl@tocbasic
+ \RequirePackage{tocbasic}
+ \addtotoclist[nomencl]{nlo}
+ \addtotoclist[nomencl]{nls}
+\fi
\if@intoc
-\setuptoc{nls}{totoc}
+ \if@nomencl@tocbasic
+ \setuptoc{nls}{totoc}
+ \fi
\fi
\if@compatibilitymode%
\def\@outputfileextension{.glo}%
@@ -251,9 +259,22 @@
\setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l}
\def\thenomenclature{%
\providecommand*{\listofnlsname}{\nomname}%
- \let\list@fname\listofnlsname
- \def\@currext{nls}%
- \tocbasic@listhead{\list@fname}%
+ \if@nomencl@tocbasic
+ \let\list@fname\listofnlsname
+ \def\@currext{nls}%
+ \tocbasic@listhead{\list@fname}%
+ \else
+ \@ifundefined{chapter}%
+ {
+ \section*{\nomname}
+ \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+ }%
+ {
+ \chapter*{\nomname}
+ \@mkboth{\nomname}{\nomname}%
+ \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+ }%
+ \fi
\nompreamble
\if@nomentbl
\let\itemOrig=\item