texlive[55377] Master/texmf-dist: reledmac (1jun20)
commits+karl at tug.org
commits+karl at tug.org
Mon Jun 1 23:09:03 CEST 2020
Revision: 55377
http://tug.org/svn/texlive?view=revision&revision=55377
Author: karl
Date: 2020-06-01 23:09:02 +0200 (Mon, 01 Jun 2020)
Log Message:
-----------
reledmac (1jun20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.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/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
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.tex
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx 2020-06-01 21:08:28 UTC (rev 55376)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx 2020-06-01 21:09:02 UTC (rev 55377)
@@ -442,4 +442,8 @@
%
%Use \cs{Xparindent} to restore indentation.
% \subsection{Migration to \reledmac~2.32.7}
-% For paragraphed familiar footnotes, the separator between notes was \cs{Xparafootsep} instead of \cs{parafootsepX}. This release fixes this bug. You may adapte your settings.
+% For paragraphed familiar footnotes, the separator between notes was \cs{Xparafootsep} instead of \cs{parafootsepX}. This release fixes this bug. You may adapt your settings.
+% \subsection{Migration to \reledmac~2.33.0}
+% You should not redefine anymore \cs{ledinnotemark}, but use instead \cs{innotemarkX} and \cs{Xinnotemark}.
+%
+% If you have personal script which parses for \cs{ledinnote} or if you redefine \cs{ledinnote} (but normally, you should not), this macro have new arguments. Look at the code for more details.
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-criticalendnotes.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)
Added: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf 2020-06-01 21:08:28 UTC (rev 55376)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf 2020-06-01 21:09:02 UTC (rev 55377)
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.tex 2020-06-01 21:09:02 UTC (rev 55377)
@@ -0,0 +1,57 @@
+\documentclass{article}
+\usepackage[osf,p]{libertinus}
+\usepackage[english]{babel}
+\babeltags{english = english}
+
+\usepackage[characterstyle=imprimerie-prose]{thalie}
+
+\usepackage[noeledsec,noend,noledgroup,nofamiliar,nocritical,antilabe]{reledmac}
+\setstanzaindents{1,0,1}
+\setcounter{stanzaindentsrepetition}{1}
+\setcounter{startstanzaindentsrepetition}{2}
+
+\linenumincrement{1}
+\firstlinenum{1}
+%%retained from the thalie package, modifies the way a character's name is given in the first line of speech
+\renewcommand*{\speakswithoutdirection}[1]{%
+ \noindent\textsc{#1}\xspace.%
+}
+
+% Space after \antilabe macro
+\renewcommand{\afterantilabe}{\hspace{1em}}
+\begin{document}
+
+
+\begin{abstract}
+This file provides an example of typesetting verse for a dramatic text with reledmac and thalie packages.
+
+We use the thalie features to manage characters.
+
+We use the following features of reledmac to typeset the verses:
+\begin{itemize}
+ \item \verb+\antilabe+ to show correctly the second half of a split line of verse (antilabe);
+ \item \verb+\afterantilabe+ to add more space after \verb+\antilabe+;
+ \item \verb+\setcounter{stanzaindentsrepetition}+ and \\ \verb+\setcounter{startstanzaindentsrepetition}+ to have the first line of a reply/stanza indented, but not the following ones;
+ \item \verb+\skipnumbering+ to avoid counting the first half of an antilabe in the line counting.
+\end{itemize}
+\end{abstract}
+
+ddd
+%%part of thalie's management of characters
+\begin{dramatis}
+ \character[cmd={Buckingham}]{Buckingham}
+ \character[cmd={Norfolk}]{Norfolk}
+\end{dramatis}
+
+% Normal typesetting
+\beginnumbering
+\stanza\Buckingham Good morrow and well met. How have ye done&
+\skipnumbering Since last we saw in France?\&
+\stanza\antilabe\Norfolk I thank your grace,&
+Healthful, and ever since a fresh admirer&
+\skipnumbering Of what I saw there.\&
+\stanza\antilabe\Buckingham An untimely ague&
+Stayed me a prisoner in my chamber when\&
+\endnumbering
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
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 2020-06-01 21:08:28 UTC (rev 55376)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/makefile 2020-06-01 21:09:02 UTC (rev 55377)
@@ -3,7 +3,7 @@
reledmac.pdf \
reledpar.pdf \
migration.pdf \
- README \
+ README.md \
makefile \
latexmkrc \
@@ -12,7 +12,7 @@
.PHONY: all dist clean doc test
-all: test reledmac.sty reledpar.sty reledmac.pdf reledpar.pdf migration.pdf dist
+all: reledmac.sty reledpar.sty reledmac.pdf reledpar.pdf migration.pdf dist
doc: *.pdf
@@ -24,9 +24,6 @@
pdflatex $<
pdflatex $<
-README: README.md
- pandoc README.md -o README
-
%.sty: %.ins %.dtx
rm -f $*.sty
@pdflatex $*.ins
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 2020-06-01 21:08:28 UTC (rev 55376)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2020-06-01 21:09:02 UTC (rev 55377)
@@ -552,6 +552,9 @@
% \changes{v2.32.7}{2020/05/03}{Fix bug with \protect\cs{lineation}\arg{pstart} and \protect\cs{edtext} in the very first line of a \protect\cs{pstart}.}
% \changes{v2.32.7}{2020/05/03}{Fix spurious spaces at the very first line of \protect\env{edtabular} environnments.}
% \changes{v2.32.8}{2020/05/24}{Add subline number in manuscript apparatus.}
+% \changes{v2.33.0}{2020/05/31}{Add startstanzaindentsrepetition feature.}
+% \changes{v2.33.0}{2020/05/31}{Add antilabe feature.}
+% \changes{v2.33.0}{2020/05/31}{Add \protect\cs{Xinnotemark} and \protect\cs{innotemarkX} hooks.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -787,6 +790,8 @@
% Please add your own edition made with (r)(e)ledmac.
%
% If you write a book or an article about (r)(e)ledmac, please add it on the collaborative bibliography on \url{https://www.zotero.org/groups/1024519/}.
+% \subsection{Acknowledgements}
+% Maïeul Rouquette may thank his predecessor, and all the \macpackage\ communauty. Especially, he may thanks all the people who checks English spell and grammar for the handbook.
% \section{How the package works --- the problem of the number of \LaTeX\ runs}\label{howto}
% The \macpackage package is a three-pass package like \LaTeX\ itself.
% Although your textual apparatus and line
@@ -840,14 +845,15 @@
% \item \TeX\ is not able to create folder. You should create it yourself.
% \item The option does not change the default \LaTeX auxiliary files (.aux, .toc, \ldots).
% \end{enumerate}
-% \item[eledmac-compat] help to migrate from \eledmac to \reledmac (see \reff{eledmac-compat}).
-% \item[nopenalties] must be called in some cases when using paragraphed endnotes (\reff{nopenalties)}
-% \item[nopbinverse] prevents page break within verse environment.
-% \item[noquotation] by default, the quotation environment is redefined within numbered text. You can disable this redefinition with \verb|noquotation| (see \reff{noquotation}).
-% \item[noresetlinenumannotation] Does not reset the annotations to line number at each line. See \reff{annotation}.
-% \item[parapparatus] by default, the apparatus cannot contain paragraph breaks; this option enables paragraphing inside the apparatus.
-% \item[swcaseinsensitive] make \cs{sameword} command case insensitive.
-% \item[widthliketwocolumns] set the width of the text printed in a single column to be the same as the width of the text printed in two parallel columns with \parpackage. This is useful when alternating between normal and parallel typesetting.
+% \item[antilabe] enable \cs{antilabe} feature (see \reff{antilabe});
+% \item[eledmac-compat] help to migrate from \eledmac to \reledmac (see \reff{eledmac-compat});
+% \item[nopenalties] must be called in some cases when using paragraphed endnotes (see \reff{nopenalties)};
+% \item[nopbinverse] prevents page break within verse environment;
+% \item[noquotation] by default, the quotation environment is redefined within numbered text. You can disable this redefinition with \verb|noquotation| (see \reff{noquotation});
+% \item[noresetlinenumannotation] does not reset the annotations to line number at each line (see \reff{annotation});
+% \item[parapparatus] by default, the apparatus cannot contain paragraph breaks; this option enables paragraphing inside the apparatus;
+% \item[swcaseinsensitive] make \cs{sameword} command case insensitive;
+% \item[widthliketwocolumns] set the width of the text printed in a single column to be the same as the width of the text printed in two parallel columns with \parpackage. This is useful when alternating between normal and parallel typesetting;
% \item[xindy] and \verb|xindy+hyperref| select \verb+xindy+ as the index processor (\reff{xindy}).
% \end{description}
%
@@ -3049,7 +3055,20 @@
% \begin{verbatim}
% \setcounter{stanzaindentsrepetition}{0}
% \end{verbatim}
-% The macros make no restriction on the number of lines in a stanza.
+% The macro makes no restriction on the number of lines in a stanza.
+%
+% Sometime, it is useful to repeat the indents only after some lines of verse.
+% You can set the counter \verb+startstanzaindentsrepetition+ to do that.
+% Its default value is \verb+1+, that means the repetition starts with line of verse number~1.
+%
+% For example, you may want to have no indent for the first line, and all other lines been indented by 1.
+% So do
+% \begin{verbatim}
+% \setstanzaindents{1,0,1}
+% \setcounter{stanzaindentsrepetition}{1}
+% \setcounter{startstanzaindentsrepetition}{2}
+% \end{verbatim}
+% \subsection{Notes about the scope of the indent settings}
% Stanza indentation values (and penalty values) obey \TeX's grouping
% conventions, so if one stanza among several has a different structure,
% its indentations (penalties) may be set within a group; the prior values
@@ -3166,6 +3185,32 @@
% \flagstanza{#1}%
%}
% \end{verbatim}
+% \DescribeMacro{\antilabe}
+% \subsection{Antilabe}\label{antilabe}
+% In dramatic text, it may happen that a line of verse is split between two speakers.
+% Thats is called \enquote{antilabe}.
+% In this case, the typesetting of the second half must start at the horizontal position where the typesetting of the first half stops.
+%
+% \Reledmac\ provides tool for such problematic, but you must enable them with the \option{antilabe} option when loading package, as this option is quite ressource consuming.
+%
+% The \cs{antilabe}\marg{name} must be called at the beginning of the second half of the line of verse.
+%
+% Its \meta{name} argument is the name of the speaker.
+% Because of the way \TeX\ expand argument, you can use one the following syntax:
+% \begin{itemize}
+% \item \verb+\antilabe{name}+, if you typeset the character name;
+% \item \verb+\antilabe\command+, if the character name is defined in a command, like with the \package{thalie} package;
+% \item \verb+\antilabe{}+, if you do not type the character name.
+% \end{itemize}
+% See the file \href{examples/2-antilabe.tex}{examples/2-antilabe.tex} for an example of use.
+%
+% \DescribeMacro{\beforeantilabe}
+% \DescribeMacro{\afterantilabe}
+% You can execute any arbitrary code before or after \cs{antilabe} macro just with a redefinition of \cs{beforeantilabe} or \cs{afterantilabe}.
+% For example, to add more space, just do:
+% \begin{verbatim}
+% \renewcommand{\afterantilabe}{\hspace{1em}}
+% \end{verbatim}
% \subsection{Various tools}
% \DescribeMacro{\ampersand}
% If you need to print an \& symbol in a stanza, use the \verb?\ampersand?
@@ -3620,12 +3665,23 @@
%
% If you add \protect\cs{edindex} inside some \protect\cs{Xfootnote} command,
% it will refer to that note, and a suffix \emph{n} will be appended to the reference.
-% You can redefine this suffix by redefining the command \protect\cs{ledinnotemark}.
-% Its actual definition is:
+%
+% \DescribeMacro{\Xinnotemark}
+% \DescribeMacro{\innotemarkX}
+% You can redefine the way the reference is made using :
+% \begin{itemize}
+% \item \cs{Xinnotemark}\oarg{series}\marg{definition} for critical notes;
+% \item \cs{innotemarkX}\oarg{series}\marg{definition} for familiar notes;
+% \end{itemize}
+% In the \meta{definition} argument, you can use the following codes:
+% \begin{itemize}
+% \item \verb+#1+, which stands for footnote series;
+% \item \verb+##1+, which stands for reference (ie. page+line)
+% \end{itemize}
+% For example:
% \begin{verbatim}
-% \newcommand{\ledinnotemark}[1]{#1\emph{n}}
+% \Xinnotemark{##1\textsuperscript{#1}}
% \end{verbatim}
-% Where \verb+#1+ stands for the reference.
% \subsection{Separator between page and line numbers}
% \DescribeMacro{\pagelinesep}\label{pagelinesep}
% The page \& linenumber combination is written as |page\pagelinesep line|,
@@ -4335,7 +4391,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/05/24 v2.32.8 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/05/31 v2.33.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4358,6 +4414,7 @@
% \begin{macro}{\ifxindyhyperref@}
% \begin{macro}{\ifeledmaccompat@}
% \begin{macro}{\ifnoresetlinenumannotation@}
+% \begin{macro}{\ifantilabe@}
% Use this to remember which option is used, set and execute the options
% with final as the default.
% We use \protect\package{xkeyval} in order to manage options with argument.
@@ -4450,6 +4507,10 @@
\DeclareOptionX{noresetlinenumannotation}{%
\noresetlinenumannotation at true%
}%
+\newif\ifantilabe@%
+\DeclareOptionX{antilabe}{%
+ \antilabe at true%
+}%
% \end{macrocode}
% We use the starred form of \protect\cs{ProcessOptionsX} which executes options in
% the order listed in the source file: class options, then listed package
@@ -4477,6 +4538,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
% \subsection{Loading packages}
% Loading package \protect\package{xargs} to declare commands with optional arguments.
% Loading package \package{xparse} to declare fully expandable commands with optional argument. Ideally, we should use only \package{xparse} and not \package{xargs}. For historical reasons, we use both.
@@ -4794,6 +4856,13 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\led at warn@BadHookSeries}
+% \begin{macrocode}
+\newcommand{\led at warn@BadHookSeries}[2]{%
+ \reledmac at warning{Bad series #1 for #2 hook. Skipped.}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led at warn@BadSidenotemargin}
% \begin{macrocode}
\newcommand*{\led at warn@BadSidenotemargin}{%
@@ -5130,7 +5199,24 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-
+% \begin{macro}{ifinstanzaL}
+% \begin{macro}{ifinstanzaR}
+% These boolean tests are switched by the \protect\cs{stanza} command, using either the left or right side.
+% \begin{macrocode}
+ \newif\ifinstanzaL%
+ \newif\ifinstanzaR%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{ifinastanzaL}
+% \begin{macro}{ifinastanzaR}
+% These boolean tests are switched by the \protect\env{astanza} environnement, using either the left or right side.
+% \begin{macrocode}
+ \newif\ifinastanzaL%
+ \newif\ifinastanzaR%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
%\section{Sectioning commands}
%
@@ -8807,6 +8893,7 @@
\@at at end@every at pend%
\endgraf\global\num at lines=\prevgraf\egroup%
\global\par at line=0%
+ \get at firsthalf@antilabe at wd%
% \end{macrocode}
% Output the lines.
% \begin{macrocode}
@@ -11830,6 +11917,7 @@
% \changes{v1.18.0}{2015/02/23}{Code refactoring in \protect\cs{printlinefootnote}: the printing of the numbers are factorized in \protect\cs{printlinefootnotearea}}
% \begin{macrocode}
\newcommand{\printlinefootnote}[2]{%
+ \xdef\@currentseries{#2}%
\iftoggle{nonum@}{%Try if the line number must printed for this specific not (by default, yes)
\hspace{\csuse{Xinplaceofnumber@#2}}%
}%
@@ -11926,7 +12014,6 @@
% The previous \protect\cs{boxlinefootnote} calls it.
% \begin{macrocode}
\newcommand{\printlinefootnotenumbers}[2]{%
- \xdef\@currentseries{#2}%
\ifboolexpr{%
(togl{Xpstart@#2} and bool{numberpstart})%
or togl{Xpstarteverytime@#2}}%
@@ -12905,6 +12992,7 @@
\xright at appenditem{%
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
+ \unexpanded{\gdef\@currentnotetype{familiar}}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
\noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}{#3}%
\noexpand\led at reinit@index at fornote%
@@ -12922,6 +13010,7 @@
\xright at appenditem{%
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
+ \unexpanded{\gdef\@currentnotetype{familiar}}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
\noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}{#3}%
\noexpand\led at reinit@index at fornote%
@@ -14630,6 +14719,7 @@
\csgdef{Xwidth@#1}{\hsize}%
\csgdef{Xwraplinenumannotation@#1}{\textsuperscript}%
\csgdef{Xlinenumannotationposition@#1}{after}%
+ \expandafter\csgdef{Xinnotemark@#1}##1{\ledinnotemark{##1}}%
\newtoggle{Xnoidenticallinenumannotation@#1}%
% \end{macrocode}
% \subsubsection{Create inserts, needed to add notes in foot}
@@ -14671,6 +14761,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
+ \unexpanded{\gdef\@currentnotetype{critical}}%
\noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current \edtext will be pushed to \sw at list@inedtext when the notes are expanded.
@@ -14708,6 +14799,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
+ \unexpanded{\gdef\@currentnotetype{critical}}%
\noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
@@ -14787,6 +14879,7 @@
\csgdef{parafootsepX@#1}{}%
\csgdef{afternoteX@#1}{1em plus.4em minus.4em}
\csgdef{widthX@#1}{\hsize}%
+ \expandafter\csgdef{innotemarkX@#1}##1{\ledinnotemark{##1}}%
\csgdef{txtbeforenotesX@#1}{}%
\newtoggle{txtbeforesnotesX@#1 at typeset}%Not directly used by user, but internal
\newtoggle{txtbeforenotesonlyonceX@#1}%
@@ -15182,13 +15275,17 @@
% \begin{macrocode}
\newcommandx{\settoggle at series}[5][4,5,usedefault]{%
\def\do##1{%
- \global\settoggle{#2@##1}{#3}%
+ \ifcsdef{etb at tgl@#2@##1}{%
+ \global\settoggle{#2@##1}{#3}%
+ }{%
+ \led at warn@BadHookSeries{##1}{#2}%
+ }%
\ifstrequal{#4}{critical}{
\csuse{Xarrangement@\csuse{series at display##1}}{##1}%
}{}
- \ifstrequal{#4}{familiar}{
+ \ifstrequal{#4}{familiar}{%
\csuse{arrangementX@\csuse{series at displayX##1}}{##1}%
- }{}
+ }{}%
}%
\ifstrempty{#1}{%
\dolistloop{\@series}%
@@ -15211,11 +15308,16 @@
% \item \verb+#3+ (mandatory): the new value of the hook/command.
% \item \verb+#4+ (optional): if equal to \verb+reload+, reload the footnote setting (call \protect\cs{footnormal} or \protect\cs{footparagraph} or \ldots\ depending of the footnote display).
% \item \verb+#5+ (optional): if not empty, and if \verb+#1+ is empty, change the hook setting for pseudo-series, as \verb+appref+.
+% \item \verb+#6+ (optional): the number of arguments of the hook.
% \end{itemize}
% \begin{macrocode}
-\newcommandx{\setcommand at series}[5][4,5,usedefault]{%
+\newcommandx{\setcommand at series}[6][4,5,6=0,usedefault]{%
\def\do##1{
- \csgdef{#2@##1}{#3}
+ \ifcsdef{#2@##1}{%
+ \expandafter\global\expandafter\renewcommand\csname#2@##1\endcsname[#6]{#3}%
+ }{%
+ \led at warn@BadHookSeries{##1}{#2}%
+ }%
\ifstrequal{#4}{critical}{%
\csuse{Xarrangement@\csuse{series at display##1}}{##1}%
}{}
@@ -15241,11 +15343,13 @@
% The first argument is the name of the hook, the second a comma-separated list of pseudo-series where the hook can be used, like \verb+appref+ in the case of \protect\cs{Xtwolines}.
% The second argument is also used to create commands named \protect\cs{<hookname><pseudoseries>},
% like \protect\cs{Xtwolinesappref}.
+% The third argument
+% \changes{v2.33.0}{2020/05/31}{\protect\cs{newhookcommand at series} can take an second optional argument (third argument).}
% \changes{v1.21.0}{2015/04/13}{\protect\cs{newhookcommand at series} can take an optional argument.}
% \begin{macrocode}
-\newcommandx{\newhookcommand at series}[2][2,usedefault]{%
+\newcommandx{\newhookcommand at series}[3][2,3=0,usedefault]{%
\global\expandafter\newcommand\expandafter*\csname #1\endcsname[2][]{%
- \setcommand at series{##1}{#1}{##2}[][#2]%
+ \setcommand at series{##1}{#1}{##2}[][#2][#3]%
}%
\ifstrempty{#2}{}{%
\def\do##1{%
@@ -15370,6 +15474,8 @@
\newhookcommand at series{Xparafootsep}
\newhookcommand at series@reload{Xwidth}{critical}%
+ \newhookcommand at series{Xinnotemark}[][1]%
+
\ifundef{\Xhsize}%
{%
\newcommandx{\Xhsize}[2][1,usedefault]{%
@@ -15419,6 +15525,8 @@
\newhookcommand at series{txtbeforenotesX}%
\newhooktoggle at series{txtbeforenotesonlyonceX}%
\newhookcommand at series@reload{widthX}{familiar}%
+ \newhookcommand at series{innotemarkX}[][1]%
+
\ifundef{\hsizeX}%
{%
\newcommandx{\hsizeX}[2][1,usedefault]{%
@@ -17858,7 +17966,7 @@
(define-attributes ("ledinnote\thelabidx"))^^J
\space\space(markup-locref^^J
\eledmacmarkuplocrefdepth^^J
- :open "\string\ledinnote[\edindexlab\thelabidx]{\@index at command}{"^^J
+ :open "\string\ledinnote[\edindexlab\thelabidx]{\@index at command}{\@currentseries}{\@currentnotetype}{"^^J
:close "}"^^J
:attr "ledinnote\thelabidx"^^J
)
@@ -17868,7 +17976,7 @@
(define-attributes ("ledinnote\thelabidx"))^^J
\space\space(markup-locref^^J
\eledmacmarkuplocrefdepth^^J
- :open "\string\ledinnote{\@index at command}{"^^J
+ :open "\string\ledinnote{\@index at command}{\@currentseries}{\@currentnotetype}{"^^J
:close "}"^^J
:attr "ledinnote\thelabidx"^^J
)
@@ -17880,7 +17988,7 @@
% \begin{macrocode}
\else%
\gdef\@ledinnote at command{%
- ledinnote[\edindexlab\thelabidx]{\@index at command}%
+ ledinnote[\edindexlab\thelabidx]{\@index at command}{\@currentseries}{\@currentnotetype}%
}%
\fi%
}
@@ -17911,13 +18019,25 @@
% \subsection{Code for the formatted index}
% \begin{macro}{\ledinnote}
% \changes{v1.22.0}{2015/04/25}{\protect\cs{ledinnote} takes a first optional argument, which is the label for hyperlinks.}
-% \begin{macro}{\ledinnotehyperpage}
% \begin{macro}{\ledinnotemark}
% \changes{v1.21.0}{2015/04/13}{Add \protect\cs{ledinnotemark}.}
+% \changes{v2.33.0}{2020/05/31}{\protect\cs{ledinnotemark} redefinition is deprecated, use \protect\cs{Xinnotemark} and \protect\cs{innotemarkX} instead.}
% These macros are used to specify that an index reference points to a note.
-% Arguments of \protect\cs{ledinnote} are: \verb+#1+ (optional): the label for the hyperlink, \verb+#2+: command applied to the number, \verb+#3+: the number itself.
+% Arguments of \protect\cs{ledinnote} are:
+% \begin{itemize}
+% \item \verb+#1+ (optional): the label for the hyperlink;
+% \item \verb+#2+: command applied to the number;
+% \item \verb+#3+: the note series;
+% \item \verb+#4+: the type of note (critical/familiar).
+% \item \verb+#5+: the number itself.
+% \end{itemize}
% \begin{macrocode}
-\newcommandx{\ledinnote}[3][1,usedefault]{%
+\newcommandx{\ledinnote}[5][1,usedefault]{%
+ \IfStrEq{#4}{critical}{%
+ \def\tmp{Xinnotemark}%
+ }{%
+ \def\tmp{innotemarkX}%
+ }%
\ifboolexpr{%
test{\ifdefequal{\iftrue}{\ifHy at hyperindex}}%
or%
@@ -17924,18 +18044,16 @@
bool {xindyhyperref@}%
}%
{%
- \csuse{#2}{\hyperlink{#1}{\ledinnotemark{#3}}}%
+ \csuse{#2}{\hyperlink{#1}{\csuse{\tmp @#3}{#5}}}%
}%
{%
- \csuse{#2}{\ledinnotemark{#3}}%
+ \csuse{#2}{\csuse{\tmp @#3}{#5}}%
}%
}%
-\newcommand{\ledinnotehyperpage}[2]{\csuse{#1}{\ledinnotemark{\hyperpage{#2}}}}%
\newcommand{\ledinnotemark}[1]{#1\emph{n}}%
% \end{macrocode}
% \end{macro}
% \end{macro}
-% \end{macro}
% \subsection{Main code}
% \changes{v2.0.0}{2015/07/19}{Suppress indexing command specific to \protect\ltxclass{memoir}.}
% \Eledmac and \ledmac were using the specific indexing tools of the \protect\ltxclass{memoir} in order to allow multiple index.
@@ -18463,12 +18581,17 @@
% \end{macro}
% \end{macro}
% \begin{macro}{\managestanza at modulo}
-% Since version 0.13, the \verb+stanzaindentsrepetition+ counter can be used when the indentation is repeated every n verses.
-% The \protect\cs{managestanza at modulo} is a command which modifies the counter stanza at modulo. The command adds 1 to stanza at modulo, but if stanza at modulo is equal to the stanzaindentsrepetition counter, the command restarts it.
+% Since the \verb+stanzaindentsrepetition+ counter can be used when the indentation is repeated every $n$ verses.
+%
+% The \verb+startstanzaindentsrepetition+ counter tells in which line of verse the repetition of indent starts.
+%
+% The \protect\cs{managestanza at modulo} macro modifies the counter stanza at modulo. The command adds 1 to stanza at modulo, but if stanza at modulo is equal to the stanzaindentsrepetition counter, the command restarts it.
%\changes{v0.13.0}{2011/11/08}{New stanzaindentsrepetition counter to repeat stanza indents every \emph{n} verses.}
% % \changes{v1.5.1}{2013/08/16}{Correct stanzaindentsrepetition counter}
% \begin{macrocode}
\newcounter{stanzaindentsrepetition}
+\newcounter{startstanzaindentsrepetition}%
+\setcounter{startstanzaindentsrepetition}{1}%
\newcount\stanza at modulo
\newcommand*{\managestanza at modulo}[0]{%
@@ -18579,6 +18702,7 @@
% \subsection{Main work}
% \begin{macro}{\stanza at line}
% \begin{macro}{\stanza at hang}
+% \begin{macro}{\stanza at indent}
% \begin{macro}{\sza at penalty}
% Now we arrive at the main works. \protect\cs{stanza at line} sets the
% indentation for the line and starts a numbered paragraph---each
@@ -18596,7 +18720,15 @@
% places in the stanza for page breaking.
% \begin{macrocode}
\newcommandx{\stanza at line}[2][1,2,usedefault]{%
- \ifnum\value{stanzaindentsrepetition}=0
+ \stanza at indent%
+ \pstart[#1][#2]\stanza at hang\ignorespaces%
+}%
+\newcommand{\stanza at indent}{%
+ \ifboolexpr{%
+ test {\ifnumequal{\value{stanzaindentsrepetition}}{0}}%
+ or%
+ test {\ifnumless{\number\stanza at count}{\value{startstanzaindentsrepetition}}}%
+ }{%
\ifcsdef{sza@\number\stanza at count @}%
{%
\parindent=\csname sza@\number\stanza at count @\endcsname\stanzaindentbase%
@@ -18603,16 +18735,20 @@
}{%
\led at err@StanzaIndentNotDefined%
}%
- \else
+ }{%
\ifcsdef{sza@\number\stanza at modulo @}{%
- \parindent=\csname sza@\number\stanza at modulo @\endcsname\stanzaindentbase%
+ \count0=\numexpr%
+ \stanza at modulo%
+ - 1%
+ + \value{startstanzaindentsrepetition}%
+ \relax%
+ \parindent=\csname sza@\number\count0 @\endcsname\stanzaindentbase%
\managestanza at modulo%
}%
{%
\led at err@StanzaIndentNotDefined%
}%
- \fi
- \pstart[#1][#2]\stanza at hang\ignorespaces%
+ }%
}%
\xdef\stanza at hang{\noexpand\leavevmode\noexpand\startlock
\hangindent\expandafter
@@ -18625,6 +18761,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@startstanza}
% \begin{macro}{\stanza}
@@ -18785,9 +18922,51 @@
\setstanzavalues{szp}{0}
% \end{macrocode}
+% \subsection{Dealing with antilabe}
+% \begin{macro}{\firsthalf at antilabe@wd}
+% \begin{macro}{\get at firsthalf@antilabe at wd}
+% \begin{macro}{\antilabe}
+% If the \option{antilabe} option is enabled, after having vboxded
+% the content of \cs{pstart}\ldots{pend} structure, we get
+% the width of the last line of the \cs{pend}.
+% \begin{macrocode}
+\ifantilabe@%
+ \newdimen\firsthalf at antilabe@wd%
+ \newcommand\get at firsthalf@antilabe at wd{%
+ \ifboolexpr{bool {instanza} or bool {inastanzaL} or bool {inastanzaR}}{%
+ \vbadness=10000%
+ \splittopskip=\z@%
+ \ifl at dpairing%
+ \ifledRcol%
+ \setbox0=\copy\csname l at dRcolrawbox\the\l at dnumpstartsR\endcsname%
+ \else%
+ \setbox0=\copy\csname l at dLcolrawbox\the\l at dnumpstartsL\endcsname%
+ \fi%
+ \else%
+ \setbox0=\copy\raw at text%
+ \fi%
+ \dimen0=\dimexpr\ht0+\dp0-\baselineskip\relax%
+ \ifdim\dimen0>0pt%
+ \setbox1=\vsplit0 to \dimen0%
+ \fi%
+ \setbox0=\vbox{\unvbox0\global\setbox1=\lastbox}%
+ \setbox1=\hbox{\noindent\unhbox1}%
+ \global\firsthalf at antilabe@wd=\wd1%
+ }{}%
+ }%
+ \def\beforeantilabe{}%
+ \def\afterantilabe{}%
+ \newcommand{\antilabe}[1]{%
+ \beforeantilabe\hbox to\firsthalf at antilabe@wd{#1}\afterantilabe%
+ }%
+\else%
+ \let\get at firsthalf@antilabe at wd\relax%
+\fi%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
-%
-%
% \section{Apparatus of Manuscripts}
% \subsection{User level macro}
% \begin{macro}{\msdata}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2020-06-01 21:08:28 UTC (rev 55376)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2020-06-01 21:09:02 UTC (rev 55377)
@@ -341,6 +341,8 @@
% \changes{v2.23.0}{2020/03/08}{Add \protect\cs{Leftpagehook} and \protect\cs{Rightpagehook}.}
% \changes{v2.23.0}{2020/03/08}{Add hanging symbol feature to \protect\env{astanza}.}
% \changes{v2.23.1}{2020/04/19}{Fix bug when using \protect\package{polyglossia} v1.45 or later.}
+% \changes{v2.24.0}{2020/05/31}{Add startstanzaindentsrepetition feature.}
+% \changes{v2.24.0}{2020/05/31}{Add antilabe feature.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1396,7 +1398,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/04/19 v2.23.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/05/31 v2.24.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1577,7 +1579,7 @@
\newcommand{\led at err@polyglossiaTooOld}{%
\reledpar at error{You use the polyglosia package.%
\MessageBreak However, reledpar requires version 2020/04/08 v1.49 or later of the polyglossia package.%
- \MessageBreak Please update your reledpar version}{\@ehc}%
+ \MessageBreak Please update your polyglossia version}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -3425,24 +3427,6 @@
% \end{environment}
%
%
-% \begin{macro}{ifinstanzaL}
-% \begin{macro}{ifinstanzaR}
-% These boolean tests are switched by the \protect\cs{stanza} command, using either the left or right side.
-% \begin{macrocode}
- \newif\ifinstanzaL
- \newif\ifinstanzaR
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \begin{macro}{ifinastanzaL}
-% \begin{macro}{ifinastanzaR}
-% These boolean tests are switched by the \protect\env{astanza} environnement, using either the left or right side.
-% \begin{macrocode}
- \newif\ifinastanzaL%
- \newif\ifinastanzaR%
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
% \begin{environment}{Leftside}
% Within the \verb?pairs? and \verb?pages? environments the left and
% right hand texts are within \verb?Leftside? and \verb?Rightside?
@@ -3825,6 +3809,7 @@
\@at at end@every at pend%
\endgraf\global\num at lines=\prevgraf\egroup%
\global\par at line=0%
+ \get at firsthalf@antilabe at wd%
% \end{macrocode}
% End the group that was begun in the \protect\cs{pstart}.
% \begin{macrocode}
@@ -3886,6 +3871,7 @@
\@at at end@every at pend%
\endgraf\global\num at linesR=\prevgraf\egroup%
\global\par at lineR=0%
+ \get at firsthalf@antilabe at wd%
\endgroup%
\ignorespaces%
\@oldnobreak%
@@ -5453,22 +5439,7 @@
% the paragraph style --- each line is treated as a paragraph.
% \begin{macrocode}
\newcommand*{\@astanza at line}{%
- \ifnum\value{stanzaindentsrepetition}=0
- \ifcsdef{sza@\number\stanza at count @}%
- {%
- \parindent=\csname sza@\number\stanza at count @\endcsname\stanzaindentbase%
- }{%
- \led at err@StanzaIndentNotDefined%
- }%
- \else
- \ifcsdef{sza@\number\stanza at modulo @}{%
- \parindent=\csname sza@\number\stanza at modulo @\endcsname\stanzaindentbase%
- \managestanza at modulo%
- }%
- {%
- \led at err@StanzaIndentNotDefined%
- }%
- \fi
+ \stanza at indent%
\endgraf
\stanza at hang%
\ignorespaces}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2020-06-01 21:08:28 UTC (rev 55376)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2020-06-01 21:09:02 UTC (rev 55377)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/05/24 v2.32.8 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/05/31 v2.33.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -117,6 +117,10 @@
\DeclareOptionX{noresetlinenumannotation}{%
\noresetlinenumannotation at true%
}%
+\newif\ifantilabe@%
+\DeclareOptionX{antilabe}{%
+ \antilabe at true%
+}%
\ProcessOptionsX*\relax
\RequirePackage{xargs}
@@ -257,6 +261,9 @@
}
\newcommand*{\led at warn@NoMarginpars}{%
\reledmac at warning{You can't use \string\marginpar\space in numbered text}}
+\newcommand{\led at warn@BadHookSeries}[2]{%
+ \reledmac at warning{Bad series #1 for #2 hook. Skipped.}%
+}%
\newcommand*{\led at warn@BadSidenotemargin}{%
\reledmac at warning{Bad \string\sidenotemmargin\space argument}}
\newcommand*{\led at warn@NoIndexFile}[1]{%
@@ -378,7 +385,10 @@
\newif\ifXnote@%
\providebool{indtl at innote}%
\providebool{indtl at notenumber}%
-
+ \newif\ifinstanzaL%
+ \newif\ifinstanzaR%
+ \newif\ifinastanzaL%
+ \newif\ifinastanzaR%
\newcount\section at num
\section at num=0
\let\extensionchars=\empty
@@ -1968,6 +1978,7 @@
\@at at end@every at pend%
\endgraf\global\num at lines=\prevgraf\egroup%
\global\par at line=0%
+ \get at firsthalf@antilabe at wd%
\loop\ifvbox\raw at text%
\do at line%
\repeat%
@@ -3448,6 +3459,7 @@
}%
}%
\newcommand{\printlinefootnote}[2]{%
+ \xdef\@currentseries{#2}%
\iftoggle{nonum@}{%Try if the line number must printed for this specific not (by default, yes)
\hspace{\csuse{Xinplaceofnumber@#2}}%
}%
@@ -3517,7 +3529,6 @@
}%
}%
\newcommand{\printlinefootnotenumbers}[2]{%
- \xdef\@currentseries{#2}%
\ifboolexpr{%
(togl{Xpstart@#2} and bool{numberpstart})%
or togl{Xpstarteverytime@#2}}%
@@ -4095,6 +4106,7 @@
\xright at appenditem{%
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
+ \unexpanded{\gdef\@currentnotetype{familiar}}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
\noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}{#3}%
\noexpand\led at reinit@index at fornote%
@@ -4112,6 +4124,7 @@
\xright at appenditem{%
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
+ \unexpanded{\gdef\@currentnotetype{familiar}}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
\noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}{#3}%
\noexpand\led at reinit@index at fornote%
@@ -5245,6 +5258,7 @@
\csgdef{Xwidth@#1}{\hsize}%
\csgdef{Xwraplinenumannotation@#1}{\textsuperscript}%
\csgdef{Xlinenumannotationposition@#1}{after}%
+ \expandafter\csgdef{Xinnotemark@#1}##1{\ledinnotemark{##1}}%
\newtoggle{Xnoidenticallinenumannotation@#1}%
\expandafter\newinsert\csname #1footins\endcsname%
\unless\ifnoledgroup@%
@@ -5276,6 +5290,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
+ \unexpanded{\gdef\@currentnotetype{critical}}%
\noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current \edtext will be pushed to \sw at list@inedtext when the notes are expanded.
@@ -5313,6 +5328,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
+ \unexpanded{\gdef\@currentnotetype{critical}}%
\noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
@@ -5372,6 +5388,7 @@
\csgdef{parafootsepX@#1}{}%
\csgdef{afternoteX@#1}{1em plus.4em minus.4em}
\csgdef{widthX@#1}{\hsize}%
+ \expandafter\csgdef{innotemarkX@#1}##1{\ledinnotemark{##1}}%
\csgdef{txtbeforenotesX@#1}{}%
\newtoggle{txtbeforesnotesX@#1 at typeset}%Not directly used by user, but internal
\newtoggle{txtbeforenotesonlyonceX@#1}%
@@ -5600,13 +5617,17 @@
}%
\newcommandx{\settoggle at series}[5][4,5,usedefault]{%
\def\do##1{%
- \global\settoggle{#2@##1}{#3}%
+ \ifcsdef{etb at tgl@#2@##1}{%
+ \global\settoggle{#2@##1}{#3}%
+ }{%
+ \led at warn@BadHookSeries{##1}{#2}%
+ }%
\ifstrequal{#4}{critical}{
\csuse{Xarrangement@\csuse{series at display##1}}{##1}%
}{}
- \ifstrequal{#4}{familiar}{
+ \ifstrequal{#4}{familiar}{%
\csuse{arrangementX@\csuse{series at displayX##1}}{##1}%
- }{}
+ }{}%
}%
\ifstrempty{#1}{%
\dolistloop{\@series}%
@@ -5618,9 +5639,13 @@
\docsvlist{#1}%
}%
}
-\newcommandx{\setcommand at series}[5][4,5,usedefault]{%
+\newcommandx{\setcommand at series}[6][4,5,6=0,usedefault]{%
\def\do##1{
- \csgdef{#2@##1}{#3}
+ \ifcsdef{#2@##1}{%
+ \expandafter\global\expandafter\renewcommand\csname#2@##1\endcsname[#6]{#3}%
+ }{%
+ \led at warn@BadHookSeries{##1}{#2}%
+ }%
\ifstrequal{#4}{critical}{%
\csuse{Xarrangement@\csuse{series at display##1}}{##1}%
}{}
@@ -5638,9 +5663,9 @@
\docsvlist{#1}%
}%
}%
-\newcommandx{\newhookcommand at series}[2][2,usedefault]{%
+\newcommandx{\newhookcommand at series}[3][2,3=0,usedefault]{%
\global\expandafter\newcommand\expandafter*\csname #1\endcsname[2][]{%
- \setcommand at series{##1}{#1}{##2}[][#2]%
+ \setcommand at series{##1}{#1}{##2}[][#2][#3]%
}%
\ifstrempty{#2}{}{%
\def\do##1{%
@@ -5735,6 +5760,8 @@
\newhookcommand at series{Xparafootsep}
\newhookcommand at series@reload{Xwidth}{critical}%
+ \newhookcommand at series{Xinnotemark}[][1]%
+
\ifundef{\Xhsize}%
{%
\newcommandx{\Xhsize}[2][1,usedefault]{%
@@ -5777,6 +5804,8 @@
\newhookcommand at series{txtbeforenotesX}%
\newhooktoggle at series{txtbeforenotesonlyonceX}%
\newhookcommand at series@reload{widthX}{familiar}%
+ \newhookcommand at series{innotemarkX}[][1]%
+
\ifundef{\hsizeX}%
{%
\newcommandx{\hsizeX}[2][1,usedefault]{%
@@ -7236,7 +7265,7 @@
(define-attributes ("ledinnote\thelabidx"))^^J
\space\space(markup-locref^^J
\eledmacmarkuplocrefdepth^^J
- :open "\string\ledinnote[\edindexlab\thelabidx]{\@index at command}{"^^J
+ :open "\string\ledinnote[\edindexlab\thelabidx]{\@index at command}{\@currentseries}{\@currentnotetype}{"^^J
:close "}"^^J
:attr "ledinnote\thelabidx"^^J
)
@@ -7246,7 +7275,7 @@
(define-attributes ("ledinnote\thelabidx"))^^J
\space\space(markup-locref^^J
\eledmacmarkuplocrefdepth^^J
- :open "\string\ledinnote{\@index at command}{"^^J
+ :open "\string\ledinnote{\@index at command}{\@currentseries}{\@currentnotetype}{"^^J
:close "}"^^J
:attr "ledinnote\thelabidx"^^J
)
@@ -7254,7 +7283,7 @@
\fi%
\else%
\gdef\@ledinnote at command{%
- ledinnote[\edindexlab\thelabidx]{\@index at command}%
+ ledinnote[\edindexlab\thelabidx]{\@index at command}{\@currentseries}{\@currentnotetype}%
}%
\fi%
}
@@ -7273,7 +7302,12 @@
\xdef\@index at parenthesis{)}%
}{}%
}
-\newcommandx{\ledinnote}[3][1,usedefault]{%
+\newcommandx{\ledinnote}[5][1,usedefault]{%
+ \IfStrEq{#4}{critical}{%
+ \def\tmp{Xinnotemark}%
+ }{%
+ \def\tmp{innotemarkX}%
+ }%
\ifboolexpr{%
test{\ifdefequal{\iftrue}{\ifHy at hyperindex}}%
or%
@@ -7280,13 +7314,12 @@
bool {xindyhyperref@}%
}%
{%
- \csuse{#2}{\hyperlink{#1}{\ledinnotemark{#3}}}%
+ \csuse{#2}{\hyperlink{#1}{\csuse{\tmp @#3}{#5}}}%
}%
{%
- \csuse{#2}{\ledinnotemark{#3}}%
+ \csuse{#2}{\csuse{\tmp @#3}{#5}}%
}%
}%
-\newcommand{\ledinnotehyperpage}[2]{\csuse{#1}{\ledinnotemark{\hyperpage{#2}}}}%
\newcommand{\ledinnotemark}[1]{#1\emph{n}}%
\newcommandx{\@wredindex}[2][1=\expandonce\jobname,usedefault]{%#1 = the index name, #2 = the text
\begingroup%
@@ -7615,6 +7648,8 @@
\newcommand*{\setstanzaindents}[1]{\setstanzavalues{sza}{#1}}
\newcommand*{\setstanzapenalties}[1]{\setstanzavalues{szp}{#1}}
\newcounter{stanzaindentsrepetition}
+\newcounter{startstanzaindentsrepetition}%
+\setcounter{startstanzaindentsrepetition}{1}%
\newcount\stanza at modulo
\newcommand*{\managestanza at modulo}[0]{%
@@ -7683,7 +7718,15 @@
}
\newcommandx{\stanza at line}[2][1,2,usedefault]{%
- \ifnum\value{stanzaindentsrepetition}=0
+ \stanza at indent%
+ \pstart[#1][#2]\stanza at hang\ignorespaces%
+}%
+\newcommand{\stanza at indent}{%
+ \ifboolexpr{%
+ test {\ifnumequal{\value{stanzaindentsrepetition}}{0}}%
+ or%
+ test {\ifnumless{\number\stanza at count}{\value{startstanzaindentsrepetition}}}%
+ }{%
\ifcsdef{sza@\number\stanza at count @}%
{%
\parindent=\csname sza@\number\stanza at count @\endcsname\stanzaindentbase%
@@ -7690,16 +7733,20 @@
}{%
\led at err@StanzaIndentNotDefined%
}%
- \else
+ }{%
\ifcsdef{sza@\number\stanza at modulo @}{%
- \parindent=\csname sza@\number\stanza at modulo @\endcsname\stanzaindentbase%
+ \count0=\numexpr%
+ \stanza at modulo%
+ - 1%
+ + \value{startstanzaindentsrepetition}%
+ \relax%
+ \parindent=\csname sza@\number\count0 @\endcsname\stanzaindentbase%
\managestanza at modulo%
}%
{%
\led at err@StanzaIndentNotDefined%
}%
- \fi
- \pstart[#1][#2]\stanza at hang\ignorespaces%
+ }%
}%
\xdef\stanza at hang{\noexpand\leavevmode\noexpand\startlock
\hangindent\expandafter
@@ -7807,6 +7854,38 @@
\catcode`\@=\body
\setstanzavalues{szp}{0}
+\ifantilabe@%
+ \newdimen\firsthalf at antilabe@wd%
+ \newcommand\get at firsthalf@antilabe at wd{%
+ \ifboolexpr{bool {instanza} or bool {inastanzaL} or bool {inastanzaR}}{%
+ \vbadness=10000%
+ \splittopskip=\z@%
+ \ifl at dpairing%
+ \ifledRcol%
+ \setbox0=\copy\csname l at dRcolrawbox\the\l at dnumpstartsR\endcsname%
+ \else%
+ \setbox0=\copy\csname l at dLcolrawbox\the\l at dnumpstartsL\endcsname%
+ \fi%
+ \else%
+ \setbox0=\copy\raw at text%
+ \fi%
+ \dimen0=\dimexpr\ht0+\dp0-\baselineskip\relax%
+ \ifdim\dimen0>0pt%
+ \setbox1=\vsplit0 to \dimen0%
+ \fi%
+ \setbox0=\vbox{\unvbox0\global\setbox1=\lastbox}%
+ \setbox1=\hbox{\noindent\unhbox1}%
+ \global\firsthalf at antilabe@wd=\wd1%
+ }{}%
+ }%
+ \def\beforeantilabe{}%
+ \def\afterantilabe{}%
+ \newcommand{\antilabe}[1]{%
+ \beforeantilabe\hbox to\firsthalf at antilabe@wd{#1}\afterantilabe%
+ }%
+\else%
+ \let\get at firsthalf@antilabe at wd\relax%
+\fi%
\def\msdata at c{}%
\def\msdata at cR{}%
\newcommand{\msdata}[1]{%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2020-06-01 21:08:28 UTC (rev 55376)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2020-06-01 21:09:02 UTC (rev 55377)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/04/19 v2.23.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/05/31 v2.24.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -85,7 +85,7 @@
\newcommand{\led at err@polyglossiaTooOld}{%
\reledpar at error{You use the polyglosia package.%
\MessageBreak However, reledpar requires version 2020/04/08 v1.49 or later of the polyglossia package.%
- \MessageBreak Please update your reledpar version}{\@ehc}%
+ \MessageBreak Please update your polyglossia version}{\@ehc}%
}%
\newcommand*{\led at err@BadLeftRightPstarts}[2]{%
\reledpar at error{The numbers of left (#1) and right (#2)
@@ -909,10 +909,6 @@
\global\Rcolwidth at pages=\Rcolwidth%
}
- \newif\ifinstanzaL
- \newif\ifinstanzaR
- \newif\ifinastanzaL%
- \newif\ifinastanzaR%
\newenvironment{Leftside}{%
\expandafter\ifvoid\csname l at dLcolrawbox1\endcsname\else%
\led at err@Leftside at PreviousNotPrinted%
@@ -1144,6 +1140,7 @@
\@at at end@every at pend%
\endgraf\global\num at lines=\prevgraf\egroup%
\global\par at line=0%
+ \get at firsthalf@antilabe at wd%
\endgroup%
\ignorespaces%
\@oldnobreak%
@@ -1190,6 +1187,7 @@
\@at at end@every at pend%
\endgraf\global\num at linesR=\prevgraf\egroup%
\global\par at lineR=0%
+ \get at firsthalf@antilabe at wd%
\endgroup%
\ignorespaces%
\@oldnobreak%
@@ -2189,22 +2187,7 @@
{\before at every@stop at stanza\pend[#1][#2]}%
}%
\newcommand*{\@astanza at line}{%
- \ifnum\value{stanzaindentsrepetition}=0
- \ifcsdef{sza@\number\stanza at count @}%
- {%
- \parindent=\csname sza@\number\stanza at count @\endcsname\stanzaindentbase%
- }{%
- \led at err@StanzaIndentNotDefined%
- }%
- \else
- \ifcsdef{sza@\number\stanza at modulo @}{%
- \parindent=\csname sza@\number\stanza at modulo @\endcsname\stanzaindentbase%
- \managestanza at modulo%
- }%
- {%
- \led at err@StanzaIndentNotDefined%
- }%
- \fi
+ \stanza at indent%
\endgraf
\stanza at hang%
\ignorespaces}
More information about the tex-live-commits
mailing list.