summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-06-02 03:03:19 +0000
committerNorbert Preining <norbert@preining.info>2020-06-02 03:03:19 +0000
commit51cae99db4d58606cdce9181fd1f4c94e1a019de (patch)
treef685715c30d06a284e8c0a0f8cd62a22ce42079f /macros
parent6a81e69e8cf1f56e4715ede8d84cdce284117970 (diff)
CTAN sync 202006020303
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/Changes13
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile9
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib4
l---------[-rw-r--r--]macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex13
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdfbin112967 -> 112670 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdfbin169826 -> 170522 bytes
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex17
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx16
-rw-r--r--macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex4
-rw-r--r--macros/latex/contrib/crop/Makefile52
-rw-r--r--macros/latex/contrib/crop/crop.dtx112
-rw-r--r--macros/latex/contrib/crop/crop.ins2
-rw-r--r--macros/latex/contrib/crop/crop.pdfbin241734 -> 0 bytes
-rw-r--r--macros/latex/contrib/crop/crop.txt17
-rw-r--r--macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx6
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40842 -> 40837 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdfbin177475 -> 177475 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin121597 -> 121597 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin145283 -> 145283 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin189792 -> 189792 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin123178 -> 123178 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin123463 -> 123463 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.pdfbin0 -> 130290 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.tex57
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin122256 -> 122256 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin126016 -> 126016 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin18321 -> 18323 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin187631 -> 187631 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin124324 -> 124324 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin144492 -> 144492 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin138405 -> 138405 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin158108 -> 158108 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin129005 -> 129005 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin140523 -> 140523 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin135414 -> 135414 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31749 -> 31748 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin215012 -> 215012 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin190222 -> 190222 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin175170 -> 175170 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin24475 -> 24474 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin93475 -> 93475 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin37801 -> 37801 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin138222 -> 138222 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin190161 -> 190161 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin189362 -> 189362 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin168099 -> 168099 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin189915 -> 189915 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin188836 -> 188836 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin188745 -> 188745 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin188865 -> 188865 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin189690 -> 189690 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin134815 -> 134815 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin190204 -> 190204 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin201833 -> 201833 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin123601 -> 123601 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin215182 -> 215182 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin239560 -> 239560 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin125082 -> 125082 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin123151 -> 123151 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin263410 -> 263410 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin183782 -> 183782 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin118947 -> 118947 bytes
-rw-r--r--macros/latex/contrib/reledmac/makefile7
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin356785 -> 356983 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx263
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin1988159 -> 1998593 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.dtx43
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin988622 -> 987044 bytes
-rw-r--r--macros/latex/required/amscls/README4
-rw-r--r--macros/latex/required/amscls/amsclass.dtx35
-rw-r--r--macros/latex/required/amscls/amsclass.ins28
-rw-r--r--macros/latex/required/amscls/doc/amsclass.pdfbin340415 -> 340632 bytes
72 files changed, 467 insertions, 235 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes b/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
new file mode 100644
index 0000000000..56c88eae67
--- /dev/null
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/Changes
@@ -0,0 +1,13 @@
+\begin{release}{bltx-v1.2-1}{2020-06-01} \item Fix mishandling of SWHIDs and HALids when hyperref is not loaded. Fix wrong origins in some SWHIDs in the examples. Improve ASCL example. \end{release}
+\begin{release}{bltx-v1.2}{2020-05-29} \item Bump version to 1.2 with clean support of multiline SWHIDs \end{release}
+\begin{release}{bltx-v1.1}{2020-04-29} \item Add support for the institution, organization, eprint, eprinttype and eprintclass fields Force urls output when they are the only reference available Updates to the documentation \end{release}
+\begin{release}{bltx-v1.0}{2020-04-25} \item First public release \end{release}
+\begin{release}{bltx-v0.9}{2020-04-25} \item Preparing for public release: Licence, Readme, update documentation, handle suggestions from the Working Group \end{release}
+\begin{release}{bltx-v0.8}{2020-04-09} \item Make the style usable as an extension, and keep possibility of generating extended styles \end{release}
+\begin{release}{bltx-v0.7}{2020-04-09} \item Move to diff model approach to be more portable \end{release}
+\begin{release}{bltx-v0.6}{2020-04-08} \item Standardise file names, make softwarebib.tex self contained, separate out sample.tex, update Makefile, use printdate macro \end{release}
+\begin{release}{bltx-v0.5}{2020-04-08} \item Added standard list format for licenses \end{release}
+\begin{release}{bltx-v0.4}{2020-04-07} \item Added repository and licence field \end{release}
+\begin{release}{bltx-v0.3}{2020-04-05} \item Biblatex style with first complete example \end{release}
+\begin{release}{bltx-v0.2}{2020-04-02} \item Biblatex style sent for review \end{release}
+\begin{release}{bltx-v0.1}{2020-04-02} \item First version of the biblatex style \end{release}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile b/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
index 2abba8d41a..183640b050 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/Makefile
@@ -1,7 +1,10 @@
TEXS = $(wildcard *.tex)
MAIN = sample-use-sty
-all: $(MAIN).pdf
+.SILENT: distrib all
+
+
+all: $(MAIN).pdf software-biblatex.pdf
biblatex-styles: stublist mkbiblatexstubs.sh
bash mkbiblatexstubs.sh < stublist
@@ -36,7 +39,11 @@ else
rubber -m pdftex $<
endif
+
distrib:
+ # remind maintainer to update version number in the documentation
+ echo -n "Did you update the version number in software-biblatex.tex? [y/N]"
+ read ans; if [ ".$ans" != ".y" ]; then echo "Please update it and run make distrib again"; exit 0; fi
# update history
rm history.tex
make software-biblatex.pdf
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib b/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib
index 72f0793ada..34dd485943 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/biblio.bib
@@ -11,7 +11,7 @@
hal_id = {hal-02090402},
hal_version = {v1},
swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
- origin=https://hal.inria.fr/hal-02090402},
+ origin=https://hal.archives-ouvertes.fr/hal-02090402},
version = {1.1},
note = {First Scilab version. It was distributed by anonymous ftp.},
repository= {https://github.com/scilab/scilab},
@@ -37,7 +37,7 @@
month = jan,
file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
- origin=https://hal.inria.fr/hal-02090402},
+ origin=https://hal.archives-ouvertes.fr/hal-02090402},
note = {First Scilab version. It was distributed by anonymous ftp.},
crossref = {delebecque:hal-02090402}
}
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex
index d0ead656fd..c38de3d1dc 100644..120000
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/history.tex
@@ -1,12 +1 @@
-\begin{release}{bltx-v1.1}{2020-04-29} \item Add support for the institution, organization, eprint, eprinttype and eprintclass fields Force urls output when they are the only reference available Updates to the documentation \end{release}
-\begin{release}{bltx-v1.0}{2020-04-25} \item First public release \end{release}
-\begin{release}{bltx-v0.9}{2020-04-25} \item Preparing for public release: Licence, Readme, update documentation, handle suggestions from the Working Group \end{release}
-\begin{release}{bltx-v0.8}{2020-04-09} \item Make the style usable as an extension, and keep possibility of generating extended styles \end{release}
-\begin{release}{bltx-v0.7}{2020-04-09} \item Move to diff model approach to be more portable \end{release}
-\begin{release}{bltx-v0.6}{2020-04-08} \item Standardise file names, make softwarebib.tex self contained, separate out sample.tex, update Makefile, use printdate macro \end{release}
-\begin{release}{bltx-v0.5}{2020-04-08} \item Added standard list format for licenses \end{release}
-\begin{release}{bltx-v0.4}{2020-04-07} \item Added repository and licence field \end{release}
-\begin{release}{bltx-v0.3}{2020-04-05} \item Biblatex style with first complete example \end{release}
-\begin{release}{bltx-v0.2}{2020-04-02} \item Biblatex style sent for review \end{release}
-\begin{release}{bltx-v0.1}{2020-04-02} \item First version of the biblatex style \end{release}
-\begin{release}{bltx-1.2}{2020-05-27} \item Add swhid stylemap to support multiline SWHIDs \end{release}
+Changes \ No newline at end of file
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
index c8d65110ec..05fdbdbe36 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/sample-use-sty.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
index 63503343ba..12c03fedec 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
index 72de0c520e..b2f1e6e8d2 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software-biblatex.tex
@@ -14,7 +14,7 @@
url={http://mirror.ctan.org/macros/latex/exptl/biblatex-contrib/biblatex-software/},
author={Roberto Di Cosmo},
email={roberto@dicosmo.org},
- revision={1.2},
+ revision={1.2-1},
date={\today}}
\hypersetup{%
@@ -203,29 +203,32 @@ platform where the software described in the enttry is developed. The default is
It would not be reasonable to have a dedicated field for each of the many software releated identifiers that exist.
If you want to create bibliographic records that use identifiers not natively supported by this package, you
-can use the standard Bib\LaTeX\ mechanism that uses the ~eprint~, ~eprinttype~ and ~eprintclass~ fields.\\
+can use the standard Bib\LaTeX\ mechanism that uses the |eprint|, |eprinttype| and |eprintclass| fields.\\
The default formatting of these fields may be what you want, but if it's not the case, you can define
your own format, as explained in the official Bib\LaTeX\ documentation.\\
As an example, this style already contains a specific formatting definition for the Astrophysics Source Code Library (ASCL) software records,
-via the following declaration in the ~software.bbx~ file:
+via the following declaration in the \verb|software.bbx| file:
\begin{verbatim}
\DeclareFieldFormat{eprint:ascl}{%
- ascl\addcolon\space
+ \mkbibacro{ASCL}\addcolon\addspace%
\ifhyperref
{\href{https://ascl.net/#1}{%
- \nolinkurl{#1}%
+ \(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
\iffieldundef{eprintclass}
{}
{\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
- {\nolinkurl{#1}%
+ {\(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
\iffieldundef{eprintclass}
{}
- {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+ {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}
+}
\end{verbatim}
+If you want to adapt this very example to an identifier |foo| with resolver prefix |https://myfoo.org/|, just replace in the \LaTeX{} code above |https://ascl.net/| with |https://myfoo.org/|, |ascl| with |foo| and |ASCL| with |FOO|.
+
\section{Details}
The detailed information for this style is contained in the example document and
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
index 2358ec1032..48f58eb736 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/software.bbx
@@ -44,11 +44,14 @@
% Macros
%
+%
+% Notice the use of \edef to force expansion of the macro parameters before calling \nolinkurl
+%
\newbibmacro*{swurl+urldate}{%
\mkbibacro{URL}\addcolon\addspace%
\ifhyperref%
{\href{\strfield{url}}{\nolinkurl{\strfield{url}}}}%
- {\nolinkurl{\strfield{url}}}%
+ {\edef\temp{\noexpand\nolinkurl{\strfield{url}}}\temp}%
\iffieldundef{urlyear}%
{}%
{\setunit*{\addspace}%
@@ -80,7 +83,7 @@
{\mkbibacro{HAL}\addcolon\addspace%
\ifhyperref%
{\href{https://hal.archives-ouvertes.fr/#1\thefield{hal_version}}{\(\langle\)\nolinkurl{#1\thefield{hal_version}}\(\rangle\)}}%
- {\(\langle\)\nolinkurl{#1\thefield{hal_version}}\(\rangle\)}%
+ {\(\langle\)\nolinkurl{#1}\thefield{hal_version}\(\rangle\)}%
}%
{}%
}
@@ -111,17 +114,18 @@
% Add here special eprint formats
%
\DeclareFieldFormat{eprint:ascl}{%
- ascl\addcolon\space
+ \mkbibacro{ASCL}\addcolon\addspace%
\ifhyperref
{\href{https://ascl.net/#1}{%
- \nolinkurl{#1}%
+ \(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
\iffieldundef{eprintclass}
{}
{\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
- {\nolinkurl{#1}%
+ {\(\langle\)ascl\addcolon\nolinkurl{#1}\(\rangle\)%
\iffieldundef{eprintclass}
{}
- {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}}
+ {\addspace\texttt{\mkbibbrackets{\thefield{eprintclass}}}}}
+}
%
% Macros to format output
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex b/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex
index 7cc89052fb..69dcbabb63 100644
--- a/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex
+++ b/macros/latex/contrib/biblatex-contrib/biblatex-software/swentries.tex
@@ -126,7 +126,7 @@ This is an example description of a software release using a single \texttt{@sof
hal_id = {hal-02090402},
hal_version = {v1},
swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
- origin=https://hal.inria.fr/hal-02090402},
+ origin=https://hal.archives-ouvertes.fr/hal-02090402},
version = {1.1},
note = {First Scilab version. It was distributed by anonymous ftp.},
repository= {https://github.com/scilab/scilab},
@@ -159,7 +159,7 @@ other versions only the changes need to be added in a new \texttt{@softwareversi
month = jan,
file = {https://hal.inria.fr/hal-02090402/file/scilab-1.1.tar.gz},
swhid = {swh:1:dir:1ba0b67b5d0c8f10961d878d91ae9d6e499d746a;
- origin=https://hal.inria.fr/hal-02090402},
+ origin=https://hal.archives-ouvertes.fr/hal-02090402},
note = {First Scilab version. It was distributed by anonymous ftp.},
crossref = {delebecque:hal-02090402}
}
diff --git a/macros/latex/contrib/crop/Makefile b/macros/latex/contrib/crop/Makefile
index 979d0d5623..09679fec8c 100644
--- a/macros/latex/contrib/crop/Makefile
+++ b/macros/latex/contrib/crop/Makefile
@@ -1,31 +1,8 @@
-# $Id: Makefile,v 1.11 2002/11/22 08:34:30 m Rel $
-
NAME=crop
ARCHIVE_NAME=$(NAME).tar.gz
ARCHIVE_CONTENTS=$(NAME).dtx Makefile $(NAME).txt $(NAME).ins
-MAKEIDXOPT=
-DVIPSOPT= #-Pcmz -Pamz
-DEP=$(NAME).sty
-
-all: $(NAME).ps
-
-print: $(NAME).ps
- psbook $(NAME).ps|psnup -2|psselect -e|lpr
- @ echo -n revert paper stack and hit return
- @ read key
- psbook $(NAME).ps|psnup -2|psselect -o -r|lpr
-
-ps: $(NAME).ps
-
-%.ps: %.dvi
- dvips $(DVIPSOPT) $< -o $@
-
-pdf: $(NAME).pdf
-
-%.pdf: %.dtx
- pdflatex $<
-arc: archive
+all: $(NAME).sty $(NAME).pdf
archive: $(NAME).ins
@ tar -czf $(ARCHIVE_NAME) $(ARCHIVE_CONTENTS)
@@ -33,30 +10,11 @@ archive: $(NAME).ins
@ echo ====================
@ tar -tzf $(ARCHIVE_NAME)
-clean:
- rm -f $(NAME).{log,toc,lot,lof,idx,ilg,ind,aux,blg,bbl,dvi,ins}
+$(NAME).pdf:
+ latexmk $(NAME).dtx
-distclean: clean
- rm -f $(NAME).{ps,pdf,sty} $(ARCHIVE_NAME)
-
-
-REFWARN = 'Rerun to get cross-references'
-LATEXMAX = 5
-
-%.dvi: %.dtx $(DEP)
- latex $<
- RUNS=$(LATEXMAX); \
- while [ $$RUNS -gt 0 ] ; do \
- if grep $(REFWARN) $*.log > /dev/null; \
- then latex $< ; else break; fi; \
- RUNS=`expr $$RUNS - 1`; \
- done
-
-$(NAME).sty: $(NAME).ins FORCE
+$(NAME).sty: $(NAME).ins
tex $(NAME).ins
$(NAME).ins:
- latex $(NAME).dtx
-
-FORCE:
-
+ pdflatex $(NAME).dtx
diff --git a/macros/latex/contrib/crop/crop.dtx b/macros/latex/contrib/crop/crop.dtx
index 321cd24c24..cb0cfd8b4d 100644
--- a/macros/latex/contrib/crop/crop.dtx
+++ b/macros/latex/contrib/crop/crop.dtx
@@ -1,7 +1,6 @@
% \iffalse
-%% File: crop.dtx Copyright (C) 1998--2003 Melchior FRANZ
-%% $Id: crop.dtx,v 1.92 2003/05/19 20:05:17 m Rel $
-%% $Version: 1.9 $
+%% File: crop.dtx Copyright (C) 1998--2017 Melchior FRANZ
+%
%<*preamble>
%
%
@@ -28,15 +27,15 @@
%% ====================================================================
%% @LaTeX-package-file{
%% author = "Melchior FRANZ",
-%% version = "1.9",
-%% date = "20 May 2003",
+%% version = "1.10",
+%% date = "19 Nov 2017",
%% filename = "crop.dtx",
%% address = "Melchior FRANZ
%% Rieder Hauptstrasse 52
%% A-5212 SCHNEEGATTERN
%% AUSTRIA",
-%% URL = "http://www.unet.univie.ac.at/~a8603365/",
-%% email = "a8603365@unet.univie.ac.at",
+%% URL = "https://github.com/drehscheibe/crop/",
+%% email = "mfranz@aon.at",
%% codetable = "ISO/ASCII",
%% keywords = "cropmarks, frame, mirror, rotate, invert",
%% supported = "yes",
@@ -75,9 +74,20 @@
%
%
%<*driver>
-\def\fileversion{1.9}
-\def\filedate{2003/05/20}
-\documentclass[draft]{ltxdoc}
+\def\fileversion{1.10}
+\def\filedate{2017/11/19}
+\documentclass{ltxdoc}
+\usepackage{hyperref}
+\hypersetup{
+ bookmarksopen,
+ colorlinks,
+ pdftitle={The crop package},
+ pdfauthor={Melchior FRANZ},
+ pdfkeywords={crop marks, mirror, invert, center}
+}
+\usepackage[pdftex]{graphicx,color}
+%
+%
%
\newcommand*\option{\textsf}
\newcommand*\package{\texttt}
@@ -130,7 +140,7 @@
% \fi
%
%
-% \CheckSum{1063}
+% \CheckSum{1098}
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -154,7 +164,7 @@
% \title{The \CROP\ package}
%
% \author{Melchior \textsc{FRANZ}}
-% \date{May 20, 2003}
+% \date{Nov 19, 2017}
% \maketitle
%
%
@@ -199,6 +209,8 @@
% \changes{v1.9}{2003/05/20}{don't create command sequences by merely
% checking for them}
%
+% \changes{v1.10}{2017/11/19}{fix dimensions of a1, a2, a5 and a6 paper; add
+% support for LuaTeX.}
%
%
% \begin{abstract}
@@ -258,9 +270,9 @@
% b0, b1, b2, b3, b4, b5, b6, letter, legal, executive]\hfill\break
% These options declare the printing paper dimensions. One of them should be
% specified if the \option{center} option or one of the options \option{dvips},
-% \option{pdftex} and \option{vtex} is used. The size options do not
-% define the logical document page size! See section~\ref{sec:custom-logical}
-% for how to achieve this.
+% \option{pdftex}, \option{luatex} and \option{vtex} is used. The size options
+% do not define the logical document page size! See
+% section~\ref{sec:custom-logical} for how to achieve this.
%
% \item[\itemfont width, height]---
% Instead of using one of the pre-defined paper formats as described
@@ -279,11 +291,12 @@
% to center a document on \emph{landscape oriented} paper. It has nothing
% to do with \LaTeX's |landscape| document class option.
%
-% \item[\itemfont dvips, pdftex, pdflatex, vtex, nodriver]---
-% If you are working with \program{dvips}, \program{pdftex} or \program{vtex}
+% \item[\itemfont dvips, pdftex, pdflatex, luatex, lualatex, vtex, nodriver]---
+% If you are working with \program{dvips}, \program{pdftex},
+% \program{luatex} or \program{vtex}
% you may want to pass the dimensions of the paper that you are planning to print on to
-% the respective driver program. Especially viewer programs like \program{gs}
-% or \program{gv} make use of this \emph{bounding box} information. Unfortunately,
+% the respective driver program. Especially viewer programs like \program{evince}
+% or \program{xpdf} make use of this \emph{bounding box} information. Unfortunately,
% this can't be done in a generic way---there's no standard. These options select
% driver specific methods to set the paper size and to rotate and reflect a page.
%
@@ -296,7 +309,8 @@
% through \program{pdflatex}. In this case \CROP\ will automatically use
% the \option{pdflatex} driver. You can also force \CROP\ not to use any
% of the drivers by requesting the \option{nodriver} option.
-% \option{pdflatex} is a synonym for \option{pdftex}.
+% \option{pdflatex} is a synonym for \option{pdftex}, and \option{lualatex}
+% is a synonym for \option{luatex}.
%
% \item[\itemfont mirror]
% This option reflects the whole document, provided that the selected output
@@ -599,7 +613,8 @@
%
% \subsection{Custom printing paper sheet size}
%
-% If you want to use one of the \option{center}, \option{dvips}, \option{pdftex} or \option{vtex}
+% If you want to use one of the \option{center}, \option{dvips}, \option{pdftex},
+% \option{pdflatex}, \option{luatex}, \option{lualatex} or \option{vtex}
% options together with non-standard printing paper, you can set it
% via the \option{width} and \option{height} option, or simply add
% the respective paper definition to your |crop.cfg| file (see \ref{sec:config}).
@@ -772,6 +787,10 @@
% (Tested with |graphics.sty|, version~1.0l as of 1999/02/16.)
%
%
+% \subsubsection{\package{ifluatex.sty}}
+%
+% \CROP's driver detection depends on the \package{ifluatex} package.
+%
%
% \StopEventually{\addtocontents{toc}{\protect\end{multicols}}}
%
@@ -807,7 +826,8 @@
% \begin{macrocode}
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{crop}[2003/05/20 v1.9 crop marks (mf)]
+\ProvidesPackage{crop}[2017/11/19 1.10 crop marks (mf)]
+\RequirePackage{ifluatex}
\expandafter\ifx\csname stockwidth\endcsname\relax
\newdimen\stockwidth
\stockwidth\paperwidth
@@ -922,6 +942,8 @@
\DeclareOption{vtex}{\def\CROP@reqdriver{vtex}}
\DeclareOption{pdftex}{\def\CROP@reqdriver{pdftex}}
\DeclareOption{pdflatex}{\def\CROP@reqdriver{pdftex}}
+\DeclareOption{luatex}{\def\CROP@reqdriver{luatex}}
+\DeclareOption{lualatex}{\def\CROP@reqdriver{luatex}}
\DeclareOption{dvips}{\def\CROP@reqdriver{dvips}}
% \end{macrocode}
% \end{macro}
@@ -942,6 +964,8 @@
\DeclareOption{vtex!}{\def\CROP@driver{vtex}}
\DeclareOption{pdftex!}{\def\CROP@driver{pdftex}}
\DeclareOption{pdflatex!}{\def\CROP@driver{pdftex}}
+\DeclareOption{luatex!}{\def\CROP@driver{luatex}}
+\DeclareOption{lualatex!}{\def\CROP@driver{luatex}}
\DeclareOption{dvips!}{\def\CROP@driver{dvips}}
\DeclareOption{nodriver}{\def\CROP@driver{none}}
\DeclareOption{!}{\def\CROP@driver{none}}
@@ -965,10 +989,14 @@
\newcommand*\CROP@evaldriver{%
\ifx\CROP@driver\@empty
\PackageInfo{crop}{requested driver: `\CROP@reqdriver'}%
- \ifx\pdfoutput\@undefined\else
- \ifx\pdfoutput\relax\else
- \ifcase\pdfoutput\else
- \def\CROP@detdriver{pdftex}%
+ \ifluatex
+ \def\CROP@detdriver{luatex}%
+ \else
+ \ifx\pdfoutput\@undefined\else
+ \ifx\pdfoutput\relax\else
+ \ifcase\pdfoutput\else
+ \def\CROP@detdriver{pdftex}%
+ \fi
\fi
\fi
\fi
@@ -1015,6 +1043,7 @@
%
% \begin{macro}{\CROP@init@dvips}
% \begin{macro}{\CROP@init@pdftex}
+% \begin{macro}{\CROP@init@luatex}
% \begin{macro}{\CROP@init@vtex}
% \begin{macro}{\CROP@init@none}
% These macros prepare the \CROP\ package for one of the supported
@@ -1031,8 +1060,17 @@
}
\newcommand*\CROP@init@pdftex{%
\PackageInfo{crop}{using `pdftex' graphics driver}%
- \pdfpagewidth\stockwidth
- \pdfpageheight\stockheight
+ \let\CROP@reflect\CROP@genreflect
+ \let\CROP@rotate\CROP@genrotate
+ \newcommand*\CROP@shiphook{%
+ \pdfpagewidth\stockwidth
+ \pdfpageheight\stockheight
+ }%
+}
+\newcommand*\CROP@init@luatex{%
+ \PackageInfo{crop}{using `luatex' graphics driver}%
+ \pagewidth\stockwidth
+ \pageheight\stockheight
\let\CROP@reflect\CROP@genreflect
\let\CROP@rotate\CROP@genrotate
}
@@ -1051,6 +1089,7 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
%
%
@@ -1067,8 +1106,9 @@
% \begin{macro}{\CROP@opt@height}
% These options set different standard printing paper sizes, which
% are needed for centering and as a hint for the \program{dvips},
-% \program{pdftex} or \program{vtex} program. Since the physical paper
-% dimensions must not underlie a possible scaling, |true| dimensions
+% \program{pdftex}, \program{luatex} or \program{vtex} program.
+% Since the physical paper
+% dimensions must not undergo a possible scaling, |true| dimensions
% are used. The \option{landscape} option exchanges the |\hoffset| and
% |\voffset| values.
%
@@ -1078,12 +1118,12 @@
\def\CROP@size#1#2{\stockheight#1 \stockwidth#2 }%
}
\DeclareOption{a0}{\CROP@size{841truemm}{1189truemm}}
-\DeclareOption{a1}{\CROP@size{595truemm}{841truemm}}
-\DeclareOption{a2}{\CROP@size{420truemm}{595truemm}}
+\DeclareOption{a1}{\CROP@size{594truemm}{841truemm}}
+\DeclareOption{a2}{\CROP@size{420truemm}{594truemm}}
\DeclareOption{a3}{\CROP@size{297truemm}{420truemm}}
\DeclareOption{a4}{\CROP@size{210truemm}{297truemm}}
-\DeclareOption{a5}{\CROP@size{149truemm}{210truemm}}
-\DeclareOption{a6}{\CROP@size{105truemm}{149truemm}}
+\DeclareOption{a5}{\CROP@size{148truemm}{210truemm}}
+\DeclareOption{a6}{\CROP@size{105truemm}{148truemm}}
\DeclareOption{b0}{\CROP@size{1000truemm}{1414truemm}}
\DeclareOption{b1}{\CROP@size{707truemm}{1000truemm}}
\DeclareOption{b2}{\CROP@size{500truemm}{707truemm}}
@@ -1585,6 +1625,7 @@
\box\@cclv
}
\newcommand*\CROP@@ship{%
+ \csname CROP@shiphook\endcsname
\CROP@shipout\vbox{\CROP@shiplist}%
}
% \end{macrocode}
@@ -1811,7 +1852,8 @@
% The \option{mirror} and \option{rotate} options add a macro to the
% \emph{shiplist,} which then gets every output page and embeds it in
% a \POSTSCRIPT\ environment (\option{dvips}) or lets the
-% \package{graphics} package reflect or rotate it (\option{pdftex}).
+% \package{graphics} package reflect or rotate it (\option{pdftex} or
+% \option{luatex}).
% We could also use the generic operations |\CROP@genreflect| and
% |\CROP@genrotate| for the \option{dvips} mode. They would produce
% correct \PS\ documents, the intermediate \DVI\ document, however,
diff --git a/macros/latex/contrib/crop/crop.ins b/macros/latex/contrib/crop/crop.ins
index fbc4e74c58..d07ecbad9e 100644
--- a/macros/latex/contrib/crop/crop.ins
+++ b/macros/latex/contrib/crop/crop.ins
@@ -1,6 +1,6 @@
%% LaTeX2e file `crop.ins'
%% generated by the `filecontents' environment
-%% from source `crop' on 2003/05/20.
+%% from source `crop' on 2020/06/01.
%%
\def\batchfile{crop.ins}
\input docstrip.tex
diff --git a/macros/latex/contrib/crop/crop.pdf b/macros/latex/contrib/crop/crop.pdf
deleted file mode 100644
index 043de5a701..0000000000
--- a/macros/latex/contrib/crop/crop.pdf
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/crop/crop.txt b/macros/latex/contrib/crop/crop.txt
index 2503cc975f..3d09373de8 100644
--- a/macros/latex/contrib/crop/crop.txt
+++ b/macros/latex/contrib/crop/crop.txt
@@ -1,5 +1,3 @@
-$Id: crop.txt,v 1.7 2003/05/19 20:05:17 m Rel $
-
crop.sty
========
@@ -16,14 +14,11 @@ either text or graphics output.
author = "Melchior FRANZ"
-version = "1.9"
-date = "20 May 2003"
-address = "Melchior FRANZ
- Rieder Hauptstrasse 52
- A-5212 SCHNEEGATTERN
- AUSTRIA"
-URL = "http://www.unet.univie.ac.at/~a8603365/"
-email = "a8603365@unet.univie.ac.at"
+maintainer = "Reuben Thomas"
+version = "1.10"
+date = "19 Nov 2017"
+URL = "https://github.org/rrthomas/crop/"
+email = "rrt@sc3d.org"
codetable = "ISO/ASCII"
keywords = "cropmarks, frame, mirror, rotate, invert"
supported = "yes"
@@ -53,5 +48,3 @@ Now generate the style file:
And finally to produce the documentation run LaTeX three times:
$ latex crop.dtx
-
-
diff --git a/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx b/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx
index e8e006ff71..12594049c6 100644
--- a/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx
+++ b/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx
@@ -442,4 +442,8 @@ If you have multiple annotations for the same line, these are now separated with
%
%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.
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
index dc6a51a5d9..a455f02b69 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index f9771ae072..5935bae5d8 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index d12c397b82..31be861852 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index b2e0bb4627..9d54f38025 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index 37aa73b06b..b195630dc0 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index ebe04af48f..159903a0d6 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index 8cc2ada791..6a0c99ad0e 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
new file mode 100644
index 0000000000..05b100fb1f
--- /dev/null
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.tex b/macros/latex/contrib/reledmac/examples/2-antilabe.tex
new file mode 100644
index 0000000000..072642d93c
--- /dev/null
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.tex
@@ -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}
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index f59f0bca02..2d3719d535 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index 50391654ab..e0dbfff0c4 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index 1e3445c3bd..a2b453c3e4 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index 4981b5163b..9a76298cb5 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 74c679e41c..22e0826cd1 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
index 2b1f403e27..e011eeb54c 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index 295c8884bb..cd381cf4e3 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index 11c2f93e6c..45e7ae9403 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index 924ef53ac7..556119bbce 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
index f6d8bb17b2..0ca4789623 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 3b4b87a531..4b7341a269 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
index 6bfceadfac..a478110c8d 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
index de365b3513..8e88dccfa5 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 939a78313e..27843c5295 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 3a0c908903..f118674fa7 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
index 7d312490b8..17fff4e145 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
index dc4a7f0d62..e7618cb75b 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index 17fababeee..a60b5d0f93 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index b2acab194b..131519a5fb 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index d974063be6..0a8932520d 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index ac531298a1..f47d3907d6 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
index 8e0223489a..6e81bf9214 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index b9fbe0622d..5170599e0c 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index 2eb0b827a4..65637ef412 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index d6576fa659..4b835d164b 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index bc787da6d0..8eb806d1c4 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index 266d7a5518..6495d6076b 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index 79355f46ad..44e0594ecc 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
index d2965b46d8..dffe46f62f 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index db408ff1c3..2c167f5616 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 3ae61cfab2..a9b5163e7f 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index 33ec708a95..a79132eb6f 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
index 99f8dcd0d4..db24043bb5 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 6c271d9f0a..ad7aac9a44 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index e5dd10e1d4..20889990c7 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index 11a42f9f20..132b040730 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index 31525237b5..673b4a76ce 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
index e78443b39c..e6e977ba83 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/makefile b/macros/latex/contrib/reledmac/makefile
index 87f38bb0e7..50505a544d 100644
--- a/macros/latex/contrib/reledmac/makefile
+++ b/macros/latex/contrib/reledmac/makefile
@@ -3,7 +3,7 @@ PACKAGE = *.dtx \
reledmac.pdf \
reledpar.pdf \
migration.pdf \
- README \
+ README.md \
makefile \
latexmkrc \
@@ -12,7 +12,7 @@ PACKAGE = *.dtx \
.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 @@ migration.pdf: migration.dtx
pdflatex $<
pdflatex $<
-README: README.md
- pandoc README.md -o README
-
%.sty: %.ins %.dtx
rm -f $*.sty
@pdflatex $*.ins
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index f94e8e176d..3dc388eeee 100644
--- a/macros/latex/contrib/reledmac/migration.pdf
+++ b/macros/latex/contrib/reledmac/migration.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index 1596d4231e..447ba8a73f 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -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@true%
}%
+\newif\ifantilabe@%
+\DeclareOptionX{antilabe}{%
+ \antilabe@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@warn@BadHookSeries}
+% \begin{macrocode}
+\newcommand{\led@warn@BadHookSeries}[2]{%
+ \reledmac@warning{Bad series #1 for #2 hook. Skipped.}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led@warn@BadSidenotemargin}
% \begin{macrocode}
\newcommand*{\led@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@end@every@pend%
\endgraf\global\num@lines=\prevgraf\egroup%
\global\par@line=0%
+ \get@firsthalf@antilabe@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@appenditem{%
\noexpand\led@set@index@fornote{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
+ \unexpanded{\gdef\@currentnotetype{familiar}}%
\unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}%
\noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}%
\noexpand\led@reinit@index@fornote%
@@ -12922,6 +13010,7 @@
\xright@appenditem{%
\noexpand\led@set@index@fornote{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
+ \unexpanded{\gdef\@currentnotetype{familiar}}%
\unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}%
\noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}%
\noexpand\led@reinit@index@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@true%
+ \unexpanded{\gdef\@currentnotetype{critical}}%
\noexpand\prepare@Xprenotes{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
\unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}%The value of the \sw@inthisedtext of current \edtext will be pushed to \sw@list@inedtext when the notes are expanded.
@@ -14708,6 +14799,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote@true%
+ \unexpanded{\gdef\@currentnotetype{critical}}%
\noexpand\prepare@Xprenotes{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
\unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}%The value of the \sw@inthisedtext of current edtext will be pushed to \sw@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@typeset}%Not directly used by user, but internal
\newtoggle{txtbeforenotesonlyonceX@#1}%
@@ -15182,13 +15275,17 @@
% \begin{macrocode}
\newcommandx{\settoggle@series}[5][4,5,usedefault]{%
\def\do##1{%
- \global\settoggle{#2@##1}{#3}%
+ \ifcsdef{etb@tgl@#2@##1}{%
+ \global\settoggle{#2@##1}{#3}%
+ }{%
+ \led@warn@BadHookSeries{##1}{#2}%
+ }%
\ifstrequal{#4}{critical}{
\csuse{Xarrangement@\csuse{series@display##1}}{##1}%
}{}
- \ifstrequal{#4}{familiar}{
+ \ifstrequal{#4}{familiar}{%
\csuse{arrangementX@\csuse{series@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@series}[5][4,5,usedefault]{%
+\newcommandx{\setcommand@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@warn@BadHookSeries{##1}{#2}%
+ }%
\ifstrequal{#4}{critical}{%
\csuse{Xarrangement@\csuse{series@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@series} can take an second optional argument (third argument).}
% \changes{v1.21.0}{2015/04/13}{\protect\cs{newhookcommand@series} can take an optional argument.}
% \begin{macrocode}
-\newcommandx{\newhookcommand@series}[2][2,usedefault]{%
+\newcommandx{\newhookcommand@series}[3][2,3=0,usedefault]{%
\global\expandafter\newcommand\expandafter*\csname #1\endcsname[2][]{%
- \setcommand@series{##1}{#1}{##2}[][#2]%
+ \setcommand@series{##1}{#1}{##2}[][#2][#3]%
}%
\ifstrempty{#2}{}{%
\def\do##1{%
@@ -15370,6 +15474,8 @@
\newhookcommand@series{Xparafootsep}
\newhookcommand@series@reload{Xwidth}{critical}%
+ \newhookcommand@series{Xinnotemark}[][1]%
+
\ifundef{\Xhsize}%
{%
\newcommandx{\Xhsize}[2][1,usedefault]{%
@@ -15419,6 +15525,8 @@
\newhookcommand@series{txtbeforenotesX}%
\newhooktoggle@series{txtbeforenotesonlyonceX}%
\newhookcommand@series@reload{widthX}{familiar}%
+ \newhookcommand@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@command}{"^^J
+ :open "\string\ledinnote[\edindexlab\thelabidx]{\@index@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@command}{"^^J
+ :open "\string\ledinnote{\@index@command}{\@currentseries}{\@currentnotetype}{"^^J
:close "}"^^J
:attr "ledinnote\thelabidx"^^J
)
@@ -17880,7 +17988,7 @@
% \begin{macrocode}
\else%
\gdef\@ledinnote@command{%
- ledinnote[\edindexlab\thelabidx]{\@index@command}%
+ ledinnote[\edindexlab\thelabidx]{\@index@command}{\@currentseries}{\@currentnotetype}%
}%
\fi%
}
@@ -17911,31 +18019,41 @@
% \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@hyperindex}}%
or%
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@modulo}
-% Since version 0.13, the \verb+stanzaindentsrepetition+ counter can be used when the indentation is repeated every n verses.
-% The \protect\cs{managestanza@modulo} is a command which modifies the counter stanza@modulo. The command adds 1 to stanza@modulo, but if stanza@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@modulo} macro modifies the counter stanza@modulo. The command adds 1 to stanza@modulo, but if stanza@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@modulo
\newcommand*{\managestanza@modulo}[0]{%
@@ -18579,6 +18702,7 @@
% \subsection{Main work}
% \begin{macro}{\stanza@line}
% \begin{macro}{\stanza@hang}
+% \begin{macro}{\stanza@indent}
% \begin{macro}{\sza@penalty}
% Now we arrive at the main works. \protect\cs{stanza@line} sets the
% indentation for the line and starts a numbered paragraph---each
@@ -18596,23 +18720,35 @@
% places in the stanza for page breaking.
% \begin{macrocode}
\newcommandx{\stanza@line}[2][1,2,usedefault]{%
- \ifnum\value{stanzaindentsrepetition}=0
+ \stanza@indent%
+ \pstart[#1][#2]\stanza@hang\ignorespaces%
+}%
+\newcommand{\stanza@indent}{%
+ \ifboolexpr{%
+ test {\ifnumequal{\value{stanzaindentsrepetition}}{0}}%
+ or%
+ test {\ifnumless{\number\stanza@count}{\value{startstanzaindentsrepetition}}}%
+ }{%
\ifcsdef{sza@\number\stanza@count @}%
{%
\parindent=\csname sza@\number\stanza@count @\endcsname\stanzaindentbase%
}{%
\led@err@StanzaIndentNotDefined%
}%
- \else
+ }{%
\ifcsdef{sza@\number\stanza@modulo @}{%
- \parindent=\csname sza@\number\stanza@modulo @\endcsname\stanzaindentbase%
+ \count0=\numexpr%
+ \stanza@modulo%
+ - 1%
+ + \value{startstanzaindentsrepetition}%
+ \relax%
+ \parindent=\csname sza@\number\count0 @\endcsname\stanzaindentbase%
\managestanza@modulo%
}%
{%
\led@err@StanzaIndentNotDefined%
}%
- \fi
- \pstart[#1][#2]\stanza@hang\ignorespaces%
+ }%
}%
\xdef\stanza@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,8 +18922,50 @@
\setstanzavalues{szp}{0}
% \end{macrocode}
-%
-%
+% \subsection{Dealing with antilabe}
+% \begin{macro}{\firsthalf@antilabe@wd}
+% \begin{macro}{\get@firsthalf@antilabe@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@antilabe@wd%
+ \newcommand\get@firsthalf@antilabe@wd{%
+ \ifboolexpr{bool {instanza} or bool {inastanzaL} or bool {inastanzaR}}{%
+ \vbadness=10000%
+ \splittopskip=\z@%
+ \ifl@dpairing%
+ \ifledRcol%
+ \setbox0=\copy\csname l@dRcolrawbox\the\l@dnumpstartsR\endcsname%
+ \else%
+ \setbox0=\copy\csname l@dLcolrawbox\the\l@dnumpstartsL\endcsname%
+ \fi%
+ \else%
+ \setbox0=\copy\raw@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@antilabe@wd=\wd1%
+ }{}%
+ }%
+ \def\beforeantilabe{}%
+ \def\afterantilabe{}%
+ \newcommand{\antilabe}[1]{%
+ \beforeantilabe\hbox to\firsthalf@antilabe@wd{#1}\afterantilabe%
+ }%
+\else%
+ \let\get@firsthalf@antilabe@wd\relax%
+\fi%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \section{Apparatus of Manuscripts}
% \subsection{User level macro}
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index a0576ab271..f3260c9268 100644
--- a/macros/latex/contrib/reledmac/reledmac.pdf
+++ b/macros/latex/contrib/reledmac/reledmac.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx
index f2f6051560..2570473276 100644
--- a/macros/latex/contrib/reledmac/reledpar.dtx
+++ b/macros/latex/contrib/reledmac/reledpar.dtx
@@ -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@err@polyglossiaTooOld}{%
\reledpar@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@end@every@pend%
\endgraf\global\num@lines=\prevgraf\egroup%
\global\par@line=0%
+ \get@firsthalf@antilabe@wd%
% \end{macrocode}
% End the group that was begun in the \protect\cs{pstart}.
% \begin{macrocode}
@@ -3886,6 +3871,7 @@
\@at@end@every@pend%
\endgraf\global\num@linesR=\prevgraf\egroup%
\global\par@lineR=0%
+ \get@firsthalf@antilabe@wd%
\endgroup%
\ignorespaces%
\@oldnobreak%
@@ -5453,22 +5439,7 @@
% the paragraph style --- each line is treated as a paragraph.
% \begin{macrocode}
\newcommand*{\@astanza@line}{%
- \ifnum\value{stanzaindentsrepetition}=0
- \ifcsdef{sza@\number\stanza@count @}%
- {%
- \parindent=\csname sza@\number\stanza@count @\endcsname\stanzaindentbase%
- }{%
- \led@err@StanzaIndentNotDefined%
- }%
- \else
- \ifcsdef{sza@\number\stanza@modulo @}{%
- \parindent=\csname sza@\number\stanza@modulo @\endcsname\stanzaindentbase%
- \managestanza@modulo%
- }%
- {%
- \led@err@StanzaIndentNotDefined%
- }%
- \fi
+ \stanza@indent%
\endgraf
\stanza@hang%
\ignorespaces}
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index be9208735d..e6c384bd1b 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ
diff --git a/macros/latex/required/amscls/README b/macros/latex/required/amscls/README
index 9c4528e516..96bd1cb935 100644
--- a/macros/latex/required/amscls/README
+++ b/macros/latex/required/amscls/README
@@ -1,6 +1,6 @@
-README file for AMS document classes amsart/book/proc 2.20.5 [2020/05/21]
+README file for AMS document classes amsart/book/proc 2.20.6 [2020/05/29]
-Copyright 2004, 2010, 2014-2017, 2020 American Mathematical Society.
+Copyright 2004, 2010, 2014-2020 American Mathematical Society.
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/macros/latex/required/amscls/amsclass.dtx b/macros/latex/required/amscls/amsclass.dtx
index b070629d7a..9b8b5b468c 100644
--- a/macros/latex/required/amscls/amsclass.dtx
+++ b/macros/latex/required/amscls/amsclass.dtx
@@ -1,6 +1,6 @@
% \def\filename{amsclass.dtx}
-% \def\fileversion{2.20.5}
-% \def\filedate{2020/05/21}
+% \def\fileversion{2.20.6}
+% \def\filedate{2020/05/29}
%
% \iffalse meta-comment
%
@@ -15,14 +15,21 @@
% fax: (401) 331-3842
% email: tech-support@ams.org
%
-% Copyright 1995, 1999, 2004, 2009, 2015, 2017, 2020 American
-% Mathematical Society.
-%
-% Unlimited copying and redistribution of this file are permitted as
-% long as this file is not modified. Modifications, and distribution
-% of modified versions, are permitted, but only if the resulting file
-% is renamed.
-%
+% Copyright 1995, 1999, 2004, 2009-2020 American Mathematical Society.
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3c
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is the American Mathematical
+% Society.
+%
% \fi
%
% \iffalse
@@ -75,13 +82,13 @@
\NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX)
[1995/06/01]% LaTeX date must be June 1995 or later
%<*amsart>
-\ProvidesClass{amsart}[2020/05/21 v2.20.5]
+\ProvidesClass{amsart}[2020/05/29 v2.20.6]
%</amsart>
%<*amsproc>
-\ProvidesClass{amsproc}[2020/05/21 v2.20.5]
+\ProvidesClass{amsproc}[2020/05/29 v2.20.6]
%</amsproc>
%<*amsbook>
-\ProvidesClass{amsbook}[2020/05/21 v2.20.5]
+\ProvidesClass{amsbook}[2020/05/29 v2.20.6]
%</amsbook>
% \end{macrocode}
% For \pkg{amsthm} we need to guard against redundant loading via
@@ -98,7 +105,7 @@
\csname ver@\@currname.\@currext\endcsname
%</classes>
%<*amsthm>
-\ProvidesPackage{amsthm}[2020/05/21 v2.20.5]
+\ProvidesPackage{amsthm}[2020/05/29 v2.20.6]
%</amsthm>
% \end{macrocode}
%
diff --git a/macros/latex/required/amscls/amsclass.ins b/macros/latex/required/amscls/amsclass.ins
index 9cebbc4939..7c63d7fa69 100644
--- a/macros/latex/required/amscls/amsclass.ins
+++ b/macros/latex/required/amscls/amsclass.ins
@@ -1,6 +1,6 @@
%% filename: amsclass.ins
-%% version: 3.03
-%% date: 2015/03/04
+%% version: 3.04
+%% date: 2020/05/29
%%
%% American Mathematical Society
%% Technical Support
@@ -13,7 +13,7 @@
%% fax: (401) 331-3842
%% email: tech-support@ams.org
%%
-%% Copyright 1999, 2010, 2011, 2014-2020 American Mathematical Society.
+%% Copyright 1995, 1999, 2004, 2009-2020 American Mathematical Society.
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -37,11 +37,9 @@
\keepsilent
\preamble
-
This is a generated file.
-Copyright 1995, 1999, 2004, 2009, 2015, 2017, 2020 American
-Mathematical Society.
+Copyright 1995, 1999, 2004, 2009-2020 American Mathematical Society.
American Mathematical Society
Technical Support
@@ -54,10 +52,20 @@ tel: (401) 455-4080
fax: (401) 331-3842
email: tech-support@ams.org
-Unlimited copying and redistribution of this file are permitted as
-long as this file is not modified. Modifications, and distribution
-of modified versions, are permitted, but only if the resulting file
-is renamed.
+This work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+of this license or (at your option) any later version.
+The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+and version 1.3c or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is the American Mathematical
+Society.
+
+========================================================================
\endpreamble
diff --git a/macros/latex/required/amscls/doc/amsclass.pdf b/macros/latex/required/amscls/doc/amsclass.pdf
index cc7d0a7856..cc83c94b8e 100644
--- a/macros/latex/required/amscls/doc/amsclass.pdf
+++ b/macros/latex/required/amscls/doc/amsclass.pdf
Binary files differ