showlabels (8dec13)

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

2 files changed, 113 insertions, 44 deletions

diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.drv b/Master/texmf-dist/source/latex/showlabels/showlabels.drv
new file mode 100644
index 00000000000..c33c3dcb259
--- /dev/null
+++ b/Master/texmf-dist/source/latex/showlabels/showlabels.drv
@@ -0,0 +1,57 @@
+%%
+%% This is file `showlabels.drv',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% showlabels.dtx  (with options: `driver')
+%% Showlabels: Style to display labels in the margin
+%% This is the showlabels package
+%%
+%%%% Copyright 2005--2013, Norman Gray
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk>
+%%
+%% This work consists of the files showlabels.dtx and showlabels.ins,
+%% and the derived file showlabels.cls.
+\def\filename{showlabels}
+\def\fileversion{1.6.6}
+\def\filedate{2013/12/06}
+\def\docdate{2013 December 6}
+\def\filemaintainer{norman@astro.gla.ac.uk}
+\documentclass{ltxdoc}
+\EnableCrossrefs
+\newcommand\Lopt[1]{\textsf{#1}} % package options
+\newcommand\file[1]{\texttt{#1}} % filename
+\newcommand\Lenv[1]{\textsl{\{#1\}}}
+\newcommand\pstyle[1]{\textsf{\{#1\}}} % packages
+%% \url macro (url.sty does this better, but we don't want extra dependencies)
+\def\setpathdots{\discretionary{.}{}{.}}
+\def\setpathslash{\discretionary{/}{}{/}}
+{\catcode`\.=\active
+ \catcode`\/=\active
+  \gdef\pathcats{%
+    \catcode`\%=12      \catcode`\~=12
+    \catcode`\.=\active  \let.\setpathdots
+    \catcode`\/=\active \let/\setpathslash
+    \catcode`\#=12      \catcode`\_=12}%
+    }
+\def\setpath#1{\ttfamily <\nobreak #1\nobreak>\endgroup}
+\def\url{\begingroup\pathcats\setpath}
+\begin{document}
+\DocInput{showlabels.dtx}
+\PrintIndex
+\end{document}
+\endinput
+%%
+%% End of file `showlabels.drv'.
diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
index e137804064b..5e87a0a65d0 100644
--- a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
+++ b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
@@ -2,33 +2,27 @@
 %
 %% This is the showlabels package
 %%
-%% This software is copyright, 1999, 2001--2009, Norman Gray. 
-%% 
-%% This program is free software; you can redistribute it and/or
-%% modify it under the terms of the GNU General Public License
-%% as published by the Free Software Foundation; either version 2
-%% of the License, or (at your option) any later version.
-%% 
-%% This program is distributed in the hope that it will be useful,
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
-%% 
-%% You should have received a copy of the GNU General Public License
-%% along with this program; if not, write to the Free Software
-%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-%% 
-%% Author: Norman Gray, norman@astro.gla.ac.uk.
-%% Department of Physics and Astronomy, University of Glasgow, UK
+%%%% Copyright 2005--2013, Norman Gray
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %%
-%% See the file LICENCE for a copy of the GPL.
-%% You can also find an online copy at http://www.gnu.org/copyleft/gpl.html .
+%% This work has the LPPL maintenance status `maintained'.
+%% 
+%% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk>
 %%
+%% This work consists of the files showlabels.dtx and showlabels.ins,
+%% and the derived file showlabels.cls.
 %
 \def\filename{showlabels}
-\def\fileversion{1.6.5}
-\def\filedate{2009/05/29}
-\def\docdate{2009 May 29}
+\def\fileversion{1.6.6}
+\def\filedate{2013/12/06}
+\def\docdate{2013 December 6}
 \def\filemaintainer{norman@astro.gla.ac.uk}
 % \changes{v1.4}{2001/07/23}{Avoided defining RCSDate}
 %<+package>\NeedsTeXFormat{LaTeX2e}
@@ -117,12 +111,13 @@
 %
 % If you want to change the font the labels appear in, redefine the
 % |\showlabelfont| command, which by default expands to
-% |\small\ttfamily|.  For example, to have labels in a slanted font, you
-% could include the definition
+% |\small\ttfamily|.  For example, to have labels in a slanted font,
+% and green, you could include the definition
 % \begin{quote}
-% |\renewcommand{\showlabelfont}{\small\slshape}|
+% |\renewcommand{\showlabelfont}{\small\slshape\color{green}}|
 % \end{quote}
-% in the preamble of your document.
+% in the preamble of your document, as long as you have loaded the
+% \pstyle{color} package.
 % If you want still more control over the labels, you can
 % instead override |\showlabelsetlabel|, which initially expands to
 % just |\showlabelfont #1|.  You can use this mechanism to get a
@@ -130,9 +125,17 @@
 % \begin{quote}
 % |\usepackage{showlabels,rotating}|\\
 % |\renewcommand{\showlabelsetlabel}[1]|\\
-% \null\qquad |{\begin{turn}{60}\showlabelfont #1\end{turn}}|
+% \null\qquad |{\begin{turn}{60}\showlabelfont #1\end{turn}}|\\
 % \end{quote}
-% then you end up with your labels at a jaunty angle in the margin.
+% then you end up with your labels at a jaunty angle in the margin.  
+% Finally, you can change the definition of the
+% |\showlabelrefline| rule from its default,
+% in order to change how the inline rule (see below) is displayed.
+% For example, defining this to be
+% |\color{red}\hrule width 0.1em height 1.5ex depth 0pt |
+% produces a fattish red line, and defining it to be
+% |\hrule width 0pt height 1.5ex depth 0pt|
+% suppresses the line but still positions the text between the lines.
 %
 % If you wish the package to do its magic with the command |\foo|
 % (most typically |\cite|), then give the command |\showlabels{foo}|.
@@ -153,7 +156,7 @@
 % \Lopt{final} turns off all the functionality of this package.  This
 % is included so that if that
 % option is given globally in the |\documentclass| declaration then this
-% package does respect it.  \Lopt{draft} does nothing, and therefore
+% package does respect it.  The \Lopt{draft} option does nothing, and therefore
 % simply continues the default behaviour of this package; it is here
 % to partner the \Lopt{final} option.
 %
@@ -221,13 +224,15 @@
 % The package might still work with \LaTeX2.09, but that's neither
 % supported, nor even still tested.
 %
-% This software is copyright, 1999, 2001--2008, Norman Gray.
+% This software is copyright, 1999, 2001--2009, Norman Gray.
 % It is released under
 % the terms of the GNU General Public Licence.  See the copyright
 % declaration at the top of file \texttt{showlabels.dtx}, and the file
 % \texttt{LICENCE} for the licence conditions.  You can find an
 % online copy of the GPL at
-% \url{http://www.gnu.org/copyleft/gpl.html}.
+% \url{http://www.gnu.org/copyleft/gpl.html}.  If the licence is a
+% problem for some reason, please get in touch -- I'm probably fairly
+% easily persuadable to change it.
 %
 % The canonical home page of the package is
 % \url{http://purl.org/nxg/dist/showlabels}, and it is on CTAN at
@@ -393,10 +398,9 @@
 %    \end{macrocode}
 %
 % If you want slightly more general control over the labels, you can
-% instead override |\showlabelsetlabel|, which is just
-% |\newcommand{\showlabelfont}[1]{\normalfont\showlabelfont #1}| by default.
+% instead override |\showlabelsetlabel|.
 %    \begin{macrocode}
-\providecommand{\showlabelsetlabel}[1]{\normalfont\showlabelfont #1}
+\providecommand{\showlabelsetlabel}[1]{{\normalfont\showlabelfont #1}}
 %    \end{macrocode}
 %
 % For the benefit of |\SL@prlabelname|, define |\SL@gobblethree| to do nothing 
@@ -626,17 +630,17 @@
   \else
     \ifSL@setleft
       \hbox to 0pt{%
-	\hss
-	\vbox to 0pt{\vss
-	  \hbox to 0pt{\hss\box\@tempboxa}%
-	  \hrule width 0.05em height 1.5ex depth 0pt
-	}}%
+ 	\hss
+ 	\vbox to 0pt{\vss
+ 	  \hbox to 0pt{\hss\box\@tempboxa}%
+ 	  \showlabelrefline
+ 	}}%
     \else
       \hbox to 0pt{%
-	\vbox to 0pt{\vss
-	  \box\@tempboxa
-	  \hrule width 0.05em height 1.5ex depth 0pt
-	}\hss}%
+ 	\vbox to 0pt{\vss
+ 	  \box\@tempboxa
+ 	  \showlabelrefline
+ 	}\hss}%
     \fi
     \penalty10000 
   \fi
@@ -644,6 +648,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \begin{macro}{\showlabelrefline}
+% Set a short line which indicates the point where a label is
+% attached, when producing inline labels.  This additionally positions
+% the label up above the line.
+%    \begin{macrocode}
+\def\showlabelrefline{\hrule width 0.05em height 1.5ex depth 0pt }
+%    \end{macrocode}
+% \end{macro}
 %
 % \begin{macro}{\SL@margintext}
 % Set the actual text of the label.  Use |\SL@prlabelname| here: without