ledmac (16aug12)

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

8 files changed, 112 insertions, 50 deletions

diff --git a/Master/texmf-dist/doc/latex/ledmac/README b/Master/texmf-dist/doc/latex/ledmac/README
index b7b7611393b..9cf9c4f663a 100644
--- a/Master/texmf-dist/doc/latex/ledmac/README
+++ b/Master/texmf-dist/doc/latex/ledmac/README
@@ -127,5 +127,5 @@ is similar.
  
 2012/06/07
 Maïeul Rouquette
-maieul at maieul do net
+maieul at maieul dot net
 
diff --git a/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf b/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
index a4aa9697918..e5c24d54a8b 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
diff --git a/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf b/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
index 647a258a360..da70e9354e3 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
diff --git a/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf b/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
index ca0f25f92a1..cdfe743944c 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
diff --git a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
index 14e385e1538..ea7cf67f91b 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
@@ -50,7 +50,7 @@
 %
 % \fi
 %
-% \CheckSum{9324}
+% \CheckSum{9323}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -140,6 +140,7 @@
 % \def\fileversion{v0.14} \def\filedate{2012/04/04}
 % \def\fileversion{v0.15} \def\filedate{2012/06/11}
 % \def\fileversion{v0.16} \def\filedate{2012/06/21}
+% \def\fileversion{v0.17} \def\filedate{2012/08/03}
 % \changes{v0.1}{2003/03/25}{First public release}
 % \changes{v0.2}{2003/08/16}{Added tabmac code, and extended indexing}
 % \changes{v0.2.1}{2003/09/13}{Bug fixes and match with mempatch v1.8}
@@ -2475,7 +2476,7 @@
 %     \skippedtrue
 %   \fi
 %   \leftskip0pt\rightskip0pt
-%   \csname #1\footnoterule\endcsname}
+%   \csname #1footnoterule\endcsname}
 % \footnormal{A}% make sure the new \normalfootstart is used
 % \footnormal{B}
 %  ...
@@ -2678,7 +2679,7 @@
 % \begin{verbatim}
 % ... \edtext{\colorbox{mycolor}{lemma}}{\Afootnote{...\colorbox...}}
 % \end{verbatim}
