listlbls

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

7 files changed, 304 insertions, 90 deletions

diff --git a/Master/texmf-dist/doc/latex/listlbls/Makefile b/Master/texmf-dist/doc/latex/listlbls/Makefile
index 541e39185cb..20ecc6f4686 100644
--- a/Master/texmf-dist/doc/latex/listlbls/Makefile
+++ b/Master/texmf-dist/doc/latex/listlbls/Makefile
@@ -7,28 +7,41 @@ VERS  = $(shell ltxfileinfo -v $(NAME).dtx)
 LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
 UTREE = $(shell kpsewhich --var-value TEXMFHOME)
 
-all:	$(NAME).pdf clean
-	test -e README.txt && mv README.txt README || exit 0
+all:	$(NAME).pdf README.md README clean
+
+README: README.txt
+	cp README.txt README
+
+README.txt: $(NAME).pdf
+
+README.md: $(NAME).pdf
+
 $(NAME).pdf: $(NAME).dtx
-	pdflatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
+	xelatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
 	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
 	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
-	pdflatex -shell-escape -recorder -interaction=nonstopmode $(NAME).dtx > /dev/null
-	pdflatex -shell-escape -recorder -interaction=nonstopmode $(NAME).dtx > /dev/null
+	xelatex -shell-escape -recorder -interaction=nonstopmode $(NAME).dtx > /dev/null
+	xelatex -shell-escape -recorder -interaction=nonstopmode $(NAME).dtx > /dev/null
+
 clean:
+	rm -f *.fls
 	rm -f $(NAME).{aux,toc,fls,glo,gls,hd,idx,ilg,ind,ins,log,out}
+
 distclean: clean
-	rm -f $(NAME).{pdf,sty} README
+	rm -f $(NAME).{pdf,sty} README{,.{md,txt}}
+
 inst: all
 	mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
 	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
 	cp $(NAME).sty $(UTREE)/tex/latex/$(NAME)
 	cp $(NAME).pdf $(UTREE)/doc/latex/$(NAME)
+
 install: all
 	sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(NAME)
 	sudo cp $(NAME).dtx $(LOCAL)/source/latex/$(NAME)
 	sudo cp $(NAME).sty $(LOCAL)/tex/latex/$(NAME)
 	sudo cp $(NAME).pdf $(LOCAL)/doc/latex/$(NAME)
+
 zip: all
 	mkdir $(TDIR)
 	cp $(NAME).{pdf,dtx} Makefile README $(TDIR)
diff --git a/Master/texmf-dist/doc/latex/listlbls/README b/Master/texmf-dist/doc/latex/listlbls/README
index 80ad7fccbf8..c8a71fe79bf 100644
--- a/Master/texmf-dist/doc/latex/listlbls/README
+++ b/Master/texmf-dist/doc/latex/listlbls/README
@@ -6,4 +6,12 @@ License: Released under the LaTeX Project Public License v1.3c or later
 See:     http://www.latex-project.org/lppl.txt
 ----------------------------------------------------------------
 
-Some text about the package: probably the same as the abstract.
+This is a package meant to help a LaTeX-writer to keep track all the defined
+labels by typesetting a complete list of labels whereever the author requests
+it. Keep in mind, that you might need to have additional LaTeX runs to get the
+references right.
+
+This package is based on an answer David Carlisle gave on tex.stackexchange.com
+in the thread ``List of all labels with hyperlinks''[1].
+
+[1]: http://tex.stackexchange.com/questions/147695/list-of-all-labels-with-hyperlinks/147705#147705
diff --git a/Master/texmf-dist/doc/latex/listlbls/README.md b/Master/texmf-dist/doc/latex/listlbls/README.md
new file mode 100644
index 00000000000..addc1bcac39
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/listlbls/README.md
@@ -0,0 +1,21 @@
+listlbls
+========
+
+Creates a list of all labels used throughout a document
+
+| Key     | Value                                                          |
+|--------:|:---------------------------------------------------------------|
+| Author  | Norbert Melzer                                                 |
+| E-mail  | timmelzer@gmail.com                                            |
+| License | Released under the LaTeX Project Public License v1.3c or later |
+| See     | http://www.latex-project.org/lppl.txt                          |
+
+This is a package meant to help a LaTeX-writer to keep track all the defined
+labels by typesetting a complete list of labels whereever the author requests
+it. Keep in mind, that you might need to have additional LaTeX runs to get the
+references right.
+
+This package is based on an answer David Carlisle gave on tex.stackexchange.com
+in the thread [List of all labels with hyperlinks][1].
+
+[1]: http://tex.stackexchange.com/questions/147695/list-of-all-labels-with-hyperlinks/147705#147705
diff --git a/Master/texmf-dist/doc/latex/listlbls/README.txt b/Master/texmf-dist/doc/latex/listlbls/README.txt
index 80ad7fccbf8..c8a71fe79bf 100644
--- a/Master/texmf-dist/doc/latex/listlbls/README.txt
+++ b/Master/texmf-dist/doc/latex/listlbls/README.txt
@@ -6,4 +6,12 @@ License: Released under the LaTeX Project Public License v1.3c or later
 See:     http://www.latex-project.org/lppl.txt
 ----------------------------------------------------------------
 
