diff options
author | Karl Berry <karl@freefriends.org> | 2017-06-16 22:09:46 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-06-16 22:09:46 +0000 |
commit | ded0ead2388e3879a1c24c439b7795ff9cc0efb0 (patch) | |
tree | 8c8c2e85d867dd7d4aac16173a934d2a42f70079 /Master/texmf-dist/source | |
parent | 968bcb877a682e7f64b012f9255d622b1b78caf3 (diff) |
reledmac (16jun17)
git-svn-id: svn://tug.org/texlive/trunk@44620 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledpar.dtx | 121 |
1 files changed, 59 insertions, 62 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index d5ed0d69426..34506e7bd90 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -305,6 +305,7 @@ % \changes{v2.17.4}{2017/04/28}{Fix bugs with sublines in parallel typesetting.} % \changes{v2.18.0}{2017/05/04}{Compatibility with v2.20.0 of \protect\reledmac.} % \changes{v2.19.0}{2017/06/08}{Compatibility with v2.22.0 of \protect\reledmac.} +% \changes{v2.19.1}{2017/06/15}{Fix bug with \protect\cs{edtext} in sectioning command with shiftedpstarts mode.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1282,7 +1283,7 @@ % \begin{macrocode} %<*code> \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]% % \end{macrocode} % \subsection{Package's requirement} @@ -3784,22 +3785,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}% }% @@ -3835,21 +3823,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{% @@ -3898,6 +3872,28 @@ % \end{macrocode} % \end{macro} +% \begin{macro}{\add@apparatusL} +% The \cs{add@apparatusL} macro add apparatus for left lines, that is both footnotes and sidenotes. +% \begin{macrocode} +\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% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\dolineLhook} % \begin{macro}{\dolineRhook} % \begin{macro}{\doinsidelineLhook} @@ -3973,22 +3969,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}% }% @@ -4026,21 +4009,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{% @@ -4085,6 +4054,28 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\add@apparatusR} +% The \cs{add@apparatusR} macro add apparatus for right lines, that is both footnotes and sidenotes. +% \begin{macrocode} +\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% +}% +% \end{macrocode} +% \end{macro} % \subsection{Line and page number computation} % % \begin{macro}{\getline@numR} @@ -6155,6 +6146,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% @@ -6236,6 +6230,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% |