nomencl (30dec18)

git-svn-id: svn://tug.org/texlive/trunk@49548 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 245 insertions, 222 deletions

diff --git a/Master/texmf-dist/tex/latex/nomencl/nomencl.sty b/Master/texmf-dist/tex/latex/nomencl/nomencl.sty
index ba8fa671ee8..390458e190e 100644
--- a/Master/texmf-dist/tex/latex/nomencl/nomencl.sty
+++ b/Master/texmf-dist/tex/latex/nomencl/nomencl.sty
@@ -6,100 +6,153 @@
 %%
 %% nomencl.dtx  (with options: `package')
 %% 
-%% Copyright 1996 Boris Veytsman
-%% Copyright 1999-2001 Bernd Schandl
-%% www http://sarovar.org/projects/nomencl
+%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
+%% Radhakrishnan, Brian Elmegaard
+%% 
 %% 
 %% This file can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
 %% archives in the directory macros/latex/base/lppl.txt; either
 %% version 1.2 of the license, or (at your option) any later version.
 %% 
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
 \ProvidesPackage{nomencl}%
-          [2005/09/22 v4.2 Nomenclature package (LN)]
+          [2018/12/29 v5.0 Nomenclature package]
 \NeedsTeXFormat{LaTeX2e}
+\RequirePackage{xkeyval}
+\RequirePackage{ifthen}
 \newif\if@printeqref
 \newif\if@printpageref
 \newif\if@intoc
 \newif\if@compatibilitymode
-\DeclareOption{refeq}{\@printeqreftrue}
-\DeclareOption{norefeq}{\@printeqreffalse}
-\DeclareOption{refpage}{\@printpagereftrue}
-\DeclareOption{norefpage}{\@printpagereffalse}
-\DeclareOption{intoc}{\@intoctrue}
-\DeclareOption{notintoc}{\@intocfalse}
-\DeclareOption{compatible}{\@compatibilitymodetrue}
-\DeclareOption{noncompatible}{\@compatibilitymodefalse}
-\DeclareOption{prefix}{\def\nomprefix{a}}
-\DeclareOption{noprefix}{\def\nomprefix{}}
+\DeclareOptionX{refeq}{\@printeqreftrue}
+\DeclareOptionX{norefeq}{\@printeqreffalse}
+\DeclareOptionX{refpage}{\@printpagereftrue}
+\DeclareOptionX{norefpage}{\@printpagereffalse}
+\DeclareOptionX{intoc}{\@intoctrue}
+\DeclareOptionX{notintoc}{\@intocfalse}
+\DeclareOptionX{compatible}{\@compatibilitymodetrue}
+\DeclareOptionX{noncompatible}{\@compatibilitymodefalse}
+\DeclareOptionX{prefix}{\def\nomprefix{a}}
+\DeclareOptionX{noprefix}{\def\nomprefix{}}
+\newif\if@nomentbl
+\DeclareOptionX{nomentbl}{\@nomentbltrue}
+\DeclareOptionX{norefeq}{\@nomentblfalse}
 \newif\if@loadcfg
-\DeclareOption{cfg}{\@loadcfgtrue}
-\DeclareOption{nocfg}{\@loadcfgfalse}
-\DeclareOption{croatian}{%
+\DeclareOptionX{cfg}[nomencl.cfg]{\@loadcfgtrue\gdef\@cfgfile{#1}}
+\DeclareOptionX{nocfg}{\@loadcfgfalse}
+\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\nomname{Popis simbola}}
-\DeclareOption{danish}{%
+  \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\nomname{Symbolliste}}
-\DeclareOption{english}{%
+  \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\nomname{Nomenclature}}
-\DeclareOption{french}{%
+  \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\nomname{Liste des symboles}}
-\DeclareOption{german}{%
+  \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\nomname{Symbolverzeichnis}}
-\DeclareOption{italian}{%
-\def\eqdeclaration#1{, vedi equazione\nobreakspace(#1)}%
-\def\pagedeclaration#1{, pagina\nobreakspace#1}%
-\def\nomname{Elenco dei simboli}}
-\DeclareOption{polish}{%
+  \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\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\nomname{Lista symboli}}
-\DeclareOption{portuguese}{%
+  \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\nomname{Nomenclatura}}
-\DeclareOption{russian}{%
+  \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\nomname{\CYRS\cyrp\cyri\cyrs\cyro\cyrk%
     \ \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri%
-    \cyrishrt}}
-\DeclareOption{spanish}{%
+    \cyrishrt}%
+   \def\nomAname{\CYRL\cyra\cyrt\cyri\cyrn\cyrs\cyrk\cyri\cyre\
+     \cyrb\cyru\cyrk\cyrv\cyrery}%
+   \def\nomGname{\CYRG\cyrr\cyre\cyrch\cyre\cyrs\cyrk\cyri\cyre\
+     \cyrb\cyru\cyrk\cyrv\cyrery}%
+   \def\nomXname{\CYRN\cyra\cyrd\cyrs\cyrt\cyrr\cyro\cyrch\cyrn\cyrery\cyre\
+     \cyri\cyrn\cyrd\cyre\cyrk\cyrs\cyrery}%
+   \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\nomname{Nomenclatura}}
-\DeclareOption{ukrainian}{%
+  \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\nomname{\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk%
-         \ \cyrp\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrsftsn}}
-\ExecuteOptions{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english}
-\ProcessOptions\relax
+    \ \cyrp\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrsftsn}%
+   \def\nomAname{\CYRL\cyra\cyrt\cyri\cyrn\cyrs\cyrsftsn\cyrk\cyrii\
+     \cyrl\cyrii\cyrt\cyre\cyrr\cyri}%
+   \def\nomGname{\CYRG\cyrr\cyre\cyrc\cyrsftsn\cyrk\cyrii\
+     \cyrl\cyrii\cyrt\cyre\cyrr\cyri}%
+   \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}
+\ProcessOptionsX\relax
+\if@nomentbl
+\RequirePackage{array,longtable, siunitx}
+\fi
 \if@compatibilitymode%
     \def\@outputfileextension{.glo}%
     \def\@inputfileextension{.gls}%
@@ -116,7 +169,7 @@
     \@sanitize
     \@ifnextchar[%
       {\@@@nomenclature}{\@@@nomenclature[\nomprefix]}}%
-  \typeout{Writing nomenclature file \jobname\@outputfileextension}%
+  \PackageInfo{nomencl}{Writing nomenclature file \jobname\@outputfileextension}%
   \let\makenomenclature\@empty}
 \if@compatibilitymode\let\makeglossary\makenomenclature\fi%
 \def\nom@verb{\expandafter\strip@prefix\meaning}
@@ -126,17 +179,59 @@
   \begingroup
   \@sanitize
   \@ifnextchar[%
-    {\@@nomenclature}{\@@nomenclature[\nomprefix]}}
-\def\@@nomenclature[#1]#2#3{\endgroup\@esphack}
-\def\@@@nomenclature[#1]#2#3{%
- \def\@tempa{#2}\def\@tempb{#3}%
- \protected@write\@nomenclaturefile{}%
-  {\string\nomenclatureentry{#1\nom@verb\@tempa @[{\nom@verb\@tempa}]%
-      \begingroup\nom@verb\@tempb\protect\nomeqref{\theequation}%
+  {\@@nomenclature}{\@@nomenclature[\nomprefix]}}
+\if@nomentbl
+  \def\@@nomenclature[#1]#2#3#4#5{\endgroup\@esphack}
+\else
+  \def\@@nomenclature[#1]#2#3{\endgroup\@esphack}
+\fi
+\if@nomentbl
+  \def\@@@nomenclature[#1]#2#3#4#5{%
+    \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#5\endgroup&\begingroup\protect\nomeqref{\theequation}%
         |nompageref}{\thepage}}%
- \endgroup
- \@esphack}
-\def\nomgroup#1{}
+    \endgroup
+    \@esphack}
+\else
+  \def\@@@nomenclature[#1]#2#3{%
+    \def\@tempa{#2}\def\@tempb{#3}%
+    \protected@write\@nomenclaturefile{}%
+    {\string\nomenclatureentry{#1\nom@verb\@tempa @[{\nom@verb\@tempa}]%
+        \begingroup\nom@verb\@tempb\protect\nomeqref{\theequation}%
+        |nompageref}{\thepage}}%
+    \endgroup
+    \@esphack}
+\fi
+\if@stdsubgroups
+  \if@nomentbl
+  \def\nomgroup#1{%
+    \ifthenelse{\equal{#1}{A}}{%
+      \item&\multicolumn{5}{@{}l}{\textbf{\nomAname}}}{%
+        \ifthenelse{\equal{#1}{G}}{%
+        \item&\multicolumn{5}{@{}l}{\textbf{\nomGname}}}{%
+          \ifthenelse{\equal{#1}{X}}{%
+          \item&\multicolumn{5}{@{}l}{\textbf{\nomXname}}}{%
+            \ifthenelse{\equal{#1}{Z}}{%
+            \item&\multicolumn{5}{@{}l}{\textbf{\nomZname}}}{%
+              {}}}}}}
+  \else
+    \def\nomgroup#1{%
+      \ifthenelse{\equal{#1}{A}}{%
+      \item[\textbf{\nomAname}]}{%
+        \ifthenelse{\equal{#1}{G}}{%
+        \item[\textbf{\nomGname}]}{%
+          \ifthenelse{\equal{#1}{X}}{%
+          \item[\textbf{\nomXname}]}{%
+            \ifthenelse{\equal{#1}{Z}}{%
+            \item[\textbf{\nomZname}]}{%
+              {}}}}}}
+    \fi
+\else
+  \def\nomgroup#1{}
+\fi
 \newdimen\nomlabelwidth
 \nomlabelwidth1cm\relax
 \newdimen\nom@tempdim
@@ -153,6 +248,8 @@
 \def\nomentryend{}
 \newskip\nomitemsep
 \nomitemsep\itemsep
+\def\setnomtableformat#1{\def\@nomtableformat{l@{}#1}}
+\setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l}
 \def\thenomenclature{%
   \@ifundefined{chapter}%
   {
@@ -161,18 +258,31 @@
   }%
   {
     \chapter*{\nomname}
+    \markboth{\nomname}{\nomname}%
     \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
   }%
 
   \nompreamble
-  \list{}{%
-    \labelwidth\nom@tempdim
-    \leftmargin\labelwidth
-    \advance\leftmargin\labelsep
-    \itemsep\nomitemsep
-    \let\makelabel\nomlabel}}
+  \if@nomentbl
+    \let\itemOrig=\item
+    \def\item{\gdef\item{\\}}%
+    \expandafter\longtable\expandafter{\@nomtableformat}
+  \else
+    \list{}{%
+      \labelwidth\nom@tempdim
+      \leftmargin\labelwidth
+      \advance\leftmargin\labelsep
+      \itemsep\nomitemsep
+      \let\makelabel\nomlabel}%
+  \fi
+}
 \def\endthenomenclature{%
-  \endlist
+  \if@nomentbl
+    \item\endlongtable
+    \global\let\item=\itemOrig
+  \else
+    \endlist
+  \fi
   \nompostamble}
 \def\nomrefeq{\@printeqreftrue}
 \def\nomrefpage{\@printpagereftrue}
@@ -184,8 +294,8 @@
 \def\nompageref#1{\if@printpageref\pagedeclaration{#1}\fi%
   \nomentryend\endgroup}
 \if@loadcfg
-  \InputIfFileExists{nomencl.cfg}{%
-    \typeout{Using the configuration file nomencl.cfg}}{}
+  \InputIfFileExists{\@cfgfile}{%
+    \PackageInfo{nomencl}{Using the configuration file \@cfgfile}}{}
 \fi
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/nomencl/sample01.cfg b/Master/texmf-dist/tex/latex/nomencl/sample01.cfg
deleted file mode 100644
index bb6dcff9bb0..00000000000
--- a/Master/texmf-dist/tex/latex/nomencl/sample01.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
-%%
-%% This is file `sample01.cfg',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nomencl.dtx  (with options: `sample01')
-%% 
-%% Copyright 1996 Boris Veytsman
-%% Copyright 1999-2001 Bernd Schandl
-%% www http://sarovar.org/projects/nomencl
-%% 
-%% This file can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License distributed from CTAN
-%% archives in the directory macros/latex/base/lppl.txt; either
-%% version 1.2 of the license, or (at your option) any later version.
-%% 
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-\RequirePackage{ifthen}
-\renewcommand{\nomgroup}[1]{%
-  \ifthenelse{\equal{#1}{R}}{\item[\textbf{Variables}]}{%
-    \ifthenelse{\equal{#1}{G}}{\item[\textbf{Constants}]}{}}}
-\endinput
-%%
-%% End of file `sample01.cfg'.
diff --git a/Master/texmf-dist/tex/latex/nomencl/sample02.cfg b/Master/texmf-dist/tex/latex/nomencl/sample02.cfg
deleted file mode 100644
index 8f9516106c7..00000000000
--- a/Master/texmf-dist/tex/latex/nomencl/sample02.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-%%
-%% This is file `sample02.cfg',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% nomencl.dtx  (with options: `sample02')
-%% 
-%% Copyright 1996 Boris Veytsman
-%% Copyright 1999-2001 Bernd Schandl
-%% www http://sarovar.org/projects/nomencl
-%% 
-%% This file can be redistributed and/or modified under the terms
-%% of the LaTeX Project Public License distributed from CTAN
-%% archives in the directory macros/latex/base/lppl.txt; either
-%% version 1.2 of the license, or (at your option) any later version.
-%% 
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-\newcommand{\nomunit}[1]{%
-  \renewcommand{\nomentryend}{\hspace*{\fill}#1}}
-\endinput
-%%
-%% End of file `sample02.cfg'.
diff --git a/Master/texmf-dist/tex/latex/nomencl/sample04.cfg b/Master/texmf-dist/tex/latex/nomencl/sample04.cfg
index 40dd612cf6b..04da50bbb40 100644
--- a/Master/texmf-dist/tex/latex/nomencl/sample04.cfg
+++ b/Master/texmf-dist/tex/latex/nomencl/sample04.cfg
@@ -4,46 +4,19 @@
 %%
 %% The original source files were:
 %%
-%% nomencl.dtx  (with options: `sample04')
+%% nomencl.dtx  (with options: `sample04.cfg')
+%% 
+%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
+%% Radhakrishnan, Brian Elmegaard
 %% 
-%% Copyright 1996 Boris Veytsman
-%% Copyright 1999-2001 Bernd Schandl
-%% www http://sarovar.org/projects/nomencl
 %% 
 %% This file can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
 %% archives in the directory macros/latex/base/lppl.txt; either
 %% version 1.2 of the license, or (at your option) any later version.
 %% 
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-\def\makenomenclature{%
-  \newwrite\@nomenclaturefile
-  \immediate\openout\@nomenclaturefile=\jobname\@outputfileextension
-  \def\@nomenclature{%
-    \@ifnextchar[%
-      {\@@@@nomenclature}{\@@@@nomenclature[\nomprefix]}}%
-  \typeout{Writing nomenclature file \jobname\@outputfileextension}%
-  \let\makenomenclature\@empty}
-\def\@@@@nomenclature[#1]#2#3{%
- \protected@write\@nomenclaturefile{}%
-  {\string\nomenclatureentry{#1#2@[{#2}]%
-      \begingroup#3\protect\nomeqref{\theequation}%
-        |nompageref}{\thepage}}}%
+\newcommand{\nomunit}[1]{%
+  \renewcommand{\nomentryend}{\hspace*{\fill}\si{#1}}}
 \endinput
 %%
 %% End of file `sample04.cfg'.
diff --git a/Master/texmf-dist/tex/latex/nomencl/sample05.cfg b/Master/texmf-dist/tex/latex/nomencl/sample05.cfg
index d1ec950e3dd..8d22032bea7 100644
--- a/Master/texmf-dist/tex/latex/nomencl/sample05.cfg
+++ b/Master/texmf-dist/tex/latex/nomencl/sample05.cfg
@@ -4,47 +4,30 @@
 %%
 %% The original source files were:
 %%
-%% nomencl.dtx  (with options: `sample05')
+%% nomencl.dtx  (with options: `sample05.cfg')
+%% 
+%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
+%% Radhakrishnan, Brian Elmegaard
 %% 
-%% Copyright 1996 Boris Veytsman
-%% Copyright 1999-2001 Bernd Schandl
-%% www http://sarovar.org/projects/nomencl
 %% 
 %% This file can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License distributed from CTAN
 %% archives in the directory macros/latex/base/lppl.txt; either
 %% version 1.2 of the license, or (at your option) any later version.
 %% 
-%% \CharacterTable
-%%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%%   Digits        \0\1\2\3\4\5\6\7\8\9
-%%   Exclamation   \!     Double quote  \"     Hash (number) \#
-%%   Dollar        \$     Percent       \%     Ampersand     \&
-%%   Acute accent  \'     Left paren    \(     Right paren   \)
-%%   Asterisk      \*     Plus          \+     Comma         \,
-%%   Minus         \-     Point         \.     Solidus       \/
-%%   Colon         \:     Semicolon     \;     Less than     \<
-%%   Equals        \=     Greater than  \>     Question mark \?
-%%   Commercial at \@     Left bracket  \[     Backslash     \\
-%%   Right bracket \]     Circumflex    \^     Underscore    \_
-%%   Grave accent  \`     Left brace    \{     Vertical bar  \|
-%%   Right brace   \}     Tilde         \~}
-%%
-\def\@@@nomenclature[#1]#2#3{%
- \def\@tempa{#2}\def\@tempb{#3}%
+\def\makenomenclature{%
+  \newwrite\@nomenclaturefile
+  \immediate\openout\@nomenclaturefile=\jobname\@outputfileextension
+  \def\@nomenclature{%
+    \@ifnextchar[%
+      {\@@@@nomenclature}{\@@@@nomenclature[\nomprefix]}}%
+  \PackageInfo{nomencl}{Writing nomenclature file \jobname\@outputfileextension}%
+  \let\makenomenclature\@empty}
+\def\@@@@nomenclature[#1]#2#3{%
  \protected@write\@nomenclaturefile{}%
-  {\string\nomenclatureentry{#1\nom@verb\@tempa @[{\nom@verb\@tempa}]%
-    |nompageref{\begingroup\nom@verb\@tempb\protect\nomeqref{\theequation}}}%
-    {\thepage}}%
- \endgroup
- \@esphack}
-\def\nompageref#1#2{%
-  \if@printpageref\pagedeclaration{#2}\else\null\fi
-  \linebreak#1\nomentryend\endgroup}
-\def\pagedeclaration#1{\dotfill\nobreakspace#1}
-\def\nomentryend{.}
-\def\nomlabel#1{\textbf{#1}\hfil}
+  {\string\nomenclatureentry{#1#2@[{#2}]%
+      \begingroup#3\protect\nomeqref{\theequation}%
+        |nompageref}{\thepage}}}%
 \endinput
 %%
 %% End of file `sample05.cfg'.
diff --git a/Master/texmf-dist/tex/latex/nomencl/sample06.cfg b/Master/texmf-dist/tex/latex/nomencl/sample06.cfg
new file mode 100644
index 00000000000..de9b0cf7282
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/nomencl/sample06.cfg
@@ -0,0 +1,35 @@
+%%
+%% This is file `sample06.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% nomencl.dtx  (with options: `sample06.cfg')
+%% 
+%% Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
+%% Radhakrishnan, Brian Elmegaard
+%% 
+%% 
+%% This file can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License distributed from CTAN
+%% archives in the directory macros/latex/base/lppl.txt; either
+%% version 1.2 of the license, or (at your option) any later version.
+%% 
+\@printpagereftrue
+\def\@@@nomenclature[#1]#2#3{%
+ \def\@tempa{#2}\def\@tempb{#3}%
+ \protected@write\@nomenclaturefile{}%
+  {\string\nomenclatureentry{#1\nom@verb\@tempa @[{\nom@verb\@tempa}]%
+    |nompageref{\begingroup\nom@verb\@tempb\protect\nomeqref{\theequation}}}%
+    {\thepage}}%
+ \endgroup
+ \@esphack}
+\def\nompageref#1#2{%
+  \if@printpageref\pagedeclaration{#2}\else\leavevmode\fi
+  \linebreak#1\nomentryend\endgroup}
+\def\pagedeclaration#1{\dotfill\nobreakspace#1}
+\def\nomentryend{.}
+\def\nomlabel#1{\textbf{#1}\hfil}
+\endinput
+%%
+%% End of file `sample06.cfg'.