From e8ee5c83e727bc3ba3d2a3d6811a45054564e3a1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Jul 2019 20:51:47 +0000 Subject: reledmac (21jul19) git-svn-id: svn://tug.org/texlive/trunk@51698 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 67 ++++++++++++++++------- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 8 ++- 2 files changed, 54 insertions(+), 21 deletions(-) (limited to 'Master/texmf-dist/tex/latex/reledmac') diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index f383181c2a4..94457cd40da 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/07/15 v2.32.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/07/21 v2.32.1 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -2567,7 +2567,7 @@ \insert\csname ##1footins\endcsname% \fi% {% - \nottoggle{Xparindent@##1}{\parindent=\z@}{}% + \Xsetparindent{##1}% \ifcsdef{Xhsize\csuse{series@display##1}@##1}% {\hsize \csuse{Xhsize\csuse{series@display##1}@##1}}% {}% @@ -2953,7 +2953,7 @@ \newcommand*{\parafootstart}[1]{% \rightskip=0pt \leftskip=0pt% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \ifdimequal{0pt}{\Xprenotes@}{}% {% \iftoggle{Xprenotes@}{% @@ -3065,7 +3065,7 @@ \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{Xbhookgroup@#1}% \csuse{Xnotefontsize@#1}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \unhbox0\par}} \newcommand*{\makehboxofhboxes}{\setbox0=\hbox{}% @@ -3188,7 +3188,7 @@ \nottoggle{Xgroupbyline@#1}% {\hsize \csuse{Xhsizethreecol@#1}}% {}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \tolerance=5000% \Xsethangindent{#1}% \@tempdima=\parindent% @@ -3283,7 +3283,7 @@ \newcommand{\twocol@begin@insert}[1]{% \normal@pars% \hsize \csuse{Xhsizetwocol@#1}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \tolerance=5000% \Xsethangindent{#1}% \@tempdima=\parindent% @@ -3330,6 +3330,22 @@ \expandafter \Xrigidbalance\csname mp#1footins\endcsname \tw@ \splittopskip}} +\newcommand{\Xsetparindent}[1]{% + \nottoggle{Xparindent@#1}{% + \parindent=\z@% + }% + {% + \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}% + }% +}% +\newcommand{\setparindentX}[1]{% + \nottoggle{parindentX@#1}{% + \parindent=\z@% + }% + {% + \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}% + }% +}% \newcommand{\Xsethangindent}[1]{% \if@RTL% \hangindent=-\csuse{Xhangindent@#1}% @@ -4202,7 +4218,7 @@ \normal@pars% \sethangindentX{#1}% \hsize \csuse{hsizetwocolX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \tolerance=5000\relax% \par% \@tempdima=\parindent% @@ -4286,7 +4302,7 @@ \sethangindentX{#1}% \normal@pars% \hsize \csuse{hsizethreecolX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \tolerance=5000\relax% \@tempdima=\parindent% \csuse{colalignX@#1}% @@ -4372,7 +4388,7 @@ }% \leftskip=\z@ \rightskip=\z@ - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \vskip\skip\@nameuse{footins#1}% \setnoteswidthliketwocolumnsX@{#1}% \setnotesXpositionliketwocolumns@{#1}% @@ -4477,7 +4493,7 @@ \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{bhookgroupX@#1}% \csuse{notefontsizeX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \unhbox0\par}} \newcommand{\insertparafootsepX}[1]{% @@ -4533,12 +4549,14 @@ \newcommand*{\Xledsetnormalparstuff}[1]{% \ledsetnormalparstuff@common% - \nottoggle{Xparindent@#1}{\parindent=\z@}{\hspace{\parindent}}% + \Xsetparindent{#1}% + \iftoggle{Xparindent@#1}{\hspace{\parindent}}{}% }% \newcommand*{\ledsetnormalparstuffX}[1]{% \ledsetnormalparstuff@common% - \nottoggle{parindentX@#1}{\parindent=\z@}{\hspace{\parindent}}% + \setparindentX{#1}% + \iftoggle{parindentX@#1}{\hspace{\parindent}}{}% }% \newdimen\old@hsize% @@ -4686,9 +4704,15 @@ \csuse{Xendbhooknote@#4}% \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% + \Xendstorelineinfo{#1}{#4}% \ifXendinsertsep@% \hskip\csuse{Xendafternote@#4}\relax% - \csuse{Xendsep@#4}% + \ifcsdef{prevendline#4}% + {\ifcsequal{prevendline#4}{lineinfo@}% + {\ifcsempty{Xendsymlinenum@#4}{\csuse{Xendsep@#4}}{}}% + {\csuse{Xendsep@#4}}% + }% + {\csuse{Xendsep@#4}}% \else% \iftoggle{Xendparagraph@#4}% {\global\Xendinsertsep@true}% @@ -4732,14 +4756,16 @@ \let\l@d@section=\@gobble -\newcommand{\printlineendnote}[2]{% +\newcommand{\Xendstorelineinfo}[2]{% \l@dp@rsefootspec#1|% \iftoggle{Xendnumberonlyfirstintwolines@#2}{% - \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}% - }% - {% - \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}% - }% + \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}% + }% + {% + \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}% + }% +}% +\newcommand{\printlineendnote}[2]{% \ifboolexpr{% togl {nonum@}% or togl {Xendnonumber@#2}% @@ -7622,6 +7648,8 @@ \noexpand\instanzatrue\expandafter \begingroup% \catcode`\noexpand\&\active% + \unexpanded{\newdimen\parindent@beforestanza% + \parindent@beforestanza=\parindent}%Keep in memory the standard \parindent \global\stanza@count\@ne\stanza@modulo\@ne \noexpand\ifnum\expandafter\noexpand \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax @@ -7658,6 +7686,7 @@ {\before@every@stop@stanza\pend[#1][#2]}% \endgroup% \instanzafalse% + \global\undef\parindent@beforestanza% } \newcommand{\AtEveryStopStanza}[1]{% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index daeadd1eb8a..6ef2a6e4746 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}[2019/01/22 v2.22.2 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2019/07/21 v2.22.3 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -2123,6 +2123,8 @@ \newenvironmentx{astanza}[2][1,2,usedefault]{% \catcode`\&\active \global\stanza@count\@ne\stanza@modulo\@ne + \newdimen\parindent@beforestanza% + \parindent@beforestanza=\parindent%Keep in memory the standard \parindent \ifnum\usenamecount{sza@0@}=\z@ \let\stanza@hang\relax \let\endlock\relax @@ -2146,7 +2148,9 @@ {\pstart[#1][#2]\at@start@every@stanza}% \@astanza@line \let\par\relax\ignorespaces%No paragraph in verses -}{} +}{% + \global\undef\parindent@beforestanza% +}% \newcommandx{\@stopastanza}[2][1,2,usedefault]{% \endlock\mbox{}% -- cgit v1.2.3