summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-16 22:09:46 +0000
committerKarl Berry <karl@freefriends.org>2017-06-16 22:09:46 +0000
commitded0ead2388e3879a1c24c439b7795ff9cc0efb0 (patch)
tree8c8c2e85d867dd7d4aac16173a934d2a42f70079 /Master/texmf-dist/tex/latex/reledmac
parent968bcb877a682e7f64b012f9255d622b1b78caf3 (diff)
reledmac (16jun17)
git-svn-id: svn://tug.org/texlive/trunk@44620 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty110
1 files changed, 48 insertions, 62 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 7b31dfecb5b..111c7f61ea5 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/06/08 v2.19.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/06/15 v2.19.1 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1177,22 +1177,9 @@
\affixline@num%
\fi%
\xifinlist{\the\l@dpscL}{\eled@sections@@}%
- {%
- \if@firstlineofpage%
- \set@Xtxtbeforenotes%
- \set@txtbeforenotesX%
- \global\@firstlineofpagefalse%
- \fi%
- \ifdefstring{\ms@data@position}{msdata-regular}{%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
- }{%
- \add@inserts%
- \add@Xgroupbyline%
- \insert@msdata%
- }%
- \affixside@note%
+ {\unless\ifshiftedpstarts%
+ \add@apparatusL%
+ \fi%
}%
{\print@lineL}%
}%
@@ -1220,21 +1207,7 @@
\def\print@lineL{%
\affixpstart@numL%
\l@dld@ta%
- \if@firstlineofpage%
- \set@Xtxtbeforenotes%
- \set@txtbeforenotesX%
- \global\@firstlineofpagefalse%
- \fi%
- \ifdefstring{\ms@data@position}{msdata-regular}{%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
- }{%
- \add@inserts%
- \add@Xgroupbyline%
- \insert@msdata%
- }%
- \affixside@note%
+ \add@apparatusL%
\l@dlsn@te%
\do@insidelineLhook%
\hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
@@ -1274,6 +1247,23 @@
\vskip\eledsection@correcting@skip%
}
+\newcommand{\add@apparatusL}{%
+ \if@firstlineofpage%
+ \set@Xtxtbeforenotes%
+ \set@txtbeforenotesX%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
+ \affixside@note%
+}%
\newcommand*{\dolineLhook}[1]{\gdef\do@lineLhook{#1}}%
\newcommand*{\dolineRhook}[1]{\gdef\do@lineRhook{#1}}%
\newcommand*{\doinsidelineLhook}[1]{\gdef\do@insidelineLhook{#1}}%
@@ -1317,22 +1307,9 @@
\affixline@numR%
\fi%
\xifinlist{\the\l@dpscR}{\eled@sectionsR@@}%
- {%
- \if@firstlineofpageR%
- \set@Xtxtbeforenotes%
- \set@txtbeforenotesX%
- \global\@firstlineofpageRfalse%
+ {\unless\ifshiftedpstarts%
+ \add@apparatusR%
\fi%
- \ifdefstring{\ms@data@position}{msdata-regular}{%
- \insert@msdata%
- \add@insertsR%
- \add@Xgroupbyline%
- }{%
- \add@insertsR%
- \add@Xgroupbyline%
- \insert@msdata%
- }%
- \affixside@noteR%
}%
{\print@lineR}%
}%
@@ -1363,21 +1340,7 @@
\def\print@lineR{%
\affixpstart@numR%
\l@dld@ta%
- \if@firstlineofpageR%
- \set@Xtxtbeforenotes%
- \set@txtbeforenotesX%
- \global\@firstlineofpageRfalse%
- \fi%
- \ifdefstring{\ms@data@position}{msdata-regular}{%
- \insert@msdata%
- \add@insertsR%
- \add@Xgroupbyline%
- }{%
- \add@insertsR%
- \add@Xgroupbyline%
- \insert@msdata%
- }%
- \affixside@noteR%
+ \add@apparatusR%
\l@dlsn@te%
\do@insidelineRhook%
\hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{%
@@ -1419,6 +1382,23 @@
\fi%
\vskip\eledsection@correcting@skip
}
+\newcommand{\add@apparatusR}{%
+ \if@firstlineofpageR%
+ \set@Xtxtbeforenotes%
+ \set@txtbeforenotesX%
+ \global\@firstlineofpageRfalse%
+ \fi%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ }{%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
+ \affixside@noteR%
+}%
\newcommand*{\getline@numR}{%
\global\advance\absline@numR \@ne
\do@actionsR
@@ -2600,6 +2580,9 @@
\parledgroup@correction@notespacing{L}%
\hb@xt@ \hsize{\ledstrutL\unhbox\l@dleftbox}%
\else%
+ \xifinlist{\the\l@dpscL}{\eled@sections@@}%
+ {\add@apparatusL}%
+ {}%
\unless\ifadvancedshiftedpstarts%
\dimen0=\pagetotal%
\advance\dimen0 by \baselineskip%
@@ -2657,6 +2640,9 @@
\parledgroup@correction@notespacing{R}%
\hb@xt@ \hsize{\ledstrutR\unhbox\l@drightbox}%
\else%
+ \xifinlist{\the\l@dpscR}{\eled@sectionsR@@}%
+ {\add@apparatusR}%
+ {}%
\unless\ifadvancedshiftedpstarts%
\dimen0=\pagetotal%
\advance\dimen0 by \baselineskip%