-% If you actally try 
+% If you actually try 
 % this\footnote{Reported by Dirk-Jan Dekker\index{Dekker, Dirk-Jan} 
 % in the CTT thread `Incompatibility
 % of ``color'' package' on 2003/08/28.}
@@ -2979,7 +2980,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2012/06/21 v0.16 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2012/08/03 v0.17 LaTeX port of EDMAC]
 
 %    \end{macrocode}
 %
@@ -5216,7 +5217,7 @@
 %
 % \begin{PW} 
 % \begin{macro}{\dummy@edtext}
-% LaTeX users are not used to delimeted arguments, so I provide
+% LaTeX users are not used to delimited arguments, so I provide
 % a \cs{edtext} macro as well.
 %    \begin{macrocode}
 \newcommand{\dummy@edtext}[2]{#1}
@@ -5796,19 +5797,18 @@
    \global\setbox\one@line=\vsplit\raw@text to\baselineskip}%
   \unvbox\one@line \global\setbox\one@line=\lastbox
   \getline@num
+  \ifnum\@lock>\@ne
+    \inserthangingsymboltrue
+  \else
+    \inserthangingsymbolfalse
+  \fi
   \affixline@num
   \affixpstart@num
   \hb@xt@ \linewidth{\inserthangingsymbol\l@dld@ta\add@inserts\affixside@note
     \l@dlsn@te
     {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta%
     \l@drsn@te
-  }}%
-%\end{macrocode}
-% The \cs{prevline@num} counter is used to check the insertion of hanging symbol.
-%\begin{macrocode}
-  \prevline@num=\line@num%
-  \add@penalties}
-
+  }}}%
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
@@ -10846,12 +10846,19 @@
 % \end{macro}
 % \end{macro}
 %\changes{v0.15}{2012/06/11}{New management of hangingsymbol insertion, preventing undesirable insertions.}
+%\changes{v0.17}{2012/08/03}{New new management of hangingsymbol insertion, preventing undesirable insertions.}
 % \begin{macro}{\inserthangingymbol}
-% \begin{macro}{\prevline@num}
-% After each insertion of true line, the value of \cs{line@num} counter is put into the \cs{prevline@num} counter. When we change verse, the \cs{line@num} is not equal to the \cs{prevline@num}. But if a verse is in two ore more lines, the second line (and next) has the same number as the first line of the verse. Consequently, the \cs{line@num} is equal to the \cs{prevline@num}. This property is used by the \cs{inserthangingsymbol} command to insert the hanging symbol at each verse's hanging.
-%    \begin{macrocode}
-\newcount\prevline@num
-\newcommand{\inserthangingsymbol}{\ifinstanza\ifnum\line@num=\prevline@num\hfill\hangingsymbol\fi\fi}
+% \begin{macro}{\ifinserthangingsymbol}
+% The boolean \cs{ifinserthangingsymbol} is set to TRUE when \cs{@lock} is greater than 1, i.e. when we are not in the first line of a verse. The switch of \cs{ifinserthangingsymbol} is  made in \cs{do@line} before the printing of line but after the line number calculation.
+%    \begin{macrocode}
+\newif\ifinserthangingsymbol
+\newcommand{\inserthangingsymbol}{%
+\ifinserthangingsymbol%
+	\ifinstanza%
+		\hfill\hangingsymbol%
+	\fi%
+\fi%
+}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
index bae3e9fb942..4017277191d 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
@@ -50,7 +50,7 @@
 %
 % \fi
 %
-% \CheckSum{4813}
+% \CheckSum{4815}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -60,7 +60,6 @@
 %   \SpecialItIndex{#1}\@esphack\ignorespaces}
 % \newcommand*{\SpecialItIndex}[1]{\@bsphack
 %   \index{#1\actualchar{\protect\ttfamily#1}\encapchar usage}\@esphack}
-%     
 % \DoNotIndex{\@,\@@par,\@beginparpenalty,\@empty}
 % \DoNotIndex{\@flushglue,\@input}
 % \DoNotIndex{\@makefnmark,\@makeother,\@maketitle}
@@ -133,6 +132,7 @@
 % \def\fileversion{v0.9.3}\def\filedate{2011/11/18}
 % \def\fileversion{v0.10}\def\filedate{2012/04/04}
 % \def\fileversion{v0.11}\def\filedate{2012/06/11}
+% \def\fileversion{v0.12}\def\filedate{2012/08/03}
 % \changes{v0.1}{2004/12/10}{First public release}
 % \changes{v0.2}{2005/01/01}{Fix babel problems}
 % \changes{v0.3}{2005/03/24}{Reorganize for ledarab}
@@ -706,7 +706,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledpar}[2012/06/11 v0.11 ledmac extension for parallel texts]
+\ProvidesPackage{ledpar}[2012/08/03 v0.12 ledmac extension for parallel texts]
 
 %    \end{macrocode}
 %  With the option `shiftedverses' a long verse one the left side (or in the right side) don't make a blank on the corresponding verse, but the blank is put on the bottom of the page. Consequently, the verses on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -2503,6 +2503,7 @@
                            to\baselineskip}% 
   \unvbox\one@line \global\setbox\one@line=\lastbox 
   \getline@numL
+\ifnum\@lock>\@ne\inserthangingsymboltrue\else\inserthangingsymbolfalse\fi
   \setbox\l@dleftbox
   \hb@xt@ \Lcolwidth{%
   	\affixpstart@numL
@@ -2514,7 +2515,6 @@
     {\ledllfill\hb@xt@ \wd\one@line{\inserthangingsymbolL\new@line\l@dunhbox@line{\one@line}}\correcthangingL\ledrlfill\l@drd@ta%
      \l@drsn@te
   }}%
-  \prevline@num=\line@num%
   \add@penaltiesL
   \global\advance\@donereallinesL\@ne
   \global\advance\@donetotallinesL\@ne
@@ -2555,6 +2555,7 @@
                            to\baselineskip}% 
   \unvbox\one@lineR \global\setbox\one@lineR=\lastbox 
   \getline@numR
