eledmac (27feb14)

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

1 files changed, 35 insertions, 22 deletions

diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 9329e0c54fa..ab968d596f0 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -51,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{8909}
+% \CheckSum{8900}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -180,6 +180,7 @@
 % \changes{v1.8.0}{2013/12/13}{Compatibility with parledgroup option of eledpar package.}
 % \changes{v1.8.2}{2014/01/31}{Debug compatibility problem with hebrew option of babel package.}
 % \changes{v1.8.3}{2014/02/03}{Fixes spurious spaces add by v1.7.0.}
+% \changes{v1.10.0}{2014/02/27}{Add \cs{pstartref} and  \cs{xpstartref} to refer to a pstart number (extension of \cs{edlabel}).}
 % \hyphenation{man-u-script man-u-scripts}
 %
 % \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -1291,15 +1292,15 @@
 % With \cs{inplaceoflemmaseparator}\oarg{s}\marg{l} you can add a space if no lemma separator is printed. The default value is 1~em. 
 %
 % \subsubsection{Font style}
-% \DescribeMacro{Xnotenumfont}
+% \DescribeMacro{\Xnotenumfont}
 % \cs{Xnotenumfont}\oarg{s}\marg{command} is used to change the font style for line numbers in critical footnotes ;  
 % \meta{command} must be one (or more) switching command, like \cs{bfseries}.
 %
-% \DescribeMacro{Xendnotenumfont}
+% \DescribeMacro{\Xendnotenumfont}
 % \cs{Xendnotenumfont}\oarg{s}\marg{command} is used to change the font style for line numbers in critical footnotes. 
 % \meta{command} must be one (or more) switching command, like \cs{bfseries}.
 %
-% \DescribeMacro{notenumfontX}
+% \DescribeMacro{\notenumfontX}
 % \cs{notenumfontX}\oarg{s}\marg{command} is used to change the font style for note numbers in familiar footnotes.  
 % \meta{command} must be one (or more) switching command, like \cs{bfseries}.
 %
@@ -1363,7 +1364,7 @@
 % You can add some space after a note by using \cs{afternote}\oarg{s}\marg{l}. The default value is \verb|1em plus.4em minus.4em|.
 %
 % \DescribeMacro{\parafootsep}
-% For paragraphed footnotes (see below), you can chooce the separator between each note by \cs{parafootsep}\oarg{s}\marg{l}. A common separator is double pipe (\verb+$||$+), which you can set by \cs{parafootsep}\verb+$||$+.
+% For paragraphed footnotes (see below), you can chooce the separator between each note by \cs{parafootsep}\oarg{s}\marg{l}. A common separator is double pipe (\verb+$||$+), which you can set by \cs{parafootsep}\verb+{$||$}+.
 %
 %\subsubsection{Options for block of notes}
 % \changes{v1.1}{2012/09/12}{New options for block of notes.}
@@ -1797,15 +1798,16 @@
 % \DescribeMacro{\edpageref}
 % \DescribeMacro{\lineref}
 % \DescribeMacro{\sublineref}
+% \DescribeMacro{\pstartref}
 % Elsewhere in the text, either before or after the \cs{edlabel},
 % you can refer to its location via \cs{edpageref}\marg{lab}, or
-% \cs{lineref}\marg{lab}, or \cs{sublineref}\marg{lab}. These commands
-% will produce, respectively, the page, line and sub-line on which
+% \cs{lineref}\marg{lab}, \cs{sublineref}\marg{lab}, or \cs{pstartref}\marg{lab}. These commands
+% will produce, respectively, the page, line, sub-line and pstart on which
 % the \cs{edlabel}\marg{lab} command occurred.
 %
 % An \cs{edlabel} command may appear in the main text, or in the
 % first argument of \cs{edtext}, but not in the apparatus itself.  But
-% \cs{edpageref}, \cs{lineref} and \cs{sublineref} commands can also be used in
+% \cs{edpageref}, \cs{lineref}, \cs{sublineref}, \cs{pstartref} commands can also be used in
 % the apparatus to refer to \cs{edlabel}'s in the text.
 %
 % The \cs{edlabel} command works by writing macros to the LaTeX
@@ -1832,6 +1834,7 @@
 % \DescribeMacro{\xpageref}
 % \DescribeMacro{\xlineref}
 % \DescribeMacro{\xsublineref}
+% \DescribeMacro{\xpstartref}
 % However, there are situations in which you'll want \Eledmac{} to
 % return a number without displaying any
 % warning messages about undefined labels or the like: if you want to
@@ -1840,7 +1843,7 @@
 % is missing. This is the case for references used within the
 % argument to \cs{linenum}, for example. For this situation,
 % three variants of the reference commands, with the \verb"x"
-% prefix, are supplied: \cs{xpageref}, \cs{xlineref}, and \cs{xsublineref}.
+% prefix, are supplied: \cs{xpageref}, \cs{xlineref}, \cs{xsublineref} and \cs{xpstartref}.
 % They have these limitations:
 % they will not tell you if the label is undefined, and they must
 % be preceded in the file by at least one of the four other
@@ -2767,7 +2770,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/02/05 v1.9.0 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2014/02/27 v1.10.0 LaTeX port of EDMAC]
 %    \end{macrocode}
 %
 %    Generally, these are the modifications to the original.
