nomentbl for nomencl 4.2

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

11 files changed, 939 insertions, 151 deletions

diff --git a/Master/texmf-dist/doc/latex/nomentbl/README b/Master/texmf-dist/doc/latex/nomentbl/README
new file mode 100644
index 00000000000..0b061330d2e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nomentbl/README
@@ -0,0 +1,27 @@
+This archive is the distribution of nomentbl, a LaTeX package for

+making nomenclatures in a longtable.

+

+Files:

+nomentbl.ins

+nomentbl.dtx

+nomentbl.pdf

+nomentbl.dvi

+example.pdf

+example.dvi

+README

+

+Installation:

+latex nomentbl.ins

+Put nomentbl.sty in directory where LaTeX will find it

+Put nomentbl.ist in directory where makeindex will find it

+

+Documentation is available as pdf and dvi. If needed it can be made

+with LaTeX by:

+latex nomentbl.dtx

+makeindex.exe -o nomentbl.nls -s nomentbl.ist nomentbl.nlo 

+latex nomentbl.dtx

+makeindex.exe -o nomentbl.gls -s gglo.ist nomentbl.glo 

+makeindex.exe -o nomentbl.ind -s gind.ist nomentbl.idx 

+latex nomentbl.dtx

+latex nomentbl.dtx

+

diff --git a/Master/texmf-dist/doc/latex/nomentbl/example.pdf b/Master/texmf-dist/doc/latex/nomentbl/example.pdf
new file mode 100644
index 00000000000..d3146fb34f3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nomentbl/example.pdf
diff --git a/Master/texmf-dist/doc/latex/nomentbl/example.tex b/Master/texmf-dist/doc/latex/nomentbl/example.tex
new file mode 100644
index 00000000000..efcb43538c3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/nomentbl/example.tex
@@ -0,0 +1,63 @@
+%%
+%% This is file `example.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% nomentbl.dtx  (with options: `example')
+%% 
+%% Copyright (C) 2006 by Stefan Pinnow
+%% 
+%% 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.
+%% 
+%% Nomentbl example
+%% For nomentbl v0.4
+%% 
+%% Written by Stefan Pinnow
+%% 
+
+
+%%
+%%
+\documentclass{article}
+\usepackage[notintoc]{nomentbl}
+\usepackage{setspace}
+    \makenomenclature
+\begin{document}
+\section*{Main equations}
+Here an equation
+    \begin{equation}\label{eq:heatflux}
+        \dot{Q} = k \cdot A \cdot \Delta T
+    \end{equation}%
+    \nomenclature[aQ]{$\dot{Q}$}{heat flux}{W}{}%
+    \nomenclature[ak]{$k$}{overall heat transfer coefficient}{$\frac{\mathrm{W}}{\mathrm{m}^2\mathrm{K}}$}{see eq.~(\ref{eq:ohtc})}%
+    \nomenclature[aA]{$A$}{area}{m$^2$}{$L^2$}%
+    \nomenclature[aL]{$L$}{length}{m}{SI base quantity}%
+    \nomenclature[aT]{$T$}{temperature}{K}{SI base quantity}%
+    \nomenclature[aT]{$\Delta T$}{temperature difference}{K}{SI base quantity}%
+or another one
+    \begin{equation}\label{eq:ohtc}
+        \frac{1}{k} = \left[\frac{1}{\alpha _{\mathrm{i}}\,r_{\mathrm{i}}} +
+        \sum^n_{j=1}\frac{1}{\lambda _j}\,
+        \ln \frac{r_{\mathrm{a},j}}{r_{\mathrm{i},j}} +
+        \frac{1}{\alpha _{\mathrm{a}}\,
+          r_{\mathrm{a}}}\right] \cdot r_{\mathrm{reference}}
+    \end{equation}%
+    \nomenclature[ga]{$\alpha$}{convection heat transfer coefficient}{$\frac{\mathrm{W}}{\mathrm{m}^2\mathrm{K}}$}{}%
+    \nomenclature[zi]{i}{in}{}{}%
+    \nomenclature[gl]{$\lambda$}{thermal conductivity}{$\frac{\mathrm{W}}{\mathrm{m K}}$}{}%
+    \nomenclature[za]{a}{out}{}{}%
+    \nomenclature[zn]{$n$}{number of walls}{}{}%
+    \nomenclature[zj]{$j$}{running parameter}{}{}%
+That should do it.
+\onehalfspacing
+\printnomenclature
+\end{document}
+
+
+\endinput
+%%
+%% End of file `example.tex'.
diff --git a/Master/texmf-dist/doc/latex/nomentbl/nomentbl.pdf b/Master/texmf-dist/doc/latex/nomentbl/nomentbl.pdf
index 812c0c4947a..f6d286be747 100644
--- a/Master/texmf-dist/doc/latex/nomentbl/nomentbl.pdf
+++ b/Master/texmf-dist/doc/latex/nomentbl/nomentbl.pdf
diff --git a/Master/texmf-dist/doc/latex/nomentbl/nomentbl.tex b/Master/texmf-dist/doc/latex/nomentbl/nomentbl.tex
deleted file mode 100644
index 8adefea3423..00000000000
--- a/Master/texmf-dist/doc/latex/nomentbl/nomentbl.tex
+++ /dev/null
@@ -1,65 +0,0 @@
-\documentclass[12pt,a4paper,twoside]{report}
-
-\usepackage{nomentbl}
-
-\makeglossary
-
-\title{Nomenclature with longtable}
-\author{Brian Elmegaard}
-
-
-\begin{document}
-\maketitle
-\printglossary
-
-\chapter{Introduction}
-This file gives a very limited introduction to the use of longtable
-together with the nomencl package for writing nomenclatures.
-
-It requires nomencl to be present on your system.
-
-The way to go is: Install \texttt{nomenltb.sty} where latex can find it, and
-\texttt{nomenltb.ist} where makeindex can find that.
-\begin{itemize}
-\item Run latex. This generates the glossary input file
-  \texttt{foo.glo}.
-\item Run makeindex with \texttt{makeindex -s nomenltb.ist -o foo.gls
-    foo.glo } 
-\item Run latex again.
-\end{itemize}
-
-An equation is needed for the current setup:
-\begin{equation}
-  \label{eq:1}
-  \mathbf{J}_i\cdot\Delta\underline{x}_{i+1}=-\underline{f}_i
-\end{equation}
-%Here follows the nomenclature entries. 
-\nomenclature[aJ]{$J$}{Jacobian Matrix}{}
-\nomenclature[Zi]{$i$}{Variable number}{}
-\nomenclature[ax]{$\Delta x$}{Variable displacement vector}{}
-\nomenclature[af]{$f$}{Residual value vector}{}
-\nomenclature[ax]{$x$}{Variable value vector}{}
-The nomenclature is result of the following:
-\begin{verbatim}
-\nomenclature[aJ]{$J$}{Jacobian Matrix}{}
-\nomenclature[Zi]{$i$}{Variable number}{}
-\nomenclature[ax]{$\Delta x$}{Variable displacement vector}{}
-\nomenclature[af]{$f$}{Residual value vector}{}
-\nomenclature[ax]{$x$}{Variable value vector}{}
-\end{verbatim}
-
-An some symbols with units:
-\begin{equation}
-  \label{eq:3}
-  F=m \alpha
-\end{equation}
-\nomenclature[aF]{$F$}{Force}{N}
-\nomenclature[am]{$m$}{mass}{kg}
-\nomenclature[ga]{$\alpha$}{acceleration}{m/s$\mathrm{^2}$}
-\begin{verbatim}
-\nomenclature[aF]{$F$}{Force}{N}
-\nomenclature[am]{$m$}{mass}{kg}
-\nomenclature[ga]{$\alpha$}{acceleration}{m/s$\mathrm{^2}$}
-
-\end{verbatim}
-\end{document}
diff --git a/Master/texmf-dist/makeindex/nomentbl/nomentbl.ist b/Master/texmf-dist/makeindex/nomentbl/nomentbl.ist
index 6d25e0a6dbc..8f4f72b88b0 100644
--- a/Master/texmf-dist/makeindex/nomentbl/nomentbl.ist
+++ b/Master/texmf-dist/makeindex/nomentbl/nomentbl.ist
@@ -1,13 +1,24 @@
-%    Nomenclature style file for makeindex. Based on the file
-%    nomencl.ist distributed with the LaTeX package nomencl version 3.1a
-%
-%
-%    Written by Brian Elmegaard be@mek.dtu.dk
-%    (Original file by Boris Veytsman)
-%
-%    The output has been changed to a (LaTeX-style) longtable to have three
-%    columns.
-%
+%%
+%% This is file `nomentbl.ist',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% nomentbl.dtx  (with options: `idxstyle')
+%% 
+%% Copyright (C) 2006 by Brian Elmegaard <be@mek.dtu.dk>
+%% 
+%% 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.
+%% 
+%% Nomenclature style file for MAKEINDEX.
+%% For nomentbl v0.4
+%% 
+%% Written by Brian Elmegaard
+%% 
+
 
 
 actual '@'
