ledmac (6aug16)

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

6 files changed, 14 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf b/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
index 722c7067cc2..911fcb96e00 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledarab.pdf
diff --git a/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf b/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
index 690d9bb92bd..b8312c6d57d 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledmac.pdf
diff --git a/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf b/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
index f7203a94a81..1254146effb 100644
--- a/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
+++ b/Master/texmf-dist/doc/latex/ledmac/ledpar.pdf
diff --git a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
index 2123a5e61e2..17e8cb2ac78 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
@@ -36,6 +36,7 @@
 \makeatother
 \EnableCrossrefs
 \RecordChanges
+\usepackage[noeledmac]{ledmac}
 \CodelineIndex
 %%\OnlyDescription
 \renewcommand{\MakeUppercase}[1]{#1}
@@ -50,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{9345}
+% \CheckSum{9342}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -152,6 +153,8 @@
 % \changes{v0.14}{2012/04/04}{Tweaked \cs{edlabel} to get correct line number if the command is first element of a paragraph.}
 % \changes{v0.19.2a}{2015/07/19}{Reledmac is released.}
 % \changes{v0.19.3}{2015/10/14}{Fix bug with bidi v17.9 and following.}
+% \changes{v0.19.4}{2016/08/06}{Fix bug with nested \cs{edtext} added by v.0.8.1 !}
+% 
 % \hyphenation{man-u-script man-u-scripts}
 %
 % \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -2961,7 +2964,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2015/10/14 v0.19.3 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2016/08/06 v0.19.4 LaTeX port of EDMAC]
 
 %    \end{macrocode}
 %
@@ -5332,7 +5335,7 @@
 %    \begin{macrocode}
   \begingroup
     \no@expands
-    \xdef\@tag{\protect#1}%
+    \gdef\@tag{#1}%
 %    \end{macrocode}
 % \end{macro}
 %
@@ -5401,7 +5404,7 @@
 \newcommand{\edtext}[2]{\leavevmode
   \begingroup
     \no@expands
-    \xdef\@tag{\protect#1}%
+    \gdef\@tag{#1}%
     \set@line
     \global\insert@count=0
     \ignorespaces #2\relax
@@ -5474,7 +5477,7 @@
 % The \cs{lemma}\marg{text} macro allows you to change the lemma
 % that's passed on to the notes.
 %    \begin{macrocode}
-\newcommand*{\lemma}[1]{\xdef\@tag{\protect#1}\ignorespaces}
+\newcommand*{\lemma}[1]{\gdef\@tag{#1}\ignorespaces}
 %    \end{macrocode}
 % \end{macro}
 %
diff --git a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
index fafe9ff5387..8f03f5a4055 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
@@ -42,6 +42,8 @@
 \pagestyle{headings}
 \setcounter{StandardModuleDepth}{1}
 \setcounter{IndexColumns}{2}
+\usepackage[noeledmac]{ledmac}
+\usepackage{ledpar}
 \begin{document}
   \raggedbottom
   \DocInput{ledpar.dtx}
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
index dd79f3e39b7..a716c3eb4b5 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
@@ -23,7 +23,7 @@
 %%   This work consists of the files listed in the README file.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2015/10/14 v0.19.3 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2016/08/06 v0.19.4 LaTeX port of EDMAC]
 
 \newif\ifledfinal
 \newif\ifnoeledmac
@@ -681,7 +681,7 @@
 \long\def\critext#1#2/{\leavevmode
   \begingroup
     \no@expands
-    \xdef\@tag{\protect#1}%
+    \gdef\@tag{#1}%
     \set@line
     \global\insert@count=0
     \ignorespaces #2\relax
@@ -697,7 +697,7 @@
 \newcommand{\edtext}[2]{\leavevmode
   \begingroup
     \no@expands
-    \xdef\@tag{\protect#1}%
+    \gdef\@tag{#1}%
     \set@line
     \global\insert@count=0
     \ignorespaces #2\relax
@@ -725,7 +725,7 @@
 
 \newcommand*{\edfont@info}{\f@encoding/\f@family/\f@series/\f@shape}
 
-\newcommand*{\lemma}[1]{\xdef\@tag{\protect#1}\ignorespaces}
+\newcommand*{\lemma}[1]{\gdef\@tag{#1}\ignorespaces}
 \newcommand*{\linenum}[1]{%
   \xdef\@tempa{#1|||||||\noexpand\\\l@d@nums}%
   \global\let\l@d@nums=\empty