From bdc2fd6fc8085793ddd27d01d8ec34565f4905e9 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 24 Dec 2016 22:12:46 +0000
Subject: reledmac (24dec16)

git-svn-id: svn://tug.org/texlive/trunk@42785 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/source/latex/reledmac/reledpar.dtx  | 55 ++++++++++++++++------
 1 file changed, 40 insertions(+), 15 deletions(-)

(limited to 'Master/texmf-dist/source/latex/reledmac/reledpar.dtx')

diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 004444aaa54..f4baa778199 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -295,6 +295,7 @@
 % \changes{v.2.15.0}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
 % \changes{v2.15.0}{2016/12/12}{Fix bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
 % \changes{v2.15.0}{2016/12/12}{Fix bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
+% \changes{v2.15.0}{2016/12/12}{Compatibility with \protect\cs{setmsdataposition}}
 % ^^A PW added following as the definitions are at some unknown elsewhere
 %
 % \newcommand{\egstart}{%
@@ -1250,7 +1251,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/12/23 v2.16.0 reledmac extension for parallel texts]%
 
 %    \end{macrocode}
 % \subsection{Package's requirement}
@@ -3657,9 +3658,15 @@
             \set@Xtxtbeforenotes%
             \global\@firstlineofpagefalse%
           \fi%
-          \insert@msdata%
-          \add@inserts%
-          \add@Xgroupbyline%
+          \ifdefstring{\ms@data@position}{msdata-regular}{%
+            \insert@msdata%
+            \add@inserts%
+            \add@Xgroupbyline%
+          }{%
+            \add@inserts%
+            \add@Xgroupbyline%
+            \insert@msdata%
+          }%
           \affixside@note%
         }%
         {\print@lineL}%
@@ -3700,10 +3707,15 @@
       \set@Xtxtbeforenotes%
       \global\@firstlineofpagefalse%
     \fi%
-    \insert@msdata%
-    \add@inserts%
-    \add@Xgroupbyline%
-    \affixside@note%
+    \ifdefstring{\ms@data@position}{msdata-regular}{%
+      \insert@msdata%
+      \add@inserts%
+      \add@Xgroupbyline%
+    }{%
+      \add@inserts%
+      \add@Xgroupbyline%
+      \insert@msdata%
+    }%  
     \l@dlsn@te%
     \do@insidelineLhook%
     \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
@@ -3832,9 +3844,15 @@
            \set@Xtxtbeforenotes%
            \global\@firstlineofpageRfalse%
          \fi%
-         \insert@msdata%
-         \add@insertsR%
-         \add@Xgroupbyline%
+         \ifdefstring{\ms@data@position}{msdata-regular}{%
+            \insert@msdata%
+            \add@insertsR%
+            \add@Xgroupbyline%
+         }{%
+            \add@insertsR%
+            \add@Xgroupbyline%
+            \insert@msdata%
+         }%
          \affixside@noteR%
        }%
        {\print@lineR}%
@@ -3877,9 +3895,15 @@
       \set@Xtxtbeforenotes%
       \global\@firstlineofpageRfalse%
     \fi%
-    \insert@msdata%
-    \add@insertsR%
-    \add@Xgroupbyline%
+    \ifdefstring{\ms@data@position}{msdata-regular}{%
+      \insert@msdata%
+      \add@insertsR%
+      \add@Xgroupbyline%
+    }{%
+      \add@insertsR%
+      \add@Xgroupbyline%
+      \insert@msdata%
+    }%
     \affixside@noteR%
     \l@dlsn@te%
     \do@insidelineRhook%
@@ -3891,7 +3915,8 @@
        \fi%
        \l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
      \l@drsn@te%
-  }}
+    }%
+}
 
 \def\print@eledsectionR{%
     \addtocounter{pstartR}{-1}%
-- 
cgit v1.2.3

