reledmac (8jan19)

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

2 files changed, 28 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index f6f8db75eab..29a0a54bc88 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -35,7 +35,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/01/04 v2.28.1a typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/01/08 v2.29.0 typesetting critical editions]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \newif\ifsameparallelpagenumber%
@@ -113,6 +113,10 @@
 \DeclareOptionX{swcaseinsensitive}{%
   \sw@caseinsensitivetrue%
 }%
+\newif\ifnoresetlinenumannotation@
+\DeclareOptionX{noresetlinenumannotation}{%
+  \noresetlinenumannotation@true%
+}%
 \ProcessOptionsX*\relax
 
 \RequirePackage{xargs}
@@ -866,7 +870,6 @@
 }
 \newcommand*{\@nl@reg}{%
   \ifx\l@dchset@num\relax \else
-    \reset@current@annot%
     \advance\absline@num \@ne
     \csgdef{l@dchset@num@\the\absline@num}{}%To remember this line have been marked by a \setlinenum
     \set@line@action
@@ -874,6 +877,7 @@
     \advance\absline@num \m@ne
     \advance\line@num \m@ne
   \fi
+  \reset@current@annot%
   \advance\absline@num \@ne
          \ifx\next@page@num\relax \else
              \page@action
@@ -2339,7 +2343,9 @@
 }%
 \let\current@annot=\empty%
 \newcommand{\reset@current@annot}{%
-  \let\current@annot\empty%
+  \unless\ifnoresetlinenumannotation@
+    \let\current@annot\empty%
+  \fi
 }%
 \def\parse@annot#1|#2|{%
   \gdef\annot@start{#1}%
@@ -5089,6 +5095,7 @@
       \csgdef{Xwraplemma@#1}{}
       \csgdef{Xwidth@#1}{\hsize}%
       \csgdef{Xwraplinenumannotation@#1}{\textsuperscript}%
+      \csgdef{Xlinenumannotationposition@#1}{after}%
       \expandafter\newinsert\csname #1footins\endcsname%
       \unless\ifnoledgroup@%
         \expandafter\newinsert\csname mp#1footins\endcsname%
@@ -5222,7 +5229,6 @@
       \csgdef{txtbeforenotesX@#1}{}%
       \newtoggle{txtbeforesnotesX@#1@typeset}%Not directly used by user, but internal
       \newtoggle{txtbeforenotesonlyonceX@#1}%
-      \csgdef{Xlinenumannotationposition@#1}{after}%
       \expandafter\newinsert\csname footins#1\endcsname%
       \unless\ifnoledgroup@%
         \expandafter\newinsert\csname mpfootins#1\endcsname%
@@ -7665,6 +7671,10 @@
             \fi%
             \csdef{@this@crossref@start}{\add@msd@c:start:msdata}%
              \csdef{@this@crossref@end}{\add@msd@c:end:msdata}%
+             \unexpanded{%
+               \def\annot@start{}%
+               \def\annot@end{}%
+             }%
             \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}%
             \reset@msd@options@iffullpage%
          }%
@@ -7710,6 +7720,10 @@
             \fi%
             \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}%
              \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}%
+             \unexpanded{%
+               \def\annot@start{}%
+               \def\annot@end{}%
+             }%
             \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}%
             \reset@msd@options@iffullpage%
          }%
@@ -7760,6 +7774,10 @@
           \fi%
           \csdef{@this@crossref@start}{\add@msd@c:start:msdata}%
            \csdef{@this@crossref@end}{\add@msd@c:end:msdata}%
+           \unexpanded{%
+             \def\annot@start{}%
+             \def\annot@end{}%
+           }%
           \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}%
           \reset@msd@options@iffullpage%
         }%
@@ -7804,6 +7822,10 @@
            \fi%
           \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}%
            \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}%
+           \unexpanded{%
+             \def\annot@start{}%
+             \def\annot@end{}%
+           }%
            \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}%
            \reset@msd@options@iffullpage%
         }%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 965a5937810..65b0ad8f432 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -28,7 +28,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/11/30 v2.22.0a reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2019/01/08 v2.22.1 reledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \RequirePackage{xkeyval}
@@ -561,7 +561,6 @@
 }%
 \newcommand{\@nl@regR}{%
   \ifx\l@dchset@num\relax \else
-    \reset@current@annot%
     \advance\absline@numR \@ne
     \csgdef{l@dchset@num@R\the\absline@numR}{}%To remember this line have been marked by a \setlinenum
     \set@line@action
@@ -569,6 +568,7 @@
     \advance\absline@numR \m@ne
     \advance\line@numR \m@ne%   % do we need this?
   \fi
+  \reset@current@annot%
   \advance\absline@numR \@ne
   \ifx\next@page@numR\relax \else
     \page@action