@@ -22,7 +33,16 @@ heading_prefix   "\\multicolumn{3}{l}{\\nomgroup{"
 heading_suffix   "}} \\\\\n\\nopagebreak\\\\*[\\parskip]\n\\nopagebreak{}"
 headings_flag       1
 group_skip        "\\\\*[\\parskip]"
-preamble "\n\\begin{theglossary}\n\\begin{longtable}[l]{lp{\\textwidth*\\real{0.55}}lll}\n"
-postamble "\n\\end{longtable}\n\n\\end{theglossary}\n"
-keyword "\\glossaryentry"
+preamble "\n\\begin{thenomenclature}\n%
+\\begin{longtable}[l]%
+{cp{\\textwidth*\\real{0.5}}c!{\\extracolsep{\\fill}}lll}\n"
+postamble "\n\\end{longtable}\n\n\\end{thenomenclature}\n"
+keyword "\\nomenclatureentry"
+
+%%
+%%
+
+
+\endinput
 %%
+%% End of file `nomentbl.ist'.
diff --git a/Master/texmf-dist/source/latex/nomentbl/nomentbl.dtx b/Master/texmf-dist/source/latex/nomentbl/nomentbl.dtx
new file mode 100644
index 00000000000..c09de218377
--- /dev/null
+++ b/Master/texmf-dist/source/latex/nomentbl/nomentbl.dtx
@@ -0,0 +1,572 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2006 Brian Elmegaard <be@mek.dtu.dk>
+% -------------------------------------------------------
+% 
+% This file may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.2
+% of this license or (at your option) any later version.
+% The latest version of this license is in:
+%
+%    http://www.latex-project.org/lppl.txt
+%
+% and version 1.2 or later is part of all distributions of LaTeX 
+% version 1999/12/01 or later.
+%
+% \fi
+%
+% \iffalse
+%<*dtx>
+\ProvidesFile{nomentbl.dtx}
+%</dtx>
+%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+%<package>\ProvidesPackage{nomentbl}
+%<driver>\ProvidesFile{nomentbl.drv} 
+%<*driver|package>
+[2006/04/14 v0.4 Nomenclature in a longtable environment]
+%</driver|package>
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{nomentbl}
+\makenomenclature
+\EnableCrossrefs         
+\CodelineIndex
+\RecordChanges
+\begin{document}
+  \DocInput{nomentbl.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{475}
+%
+% \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         \~}
+%
+%
+% \changes{v0.3}{2004/02/17}{Initial version more or less}
+% \changes{v0.4}{2006/04/14}{Version updated for nomencl 4.2 with a
+% few additions to functionality}
+%
+% \GetFileInfo{nomentbl.dtx}
+%
+% \newcommand{\MakeIndex}{\textsl{MakeIndex}}
+% 
+%
+% \DoNotIndex{\newcommand,\newenvironment}
+% 
+%  
+%
+% \title{The \textsf{nomentbl} package\thanks{This document
+%   corresponds to \textsf{nomentbl}~\fileversion, dated \filedate.}}
+% \author{Brian Elmegaard \\ \texttt{be@mek.dtu.dk}\\Updated by Patrick Egan, March 2006.}
+%
+% \maketitle
+%
+% \section{Introduction}
+%
+% Often it is desirable to include the units of nomenclature in a
+% tabular environment. \textsf{Nomentbl} is a customization of the
+% \texttt{nomencl} package that presents the nomenclature in a table
+% of the \textsf{longtable}-type.  
+%
+% With the most recent update\footnote{September 22, 2005.} to the
+% \textsf{nomencl} package to version 4.2, the \textsf{nomentbl}
+% package version 0.3 is not compatible with the \verb+\makenomenclature+
+% and \verb+\printnomenclature+ commands. This document describes
+% version 0.4 of the \textsf{nomentbl} package. It is compatible with the most
+% recent \textsf{nomencl} version.
+% 
+% This document gives a very limited yet sufficient introduction to
+% the use of \textsf{longtable} together with the \textsf{nomencl}
+% package for writing nomenclatures.
+%
+% \section{Prerequisite}
+%
+% The \textsf{nomentbl} package requires both \textsf{nomencl} and
+% \textsf{longtable} to be present on your system.
+%
+% \section{Usage}
+%
+% \begin{itemize}
+%
+% \item
+% Install \texttt{nomentbl.sty} where latex can find it, and
+% \texttt{nomentbl.ist} where \emph{MakeIndex} can find that.
+%
+% \item
+% Put \verb+\usepackage[<options>]{nomentbl}+ in the preamble of the
+% document. For further information on \verb+<options>+ see the
+% \textsf{nomencl} user guide.
+%
+% \item
+% Put \verb+\makenomenclature+ in the preamble of the document.
+%
+% \item
+% Put \verb+\printnomenclature+ where the nomenclature section/chapter
+% is desired.
+%
+% \item
+% Issue the \verb+\nomenclature+ command for each symbol desired to be
+% in the nomenclature list (see Section
+% \ref{sect:nomenclature_command}).
+%
+% \item
+% Run \LaTeX. This generates the nomenclature input file
+% \verb+<filename>.nlo+.
+%
+% \item
+% Run \emph{MakeIndex} with
+% \begin{center}
+% \verb+makeindex -s nomentbl.ist -o <filename>.nls <filename>.nlo+%
+% \end{center}
+%
+% \item
+% Run \LaTeX\ again.
+%
+% \end{itemize}
+%
+% \section{Examples}
+% \label{sect:examples}%
+%
+% An equation is needed for the current setup:
+% \begin{equation}
+%   \label{eq:1}
+%   \mathbf{J}_i\cdot\Delta\underline{x}_{i+1}=-\underline{f}_i
+% \end{equation}
+% 
+% \iffalse
+% Here follows the nomenclature entries.
+% \fi
+% \nomenclature[aJ]{$J$}{Jacobian Matrix}{}{}%
+% \nomenclature[Zi]{$i$}{Variable number}{}{}%
+% \nomenclature[ax]{$\Delta x$}{Variable displacement vector}{}{}%
+% \nomenclature[af]{$f$}{Residual value vector}{}{}%
+% \nomenclature[ax]{$x$}{Variable value vector}{}{}%
+% The nomenclature is a result of the following:
+% \begin{verbatim}
+%  \nomenclature[AJ]{$J$}{Jacobian Matrix}{}{}%
+%  \nomenclature[Zi]{$i$}{Variable number}{}{}%
+%  \nomenclature[Ax]{$\Delta x$}{Variable displacement vector}{}{}%
+%  \nomenclature[Af]{$f$}{Residual value vector}{}{}%
+%  \nomenclature[Ax]{$x$}{Variable value vector}{}{}%
+% \end{verbatim}
+% Some symbols with units:
+% \begin{equation}
+%   \label{eq:3}
+%   F = m \alpha
+% \end{equation}
+% \nomenclature[AF]{$F$}{Force}{N}{ML/T$^2$}%
+% \nomenclature[Am]{$m$}{mass}{kg}{M}%
+% \nomenclature[Ga]{$\alpha$}{acceleration}{m/s$^2$}{L/T$^2$}%
+% \begin{verbatim}
+%  \nomenclature[AF]{$F$}{Force}{N}{ML/T$^2$}%
+%  \nomenclature[Am]{$m$}{mass}{kg}{M}%
+%  \nomenclature[Ga]{$\alpha$}{acceleration}{m/s$^2$}{L/T$^2$}%
+% \end{verbatim}
+%
+% The nomenclature is typeset in a |section*| by using the
+% |\printnomenclature| command. In this example it gives the following
+% result nomenclature.
+% \printnomenclature
+%
+% \section{The \texttt{\textbackslash nomenclature} command}
+% \label{sect:nomenclature_command}%
+% \DescribeMacro{\nomenclature}
+% To use the \texttt{\textbackslash nomenclature} command
+%     \begin{center}
+%     \verb+\nomenclature[<prefix>]{<symbol>}{<description>}{<units>}{<dimension>}+
+%     \end{center}
+% The \verb+<symbol>+ is the symbol entry to the nomenclature table.
+% Do not forget to use the math environment (\verb+$ $+) if it is a
+% mathematical symbol. The \verb+<description>+ is the description of
+% the symbol. The \verb+<units>+ are the physical (SI) units of the
+% symbol. The |<dimension>| may be used to give the dimension of the
+% used symbol, but other uses may be found.
+%
+% The \verb+<prefix>+ is made of two characters, as outlined in
+% Section \ref{sect:examples}. The second character acts as a sorting
+% identifier, for example, a--z. The first character can be:
+%
+% \begin{itemize}
+% \item
+% `A' so that the symbol is classified as a Latin letter.
+% \item
+% `G' so that the symbol is classified as a Greek letter.
+% \item
+% `X' so that the symbol is classified as a superscript.
+% \item
+% `Z' so that the symbol is classified as a subscript.
+% \end{itemize}
+%
+%
+
+% \section{Acknowledgements}
+% \label{sec:acknowledgements}
+
+% \textsf{Nomentbl} is only a customized version of the \textsf{nomencl}
+% by Boris Veytsman and Bernd Schandl. 
+%
+%
+%
+% The package files \texttt{nomentbl.ins} and \texttt{nomentbl.dtx} are
+% based on \texttt{skeleton.ins} and \texttt{skeleton.dtx} in the
+% \textsf{dtxtut} package by Scott Pakin.
+%
+% \changes{v0.3}{2004/02/17}{Initial version more or less}
+% \changes{v0.4}{2006/04/14}{Updating to version 4.2 of nomencl}
+% \changes{v0.4}{2006/04/14}{Adding intoc option (SP)}
+% \changes{v0.4}{2006/04/14}{Improving the table by using a
+% |definition| column}
+% \changes{v0.4}{2006/04/14}{Improving the table by use of the
+% \textsf{array} package}
+% Additions and corrections to the package (especially for updating
+% it to version 4.2 of nomencl) have been provided by: 
+% Stefan Pinnow (SP), 
+% Patrick Egan (PE), 
+% Rasmus Solmer Eriksen (RSE),
+% Andrea Kern,
+% Christian Faulhammer (CF)
+%
+% \section{To do}
+% \label{sec:do}
+%
+% Ideas for future development:
+% \begingroup\obeylines
+% Option for underlining group header lines
+% Make the dimension column optional
+% Possibility for user-defined symbol groups
+% Translation of symbol group names
+% \endgroup
+%
+%
+%
+% \StopEventually{
+% \PrintChanges
+% \PrintIndex
+% }
+%
+%
+%\section{Implementation}
+%\label{sec:Implementation}
+%    \begin{macrocode}
+%<*package>
+% Additions and corrections to the package (especially for updating
+% it to version 4.2 of nomencl) have been provided by: 
+% Stefan Pinnow (SP) 
+% Patrick Egan (PE) 
+% Rasmus Solmer Eriksen (RSE)
+% Andrea Kern
+% Christian Faulhammer (CF)
+%
+\def\docdate{2006/04/14}
+%SP
+%    \end{macrocode}
+% \begin{macro}{\intoc}
+% Option to specify if the nomenclature should be shown in the table
+% of contents.
+%    \begin{macrocode}
+\newif\if@intoc
+%    \end{macrocode}
+% \end{macro}
+%    \begin{macrocode}
+\RequirePackage{longtable}
+%SP
+\RequirePackageWithOptions{nomencl}[2005/09/22 v4.2 Nomenclature package (LN)]
+\RequirePackage{ifthen}
+\RequirePackage{calc}
+%SP
+\RequirePackage{array}
+%SP
+\DeclareOption{intoc}{\@intoctrue}
+\DeclareOption{notintoc}{\@intocfalse}
+%
+\DeclareOption*{%
+\PassOptionsToPackage{\CurrentOption}{nomencl}%
+}
+%
+ \DeclareOption{croatian}{%
+   \def\eqdeclaration#1{jednad\v{z}bu\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}stranica\nobreakspace#1}%
+%SP
+   \def\nomname{Popis simbola}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+ \DeclareOption{danish}{%
+   \def\eqdeclaration#1{ligning\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}side\nobreakspace#1}%
+%SP
+   \def\nomname{Symbolliste}%
+   \def\nomAname{Romerske bogstaver}%
+   \def\nomGname{Græske bogstaver}%
+   \def\nomXname{(Højtstillede) indices}%
+   \def\nomZname{Indices}}
+ \DeclareOption{english}{%
+   \def\eqdeclaration#1{equation\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}page\nobreakspace#1}%
+%SP
+   \def\nomname{Nomenclature}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+ \DeclareOption{french}{%
+   \def\eqdeclaration#1{\'equation\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}page\nobreakspace#1}%
+%SP
+   \def\nomname{Liste des symboles}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+\DeclareOption{german}{%
+   \def\eqdeclaration#1{Gleichung\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}Seite\nobreakspace#1}%
+%SP
+%CF
+   \def\nomname{Symbolverzeichnis}%
+   \def\nomAname{Lateinische Buchstaben}%
+   \def\nomGname{Griechische Buchstaben}%
+   \def\nomXname{(hochgestellte) Indizes}%
+   \def\nomZname{Indizes}}
+ \DeclareOption{italian}{%
+   \def\eqdeclaration#1{equazione\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}pagina\nobreakspace#1}%
+%SP
+   \def\nomname{Elenco dei Simboli}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+ \DeclareOption{polish}{%
+   \def\eqdeclaration#1{rownanie\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}strona\nobreakspace#1}%
+%SP
+   \def\nomname{Lista symboli}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+ \DeclareOption{portuguese}{%
+   \def\eqdeclaration#1{equa\c{c}\~ao\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}p\'agina\nobreakspace#1}%
+%SP
+   \def\nomname{Nomenclatura}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+ \DeclareOption{russian}{%
+   \def\eqdeclaration#1{\cyrs\cyrm.\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}\cyrs\cyrt\cyrr.\nobreakspace#1}%
+   \def\nomname{\CYRS\cyrp\cyri\cyrs\cyro\cyrk%
+     \ \cyro\cyrb\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyri%
+     \cyrishrt}%
+%SP
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+\DeclareOption{spanish}{%
+   \def\eqdeclaration#1{ecuaci\'on\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}p\'agina\nobreakspace#1}%
+%SP
+   \def\nomname{Nomenclatura}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+ \DeclareOption{ukrainian}{%
+   \def\eqdeclaration#1{\cyrd\cyri\cyrv.\nobreakspace(#1)}%
+   \def\pagedeclaration#1{\hspace*{2mm}\cyrs\cyrt\cyro\cyrr.\nobreakspace#1}%
+   \def\nomname{\CYRP\cyre\cyrr\cyre\cyrl\cyrii\cyrk%
+          \ \cyrp\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrsftsn}%
+%SP
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+\ExecuteOptions{notintoc,norefeq,norefpage,prefix,cfg,english}
+\ProcessOptions\relax
+%
+%SP
+%    \end{macrocode}
+% \begin{macro}{\nomenclature}
+% This is the actual command provided by the package.
+%    \begin{macrocode}
+\def\@@nomenclature[#1]#2#3#4#5{\endgroup\@esphack}
+\def\@@@nomenclature[#1]#2#3#4#5{%
+ \def\@tempa{#2}\def\@tempb{#3}%
+%    \end{macrocode}
+% \end{macro}
+%    \begin{macrocode}
+%SP
+%PE
+ \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}
+%
+%SP
+%PE
+%RSE
+
+
+\def\thenomenclature{%
+  \@ifundefined{chapter}%
+  {
+    \section*{\nomname}
+    \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+  }%
+  {
+    \chapter*{\nomname}
+    \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+  }%
+%  \@ifundefined{chapter}{\section*}{\chapter*}{\nomname}%
+  \markboth{\nomname}{\nomname}
+  \nompreamble
+}
+
+\def\endthenomenclature{%
+  \endlist
+  \nompostamble}
+
+\renewcommand\nomgroup[1]{%
+%SP
+    \ifthenelse{\equal{#1}{A}}{%
+      \large{\nomAname}}{%
+      \ifthenelse{\equal{#1}{G}}{%
+        \large{\nomGname}}{%
+        \ifthenelse{\equal{#1}{X}}{%
+          \large{\nomXname}}{%
+          \ifthenelse{\equal{#1}{Z}}{%
+            \large{\nomZname}}{%
+            {}}}}}}
+%    \end{macrocode}
+
+%    \begin{macrocode}
+%</package>
+%    \end{macrocode}
+% \subsection{The \MakeIndex\ Style File}
+% \label{sec:ist}
+%
+%    \begin{macrocode}
+%<*idxstyle>
+%    Nomenclature style file for makeindex. Based on the file
+%SP
+%    nomencl.ist distributed with the LaTeX package nomencl version v4.2 2005/09/22
+%
+%
+%    Written by Brian Elmegaard be@mek.dtu.dk
+%    (Original file by Boris Veytsman)
+%SP
+%    Updated by Stefan Pinnow 27 March 2006.
+%PE
+%    Updated by Patrick Egan 02 March 2006.
+
+%
+%    The output has been changed to a (LaTeX-style) longtable to have four
+%    columns.
+%
+actual '@'
+quote '%'
+delim_0   ""
+delim_1   ""
+delim_2   ""
+item_0    ""
+delim_t   " \\\\\n"
+line_max  1000
+heading_prefix   "\\multicolumn{3}{l}{\\nomgroup{"
+heading_suffix   "}} \\\\\n\\nopagebreak\\\\*[\\parskip]\n\\nopagebreak{}"
+headings_flag       1
+group_skip        "\\\\*[\\parskip]"
+%SP
+%PE
+preamble "\n\\begin{thenomenclature}\n%
+\\begin{longtable}[l]%
+{cp{\\textwidth*\\real{0.5}}c!{\\extracolsep{\\fill}}lll}\n"
+postamble "\n\\end{longtable}\n\n\\end{thenomenclature}\n"
+%SP
+%PE
+keyword "\\nomenclatureentry"
+%
+%    \end{macrocode}
+
+%    \begin{macrocode}
+%</idxstyle>
+%    \end{macrocode}
+%%
+%
+%%
+%    \begin{macrocode}
+%<*example>
+% Example provided by Stefan Pinnow (SP) 
+\documentclass{article}
+\usepackage[notintoc]{nomentbl}
+\usepackage{setspace}
+    \makenomenclature
+%
+\begin{document}
+%
+\section*{Main equations}
+%
+Here an equation
+    \begin{equation}\label{eq:heatflux}
+        \dot{Q} = k \cdot A \cdot \Delta T
+    \end{equation}%
+    \nomenclature[aQ]{$\dot{Q}$}{heat flux}{W}{}%
+    \nomenclature[ak]{$k$}{overall heat transfer coefficient}{$\frac{\mathrm{W}}{\mathrm{m}^2\mathrm{K}}$}{see eq.~(\ref{eq:ohtc})}%
+    \nomenclature[aA]{$A$}{area}{m$^2$}{$L^2$}%
+    \nomenclature[aL]{$L$}{length}{m}{SI base quantity}%
+    \nomenclature[aT]{$T$}{temperature}{K}{SI base quantity}%
+    \nomenclature[aT]{$\Delta T$}{temperature difference}{K}{SI base quantity}%
+%
+or another one
+    \begin{equation}\label{eq:ohtc}
+        \frac{1}{k} = \left[\frac{1}{\alpha _{\mathrm{i}}\,r_{\mathrm{i}}} +
+        \sum^n_{j=1}\frac{1}{\lambda _j}\,
+        \ln \frac{r_{\mathrm{a},j}}{r_{\mathrm{i},j}} +
+        \frac{1}{\alpha _{\mathrm{a}}\,
+          r_{\mathrm{a}}}\right] \cdot r_{\mathrm{reference}}
+    \end{equation}%
+    \nomenclature[ga]{$\alpha$}{convection heat transfer coefficient}{$\frac{\mathrm{W}}{\mathrm{m}^2\mathrm{K}}$}{}%
+    \nomenclature[zi]{i}{in}{}{}%
+    \nomenclature[gl]{$\lambda$}{thermal conductivity}{$\frac{\mathrm{W}}{\mathrm{m K}}$}{}%
+    \nomenclature[za]{a}{out}{}{}%
+    \nomenclature[zn]{$n$}{number of walls}{}{}%
+    \nomenclature[zj]{$j$}{running parameter}{}{}%
+%
+That should do it.
+%
+\onehalfspacing
+\printnomenclature
+%
+\end{document}
+%    \end{macrocode}
+%    \begin{macrocode}
+%</example>
+%    \end{macrocode}
+
+
+% \Finale
+
+
+\endinput
diff --git a/Master/texmf-dist/source/latex/nomentbl/nomentbl.ins b/Master/texmf-dist/source/latex/nomentbl/nomentbl.ins
new file mode 100644
index 00000000000..80a5d4da834
--- /dev/null
+++ b/Master/texmf-dist/source/latex/nomentbl/nomentbl.ins
@@ -0,0 +1,105 @@
+%%
+%% Copyright (C) 2006 by Brian Elmegaard <be@mek.dtu.dk>
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.2 of this license
+%% or (at your option) any later version.  The latest version of this
+%% license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.2 or later is part of all distributions of LaTeX version
+%% 1999/12/01 or later.
+%%
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/nomentbl/test}
+
+\preamble
+
+This is a generated file.
+
+Copyright (C) 2006 by Brian Elmegaard <be@mek.dtu.dk>
+
+This file may be distributed and/or modified under the conditions of
+the LaTeX Project Public License, either version 1.2 of this license
+or (at your option) any later version.  The latest version of this
+license is in:
+
+   http://www.latex-project.org/lppl.txt
+
+and version 1.2 or later is part of all distributions of LaTeX version
+1999/12/01 or later.
+
+The file is based on skeleton.ins in the dtxtut package by Scott Pakin
+
+\endpreamble
+
+% preamble for ist file
+\catcode`\%=12
+\declarepreamble\istpreamble
+
+Copyright (C) 2006 by Brian Elmegaard <be@mek.dtu.dk>
+
+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.
+
+Nomenclature style file for MAKEINDEX.
+For nomentbl v0.4
+
+Written by Brian Elmegaard
+
+\endpreamble
+\catcode`\%=14
+
+% preamble for ist file
+\catcode`\%=12
+\declarepreamble\examplepreamble
+
+Copyright (C) 2006 by Stefan Pinnow
+
+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.
+
+Nomentbl example
+For nomentbl v0.4
+
+Written by Stefan Pinnow
+
+\endpreamble
+\catcode`\%=14
+
+
+\generate{%
+  \file{nomentbl.sty}{\from{nomentbl.dtx}{package}}
+  \usepreamble\istpreamble
+  \file{nomentbl.ist}{\from{nomentbl.dtx}{idxstyle}}
+  \usepreamble\examplepreamble
+  \file{example.tex}{\from{nomentbl.dtx}{example}}}
+
+
+
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{*                                                           *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX:                    *}
+\Msg{*                                                           *}
+\Msg{*     nomentbl.sty                                          *}
+\Msg{*     nomentbl.ist                                          *}
+\Msg{*                                                           *}
+\Msg{* To produce the documentation run the file nomentbl.dtx    *}
+\Msg{* through LaTeX.                                            *}
+\Msg{*                                                           *}
+\Msg{* Happy TeXing!                                             *}
+\Msg{*                                                           *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/Master/texmf-dist/tex/latex/nomentbl/nomentbl.sty b/Master/texmf-dist/tex/latex/nomentbl/nomentbl.sty
index 659aed9dbb1..13b0901202d 100644
--- a/Master/texmf-dist/tex/latex/nomentbl/nomentbl.sty
+++ b/Master/texmf-dist/tex/latex/nomentbl/nomentbl.sty
@@ -1,123 +1,180 @@
-%
+%%
 %% This is file `nomentbl.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% nomentbl.dtx  (with options: `package')
 %% 
-%% 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.
+%% This is a generated file.
 %% 
-%% \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\filename{nomentbl}
-\def\fileversion{0.3}
-\def\filedate{2004/02/17}
-\def\docdate{2004/02/17}
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nomentbl}[\filedate\ v03 Nomenclature in longtable (BE)]
+%% Copyright (C) 2006 by Brian Elmegaard <be@mek.dtu.dk>
+%% 
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.2 of this license
+%% or (at your option) any later version.  The latest version of this
+%% license is in:
+%% 
+%%    http://www.latex-project.org/lppl.txt
+%% 
+%% and version 1.2 or later is part of all distributions of LaTeX version
+%% 1999/12/01 or later.
+%% 
+%% The file is based on skeleton.ins in the dtxtut package by Scott Pakin
+%% 
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{nomentbl}
+[2006/04/14 v0.4 Nomenclature in a longtable environment]
+
+
+\def\docdate{2006/04/14}
+\newif\if@intoc
 \RequirePackage{longtable}
-\RequirePackageWithOptions{nomencl}[2000/12/03 v3.1a Nomenclature package (BS)]
+\RequirePackageWithOptions{nomencl}[2005/09/22 v4.2 Nomenclature package (LN)]
 \RequirePackage{ifthen}
 \RequirePackage{calc}
-
+\RequirePackage{array}
+\DeclareOption{intoc}{\@intoctrue}
+\DeclareOption{notintoc}{\@intocfalse}
 \DeclareOption*{%
 \PassOptionsToPackage{\CurrentOption}{nomencl}%
 }
-
  \DeclareOption{croatian}{%
    \def\eqdeclaration#1{jednad\v{z}bu\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}stranica\nobreakspace#1}%
-   \def\nomname{Popis simbola}}
+   \def\nomname{Popis simbola}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
  \DeclareOption{danish}{%
    \def\eqdeclaration#1{ligning\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}side\nobreakspace#1}%
-   \def\nomname{Symbolliste}}
+   \def\nomname{Symbolliste}%
+   \def\nomAname{Romerske bogstaver}%
+   \def\nomGname{Græske bogstaver}%
+   \def\nomXname{(Højtstillede) indices}%
+   \def\nomZname{Indices}}
  \DeclareOption{english}{%
    \def\eqdeclaration#1{equation\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}page\nobreakspace#1}%
-   \def\nomname{Nomenclature}}
+   \def\nomname{Nomenclature}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
  \DeclareOption{french}{%
    \def\eqdeclaration#1{\'equation\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}page\nobreakspace#1}%
-   \def\nomname{Liste des symboles}}
- \DeclareOption{german}{%
+   \def\nomname{Liste des symboles}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+\DeclareOption{german}{%
    \def\eqdeclaration#1{Gleichung\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}Seite\nobreakspace#1}%
-   \def\nomname{Symbolverzeichnis}}
+   \def\nomname{Symbolverzeichnis}%
+   \def\nomAname{Lateinische Buchstaben}%
+   \def\nomGname{Griechische Buchstaben}%
+   \def\nomXname{(hochgestellte) Indizes}%
+   \def\nomZname{Indizes}}
  \DeclareOption{italian}{%
    \def\eqdeclaration#1{equazione\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}pagina\nobreakspace#1}%
-   \def\nomname{Elenco dei Simboli}}
+   \def\nomname{Elenco dei Simboli}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
  \DeclareOption{polish}{%
    \def\eqdeclaration#1{rownanie\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}strona\nobreakspace#1}%
-   \def\nomname{Lista symboli}}
+   \def\nomname{Lista symboli}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
  \DeclareOption{portuguese}{%
    \def\eqdeclaration#1{equa\c{c}\~ao\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}p\'agina\nobreakspace#1}%
-   \def\nomname{Nomenclatura}}
+   \def\nomname{Nomenclatura}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
  \DeclareOption{russian}{%
    \def\eqdeclaration#1{\cyrs\cyrm.\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}\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{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+\DeclareOption{spanish}{%
    \def\eqdeclaration#1{ecuaci\'on\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}p\'agina\nobreakspace#1}%
-   \def\nomname{Nomenclatura}}
+   \def\nomname{Nomenclatura}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
  \DeclareOption{ukrainian}{%
    \def\eqdeclaration#1{\cyrd\cyri\cyrv.\nobreakspace(#1)}%
    \def\pagedeclaration#1{\hspace*{2mm}\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{norefeq,norefpage,prefix,cfg,english}
+          \ \cyrp\cyro\cyrz\cyrn\cyra\cyrch\cyre\cyrn\cyrsftsn}%
+   \def\nomAname{Latin Letters}%
+   \def\nomGname{Greek Letters}%
+   \def\nomXname{Superscripts}%
+   \def\nomZname{Subscripts}}
+\ExecuteOptions{notintoc,norefeq,norefpage,prefix,cfg,english}
 \ProcessOptions\relax
-
-\def\@@nomenclature[#1]#2#3#4{\endgroup\@esphack}
-\def\@@@nomenclature[#1]#2#3#4{%
+\def\@@nomenclature[#1]#2#3#4#5{\endgroup\@esphack}
+\def\@@@nomenclature[#1]#2#3#4#5{%
  \def\@tempa{#2}\def\@tempb{#3}%
- \protected@write\@glossaryfile{}%
-  {\string\glossaryentry{#1\nom@verb\@tempa @{\nom@verb\@tempa}&%
-      \begingroup\nom@verb\@tempb\endgroup &\begingroup#4\endgroup&\begingroup\protect\nomeqref{\theequation}%
+ \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\theglossary{%
-  \@ifundefined{chapter}{\section*}{\chapter*}{\nomname}%
+\def\thenomenclature{%
+  \@ifundefined{chapter}%
+  {
+    \section*{\nomname}
+    \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+  }%
+  {
+    \chapter*{\nomname}
+    \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+  }%
+  \markboth{\nomname}{\nomname}
   \nompreamble
-                                %  \list{}{%
-                                %    \labelwidth\nom@tempdim
-                                %    \leftmargin\labelwidth
-                                %    \advance\leftmargin\labelsep
-                                %    \itemsep\nomitemsep
-                                %    \let\makelabel\nomlabel}
 }
 
+\def\endthenomenclature{%
+  \endlist
+  \nompostamble}
+
 \renewcommand\nomgroup[1]{%
-  \ifthenelse{\equal{#1}{A}}{%
-    \large{Roman Letters}}{%
-    \ifthenelse{\equal{#1}{G}}{%
-      \large{Greek Letters}}{%
-      \ifthenelse{\equal{#1}{X}}{%
-        \large{Superscripts}}{%
-        \ifthenelse{\equal{#1}{Z}}{%
-          \large{Subscripts}}{%
-          {}}}}}}
+    \ifthenelse{\equal{#1}{A}}{%
+      \large{\nomAname}}{%
+      \ifthenelse{\equal{#1}{G}}{%
+        \large{\nomGname}}{%
+        \ifthenelse{\equal{#1}{X}}{%
+          \large{\nomXname}}{%
+          \ifthenelse{\equal{#1}{Z}}{%
+            \large{\nomZname}}{%
+            {}}}}}}
+
+%%
+%%
+
 
 \endinput
 %%
diff --git a/Master/texmf-dist/tpm/nomentbl.tpm b/Master/texmf-dist/tpm/nomentbl.tpm
index 5ad79db9063..051427d19b9 100644
--- a/Master/texmf-dist/tpm/nomentbl.tpm
+++ b/Master/texmf-dist/tpm/nomentbl.tpm
@@ -3,7 +3,7 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/nomentbl.zip">
     <TPM:Name>nomentbl</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/09 00:49:07</TPM:Date>
+    <TPM:Date>2006/04/19 16:46:00</TPM:Date>
     <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Nomenclature typeset  in a longtable</TPM:Title>
@@ -17,15 +17,21 @@ and physical unit.
     <TPM:Author>Brian Elmegaard</TPM:Author>
     <TPM:Size>51141</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="7033">
+    <TPM:RunFiles size="8390">
 texmf-dist/makeindex/nomentbl/nomentbl.ist
 texmf-dist/tex/latex/nomentbl/nomentbl.sty
 texmf-dist/tpm/nomentbl.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="44108">
+    <TPM:DocFiles size="208818">
+texmf-dist/doc/latex/nomentbl/README
+texmf-dist/doc/latex/nomentbl/example.pdf
+texmf-dist/doc/latex/nomentbl/example.tex
 texmf-dist/doc/latex/nomentbl/nomentbl.pdf
-texmf-dist/doc/latex/nomentbl/nomentbl.tex
     </TPM:DocFiles>
+    <TPM:SourceFiles size="21037">
+texmf-dist/source/latex/nomentbl/nomentbl.dtx
+texmf-dist/source/latex/nomentbl/nomentbl.ins
+    </TPM:SourceFiles>
     <TPM:Provides>Package/nomentbl</TPM:Provides>
   </rdf:Description>
 </rdf:RDF>
diff --git a/Master/texmf/lists/nomentbl b/Master/texmf/lists/nomentbl
index 531b71cf954..68574154eed 100644
--- a/Master/texmf/lists/nomentbl
+++ b/Master/texmf/lists/nomentbl
@@ -1,6 +1,9 @@
+texmf-dist/doc/latex/nomentbl/README
+texmf-dist/doc/latex/nomentbl/example.pdf
+texmf-dist/doc/latex/nomentbl/example.tex
 texmf-dist/doc/latex/nomentbl/nomentbl.pdf
-texmf-dist/doc/latex/nomentbl/nomentbl.tex
-
+texmf-dist/source/latex/nomentbl/nomentbl.dtx
+texmf-dist/source/latex/nomentbl/nomentbl.ins
 texmf-dist/makeindex/nomentbl/nomentbl.ist
 texmf-dist/tex/latex/nomentbl/nomentbl.sty
 texmf-dist/tpm/nomentbl.tpm