@@ -3267,6 +3270,7 @@
 % \changes{v1.4.1}{2012/11/16}{New option \emph{noquotation}.}
 % \changes{v1.4.7}{2012/06/07}{Compatibility of sectioning commands with \cs{autopar}.}
 % \changes{v1.8.0}{2013/12/13}{Correction of sectioning commands in parallel texts.}
+% \changes{v1.10.0}{2014/02/27}{Correction of sectioning commands in parallel texts.}
 % \cs{initnumbering@sectcmd} defines sectioning commands inside numbered section.
 % It also defines quotation environment. 
 % Note: this assumes that the user didn't change \cs{chapter}.
@@ -3274,42 +3278,42 @@
 %    \begin{macrocode}
 \newcommand{\initnumbering@sectcmd}{
     \newcommand{\ledsection}[2][]{%
-        \ifl@dpairing\else\leavevmode\fi\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%%
+        \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%%
         \pstart%
         \leavevmode\ifledsecnolinenumber\skipnumbering\fi\section[##1]{##2}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend%
         \vspace{-2\parskip}\vspace{-2\baselineskip}%
         \ifautopar\else\pstart\fi
     }
     \WithSuffix\newcommand\ledsection*[1]{%
-        \ifl@dpairing\else\leavevmode\fi\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
+        \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
         \pstart%
         \leavevmode\ifledsecnolinenumber\skipnumbering\fi\section*{##1}\leavevmode\vspace{2.3ex \@plus.2ex}\skipnumbering\pend%
         \vspace{-2\parskip}\vspace{-2\baselineskip}%
         \ifautopar\else\pstart\fi
     }
     \newcommand{\ledsubsection}[2][]{%
-        \ifl@dpairing\else\leavevmode\fi\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
+        \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
         \pstart%
         \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
         \vspace{-2\parskip}\vspace{-2\baselineskip}%
         \ifautopar\else\pstart\fi
     }
     \WithSuffix\newcommand\ledsubsection*[1]{%
-        \ifl@dpairing\else\leavevmode\fi\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
+        \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
         \pstart%
         \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
         \vspace{-2\parskip}\vspace{-2\baselineskip}%
         \ifautopar\else\pstart\fi
     }
     \newcommand{\ledsubsubsection}[2][]{%
-        \ifl@dpairing\else\leavevmode\fi\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
+        \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
         \pstart%
         \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsubsection[##1]{##2}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
         \vspace{-2\parskip}\vspace{-2\baselineskip}%
         \ifautopar\else\pstart\fi
     }
     \WithSuffix\newcommand\ledsubsubsection*[1]{%
-        \ifl@dpairing\else\leavevmode\fi\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
+        \leavevmode\pend\vspace{3.5ex \@plus 1ex \@minus .2ex}\ifl@dpairing\else\skipnumbering\fi%
         \pstart%
         \leavevmode\ifledsecnolinenumber\skipnumbering\fi\subsubsection*{##1}\leavevmode\vspace{1.5ex \@plus .2ex}\skipnumbering\pend%
         \vspace{-2\parskip}\vspace{-2\baselineskip}%
@@ -9935,7 +9939,7 @@
 % scheme might also have had problems in this area).
 %    \begin{macrocode}
   \protected@write\@auxout{}%
-    {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
+    {\string\l@dmake@labels\space\thepage|\label@refs|\the\c@pstart|{#1}}%
   \@esphack}
 
 %    \end{macrocode}
@@ -9980,11 +9984,11 @@
 % has been previously defined (by a class or package).
 %    \begin{macrocode}
 \newcommand*{\l@dmake@labels}{}
-\def\l@dmake@labels#1|#2|#3|#4{%
-  \expandafter\ifx\csname the@label#4\endcsname \relax\else
-    \led@warn@DuplicateLabel{#4}%
+\def\l@dmake@labels#1|#2|#3|#4|#5{%
+  \expandafter\ifx\csname the@label#5\endcsname \relax\else
+    \led@warn@DuplicateLabel{#5}%
   \fi
-  \expandafter\gdef\csname the@label#4\endcsname{#1|#2|#3}%
+  \expandafter\gdef\csname the@label#5\endcsname{#1|#2|#3|#4}%
   \ignorespaces}
 
 %    \end{macrocode}
@@ -9996,7 +10000,7 @@
 %
 %    \begin{macrocode}
 \AtBeginDocument{%
-  \def\l@dmake@labels#1|#2|#3|#4{}%
+  \def\l@dmake@labels#1|#2|#3|#4|#5{}%
 }
 
 %    \end{macrocode}
@@ -10068,6 +10072,15 @@
 % \end{macro}
 % \end{macro}
 %
+% \begin{macro}{\pstarteref}
+% \begin{macro}{\xpstartref}
+% If the specified label exists, \cs{pstartref} gives its pstart number.
+%    \begin{macrocode}
+\newcommand*{\pstartref}[1]{\l@dref@undefined{#1}\l@dgetref@num{4}{#1}}
+\newcommand*{\xpstartref}[1]{\l@dgetref@num{4}{#1}}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
 % The next three macros are used by the referencing commands above,
 % and do the job of extracting the right numbers from the label
 % macro that contains the page, line, and sub-line number.