summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/reledmac
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/reledmac')
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40808 -> 40839 bytes
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.tex22
-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.pdfbin189798 -> 189798 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-cross_referencing.pdfbin122256 -> 122256 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin126045 -> 126016 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex2
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin18103 -> 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.pdfbin31578 -> 31754 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex6
-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.pdfbin24281 -> 24477 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.pdfbin37805 -> 37801 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.tex2
-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.pdfbin190134 -> 190204 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex4
-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/makefile2
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin356254 -> 356244 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx179
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin1982228 -> 1847190 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.dtx41
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin987328 -> 988616 bytes
56 files changed, 160 insertions, 98 deletions
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 8d9a06b286..a573eab690 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/doc-more/page-typesetting-columns.tex b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.tex
index e40dc5f6ff..70986e353f 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.tex
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.tex
@@ -1,7 +1,7 @@
\documentclass[11pt,a4paper]{article}
\usepackage{fontspec}
\usepackage{unicode-math}
-\usepackage{libertineotf}
+\usepackage{libertine}
\usepackage{tikz}
\usepackage{csquotes}
\newcommand{\package}[1]{\emph{#1}}
@@ -34,7 +34,7 @@
\section{General}
\package{Reledmac} doesn't care neither text width ($T$) nor margins, whose sizes are calculated by \LaTeX{} itself or depends on other packages like \package{geometry}. In normal typesetting, line numbers and sidenotes are in the margin.
-In parallel typesetting, sidenotes and lines numbers can be, or not, in page margins.
+In parallel typesetting, sidenotes and lines numbers can be, or not, in page margins.
Normally, we get:
@@ -46,25 +46,25 @@ The only possible exceptions occur when the user makes mistakes when fixing $L$
\section{Parameters}
The parameters that can be controlled by \package{reledmac} are (see fig.~\ref{pic:page}):
-\begin{description}
+\begin{description}
\item[N] The numbered text width, \emph{i. e.} the width of text which is between \verb+\beginnumbering+ and \verb+\endnumbering+ in normal tyepsetting. By default $N=T$, but can be also modified by the \package{reledmac}/\package{reledpar} option \verb!widthliketwocolumns!: in this case, $N=L+B+S+A+R$
-
+
\item[L] \verb!\Lcolwidth!; fixed width, by default \verb!{0.45\textwidth}!
-
+
\item[R] \verb!\Rcolwidth!; fixed width, by default \verb!{0.45\textwidth}!
-
+
\item[S] \verb!\columnseparator!; \package{reledpar} inserts a vertical rule of width \verb!\columnrulewidth!, by default set to be $0\,pt$. You can redefine \verb!\columnrulewidth! by
-
+
\begin{verbatim}
\setlength{\columnrulewidth}{0.4pt}
\end{verbatim}
-
+
\item[B] \verb!\beforecolumnseparator!: automatically calculated, but can be redefined by
-
+
\begin{verbatim}
\setlength{\beforecolumnseparator}{<length>}
\end{verbatim}
-
+
\item[A] \verb!\aftercolumnseparator!: automatically calculated, but can be redefined by
\begin{verbatim}
@@ -87,7 +87,7 @@ In this case $LM$ and $RM$ are modified:
\end{itemize}
\section{Automatically calculated parameters}
-Therefore, the lengths automatically calculated are $LM$, $RM$, and, if not fixed by user, $B$ and $A$.
+Therefore, the lengths automatically calculated are $LM$, $RM$, and, if not fixed by user, $B$ and $A$.
\subsection{If $LM$, $RM$, $B$ and $A$ are calculated}
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 569aa77469..86bc6586e0 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 c7be79abaf..dc66a76df9 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 3c9593e657..27f44aaa24 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 2a9d0dac7a..5017cbfe52 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 469ee797c0..83f880f4c2 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 c17e0c41f9..0f67cf21db 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-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index 6886bf80ff..bbd1ce59e7 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 22bf961c99..ed1cb1a9bf 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-footnote_spacing.tex b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
index dfcbb30728..4486d43ee4 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.tex
@@ -36,7 +36,7 @@
\begin{abstract}
This file sets spaces around footnote rules, to have a uniform \SI{3}{\milli\meter} before and after. There are three levels of paragraphed notes. Before the first series of notes, we have \SI{0.5}{\centi\meter}.
-We use \verb+\Xbeforenotes+ and \verb+\Xafterrule+. There is, anyway, a subtlety: the footnote rule of reledmac is the standard \LaTeX footnote rule: \verb+\footnoterule+, which automatically decreases \SI{3}{pt} before and adds \SI{2.6}{pt} after. So we have to compensate, by defining to length: \verb+before+ and \verb+\after+, which are passed to the respective commands.
+We use \verb+\Xbeforenotes+ and \verb+\Xafterrule+. There is a subtlety: the footnote rule of reledmac is the standard \LaTeX footnote rule: \verb+\footnoterule+, which automatically removes \SI{3}{pt} before and adds \SI{2.6}{pt} after. So we have to compensate by defining two lengths, \verb+before+ and \verb+\after+, which are passed to the respective commands.
\end{abstract}
\end{english}
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index d7a8c20469..bed2b14615 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 ecc70e013f..613d8e1e45 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 958c9fa978..c69365c478 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 d2aff82445..2cbc60c572 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 4aa9567e30..8e9afbd9b6 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 15095aba74..c1a159046d 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 ff1a00d2ac..be64a10566 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 ee7f120c90..c46b358e56 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 f73205792e..9127236015 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 97d2f7f851..7122422fd1 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-reledmac-right-to-left.tex b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
index fbdf5c8b91..469a027b84 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
@@ -42,9 +42,9 @@ In this file, we provide an example of an edition with right-to-left text and le
\begin{itemize}
\item The `hebrew' environment allows us to write Hebrew right-to-left.
- \item \verb+\Xbeforeinserting{\LTR}+ makes the critical notes to be typeset left-to-right.
- \item \verb+\Xwraplemma{\RL}+ assures the lemmas, which are in Hebrew, be typeset right-to-left.
- \item \verb+\Xwrapcontent{\textenglish}+ assures the content of the note is marked as English text.
+ \item \verb+\Xbeforeinserting{\LTR}+ makes the critical notes be typeset left-to-right.
+ \item \verb+\Xwraplemma{\RL}+ ensures the lemmas, which are in Hebrew, are typeset right-to-left.
+ \item \verb+\Xwrapcontent{\textenglish}+ ensures the content of the note is marked as English text.
\item As the `Ezra SIL' font transforms a `]' to a `[', we use a `[' as lemma separator, that will be typeset as `]' by `Ezra SIL'. So the need for \verb+\Xlemmaseparator+ is not directly linked to reledmac.
\end{itemize}
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 838b2a3409..9d68fe42db 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 8699fc6293..7279fd65fd 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 47816b8c0d..bac948ef54 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 208c6fcb01..acb74e6b32 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 2e0f36b80b..91b2519792 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 5dee9bad9c..96c1f950de 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_pages_different_languages_lualatex.tex b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.tex
index 751bde69f6..2ca48a41a9 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.tex
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.tex
@@ -33,7 +33,7 @@
\title{Using \LuaLaTeX\ to typeset RTL text with reledpar}
\maketitle
\begin{abstract}
-This file provides an example on how to use reledpar and \LuaLaTeX\ to typeset a right to left text with its translation on the facing page\footnote{The text was provided by Latechneuse on \url{https://tex.stackexchange.com/q/227837/}.}.
+This file provides an example of how to use reledpar and \LuaLaTeX\ to typeset a right to left text with its translation on the facing page\footnote{The text was provided by Latechneuse at \url{https://tex.stackexchange.com/q/227837/}.}.
As you can see, the switch to RTL convention is made \emph{before} the \verb+pstart+.
It must be also called inside \verb+\eledsection+.
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 5d5f5dbc52..b56828afab 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 15217b2e57..800eeb88fd 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 d74ac16fa4..6e27aea885 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 8d734eb247..503997cc43 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 8f3aed07f8..32115ab4b7 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 91a3e6bd91..1de5e4bb0d 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 8cb89f7bd5..a8180687cc 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 2c69289ec2..2f8bc198ac 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 188b182e8c..00c2fac4e6 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 bc2dd25e64..f87c13957d 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 d1579129da..ebf58aaf56 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_alignment.tex b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
index db79d0dcb5..71d7837c03 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.tex
@@ -24,7 +24,7 @@ This file provides example of setting the alignment of \texttt{\textbackslash{}C
The column are 0.44\texttt{\textbackslash{}textwidth}, and we use \texttt{\textbackslash{}columnsposition}.
-We also provide a last example, showing how we can manipulate space between colons, by redefining \texttt{\textbackslash{}beforecolumnseparator} and \texttt{\textbackslash{}aftercolumnseparator}.
+We also provide one last example, showing how we can manipulate space between columns, by redefining \texttt{\textbackslash{}beforecolumnseparator} and \texttt{\textbackslash{}aftercolumnseparator}.
\end{abstract}
@@ -126,4 +126,4 @@ Right side right side right side right side right side right side right side rig
\end{pairs}
\Columns
-\end{document} \ No newline at end of file
+\end{document}
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 6ec18019d0..61554fad0e 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 dfa0ce2ea4..0e088228ed 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 b58cd2c2a1..1a276771ae 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 970c4cd22c..2295af22dc 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 17510a9312..538b451de4 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 9280fcf71e..08f6e18440 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 9730bd9485..40f3a123bc 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 d2b1e2540e..e1a1f48349 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 e64716dd29..e26b41ccc7 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..a530fdd0a9 100644
--- a/macros/latex/contrib/reledmac/makefile
+++ b/macros/latex/contrib/reledmac/makefile
@@ -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
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index 395c1fe719..c35fc3ac1d 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 2634484f6a..97dfb0c005 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -532,13 +532,13 @@
% \changes{v2.31.1}{2019/03/03}{Fix bug in vertical spacing with \protect\cs{Xgroupbyline}.}
% \changes{v2.31.1}{2019/03/03}{Fix bug with indentation with \protect\cs{Xgroupbyline}.}
% \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.2}{2019/04/03}{Fix bug with familiar footnote containing non-default font (introduced with v.~2.20.0).}
% \changes{v2.31.3}{2019/06/19}{Fix bug with paragraphed footnote in RTL context.}
% \changes{v2.32.0}{2019/07/15}{Add \protect\cs{Xlinenumannotationonlyfirst}, \protect\cs{Xlinenumannotationonlyfirstintwo}, \protect\cs{Xsymlinenumannotation}, \protect\cs{Xendlinenumannotationonlyfirst}, \protect\cs{Xendlinenumannotationonlyfirstintwo} and \protect\cs{Xendsymlinenumannotation}.}
% \changes{v2.32.1}{2019/07/21}{Do not print \protect\cs{Xendsep} if we print \protect\cs{Xendsymlinenum}.}
% \changes{v2.32.1}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
% \changes{v2.32.2}{2019/11/28}{Fix spurious vertical space in familiar footnotes with \protect\LuaLaTeX.}
-% \changes{v2.32.3}{2019/12/09}{Fix bug with critical footnotes when typesetting arabic text with \protect\package{polyglossia}.}
+% \changes{v2.32.3}{2019/12/09}{Fix bug with critical footnotes when typesetting Arabic text with \protect\package{polyglossia}.}
% \changes{v2.32.4}{2020/02/04}{Fix bug \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext}.}
% \changes{v2.32.4}{2020/01/04}{\protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} can now have an optional argument, setting the footnote number.}
% \changes{v2.32.4}{2020/02/04}{Fix bug when using \protect\cs{Xgroupbyline} and twocol arrangement.}
@@ -546,6 +546,8 @@
% \changes{v2.32.5}{2020/03/08}{Fix bug with \protect\cs{edindex} inside \protect\cs{eledsection} and related.}
% \changes{v2.32.5}{2020/03/08}{Fix bug with page number in index with \protect\cs{edindex} when indexing a critical notes.}
% \changes{v2.32.5}{2020/03/08}{Fix bug with macro inside \protect\cs{sameword} with no-\protect\XeTeX\ engines.}
+% \changes{v2.32.6}{2020/04/19}{Fix bug with glossary entries inside the first argument of \protect\cs{edtext}.}
+% \changes{v2.32.6}{2020/04/19}{Add hyperref link when inserting glossary entries.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -804,7 +806,7 @@
%
%Please read \reff{Xmaxhnotes}.
%
-% If you use \LuaTeX\ engine, you need \LuaTeX\ 1.1.0 or later.
+% If you use the \LuaTeX\ engine, you need \LuaTeX\ 1.1.0 or later.
% A file may mix \emph{numbered} and \emph{unnumbered} text.
%
% Numbered text is printed with marginal line numbers and can include
@@ -1100,7 +1102,7 @@
% \end{itemize}
% \item It must not be used if:
% \begin{itemize}
-% \item You just not want to have the line number in the margins, but want to use critical footnote. In this case, set \cs{firstlinenum} to a big value, such as 100,000 (\reff{firstlinenum}).
+% \item You do not want to have the line number in the margins, but do want to use critical footnotes. In this case, set \cs{firstlinenum} to a big value, such as 100,000 (\reff{firstlinenum}).
% \item You want to freeze the line numbering for some line, but still keep critical footnotes. In this case, use \cs{startlock} (\reff{startlock}).
% \end{itemize}
% \end{itemize}
@@ -1399,7 +1401,7 @@
% If you want to change the separator, you can use \\
% \cs{setlinenumannotationsep}\marg{sep}
% \subsubsection{Annotations in the apparatus}
-% Some other options for the annotation in the apparatus are described on \reff{annotation-inapparatus}
+% Some other options for annotations in the apparatus are described in \reff{annotation-inapparatus}
% \subsection{Executing code at each line}\label{linehook}
% \Macpackage provides an advanced feature for users.
% \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
@@ -1556,7 +1558,7 @@
% \label{fulllines}The available options are:
% \begin{itemize}
% \item \verb|fulllines| to disable \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines} features for this note (cf. \reff{Xtwolines}).
-% \item \verb|nonum| disables line numbering for this note. A horizontal blank space is added instead. You can use \cs{Xinplaceofnumber} to set it (\reff{Xinplaceofnumber}).
+% \item \verb|nonum| disables line numbering for this note. A horizontal blank space is added instead. You can use \cs{Xinplaceofnumber} to set it (\reff{Xinplaceofnumber}).
% \item \verb|nosep| to disable the lemma separator for this note. A horizontal blank space is added instead. You can use \cs{Xinplaceoflemmaseparator} to set it (\reff{Xinplaceoflemmaseparator}).
% \item \verb|linerangesep=|\meta{c} to change to \meta{c} the separator between start line and end line for this particular note.
% \end{itemize}
@@ -1767,7 +1769,7 @@
% 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 French, ``é'' has two possible unicode numbers:
+% For instance, in French, ``é'' has two possible Unicode codepoints:
% \begin{itemize}
% \item LATIN SMALL LETTER E (U+0065) + COMBINING ACUTE ACCENT (U+0301)
% \item LATIN SMALL LETTER E WITH ACUTE (U+00E9)
@@ -2040,7 +2042,7 @@
% [...]
% 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 \enquote{sic transit} is witnessed by manuscripts A, B, C and D.
%
% \cs{stopmsdata} is also automatically inserted by \cs{msdata}.
%
@@ -2295,15 +2297,15 @@
% 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}
+% \subsubsection{Print line number annotation only the first time}\label{annotation-inapparatus}
% \DescribeMacro{\Xlinenumannotationonlyfirst}
-% By default, the line number annotation (\reff{annotion} is printed inside every note. If you want to print it only the first time for a given annotation
+% 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 following 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 lemmas 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 lemmas will have its own annotation in the apparatus.
+% \item If you use the \option{noresetlinenumannotation} option of \macpackage, the \cs{Xlinenumannotationonlyfirst} won't take account of the official line number.
+% \item The \cs{Xlinenumannotationonlyfirst} works for consecutive lemmas with the same annotation. That is, if you have for example a lemma with an \verb+A+ annotation, then a lemma with a \verb+B+ annotation, then a lemma with an \verb+A+ annotation, each lemma will have its own annotation in the apparatus.
% \end{itemize}
%
% \DescribeMacro{\Xlinenumannotationonlyfirstintwo}
@@ -2313,7 +2315,7 @@
%
%
% \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.
+% To use 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}
@@ -4329,7 +4331,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/03/08 v2.32.5 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/04/19 v2.32.6 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -7847,6 +7849,7 @@
\let\edtext=\dummy@edtext
\let\edindex\dummy@edindex%
\l@dtabnoexpands
+ \l@noexpands@edgl%
\let\linenumannotation=\@gobble%
\morenoexpands}
\let\morenoexpands=\relax
@@ -8279,7 +8282,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+\ldots\ 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+\ldots\ 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):
@@ -18193,93 +18196,141 @@
% \end{macrocode}
% First those which arguments are \oarg{options}\marg{label}\oarg{insert}.
% \begin{macrocode}
+ \gdef\edglsomo{}%
+ \listgadd{\edglsomo}{gls}%
+ \listgadd{\edglsomo}{Gls}%
+ \listgadd{\edglsomo}{GLS}%
+ \listgadd{\edglsomo}{glspl}%
+ \listgadd{\edglsomo}{Glspl}%
+ \listgadd{\edglsomo}{GLSpl}%
+ \listgadd{\edglsomo}{glstext}%
+ \listgadd{\edglsomo}{Glstext}%
+ \listgadd{\edglsomo}{GLStext}%
+ \listgadd{\edglsomo}{Glsfirst}%
+ \listgadd{\edglsomo}{GLSfirst}%
+ \listgadd{\edglsomo}{glsplural}%
+ \listgadd{\edglsomo}{Glsplural}%
+ \listgadd{\edglsomo}{GLSplural}%
+ \listgadd{\edglsomo}{glsfirstplural}%
+ \listgadd{\edglsomo}{Glsfirstplural}%
+ \listgadd{\edglsomo}{GLSfirstplural}%
+ \listgadd{\edglsomo}{glsname}%
+ \listgadd{\edglsomo}{Glsname}%
+ \listgadd{\edglsomo}{GLSname}%
+ \listgadd{\edglsomo}{glssymbol}%
+ \listgadd{\edglsomo}{Glssymbol}%
+ \listgadd{\edglsomo}{GLSsymbol}%
+ \listgadd{\edglsomo}{glsdesc}%
+ \listgadd{\edglsomo}{Glsdesc}%
+ \listgadd{\edglsomo}{GLSdesc}%
+ \listgadd{\edglsomo}{glsuseri}%
+ \listgadd{\edglsomo}{Glsuseri}%
+ \listgadd{\edglsomo}{GLSuseri}%
+ \listgadd{\edglsomo}{glsuserii}%
+ \listgadd{\edglsomo}{Glsuserii}%
+ \listgadd{\edglsomo}{GLSuserii}%
+ \listgadd{\edglsomo}{glsuseriii}%
+ \listgadd{\edglsomo}{Glsuseriii}%
+ \listgadd{\edglsomo}{GLSuseriii}%
+ \listgadd{\edglsomo}{glsuseriv}%
+ \listgadd{\edglsomo}{Glsuseriv}%
+ \listgadd{\edglsomo}{GLSuseriv}%
+ \listgadd{\edglsomo}{glsuserv}%
+ \listgadd{\edglsomo}{Glsuserv}%
+ \listgadd{\edglsomo}{GLSuserv}%
+ \listgadd{\edglsomo}{glsuservi}%
+ \listgadd{\edglsomo}{Glsuservi}%
+ \listgadd{\edglsomo}{GLSuservi}%
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{%
\doedindexlabel%
+ \ifdef{\hypertarget}{%
+ \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
\csname#1\endcsname[counter=pageline,##1]{##2}[##3]%
}%
\expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{%
\doedindexlabel%
+ \ifdef{\hypertarget}{%
+ \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
\csname#1\endcsname*[counter=pageline,##1]{##2}[##3]%
}%
}%
- \docsvlist{%
- gls,%
- Gls,%
- GLS,%
- glspl,%
- Glspl,%
- GLSpl,%
- glstext,%
- Glstext,%
- GLStext,%
- Glsfirst,%
- GLSfirst,%
- glsplural%
- Glsplural,%
- GLSplural,%
- glsfirstplural,%
- Glsfirstplural,%
- GLSfirstplural,%
- glsname,%
- Glsname,%
- GLSname,%
- glssymbol,%
- Glssymbol,%
- GLSsymbol,%
- glsdesc,%
- Glsdesc,%
- GLSdesc,%
- glsuseri,%
- Glsuseri,%
- GLSuseri,%
- glsuserii,%
- Glsuserii,%
- GLSuserii,%
- glsuseriii,%
- Glsuseriii,%
- GLSuseriii,%
- glsuseriv,%
- Glsuseriv,%
- GLSuseriv,%
- glsuserv,%
- Glsuserv,%
- GLSuserv,%
- glsuservi,%
- Glsuservi,%
- GLSuservi%
- }%
+ \dolistloop{\edglsomo}%
% \end{macrocode}
% Then those which arguments are \oarg{options}\marg{label}\marg{link text}.
% \begin{macrocode}
+ \gdef\edglsomm{}%
+ \listgadd\edglsomm{glsdisp}%
+ \listgadd\edglsomm{glslink}%
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{%
\doedindexlabel%
+ \ifdef{\hypertarget}{%
+ \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
\csname#1\endcsname[counter=pageline,##1]{##2}{##3}%
}%
\expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{%
\doedindexlabel%
+ \ifdef{\hypertarget}{%
+ \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
\csname#1\endcsname*[counter=pageline,##1]{##2}{##3}%
}%
}%
- \docsvlist{glsdisp,glslink}%
+ \dolistloop{\edglsomm}%
% \end{macrocode}
% Then those which arguments are \oarg{options}\marg{label}.
% \begin{macrocode}
+ \gdef\edglsom{}%
+ \listgadd\edglsom{glsadd}%
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{%
\doedindexlabel%
+ \ifdef{\hypertarget}{%
+ \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
\csname#1\endcsname[counter=pageline,##1]{##2}%
}%
\expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{%
\doedindexlabel%
+ \ifdef{\hypertarget}{%
+ \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
\csname#1\endcsname*[counter=pageline,##1]{##2}%
}%
}%
- \docsvlist{glsadd}%
- }{}%
+ \dolistloop{\edglsom}%
+% \end{macrocode}
+% \cs{l@noexpands@edgl} is a macro to avoid expanding glossaries macros in \cs{edtext} first argument. It is called by \cs{no@expands}.
+% Its definition is made dynamically.
+% \begin{macro}{\l@noexpands@edgl}
+% \begin{macrocode}
+ \def\l@noexpands@edgl{}%
+ \renewcommand\do[1]{%
+ \xappto\l@noexpands@edgl{%
+ \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}%
+ }%
+ }%
+ \dolistloop{\edglsomo}%
+ \renewcommand\do[1]{%
+ \xappto\l@noexpands@edgl{%
+ \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}%
+ }%
+ }%
+ \dolistloop{\edglsomm}%
+ \renewcommand\do[1]{%
+ \xappto\l@noexpands@edgl{%
+ \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}%
+ }%
+ }%
+ \dolistloop{\edglsom}%
+ }{\let\l@noexpands@edgl\relax}%
}%
% \end{macrocode}
+% \end{macro}
% \section{Verse}
%
% The original code is principally Wayne Sullivan's\index{Sullivan, Wayne}
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index ab37c448c0..11d404b54c 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 45e86de80e..f2f6051560 100644
--- a/macros/latex/contrib/reledmac/reledpar.dtx
+++ b/macros/latex/contrib/reledmac/reledpar.dtx
@@ -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}\ldots\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 another \protect\cs{beginnumbering}\ldots\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.}
@@ -339,7 +339,8 @@
% \changes{v2.22.2}{2019/01/22}{Fix bug with \protect\cs{Xonlyside} and \protect\cs{onlysideX}}
% \changes{v2.22.3}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.}
% \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 into \protect\env{astanza}.}
+% \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.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -665,9 +666,9 @@
% \file{examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex}
% covers all these cases.
% \subsection{Note about \cs{AtEveryPstart*} and \cs{AtEveryPend*}}
-% The content of \cs{AtEveryPstart} / \cs{AtEveryPend} (without star) is added before every \cs{pstart} / after every \cs{pend}, making distinction between the left and the right side.
+% The content of \cs{AtEveryPstart} / \cs{AtEveryPend} (without star) is added before every \cs{pstart} / after every \cs{pend}, distinguishing between the left and the right side.
%
-% The content of \cs{AtEveryPstart*} / \cs{AtEveryPend*} (with star) is added before every \cs{pstart} / after every \cs{pend}, but there is no distinction between the left and the right sides: the content is inserted \enquote{for the two columns as a whole}.
+% The content of \cs{AtEveryPstart*} / \cs{AtEveryPend*} (with star) is added before every \cs{pstart} / after every \cs{pend}, but there is no distinction between the left and right sides: the content is inserted \enquote{for the two columns as a whole}.
%
% However, as this content is also added when we typeset pages in parallel, \reledmac must add it once for left \cs{pstart} and once for right \cs{pstart}.
% So if you use it to add vertical spacing, it will be problematic in parallel columns, as you will have the vertical spacing two times (vertical spacing will be twice as large as expected).
@@ -1395,7 +1396,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/03/08 v2.23.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/04/19 v2.23.1 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1571,6 +1572,15 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\led@err@polyglossiaTooOld}
+% \begin{macrocode}
+\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}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led@err@BadLeftRightPstarts}
% \begin{macrocode}
\newcommand*{\led@err@BadLeftRightPstarts}[2]{%
@@ -3150,7 +3160,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 typeset, 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.
@@ -5599,20 +5609,21 @@
% If use \protect\package{polyglossia}
% \changes{v1.8.0}{2014/08/05}{Correct left/right language setting with polyglossia.}
% \changes{v1.9.0}{2014/09/16}{Debug left/right language switching with polyglossia. Do not write in .aux file when setting left/right lines.}
-% \changes{v2.22.4}{2019/11/04}{Provide compatibility with last version of polyglossia (v1.45).}
-% \changes{v2.23.0}{2020/03/08}{Restore compatibility with version of polyglossia prior to v1.45.}
+% \changes{v2.22.4}{2019/11/04}{Provide compatibility with the latest version of polyglossia (v1.45).}
+% \changes{v2.23.0}{2020/03/08}{Restore compatibility with versions of polyglossia prior to v1.45.}
% \begin{macrocode}
- { \let\old@otherlanguage\otherlanguage%
+ {%
+ \@ifpackagelater{polyglossia}{2020/04/08}{}{\led@err@polyglossiaTooOld}%
+ \let\old@otherlanguage\otherlanguage%
\renewcommand{\otherlanguage}[2][]{%
- \ifdefined\xpg@set@group@aux%
- \xpg@set@group@aux%
- \fi%
+ \xpg@set@group@aux%
\selectlanguage[#1]{#2}%
\ifledRcol \gdef\theledlanguageR{#2}%
\else \gdef\theledlanguageL{#2}%
\fi}%
\renewcommand{\l@duselanguage}[1]{%
- \csuse{no\languagename @numbers}\select@language{#1}%
+ \csuse{no\languagename @numbers}%
+ \@select@language{#1}%
}%
\gdef\theledlanguageL{\xpg@main@language}%
\gdef\theledlanguageR{\xpg@main@language}%
@@ -6288,8 +6299,8 @@
% \begin{macro}{setnotepositionliketwocolumns@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\ldots} 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\ldots} 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\ldots} 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\ldots} macros are called in \protect\cs{xxxfootstart} in a \textbf{non-parallel} typesetting context to fix the position of the notes block.
% \begin{macrocode}
\newcommand{\setwidthliketwocolumns}{%
\get@intercolumns@width%As \columns is not necessary called before \setwidthliketwocolumns
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index 7db2af1159..b29193003b 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