From 71bf46e7bb571f5403e8839fb91ac4e1f0e6492f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 6 May 2019 21:05:51 +0000 Subject: nomencl (6may19) git-svn-id: svn://tug.org/texlive/trunk@51025 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/nomencl/nomencl.sty | 39 +++++++++++++++++++------ 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'Master/texmf-dist/tex/latex/nomencl') 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 -- cgit v1.2.3