summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-08 22:55:22 +0000
committerKarl Berry <karl@freefriends.org>2015-08-08 22:55:22 +0000
commit2c4e39a47e58aca19e393283377c93378cc0e1bc (patch)
tree0a248b7a2eacba78e89f808de94d6fb9bdb44583 /Master/texmf-dist
parent194127387a006f30c0dc7692e54f55ddc94a2434 (diff)
reledmac (8aug15)
git-svn-id: svn://tug.org/texlive/trunk@38081 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx16
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx4
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdfbin17240 -> 17191 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdfbin20195 -> 20136 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdfbin21109 -> 20765 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdfbin17357 -> 17357 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdfbin17609 -> 17611 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdfbin20903 -> 20779 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdfbin19897 -> 19897 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdfbin17089 -> 17089 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdfbin31600 -> 31484 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdfbin25999 -> 25878 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdfbin23147 -> 23100 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin22796 -> 22798 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdfbin17140 -> 17143 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdfbin26219 -> 26097 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdfbin12223 -> 12221 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin39708 -> 39708 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin23164 -> 23032 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin18430 -> 18427 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdfbin21173 -> 21173 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin29592 -> 29473 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin36485 -> 36488 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdfbin31714 -> 31770 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdfbin59059 -> 59057 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin22718 -> 22718 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin18941 -> 18893 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin22219 -> 22216 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdfbin16237 -> 16236 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/migration.pdfbin76837 -> 79468 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledmac.pdfbin1010680 -> 1019989 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledpar.pdfbin395916 -> 398634 bytes
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx232
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx52
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty124
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty14
36 files changed, 356 insertions, 86 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
index 56501c3fa34..af053e11126 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
@@ -305,7 +305,7 @@
% \cs{beforeXnotes} & \cs{Xbeforenotes} \\
% \cs{beforeXsymlinenum} & \cs{Xbeforesymlinenum} \\
% \cs{bhookXnote} & \cs{Xbhookendnote}\\
-% \cs{bhookXnote} & \cs{Xbooknote} \\
+% \cs{bhookXnote} & \cs{Xbhooknote} \\
% \cs{boxendlinenum} & \cs{Xboxendlinenum}\\
% \cs{boxlinenum} & \cs{Xboxlinenum} \\
% \cs{boxlinenumalign} & \cs{Xboxlinenumalign} \\
@@ -357,3 +357,17 @@
% \item If you have modified \cs{Xfootfmt}, note that the fourth argument is now mandatory.
% \item \cs{unvxh} has been replaced with \cs{Xunvxh} and \cs{unvxhX} with two mandatory arguments.
% \end{itemize}
+% \subsection{Migration to \reledmac~2.1.0}
+% \Reledmac~2.1.0 fix some bug when using \cs{Xbhooknote} and \cs{bhooknoteX} not in order to execute code at the beginning of each notes, but to insert content of at the beginning of each notes.
+%
+% People which use these commands to do it, which is not the original idea, must change to things:
+% \begin{enumerate}
+% \item Horizontal space is no more automatically added after the content of \cs{Xbhooknote}/\cs{bhooknoteX} argument.
+% You must include it manually.
+% So instead of \cs{Xbhooknote}\arg{content}, use \cs{Xbhooknote}\arg{content\ }.
+% \item Indent is no more automatically added before the content of \cs{Xbhooknote}/\cs{bhooknoteX} argument.
+% If you want to keep it, add \cs{indent} in the argument of \cs{Xbhooknote}/\cs{bhooknoteX}.
+%
+% \end{enumerate}
+%
+%
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
index ab9fb03a4c0..8b39a30fb01 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
@@ -56,3 +56,7 @@
% \endhead
% \cs{onlyXside} & \cs{Xonlyside} \\
% \end{longtable}
+% \subsection{Migration to \reledpar~2.2.0}
+% The \env{astanza} can take now an option argument.
+% Consequently, if the first line of verse in a \env{astanza} environment starts with brackets \verb+[]+, you must precede them with a \cs{relax}. If you do not do it, the content of the brackets will be considered as an optional argument of the \env{astanza} environment.
+
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
index 8a8604cfd79..bb14feff8ef 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
index a235953639f..26e825b54f2 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
index f2af8d64ae8..18928fca5ad 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
index 4a4091a8044..30c74c288d4 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
index 6ccde05f794..0b94205fdee 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
index 2821b43ed97..7d51becd592 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
index 622b82951de..48174b5d261 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
index dd02d9f4fcd..2f057caf505 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
index fbbced43207..73ae3b90745 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
index 9364bab3c4a..d35ef3c3b1f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
index bf753a0df96..e83ad0089d5 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index 71057c6e2ec..2b6cdeadb85 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
index e035cf10392..c2ae8e07ad2 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
index a3fbad371f1..93e6f5a2435 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
index 2656d890dc8..90e3c48ad38 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index 50785f17a26..bed2f769553 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index 7759b0306e8..3c09c6bc7ad 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index 8ef07b8e490..8e22aed7615 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
index 9603c356020..46b76f98cea 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index ddb0e7e9a99..02ec21f59be 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index bdb78c7c2fa..869b2f301b2 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf
index 4ab391c7777..a8f901d221b 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
index cb37f87ad8d..e2ed2ce669f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 9e6148b10d3..cca573d5499 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index f8c3b6de5fb..0c81116a417 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index 3d102060d29..ff49c7b3474 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
index efabdb4a9db..65e69372f2a 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
index c81a0623c6c..c7013d3b735 100644
--- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
index eab74755fd1..8e8a693af77 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
index 8aba02a8234..9f003e7c66b 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index 7d730d1ccd7..f851ca9445f 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -311,6 +311,13 @@
% \changes{v2.0.0}{2015/07/19}{Fix bug when printing only one series of endnotes, but wanted to keep endnotes for other series.}
% \changes{v2.0.1}{2015/07/27}{Fix incompatibility between optional argument of \protect\cs{pstart} and \protect\cs{numberpstarttrue}}
% \changes{v2.0.1}{2015/07/27}{Fix bug in eledmac-compat option}
+% \changes{v2.1.0}{2015/08/08}{New tools to number stanza}
+%
+%\changes{v2.1.0}{2015/08/02}{Fix bug with \protect\cs{chapter} in optional argument of \protect\cs{pstart} in parallel typesetting with \protect\ltxclass{scrbook}.}
+% \changes{v2.1.0}{2015/08/02}{Fix bug with \protect\cs{eledchapter} in parallel typesetting with \protect\ltxclass{scrbook}.}
+% \changes{v2.1.0}{2015/08/02}{Fix bug with \protect\cs{setline} at the begin of a \protect\cs{pstart}.}
+% \changes{v2.1.0}{2015/08/02}{Fix bug with \protect\cs{advanceline} at the begin of a \protect\cs{pstart}.}
+% \changes{v2.1.0}{2015/08/08}{Fix space bug with \protect\cs{Xbhooknote} and \protect\cs{bhooknoteX} when using to insert text and not to execute code.}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -739,13 +746,11 @@
%
% \subsubsection{Content before specific \protect\cs{pstart} and after specific \protect\cs{pend}}\label{pstart:optionalarg}
% \changes{v1.12.0}{2014/08/05}{Optional arguments for \protect\cs{pstart} and \protect\cs{pend}.}
-% \DescribeMacro{\AtEveryPstart}
-% \DescribeMacro{\AtEveryPend}
% Both \protect\cs{pstart} and \protect\cs{pend} can take a optional argument, in brackets.
% Its content will be printed before the beginning of \protect\cs{pstart} / after the end of \protect\cs{pend} instead of the argument of \protect\cs{AtEveryPstart} / \protect\cs{AtEveryPend}.
% If you need to start a \protect\cs{pstart} by brackets, or to add brackets after a \protect\cs{pend}, just add a \protect\cs{relax} between \protect\cs{pstart}/\protect\cs{pend} and the brackets.
%
-%. This feature is also useful when typesetting verses (see~\reff{verse}) or \protect\package{eledpar} (see~\reff{eledpar}).
+% This feature is also useful when typesetting verses (see~\reff{verse}) or \protect\package{eledpar} (see~\reff{eledpar}).
%
% A \protect\cs{noindent} is automatically added before this argument.
% \subsubsection{Content before every \protect\cs{pstart} and after every \protect\cs{pend}}
@@ -1622,6 +1627,19 @@
% \DescribeMacro{\Xonlypstart}
% In combination with \protect\cs{Xpstart}, you can use \protect\cs{Xonlypstart}\oarg{s} if you want to print only the pstart number in the footnote, and not the line and subline number.
% Use \protect\cs{Xonlypstart}\oarg{s}\verb+[false]+ disable this it (\meta{s} can be empty if you want to disable it for every series).
+% \subsubsection{Printing stanza number}
+%
+% \DescribeMacro{\Xstanza}\label{Xstanza}
+% You can use \cs{Xstanza}\oarg{s} if you want to print the stanza number in the footnote, before the line and subline number.
+% Use \cs{Xstanza}\oarg{s}\verb+[false]+ to disable this (\meta{s} can be empty if you want to disable it for every series).
+%
+% Of course the stanza number is printed only when you use \cs{numberstanza}
+%
+% \DescribeMacro{\Xstanzaseparator}
+%
+% When using \cs{Xstanza}, you can use \cs{Xstanzaseparator}\oarg{s}\marg{text} to print \meta{text} after the stanza number.
+% Default value is empty.
+%
% \subsubsection{Space around number}
% \DescribeMacro{\Xbeforenumber}
% With \protect\cs{Xbeforenumber}\oarg{s}\marg{l}, you can add some space before the line number in a footnote. If the line number is not printed, the space is not either. The default value is 0~pt.
@@ -2169,6 +2187,37 @@
% \item \verb+&+ can be replaced by \protect\cs{newverse} with two optional arguments (in brackets). The first will be printed after the current verse, the second before the next verse.
% \item \verb+\&+ can take a optional argument (in brackets). Its content will be printed after the stanza.
% \end{itemize}
+% \subsection{Numbering stanza}\label{numbering-stanza}
+% \DescribeMacro{\numberstanzatrue}
+% \DescribeMacro{\numberstanzafalse}
+% If you want to automatically number stanzas, use \cs{numberstanzatrue}.
+% In this case, the line number will restart at each \cs{stanza}.
+%
+%
+% If you want to disable this feature again, use \cs{numberstanzafalse}.
+%
+% You can use this feature in combination with \cs{Xstanza} (\reff{Xstanza}).
+%
+% \DescribeMacro{thestanza}.
+% You can redefine \cs{thestanza} to change the aspect of stanza number.
+% Default value is:
+% \begin{verbatim}
+% \renewcommand{\thestanza}{%
+% \textbf{\arabic{stanza}}%
+% }
+%
+% \end{verbatim}
+%
+% You can change the value of the \verb+stanza+ counter with the usual commands of \LaTeX.
+%
+% \DescribeMacro{\stanzanumwrapper}
+% You can redefine \cs{stanzanumwrapper} in order to modify the way the stanza number is inserted in the flow of text.
+% Default value is:
+% \begin{verbatim}
+% \newcommand{\stanzanumwrapper}[1]{%
+% \flagstanza{#1}%
+%}
+% \end{verbatim}
% \subsection{Various tools}
% \DescribeMacro{\ampersand}
% If you need to print an \& symbol in a stanza, use the \verb?\ampersand?
@@ -2181,23 +2230,6 @@
% distance \meta{len} before
% the line. The default \meta{len} is \verb?\stanzaindentbase?.
%
-% For example, to put a verse number before the first line of a stanza
-% you could proceed along the lines:
-% \begin{verbatim}
-% \newcounter{stanzanum}
-% \setcounter{stanzanum}{0}
- \newcommand{\numberit}{%
- \refstepcounter{stanzanum}%
- \flagstanza{\thestanzanum}%
- }
-% ...
-% \stanza[\numberit]
-% \numberit First line...&
-% rest of stanza\&
-%
-% \stanza[\numberit]
-% First line, second stanza...
-% \end{verbatim}
% \section{Grouping}
% In a \verb?minipage? environment \LaTeX\ changes \verb?\footnote? numbering from
% arabic to alphabetic and puts the footnotes at the end of the minipage.
@@ -2532,9 +2564,9 @@
%
% Be careful with the order of package loading and index declaration. You must use this order:
% \begin{enumerate}
-% \item Load \protect\package{imakeidx} or \protect\package{indextools} .
-% \item Load \protect\package{eledmac}.
-% \item Declare the index with the macro \protect\cs{makeindex} of \protect\package{imakeidx}/\protect\package{indextools}.
+% \item Load \package{imakeidx} or \package{indextools} .
+% \item Load \macpackage.
+% \item Declare the index with the macro \cs{makeindex} of \package{imakeidx}/\package{indextools}.
% \end{enumerate}
% \subsection{Separator between page and line numbers}
% \DescribeMacro{\pagelinesep}
@@ -3135,6 +3167,7 @@
%
% \clearpage
% \renewcommand{\thesection}{\Roman{section}}
+% \renewcommand\theHsection{\Roman{section}}
% \setcounter{section}{0}
%
% \section{Implementation overview}\label{overview}
@@ -3204,7 +3237,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/07/27 v2.0.1 typesset critical edition]%
+\ProvidesPackage{reledmac}[2015/08/08 v2.1.0 typesset critical edition]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -3657,14 +3690,14 @@
% \begin{macro}{\led@error@ImakeidxAfterEledmac}
% \begin{macrocode}
\newcommand{\led@error@ImakeidxAfterEledmac}{%
- \reledmac@error{Imakeidx must be loaded before eledmac.}{\@ehc}%
+ \reledmac@error{Imakeidx must be loaded before reledmac.}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led@error@IndextoolsAfterEledmac}
% \begin{macrocode}
\newcommand{\led@error@IndextoolsAfterEledmac}{%
- \reledmac@error{Indextools must be loaded before eledmac.}{\@ehc}%
+ \reledmac@error{Indextools must be loaded before reledmac.}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -5873,7 +5906,7 @@
% in running text to advance the current visible
% line-number by a specified value, positive or negative.
% \begin{macrocode}
-\newcommand*{\advanceline}[1]{%
+\newcommand*{\advanceline}[1]{\leavevmode%
\ifledRcol \write\linenum@outR{\string\@adv[#1]}%
\else \write\linenum@out{\string\@adv[#1]}%
\fi%
@@ -5889,6 +5922,7 @@
% \begin{macrocode}
\newcommand*{\setline}[1]{%
+ \leavevmode%
\ifnum#1<\z@
\led@warn@BadSetline
\else
@@ -8266,8 +8300,8 @@
% \begin{macrocode}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{%
\insert\csname #1footins\endcsname\bgroup
- \csuse{Xbhooknote@#1}
- \csuse{Xnotefontsize@#1}
+ \noindent\csuse{Xbhooknote@#1}%
+ \csuse{Xnotefontsize@#1}%
\footsplitskips
\ifl@dpairing\ifl@dpaging\else%
\setXnoteswidthliketwocolumns@{#1}%
@@ -8285,8 +8319,8 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\mpnormalvfootnote}[2]{%
\global\setbox\@nameuse{mp#1footins}\vbox{%
\unvbox\@nameuse{mp#1footins}
- \csuse{Xbhooknote@#1}
- \csuse{Xnotefontsize@#1}
+ \noindent\csuse{Xbhooknote@#1}%
+ \csuse{Xnotefontsize@#1}%
\hsize\columnwidth
\@parboxrestore
\color@begingroup
@@ -8639,11 +8673,11 @@
\newcommand*{\paravfootnote}[2]{%
\insert\csname #1footins\endcsname
\bgroup
- \csuse{Xbhooknote@#1}
\csuse{Xnotefontsize@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\csname #1footfmt\endcsname #2{#1}}%
+ \noindent\csuse{Xbhooknote@#1}%
+ \csname #1footfmt\endcsname #2{#1}}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
\dp0=0pt
\ht0=\csname #1footfudgefactor\endcsname\wd0
@@ -8679,11 +8713,12 @@
\newcommand*{\mpparavfootnote}[2]{%
\global\setbox\@nameuse{mp#1footins}\vbox{%
\unvbox\@nameuse{mp#1footins}%
- \csuse{Xbhooknote@#1}
\csuse{Xnotefontsize@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\color@begingroup\csname #1footfmt\endcsname #2{#1}\color@endgroup}%
+ \noindent\color@begingroup%
+ \csuse{Xbhooknote@#1}%
+ \csname #1footfmt\endcsname #2{#1}\color@endgroup}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
\dp0=\z@
\ht0=\csname #1footfudgefactor\endcsname\wd0
@@ -9345,6 +9380,12 @@
(togl{Xpstart@#2} and bool{numberpstart})%
or togl{Xpstarteverytime@#2}}%
{\printpstart}{}%
+ \iftoggle{Xstanza@#2}{%
+ \ifnumberstanza%
+ \printstanza%
+ \csuse{Xstanzaseparator@#2}%
+ \fi%
+ }{}%
\iftoggle{Xonlypstart@#2}{}{\printlines#1|}%
}%
% \end{macrocode}
@@ -9884,8 +9925,8 @@
% \begin{macrocode}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{%
\insert\@nameuse{footins#1}\bgroup
- \csuse{bhooknoteX@#1}
- \csuse{notefontsizeX@#1}
+ \noindent\csuse{bhooknoteX@#1}%
+ \csuse{notefontsizeX@#1}%
\footsplitskips
\ifl@dpairing\ifl@dpaging\else%
\setnoteswidthliketwocolumnsX@{#1}%
@@ -9903,8 +9944,8 @@
\newcommand*{\mpnormalvfootnoteX}[2]{%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
- \csuse{bhooknoteX@#1}
- \csuse{notefontsizeX@#1}
+ \noindent\csuse{bhooknoteX@#1}%
+ \csuse{notefontsizeX@#1}%
\hsize\columnwidth
\@parboxrestore
\color@begingroup
@@ -10428,11 +10469,11 @@
\newcommand*{\para@vfootnoteX}[2]{%
\insert\csname footins#1\endcsname
\bgroup
- \csuse{bhooknoteX@#1}
\csuse{notefontsizeX@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\@nameuse{footfmt#1}{#1}{#2}}%
+ \noindent\csuse{bhooknoteX@#1}%
+ \@nameuse{footfmt#1}{#1}{#2}}%
\setbox0=\hbox{\unvxhX{0}{#1}}%
\dp0=\z@
\ht0=\csname footfudgefactor#1\endcsname\wd0
@@ -10442,11 +10483,12 @@
\newcommand*{\mppara@vfootnoteX}[2]{%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
- \csuse{bhooknoteX@#1}
\csuse{notefontsizeX@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\color@begingroup\@nameuse{footfmt#1}{#1}{#2}\color@endgroup}%
+ \noindent\color@begingroup%
+ \csuse{bhooknoteX@#1}%
+ \@nameuse{footfmt#1}{#1}{#2}\color@endgroup}%
\setbox0=\hbox{\unvxhX{0}{#1}}%
\dp0=\z@
\ht0=\csname footfudgefactor#1\endcsname\wd0
@@ -11221,6 +11263,8 @@
\newtoggle{Xonlypstart@#1}%
\newtoggle{Xpstarteverytime@#1}%
\newtoggle{Xpstart@#1}%
+ \newtoggle{Xstanza@#1}%
+ \csgdef{Xstanzaseparator@#1}{}%
\csgdef{Xsymlinenum@#1}{}%
\newtoggle{Xnonumber@#1}%
\csgdef{Xbeforenumber@#1}{0pt}%
@@ -11271,6 +11315,7 @@
\noexpand\prepare@preXnotes{#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.
+ \noexpand\setcounter{stanzaR}{\the\c@stanzaR}%Save stanzaR counter for footnote
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
}\to\inserts@listR
@@ -11288,6 +11333,9 @@
\noexpand\prepare@preXnotes{#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.
+ \ifl@dpairing%
+ \noexpand\setcounter{stanzaL}{\the\c@stanzaL}%Save stanzaR counter for footnote
+ \fi%
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
}\to\inserts@list
@@ -11735,6 +11783,10 @@
\newhooktoggle@series{Xnonumber}
\newhooktoggle@series{Xpstart}
\newhooktoggle@series{Xpstarteverytime}%
+
+ \newhooktoggle@series{Xstanza}%
+ \newhookcommand@series{Xstanzaseparator}%
+
\newhooktoggle@series{Xonlypstart}
\newhooktoggle@series{Xnonbreakableafternumber}
\newhooktoggle@series{Xlemmadisablefontselection}
@@ -13831,7 +13883,6 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-%
% \begin{macro}{\setstanzaindents}
% \begin{macro}{\setstanzapenalties}
% In the original \edmac, \protect\cs{setstanzavalues}\verb+{sza}+\marg{...} had to be called to
@@ -13884,6 +13935,83 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \subsection{Numbering stanza}
+% Here, macro for numbering stanza.
+% First, the stanza counter.
+% \begin{macro}{\thestanza}
+% \begin{macrocode}
+\newcounter{stanza}
+\renewcommand{\thestanza}{%
+ \textbf{\arabic{stanza}}%
+}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ifnumberstanza}
+% Then, macro to activate automatically numbering of stanza.
+% \begin{macrocode}
+\newif\ifnumberstanza%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@insertstanzanumber}
+% Now, macro called at the first line of of verse of a stanza.
+% \begin{macrocode}
+\newcommand{\@insertstanzanumber}[0]{%
+ \ifnumberstanza%
+ \ifl@dpairing%
+ \ifledRcol%
+ \stanzanumwrapper{\thestanzaR}%
+ \else%
+ \stanzanumwrapper{\thestanzaL}%
+ \fi%
+ \else%
+ \stanzanumwrapper{\thestanza}%
+ \fi%
+ \setline{1}%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@advancestanzanumber}
+% Also a command to advance the counter of stanza.
+% \begin{macrocode}
+\newcommand{\@advancestanzanumber}[0]{%
+ \ifnumberstanza%
+ \ifl@dpairing%
+ \ifledRcol%
+ \addtocounter{stanzaR}{1}%
+ \else%
+ \addtocounter{stanzaL}{1}%
+ \fi%
+ \else%
+ \addtocounter{stanza}{1}%
+ \fi%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\stanzanumwrapper}
+% And finally, the wrapper for stanza number
+% \begin{macrocode}
+\newcommand{\stanzanumwrapper}[1]{%
+ \flagstanza{#1}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \subsection{Stanza number in note}
+% Here, the command called when printing stanza number in notes.
+% \begin{macrocode}
+\newcommand{\printstanza}[0]{%
+ \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{%
+ \ifledRcol@%
+ \thestanzaR%
+ \else%
+ \thestanzaL%
+ \fi%
+ }{%
+ \thestanza%
+ }%
+}
+% \end{macrocode}
% \subsection{Main work}
% \begin{macro}{\stanza@line}
% \begin{macro}{\stanza@hang}
@@ -13965,7 +14093,8 @@
\def\noexpand&{%
\noexpand\newverse[][]}%
\def\noexpand\&{\noexpand\@stopstanza}%
- \noexpand\stanza@line[#1]}
+ \noexpand\@advancestanzanumber%
+ \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber}
\newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]}
@@ -15591,6 +15720,7 @@
{}
{}
+
\pretocmd{\M@sect}
{\let\old@edtext=\edtext%
\let\edtext=\dummy@edtext@showlemma%
@@ -15638,13 +15768,23 @@
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{%
\if@eled@sectioning\else%
\ifl@dprintingpages\else%
- \if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \eledsection: will keep critical notes from printing on the title page.
+ \if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for classical classes
\fi%
\fi%
}%
{}%
{}%
+\patchcmd{\scr@startchapter}{\if@openright\cleardoublepage\else\clearpage\fi}{%
+ \if@eled@sectioning\else%
+ \ifl@dprintingpages\else%
+ \if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for scrbook.
+ \fi%
+ \fi%
+ }
+ {}
+ {}
+
\patchcmd{\@makechapterhead}
{#1}
{\print@leftmargin@eledsection%
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index c5562ce8550..04dd0125ed3 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -238,6 +238,8 @@
% \changes{v2.1.0}{2015/07/27}{Options to custom empty right page before \protect\cs{Pages}.}
% \changes{v2.1.0}{2015/07/27}{Fix bug when using \protect\cs{pagenumbering} with memoir (bug added in v2.0.0).}
% \changes{v2.1.0}{2015/07/27}{Fix bug when using \protect\cs{eledsection} and related on right pages when page width is short.}
+% \changes{v2.2.0}{2015/08/08}{\protect\env{astanza} environment can take an optional argument, which will be the optional argument of \protect\cs{pstart} started by this environment.}
+% \changes{v2.2.0}{2015/08/08}{New tools to number stanza}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -809,18 +811,26 @@
% for verse lines than the other does.
%
% \DescribeEnv{astanza}
-% \Parpackage provides an \verb?astanza? environment which you can use instead
-% of \protect\cs{stanza}.
-% To use it, imply replace \verb?\stanza? by \verb?\begin{astanza}? and
-% add \verb?\end{astanza}? after the ending \verb?\&?. Within the
-% \verb?astanza? environment each verse line is treated as a paragraph,
+% \Parpackage provides an \env{astanza} environment which you can use instead
+% of \cs{stanza}. A \env{astanza} environment is a chunk. Consequently left and right \emph{verse} are matched, and not, as with standard \cs{stanza}, left and right \emph{verse lines}.
+%
+% Within the
+% \env{astanza} environment each verse line is treated as an individual paragraph,
% so there must be no blank lines in the environment otherwise there will
% be some extraneous vertical spacing.
+% To use \env{astanza}, imply replace \cs{astanza} by \cs{begin}\arg{astanza} and
+% add \cs{end}\arg{astanza} after the ending \expandafter\cs\expandafter{\&}.
%
% If you get an error message along the lines of `Missing number,
% treated as zero \protect\cs{sza@0@}' it is because you have forgotten to use
% \protect\cs{setstanzaindents} to set the stanza indents.
%
+% As \env{astanza} is a specify type \cs{pstart}\ldots\cs{pend} structure, you can:
+% \begin{itemize}
+% \item Add optional argument (in brackets) after \cs{begin}\arg{astanza}, as the optional argument of \cs{pstart}.
+% \item Use optional argument after the last \expandafter\cs\expandafter{\&} as optional argument of \cs{pend}.
+%
+% \end{itemize}
%
%
% \DescribeMacro{\sethangingsymbol}Like in \macpackage, you could use the \protect\cs{sethangingsymbol} command to insert a character in each hanging line. If you use it, you must run \LaTeX\ two time. Example for the French typography
@@ -835,6 +845,11 @@
%
% When you use \protect\cs{lednopb} make sure to use it on both sides in the corresponding
% verses to keep the pages in sync.
+%
+% \DescribeMacro{\thestanzaL}
+% \DescribeMacro{\thestanzaR}
+% When using \cs{stanzanumtrue} (\reff{reledmac-numbering-stanza}) in parallel typesetting, \verb+stanza+ counter is replaced by \verb+stanzaL+ counter in left side and by \verb+stanzaR+ counter in right side. Consequently, you can redefine \cs{thestanzaL} and \cs{thestanzaR} to change their aspect.
+%
% \section{Side notes}
% As in \macpackage, you must use one of the following commands to add side notes: \protect\cs{ledsidenote}, \protect\cs{ledleftnote}, \protect\cs{ledrightnote}, \protect\cs{ledouterote}, \protect\cs{ledinnerrote}.
%
@@ -914,6 +929,7 @@
% \StopEventually{}
% \clearpage
% \renewcommand{\thesection}{\Roman{section}}
+% \renewcommand\theHsection{\Roman{section}}
% \setcounter{section}{0}
% \section{Implementation overview}\label{overview}
%
@@ -951,7 +967,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2015/07/27 v2.1.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/08/08 v2.2.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3972,11 +3988,11 @@
% \begin{environment}{astanza}
% \changes{v1.4.1}{2013/08/16}{Enable the use of stanzaindentsrepetition within astanza environment.}
% \changes{v1.13.0}{2015/03/06}{Enable the use of optional argument of \& in astanza environment.}
-% This is roughly an environmental form of \protect\cs{stanza}, which treats
+% This is roughly an environmental form of \cs{stanza}, which treats
% its stanza-like contents as a single chunk.
%
% \begin{macrocode}
-\newenvironment{astanza}{%
+\newenvironment{astanza}[1][]{%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
\ifnum\usenamecount{sza@0@}=\z@
@@ -3994,7 +4010,7 @@
\global\advance\stanza@count\@ne
\@astanza@line}%
\def\&{\@stopastanza}%
- \pstart
+ \pstart[#1]%
\@astanza@line
}{}
@@ -4002,7 +4018,7 @@
% \end{environment}
%
% \begin{macro}{\@stopastanza}
-% This command is called by \verb+\&+ in astanza environment.
+% This command is called by \verb+\&+ in \env{astanza} environment.
% It allows optional arguments.
% \begin{macrocode}
\newcommandx{\@stopastanza}[1][1,usedefault]{%
@@ -4036,7 +4052,23 @@
\catcode`\&=\next
% \end{macrocode}
+%
+% \begin{macro}{\thestanzaL}
+% \begin{macro}{\thestanzaR}
+% And now, the left and right stanza counter.
+% \begin{macrocode}
+\newcounter{stanzaL}
+\newcounter{stanzaR}
+\renewcommand{\thestanzaL}{%
+ \textbf{\arabic{stanzaL}}%
+}
+\renewcommand{\thestanzaR}{%
+ \textbf{\arabic{stanzaR}}%
+}
%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \section{Naming macros}
%
% The \LaTeX\ kernel provides \protect\cs{@namedef} and \protect\cs{@namuse} for defining
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 15056105b40..522365c6c2d 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -33,14 +33,10 @@
- \newcommand{\numberit}{%
- \refstepcounter{stanzanum}%
- \flagstanza{\thestanzanum}%
- }
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/07/27 v2.0.1 typesset critical edition]%
+\ProvidesPackage{reledmac}[2015/08/08 v2.1.0 typesset critical edition]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -243,10 +239,10 @@
\reledmac@error{Xfootnote without edtext. Check syntax.}{\@ehc}%
}%
\newcommand{\led@error@ImakeidxAfterEledmac}{%
- \reledmac@error{Imakeidx must be loaded before eledmac.}{\@ehc}%
+ \reledmac@error{Imakeidx must be loaded before reledmac.}{\@ehc}%
}%
\newcommand{\led@error@IndextoolsAfterEledmac}{%
- \reledmac@error{Indextools must be loaded before eledmac.}{\@ehc}%
+ \reledmac@error{Indextools must be loaded before reledmac.}{\@ehc}%
}%
\newcommand{\led@error@fail@patch@@makecol}{%
\reledmac@error{Fail to patch \string\@makecol\space command.}{\@ehc}%
@@ -1111,13 +1107,14 @@
\fi
\ifdim\dimen0>0pt \hskip\dimen0 \fi}
-\newcommand*{\advanceline}[1]{%
+\newcommand*{\advanceline}[1]{\leavevmode%
\ifledRcol \write\linenum@outR{\string\@adv[#1]}%
\else \write\linenum@out{\string\@adv[#1]}%
\fi%
}
\newcommand*{\setline}[1]{%
+ \leavevmode%
\ifnum#1<\z@
\led@warn@BadSetline
\else
@@ -2036,8 +2033,8 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{%
\insert\csname #1footins\endcsname\bgroup
- \csuse{Xbhooknote@#1}
- \csuse{Xnotefontsize@#1}
+ \noindent\csuse{Xbhooknote@#1}%
+ \csuse{Xnotefontsize@#1}%
\footsplitskips
\ifl@dpairing\ifl@dpaging\else%
\setXnoteswidthliketwocolumns@{#1}%
@@ -2048,8 +2045,8 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\mpnormalvfootnote}[2]{%
\global\setbox\@nameuse{mp#1footins}\vbox{%
\unvbox\@nameuse{mp#1footins}
- \csuse{Xbhooknote@#1}
- \csuse{Xnotefontsize@#1}
+ \noindent\csuse{Xbhooknote@#1}%
+ \csuse{Xnotefontsize@#1}%
\hsize\columnwidth
\@parboxrestore
\color@begingroup
@@ -2165,11 +2162,11 @@
\newcommand*{\paravfootnote}[2]{%
\insert\csname #1footins\endcsname
\bgroup
- \csuse{Xbhooknote@#1}
\csuse{Xnotefontsize@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\csname #1footfmt\endcsname #2{#1}}%
+ \noindent\csuse{Xbhooknote@#1}%
+ \csname #1footfmt\endcsname #2{#1}}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
\dp0=0pt
\ht0=\csname #1footfudgefactor\endcsname\wd0
@@ -2180,11 +2177,12 @@
\newcommand*{\mpparavfootnote}[2]{%
\global\setbox\@nameuse{mp#1footins}\vbox{%
\unvbox\@nameuse{mp#1footins}%
- \csuse{Xbhooknote@#1}
\csuse{Xnotefontsize@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\color@begingroup\csname #1footfmt\endcsname #2{#1}\color@endgroup}%
+ \noindent\color@begingroup%
+ \csuse{Xbhooknote@#1}%
+ \csname #1footfmt\endcsname #2{#1}\color@endgroup}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
\dp0=\z@
\ht0=\csname #1footfudgefactor\endcsname\wd0
@@ -2538,6 +2536,12 @@
(togl{Xpstart@#2} and bool{numberpstart})%
or togl{Xpstarteverytime@#2}}%
{\printpstart}{}%
+ \iftoggle{Xstanza@#2}{%
+ \ifnumberstanza%
+ \printstanza%
+ \csuse{Xstanzaseparator@#2}%
+ \fi%
+ }{}%
\iftoggle{Xonlypstart@#2}{}{\printlines#1|}%
}%
\newcommand{\printXbeforenumber}[1]{%
@@ -2772,8 +2776,8 @@
\hbox{\textsuperscript{\normalfont\@nameuse{@thefnmark#1}}}}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{%
\insert\@nameuse{footins#1}\bgroup
- \csuse{bhooknoteX@#1}
- \csuse{notefontsizeX@#1}
+ \noindent\csuse{bhooknoteX@#1}%
+ \csuse{notefontsizeX@#1}%
\footsplitskips
\ifl@dpairing\ifl@dpaging\else%
\setnoteswidthliketwocolumnsX@{#1}%
@@ -2785,8 +2789,8 @@
\newcommand*{\mpnormalvfootnoteX}[2]{%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
- \csuse{bhooknoteX@#1}
- \csuse{notefontsizeX@#1}
+ \noindent\csuse{bhooknoteX@#1}%
+ \csuse{notefontsizeX@#1}%
\hsize\columnwidth
\@parboxrestore
\color@begingroup
@@ -3127,11 +3131,11 @@
\newcommand*{\para@vfootnoteX}[2]{%
\insert\csname footins#1\endcsname
\bgroup
- \csuse{bhooknoteX@#1}
\csuse{notefontsizeX@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\@nameuse{footfmt#1}{#1}{#2}}%
+ \noindent\csuse{bhooknoteX@#1}%
+ \@nameuse{footfmt#1}{#1}{#2}}%
\setbox0=\hbox{\unvxhX{0}{#1}}%
\dp0=\z@
\ht0=\csname footfudgefactor#1\endcsname\wd0
@@ -3141,11 +3145,12 @@
\newcommand*{\mppara@vfootnoteX}[2]{%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
- \csuse{bhooknoteX@#1}
\csuse{notefontsizeX@#1}
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen
- \noindent\color@begingroup\@nameuse{footfmt#1}{#1}{#2}\color@endgroup}%
+ \noindent\color@begingroup%
+ \csuse{bhooknoteX@#1}%
+ \@nameuse{footfmt#1}{#1}{#2}\color@endgroup}%
\setbox0=\hbox{\unvxhX{0}{#1}}%
\dp0=\z@
\ht0=\csname footfudgefactor#1\endcsname\wd0
@@ -3583,6 +3588,8 @@
\newtoggle{Xonlypstart@#1}%
\newtoggle{Xpstarteverytime@#1}%
\newtoggle{Xpstart@#1}%
+ \newtoggle{Xstanza@#1}%
+ \csgdef{Xstanzaseparator@#1}{}%
\csgdef{Xsymlinenum@#1}{}%
\newtoggle{Xnonumber@#1}%
\csgdef{Xbeforenumber@#1}{0pt}%
@@ -3623,6 +3630,7 @@
\noexpand\prepare@preXnotes{#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.
+ \noexpand\setcounter{stanzaR}{\the\c@stanzaR}%Save stanzaR counter for footnote
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
}\to\inserts@listR
@@ -3640,6 +3648,9 @@
\noexpand\prepare@preXnotes{#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.
+ \ifl@dpairing%
+ \noexpand\setcounter{stanzaL}{\the\c@stanzaL}%Save stanzaR counter for footnote
+ \fi%
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
}\to\inserts@list
@@ -3882,6 +3893,10 @@
\newhooktoggle@series{Xnonumber}
\newhooktoggle@series{Xpstart}
\newhooktoggle@series{Xpstarteverytime}%
+
+ \newhooktoggle@series{Xstanza}%
+ \newhookcommand@series{Xstanzaseparator}%
+
\newhooktoggle@series{Xonlypstart}
\newhooktoggle@series{Xnonbreakableafternumber}
\newhooktoggle@series{Xlemmadisablefontselection}
@@ -4981,6 +4996,52 @@
\fi%
\ignorespaces%
}%
+\newcounter{stanza}
+\renewcommand{\thestanza}{%
+ \textbf{\arabic{stanza}}%
+}
+\newif\ifnumberstanza%
+\newcommand{\@insertstanzanumber}[0]{%
+ \ifnumberstanza%
+ \ifl@dpairing%
+ \ifledRcol%
+ \stanzanumwrapper{\thestanzaR}%
+ \else%
+ \stanzanumwrapper{\thestanzaL}%
+ \fi%
+ \else%
+ \stanzanumwrapper{\thestanza}%
+ \fi%
+ \setline{1}%
+ \fi%
+}%
+\newcommand{\@advancestanzanumber}[0]{%
+ \ifnumberstanza%
+ \ifl@dpairing%
+ \ifledRcol%
+ \addtocounter{stanzaR}{1}%
+ \else%
+ \addtocounter{stanzaL}{1}%
+ \fi%
+ \else%
+ \addtocounter{stanza}{1}%
+ \fi%
+ \fi%
+}%
+\newcommand{\stanzanumwrapper}[1]{%
+ \flagstanza{#1}%
+}%
+\newcommand{\printstanza}[0]{%
+ \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{%
+ \ifledRcol@%
+ \thestanzaR%
+ \else%
+ \thestanzaL%
+ \fi%
+ }{%
+ \thestanza%
+ }%
+}
\newcommandx{\stanza@line}[1][1]{
\ifnum\value{stanzaindentsrepetition}=0
@@ -5013,7 +5074,8 @@
\def\noexpand&{%
\noexpand\newverse[][]}%
\def\noexpand\&{\noexpand\@stopstanza}%
- \noexpand\stanza@line[#1]}
+ \noexpand\@advancestanzanumber%
+ \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber}
\newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]}
@@ -5835,13 +5897,23 @@
\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{%
\if@eled@sectioning\else%
\ifl@dprintingpages\else%
- \if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \eledsection: will keep critical notes from printing on the title page.
+ \if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for classical classes
\fi%
\fi%
}%
{}%
{}%
+\patchcmd{\scr@startchapter}{\if@openright\cleardoublepage\else\clearpage\fi}{%
+ \if@eled@sectioning\else%
+ \ifl@dprintingpages\else%
+ \if@openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for scrbook.
+ \fi%
+ \fi%
+ }
+ {}
+ {}
+
\patchcmd{\@makechapterhead}
{#1}
{\print@leftmargin@eledsection%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 48b3141179c..ad14fe8e176 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2015/07/27 v2.1.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/08/08 v2.2.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1465,7 +1465,7 @@
\chardef\next=\catcode`\&
\catcode`\&=\active
-\newenvironment{astanza}{%
+\newenvironment{astanza}[1][]{%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
\ifnum\usenamecount{sza@0@}=\z@
@@ -1483,7 +1483,7 @@
\global\advance\stanza@count\@ne
\@astanza@line}%
\def\&{\@stopastanza}%
- \pstart
+ \pstart[#1]%
\@astanza@line
}{}
@@ -1506,6 +1506,14 @@
\catcode`\&=\next
+\newcounter{stanzaL}
+\newcounter{stanzaR}
+\renewcommand{\thestanzaL}{%
+ \textbf{\arabic{stanzaL}}%
+}
+\renewcommand{\thestanzaR}{%
+ \textbf{\arabic{stanzaR}}%
+}
\providecommand*{\newnamebox}[1]{%
\expandafter\newbox\csname #1\endcsname}
\providecommand*{\setnamebox}[1]{%