+\ifnum\@lockR>\@ne\inserthangingsymbolRtrue\else\inserthangingsymbolRfalse\fi
   \setbox\l@drightbox
   \hb@xt@ \Rcolwidth{%
   	\affixpstart@numR
@@ -2566,7 +2567,6 @@
     {\correcthangingR\ledllfill\hb@xt@ \wd\one@lineR{\inserthangingsymbolR\new@lineR\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
      \l@drsn@te
   }}%
-  \prevline@numR=\line@numR%
   \add@penaltiesR
   \global\advance\@donereallinesR\@ne
   \global\advance\@donetotallinesR\@ne
@@ -3574,28 +3574,51 @@
 
 % \section{Verse}
 %\changes{v0.11}{2012/06/11}{New management of hangingsymbol insertion, preventing undesirable insertions.}
-% Like in ledmac, the insertion of hangingsymbol is base on a control of the change of line's numbers. But we need different macros for left and right sides.
-% \begin{macro}{\prevline@numR}
+%\changes{v0.12}{2012/08/03}{New new management of hangingsymbol insertion, preventing undesirable insertions.}
+% Like in ledmac, the insertion of hangingsymbol is base on \cs{ifinserthangingsymbol}, and, for the right side, on \cs{ifinserthangingsymbolR}.
 % \begin{macro}{\inserthangingsymbolL}
 % \begin{macro}{\inserthangingsymbolR}
 %    \begin{macrocode}
-\newcount\prevline@numR
-\newcommand{\inserthangingsymbolL}{\ifinstanzaL\ifnum\line@num=\prevline@num\hfill\hangingsymbol\fi\fi}
-\newcommand{\inserthangingsymbolR}{\ifinstanzaR\ifnum\line@numR=\prevline@numR\hfill\hangingsymbol\fi\fi}
+\newif\ifinserthangingsymbolR
+\newcommand{\inserthangingsymbolL}{%
+\ifinserthangingsymbol%
+	\ifinstanzaL%
+		\hfill\hangingsymbol%
+	\fi%
+\fi}
+\newcommand{\inserthangingsymbolR}{%
+\ifinserthangingsymbolR%
+	\ifinstanzaR%
+		\hfill\hangingsymbol%
+	\fi%
+\fi}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
-% \end{macro}
 %\changes{v0.11}{2012/06/11}{Prevent shift of column separator when a verse is hanged}
 % When a verse is hanged, the column separator is shifted. To prevent it, the \cs{do@lineL} and \cs{do@lineR} commands call \cs{correcthangingL} and \cs{correcthangingR} commands. These commands insert horizontal skip which length is equal to the hang indent.
 % \begin{macro}{\correcthangingL}
 % \begin{macro}{\correcthangingR}
 %    \begin{macrocode}
-\newcommand{\correcthangingL}{\ifl@dpaging\else\ifinstanzaL\ifnum\line@num=\prevline@num\hskip \@ifundefined{sza@0@}{0}{\expandafter%
-            \noexpand\csname sza@0@\endcsname}\stanzaindentbase\fi\fi\fi}
+\newcommand{\correcthangingL}{%
+\ifl@dpaging\else%
+	\ifinstanzaL%
+		\ifinserthangingsymbol%
+			\hskip \@ifundefined{sza@0@}{0}{\expandafter%
+           		\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
+		\fi%
+	\fi%
+\fi}
 
-\newcommand{\correcthangingR}{\ifl@dpaging\else\ifinstanzaR\ifnum\line@numR=\prevline@numR\hskip \@ifundefined{sza@0@}{0}{\expandafter%
-            \noexpand\csname sza@0@\endcsname}\stanzaindentbase\fi\fi\fi}
+\newcommand{\correcthangingR}{%
+\ifl@dpaging\else%
+	\ifinstanzaR%
+		\ifinserthangingsymbolR%
+			\hskip \@ifundefined{sza@0@}{0}{\expandafter%
+           		\noexpand\csname sza@0@\endcsname}\stanzaindentbase%
+		\fi%
+	\fi%
+\fi}
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
index a303b951ab0..1afbb55234b 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
@@ -23,7 +23,7 @@
 %%   This work consists of the files listed in the README file.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2012/06/21 v0.16 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2012/08/03 v0.17 LaTeX port of EDMAC]
 
 \newif\ifledfinal
 \DeclareOption{final}{\ledfinaltrue}
@@ -833,16 +833,18 @@
    \global\setbox\one@line=\vsplit\raw@text to\baselineskip}%
   \unvbox\one@line \global\setbox\one@line=\lastbox
   \getline@num
+  \ifnum\@lock>\@ne
+    \inserthangingsymboltrue
+  \else
+    \inserthangingsymbolfalse
+  \fi
   \affixline@num
   \affixpstart@num
   \hb@xt@ \linewidth{\inserthangingsymbol\l@dld@ta\add@inserts\affixside@note
     \l@dlsn@te
     {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta%
     \l@drsn@te
-  }}%
-  \prevline@num=\line@num%
-  \add@penalties}
-
+  }}}%
 \newcommand*{\do@linehook}{}
 \newcommand*{\l@demptyd@ta}{%
   \gdef\l@dld@ta{}%
@@ -2685,8 +2687,14 @@
 \newcommand*{\hangingsymbol}{}
 \newif\ifinstanza
 \instanzafalse
-\newcount\prevline@num
-\newcommand{\inserthangingsymbol}{\ifinstanza\ifnum\line@num=\prevline@num\hfill\hangingsymbol\fi\fi}
+\newif\ifinserthangingsymbol
+\newcommand{\inserthangingsymbol}{%
+\ifinserthangingsymbol%
+\ifinstanza%
+\hfill\hangingsymbol%
+\fi%
+\fi%
+}
 \newcommand*{\ampersand}{\char`\&}
 
   \chardef\body=\catcode`\@
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
index 07645da57fe..ff1018f0e2d 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
@@ -24,7 +24,7 @@
 %% 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledpar}[2012/06/11 v0.11 ledmac extension for parallel texts]
+\ProvidesPackage{ledpar}[2012/08/03 v0.12 ledmac extension for parallel texts]
 
 \newif\ifshiftedverses
 \shiftedversesfalse
@@ -907,6 +907,7 @@
                            to\baselineskip}%
   \unvbox\one@line \global\setbox\one@line=\lastbox
   \getline@numL
