eledmac (12oct13)

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

4 files changed, 55 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 68e5dd55f74..2c66b4df2cc 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 eab7796ae30..3faef478d26 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 8969806f63d..059faf4d3a5 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{8437}
+% \CheckSum{8452}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -952,6 +952,7 @@
 % the numbering of that particular line to be skipped; that is, the line 
 % number is unchanged and no line number will be printed.
 %
+% If you want to use the feature in a stanza, you should look at the \cs{falseverse} macro (p.~\pageref{falseverse}).
 %
 % \section{The apparatus}
 % \subsection{Commands}
@@ -1213,7 +1214,7 @@
 % \changes{v1.1}{2012/09/25}{Add \cs{numberonlyfirstintwolines}}
 % Suppose you have a lemma on line~2 and a lemma between line~2 and line~3. 
 % With \cs{numberonlyfirstinline}, the second lemma is considered to be on the same line as the first lemma.
-% But if you add \cs{numberonlyfirstintwolines}\oarg{s}, the distinction is made.
+% But if  you use both \cs{numberonlyfirstinline}\oarg{s} and \cs{numberonlyfirstintwolines}\oarg{s}, the distinction is made.
 % Use \cs{numberonlyfirstintwolines}\oarg{s}\oarg{false} to cancel it (\verb|<s>| can be empty if you want to disable it for every series).
 %
 % \DescribeMacro{\symlinenum}
@@ -1533,6 +1534,7 @@
 % is ended by an ampersand (\&), and the stanza itself is ended
 % by putting \verb?\&? at the end of the last line.
 %
+% 
 % \DescribeMacro{\stanzaindentbase}
 % Lines within a stanza may be indented. The indents are integer multiples
 % of the length \verb?\stanzaindentbase?, whose default value is 20pt.
@@ -1615,6 +1617,28 @@
 % 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{False verse}