-Some text about the package: probably the same as the abstract.
+This is a package meant to help a LaTeX-writer to keep track all the defined
+labels by typesetting a complete list of labels whereever the author requests
+it. Keep in mind, that you might need to have additional LaTeX runs to get the
+references right.
+
+This package is based on an answer David Carlisle gave on tex.stackexchange.com
+in the thread ``List of all labels with hyperlinks''[1].
+
+[1]: http://tex.stackexchange.com/questions/147695/list-of-all-labels-with-hyperlinks/147705#147705
diff --git a/Master/texmf-dist/doc/latex/listlbls/listlbls.pdf b/Master/texmf-dist/doc/latex/listlbls/listlbls.pdf
index cf778c883b3..15a732d7991 100644
--- a/Master/texmf-dist/doc/latex/listlbls/listlbls.pdf
+++ b/Master/texmf-dist/doc/latex/listlbls/listlbls.pdf
diff --git a/Master/texmf-dist/source/latex/listlbls/listlbls.dtx b/Master/texmf-dist/source/latex/listlbls/listlbls.dtx
index c1036548e7d..52da33c3817 100644
--- a/Master/texmf-dist/source/latex/listlbls/listlbls.dtx
+++ b/Master/texmf-dist/source/latex/listlbls/listlbls.dtx
@@ -11,8 +11,39 @@ License: Released under the LaTeX Project Public License v1.3c or later
 See:     http://www.latex-project.org/lppl.txt
 ----------------------------------------------------------------
 
-Some text about the package: probably the same as the abstract.
+This is a package meant to help a LaTeX-writer to keep track all the defined
+labels by typesetting a complete list of labels whereever the author requests
+it. Keep in mind, that you might need to have additional LaTeX runs to get the
+references right.
+
+This package is based on an answer David Carlisle gave on tex.stackexchange.com
+in the thread ``List of all labels with hyperlinks''[1].
+
+[1]: http://tex.stackexchange.com/questions/147695/list-of-all-labels-with-hyperlinks/147705#147705
 %</readme>
+%<*readmemd>
+listlbls
+========
+
+Creates a list of all labels used throughout a document
+
+| Key     | Value                                                          |
+|--------:|:---------------------------------------------------------------|
+| Author  | Norbert Melzer                                                 |
+| E-mail  | timmelzer@gmail.com                                            |
+| License | Released under the LaTeX Project Public License v1.3c or later |
+| See     | http://www.latex-project.org/lppl.txt                          |
+
+This is a package meant to help a LaTeX-writer to keep track all the defined
+labels by typesetting a complete list of labels whereever the author requests
+it. Keep in mind, that you might need to have additional LaTeX runs to get the
+references right.
+
+This package is based on an answer David Carlisle gave on tex.stackexchange.com
+in the thread [List of all labels with hyperlinks][1].
+
+[1]: http://tex.stackexchange.com/questions/147695/list-of-all-labels-with-hyperlinks/147705#147705
+%</readmemd>
 %<*internal>
 \fi
 \def\nameofplainTeX{plain}
@@ -71,6 +102,9 @@ Running "make install" installs the files in the local TeX tree.
 \generate{
   \file{README.txt}{\from{\jobname.dtx}{readme}}
 }
+\generate{
+  \file{README.md}{\from{\jobname.dtx}{readmemd}}
+}
 \ifx\fmtname\nameofplainTeX
   \expandafter\endbatchfile
 \else
