texlive[51698] Master/texmf-dist: reledmac (21jul19)
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 21 22:51:47 CEST 2019
Revision: 51698
http://tug.org/svn/texlive?view=revision&revision=51698
Author: karl
Date: 2019-07-21 22:51:47 +0200 (Sun, 21 Jul 2019)
Log Message:
-----------
reledmac (21jul19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/makefile
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex 2019-07-21 20:51:18 UTC (rev 51697)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex 2019-07-21 20:51:47 UTC (rev 51698)
@@ -5,7 +5,7 @@
\usepackage[english, main=latin]{babel}
\babeltags{english = english}
-\usepackage[series={A,B},noend,noeledsec,noledgroup]{reledmac}
+\usepackage[series={A,B},nofamiliar,noend,noeledsec,noledgroup]{reledmac}
\sethangingsymbol{[\,}
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/makefile 2019-07-21 20:51:18 UTC (rev 51697)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/makefile 2019-07-21 20:51:47 UTC (rev 51698)
@@ -61,6 +61,7 @@
ln doc-more/makefile reledmac/doc-more
ln doc-more/latexmkrc reledmac/doc-more
ln $(PACKAGE) reledmac
+ rm -rf build
@$(RM) ../reledmac.zip
zip -r ../reledmac.zip reledmac
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2019-07-21 20:51:18 UTC (rev 51697)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2019-07-21 20:51:47 UTC (rev 51698)
@@ -535,6 +535,8 @@
% \changes{v2.31.2}{2019/04/03}{Fix bug with familiar footnote containing not default font (introduced with v.~2.20.0).}
% \changes{v2.31.3}{2019/06/19}{Fix bug with paragraphed footnote in RTL context.}
% \changes{v2.32.0}{2019/07/15}{Add \protect\cs{Xlinenumannotationonlyfirst}, \protect\cs{Xlinenumannotationonlyfirstintwo}, \protect\cs{Xsymlinenumannotation}, \protect\cs{Xendlinenumannotationonlyfirst}, \protect\cs{Xendlinenumannotationonlyfirstintwo} and \protect\cs{Xendsymlinenumannotation}.}
+% \changes{v2.32.1}{2019/07/21}{Do not print \protect\cs{Xendsep} if we print \protect\cs{Xendsymlinenum}.}
+% \changes{v2.32.1}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4314,7 +4316,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/07/15 v2.32.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/07/21 v2.32.1 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -10039,7 +10041,7 @@
\insert\csname ##1footins\endcsname%
\fi%
{%
- \nottoggle{Xparindent@##1}{\parindent=\z@}{}%
+ \Xsetparindent{##1}%
\ifcsdef{Xhsize\csuse{series at display##1}@##1}%
{\hsize \csuse{Xhsize\csuse{series at display##1}@##1}}%
{}%
@@ -10865,7 +10867,7 @@
% \begin{macrocode}
\newcommand*{\parafootstart}[1]{%
\rightskip=0pt \leftskip=0pt%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \Xsetparindent{#1}%
\ifdimequal{0pt}{\Xprenotes@}{}%
{%
\iftoggle{Xprenotes@}{%
@@ -11139,7 +11141,7 @@
\setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{Xbhookgroup@#1}%
\csuse{Xnotefontsize@#1}%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \Xsetparindent{#1}%
\unhbox0\par}}
% \end{macrocode}
@@ -11397,7 +11399,7 @@
\nottoggle{Xgroupbyline@#1}%
{\hsize \csuse{Xhsizethreecol@#1}}%
{}%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \Xsetparindent{#1}%
\tolerance=5000%
\Xsethangindent{#1}%
\@tempdima=\parindent%
@@ -11545,7 +11547,7 @@
\newcommand{\twocol at begin@insert}[1]{%
\normal at pars%
\hsize \csuse{Xhsizetwocol@#1}%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
+ \Xsetparindent{#1}%
\tolerance=5000%
\Xsethangindent{#1}%
\@tempdima=\parindent%
@@ -11610,6 +11612,30 @@
% \end{macro}
%
%
+% \subsection{Footnote paragraph indent}
+% \begin{macro}{\Xsetparindent}
+% \begin{macro}{\setparindentX}
+% These two commands set the paragraph indentation of the footnotes, depending of the settings of the user.
+% \begin{macrocode}
+\newcommand{\Xsetparindent}[1]{%
+ \nottoggle{Xparindent@#1}{%
+ \parindent=\z@%
+ }%
+ {%
+ \ifdef{\parindent at beforestanza}{\parindent=\parindent at beforestanza}{}%
+ }%
+}%
+\newcommand{\setparindentX}[1]{%
+ \nottoggle{parindentX@#1}{%
+ \parindent=\z@%
+ }%
+ {%
+ \ifdef{\parindent at beforestanza}{\parindent=\parindent at beforestanza}{}%
+ }%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \subsection{Footnote hanging indent}
% \begin{macro}{\Xsethangindent}
% \begin{macro}{\sethangindentX}
@@ -13055,7 +13081,7 @@
\normal at pars%
\sethangindentX{#1}%
\hsize \csuse{hsizetwocolX@#1}%
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\tolerance=5000\relax%
\par%
\@tempdima=\parindent%
@@ -13178,7 +13204,7 @@
\sethangindentX{#1}%
\normal at pars%
\hsize \csuse{hsizethreecolX@#1}%
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\tolerance=5000\relax%
\@tempdima=\parindent%
\csuse{colalignX@#1}%
@@ -13297,7 +13323,7 @@
}%
\leftskip=\z@
\rightskip=\z@
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\vskip\skip\@nameuse{footins#1}%
\setnoteswidthliketwocolumnsX@{#1}%
\setnotesXpositionliketwocolumns@{#1}%
@@ -13426,7 +13452,7 @@
\setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{bhookgroupX@#1}%
\csuse{notefontsizeX@#1}%
- \nottoggle{parindentX@#1}{\parindent=\z@}{}%
+ \setparindentX{#1}%
\unhbox0\par}}
% \end{macrocode}
@@ -13522,12 +13548,14 @@
\newcommand*{\Xledsetnormalparstuff}[1]{%
\ledsetnormalparstuff at common%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{\hspace{\parindent}}%
+ \Xsetparindent{#1}%
+ \iftoggle{Xparindent@#1}{\hspace{\parindent}}{}%
}%
\newcommand*{\ledsetnormalparstuffX}[1]{%
\ledsetnormalparstuff at common%
- \nottoggle{parindentX@#1}{\parindent=\z@}{\hspace{\parindent}}%
+ \setparindentX{#1}%
+ \iftoggle{parindentX@#1}{\hspace{\parindent}}{}%
}%
% \end{macrocode}
% \end{macro}
@@ -13841,9 +13869,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 at true}%
@@ -13890,17 +13924,27 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \begin{macro}{\Xendstorelineinfo}
+% The \cs{Xendstorelineinfo} macro is used to store some data about line number of the current critical endnote, data which will be reused later for the \cs{Xnumberonlyfirstinline} and related setting.
+%
+% \#1 endnote specification for the current endnote;
+% \#2 endnote series.
+% \begin{macrocode}
+\newcommand{\Xendstorelineinfo}[2]{%
+ \l at dp@rsefootspec#1|%
+ \iftoggle{Xendnumberonlyfirstintwolines@#2}{%
+ \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at dparsedstartsub - \l at dparsedendpage - \l at dparsedendline - \l at dparsedendsub}%
+ }%
+ {%
+ \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at dparsedstartsub}%
+ }%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\printlineendnote}
% This macro controls, in endnote, whether the line number is printed or not, according to the series options. Its first argument is the information about lines; its second is the series of the footnote.
% \begin{macrocode}
\newcommand{\printlineendnote}[2]{%
- \l at dp@rsefootspec#1|%
- \iftoggle{Xendnumberonlyfirstintwolines@#2}{%
- \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at dparsedstartsub - \l at dparsedendpage - \l at dparsedendline - \l at dparsedendsub}%
- }%
- {%
- \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at dparsedstartsub}%
- }%
\ifboolexpr{%
togl {nonum@}%
or togl {Xendnonumber@#2}%
@@ -18530,6 +18574,8 @@
\noexpand\instanzatrue\expandafter
\begingroup%
\catcode`\noexpand\&\active%
+ \unexpanded{\newdimen\parindent at beforestanza%
+ \parindent at beforestanza=\parindent}%Keep in memory the standard \parindent
\global\stanza at count\@ne\stanza at modulo\@ne
\noexpand\ifnum\expandafter\noexpand
\csname sza at 0@\endcsname=\z@\let\noexpand\stanza at hang\relax
@@ -18566,6 +18612,7 @@
{\before at every@stop at stanza\pend[#1][#2]}%
\endgroup%
\instanzafalse%
+ \global\undef\parindent at beforestanza%
}
\newcommand{\AtEveryStopStanza}[1]{%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2019-07-21 20:51:18 UTC (rev 51697)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2019-07-21 20:51:47 UTC (rev 51698)
@@ -337,6 +337,7 @@
% \changes{v2.22.0}{2018/09/13}{Compatibility with \protect\cs{doinsidethislinehook} macro.}
% \changes{v2.22.1}{2019/01/08}{Really reset line number annotation at each line}
% \changes{v2.22.2}{2019/01/22}{Fix bug with \protect\cs{Xonlyside} and \protect\cs{onlysideX}}
+% \changes{v2.22.3}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1385,7 +1386,7 @@
% \begin{macrocode}
%<*code>
\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]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3149,7 +3150,7 @@
% \item A \LaTeX\ counter \verb+footnoteX+. This the only one manipulated by user, and the only one finally printed.
% \item A \TeX\ counter \verb+footnoteX at reading+. Its value is incremented when reading the \cs{footnoteX} command in left or right side environments. It is used to get the correct footnote number from the \verb+.aux+ file to be typeset in the main text. This counter is already defined in \macpackage, as it is also used for hyperlink.
% \changes{v2.6.2}{2015/11/29}{The \TeX\ counter \protect\cs{footnoteX at reading} is defined in \protect\reledmac.}
-% \item A \LaTeX\ counter \verb+footnoteX at typeset. Its value is increased when inserting footnotes. Its value is directly used in the footnote, and is stored in the \verb+aux+ files to be used on the next run for the main text.
+% \item A \LaTeX\ counter \verb+footnoteX at typeset+. Its value is increased when inserting footnotes. Its value is directly used in the footnote, and is stored in the \verb+aux+ files to be used on the next run for the main text.
% \end{enumerate}
%
%
@@ -5345,6 +5346,8 @@
\newenvironmentx{astanza}[2][1,2,usedefault]{%
\catcode`\&\active
\global\stanza at count\@ne\stanza at modulo\@ne
+ \newdimen\parindent at beforestanza%
+ \parindent at beforestanza=\parindent%Keep in memory the standard \parindent
\ifnum\usenamecount{sza at 0@}=\z@
\let\stanza at hang\relax
\let\endlock\relax
@@ -5368,7 +5371,9 @@
{\pstart[#1][#2]\at at start@every at stanza}%
\@astanza at line
\let\par\relax\ignorespaces%No paragraph in verses
-}{}
+}{%
+ \global\undef\parindent at beforestanza%
+}%
% \end{macrocode}
% \end{environment}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2019-07-21 20:51:18 UTC (rev 51697)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2019-07-21 20:51:47 UTC (rev 51698)
@@ -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 at display##1}@##1}%
{\hsize \csuse{Xhsize\csuse{series at 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 at begin@insert}[1]{%
\normal at 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 at beforestanza}{\parindent=\parindent at beforestanza}{}%
+ }%
+}%
+\newcommand{\setparindentX}[1]{%
+ \nottoggle{parindentX@#1}{%
+ \parindent=\z@%
+ }%
+ {%
+ \ifdef{\parindent at beforestanza}{\parindent=\parindent at beforestanza}{}%
+ }%
+}%
\newcommand{\Xsethangindent}[1]{%
\if at RTL%
\hangindent=-\csuse{Xhangindent@#1}%
@@ -4202,7 +4218,7 @@
\normal at 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 at 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 at common%
- \nottoggle{Xparindent@#1}{\parindent=\z@}{\hspace{\parindent}}%
+ \Xsetparindent{#1}%
+ \iftoggle{Xparindent@#1}{\hspace{\parindent}}{}%
}%
\newcommand*{\ledsetnormalparstuffX}[1]{%
\ledsetnormalparstuff at common%
- \nottoggle{parindentX@#1}{\parindent=\z@}{\hspace{\parindent}}%
+ \setparindentX{#1}%
+ \iftoggle{parindentX@#1}{\hspace{\parindent}}{}%
}%
\newdimen\old at 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 at true}%
@@ -4732,14 +4756,16 @@
\let\l at d@section=\@gobble
-\newcommand{\printlineendnote}[2]{%
+\newcommand{\Xendstorelineinfo}[2]{%
\l at dp@rsefootspec#1|%
\iftoggle{Xendnumberonlyfirstintwolines@#2}{%
- \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at dparsedstartsub - \l at dparsedendpage - \l at dparsedendline - \l at dparsedendsub}%
- }%
- {%
- \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at dparsedstartsub}%
- }%
+ \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at dparsedstartsub - \l at dparsedendpage - \l at dparsedendline - \l at dparsedendsub}%
+ }%
+ {%
+ \xdef\lineinfo@{\l at dparsedstartpage - \l at dparsedstartline - \l at 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 at beforestanza%
+ \parindent at beforestanza=\parindent}%Keep in memory the standard \parindent
\global\stanza at count\@ne\stanza at modulo\@ne
\noexpand\ifnum\expandafter\noexpand
\csname sza at 0@\endcsname=\z@\let\noexpand\stanza at hang\relax
@@ -7658,6 +7686,7 @@
{\before at every@stop at stanza\pend[#1][#2]}%
\endgroup%
\instanzafalse%
+ \global\undef\parindent at beforestanza%
}
\newcommand{\AtEveryStopStanza}[1]{%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2019-07-21 20:51:18 UTC (rev 51697)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2019-07-21 20:51:47 UTC (rev 51698)
@@ -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 at count\@ne\stanza at modulo\@ne
+ \newdimen\parindent at beforestanza%
+ \parindent at beforestanza=\parindent%Keep in memory the standard \parindent
\ifnum\usenamecount{sza at 0@}=\z@
\let\stanza at hang\relax
\let\endlock\relax
@@ -2146,7 +2148,9 @@
{\pstart[#1][#2]\at at start@every at stanza}%
\@astanza at line
\let\par\relax\ignorespaces%No paragraph in verses
-}{}
+}{%
+ \global\undef\parindent at beforestanza%
+}%
\newcommandx{\@stopastanza}[2][1,2,usedefault]{%
\endlock\mbox{}%
More information about the tex-live-commits
mailing list