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/doc/latex/nomencl/Makefile | 65 ----------- Master/texmf-dist/doc/latex/nomencl/README | 6 +- Master/texmf-dist/doc/latex/nomencl/nomencl.pdf | Bin 328389 -> 330880 bytes Master/texmf-dist/doc/latex/nomencl/sample01.pdf | Bin 33806 -> 34412 bytes Master/texmf-dist/doc/latex/nomencl/sample01.tex | 7 +- Master/texmf-dist/doc/latex/nomencl/sample02.pdf | Bin 80166 -> 80166 bytes Master/texmf-dist/doc/latex/nomencl/sample03.pdf | Bin 81763 -> 81763 bytes Master/texmf-dist/doc/latex/nomencl/sample04.cfg | 2 +- Master/texmf-dist/doc/latex/nomencl/sample04.pdf | Bin 48310 -> 48310 bytes Master/texmf-dist/doc/latex/nomencl/sample05.cfg | 2 +- Master/texmf-dist/doc/latex/nomencl/sample05.pdf | Bin 34041 -> 34041 bytes Master/texmf-dist/doc/latex/nomencl/sample06.cfg | 2 +- Master/texmf-dist/makeindex/nomencl/nomencl.ist | 2 +- Master/texmf-dist/source/latex/nomencl/Makefile | 65 +++++++++++ Master/texmf-dist/source/latex/nomencl/nomencl.drv | 4 +- Master/texmf-dist/source/latex/nomencl/nomencl.dtx | 120 ++++++++++----------- Master/texmf-dist/source/latex/nomencl/nomencl.ins | 6 +- Master/texmf-dist/tex/latex/nomencl/nomencl.sty | 76 ++++++------- Master/tlpkg/libexec/ctan2tds | 1 + 19 files changed, 178 insertions(+), 180 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/nomencl/Makefile create mode 100644 Master/texmf-dist/source/latex/nomencl/Makefile diff --git a/Master/texmf-dist/doc/latex/nomencl/Makefile b/Master/texmf-dist/doc/latex/nomencl/Makefile deleted file mode 100644 index 74c49a80b18..00000000000 --- a/Master/texmf-dist/doc/latex/nomencl/Makefile +++ /dev/null @@ -1,65 +0,0 @@ - -PACKAGE=nomencl - -SAMPLES = sample01.tex sample02.tex sample03.tex sample04.tex sample05.tex - -CFG = sample04.cfg sample05.cfg sample06.cfg - - -SAMPLEPDF = ${SAMPLES:%.tex=%.pdf} - -PDF = $(PACKAGE).pdf ${SAMPLEPDF} - -all: ${PDF} ${SAMPLES} ${CFG} ${PACKAGE}.sty - - -%.sty: %.ins %.dtx - pdflatex $*.ins - -sample%.tex: nomencl.ins nomencl.sty - pdflatex nomencl.ins - -sample%.cfg: nomencl.ins nomencl.dtx - pdflatex nomencl.ins - - -%.pdf: %.dtx ${PACKAGE}.sty - pdflatex $< - - bibtex $* - pdflatex $< - - makeindex -s gind.ist -o $*.ind $*.idx - - makeindex -s gglo.ist -o $*.gls $*.glo - pdflatex $< - while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \ - do pdflatex $<; done - - -sample%.pdf: sample%.tex ${CFG} ${PACKAGE}.sty - pdflatex sample$*.tex - makeindex sample$*.nlo -s nomencl.ist -o sample$*.nls - pdflatex sample$*.tex - pdflatex sample$*.tex - - - -clean: - $(RM) ${PACKAGE}.sty *.log *.aux \ - *.cfg *.glo *.idx *.toc \ - *.ilg *.ind *.out *.lof \ - *.lot *.bbl *.blg *.gls *.cut *.hd \ - *.dvi *.ps *.thm *.tgz *.zip *.rpi *.drv *.ist \ - *.nlo *.nls ${SAMPLES} ${CFG} - -distclean: clean - $(RM) $(PDF) - -# -# Archive for the distribution. Includes typeset documentation -# -archive: all clean - COPYFILE_DISABLE=1 tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip' --exclude CVS --exclude '.git*' $(PACKAGE); mv ../$(PACKAGE).tgz . - -zip: all clean - zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*' - -.PRECIOUS: ${SAMPLES} ${CFG} diff --git a/Master/texmf-dist/doc/latex/nomencl/README b/Master/texmf-dist/doc/latex/nomencl/README index 42b11bc6373..61945881831 100644 --- a/Master/texmf-dist/doc/latex/nomencl/README +++ b/Master/texmf-dist/doc/latex/nomencl/README @@ -30,4 +30,8 @@ VERSION HISTORY Cleaned code and documentation Incorporated nomentbl code New options: stdsubgroups, nomentbl, - user selectable configuratuon file \ No newline at end of file + user selectable configuratuon file + + v5.1 2019/02/08 Compatibility changes for KOMA-Script + Bugs fixes + diff --git a/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf b/Master/texmf-dist/doc/latex/nomencl/nomencl.pdf index d96ae01c21d..78a69727b06 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 85dddbf53c1..73b101b5eec 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/sample01.tex b/Master/texmf-dist/doc/latex/nomencl/sample01.tex index 6c756d37eef..4de78df6fa0 100644 --- a/Master/texmf-dist/doc/latex/nomencl/sample01.tex +++ b/Master/texmf-dist/doc/latex/nomencl/sample01.tex @@ -6,12 +6,13 @@ \begin{equation} a=\frac{N}{A} \end{equation}% -\nomenclature{$a$}{The number of angels per unit area}% -\nomenclature{$N$}{The number of angels per needle point}% +\nomenclature{$a$}{The number of angels per unit area\nomrefeq}% +\nomenclature{$N$}{The number of angels per needle point\nomrefpage}% \nomenclature{$A$}{The area of the needle point}% The equation $\sigma = m a$% -\nomenclature{$\sigma$}{The total mass of angels per unit area}% +\nomenclature{$\sigma$}{The total mass of angels per unit area\nomrefeqpage}% \nomenclature{$m$}{The mass of one angel} follows easily. +\eqdeclaration{32} \printnomenclature \end{document} diff --git a/Master/texmf-dist/doc/latex/nomencl/sample02.pdf b/Master/texmf-dist/doc/latex/nomencl/sample02.pdf index 1cde472f907..834f17f6dd5 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 32ac6818e53..87ff498a03a 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.cfg b/Master/texmf-dist/doc/latex/nomencl/sample04.cfg index 04da50bbb40..81cff016fea 100644 --- a/Master/texmf-dist/doc/latex/nomencl/sample04.cfg +++ b/Master/texmf-dist/doc/latex/nomencl/sample04.cfg @@ -6,7 +6,7 @@ %% %% nomencl.dtx (with options: `sample04.cfg') %% -%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +%% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV %% Radhakrishnan, Brian Elmegaard %% %% diff --git a/Master/texmf-dist/doc/latex/nomencl/sample04.pdf b/Master/texmf-dist/doc/latex/nomencl/sample04.pdf index 85db6b9e159..c239c6359ff 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.cfg b/Master/texmf-dist/doc/latex/nomencl/sample05.cfg index 8d22032bea7..660d7a679f0 100644 --- a/Master/texmf-dist/doc/latex/nomencl/sample05.cfg +++ b/Master/texmf-dist/doc/latex/nomencl/sample05.cfg @@ -6,7 +6,7 @@ %% %% nomencl.dtx (with options: `sample05.cfg') %% -%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +%% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV %% Radhakrishnan, Brian Elmegaard %% %% diff --git a/Master/texmf-dist/doc/latex/nomencl/sample05.pdf b/Master/texmf-dist/doc/latex/nomencl/sample05.pdf index bb65d3572d0..3181af6967c 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/doc/latex/nomencl/sample06.cfg b/Master/texmf-dist/doc/latex/nomencl/sample06.cfg index de9b0cf7282..fe89c346c97 100644 --- a/Master/texmf-dist/doc/latex/nomencl/sample06.cfg +++ b/Master/texmf-dist/doc/latex/nomencl/sample06.cfg @@ -6,7 +6,7 @@ %% %% nomencl.dtx (with options: `sample06.cfg') %% -%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +%% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV %% Radhakrishnan, Brian Elmegaard %% %% diff --git a/Master/texmf-dist/makeindex/nomencl/nomencl.ist b/Master/texmf-dist/makeindex/nomencl/nomencl.ist index e47695da09a..5b80b431d06 100644 --- a/Master/texmf-dist/makeindex/nomencl/nomencl.ist +++ b/Master/texmf-dist/makeindex/nomencl/nomencl.ist @@ -6,7 +6,7 @@ %% %% nomencl.dtx (with options: `idxstyle') %% -%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +%% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV %% Radhakrishnan, Brian Elmegaard %% %% diff --git a/Master/texmf-dist/source/latex/nomencl/Makefile b/Master/texmf-dist/source/latex/nomencl/Makefile new file mode 100644 index 00000000000..74c49a80b18 --- /dev/null +++ b/Master/texmf-dist/source/latex/nomencl/Makefile @@ -0,0 +1,65 @@ + +PACKAGE=nomencl + +SAMPLES = sample01.tex sample02.tex sample03.tex sample04.tex sample05.tex + +CFG = sample04.cfg sample05.cfg sample06.cfg + + +SAMPLEPDF = ${SAMPLES:%.tex=%.pdf} + +PDF = $(PACKAGE).pdf ${SAMPLEPDF} + +all: ${PDF} ${SAMPLES} ${CFG} ${PACKAGE}.sty + + +%.sty: %.ins %.dtx + pdflatex $*.ins + +sample%.tex: nomencl.ins nomencl.sty + pdflatex nomencl.ins + +sample%.cfg: nomencl.ins nomencl.dtx + pdflatex nomencl.ins + + +%.pdf: %.dtx ${PACKAGE}.sty + pdflatex $< + - bibtex $* + pdflatex $< + - makeindex -s gind.ist -o $*.ind $*.idx + - makeindex -s gglo.ist -o $*.gls $*.glo + pdflatex $< + while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \ + do pdflatex $<; done + + +sample%.pdf: sample%.tex ${CFG} ${PACKAGE}.sty + pdflatex sample$*.tex + makeindex sample$*.nlo -s nomencl.ist -o sample$*.nls + pdflatex sample$*.tex + pdflatex sample$*.tex + + + +clean: + $(RM) ${PACKAGE}.sty *.log *.aux \ + *.cfg *.glo *.idx *.toc \ + *.ilg *.ind *.out *.lof \ + *.lot *.bbl *.blg *.gls *.cut *.hd \ + *.dvi *.ps *.thm *.tgz *.zip *.rpi *.drv *.ist \ + *.nlo *.nls ${SAMPLES} ${CFG} + +distclean: clean + $(RM) $(PDF) + +# +# Archive for the distribution. Includes typeset documentation +# +archive: all clean + COPYFILE_DISABLE=1 tar -C .. -czvf ../$(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude '*.zip' --exclude CVS --exclude '.git*' $(PACKAGE); mv ../$(PACKAGE).tgz . + +zip: all clean + zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x CVS -x 'CVS/*' + +.PRECIOUS: ${SAMPLES} ${CFG} diff --git a/Master/texmf-dist/source/latex/nomencl/nomencl.drv b/Master/texmf-dist/source/latex/nomencl/nomencl.drv index 247f8ac3e75..307ea99f7d6 100644 --- a/Master/texmf-dist/source/latex/nomencl/nomencl.drv +++ b/Master/texmf-dist/source/latex/nomencl/nomencl.drv @@ -6,7 +6,7 @@ %% %% nomencl.dtx (with options: `driver') %% -%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +%% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV %% Radhakrishnan, Brian Elmegaard %% %% @@ -16,7 +16,7 @@ %% version 1.2 of the license, or (at your option) any later version. %% \ProvidesFile{nomencl.drv}% - [2018/12/29 v5.0 Nomenclature package] + [2019/02/08 v5.1 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 eddd8e54ce9..59f3b474999 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-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV % Radhakrishnan, Brian Elmegaard % % @@ -28,7 +28,7 @@ %<*package|driver> % \fi % \ProvidesFile{nomencl.dtx}% - [2018/12/29 v5.0 Nomenclature package] + [2019/02/08 v5.1 Nomenclature package] % % \iffalse % @@ -256,13 +256,14 @@ \begin{equation} a=\frac{N}{A} \end{equation}% -\nomenclature{$a$}{The number of angels per unit area}% -\nomenclature{$N$}{The number of angels per needle point}% +\nomenclature{$a$}{The number of angels per unit area\nomrefeq}% +\nomenclature{$N$}{The number of angels per needle point\nomrefpage}% \nomenclature{$A$}{The area of the needle point}% The equation $\sigma = m a$% -\nomenclature{$\sigma$}{The total mass of angels per unit area}% +\nomenclature{$\sigma$}{The total mass of angels per unit area\nomrefeqpage}% \nomenclature{$m$}{The mass of one angel} follows easily. +\eqdeclaration{32} \printnomenclature \end{document} % @@ -271,19 +272,14 @@ follows easily. % \label{fig:simple} % \end{example} % \begin{example} -% \begin{thenomenclature} -% \nomgroup{A} -% \item[$\sigma$]\begingroup The total mass of angels per unit area\nomeqref {1} -% \nompageref{1} -% \item[$A$]\begingroup The area of the needle point\nomeqref {1} -% \nompageref{1} -% \item[$a$]\begingroup The number of angels per unit area\nomeqref {1} -% \nompageref{1} -% \item[$m$]\begingroup The mass of one angel\nomeqref {1} -% \nompageref{1} -% \item[$N$]\begingroup The number of angels per needle point\nomeqref {1} -% \nompageref{1} -% \end{thenomenclature} +%\begin{thenomenclature} +%\nomgroup{A} +% \item [{$\sigma$}]\begingroup The total mass of angels per unit area\nomrefeqpage\nomeqref {1}\nompageref{1} +% \item [{$A$}]\begingroup The area of the needle point\nomeqref {1}\nompageref{1} +% \item [{$a$}]\begingroup The number of angels per unit area\nomrefeq\nomeqref {1}\nompageref{1} +% \item [{$m$}]\begingroup The mass of one angel\nomeqref {1}\nompageref{1} +% \item [{$N$}]\begingroup The number of angels per needle point\nomrefpage\nomeqref {1}\nompageref{1} +%\end{thenomenclature} % \caption{The typeset output for the simple example} % \label{fig:simple.out} % \end{example} @@ -985,7 +981,6 @@ follows easily. % % % -% % \subsection{Acknowledgements} % % Since version 5.0 the package incorporates the code from @@ -1059,10 +1054,14 @@ follows easily. % % \changes{v5.0}{2018/12/28}{Moved to xkeyval} % \changes{v5.0}{2018/12/28}{Added ifthen package} -% We need xkeyval package for some options and ifthen for grouping +% We need \textsl{xkeyval} package for some options and \textsl{ifthen} +% for grouping and \textsl{tocbasic} for TOC % \begin{macrocode} \RequirePackage{xkeyval} \RequirePackage{ifthen} +\RequirePackage{tocbasic} +\addtotoclist[nomencl]{nlo} +\addtotoclist[nomencl]{nls} % \end{macrocode} % % @@ -1158,82 +1157,76 @@ follows easily. % \changes{v3.1 (2000/09/15)}{2000/08/30}{Added Croatian} % \changes{v3.1a (2000/12/03)}{2000/12/03}{Added Portuguese} % \changes{v5.0}{2018/12/28}{Added defaults} +% \changes{v5.1}{2019/02/08}{Changed \# to \#\# in options.} % If you can help out with translations for some other languages, let me know. % \begin{macrocode} -\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}% @@ -1246,16 +1239,16 @@ follows easily. \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\ @@ -1280,6 +1273,13 @@ follows easily. \RequirePackage{array,longtable, siunitx} \fi % \end{macrocode} +% +% Checking whether we need nomenclature in toc +% \begin{macrocode} +\if@intoc +\setuptoc{nls}{totoc} +\fi +% \end{macrocode} % % % \begin{macro}{\@outputfileextension} @@ -1501,6 +1501,9 @@ 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} % 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 @@ -1513,17 +1516,10 @@ follows easily. % end of the table. % \begin{macrocode} \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 @@ -1591,6 +1587,10 @@ follows easily. \PackageInfo{nomencl}{Using the configuration file \@cfgfile}}{} \fi % \end{macrocode} +% +% +% +% % The end. % \begin{macrocode} % diff --git a/Master/texmf-dist/source/latex/nomencl/nomencl.ins b/Master/texmf-dist/source/latex/nomencl/nomencl.ins index 5642b316159..238dbb7a8db 100644 --- a/Master/texmf-dist/source/latex/nomencl/nomencl.ins +++ b/Master/texmf-dist/source/latex/nomencl/nomencl.ins @@ -1,5 +1,5 @@ % File nomencl.ins -% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +% Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV % Radhakrishnan, Brian Elmegaard % % @@ -21,7 +21,7 @@ % preamble for sty and drv file \preamble -Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV Radhakrishnan, Brian Elmegaard @@ -36,7 +36,7 @@ version 1.2 of the license, or (at your option) any later version. \catcode`\%=12 \declarepreamble\istpreamble -Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV +Copyright 1996-2019 Boris Veytsman, Bernd Shandl, Lee Netherton, CV Radhakrishnan, Brian Elmegaard 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 diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 82a94f88205..ab48f550678 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1859,6 +1859,7 @@ $standardtex 'nddiss', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$', 'nodetree', 'nodetree.(tex|lua)|' . $standardtex, 'noindentafter', "noindentafter\.sty", + 'nomencl', '\.sty', # not .cfg 'notes', '[^s]\.(eps|pdf|png)|' . $standardtex, # not notes.pdf 'ntheorem', '\.sty|\.std', 'nucleardata', '\.(csv|hd|pytxcode)|' . $standardtex, -- cgit v1.2.3