From 68b07b446344bcad010ee2d562dd6e6396953a67 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 Feb 2019 22:21:04 +0000 Subject: nomencl (9feb19) git-svn-id: svn://tug.org/texlive/trunk@49987 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/nomencl/nomencl.sty | 76 +++++++++++-------------- 1 file changed, 34 insertions(+), 42 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 390458e190e..d1001164e95 100644 --- a/Master/texmf-dist/tex/latex/nomencl/nomencl.sty +++ b/Master/texmf-dist/tex/latex/nomencl/nomencl.sty @@ -6,7 +6,7 @@ %% %% nomencl.dtx (with options: `package') %% -%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +%% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV %% Radhakrishnan, Brian Elmegaard %% %% @@ -16,10 +16,13 @@ %% version 1.2 of the license, or (at your option) any later version. %% \ProvidesPackage{nomencl}% - [2018/12/29 v5.0 Nomenclature package] + [2019/02/08 v5.1 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 @@ -43,80 +46,73 @@ \newif\if@stdsubgroups \DeclareOptionX{stdsubgroups}{\@stdsubgroupstrue} \DeclareOptionX{nostdsubgroups}{\@stdsubgroupsfalse} -\def\eqdeclaration#1{equation\nobreakspace(#1)}% -\def\pagedeclaration#1{\hspace*{2mm}page\nobreakspace#1}% -\def\nomname{Nomenclature}% -\def\nomAname{Latin Letters}% -\def\nomGname{Greek Letters}% -\def\nomXname{Superscripts}% -\def\nomZname{Subscripts} \DeclareOptionX{croatian}{% - \def\eqdeclaration#1{, vidi jednad\v{z}bu\nobreakspace(#1)}% - \def\pagedeclaration#1{, stranica\nobreakspace#1}% + \def\eqdeclaration##1{, vidi jednad\v{z}bu\nobreakspace(##1)}% + \def\pagedeclaration##1{, stranica\nobreakspace##1}% \def\nomname{Popis simbola}% \def\nomAname{Latini\v{c}na slova}% \def\nomGname{Gr\v{c}ka slova}% \def\nomXname{Exponenats}% \def\nomZname{Indeksi}} \DeclareOptionX{danish}{% - \def\eqdeclaration#1{, se ligning\nobreakspace(#1)}% - \def\pagedeclaration#1{, side\nobreakspace#1}% + \def\eqdeclaration##1{, se ligning\nobreakspace(##1)}% + \def\pagedeclaration##1{, side\nobreakspace##1}% \def\nomname{Symbolliste}% \def\nomAname{Romerske bogstaver}% \def\nomGname{Gr{\ae}ske bogstaver}% \def\nomXname{(H{\o}jtstillede) indices}% \def\nomZname{Indices}} \DeclareOptionX{english}{% - \def\eqdeclaration#1{, see equation\nobreakspace(#1)}% - \def\pagedeclaration#1{, page\nobreakspace#1}% + \def\eqdeclaration##1{, see equation\nobreakspace(##1)}% + \def\pagedeclaration##1{, page\nobreakspace##1}% \def\nomname{Nomenclature}% \def\nomAname{Latin Letters}% \def\nomGname{Greek Letters}% \def\nomXname{Superscripts}% \def\nomZname{Subscripts}} \DeclareOptionX{french}{% - \def\eqdeclaration#1{, voir \'equation\nobreakspace(#1)}% - \def\pagedeclaration#1{, page\nobreakspace#1}% + \def\eqdeclaration##1{, voir \'equation\nobreakspace(##1)}% + \def\pagedeclaration##1{, page\nobreakspace##1}% \def\nomname{Liste des symboles}% \def\nomAname{Lettres latines}% \def\nomGname{Lettres grecques}% \def\nomXname{Indices sup{\'e}rieurs}% \def\nomZname{Indices}} \DeclareOptionX{german}{% - \def\eqdeclaration#1{, siehe Gleichung\nobreakspace(#1)}% - \def\pagedeclaration#1{, Seite\nobreakspace#1}% + \def\eqdeclaration##1{, siehe Gleichung\nobreakspace(##1)}% + \def\pagedeclaration##1{, Seite\nobreakspace##1}% \def\nomname{Symbolverzeichnis}% \def\nomAname{Lateinische Buchstaben}% \def\nomGname{Griechische Buchstaben}% \def\nomXname{(hochgestellte) Indizes}% \def\nomZname{Indizes}} \DeclareOptionX{italian}{% - \def\eqdeclaration#1{, vedi equazione\nobreakspace(#1)}% - \def\pagedeclaration#1{, pagina\nobreakspace#1}% + \def\eqdeclaration##1{, vedi equazione\nobreakspace(##1)}% + \def\pagedeclaration##1{, pagina\nobreakspace##1}% \def\nomname{Elenco dei simboli}% \def\nomAname{Lettere latine}% \def\nomGname{Lettere greche}% \def\nomXname{Apici}% \def\nomZname{Indici}} \DeclareOptionX{polish}{% - \def\eqdeclaration#1{, porownaj rownanie\nobreakspace(#1)}% - \def\pagedeclaration#1{, strona\nobreakspace#1}% + \def\eqdeclaration##1{, porownaj rownanie\nobreakspace(##1)}% + \def\pagedeclaration##1{, strona\nobreakspace##1}% \def\nomname{Lista symboli}% \def\nomAname{Litery {\l}aci\'nskie}% \def\nomGname{Litery greckie}% \def\nomXname{Indeksy g\'orny}% \def\nomZname{Indeksy dolne}} \DeclareOptionX{portuguese}{% - \def\eqdeclaration#1{, veja equa\c{c}\~ao\nobreakspace(#1)}% - \def\pagedeclaration#1{, p\'agina\nobreakspace#1}% + \def\eqdeclaration##1{, veja equa\c{c}\~ao\nobreakspace(##1)}% + \def\pagedeclaration##1{, p\'agina\nobreakspace##1}% \def\nomname{Nomenclatura}% \def\nomAname{Letras latinas}% \def\nomGname{Letras gregas}% \def\nomXname{Sobrescritos}% \def\nomZname{Subscritos}} \DeclareOptionX{russian}{% - \def\eqdeclaration#1{, \cyrs\cyrm.\nobreakspace(#1)}% - \def\pagedeclaration#1{, \cyrs\cyrt\cyrr.\nobreakspace#1}% + \def\eqdeclaration##1{, \cyrs\cyrm.\nobreakspace(##1)}% + \def\pagedeclaration##1{, \cyrs\cyrt\cyrr.\nobreakspace##1}% \def\nomname{\CYRS\cyrp\cyri\cyrs\cyro\cyrk% \ \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri% \cyrishrt}% @@ -129,16 +125,16 @@ \def\nomZname{\CYRP\cyro\cyrd\cyrs\cyrt\cyrr\cyro\cyrch\cyrn\cyrery\cyre\ \cyri\cyrn\cyrd\cyre\cyrk\cyrs\cyrery}} \DeclareOptionX{spanish}{% - \def\eqdeclaration#1{, v\'ease la ecuaci\'on\nobreakspace(#1)}% - \def\pagedeclaration#1{, p\'agina\nobreakspace#1}% + \def\eqdeclaration##1{, v\'ease la ecuaci\'on\nobreakspace(##1)}% + \def\pagedeclaration##1{, p\'agina\nobreakspace##1}% \def\nomname{Nomenclatura}% \def\nomAname{Letras latinas}% \def\nomGname{Letras griegas}% \def\nomXname{Super{\'\i}ndices}% \def\nomZname{Sub{\'\i}ndices}} \DeclareOptionX{ukrainian}{% - \def\eqdeclaration#1{, \cyrd\cyri\cyrv.\nobreakspace(#1)}% - \def\pagedeclaration#1{, \cyrs\cyrt\cyro\cyrr.\nobreakspace#1}% + \def\eqdeclaration##1{, \cyrd\cyri\cyrv.\nobreakspace(##1)}% + \def\pagedeclaration##1{, \cyrs\cyrt\cyro\cyrr.\nobreakspace##1}% \def\nomname{\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk% \ \cyrp\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrsftsn}% \def\nomAname{\CYRL\cyra\cyrt\cyri\cyrn\cyrs\cyrsftsn\cyrk\cyrii\ @@ -153,6 +149,9 @@ \if@nomentbl \RequirePackage{array,longtable, siunitx} \fi +\if@intoc +\setuptoc{nls}{totoc} +\fi \if@compatibilitymode% \def\@outputfileextension{.glo}% \def\@inputfileextension{.gls}% @@ -251,17 +250,10 @@ \def\setnomtableformat#1{\def\@nomtableformat{l@{}#1}} \setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l} \def\thenomenclature{% - \@ifundefined{chapter}% - { - \section*{\nomname} - \if@intoc\addcontentsline{toc}{section}{\nomname}\fi% - }% - { - \chapter*{\nomname} - \markboth{\nomname}{\nomname}% - \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi% - }% - + \providecommand*{\listofnlsname}{\nomname}% + \let\list@fname\listofnlsname + \def\@currext{nls}% + \tocbasic@listhead{\list@fname}% \nompreamble \if@nomentbl \let\itemOrig=\item -- cgit v1.2.3