eledmac (8aug14)

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

2 files changed, 32 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 464685a4b0f..92ece9ba6e0 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -30,7 +30,7 @@
               hyperindex=false
              ]{hyperref}
 \usepackage[utf8]{inputenc}
-\providecommand{\phantomsection}{} % just in case hyperref is not used
+\usepackage[english]{babel}
 \usepackage{graphicx,eledmac}
 \makeatletter
   \@mparswitchfalse
@@ -51,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{9904}
+% \CheckSum{9906}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -293,11 +293,13 @@
 % also provides for index entries keyed to both page and line numbers.
 % Multiple series of the familiar numbered footnotes are also available.
 %
-%    Other LaTeX packages for critical editions include EDNOTES, and
+%    Other \LaTeX\ packages for critical editions include EDNOTES, and
 % \Lpack{poemscol} for poetical works.
 % 
-%
-% To report bugs, please go to ledmac's GitHub page and click "New Issue": \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users. You can report bugs in English or in French.
+% \Lpack{eledmac} provides many tools and options. Normally, they are all documented in this file.
+% However, to help people, a ``\href{examples/.}{examples}'' folder is provided, with example for some needs, but not for all.
+% 
+% To report bugs, please go to ledmac's GitHub page and click ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users. You can report bugs in English or in French (better).
 %
 % You can subscribe to the eledmac mail list in:\\ \url{http://geekographie.maieul.net/146}
 % \end{abstract}
@@ -2639,8 +2641,8 @@
 %
 % Peter Wilson has developed the Ledpar package
 % as an extension to \Eledmac{} specifically for parallel typesetting
-% of critical texts. This also cooperates with the \Lpack{babel}
-% package for typesetting in multiple languages. The package has been called \emph{eledpar} since September 2012.
+% of critical texts. This also cooperates with the \Lpack{babel} / \Lpack{polyglossia}
+% packages for typesetting in multiple languages. The package has been called \emph{eledpar} since September 2012.
 
 % He also developed 
 % the \Lpack{ledarab} package for 
@@ -2830,7 +2832,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/08/06 v1.12.1 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2014/08/07 v1.12.2 LaTeX port of EDMAC]%
 %    \end{macrocode}
 %
 %    Generally, these are the modifications to the original.
@@ -5753,6 +5755,7 @@
 % The \cs{do@line} macro is called by \cs{pend} to
 % do all the processing for a single line of text.
 % \changes{v1.6.1}{2013/10/27}{Move the call to \cs{inserthangingsymbol} to allow use \cs{hfill} inside.}
