eledmac (21dec12)

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

5 files changed, 35 insertions, 32 deletions

diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 8a076485511..341a9745110 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
index c0e6bc8df1c..392677b85b4 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index a166e7ded57..f35e660474c 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -1237,9 +1237,8 @@
 % \DescribeMacro{\afternumberinfootnote}
 % With \cs{afternumberinfootnote}\oarg{s}\marg{l} you can add some space after the line number in a footnote. If the line number is not printed, the space is not either. The default value is 0.5~em.
 %
-%\DescribeMacro{\nonbreakableafternumber}.
-% \changes{v1.4.3}{2012/12/18}{Add \cs{nonbreakableafternumber}.}
-% By default, the space defined by \cs{afternumberinfootnote} is breakeable. With \cs{afternumberinfootnote}\oarg{s} it becomes non breakable. Use \cs{afternumberinfootnote}\oarg{s}\oarg{false} to cancel it (\verb|<s>| can be empty if you want to disable it for every series).
+%\DescribeMacro{\nonbreakableafternumber}\changes{v1.4.3}{2012/12/18}{Add \cs{nonbreakableafternumber}.}
+%By default, the space defined by \cs{afternumberinfootnote} is breakeable. With \cs{afternumberinfootnote}\oarg{s} it becomes non breakable. Use \cs{afternumberinfootnote}\oarg{s}\oarg{false} to cancel it (\verb|<s>| can be empty if you want to disable it for every series).
 %
 % \DescribeMacro{\beforesymlinenum} 
 % With \cs{beforesymlinenum}\oarg{s}\marg{l} you can add some space before the line symbol in a footnote. The default value is value set by \cs{beforenumberinfootnote}.
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 557b77b41c2..d7a312d24db 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -51,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{3932}
+% \CheckSum{3936}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -719,7 +719,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2012/12/11 v1.3.2 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/12/19 v1.3.3 eledmac extension for parallel texts]
 
 %    \end{macrocode}
 %  With the option `shiftedpstarts' a long pstart one the left side (or in the right side) don't make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -2096,27 +2096,27 @@
 % And similarly for \cs{edtext}.
 %    \begin{macrocode}
 \renewcommand{\edtext}[2]{\leavevmode
-  \begingroup
+  \begingroup%
     \renewcommand{\@tag}{\no@expands #1}%
-    \set@line
-    \ifledRcol \global\insert@countR \z@ 
-    \else      \global\insert@count \z@ \fi
-    \ignorespaces #2\relax
+    \set@line%
+    \ifledRcol \global\insert@countR \z@% 
+    \else      \global\insert@count \z@ \fi%
+    \ignorespaces #2\relax%
     \@ifundefined{xpg@main@language}{%if not polyglossia
        \flag@start}%
        {\if@RTL\flag@end\else\flag@start\fi% be careful on the direction of writing with polyglossia
        }%
-  \endgroup
+  \endgroup%
   \showlemma{#1}%
-  \ifx\end@lemmas\empty \else
-    \gl@p\end@lemmas\to\x@lemma
-    \x@lemma
-    \global\let\x@lemma=\relax
-  \fi
+  \ifx\end@lemmas\empty \else%
+    \gl@p\end@lemmas\to\x@lemma%
+    \x@lemma%
+    \global\let\x@lemma=\relax%
+  \fi%
   \@ifundefined{xpg@main@language}{%if not polyglossia
        \flag@end}%
        {\if@RTL\flag@start\else\flag@end\fi% be careful on the direction of writing with polyglossia
-       }
+       }%
 }
 
 %    \end{macrocode}
@@ -3291,12 +3291,14 @@
 % \begin{macro}{\l@dcsnote}
 % The `footnotes' for left, right, and moveable sidenotes. The whole 
 % scheme is reminiscent of the critical footnotes code.
+% \changes{v1.3.3}{2012/12/19}{Debug on the left notes of the right column.}
 %    \begin{macrocode}
 \renewcommand*{\l@dlsnote}[1]{%
   \ifnumberedpar@
     \ifledRcol%
       \xright@appenditem{\noexpand\vl@dlsnote{#1}}%
                          \to\inserts@listR
+      \global\advance\insert@countR \@ne%
     \else%
       \xright@appenditem{\noexpand\vl@dlsnote{#1}}%
                          \to\inserts@list
@@ -3382,10 +3384,11 @@
 % \verb?\l@dbfnote? adds the footnote to the insert list, and
 % \verb?\vl@dbfnote? calls the original \verb?\@footnotetext?.
 % \changes{v1.3.1}{2012/11/16}{Compatibility of standard footnotes with eledmac when theses footnotes contain any commands.}
+% \changes{v1.3.3}{2012/11/19}{Spurious space with footnote in right column.}
 %    \begin{macrocode}
 \renewcommand{\l@dbfnote}[1]{%
   \ifnumberedpar@
-  \gdef\@tag{#1}
+  \gdef\@tag{#1}%
     \ifledRcol%
       \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
                          \to\inserts@listR
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index aa272cd6cca..faac3e6056a 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
@@ -24,7 +24,7 @@
 %% 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2012/12/11 v1.3.2 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2012/12/19 v1.3.3 eledmac extension for parallel texts]
 
 \newif\ifshiftedpstarts
 \let\shiftedversestrue\shiftedpstartstrue
@@ -701,27 +701,27 @@
        }
   }
 \renewcommand{\edtext}[2]{\leavevmode
-  \begingroup
+  \begingroup%
     \renewcommand{\@tag}{\no@expands #1}%
-    \set@line
-    \ifledRcol \global\insert@countR \z@
-    \else      \global\insert@count \z@ \fi
-    \ignorespaces #2\relax
+    \set@line%
+    \ifledRcol \global\insert@countR \z@%
+    \else      \global\insert@count \z@ \fi%
+    \ignorespaces #2\relax%
     \@ifundefined{xpg@main@language}{%if not polyglossia
        \flag@start}%
        {\if@RTL\flag@end\else\flag@start\fi% be careful on the direction of writing with polyglossia
        }%
-  \endgroup
+  \endgroup%
   \showlemma{#1}%
-  \ifx\end@lemmas\empty \else
-    \gl@p\end@lemmas\to\x@lemma
-    \x@lemma
-    \global\let\x@lemma=\relax
-  \fi
+  \ifx\end@lemmas\empty \else%
+    \gl@p\end@lemmas\to\x@lemma%
+    \x@lemma%
+    \global\let\x@lemma=\relax%
+  \fi%
   \@ifundefined{xpg@main@language}{%if not polyglossia
        \flag@end}%
        {\if@RTL\flag@start\else\flag@end\fi% be careful on the direction of writing with polyglossia
-       }
+       }%
 }
 
 \renewcommand*{\set@line}{%
@@ -1388,6 +1388,7 @@
     \ifledRcol%
       \xright@appenditem{\noexpand\vl@dlsnote{#1}}%
                          \to\inserts@listR
+      \global\advance\insert@countR \@ne%
     \else%
       \xright@appenditem{\noexpand\vl@dlsnote{#1}}%
                          \to\inserts@list
@@ -1455,7 +1456,7 @@
 
 \renewcommand{\l@dbfnote}[1]{%
   \ifnumberedpar@
-  \gdef\@tag{#1}
+  \gdef\@tag{#1}%
     \ifledRcol%
       \xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
                          \to\inserts@listR