eledmac (9feb15)

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

1 files changed, 34 insertions, 53 deletions

diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 300ef344fd5..16ebce2b797 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -25,7 +25,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2015/02/05 v1.16.1 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2015/02/09 v1.17.0 LaTeX port of EDMAC]%
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -85,6 +85,8 @@
   \eledmac@error{Numbering was not started}{\@ehc}}
 \newcommand*{\led@err@NumberingShouldHaveStarted}{%
   \eledmac@error{Numbering should already have been started}{\@ehc}}
+\newcommand*{\led@err@edtextoutsidepstart}{%
+  \eledmac@error{\string\edtext\space outside numbered paragraph (\pstart…\pend)}{\@ehc}}%
 \newcommand*{\led@mess@NotesChanged}{%
   \typeout{eledmac reminder: }%
   \typeout{ The number of the footnotes in this section
@@ -779,7 +781,7 @@
   \IfStrEqCase{\led@pb@setting}{{before}{\relax}{after}{\relax}}[\write\linenum@out{\string\@nl[\the\c@page][\thepage]}]%
 }
 
-\newif\if@noneed@Footnote%Bool to check if we have to print a error message
+\newif\if@noneed@Footnote%
 
 \newcommand*{\flag@start}{%
   \ifledRcol%
@@ -857,58 +859,37 @@
 
 \newcommand{\@tag}{}
 \newif\if@edtext@%
-\long\def\critext#1#2/{\leavevmode
-  \@edtext@true%
-  \begingroup
-    \global\renewcommand{\@tag}{\no@expands #1}%%
-    \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% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
-       }
-  \endgroup
-  \showlemma{#1}%
-  \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% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
-       }
-  \@edtext@false%
-  \global\@lemmacommand@false%
-  }
-\newcommand{\edtext}[2]{\leavevmode
-  \@edtext@true%
-  \begingroup%
-    \global\renewcommand{\@tag}{\no@expands #1}%
-    \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% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
-       }%
-  \endgroup%
-  \showlemma{#1}%
-  \ifx\end@lemmas\empty \else%
-    \gl@p\end@lemmas\to\x@lemma%
-    \x@lemma%
-    \global\let\x@lemma=\relax%
+\long\def\critext#1#2/{\edtext{#1}{#2}}%
+\newcommand{\edtext}[2]{\leavevmode%
+  \ifnumberedpar@%
+      \@edtext@true%
+      \begingroup%
+        \global\renewcommand{\@tag}{\no@expands #1}%
+        \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% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
+           }%
+      \endgroup%
+      \showlemma{#1}%
+      \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% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
+           }%
+      \global\@noneed@Footnotefalse%
+      \@edtext@false%
+      \global\@lemmacommand@false%
+  \else%
+  \showlemma{#1} (\textbf{\textsc{Edtext outside numbered paragraph}})\led@err@edtextoutsidepstart%
   \fi%
-  \@ifundefined{xpg@main@language}{%if not polyglossia
-       \flag@end}%
-       {\if@RTL\flag@start\else\flag@end\fi% With polyglossia, you must track whether the language reads left to right (English) or right to left (Arabic).
-       }%
-  \global\@noneed@Footnotefalse%
-   \@edtext@false%
-   \global\@lemmacommand@false%
 }%
 
 \newcommand*{\flag@end}{%