+\ifnum\@lock>\@ne\inserthangingsymboltrue\else\inserthangingsymbolfalse\fi
   \setbox\l@dleftbox
   \hb@xt@ \Lcolwidth{%
    \affixpstart@numL
@@ -918,7 +919,6 @@
     {\ledllfill\hb@xt@ \wd\one@line{\inserthangingsymbolL\new@line\l@dunhbox@line{\one@line}}\correcthangingL\ledrlfill\l@drd@ta%
      \l@drsn@te
   }}%
-  \prevline@num=\line@num%
   \add@penaltiesL
   \global\advance\@donereallinesL\@ne
   \global\advance\@donetotallinesL\@ne
@@ -941,6 +941,7 @@
                            to\baselineskip}%
   \unvbox\one@lineR \global\setbox\one@lineR=\lastbox
   \getline@numR
+\ifnum\@lockR>\@ne\inserthangingsymbolRtrue\else\inserthangingsymbolRfalse\fi
   \setbox\l@drightbox
   \hb@xt@ \Rcolwidth{%
    \affixpstart@numR
@@ -952,7 +953,6 @@
     {\correcthangingR\ledllfill\hb@xt@ \wd\one@lineR{\inserthangingsymbolR\new@lineR\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
      \l@drsn@te
   }}%
-  \prevline@numR=\line@numR%
   \add@penaltiesR
   \global\advance\@donereallinesR\@ne
   \global\advance\@donetotallinesR\@ne
@@ -1592,14 +1592,38 @@
   \fi\ignorespaces}
 
 
-\newcount\prevline@numR
-\newcommand{\inserthangingsymbolL}{\ifinstanzaL\ifnum\line@num=\prevline@num\hfill\hangingsymbol\fi\fi}
-\newcommand{\inserthangingsymbolR}{\ifinstanzaR\ifnum\line@numR=\prevline@numR\hfill\hangingsymbol\fi\fi}
-\newcommand{\correcthangingL}{\ifl@dpaging\else\ifinstanzaL\ifnum\line@num=\prevline@num\hskip \@ifundefined{sza@0@}{0}{\expandafter%
-            \noexpand\csname sza@0@\endcsname}\stanzaindentbase\fi\fi\fi}
+\newif\ifinserthangingsymbolR
+\newcommand{\inserthangingsymbolL}{%
+\ifinserthangingsymbol%
+\ifinstanzaL%
+\hfill\hangingsymbol%
+\fi%
+\fi}
+\newcommand{\inserthangingsymbolR}{%
+\ifinserthangingsymbolR%
+\ifinstanzaR%
+\hfill\hangingsymbol%
+\fi%
+\fi}
+\newcommand{\correcthangingL}{%
+\ifl@dpaging\else%
+\ifinstanzaL%
+\ifinserthangingsymbol%
+\hskip \@ifundefined{sza@0@}{0}{\expandafter%
+            \noexpand\csname sza@0@\endcsname}\stanzaindentbase%
+\fi%
+\fi%
+\fi}
 
-\newcommand{\correcthangingR}{\ifl@dpaging\else\ifinstanzaR\ifnum\line@numR=\prevline@numR\hskip \@ifundefined{sza@0@}{0}{\expandafter%
-            \noexpand\csname sza@0@\endcsname}\stanzaindentbase\fi\fi\fi}
+\newcommand{\correcthangingR}{%
+\ifl@dpaging\else%
+\ifinstanzaR%
+\ifinserthangingsymbolR%
+\hskip \@ifundefined{sza@0@}{0}{\expandafter%
+            \noexpand\csname sza@0@\endcsname}\stanzaindentbase%
+\fi%
+\fi%
+\fi}
   \chardef\next=\catcode`\&
   \catcode`\&=\active