+% \changes{v1.12.2}{2014/08/07}{Fix a bug with critical notes a the begining of a page, added by v12.0.0.}
 %    \begin{macrocode}
  \newcommand*{\l@dunhbox@line}[1]{\unhbox #1}
  \newcommand*{\do@line}{%
@@ -5771,7 +5774,6 @@
   \fi
   \check@pb@in@verse
   \affixline@num
-  \add@inserts\affixside@note
 %    \end{macrocode}
 % \changes{v1.12.0}{2014/08/05}{\cs{do@line} is splitted in more little commands.}
 % Depending wether a sectioning command is called at this pstart or not 
@@ -5791,7 +5793,8 @@
 % \cs{print@line} is for normal line, i. e line without sectioning command.
 \def\print@line{
     \affixpstart@num%
-    \hb@xt@ \linewidth{\do@insidelinehook\l@dld@ta
+    \hb@xt@ \linewidth{\do@insidelinehook\l@dld@ta%
+        \add@inserts\affixside@note%
         \l@dlsn@te
         {\ledllfill\hb@xt@ \wd\one@line{\new@line\inserthangingsymbol \l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta%
         \l@drsn@te
@@ -5805,6 +5808,7 @@
 % Because of this printing, a vertical spacing correction is added.
 %    \begin{macrocode}
 \def\print@eledsection{%
+    \add@inserts\affixside@note%
     \numdef{\temp@}{\l@dnumpstartsL-1}%
     \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
     \@eled@sectioningtrue%
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 342f132f4a0..9d3458ac6b4 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -30,7 +30,7 @@
               hyperindex=false
              ]{hyperref}
 \usepackage[utf8]{inputenc}
-\providecommand{\phantomsection}{} % just in case hyperref is not used
+\usepackage[english]{babel}
 \usepackage{graphicx,eledmac,eledpar}
 \makeatletter
   \@mparswitchfalse
@@ -218,7 +218,10 @@
 %
 % Note that before September 2012, eledpar was called ledpar. The changes from ledmac/ledpar to eledmac/eledpar is explained in ledmac documentation.
 %
-% To report bugs, please go to ledmac's GitHub page and click ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users. You can report bug in English or in French.
+% \Lpack{eledpar} provides many tools and options. Normally, they are all documented in this file.
+% However, to help people, a ``\href{examples/.}{examples}'' folder is provided, with example for some needs, but not for all.
+%
+% To report bugs, please go to ledmac's GitHub page and click ``New Issue'': \url{https://github.com/maieul/ledmac/issues/}. You must open an account with github.com to access my page (maieul/ledmac).  GitHub accounts are free for open-source users. You can report bug in English or in French (better).
 %
 % You can subscribe to the eledmac email list in:\\ \url{http://geekographie.maieul.net/146}
 % \end{abstract}
@@ -847,7 +850,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2014/08/05 v1.8.0 eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2014/08/07 v1.8.1 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.
@@ -2742,6 +2745,7 @@
 % \changes{v0.11}{2012/06/11}{Change \cs{do@lineL} and \cs{do@lineR} to allow line numbering by pstart (like in eledmac 0.15).}
 % \changes{v1.8.0}{2014/08/05}{Change \cs{do@lineR} and \cs{do@lineR} to allow new sectioning commands.}
 % \begin{macro}{\do@lineL}
+% \changes{v1.8.1}{2014/08/07}{Fix a bug with critical notes a the begining of a page, added by v1.8.0 (?).}
 % The \cs{do@lineL} macro is called to 
 % do all the processing for a single line of left text.
 % \changes{v0.3}{2005/02/10}{Added \cs{do@lineLhook} to \cs{do@lineL}}
@@ -2768,8 +2772,6 @@
   \setbox\l@dleftbox
   \hb@xt@ \Lcolwidth{%
     \affixline@num
-    \add@inserts
-    \affixside@note
     \xifinlist{\the\l@dpscL}{\eled@sections@@}%
       {}%
       {\print@lineL}}%
@@ -2790,8 +2792,9 @@
 %    \begin{macrocode}
 \def\print@lineL{%
     \affixpstart@numL%
-    \l@dld@ta %space kept for backwar compatibility
-    \l@dlsn@te %space kept for backwar compatibility
+    \l@dld@ta %space kept for backward compatibility
+    \add@inserts\affixside@note%
+    \l@dlsn@te %space kept for backward compatibility
     {\ledllfill\hb@xt@ \wd\one@line{\do@insidelineLhook\inserthangingsymbolL\new@lineL\l@dunhbox@line{\one@line}}\correcthangingL\ledrlfill\l@drd@ta%
      \l@drsn@te}}
 %    \end{macrocode}
@@ -2800,6 +2803,7 @@
 % \cs{print@eledsectionL} is for line with macro code.
 %    \begin{macrocode}
 \def\print@eledsectionL{%
+    \add@inserts\affixside@note%
     \addtocounter{pstartL}{-1}%
     \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
     \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
@@ -2842,6 +2846,7 @@
 % The \cs{do@lineR} macro is called to 
 % do all the processing for a single line of right text.
 % \changes{v0.3}{2005/02/10}{Changed \cs{do@lineR} similarly to \cs{do@lineL}}
+% \changes{v1.8.1}{2014/08/07}{Fix a bug with critical notes a the begining of a page, added by v1.8.0 (?).}
 %    \begin{macrocode}
 \newcommand*{\do@lineR}{%
   \ledRcol@true%
@@ -2864,8 +2869,6 @@
   \setbox\l@drightbox
   \hb@xt@ \Rcolwidth{%
     \affixline@numR%
-    \add@insertsR
-    \affixside@noteR
     \xifinlist{\the\l@dpscR}{\eled@sectionsR@@}%
      {}%
      {\print@lineR}%
@@ -2888,13 +2891,17 @@
 % \begin{macro}{\print@eledsectionR}{}
 \def\print@lineR{%
     \affixpstart@numR%
-    \l@dld@ta
-    \l@dlsn@te
+    \l@dld@ta  %space kept for backward compatibility
+    \add@insertsR%
+    \affixside@noteR%
+    \l@dlsn@te  %space kept for backward compatibility
 \correcthangingR\ledllfill\hb@xt@ \wd\one@lineR{\do@insidelineRhook\inserthangingsymbolR\new@lineR\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
      \l@drsn@te
   }
 
 \def\print@eledsectionR{%
+    \add@insertsR%
+    \affixside@noteR%
     \addtocounter{pstartR}{-1}%
     \initnumbering@sectcountR%
     \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}%