@@ -86,10 +120,12 @@ Running "make install" installs the files in the local TeX tree.
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{listlbls}
 %<*package>
-    [2014/07/27 v1.02 Creates a list of all labels used throughout a document]
+    [2014/08/04 v1.03 Creates a list of all labels used throughout a document]
 %</package>
 %<*driver>
 \documentclass{ltxdoc}
+\usepackage{microtype}
+\usepackage{libertine}
 \usepackage[a4paper,margin=25mm,left=50mm,nohead]{geometry}
 \usepackage{colordoc}
 \usepackage{multicol}
@@ -97,8 +133,9 @@ Running "make install" installs the files in the local TeX tree.
 \doxitem{Option}{option}{option}
 \usepackage[numbered]{hypdoc}
 \usepackage{xspace}
-\usepackage[draft,totoc]{listlbls}
+\usepackage{nameref}
 \usepackage[english]{babel}
+\usepackage[draft,totoc]{listlbls}
 \EnableCrossrefs
 \CodelineIndex
 \RecordChanges
@@ -125,6 +162,7 @@ Running "make install" installs the files in the local TeX tree.
 %\changes{v1.01}{2014/07/25}{Changed some internal stuff to make it releaseable on CTAN}
 %\changes{v1.02}{2014/07/26}{Local option wins agains global option}
 %\changes{v1.02}{2014/07/27}{Added languag-support for English, German and French.}
+%\changes{v1.03}{2014/08/04}{Proceeding with namespacing internal macros}
 % \begin{abstract}
 % This is a package meant to help a \LaTeX-writer to keep track all the defined labels by typesetting a complete list of labels whereever the author requests it. Keep in mind, that you might need to have additional \LaTeX\ runs to get the references right.
 %
@@ -138,7 +176,11 @@ Running "make install" installs the files in the local TeX tree.
 % 
 % The following explanations are only valid for Linux-like systems with gnu-|make| available.
 %
