eledmac (16aug13)

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

7 files changed, 105 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/latex/eledmac/Makefile b/Master/texmf-dist/doc/latex/eledmac/Makefile
index 091bf0cc0fa..4f28f1e0134 100644
--- a/Master/texmf-dist/doc/latex/eledmac/Makefile
+++ b/Master/texmf-dist/doc/latex/eledmac/Makefile
@@ -28,8 +28,11 @@ doc: *.pdf
 
 
 dist: $(PACKAGE)
+	rm -rf eledmac
+	mkdir eledmac
+	cp $(PACKAGE) eledmac
 	@$(RM) ../eledmac.zip
-	zip ../eledmac.zip $(PACKAGE)
+	zip -r ../eledmac.zip eledmac
 	
 
 clean:
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 80bcdcad635..c8cb0bcce56 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 af82d63326e..4615aaad29f 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 0d5cac55cc4..976417e4355 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{8406}
+% \CheckSum{8413}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -283,7 +283,7 @@
 % In October 2012, Maïeul Rouquette released the \emph{eledform} package\footnote{\url{http://www.ctan.org/eledform}.}. 
 % Based on eledmac, this package provides tools for creating a formal description (formalism) of textual variants.
 %
-% 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.
+% 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.
 %
 % You can subscribe to the eledmac mail list in:\\ \url{https://lists.berlios.de/pipermail/ledmac-users/}
 % \end{abstract}
@@ -1558,10 +1558,11 @@
 % two units, with 3 units of hanging indentation in case a stanza line is too
 % long to fit on one print line. 
 %
+% \subsection{Repeating stanza indents}
 %\changes{v0.13}{2011/11/08}{New stanzaindentsrepetition counter to repeat stanza indents every \emph{n} verses.}
-% Since version 0.13, if the indentation is repeated every \emph{n} verses of the stanza, you can define only the \emph{n} first indentations, and say they are repeated, defining the value of  the \verb+stanzaindentsrepetition+ counter  at \emph{n}. For example:
+% \label{stanzaindentsrepetition}Since version 0.13, if the indentation is repeated every \emph{n} verses of the stanza, you can define only the \emph{n} first indentations, and say they are repeated, defining the value of  the \verb+stanzaindentsrepetition+ counter  at \emph{n}. For example:
 %\begin{verbatim}
-%\setstanzaindents{0,1,0}
+%\setstanzaindents{5,1,0}
 %\setcounter{stanzaindentsrepetition}{2}
 % \end{verbatim}
 %
@@ -1570,14 +1571,22 @@
 %\setstanzaindents{0,1,0,1,0,1,0,1,0,1,0}
 % \end{verbatim}
 %
+% \textbf{Be careful: the feature change in eledmac 1.5.1. See \ref{change151} p.~\pageref{change151}.}
+%
 %If you don't use the  \verb+stanzaindentsrepetition+ counter, make sure you have at least one more numerical
 % entry in \verb+\setstanzavalues+ than the number of lines in the stanza.
+%
+% If you want to disable again this feature, just put the counter to 0: 
+% \begin{verbatim}
+% \setcounter{stanzaindentsrepetition}{0}
+% \end{verbatim}
 % The macros make no restriction on the number of lines in a stanza.
 % Stanza indentation values (and penalty values) obey \TeX's grouping
 % conventions, so if one stanza among several has a different structure,
 % its indentations (penalties) may be set within a group; the prior values
 % will be restored when the group ends.
 %
+% % \subsection{Stanza breaking}
 % \DescribeMacro{\setstanzapenalties}
 % When the stanzas run over several pages, often it is
 % desirable that page breaks should arise between certain lines in the
@@ -1606,7 +1615,7 @@
 % desirability of a page break at a given line. There is a subtle interaction
 % between penalties and \textit{glue}, so it may take some adjustment of skips
 % and penalties to achieve the best results.
-%
+% \subsection{Various tools}
 % \DescribeMacro{\ampersand}
 % If you need to print an \& symbol in a stanza, use the \verb?\ampersand? 
 % macro, not \verb?\&? which will end the stanza.
@@ -1944,10 +1953,10 @@
 % The appearance of the mark in the text is controlled by \cs{bodyfootmarkA}
 % which is defined as: \\
 % \verb?\newcommand*{\bodyfootmarkA}{%? \\
-% \verb?  \hbox{\textsuperscript{\normalfont\thefootnoteA}}}? \\
+% \verb?  \hbox{\textsuperscript{\normalfont\@nameuse{@thefnmarkA}}}}? \\
 % The command \cs{footfootmarkA} controls the appearance of the mark at the
 % start of the footnote text. It is defined as: \\
-% \verb?\newcommand*{\footfootmarkA}{\textsuperscript{\thefootnoteA}}?
+% \verb?\newcommand*{\footfootmarkA}{\textsuperscript{\@nameuse{@thefnmarkA}}}?
 %
 %    There are similar command triples for the other series.
 %
@@ -2677,7 +2686,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/07/11 v1.5 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/08/16 v1.5.1 LaTeX port of EDMAC]
 %    \end{macrocode}
 %
 %    Generally, these are the modifications to the original.
@@ -6926,7 +6935,7 @@
 % \end{macro}
 %
 % \begin{macro}{\normalfootnoterule}
-% \cs{norrmalfootnoterule} is
+% \cs{normalfootnoterule} is
 % a standard footnote-rule macro, for use by a \verb"footstart"
 % macro: just the same as the \PlainTeX\ footnote rule.
 %    \begin{macrocode}
@@ -7920,6 +7929,7 @@
 % \end{macro}
 %
 % \begin{macro}{\normalvfootnoteX}
+% \changes{v1.5.1}{2013/08/16}{Fix bug with normal familiar footnotes when mixing RTL and LTR text.}
 % \cs{normalvfootnoteX}\marg{series}\marg{text} does the \cs{insert} for
 % the \meta{series} and calls the series' \cs{footfmt...} to format the
 % \meta{text}.
@@ -7930,7 +7940,7 @@
     \csuse{notefontsizeX@#1}
     \footsplitskips
     \spaceskip=\z@skip \xspaceskip=\z@skip
-    \@nameuse{footfmt#1}{#1}{#2}\egroup}
+    \csuse{\csuse{footnote@dir}}\if@RTL\else\noindent\leavevmode\fi\@nameuse{footfmt#1}{#1}{#2}\egroup}
 
 %    \end{macrocode}
 % \end{macro}
@@ -10924,6 +10934,7 @@
 % the user one less thing to worry about (misspelling the first argument).
 % Since version 0.13, the \verb+stanzaindentsrepetition+ counter  can be used when the indentation is repeated every n verses. The \cs{managestanza@modulo} is a command which modifies the counter stanza@modulo. The command adds 1 to stanza@modulo, but if stanza@modulo is equal to the stanzaindentsrepetition counter, the command restarts it.
 %\changes{v0.13}{2011/11/08}{New stanzaindentsrepetition counter to repeat stanza indents every \emph{n} verses.}
+% % \changes{v1.5.1}{2013/08/16}{Correct stanzaindentsrepetition counter}
 %    \begin{macrocode}
 \newcommand*{\setstanzaindents}[1]{\setstanzavalues{sza}{#1}}
 \newcommand*{\setstanzapenalties}[1]{\setstanzavalues{szp}{#1}}
@@ -10962,9 +10973,9 @@
         \parindent=\csname sza@\number\stanza@count
                  @\endcsname\stanzaindentbase
     \else
-        \managestanza@modulo
         \parindent=\csname sza@\number\stanza@modulo
                  @\endcsname\stanzaindentbase
+        \managestanza@modulo
     \fi
     \pstart\stanza@hang\ignorespaces}
 \xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock
@@ -12382,7 +12393,8 @@
 % \appendix
 % \let\oldthesection\thesection
 % \renewcommand{\thesection}{Appendix \oldthesection}
-% \section{Migration from ledmac to eledmac}\label{migration}
+% \section{Some things to do when changing version}
+% \subsection{Migration from ledmac to eledmac}\label{migration}
 % In eledmac, some changes were made in the code to allow for easy customization.
 % This can cause problems for people who have made their own customizations. The next sections explain how to correct this.
 %
@@ -12402,6 +12414,32 @@
 % If you dont' do that, you will see a spurious \verb+[X]+, where X is series letter.
 %
 % If you used a \cs{protect} command inside a \cs{footnote} command inside a numbered section, you must change the \cs{protect} to \cs{noexpand}. If you don't, the command after the \cs{protect} won't be displayed.
+% \subsection{Migration to eledmac 1.5.1}\label{change151}
+% The version 1.5.1 corrects bug with \verb+stanzaindentsrepetition+ (cf. p.~\pageref{stanzaindentsrepetition}). This bug had two consequences:
+% \begin{enumerate}
+% \item \verb+stanzaindentsrepetition+ did'nt work when its value was greater than 2.
+% \item \verb+stanzaindentsrepetition+ worked wrong when its value was equal to 2.
+% \end{enumerate}
+% 
+% So, if you used \verb+stanzaindentsrepetition+ with value equal to 2, you must change your \cs{setstanzaindents}. Explanation:
+% \begin{verbatim}
+% \setcounter{stanzaindentsrepetition}{2}
+% \setstanzaindents{5,1,0}
+% \end{verbatim}
+% This code, in version older than 1.5.1, made that the first verse had an indent to 0, the secund verse to 1, the third verse to 0, the fourth verse to 1 etc.
+%
+% But it should have do that the first verse had an indent to 1, the secund verse to 0, the third verse to 1, the fourth verse to 0 etc.
+%
+% So the version 1.5.1 corrected this bug. If you want to keep the older presentation, you must change:
+% \begin{verbatim}
+% \setcounter{stanzaindentsrepetition}{2}
+% \setstanzaindents{5,1,0}
+% \end{verbatim}
+% by:
+% \begin{verbatim}
+% \setcounter{stanzaindentsrepetition}{2}
+% \setstanzaindents{5,0,1}
+% \end{verbatim} 
 % \clearpage
 %
 % \bibliographystyle{alpha}
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index ecbe799354f..7b0549f374b 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{3964}
+% \CheckSum{3987}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -209,7 +209,7 @@
 %
 % 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.
+% 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.
 %
 % You can subscribe to the eledmac email list in:\\ \url{https://lists.berlios.de/pipermail/ledmac-users/}
 % \end{abstract}
@@ -719,7 +719,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2013/07/11 v1.4 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2013/08/16 v1.4.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.
@@ -3420,15 +3420,28 @@
 % \begin{macro}{\normalbfnoteX}
 % \changes{v0.3}{2005/02/04}{Removed extraneous spaces from \cs{normalbfnoteX}}
 % \changes{v1.3.5}{2013/07/10}{Allows one to redefine \cs{thefootnoteX} with \c{alph} when some packages are loaded.}
+% \changes{v1.4.1}{2013/08/16}{Fix bug with normal familiar footnotes when mixing RTL and LTR text.}
 %    \begin{macrocode}
 \renewcommand{\normalbfnoteX}[2]{%
   \ifnumberedpar@
     \ifledRcol%
+      \ifluatex
+          \footnotelang@lua[R]%
+      \fi
+      \@ifundefined{xpg@main@language}%if polyglossia
+		{}%
+		{\footnotelang@poly[R]}%      
       \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
       \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@listR
        \global\advance\insert@countR \@ne%
     \else%
+      \ifluatex
+          \footnotelang@lua%
+      \fi
+      \@ifundefined{xpg@main@language}%if polyglossia
+		{}%
+		{\footnotelang@poly}%    
       \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
       \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@list
@@ -3504,6 +3517,7 @@
 %
 %
 % \begin{environment}{astanza}
+% \changes{v1.4.1}{2013/08/16}{Enable the  use of stanzaindentsrepetition within astanza environnment.}
 % This is roughly an environmental form of \cs{stanza}, which treats
 % its stanza-like contents as a single chunk.
 %
@@ -3511,7 +3525,7 @@
 \newenvironment{astanza}{%
   \startstanzahook
   \catcode`\&\active
-  \global\stanza@count\@ne
+  \global\stanza@count\@ne\stanza@modulo\@ne
   \ifnum\usenamecount{sza@0@}=\z@
     \let\stanza@hang\relax
     \let\endlock\relax
@@ -3543,7 +3557,14 @@
 % the paragraph style --- each line is treated as a paragraph.
 %    \begin{macrocode}
 \newcommand*{\@astanza@line}{%
-  \parindent=\csname sza@\number\stanza@count @\endcsname\stanzaindentbase
+  \ifnum\value{stanzaindentsrepetition}=0
+      \parindent=\csname sza@\number\stanza@count
+               @\endcsname\stanzaindentbase
+  \else
+      \parindent=\csname sza@\number\stanza@modulo
+               @\endcsname\stanzaindentbase
+      \managestanza@modulo
+  \fi
   \par
   \stanza@hang%\mbox{}%
   \ignorespaces}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 96cc735df4d..534aebd96fc 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -24,7 +24,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/07/11 v1.5 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/08/16 v1.5.1 LaTeX port of EDMAC]
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -1843,7 +1843,7 @@
     \csuse{notefontsizeX@#1}
     \footsplitskips
     \spaceskip=\z@skip \xspaceskip=\z@skip
-    \@nameuse{footfmt#1}{#1}{#2}\egroup}
+    \csuse{\csuse{footnote@dir}}\if@RTL\else\noindent\leavevmode\fi\@nameuse{footfmt#1}{#1}{#2}\egroup}
 
 \newcommand*{\mpnormalvfootnoteX}[2]{%
   \global\setbox\@nameuse{mpfootins#1}\vbox{%
@@ -3241,9 +3241,9 @@
         \parindent=\csname sza@\number\stanza@count
                  @\endcsname\stanzaindentbase
     \else
-        \managestanza@modulo
         \parindent=\csname sza@\number\stanza@modulo
                  @\endcsname\stanzaindentbase
+        \managestanza@modulo
     \fi
     \pstart\stanza@hang\ignorespaces}
 \xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index 61a56ae8df0..a421a04722e 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}[2013/07/11 v1.4 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2013/08/16 v1.4.1 eledmac extension for parallel texts]
 
 \newif\ifshiftedpstarts
 \let\shiftedversestrue\shiftedpstartstrue
@@ -1479,11 +1479,23 @@
 \renewcommand{\normalbfnoteX}[2]{%
   \ifnumberedpar@
     \ifledRcol%
+      \ifluatex
+          \footnotelang@lua[R]%
+      \fi
+      \@ifundefined{xpg@main@language}%if polyglossia
+{}%
+{\footnotelang@poly[R]}%
       \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
       \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@listR
        \global\advance\insert@countR \@ne%
     \else%
+      \ifluatex
+          \footnotelang@lua%
+      \fi
+      \@ifundefined{xpg@main@language}%if polyglossia
+{}%
+{\footnotelang@poly}%
       \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
       \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@list
@@ -1530,7 +1542,7 @@
 \newenvironment{astanza}{%
   \startstanzahook
   \catcode`\&\active
-  \global\stanza@count\@ne
+  \global\stanza@count\@ne\stanza@modulo\@ne
   \ifnum\usenamecount{sza@0@}=\z@
     \let\stanza@hang\relax
     \let\endlock\relax
@@ -1555,7 +1567,14 @@
 }{}
 
 \newcommand*{\@astanza@line}{%
-  \parindent=\csname sza@\number\stanza@count @\endcsname\stanzaindentbase
+  \ifnum\value{stanzaindentsrepetition}=0
+      \parindent=\csname sza@\number\stanza@count
+               @\endcsname\stanzaindentbase
+  \else
+      \parindent=\csname sza@\number\stanza@modulo
+               @\endcsname\stanzaindentbase
+      \managestanza@modulo
+  \fi
   \par
   \stanza@hang%\mbox{}%
   \ignorespaces}