texlive[51645] Master/texmf-dist: reledmac (15jul19)
commits+karl at tug.org
commits+karl at tug.org
Mon Jul 15 22:48:30 CEST 2019
Revision: 51645
http://tug.org/svn/texlive?view=revision&revision=51645
Author: karl
Date: 2019-07-15 22:48:30 +0200 (Mon, 15 Jul 2019)
Log Message:
-----------
reledmac (15jul19)
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/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/2-titles_not_in_line_numbering.tex
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/examples/4-reledpar_verse_text_between.tex
trunk/Master/texmf-dist/doc/latex/reledmac/examples/latexmkrc
trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile
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/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/2-titles_not_in_line_numbering.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.tex 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.tex 2019-07-15 20:48:30 UTC (rev 51645)
@@ -14,7 +14,7 @@
\maketitle
\begin{abstract}
This file provides examples of use of sectioning commands with reledmac.
-The sections are outside of the numbered text.
+The sections are outside of the numbered text.
The optional argument of \verb+\pstart+ is used. The optional argument of \verb+\pend+ is also used.
\end{abstract}
@@ -41,7 +41,7 @@
magna aliqua. Ut enim ad minim veniam, quis nostrud
exercitation ullamco laboris nisi
consequat ut aliquip consequat
-\pend[\vskip\baselineskip\noindent\hfill⁂\hfill\hbox{}]
+\pend[\vskip\baselineskip\noindent\hfill*\hfill\hbox{}]
\pstart[\section{Section title}]
Irure dolor in reprehenderit
in voluptate velit esse cillum dolore eu ur. Excepteur sint occaecat
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/examples/4-reledpar_verse_text_between.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.tex 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.tex 2019-07-15 20:48:30 UTC (rev 51645)
@@ -34,7 +34,7 @@
exercitation ullamco laboris nisi&
Uut aliquip consequat ut aliquip consequat
\newverse[\vskip\baselineskip%
- ⁂\hfill⁂\hfill⁂%
+ *\hfill*\hfill*%
\vskip\baselineskip]%
%
Duis aute irure dolor in reprehenderit&
@@ -55,7 +55,7 @@
magna aliqua. Ut enim ad minim veniam Ut enim ad minim veniam, quis nostrud&
exercitation ullamco laboris nisi&
Ut aliquip consequat ut consequat ut consequat ut consequat ut aliquip consequat\newverse[\vskip\baselineskip%
- ⁂\hfill⁂\hfill⁂%
+ *\hfill*\hfill*%
\vskip\baselineskip]%
%
Duis aute irure dolor in reprehenderit&
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/latexmkrc
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/latexmkrc 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/latexmkrc 2019-07-15 20:48:30 UTC (rev 51645)
@@ -1,2 +1,2 @@
-$pdf_mode = 5;
+$pdf_mode = 1;
$postscript_mode = $dvi_mode = 0;
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile 2019-07-15 20:48:30 UTC (rev 51645)
@@ -4,13 +4,9 @@
OBJ= $(SRC:.tex=.pdf)
all:$(OBJ)
- python3 check-example.py
PDF:$(OBJ)
-%.test: %.pdf
- python3 check-example.py --filename=$<
-
%.pdf: %.tex
latexmk $<
@@ -24,5 +20,11 @@
3-reledpar_pages_different_languages_lualatex.pdf: 3-reledpar_pages_different_languages_lualatex.tex
latexmk --lualatex $<
+3-reledpar_columns_different_languages.pdf: 3-reledpar_columns_different_languages.tex
+ latexmk --xelatex $<
+
+2-reledmac-right-to-left.pdf: 2-reledmac-right-to-left.tex
+ latexmk --xelatex $<
+
clean:
@$(RM) *pdf *toc *.1* *.2* *.3* *.4* *.5* *.6* *.7* *.8* *.9* *.eledsec* *.Aend* *.Bend* *.fls* *.xdv* *.glg* *.glo* *.gls* *.ist* *.log *.fdb_latexmk *.aux *.end *.ilg *.ind *.idx *.out *.synctex.gz *.synctex.gz\(busy\)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/makefile 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/makefile 2019-07-15 20:48:30 UTC (rev 51645)
@@ -1,5 +1,5 @@
PACKAGE = *.dtx \
- *.ins \
+ *.ins \
reledmac.pdf \
reledpar.pdf \
migration.pdf \
@@ -9,40 +9,41 @@
-.PHONY: all dist clean
+.PHONY: all dist clean doc test
-all: reledmac.sty reledpar.sty reledmac.pdf reledpar.pdf migration.pdf dist
+all: test reledmac.sty reledpar.sty reledmac.pdf reledpar.pdf migration.pdf dist
doc: *.pdf
+test: *dtx
+ l3build check
+
migration.pdf: migration.dtx
- xelatex -no-pdf $<
- xelatex -no-pdf $<
- xelatex -no-pdf $<
- xdvipdfmx migration.xdv
+ pdflatex $<
+ pdflatex $<
+ pdflatex $<
README: README.md
pandoc README.md -o README
%.sty: %.ins %.dtx
- rm -f $*.sty
+ rm -f $*.sty
@pdflatex $*.ins
%.pdf: %.sty %.dtx
- @xelatex -no-pdf $*.dtx
+ @pdflatex $*.dtx
@makeindex -s gind.ist -o $*.ind $*.idx
@makeindex -s gglo.ist -o $*.gls $*.glo
- @xelatex -no-pdf $*.dtx
+ @pdflatex $*.dtx
@makeindex -s gind.ist -o $*.ind $*.idx
@makeindex -s gglo.ist -o $*.gls $*.glo
- @xelatex -no-pdf $*.dtx
- @xdvipdfmx $*.xdv
+ @pdflatex $*.dtx
dist: $(PACKAGE) examples
rm -rf reledmac
mkdir reledmac
- @xelatex reledmac.dtx #We call it at last time because reledmac handbook can refer to page of reledpar handbook, and so we need to run reledmac.dtx a last time after reledpar.dtx has been run
+ @pdflatex reledmac.dtx #We call it at last time because reledmac handbook can refer to page of reledpar handbook, and so we need to run reledmac.dtx a last time after reledpar.dtx has been run
rm -f examples/*pdf
$(MAKE) -C examples all
mkdir reledmac/examples
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-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2019-07-15 20:48:30 UTC (rev 51645)
@@ -295,7 +295,7 @@
% \changes{v1.23.0}{2015/05/18}{Compatibility between nofamiliar/nocriticals option and minipage/ledgroup.}
% \changes{v1.23.0}{2015/05/18}{Fix error of \protect\cs{iftrue} not closed.}
% \changes{v1.23.0}{2015/05/18}{Allow use of \protect\cs{sameword} with inputenc managing of UTF-8.}
-% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{New tools to ensure the line-list file uses the right version of commands when upgrading the eledmac version.}
% \changes{v1.23.0}{2015/05/18}{Fix a bug with \protect\cs{skipnumbering} called immediately after a \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{Fix spurious space with \protect\cs{skipnumbering} (bug added on v1.21.0).}
@@ -382,7 +382,7 @@
% \changes{v2.7.2}{2015/12/13}{Fix problem of hyphenation when using \protect\package{hyperref} package (added in v2.7.0).}
% \changes{v2.8.0}{2016/01/15}{\protect\macpackage cross-referencing can take advantage of \protect\package{xr} package.}
% \changes{v2.8.0}{2016/01/15}{No indentation for paragraphed notes in ledgroup. Can be changed with \protect\cs{Xparindent} and \protect\cs{parindentX}.}
-% \changes{v2.8.0}{2016/01/15}{More \protect\cs{edgls…} commands.}
+% \changes{v2.8.0}{2016/01/15}{More \protect\cs{edgls...} commands.}
% \changes{v2.8.1}{2016/02/22}{Warnings for undefined labels are really parsable by latexmk}
% \changes{v2.8.2}{2016/02/27}{Fix a bug with \protect\cs{AtEveryPstart} added in version 2.0.0.}
% \changes{v2.8.2}{2016/02/27}{Fix a bug with vertical space after the between-sectioning command as optional argument of a \protect\cs{pstart} and \protect\cs{pstart} content}
@@ -449,8 +449,8 @@
% \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.}
% \changes{v2.16.6}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.16.6}{2016/11/14}{Fix a bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
% \changes{v2.16.8}{2016/12/16}{Fix a bug with \protect\cs{edindex} in footnotes in parallel typesetting.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.}
@@ -534,6 +534,7 @@
% \changes{v2.31.1}{2019/03/03}{Fix bug with \protect\cs{Xhangindent} and \protect\cs{hangindentX} for right-to-left texts.}
% \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}.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -1307,10 +1308,10 @@
% \begin{verbatim}
% \edtext{first lemma}
% \linenumannotation{A}
-% \edtext{second lemma}{…}
+% \edtext{second lemma}{...}
% \edtext{third%
% \linenumannotation{B}
-% lemma}{…}
+% lemma}{...}
% \edtext{fourth lemma}&
% \end{verbatim}
% In the critical notes, the line number will be followed
@@ -1385,6 +1386,8 @@
% If there an more than one annotation in the same line, there are separated by a comma.
% If you want to change the separator, you can use \\
% \cs{setlinenumannotationsep}\marg{sep}
+% \subsubsection{Annotations in the apparatus}
+% Some others options for the annotation in the apparatus are described on \reff{annotation-inapparatus}
% \subsection{Executing code at each line}\label{linehook}
% \Macpackage provides an advanced feature for users.
% \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
@@ -1407,7 +1410,7 @@
% \begin{verbatim}
% \beginnumbering
% \pstart
-% …
+% ...
% 1.\doinsidelinehook{\markboth{1}{1}} a
% \pend
% \end{verbatim}
@@ -1752,10 +1755,10 @@
% If you use UTF-8 processor, like \XeLaTeX\ or \LuaLaTeX, there should not be any glitches.
% However, pay attention to how characters are encoded. Similar-looking characters may be represented differently in unicode numbering.
%
-% For instance, in Greek, ``ᾳ'' has two possible unicode numbers:
+% For instance, in French, ``é'' has two possible unicode numbers:
% \begin{itemize}
-% \item GREEK SMALL LETTER ALPHA (U+03B1) + COMBINING GREEK YPOGEGRAMMENI (U+0345)
-% \item GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI (U+1FB3)
+% \item LATIN SMALL LETTER E (U+0065) + COMBINING ACUTE ACCENT (U+0301)
+% \item LATIN SMALL LETTER E WITH ACUTE (U+00E9)
% \end{itemize}
%
% Which unicode number you use depends, many times, on your keyboard configuration (the computer-input system).
@@ -2018,10 +2021,10 @@
% To keep that space, you have to either append a backslash followed by a space or \verb+{}+ to \cs{stopmsdata}, like so:
% \begin{verbatim}
% \msdata{ABC}Lorem ipsum dolor
-% […]
-% amet\stopmsdata{} \msdata{ABCD}sic transit […]
+% [...]
+% amet\stopmsdata{} \msdata{ABCD}sic transit [...]
% \end{verbatim}
-% Which means that the part of text containing \enquote{Lorem ipsum dolor […] amet} is witnessed by manuscripts A, B and C, while the part of text starting by \enquote{sic transit} is witnessed by manuscripts A, B, C and D.
+% Which means that the part of text containing \enquote{Lorem ipsum dolor [...] amet} is witnessed by manuscripts A, B and C, while the part of text starting by \enquote{sic transit} is witnessed by manuscripts A, B, C and D.
%
% \cs{stopmsdata} is also automatically inserted by \cs{msdata}.
%
@@ -2276,6 +2279,32 @@
% For endnotes, \cs{Xendnumberonlyfirstinline}; \cs{Xendnumberonlyfirstintwolines} and \cs{Xendsymlinenum} are the equivalents of
% \\ \cs{Xnumberonlyfirstinline}; \cs{Xnumberonlyfirstintwolines} and \cs{Xsymlinenum}.
%
+% \subsubsection{Print line number annotation only at first time}\label{annotation-inapparatus}
+% \DescribeMacro{\Xlinenumannotationonlyfirst}
+% By default, the line number annotation (\reff{annotion} is printed in every note. If you want to print it only the first time for a given annotation
+% you can use \cs{Xlinenumannotationonlyfirst}\oarg{s}.
+%
+% Note the two followings points:
+% \begin{itemize}
+% \item If you use \option{noresetlinenumannotation} option of \macpackage, the \cs{Xlinenumannotationonlyfirst} won't take account of the official line number.
+% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemma with the same annotation. That is, if you have for example a lemma with \verb+A+ annotation, then a lemma with \verb+B+ annotation, then a lemma with \verb+A+ annotation, all lemma will have its annotation in the apparatus.
+% \end{itemize}
+%
+% \DescribeMacro{\Xlinenumannotationonlyfirstintwo}
+% Suppose you have a lemma on annoation~1 and a lemma between annotation~1 and annotation~3.
+% With \cs{Xlinenumannotationonlyfirst}, the second lemma is considered to be with the same line annotation as the first lemma.
+% But if you use both \cs{Xlinenumannotationonlyfirst}\oarg{s} and \cs{Xlinenumannotationonlyfirstintwo}\oarg{s}, a distinction is made.
+%
+%
+% \DescribeMacro{\Xsymlinenumannotation}
+% For setting a particular symbol in place of the line number annotation, you can use \protect\cs{Xsymlinenumannotation}\oarg{s}\marg{symbol} in combination with \protect\cs{Xlinenumannotationonlyfirst}\oarg{s}. From the second lemma with the same line number annotation, the symbol will be used instead of the annotation. Note that any command called in \meta{symbol} must be robust. Use \protect\cs{robustify} to robustify a non-robust command.
+%
+% \DescribeMacro{\Xendlinenumannotationonlyfirst}
+% \DescribeMacro{\Xendlinenumannotationonlyfirstintwo}
+% \DescribeMacro{\Xendsymlinenumannotation}
+% For endnotes, \cs{Xendlinenumannotationonlyfirst}; \cs{Xendlinenumannotationonlyfirstintwo} and \cs{Xendsymlinenumannotation} are the equivalents of
+% \\ \cs{Xlinenumannotationonlyfirst}; \cs{Xlinenumannotationonlyfirstintwo} and \cs{Xsymlinenumannotation}.
+%
% \subsubsection{Print page number only at first time}
% For endnotes, \reledmac\ provides a mechanism for printing the page number only the first time it is seen.
% However, when a lemma spans over two pages, the line numbers are normally printed in the following pattern: starting page number - starting line number - ending page number - ending line number.
@@ -4285,7 +4314,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/06/19 v2.31.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/07/15 v2.32.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4560,7 +4589,7 @@
% \begin{macro}{\led at err@PendInEdtext}
% \begin{macrocode}
\newcommand*{\led at err@edtextoutsidepstart}{%
- \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}%
+ \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\space ...\space\pend)}{\@ehc}}%
\newcommand{\led at err@PstartInEdtext}[1]{%
\reledmac at error{\string\pstart\space in \string\edtext\space #1 argument}{\@ehc}%
@@ -4668,7 +4697,7 @@
\newcommand*{\led at err@PstartNotNumbered}{%
\reledmac at error{\string\pstart\space must be used within a
numbered section %
- (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}%
+ (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}}%
\newcommand*{\led at err@PstartInPstart}{%
\reledmac at error{\string\pstart\space encountered while another
\string\pstart\space was in effect}{\@ehc}}
@@ -4816,7 +4845,7 @@
% \begin{macro}{\led at err@toendnotes at outsidenumbering}
% \begin{macrocode}
\newcommand{\led at err@toendnotes at outsidenumbering}{%
- \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}%
+ \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4887,7 +4916,7 @@
% \begin{macro}{\led at warn@edinde at outsidenumbering}
% \begin{macrocode}
\newcommand{\led at warn@edinde at outsidenumbering}{%
- \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
+ \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
% \end{macrocode}
% \end{macro}
@@ -8222,7 +8251,7 @@
% The general mechanism is the following:
% \begin{itemize}
% \item \textbf{At the first run}, each \protect\cs{sameword} command increments an \protect\package{etoolbox} counter the name of which contains the argument of the \protect\cs{sameword} commands.
-% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored with the \protect\cs{@sw} command in the auxiliary file of the current \macpackage\ section (the \verb+.1+, \verb+.2+… file).
+% \item Then this counter, associated with the argument of \protect\cs{sameword} is stored with the \protect\cs{@sw} command in the auxiliary file of the current \macpackage\ section (the \verb+.1+, \verb+.2+... file).
% \item \textbf{When this auxiliary file is read at the second run}, different operations are achieved:
% \begin{enumerate}
% \item Get the rank of each \protect\cs{sameword} in a line (relative rank) from the rank of each \protect\cs{sameword} in all the numbered section (absolute rank):
@@ -8793,7 +8822,7 @@
}%
% \end{macrocode}
% Restore standard \enquote{nobreak} and \enquote{autopar} settings.
-% Normally, \cs{if at nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ …\ \cs{pend} structure can't contain any sectioning command, we set \cs{if at nobreak} to false.
+% Normally, \cs{if at nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ ...\ \cs{pend} structure can't contain any sectioning command, we set \cs{if at nobreak} to false.
% \begin{macrocode}
\@nobreakfalse%
\ifautopar%
@@ -12126,6 +12155,34 @@
\fi%
}{}%
% \end{macrocode}
+% Finally, we check for \cs{Xlinenumannotationonlyfirst} and \cs{Xlinenumannotationonlyfirstintwo}, and we redefine, if required, \cs{@annot at start@print} and \cs{annot at end@print}. We also store the current line number annotations.
+% \begin{macrocode}
+ \iftoggle{Xlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ and test{\ifcsequal{annot at end}{prevannot at end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot at start@print{%
+ \l at wrapcs@ifnotemptybox{Xwraplinenumannotation@\@currentseries}{\csuse{Xsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l at d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot at start@\@currentseries}{\annot at start}%
+ \global\cslet{prevannot at end@\@currentseries}{\annot at end}%
+ }%
+ {}%
+% \end{macrocode}
% End of \protect\cs{setprintlines}.
% \begin{macrocode}
}%
@@ -14154,6 +14211,34 @@
\fi%
}{}%
% \end{macrocode}
+% Finally, we check for \cs{Xendlinenumannotationonlyfirst} and \cs{Xendlinenumannotationonlyfirstintwo}, and we redefine, if required, \cs{@annot at start@print} and \cs{annot at end@print}. We also store the current line number annotations.
+% \begin{macrocode}
+ \iftoggle{Xendlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ and test{\ifcsequal{annot at end}{prevannot at end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot at start@print{%
+ \l at wrapcs@ifnotemptybox{Xendwraplinenumannotation@\@currentseries}{\csuse{Xendsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l at d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot at start@\@currentseries}{\annot at start}%
+ \global\cslet{prevannot at end@\@currentseries}{\annot at end}%
+ }%
+ {}%
+% \end{macrocode}
% End of \protect\cs{setprintendlines}.
% \begin{macrocode}
}%
@@ -14415,10 +14500,15 @@
\csgdef{Xboxendlinenum@#1}{0pt}%
\csgdef{Xboxsymlinenum@#1}{0pt}%
- \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xgroupbyline@#1}%
\newtoggle{Xgroupbylineseparetwolines@#1}%
+
+ \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xnumberonlyfirstintwolines@#1}%
+
+ \newtoggle{Xlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xtwolines@#1}{}%
\csgdef{Xmorethantwolines@#1}{}%
\csgdef{Xsublinesep@#1}{\fullstop}%
@@ -14430,7 +14520,10 @@
\newtoggle{Xpstart@#1}%
\newtoggle{Xstanza@#1}%
\csgdef{Xstanzaseparator@#1}{}%
+
\csgdef{Xsymlinenum@#1}{}%
+ \csgdef{Xsymlinenumannotation@#1}{}%
+
\newtoggle{Xnonumber@#1}%
\csgdef{Xbeforenumber@#1}{0pt}%
\csgdef{Xtxtbeforenumber@#1}{}%
@@ -14499,7 +14592,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl at notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
\noexpand\prepare at Xprenotes{#1}%
@@ -14536,7 +14629,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl at notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
\noexpand\prepare at Xprenotes{#1}%
@@ -14860,12 +14953,19 @@
\newtoggle{Xendnonumber@#1}%
\csgdef{Xendhangindent@#1}{0pt}%
+
\newtoggle{Xendnumberonlyfirstinline@#1}%
\newtoggle{Xendnumberonlyfirstintwolines@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xendbeforesymlinenum@#1}{\csuse{Xendbeforenumber@#1}}%
\csgdef{Xendaftersymlinenum@#1}{\csuse{Xendafternumber@#1}}%
+
\csgdef{Xendsymlinenum@#1}{}%
+ \csgdef{Xendsymlinenumannotation@#1}{}%
+
\csgdef{Xendboxsymlinenum@#1}{0pt}%
\csgdef{Xendbhooklinenumber@#1}{}%
@@ -15145,6 +15245,7 @@
\newhookcommand at series@reload{Xbhookgroup}{critical}
\newhookcommand at series{Xboxsymlinenum}%
\newhookcommand at series{Xsymlinenum}
+ \newhookcommand at series{Xsymlinenumannotation}%
\newhookcommand at series{Xbeforenumber}
\newhookcommand at series{Xtxtbeforenumber}
\newhookcommand at series{Xafternumber}
@@ -15160,6 +15261,8 @@
\newhookcommand at series@reload{Xafterrule}{critical}
\newhooktoggle at series{Xnumberonlyfirstinline}
\newhooktoggle at series{Xnumberonlyfirstintwolines}
+ \newhooktoggle at series{Xlinenumannotationonlyfirst}%
+ \newhooktoggle at series{Xlinenumannotationonlyfirstintwo}%
\newhooktoggle at series{Xgroupbyline}%
\newhooktoggle at series{Xgroupbylineseparetwolines}%
\newhooktoggle at series{Xnonumber}
@@ -15282,11 +15385,16 @@
\newhooktoggle at series{Xendnumberonlyfirstinline}%
\newhooktoggle at series{Xendnumberonlyfirstintwolines}%
+ \newhooktoggle at series{Xendlinenumannotationonlyfirst}%
+ \newhooktoggle at series{Xendlinenumannotationonlyfirstintwo}%
+
\newhookcommand at series{Xendsymlinenum}%
\newhookcommand at series{Xendbeforesymlinenum}%
\newhookcommand at series{Xendaftersymlinenum}%
\newhookcommand at series{Xendboxsymlinenum}%
+ \newhookcommand at series{Xendsymlinenumannotation}%
+
\newhookcommand at series{Xendbhooklinenumber}%
\newhookcommand at series{Xendahooklinenumber}%
\newhookcommand at series{Xendbhookinplaceofnumber}%
@@ -16487,6 +16595,9 @@
\newtoggle{Xlineflag at SEref}%
\toggletrue{Xlineflag at SEref}%%Here exception
+\newtoggle{Xlinenumannotationonlyfirst at SEref}%Never changed, just for the test in \setprintlines
+\newtoggle{Xlinenumannotationonlyfirst at appref}%Idem
+
\def\Xlinenumannotationposition at appref{after}%
\def\Xlinenumannotationposition at SEref{after}%
@@ -16533,6 +16644,10 @@
\newtoggle{Xendlineflag at SErefwithpage}
\toggletrue{Xendlineflag at SErefwithpage}%Here, exception
+
+\newtoggle{Xendlinenumannotationonlyfirst at SEref}%Never changed, just for the test in \setprintendlines
+\newtoggle{Xendlinenumannotationonlyfirst at appref}%Idem
+
\def\Xendlinenumannotationposition at apprefwithpage{after}%
\def\Xendlinenumannotationposition at apprefwithpage@SErefwithpage{after}%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2019-07-15 20:48:30 UTC (rev 51645)
@@ -225,7 +225,7 @@
% \changes{v1.15.0}{2015/04/13}{Fix vertical spurious space before right \protect\cs{eledchapter} (bug added in v1.13.0).}
% \changes{v1.15.0}{2015/04/13}{Prevent vertical space when using \protect\cs{AtEveryPstart} or \protect\cs{AtEveryPend} with a command which prints nothing}
% \changes{v1.16.0}{2015/05/18}{Fix a bug with nofamiliar / nocritical option of eledmac.}
-% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.16.0}{2015/05/18}{Error message when starting a Leftside/a Rightside while the previous one has not been yet typeset.}
% \changes{v1.16.0}{2015/05/18}{Error message when calling \protect\cs{Pages} inside `pages' environment and \protect\cs{Columns} inside `pairs' environment.}
% \changes{v1.16.0}{2015/05/18}{New package option sameparallelpagenumber to have the same page number for both left and right side.}
@@ -293,7 +293,7 @@
% \changes{v2.14.4}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.15.0}{2016/12/12}{Add \protect\option{movecolumnspositiononrightpage} option.}
% \changes{v2.15.0}{2016/12/12}{New macro \protect\cs{sidenotemarginR}, fix default value to right.}
-% \changes{v2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}}
+% \changes{v2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}}
% \changes{v2.15.0}{2016/12/12}{Fix a bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
% \changes{v2.15.0}{2016/12/12}{Fix a bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
% \changes{v2.16.0}{2016/12/23}{Compatibility with \protect\cs{setmsdataposition}}
@@ -317,7 +317,7 @@
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\cs{continuousnumberingwithcolumns} when using multiple series of continued numbering text. Now, the line number are correctly reset at each \protect\cs{beginnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} and inner / outer notes and line numbering.}
% \changes{v2.20.0}{2017/08/17}{Add \protect\cs{linenumOnlyPagesForColumns} and \protect\cs{linenumOnlyPagesForColumnsR} to tell to print the line numbers associated with a column only on some specific pages (for example, only on right pages).}
-% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.}
+% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ ...\ \protect\cs{endnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{widthliketwocolumns} when manually setting \protect\cs{beforecolumnseparator} and \protect\cs{aftercolumnseparator}.}
% \changes{v2.20.0}{2017/08/17}{Fix compatibility between \protect\option{continuousnumberingwithcolumns} and \protect\cs{numberpstartfalse}.}
% \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\option{continuousnumberingwithcolumns} when left column and right column have not the same size.}
@@ -626,8 +626,8 @@
% numbers between multiple columns and single columns, use the
% \option{continuousnumberingwithcolumns} option when loading \macpackage
% or \parpackage.
-% You will need to use \cs{pausenumbering}~…\
-% \cs{resumenumbering} in addition to \cs{beginnumbering}~…\
+% You will need to use \cs{pausenumbering}~...\
+% \cs{resumenumbering} in addition to \cs{beginnumbering}~...\
% \cs{endnumbering} (see \reff{reledmac-pause}).
%
% The best way to understand the behaviour of \cs{pausenumbering} and
@@ -639,15 +639,15 @@
% left-column commands.
%
% This means that you must switch between single-column and left-column
-% text using \cs{beginnumbering}~…\ \cs{pausenumbering}~…\
-% \cs{resumenumbering}~…\ \cs{pausenumbering}~…\
-% \cs{resumenumbering}~…\ \cs{endnumbering}.
+% text using \cs{beginnumbering}~...\ \cs{pausenumbering}~...\
+% \cs{resumenumbering}~...\ \cs{pausenumbering}~...\
+% \cs{resumenumbering}~...\ \cs{endnumbering}.
%
% On the other side, the first right column must always begin with
% \cs{beginnumbering}, no matter if the corresponding left-column started
% with \cs{resumenumbering} or not; this is because numbering in the right
% column has not been started yet. Then, for consecutive chunks of
-% right-column text you should use \cs{pausenumbering}~…\
+% right-column text you should use \cs{pausenumbering}~...\
% \cs{resumenumbering}.
%
% You must use \cs{endnumbering} in a right column in the following cases:
@@ -1702,7 +1702,7 @@
% \begin{macro}{\led at error@missing at numbering}
% \begin{macrocode}
\newcommand{\led at error@missing at numbering}[1]{%
- \reledpar at error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}%
+ \reledpar at error{Missing \string\pstart\space ...\space\string\pend\space inside `#1` environment}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -3138,7 +3138,7 @@
\unless\ifnofamiliar@%
% \end{macrocode}
% \paragraph{Managing correct number}\label{familiarfootnotenumber}
-% One problem with using familiar footnotes in parallel typesetting is the fact that the order of reading notes is not the same as the order they are typset, because \LaTeX\ reads first all the notes on one side, then all the notes on the other side.
+% One problem with using familiar footnotes in parallel typesetting is the fact that the order of reading notes is not the same as the order they are typset, because \LaTeX\ reads first all the notes on one side, then all the notes on the other side.
% Then, however, \LaTeX\ alternates between typesetting left-side note and right-side notes.
% Consequently, if we do nothing special, the note numbers are sorted in the reading order, not in the typesetting order.
% So we could obtain something like 1,3,2,5,4.
@@ -3229,7 +3229,7 @@
% \subsubsection{Get correct footnote number}
% \begin{macro}{\get at familiarfootnote@number}
% \begin{macro}{\save at familiarfootnote@number}
-% As users can insert footnotes between two \cs{Pairs} or \cs{Pages} commands, we have to set the \cs+footnoteX at typeset+ counter to the last value of the \verb+footnoteX+ counter at the beginning of these two commands.
+% As users can insert footnotes between two \cs{Pairs} or \cs{Pages} commands, we have to set the \cs+footnoteX at typeset+ counter to the last value of the \verb+footnoteX+ counter at the beginning of these two commands.
% \begin{macrocode}
\newcommand{\save at familiarfootnote@number}{%
\unless\ifnofamiliar@%
@@ -6235,8 +6235,8 @@
% \begin{macro}{setnotepositionliketwocolumns at R}
% The \protect\cs{setwidthliketwocolumns} macro is called in \protect\cs{beginnumbering} in a \textbf{non-parallel}
% typesetting context, to fix the width of the lines to be vertically aligned with parallel columns. It is also called at the beginning of a note's group, if some options are enabled.
-% The \protect\cs{setposition…} macros are called in \protect\cs{beginnumbering} in a \textbf{non- parallel} typesetting context to fix the position of the lines.
-% The \protect\cs{setnoteposition…} macros are called in \protect\cs{xxxfootstart} in a \textbf{non- parallel} typesetting context to fix the position of notes block.
+% The \protect\cs{setposition...} macros are called in \protect\cs{beginnumbering} in a \textbf{non- parallel} typesetting context to fix the position of the lines.
+% The \protect\cs{setnoteposition...} macros are called in \protect\cs{xxxfootstart} in a \textbf{non- parallel} typesetting context to fix the position of notes block.
% \begin{macrocode}
\newcommand{\setwidthliketwocolumns}{%
\get at intercolumns@width%As \columns is not necessary called before \setwidthliketwocolumns
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2019-07-15 20:48:30 UTC (rev 51645)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/06/19 v2.31.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/07/15 v2.32.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -166,7 +166,7 @@
\newcommand*{\led at err@NumberingShouldHaveStarted}{%
\reledmac at error{Numbering should already have been started}{\@ehc}}
\newcommand*{\led at err@edtextoutsidepstart}{%
- \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}%
+ \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\space ...\space\pend)}{\@ehc}}%
\newcommand{\led at err@PstartInEdtext}[1]{%
\reledmac at error{\string\pstart\space in \string\edtext\space #1 argument}{\@ehc}%
@@ -213,7 +213,7 @@
\newcommand*{\led at err@PstartNotNumbered}{%
\reledmac at error{\string\pstart\space must be used within a
numbered section %
- (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}%
+ (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}}%
\newcommand*{\led at err@PstartInPstart}{%
\reledmac at error{\string\pstart\space encountered while another
\string\pstart\space was in effect}{\@ehc}}
@@ -291,7 +291,7 @@
\newcommand*{\led at err@ReverseColumns}{%
\reledmac at error{Start column is greater than end column}{\@ehc}}
\newcommand{\led at err@toendnotes at outsidenumbering}{%
- \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}%
+ \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}%
}%
\newcommand{\led at err@EdtextWithoutFootnote}{%
\reledmac at error{edtext without Xfootnote. Check syntaxis}{\@ehc}%
@@ -321,7 +321,7 @@
\reledmac at error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
\newcommand{\led at warn@edinde at outsidenumbering}{%
- \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
+ \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
\newcommand{\led at warning@hsizeX at deprecated}{%
\reledmac at warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}%
@@ -3640,6 +3640,31 @@
\fi%
\fi%
}{}%
+ \iftoggle{Xlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ and test{\ifcsequal{annot at end}{prevannot at end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot at start@print{%
+ \l at wrapcs@ifnotemptybox{Xwraplinenumannotation@\@currentseries}{\csuse{Xsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l at d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot at start@\@currentseries}{\annot at start}%
+ \global\cslet{prevannot at end@\@currentseries}{\annot at end}%
+ }%
+ {}%
}%
\newif\ifistwofollowinglines@%
\newcommand{\setistwofollowinglines}[4]{%
@@ -4930,6 +4955,31 @@
\fi%
\fi%
}{}%
+ \iftoggle{Xendlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ and test{\ifcsequal{annot at end}{prevannot at end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot at start}{prevannot at start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot at start@print{%
+ \l at wrapcs@ifnotemptybox{Xendwraplinenumannotation@\@currentseries}{\csuse{Xendsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot at end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l at d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot at start@\@currentseries}{\annot at start}%
+ \global\cslet{prevannot at end@\@currentseries}{\annot at end}%
+ }%
+ {}%
}%
\def\printendlines#1|#2|#3|#4|#5|#6|#7|#8|{%
\begingroup
@@ -5099,10 +5149,15 @@
\csgdef{Xboxendlinenum@#1}{0pt}%
\csgdef{Xboxsymlinenum@#1}{0pt}%
- \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xgroupbyline@#1}%
\newtoggle{Xgroupbylineseparetwolines@#1}%
+
+ \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xnumberonlyfirstintwolines@#1}%
+
+ \newtoggle{Xlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xtwolines@#1}{}%
\csgdef{Xmorethantwolines@#1}{}%
\csgdef{Xsublinesep@#1}{\fullstop}%
@@ -5114,7 +5169,10 @@
\newtoggle{Xpstart@#1}%
\newtoggle{Xstanza@#1}%
\csgdef{Xstanzaseparator@#1}{}%
+
\csgdef{Xsymlinenum@#1}{}%
+ \csgdef{Xsymlinenumannotation@#1}{}%
+
\newtoggle{Xnonumber@#1}%
\csgdef{Xbeforenumber@#1}{0pt}%
\csgdef{Xtxtbeforenumber@#1}{}%
@@ -5173,7 +5231,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl at notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
\noexpand\prepare at Xprenotes{#1}%
@@ -5210,7 +5268,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl at notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote at true%
\noexpand\prepare at Xprenotes{#1}%
@@ -5421,12 +5479,19 @@
\newtoggle{Xendnonumber@#1}%
\csgdef{Xendhangindent@#1}{0pt}%
+
\newtoggle{Xendnumberonlyfirstinline@#1}%
\newtoggle{Xendnumberonlyfirstintwolines@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xendbeforesymlinenum@#1}{\csuse{Xendbeforenumber@#1}}%
\csgdef{Xendaftersymlinenum@#1}{\csuse{Xendafternumber@#1}}%
+
\csgdef{Xendsymlinenum@#1}{}%
+ \csgdef{Xendsymlinenumannotation@#1}{}%
+
\csgdef{Xendboxsymlinenum@#1}{0pt}%
\csgdef{Xendbhooklinenumber@#1}{}%
@@ -5579,6 +5644,7 @@
\newhookcommand at series@reload{Xbhookgroup}{critical}
\newhookcommand at series{Xboxsymlinenum}%
\newhookcommand at series{Xsymlinenum}
+ \newhookcommand at series{Xsymlinenumannotation}%
\newhookcommand at series{Xbeforenumber}
\newhookcommand at series{Xtxtbeforenumber}
\newhookcommand at series{Xafternumber}
@@ -5594,6 +5660,8 @@
\newhookcommand at series@reload{Xafterrule}{critical}
\newhooktoggle at series{Xnumberonlyfirstinline}
\newhooktoggle at series{Xnumberonlyfirstintwolines}
+ \newhooktoggle at series{Xlinenumannotationonlyfirst}%
+ \newhooktoggle at series{Xlinenumannotationonlyfirstintwo}%
\newhooktoggle at series{Xgroupbyline}%
\newhooktoggle at series{Xgroupbylineseparetwolines}%
\newhooktoggle at series{Xnonumber}
@@ -5705,11 +5773,16 @@
\newhooktoggle at series{Xendnumberonlyfirstinline}%
\newhooktoggle at series{Xendnumberonlyfirstintwolines}%
+ \newhooktoggle at series{Xendlinenumannotationonlyfirst}%
+ \newhooktoggle at series{Xendlinenumannotationonlyfirstintwo}%
+
\newhookcommand at series{Xendsymlinenum}%
\newhookcommand at series{Xendbeforesymlinenum}%
\newhookcommand at series{Xendaftersymlinenum}%
\newhookcommand at series{Xendboxsymlinenum}%
+ \newhookcommand at series{Xendsymlinenumannotation}%
+
\newhookcommand at series{Xendbhooklinenumber}%
\newhookcommand at series{Xendahooklinenumber}%
\newhookcommand at series{Xendbhookinplaceofnumber}%
@@ -6361,6 +6434,9 @@
\newtoggle{Xlineflag at SEref}%
\toggletrue{Xlineflag at SEref}%%Here exception
+\newtoggle{Xlinenumannotationonlyfirst at SEref}%Never changed, just for the test in \setprintlines
+\newtoggle{Xlinenumannotationonlyfirst at appref}%Idem
+
\def\Xlinenumannotationposition at appref{after}%
\def\Xlinenumannotationposition at SEref{after}%
@@ -6406,6 +6482,9 @@
\newtoggle{Xendlineflag at SErefwithpage}
\toggletrue{Xendlineflag at SErefwithpage}%Here, exception
+\newtoggle{Xendlinenumannotationonlyfirst at SEref}%Never changed, just for the test in \setprintendlines
+\newtoggle{Xendlinenumannotationonlyfirst at appref}%Idem
+
\def\Xendlinenumannotationposition at apprefwithpage{after}%
\def\Xendlinenumannotationposition at apprefwithpage@SErefwithpage{after}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2019-07-14 23:53:44 UTC (rev 51644)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2019-07-15 20:48:30 UTC (rev 51645)
@@ -146,7 +146,7 @@
Use instead #1R or #1* in your preamble.}%
}
\newcommand{\led at error@missing at numbering}[1]{%
- \reledpar at error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}%
+ \reledpar at error{Missing \string\pstart\space ...\space\string\pend\space inside `#1` environment}{\@ehc}%
}%
\providecommand*{\newnamebox}[1]{%
\expandafter\newbox\csname #1\endcsname}
More information about the tex-live-commits
mailing list