-% \subsection{From Github}
+% \subsection{\TeX live}\label{ssec:inst-tl}
+%
+% This package is bundled in \TeX live, so you can simply (|sudo|) |tlmgr install listlbls| (which should work for windows as well)
+%
+% \subsection{From Github}\label{ssec:inst-gh}
 %
 % \begin{enumerate}
 %   \item Check out the sourcecode from \href{https://github.com/}{GitHub}:\\
@@ -155,7 +197,7 @@ Running "make install" installs the files in the local TeX tree.
 %     \end{description}
 % \end{enumerate}
 %
-% \subsection{From CTAN}
+% \subsection{From CTAN}\label{ssec:inst-ctan}
 %
 % \begin{enumerate}
 %   \item Browse to \url{http://ctan.org/pkg/listlbls}.
@@ -188,13 +230,15 @@ Running "make install" installs the files in the local TeX tree.
 %
 % \DescribeOption{numtoc} Typesets a numbered headline, this option also implies |totoc|!
 %
-% This document was typeset with |\usepackage[draft,totoc]{listlbls}|.
+% \DescribeOption{nonameref} Even if the package |nameref| if detected, it will not be used.
+%
+% This document was typeset with |\usepackage[draft,totoc]{listlbls}| also the package |nameref| was loaded.
 %
 % A locally set option will win against a globally set contrary option!
 %
-% \subsection{Macros}
+% \subsection{Macros}\label{ssec:use-macros}
 %
-% Then anywhere in your document, you can use the |\listoflabels|-macro to typeset a list of labels. An example can be seen on page \pageref{sec:lolabels}.
+% Then anywhere in your document, you can use the |\listoflabels|-macro to typeset a list of labels. An example can be seen on page \pageref{special:listoflabels}.
 %
 % \DescribeMacro{\label} Use |\label| as you are used to it!
 %
@@ -208,13 +252,30 @@ Running "make install" installs the files in the local TeX tree.
 %  \listoflabels
 %}
 %
+% \section{Contribution and bugreports}\label{sec:contribute}
+%
+% If you have feature-requests or bug-reports, please feel free to report them on the \href{https://github.com/NobbZ/listlbls}{project page at GitHub}.
+%
+% If you want to contribute then follow these steps:
+% \begin{enumerate}
+%   \item Visit the \href{https://github.com/NobbZ/listlbls}{project page at GitHub},
+%   \item forkt it,
+%   \item clone it to your local machine,
+%   \item create a branch ``|feature/|\meta{feature name}'',
+%   \item do your changes,
+%   \item push them back to GitHub,
+%   \item create a pull request to |develop|,
+%   \item and wait for approval.
+% \end{enumerate}
+% After approval your code will be merged to the |development|-branch and I will generally not accept pull-requests that edit |develop| directly.
 % \section{Implementation}\label{sec:implementation}
 %
 %    \begin{macrocode}
 %<*package>
-\newif\if@draft\@draftfalse
-\newif\if@totoc\@totocfalse
-\newif\if@numtoc\@numtocfalse
+\newif\ifllbls@draft\llbls@draftfalse
+\newif\ifllbls@totoc\llbls@totocfalse
+\newif\ifllbls@numtoc\llbls@numtocfalse
+\newif\ifllbls@nameref\llbls@namereftrue
 %    \end{macrocode}
 % \subsection{Options}\label{ssec:impl-options}
 % \begin{option}{draft}
@@ -222,7 +283,7 @@ Running "make install" installs the files in the local TeX tree.
 % \changes{v1.02}{2014/07/26}{Introduced @ifdraft}
 % Check for |draft|-option:
 %    \begin{macrocode}
-\DeclareOption{draft}{\@drafttrue}
+\DeclareOption{draft}{\llbls@drafttrue}
 %    \end{macrocode}
 % \end{option}
 % \begin{option}{final}
@@ -230,28 +291,35 @@ Running "make install" installs the files in the local TeX tree.
 % \changes{v1.02}{2014/07/26}{Introduced @ifdraft}
 % Check for |final|-option:
 %    \begin{macrocode}
-\DeclareOption{final}{\@draftfalse}
+\DeclareOption{final}{\llbls@draftfalse}
 %    \end{macrocode}
 % \end{option}
 % \begin{option}{totoc}
 % \changes{v1.02}{2014/07/26}{Added option}
 % Check for |totoc|-option:
 %    \begin{macrocode}
-\DeclareOption{totoc}{\@totoctrue}
+\DeclareOption{totoc}{\llbls@totoctrue}
 %    \end{macrocode}
 % \end{option}
 % \begin{option}{notoc}
 % \changes{v1.02}{2014/07/26}{Added option}
 % Check for |notoc|-option:
 %    \begin{macrocode}
-\DeclareOption{notoc}{\@totocfalse}
+\DeclareOption{notoc}{\llbls@totocfalse}
 %    \end{macrocode}
 % \end{option}
 % \begin{option}{numtoc}
 % \changes{v1.02}{2014/07/27}{Added option}
 % Check for |numtoc|-option:
 %    \begin{macrocode}
-\DeclareOption{numtoc}{\@numtoctrue}
+\DeclareOption{numtoc}{\llbls@numtoctrue}
+%    \end{macrocode}
+% \end{option}
+% \begin{option}{nonameref}
+% \changes{v1.03}{2014/08/04}{Added option}
+% Check for |nonameref|-option:
+%    \begin{macrocode}
+\DeclareOption{nonameref}{\llbls@namereffalse}
 %    \end{macrocode}
 % \end{option}
 % Process the options:
@@ -259,84 +327,138 @@ Running "make install" installs the files in the local TeX tree.
 \ProcessOptions*\relax
 %    \end{macrocode}
 % \subsection{Loading auxilliary packages}\label{ssec:impl-aux}
-% Load the package |translations| to provide internationalised caption for the |\listoflabels|.
+% Load the package |translations| to provide internationalised caption for the\\|\listoflabels|.
 %    \begin{macrocode}
 \RequirePackage{translations}
 %    \end{macrocode}
 % \subsection{Set up internationalisation}\label{ssec:impl-i18n}
 % Define fallback translations:
 %    \begin{macrocode}
-\DeclareTranslationFallback{llbls-listoflabels}{List of Labels}
-\DeclareTranslationFallback{llbls-onpage}{on page}
+\DeclareTranslationFallback%
+  {llbls-listoflabels}%
+  {List of Labels}
+\DeclareTranslationFallback%
+  {llbls-onpage}%
+  {on page}
+%    \end{macrocode}
+% \subsubsection{English}\label{sssec:impl-i18n-en}
+%    \begin{macrocode}
+\DeclareTranslation{English}%
+  {llbls-listoflabels}%
+  {List of Labels}
+\DeclareTranslation{English}%
+  {llbls-onpage}%
+  {on page}
+%    \end{macrocode}
+% \subsubsection{German}\label{sssec:impl-i18n-de}
+%    \begin{macrocode}
+\DeclareTranslation{German}%
+  {llbls-listoflabels}%
+  {Sprungmarkenverzeichnis}
+\DeclareTranslation{German}%
+  {llbls-onpage}%
+  {auf Seite}
 %    \end{macrocode}
-% Define other translations:
+% \subsubsection{French}\label{sssec:impl-i18n-fr}
 %    \begin{macrocode}
-\DeclareTranslation{English}{llbls-listoflabels}{List of Labels}
-\DeclareTranslation{English}{llbls-onpage}{on page}
-\DeclareTranslation{German}{llbls-listoflabels}{Sprungmarkenverzeichnis}
-\DeclareTranslation{German}{llbls-onpage}{auf Seite}
-\DeclareTranslation{French}{llbls-listoflabels}{Liste des \'etiquettes}
-\DeclareTranslation{French}{llbls-onpage}{\`a la page}
+\DeclareTranslation{French}%
+  {llbls-listoflabels}%
+  {Liste des \'etiquettes}
+\DeclareTranslation{French}%
+  {llbls-onpage}%
+  {\`a la page}
 %    \end{macrocode}
 % \subsection{Internal stuff}\label{ssec:impl-internal}
+% \begin{macro}{\llbls@headline}\begin{macro}{\llbls@toccommand}\begin{macro}{\llbls@tocgroup}
 % Determine if we have |\chapter|s or not and create a command that maps to |\chapter| or |\section| as needed.
 %    \begin{macrocode}
 \ifdefined\chapter*
-  \if@numtoc
-    \def\llbls@headline{\chapter{List of Labels}\label{special:listoflabels}}
+  \ifllbls@numtoc
+    \def\llbls@headline{%
+      \chapter{List of Labels}\label{special:listoflabels}}
   \else
     \def\llbls@toccommand{\chapter*}
     \def\llbls@tocgroup{chapter}
   \fi
 \else
-  \if@numtoc
-    \def\llbls@headline{\section{List of Labels}\label{special:listoflabels}}
+  \ifllbls@numtoc
+    \def\llbls@headline{%
+      \section{List of Labels}\label{special:listoflabels}}
   \else
     \def\llbls@toccommand{\section*}
     \def\llbls@tocgroup{section}
   \fi
 \fi
 \ifdefined\llbls@headline\else
-  \def\llbls@headline{\llbls@toccommand{\GetTranslation{llbls-listoflabels}}\label{special:listoflabels}%
-    \if@totoc\addcontentsline{toc}{\llbls@tocgroup}{\GetTranslation{llbls-listoflabels}}\relax\fi}
+  \def\llbls@headline{%
+    \llbls@toccommand{\GetTranslation{llbls-listoflabels}}%
+    \label{special:listoflabels}%
+    \ifllbls@totoc%
+      \addcontentsline{toc}%
+        {\llbls@tocgroup}%
+        {\GetTranslation{llbls-listoflabels}}%
+      \relax%
+    \fi%
+  }
 \fi
 %    \end{macrocode}
-% \begin{macro}{\@findlabel}
+% \end{macro}\end{macro}\end{macro}
+% \begin{macro}{\llbls@refs}
+% Whether or not we use |\nameref| in the output.
+%    \begin{macrocode}
+\ifdefined\nameref
+  \ifllbls@nameref
+    \newcommand\llbls@refs[1]{\nameref{#1}, \ref{#1}}
+  \else
+    \newcommand\llbls@refs[1]{\ref{#1}}
+  \fi
+\else
+  \newcommand\llbls@refs[1]{\ref{#1}}%
+\fi
+%    \end{macrocode}
+% \end{macro}
+% \begin{macro}{\llbls@findlabel}
 % No explanation yet.
 %    \begin{macrocode}
-\long\def\@findlabel#1#2\@findlabel{%
-  \ifx\newlabel#1\lablist\expandafter{\the\lablist\@showlabel#2}\fi}
+\long\def\llbls@findlabel#1#2\llbls@findlabel{%
+  \ifx\newlabel#1%
+    \llbls@lablist\expandafter{\the\llbls@lablist\llbls@showlabel#2}
+  \fi}
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{\@showlabel}
+% \begin{macro}{\llbls@showlabel}
+% \changes{v1.03}{2014/07/27}{Add support for nameref-package}
 % Displays a single entry in the |\listoflabels|
 %    \begin{macrocode}
-\def\@showlabel#1#2{%
-  \par\noindent Label: \texttt{\detokenize{#1}}\dotfill\ref{#1}~\GetTranslation{llbls-onpage}~\pageref{#1}}
+\def\llbls@showlabel#1#2{%
+  \par\noindent Label: %
+  \texttt{\detokenize{#1}}\dotfill%
+  \llbls@refs{#1}~\GetTranslation{llbls-onpage}~\pageref{#1}%
+}
 %    \end{macrocode}
 % \end{macro}
 %
 %    \begin{macrocode}
-\newtoks\lablist
-\newread\zz
-\immediate\openin\zz=\jobname.aux
+\newtoks\llbls@lablist
+\newread\llbls@zz
+\immediate\openin\llbls@zz=\jobname.aux
 \loop
-\ifeof\zz\else
-\read\zz to \tmp
-\expandafter\@findlabel\tmp\relax\@findlabel
-\repeat    
+\ifeof\llbls@zz\else
+\read\llbls@zz to \llbls@tmp
+\expandafter\llbls@findlabel\llbls@tmp\relax\llbls@findlabel
+\repeat
 %    \end{macrocode}
 % \subsection{External stuff}\label{ssec:impl-extern}
 %    \begin{macrocode}
-\if@draft
+\ifllbls@draft
 %    \end{macrocode}
 % \begin{macro}{\listoflabels}
 % Print a list of all available lables that are defined throughout the document.
 %    \begin{macrocode}
   \newcommand\listoflabels{%
     \llbls@headline%
-    \the\lablist}
+    \the\llbls@lablist}
 %    \end{macrocode}
 % \end{macro}
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/listlbls/listlbls.sty b/Master/texmf-dist/tex/latex/listlbls/listlbls.sty
index c94c1be6855..79f1eb33ab4 100644
--- a/Master/texmf-dist/tex/latex/listlbls/listlbls.sty
+++ b/Master/texmf-dist/tex/latex/listlbls/listlbls.sty
@@ -15,60 +15,102 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{listlbls}
-    [2014/07/27 v1.02 Creates a list of all labels used throughout a document]
-\newif\if@draft\@draftfalse
-\newif\if@totoc\@totocfalse
-\newif\if@numtoc\@numtocfalse
-\DeclareOption{draft}{\@drafttrue}
-\DeclareOption{final}{\@draftfalse}
-\DeclareOption{totoc}{\@totoctrue}
-\DeclareOption{notoc}{\@totocfalse}
-\DeclareOption{numtoc}{\@numtoctrue}
+    [2014/08/04 v1.03 Creates a list of all labels used throughout a document]
+\newif\ifllbls@draft\llbls@draftfalse
+\newif\ifllbls@totoc\llbls@totocfalse
+\newif\ifllbls@numtoc\llbls@numtocfalse
+\newif\ifllbls@nameref\llbls@namereftrue
+\DeclareOption{draft}{\llbls@drafttrue}
+\DeclareOption{final}{\llbls@draftfalse}
+\DeclareOption{totoc}{\llbls@totoctrue}
+\DeclareOption{notoc}{\llbls@totocfalse}
+\DeclareOption{numtoc}{\llbls@numtoctrue}
+\DeclareOption{nonameref}{\llbls@namereffalse}
 \ProcessOptions*\relax
 \RequirePackage{translations}
-\DeclareTranslationFallback{llbls-listoflabels}{List of Labels}
-\DeclareTranslationFallback{llbls-onpage}{on page}
-\DeclareTranslation{English}{llbls-listoflabels}{List of Labels}
-\DeclareTranslation{English}{llbls-onpage}{on page}
-\DeclareTranslation{German}{llbls-listoflabels}{Sprungmarkenverzeichnis}
-\DeclareTranslation{German}{llbls-onpage}{auf Seite}
-\DeclareTranslation{French}{llbls-listoflabels}{Liste des \'etiquettes}
-\DeclareTranslation{French}{llbls-onpage}{\`a la page}
+\DeclareTranslationFallback%
+  {llbls-listoflabels}%
+  {List of Labels}
+\DeclareTranslationFallback%
+  {llbls-onpage}%
+  {on page}
+\DeclareTranslation{English}%
+  {llbls-listoflabels}%
+  {List of Labels}
+\DeclareTranslation{English}%
+  {llbls-onpage}%
+  {on page}
+\DeclareTranslation{German}%
+  {llbls-listoflabels}%
+  {Sprungmarkenverzeichnis}
+\DeclareTranslation{German}%
+  {llbls-onpage}%
+  {auf Seite}
+\DeclareTranslation{French}%
+  {llbls-listoflabels}%
+  {Liste des \'etiquettes}
+\DeclareTranslation{French}%
+  {llbls-onpage}%
+  {\`a la page}
 \ifdefined\chapter*
-  \if@numtoc
-    \def\llbls@headline{\chapter{List of Labels}\label{special:listoflabels}}
+  \ifllbls@numtoc
+    \def\llbls@headline{%
+      \chapter{List of Labels}\label{special:listoflabels}}
   \else
     \def\llbls@toccommand{\chapter*}
     \def\llbls@tocgroup{chapter}
   \fi
 \else
-  \if@numtoc
-    \def\llbls@headline{\section{List of Labels}\label{special:listoflabels}}
+  \ifllbls@numtoc
+    \def\llbls@headline{%
+      \section{List of Labels}\label{special:listoflabels}}
   \else
     \def\llbls@toccommand{\section*}
     \def\llbls@tocgroup{section}
   \fi
 \fi
 \ifdefined\llbls@headline\else
-  \def\llbls@headline{\llbls@toccommand{\GetTranslation{llbls-listoflabels}}\label{special:listoflabels}%
-    \if@totoc\addcontentsline{toc}{\llbls@tocgroup}{\GetTranslation{llbls-listoflabels}}\relax\fi}
+  \def\llbls@headline{%
+    \llbls@toccommand{\GetTranslation{llbls-listoflabels}}%
+    \label{special:listoflabels}%
+    \ifllbls@totoc%
+      \addcontentsline{toc}%
+        {\llbls@tocgroup}%
+        {\GetTranslation{llbls-listoflabels}}%
+      \relax%
+    \fi%
+  }
 \fi
-\long\def\@findlabel#1#2\@findlabel{%
-  \ifx\newlabel#1\lablist\expandafter{\the\lablist\@showlabel#2}\fi}
-\def\@showlabel#1#2{%
-  \par\noindent Label: \texttt{\detokenize{#1}}\dotfill\ref{#1}~\GetTranslation{llbls-onpage}~\pageref{#1}}
-\newtoks\lablist
-\newread\zz
-\immediate\openin\zz=\jobname.aux
+\ifdefined\nameref
+  \ifllbls@nameref
+    \newcommand\llbls@refs[1]{\nameref{#1}, \ref{#1}}
+  \else
+    \newcommand\llbls@refs[1]{\ref{#1}}
+  \fi
+\else
+  \newcommand\llbls@refs[1]{\ref{#1}}%
+\fi
+\long\def\llbls@findlabel#1#2\llbls@findlabel{%
+  \ifx\newlabel#1%
+    \llbls@lablist\expandafter{\the\llbls@lablist\llbls@showlabel#2}
+  \fi}
+\def\llbls@showlabel#1#2{%
+  \par\noindent Label: %
+  \texttt{\detokenize{#1}}\dotfill%
+  \llbls@refs{#1}~\GetTranslation{llbls-onpage}~\pageref{#1}%
+}
+\newtoks\llbls@lablist
+\newread\llbls@zz
+\immediate\openin\llbls@zz=\jobname.aux
 \loop
-\ifeof\zz\else
-\read\zz to \tmp
-\expandafter\@findlabel\tmp\relax\@findlabel
+\ifeof\llbls@zz\else
+\read\llbls@zz to \llbls@tmp
+\expandafter\llbls@findlabel\llbls@tmp\relax\llbls@findlabel
 \repeat
-\if@draft
+\ifllbls@draft
   \newcommand\listoflabels{%
     \llbls@headline%
-    \the\lablist}
+    \the\llbls@lablist}
 \else
   \let\listoflabels=\relax
 \fi