+% \label{falseverse}In some special cases, you want to add false verse after true verse. 
+% This false verse:
+% 	\begin{enumerate}
+% 		\item Won't be numbered.
+% 		\item Won't affect the indent of the next verse.
+% 	\end{enumerate}
+% It could be use, for example, to add some space between verse.
+% To add this type of false verse, you have to finish the previous verse with \cs{falseverse} (and not with \verb+&+).
+% For example:
+% \begin{verbatim}
+% 	True verse&
+% 	True verse\falseverse
+% 	\vspace{3ex}&
+% 	True verse&
+% 	True verse
+% \end{verbatim}
+% \subsection{Hanging symbol}
+%It's possible to insert a symbol on each line of verse's hanging, as in French typography for `['.  To insert in eledmac, redefine macro \DescribeMacro{\hangingsymbol}\cmd{\hangingsymbol} with this code:
+%\begin{verbatim}
+%\renewcommand{\hangingsymbol}{[\,}
+%\end{verbatim}
 % \subsection{Various tools}
 % \DescribeMacro{\ampersand}
 % If you need to print an \& symbol in a stanza, use the \verb?\ampersand? 
@@ -1653,11 +1677,6 @@
 % \stanza
 % \numberit First line, second stanza...
 % \end{verbatim}
-% \subsection{Hanging symbol}
-%It's possible to insert a symbol on each line of verse's hanging, as in French typography for `['.  To insert in eledmac, redefine macro \DescribeMacro{\hangingsymbol}\cmd{\hangingsymbol} with this code:
-%\begin{verbatim}
-%\renewcommand{\hangingsymbol}{[\,}
-%\end{verbatim}
 % \section{Grouping}
 %    In a \verb?minipage? environment LaTeX changes \verb?\footnote? numbering from
 % arabic to alphabetic and puts the footnotes at the end of the minipage.
@@ -2686,7 +2705,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/08/21 v1.5.2 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/10/09 v1.6.0 LaTeX port of EDMAC]
 %    \end{macrocode}
 %
 %    Generally, these are the modifications to the original.
@@ -11011,6 +11030,8 @@
 % \begin{macro}{\startstanzahook}
 % \begin{macro}{\endstanzaextra}
 % \begin{macro}{\stanza}
+% \begin{macro}{\falseverse}
+% \changes{v1.6.0}{2013/10/09}{Add \cs{falseverse} macro.}
 % Now we have the components of the \verb+\stanza+ macro,
 % which appears at the start of a group of lines. This macro
 % initializes the count and checks to see if hanging indentation
@@ -11021,9 +11042,12 @@
 % \verb+\endlock+. Here and above we have used \verb+\xdef+ to
 % make the stored macros take up a bit less space, but it also
 % makes them more obscure to the reader. Lines of the stanza are
-% delimited by ampersands \&. The last line of the stanza must
-% end with \verb+\&+. For convenience the macro
-% \verb+\endstanzaextra+ is incuded. The user may use this to add
+% delimited by ampersands \&. The macro \cs{falseverse} can be
+% use to add stanza not numbered and with no impact on the next indent. 
+% The last line of the stanza must
+% end with \verb+\&+. 
+% For convenience the macro
+% \verb+\endstanzaextra+ is included. The user may use this to add
 % vertical space or penalties between stanzas.
 %
 %
@@ -11042,9 +11066,15 @@
          \let\noexpand\endlock\relax\noexpand\else\interlinepenalty
          \@M\rightskip\z@ plus 1fil\relax\noexpand\fi\noexpand\ifnum
          \expandafter\noexpand\csname szp@0@\endcsname=\z@
-         \let\noexpand\sza@penalty\relax\noexpand\fi \def\noexpand&{%
-         \noexpand\endlock\noexpand\pend\noexpand\sza@penalty\global
-         \advance\stanza@count\@ne\noexpand\stanza@line}\def\noexpand
+         \let\noexpand\sza@penalty\relax\noexpand\fi% 
+   \def\noexpand\falseverse{%
+     \global\advance\stanza@modulo-\@ne%
+     \global\advance\stanza@count-\@ne%
+     \relax\noexpand&\leavevmode\skipnumbering}
+         \def\noexpand&{%
+         \noexpand\endlock\noexpand\pend\noexpand\sza@penalty\global%
+         \advance\stanza@count\@ne\noexpand\stanza@line}%
+         \def\noexpand%
          \&{\noexpand\endlock\noexpand\pend\endgroup\noexpand\instanzafalse\expandafter\endstanzaextra}%
          \noexpand\stanza@line}
 
@@ -11052,7 +11082,7 @@
 % \end{macro}
 % \end{macro}
 % \end{macro}
-%
+% \end{macro}
 % \begin{macro}{\flagstanza}
 % Use \verb?\flagstanza[len]{text}? at the start of a line to put \texttt{text} 
 % a distance \texttt{len} before the start of the line. The default for
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 75d012f109d..815165548b2 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/08/21 v1.5.2 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/10/09 v1.6.0 LaTeX port of EDMAC]
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -3277,9 +3277,15 @@
          \let\noexpand\endlock\relax\noexpand\else\interlinepenalty
          \@M\rightskip\z@ plus 1fil\relax\noexpand\fi\noexpand\ifnum
          \expandafter\noexpand\csname szp@0@\endcsname=\z@
-         \let\noexpand\sza@penalty\relax\noexpand\fi \def\noexpand&{%
-         \noexpand\endlock\noexpand\pend\noexpand\sza@penalty\global
-         \advance\stanza@count\@ne\noexpand\stanza@line}\def\noexpand
+         \let\noexpand\sza@penalty\relax\noexpand\fi%
+   \def\noexpand\falseverse{%
+     \global\advance\stanza@modulo-\@ne%
+     \global\advance\stanza@count-\@ne%
+     \relax\noexpand&\leavevmode\skipnumbering}
+         \def\noexpand&{%
+         \noexpand\endlock\noexpand\pend\noexpand\sza@penalty\global%
+         \advance\stanza@count\@ne\noexpand\stanza@line}%
+         \def\noexpand%
          \&{\noexpand\endlock\noexpand\pend\endgroup\noexpand\instanzafalse\expandafter\endstanzaextra}%
          \noexpand\stanza@line}