diff options
author | Karl Berry <karl@freefriends.org> | 2015-10-19 22:36:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-10-19 22:36:04 +0000 |
commit | 90eab0f6fae15d48f312525a7613f63546292087 (patch) | |
tree | 24465222b5d973267bb3751416822db039c821f7 /Master | |
parent | dd668ea645b653e663abe0e53f9364f3b8f28ddf (diff) |
reledmac (19oct15)
git-svn-id: svn://tug.org/texlive/trunk@38673 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
42 files changed, 236 insertions, 147 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 bbcee490256..0488c4433ea 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 @@ -367,14 +367,17 @@ % So instead of \cs{Xbhooknote}\arg{content}, use \cs{Xbhooknote}\arg{content\ }. % \item Indent is no longer automatically added before the content of the \cs{Xbhooknote}/\cs{bhooknoteX} argument. % If you want to keep it, add \cs{indent} in the argument of \cs{Xbhooknote}/\cs{bhooknoteX}. -% +% \end{enumerate} % \subsection{Migration to \reledmac~2.1.3} % \Reledmac~2.1.3 fix an historical bug, (style in \ledmac~0.7!) which doubled the space before the rules of paragraphed familiar footnotes. % Consequently, if you use paragraphed familiar footnotes, you should maybe adapt it, playing with \cs{beforenotesX}. -% \end{enumerate} % \subsection{Migration to \reledmac~2.3.0}\label{mac2.5.0migration} -% Before \reledmac~2.3.0, any empty line when typeseting verse was considered as a paragraph inside verses. Consequently, it was breaking verse hanging, and, furthermore, add spurious vertical spaces. -% Version 2.3.0 disable paragraph in stanza. If you want vertical space, use optional argument of \cs{stanza} or \cs{endverse}. +% Before \reledmac~2.3.0, for typesetting verse, any empty line was considered a paragraph inside verses. Counting empty lines this created breaking verse, hanging verses, and also added spurious vertical spaces. +% Version 2.3.0 disables paragraph in stanza. If you want vertical space, use optional argument of \cs{stanza} or \cs{endverse}. +% \subsection{Migration to \reledmac~2.4.0} +% It is not mandatory, but strongly recommended, to change any \cs{renewcommand}\\marg{\endashchar}\marg{…} to the use of \cs{Xlinerangeseparator} or / and \cs{Xendlinerangeseparator} (\reff{linerangeseparator}). +% +% % % % diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf Binary files differindex ae2bb504c13..b0628899ea7 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf Binary files differindex a0bbe076926..fb888949960 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf Binary files differindex 435efdbccae..c1ab5100b6d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf Binary files differindex acfa970869c..07b6fe49b98 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf 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 Binary files differindex 7348c8be9e3..951397b3472 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 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 Binary files differindex ae1b32b2f1f..15aa470e67f 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 diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf Binary files differindex b5c6ec86f7c..40992dff0a0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf 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 Binary files differindex 902d80a0a22..dd9f072bf87 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 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 Binary files differindex e7f35789b4c..e8461f0b9e1 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 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 Binary files differindex d31e333681b..208520abd38 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 diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf Binary files differindex 162769ce59f..73b06c8724b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf 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 Binary files differindex f4794939e9c..868f3f42a86 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 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 Binary files differindex 95764293a84..56bad12aa52 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 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 Binary files differindex c8c1ddd2420..0bd7dd7c98f 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 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 Binary files differindex be4e3f73cd2..08629bc4d7f 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 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 Binary files differindex 77693457829..1a35feebf08 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 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 Binary files differindex 2d7128cca03..f4322b65250 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 diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex 1ef7de27e49..69b6c58eed6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex b5b42df89d8..6ab0772b59a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex 7b5a47131b9..645db06917f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 8e4e882b42d..a2f871c1ce0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex cb89797a1ae..0fff5d68b01 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 4aa3b834b1c..dbcc40cf479 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex a7e99b131d4..0b40af84a5f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf 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 Binary files differindex 06e3bd10172..7e50c7d07c1 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 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 Binary files differindex 15382e332a0..f9bf511fd76 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 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 Binary files differindex 98563a3751b..83e0676955d 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 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 Binary files differindex e65b22d3734..2b9f0cc3424 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 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 Binary files differindex cba0d290b82..e5a4d581e40 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 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 Binary files differindex 7c370193484..db4f02ae38f 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 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 Binary files differindex c5c676605ef..221199356da 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 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 Binary files differindex 803c3662069..dc71018ad1d 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 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 Binary files differindex edf9de66756..42ca9a10ebc 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 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 Binary files differindex 54cc71fa8bb..bbcd198791a 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 diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex d0b3f9727a3..6cf71f2949a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf Binary files differindex 35a9abfd5be..345b86af1a8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf Binary files differindex 3b70b818891..c5bd436f719 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 1dbaf009d97..50aa33c3511 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -338,7 +338,12 @@ % \changes{v2.3.0}{2015/10/14}{Warning message when using some setting commands inside rightside environment (deprecated behavior)} % \changes{v2.3.0}{2015/10/14}{Disable empty lines as paragraph in stanza.} % \changes{v2.3.0}{2015/10/14}{Fix compatibility of paragraphed footnotes with \protect\package{bidi} v17.9 and following.} -% +% \changes{v2.3.1}{2015/10/19}{Fix spurious space when using optional argument of \protect\cs{stanza} (introduced in v2.3.0).} +% \changes{v2.4.0}{2015/10/19}{\protect\cs{Xbhooknote} and \protect\cs{bhooknoteX} work with notes in columns.} +% \changes{v2.4.0}{2015/10/19}{Fix bug with \protect\cs{sameword} in right side.} +% \changes{v2.4.0}{2015/10/19}{Fix spurious space in two columns and three columns notes.} +% \changes{v2.4.0}{2015/10/19}{Fix bug of \protect\cs{parindentX} and \protect\cs{Xparindent} with two columns and three columns notes.} +% \changes{v2.4.0}{2015/10/19}{Fix spurious space when using optional argument of \protect{stanza} (introduced in v2.3.0).} % % % \title{\Macpackage \\ @@ -1158,6 +1163,7 @@ % \item \verb|fulllines| to disable \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines} features for this note (cf. \reff{Xtwolines}). % \item \verb|nonum| to disable line numbering for this note. % \item \verb|nosep| to disable the lemma separator for this note. +% \item \verb|linerangesep=|\meta{c} to change to \meta{c} the separator between start line and end line for this particular note. % \end{itemize} % % Example: \protect\cs{Afootnote}\verb|[nonum]|\marg{text}. @@ -1180,6 +1186,7 @@ % \item \verb|fulllines| to disable \protect\cs{Xendtwolines} and \protect\cs{Xendmorethantwolines} features for this particular note (cf. \reff{Xtwolines}). % \item \verb+nonum+ to disable line number for this particular note. % \item \verb|nosep| to disable the lemma separator for this particular note. +% \item \verb|linerangesep=|\meta{c} to change to \meta{c} the separator between start line and end line for this particular note. % \end{itemize} % % \DescribeMacro{\doendnotes}\label{doendnotes} Normally, endnotes are not printed: you must use the @@ -1592,6 +1599,14 @@ % \DescribeMacro{\Xendsymlinenum} % For endnotes, \cs{Xendnumberonlyfirstinline}; \cs{Xendnumberonlyfirstintwolines} and \cs{Xendsymlinenum} are the equivalents of % \\ \cs{Xnumberonlyfirstinline}; \cs{Xnumberonlyfirstintwolines} and \cs{Xsymlinenum}. +% \subsubsection{Separator for line range}\label{linerangeseparator} +% \changes{v2.4.0}{2015/10/19}{New hooks: \protect\cs{Xlinerangeseparator} and \protect\cs{Xendlinerangeseparator}.} +% \changes{v2.4.0}{2015/10/19}{Option linerangesep for critical footnotes and endnotes.} +% \DescribeMacro{\Xlinerangeseparator} +% \DescribeMacro{\Xendlinerangeseparator} +% By default, the separator between the begin line and the end line in a lines' range is an endash in a normal font (\verb+\textnormal{--}+). +% You can change it for critical footnotes with \cs{Xlinerangeseparator}\oarg{s}\marg{text}, and with \cs{Xendlinerangeseparator}\oarg{s}\marg{text} for critical endnotes. +% % \subsubsection{Abbreviate line range} % \changes{v1.20.0}{2015/03/22}{Add \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines} hooks} % \label{Xtwolines} @@ -1775,7 +1790,7 @@ %\subsection{Separator between the lemma and the note} % \subsubsection{For footnotes} % \DescribeMacro{\Xlemmaseparator} -% By default, in a footnote, the separator between the lemma and the note is a right bracket (\protect\cs{rbracket}). You can use \protect\cs{Xlemmaseparator}\oarg{s}\marg{Xlemmaseparator} to change it. The optional argument can be used to specify the series in which it is used. Note that there is a non-breakable space between the lemma and the separator, but a \textbf{breakable} space between the separator and the following text. +% By default, in a footnote, the separator between the lemma and the note is a right bracket (\protect\cs{rbracket})\footnote{For \protect\package{polyglossia}, when the lemma is RTL, the bracket automatically switches to a left bracket.}. You can use \protect\cs{Xlemmaseparator}\oarg{s}\marg{Xlemmaseparator} to change it. The optional argument can be used to specify the series in which it is used. Note that there is a non-breakable space between the lemma and the separator, but a \textbf{breakable} space between the separator and the following text. % % \DescribeMacro{\Xbeforelemmaseparator} % Using \protect\cs{Xbeforelemmaseparator}\oarg{s}\marg{l} you can add some space between lemma and separator. If your lemma separator is empty, this space won't be printed. The default value is 0~em. @@ -2058,31 +2073,26 @@ % % % -% \DescribeMacro{\endashchar} % \DescribeMacro{\fullstop} -% \DescribeMacro{\rbracket} % \font\teni=cmmi10 % A relatively trivial matter relates to punctuation. In your -% footnotes, there will sometimes be spans of line numbers like -% this: 12--34, or lines with sub-line numbers like this: 55.6. The +% footnotes, there will be sometimes lines with sub-line numbers like this: 55.6. The % en-dash and the full stop are taken from the same font as the % numbers, and it all works nicely. But what if you wanted to use % old-style numbers, like {\teni12} and {\teni34}? These look nice % in an edition, but when you use the fonts provided by \PlainTeX\ % they are taken from a math font which does not -% have the en-dash or full stop in the same places as a text font. -% If you (or your macros) just typed \verb"$\oldstyle 12--34$" or -% \verb"$\oldstyle 55.6$" you would get `{\teni12--34}'and -% `{\teni55.6}'. So we define \protect\cs{endashchar} and -% \protect\cs{fullstop}, which produce an en-dash and a full stop -% respectively from the normal document font, whatever font you are using -% for the numbers. These two macros are used in the +% have full stop in the same places as a text font. +% If you (or your macros) just typed +% \verb"$\oldstyle 55.6$" you will get +% `{\teni55.6}'. So we define +% \protect\cs{fullstop}, which produces a full stop +% from the normal document font, whatever font you are using +% for the numbers. This macro is used in the % macros which format the line numbers in the margins and % footnotes, instead of explicit punctuation. -% We also define an \protect\cs{rbracket} macro for the -% right square bracket printed at the end of the lemma in many -% styles of textual notes (including \macpackage's standard style). -% For \protect\package{polyglossia}, when the lemma is RTL, the bracket automatically switches to a left bracket. +% +% % % % @@ -2291,7 +2301,7 @@ % the line. The default \meta{len} is \verb?\stanzaindentbase?. % % \subsection{Notes on empty lines} -% Since v2.3.0 of \reledmac, empty lines when typesetting verse does not produce any more new paragraph, and, consequently, do not insert vertical space. +% Since v2.3.0 of \reledmac, empty lines when typesetting verses no longer produce new paragraphs, and consequently, do not insert vertical spaces. % Use optional argument of \cs{stanza} or \cs{newverse} to insert vertical space (\reff{contentverse}). % \section{Grouping} % In a \verb?minipage? environment \LaTeX\ changes \verb?\footnote? numbering from @@ -3311,7 +3321,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/10/14 v2.3.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/10/19 v2.4.0 typeset critical edition]% % \end{macrocode} % % \subsection{Package options} @@ -6764,8 +6774,8 @@ % Do the same thing if we are in the right columns. % \begin{macrocode} \else% - \csnumgdef{sw@\sw@txt@R}{\csuse{sw@\sw@txt@R}+1}% - \protected@write\linenum@outR{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt@R}}{#1}}% + \csnumgdef{sw@\sw@txt}{\csuse{sw@\sw@txt}+1}% + \protected@write\linenum@outR{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt}}{#1}}% \fi% % \end{macrocode} % And print the word. @@ -8168,15 +8178,16 @@ % \changes{v1.0.0}{2012/09/15}{Options of \protect\cs{Xfootnote}s.} % \begin{macro}{\footnoteoptions@} % The \protect\cs{footnoteoption@}\oarg{side}\marg{options}\marg{value} changes the value of on options of Xfootnote, to switch between true and false. +% \changes{v2.4.0}{2015/10/19}{First argument of \protect\cs{footnoteoption@} is now mandatory, not optional.} % \begin{macrocode} -\newcommandx*{\footnoteoptions@}[3][1=L,usedefault]{% +\newcommand*{\footnoteoptions@}[3]{% \def\do##1{% \ifstrequal{#1}{L}{% In Leftside - \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@list% Switch toogle, in all case + \xright@appenditem{\noexpand\setkeys[mac]{#3footnoteoption}{\unexpanded{##1}}}\to\inserts@list% \global\advance\insert@count \@ne% Increment the left insert counter. }% {% - \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@listR% Switch toogle, in all case + \xright@appenditem{\noexpand\setkeys[mac]{#3footnoteoption}{\unexpanded{##1}}}\to\inserts@listR% \global\advance\insert@countR \@ne% Increment the right insert counter insert. }% }% @@ -9108,9 +9119,10 @@ % of the note (including numbers, lemma and text). % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{% - \insert\csname #1footins\endcsname\bgroup - \csuse{Xnotefontsize@#1} - \footsplitskips + \insert\csname #1footins\endcsname\bgroup% + \noindent\csuse{Xbhooknote@#1}% + \csuse{Xnotefontsize@#1}% + \footsplitskips% \csname #1footfmt\endcsname #2{#1}\egroup} % \end{macrocode} % \end{macro} @@ -9124,12 +9136,12 @@ % % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolfootfmt}[4]{% - \normal@pars - \hsize \csuse{Xhsizethreecol@#4} - \nottoggle{Xparindent@#4}{\parindent=\z@}{} - \tolerance=5000 - \hangindent=\csuse{Xhangindent@#4} - \leavevmode + \normal@pars% + \hsize \csuse{Xhsizethreecol@#4}% + \nottoggle{Xparindent@#4}{\parindent=\z@}{}% + \tolerance=5000% + \hangindent=\csuse{Xhangindent@#4}% + \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% @@ -9241,19 +9253,21 @@ \multiply\dimen\csname #1footins\endcsname \tw@} % \end{macrocode} % \begin{macrocode} -\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{\insert\csname #1footins\endcsname\bgroup - \csuse{Xnotefontsize@#1} - \footsplitskips +\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{% + \insert\csname #1footins\endcsname\bgroup% + \noindent\csuse{Xbhooknote@#1}% + \csuse{Xnotefontsize@#1}% + \footsplitskips% \csname #1footfmt\endcsname #2{#1}\egroup} % \end{macrocode} % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolfootfmt}[4]{% 4th arg is optional, for backward compatibility - \normal@pars - \hsize \csuse{Xhsizetwocol@#4} - \nottoggle{Xparindent@#4}{\parindent=\z@}{} - \tolerance=5000 - \hangindent=\csuse{Xhangindent@#4} - \leavevmode + \normal@pars% + \hsize \csuse{Xhsizetwocol@#4}% + \nottoggle{Xparindent@#4}{\parindent=\z@}{}% + \tolerance=5000% + \hangindent=\csuse{Xhangindent@#4}% + \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% @@ -9810,7 +9824,13 @@ \csuse{Xtwolines@\@currentseries}% \fi% \else% - \ifl@d@dash \endashchar\fi% + \ifl@d@dash% + \ifdefined\linerangesep@% + \linerangesep@% + \else% + \csuse{Xlinerangeseparator@\@currentseries}% + \fi% + \fi% \ifl@d@pnum #4\fullstop\fi% \ifl@d@elin \linenumrep{#5}\fi% \ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi% @@ -10328,10 +10348,11 @@ % \protect\cs{twocolvfootnoteX}\marg{series} % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% - \insert\csname footins#1\endcsname\bgroup - \csuse{notefontsizeX@#1} - \footsplitskips - \spaceskip=\z@skip \xspaceskip=\z@skip + \insert\csname footins#1\endcsname\bgroup% + \noindent\csuse{bhooknoteX@#1}% + \csuse{notefontsizeX@#1}% + \footsplitskips% + \spaceskip=\z@skip \xspaceskip=\z@skip% \@nameuse{footfmt#1}{#1}{#2}\egroup} % \end{macrocode} @@ -10344,13 +10365,13 @@ \protected@edef\@currentlabel{% \@nameuse{@thefnmark#1}% }% - \normal@pars + \normal@pars% \hangindent=\csuse{hangindentX@#1}% \everypar{\hangindent=\csuse{hangindentX@#1}}% - \hsize \csuse{hsizetwocolX@#1} - \nottoggle{parindentX@#1}{\parindent=\z@}{} - \tolerance=5000\relax - \leavevmode + \hsize \csuse{hsizetwocolX@#1}% + \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \tolerance=5000\relax% + \par% \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% @@ -10444,9 +10465,10 @@ % \protect\cs{threecolvfootnoteX}\marg{series}\marg{text} % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% - \insert\csname footins#1\endcsname\bgroup + \insert\csname footins#1\endcsname\bgroup% + \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1} - \footsplitskips + \footsplitskips% \@nameuse{footfmt#1}{#1}{#2}\egroup} % \end{macrocode} @@ -10461,11 +10483,11 @@ }% \hangindent=\csuse{hangindentX@#1}% \everypar{\hangindent=\csuse{hangindentX@#1}}% - \normal@pars - \hsize \csuse{hsizethreecolX@#1} - \nottoggle{parindentX@#1}{\parindent=\z@}{} % - \tolerance=5000\relax - \leavevmode + \normal@pars% + \hsize \csuse{hsizethreecolX@#1}% + \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \tolerance=5000\relax% + \par% \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% @@ -11058,7 +11080,7 @@ \fi% \xdef\@currentseries{#4}% \def\do##1{% - \toggletrue{##1@}% + \setkeys[mac]{truefootnoteoption}{##1}% }% \notblank{#5}{\docsvlist{#5}}{}% \csuse{Xendbhooknote@#4}% @@ -11079,8 +11101,8 @@ }% #3% \nottoggle{Xendparagraph@#4}{\par}{}% - \def\do##1{% - \togglefalse{##1@}% + \def\do##1{% + \setkeys[mac]{falsefootnoteoption}{##1}% }% \notblank{#5}{\docsvlist{#5}}{}% }}% @@ -11302,7 +11324,13 @@ \csuse{Xendtwolines@\@currentseries}% \fi% \else% - \ifl@d@dash \endashchar\fi% + \ifl@d@dash% + \ifdefined\linerangesep@% + \linerangesep@% + \else% + \csuse{Xendlinerangeseparator@\@currentseries}% + \fi% + \fi% \ifl@d@pnum \printnpnum{#4}\fi% \ifl@d@elin \linenumrep{#5}\fi% \ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi% @@ -11461,6 +11489,7 @@ \newtoggle{Xnoteswidthliketwocolumns@#1}% \csgdef{Xparafootsep@#1}{}% \csgdef{Xafternote@#1}{1em plus.4em minus.4em} + \csgdef{Xlinerangeseparator@#1}{\endashchar}% % \end{macrocode} % \subsubsection{Create inserts, needed to add notes in foot} % As regards inserts, see chapter 15 of \thetexbook by D. Knuth. @@ -11487,7 +11516,7 @@ \@ifundefined{xpg@main@language}%if polyglossia {}% {\footnotelang@poly[R]}% - \footnoteoptions@[R]{##1}{true}% + \footnoteoptions@{R}{##1}{true}% \xright@appenditem{% \noexpand\prepare@preXnotes{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% @@ -11496,7 +11525,7 @@ \noexpand\csuse{v#1footnote}{#1}% {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% }\to\inserts@listR - \footnoteoptions@[R]{##1}{false}% + \footnoteoptions@{R}{##1}{false}% \global\advance\insert@countR \@ne% \else% \ifluatex% @@ -11505,7 +11534,7 @@ \@ifundefined{xpg@main@language}%if polyglossia {}% {\footnotelang@poly}% - \footnoteoptions@{##1}{true}% + \footnoteoptions@{L}{##1}{true}% \xright@appenditem{% \noexpand\prepare@preXnotes{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% @@ -11517,7 +11546,7 @@ {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% }\to\inserts@list \global\advance\insert@count \@ne% - \footnoteoptions@{##1}{false}% + \footnoteoptions@{L}{##1}{false}% \fi \else \csuse{v#1footnote}{#1}{{0|0|0|0|0|0|0}{}{##1}}% @@ -11650,7 +11679,7 @@ {\ifnumberedpar@\expandonce\@tag\fi}% {\expandonce\content}% {#1}% - {##1}% + {\unexpanded{##1}}% \@percentchar% }% \egroup% @@ -11717,6 +11746,8 @@ \csgdef{Xendehooklinenumber@#1}{}% \csgdef{Xendbhookinplaceofnumber@#1}{}% \csgdef{Xendehookinplaceofnumber@#1}{}% + + \csgdef{Xendlinerangeseparator@#1}{\endashchar}% % \end{macrocode} % End of endnotes declaration % \begin{macrocode} @@ -12001,6 +12032,8 @@ \newhookcommand@series{Xafternote}% \newhookcommand@series{Xparafootsep} + \newhookcommand@series{Xlinerangeseparator} + \fi % \end{macrocode} % \subsubsection{Options for familiar notes} @@ -12072,26 +12105,44 @@ \newhookcommand@series{Xendahookinplaceofnumber}% \newhookcommand@series{Xendhangindent}% + + \newhookcommand@series{Xendlinerangeseparator} \fi % \end{macrocode} % \subsection{Hooks for a particular footnote} -% \begin{macro}{\fulllines@} -%\protect\cs{fulllines@} toggle is used to print the full lines references, and not the abbreviated form defined by \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines}. +% \begin{macro}{\newhooktoggle@specific} +% \cs{newhooktoggle@specific} is a generic command to create boolean hook specific to a note. % \begin{macrocode} -\newtoggle{fulllines@}% +\newcommand{\newhooktoggle@specific}[1]{% + \newtoggle{#1@}% + \define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option + \define@key[mac]{falsefootnoteoption}{#1}[]{\global\settoggle{#1@}{false}} +} % \end{macrocode} % \end{macro} -% \begin{macro}{\nonum@} -%\protect\cs{nonum@} toggle is used to disable line number printing in a particular footnote. +% \begin{macro}{\newhookarg@specific} +% \cs{newhookarg@specific} is a generic command to create argumen hook specific to a note. % \begin{macrocode} -\newtoggle{nonum@} +\newcommand{\newhookarg@specific}[1]{% + \define@key[mac]{truefootnoteoption}{#1}{\global\def\linerangesep@{##1}}%When enabling footnote option + \define@key[mac]{falsefootnoteoption}{#1}{\global\undef\linerangesep@}%When +} % \end{macrocode} % \end{macro} -% \begin{macro}{\nosep@} -%\protect\cs{nonum@} toggle is used to disable the lemma separator in a particular footnote. +% And now, we define some hooks specific to a note. % \begin{macrocode} -\newtoggle{nosep@} +\newhooktoggle@specific{fulllines}% +\newhooktoggle@specific{nonum} +\newhooktoggle@specific{nosep} +\newhookarg@specific{linerangesep} % \end{macrocode} +% \begin{macro}{linerangesep@} +% \cs{linerangesep@} is defined by the option \option{linerangesep} of critical notes to change temporarily the line range separator for a specific line. +% As we have to define it before typesetting the line and undefine it after, we use the family of \package{xkeyval} package's key. +% \begin{macrocode} +% \end{macrocode} +% +% % \end{macro} % \begin{macro}{\nomk@} %\protect\cs{nomk@} toggle is used by \parpackage{} to remove the footnote mark in the text when using \protect\cs{footnoteXmk}. Read \parpackage handbook. @@ -14310,7 +14361,7 @@ \def\noexpand\&{\noexpand\@stopstanza}% \noexpand\@advancestanzanumber% \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber% - \let\par\relax%No paragraph in verses + \let\par\relax\ignorespaces%No paragraph in verses } \newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 143992208b9..57ba96b85c5 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -248,8 +248,9 @@ % \changes{v2.4.0}{2015/09/29}{New way of (not) synchronizing the parallel pages.} % \changes{v2.4.0}{2015/09/29}{Option to switch to \protect\cs{mainmatter} when calling \protect\cs{Pages}} % \changes{v2.5.0}{2015/10/14}{New commands \protect\cs{linenummarginR} and \protect\cs{linenummargin*}} -% \changes{v2.5.0}{2015/10/14}{Fix bug introduced in v1.15.0 which made hanging indentation in verse was not working anymore.} -% \changes{v2.3.0}{2015/10/14}{Disable empty lines as paragraph in astanza.} +% \changes{v2.5.0}{2015/10/14}{Fix bug introduced in v1.15.0 which made hanging indentation in verse not work anymore.} +% \changes{v2.5.0}{2015/10/14}{Disable empty lines as paragraph in astanza.} +% \changes{v2.5.1}{2015/10/19}{Fix spurious space when using optional argument of \protect\env{astanza} environment (introduced in v2.5.0).} % \hyphenation{man-u-script man-u-scripts} % % @@ -842,12 +843,12 @@ % line will have a printed number. % % -% The lineation commands those finish by a \verb+R+ apply for right text. -% The lineation commands those are starred apply for both left and right texts. -% The lineation command those does not finish by a \verb+R+ and who are not starred apply for the left side. +% The lineation commands which finish by a \verb+R+ apply for right text. +% The lineation commands which are starred apply for both left and right texts. +% The lineation command which does not finish by a \verb+R+ and who are not starred apply for the left side. % \textbf{% -% However, these commands applies for right side when there are called inside a \environment{left} environment. -% However, such feature should not be used any more, as it a more recommend practice to add all commands about setting on the preamble. +% However, these commands apply to right side when they are called inside a \environment{left} environment. +% However, such features should not be used any more. The recommended practice is to add all setting commands to the preamble. %} % % \DescribeMacro{\firstlinenum*} @@ -1116,7 +1117,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/10/14 v2.5.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/10/19 v2.5.1 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -4353,7 +4354,7 @@ \def\&{\@stopastanza}% \pstart[#1]% \@astanza@line - \let\par\relax%No paragraph in verses + \let\par\relax\ignorespaces%No paragraph in verses }{} % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 9c57ae558e9..8b1dbd5ee68 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/10/14 v2.3.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/10/19 v2.4.0 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -1322,8 +1322,8 @@ \csnumgdef{sw@\sw@txt}{\csuse{sw@\sw@txt}+1}% \protected@write\linenum@out{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt}}{#1}}% \else% - \csnumgdef{sw@\sw@txt@R}{\csuse{sw@\sw@txt@R}+1}% - \protected@write\linenum@outR{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt@R}}{#1}}% + \csnumgdef{sw@\sw@txt}{\csuse{sw@\sw@txt}+1}% + \protected@write\linenum@outR{}{\string\@sw{\sw@txt}{\csuse{sw@\sw@txt}}{#1}}% \fi% #2% }% @@ -1948,14 +1948,14 @@ {\fontencoding{#1}\fontfamily{#2}\fontseries{#3}\fontshape{#4}% \selectfont} -\newcommandx*{\footnoteoptions@}[3][1=L,usedefault]{% +\newcommand*{\footnoteoptions@}[3]{% \def\do##1{% \ifstrequal{#1}{L}{% In Leftside - \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@list% Switch toogle, in all case + \xright@appenditem{\noexpand\setkeys[mac]{#3footnoteoption}{\unexpanded{##1}}}\to\inserts@list% \global\advance\insert@count \@ne% Increment the left insert counter. }% {% - \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@listR% Switch toogle, in all case + \xright@appenditem{\noexpand\setkeys[mac]{#3footnoteoption}{\unexpanded{##1}}}\to\inserts@listR% \global\advance\insert@countR \@ne% Increment the right insert counter insert. }% }% @@ -2330,17 +2330,18 @@ \multiply\dimen\csname mp#1footins\endcsname \thr@@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{% - \insert\csname #1footins\endcsname\bgroup - \csuse{Xnotefontsize@#1} - \footsplitskips + \insert\csname #1footins\endcsname\bgroup% + \noindent\csuse{Xbhooknote@#1}% + \csuse{Xnotefontsize@#1}% + \footsplitskips% \csname #1footfmt\endcsname #2{#1}\egroup} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolfootfmt}[4]{% - \normal@pars - \hsize \csuse{Xhsizethreecol@#4} - \nottoggle{Xparindent@#4}{\parindent=\z@}{} - \tolerance=5000 - \hangindent=\csuse{Xhangindent@#4} - \leavevmode + \normal@pars% + \hsize \csuse{Xhsizethreecol@#4}% + \nottoggle{Xparindent@#4}{\parindent=\z@}{}% + \tolerance=5000% + \hangindent=\csuse{Xhangindent@#4}% + \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% @@ -2403,17 +2404,19 @@ \count\csname #1footins\endcsname 500 \csxdef{default@#1footins}{500}%Use this to confine the notes to one side only \multiply\dimen\csname #1footins\endcsname \tw@} -\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{\insert\csname #1footins\endcsname\bgroup - \csuse{Xnotefontsize@#1} - \footsplitskips +\notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{% + \insert\csname #1footins\endcsname\bgroup% + \noindent\csuse{Xbhooknote@#1}% + \csuse{Xnotefontsize@#1}% + \footsplitskips% \csname #1footfmt\endcsname #2{#1}\egroup} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolfootfmt}[4]{% 4th arg is optional, for backward compatibility - \normal@pars - \hsize \csuse{Xhsizetwocol@#4} - \nottoggle{Xparindent@#4}{\parindent=\z@}{} - \tolerance=5000 - \hangindent=\csuse{Xhangindent@#4} - \leavevmode + \normal@pars% + \hsize \csuse{Xhsizetwocol@#4}% + \nottoggle{Xparindent@#4}{\parindent=\z@}{}% + \tolerance=5000% + \hangindent=\csuse{Xhangindent@#4}% + \par% \everypar{\hangindent=\csuse{Xhangindent@#4}}% \@tempdima=\parindent% \csuse{Xcolalign@#4}% @@ -2709,7 +2712,13 @@ \csuse{Xtwolines@\@currentseries}% \fi% \else% - \ifl@d@dash \endashchar\fi% + \ifl@d@dash% + \ifdefined\linerangesep@% + \linerangesep@% + \else% + \csuse{Xlinerangeseparator@\@currentseries}% + \fi% + \fi% \ifl@d@pnum #4\fullstop\fi% \ifl@d@elin \linenumrep{#5}\fi% \ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi% @@ -2988,23 +2997,24 @@ \multiply\dimen\csname mpfootins#1\endcsname by \tw@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% - \insert\csname footins#1\endcsname\bgroup - \csuse{notefontsizeX@#1} - \footsplitskips - \spaceskip=\z@skip \xspaceskip=\z@skip + \insert\csname footins#1\endcsname\bgroup% + \noindent\csuse{bhooknoteX@#1}% + \csuse{notefontsizeX@#1}% + \footsplitskips% + \spaceskip=\z@skip \xspaceskip=\z@skip% \@nameuse{footfmt#1}{#1}{#2}\egroup} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolfootfmtX}[2]{% \protected@edef\@currentlabel{% \@nameuse{@thefnmark#1}% }% - \normal@pars + \normal@pars% \hangindent=\csuse{hangindentX@#1}% \everypar{\hangindent=\csuse{hangindentX@#1}}% - \hsize \csuse{hsizetwocolX@#1} - \nottoggle{parindentX@#1}{\parindent=\z@}{} - \tolerance=5000\relax - \leavevmode + \hsize \csuse{hsizetwocolX@#1}% + \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \tolerance=5000\relax% + \par% \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% @@ -3065,9 +3075,10 @@ \multiply\dimen\csname mpfootins#1\endcsname by \thr@@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% - \insert\csname footins#1\endcsname\bgroup + \insert\csname footins#1\endcsname\bgroup% + \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1} - \footsplitskips + \footsplitskips% \@nameuse{footfmt#1}{#1}{#2}\egroup} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolfootfmtX}[2]{% @@ -3076,11 +3087,11 @@ }% \hangindent=\csuse{hangindentX@#1}% \everypar{\hangindent=\csuse{hangindentX@#1}}% - \normal@pars - \hsize \csuse{hsizethreecolX@#1} - \nottoggle{parindentX@#1}{\parindent=\z@}{} % - \tolerance=5000\relax - \leavevmode + \normal@pars% + \hsize \csuse{hsizethreecolX@#1}% + \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \tolerance=5000\relax% + \par% \@tempdima=\parindent% \csuse{colalignX@#1}% \parindent=\@tempdima% @@ -3425,7 +3436,7 @@ \fi% \xdef\@currentseries{#4}% \def\do##1{% - \toggletrue{##1@}% + \setkeys[mac]{truefootnoteoption}{##1}% }% \notblank{#5}{\docsvlist{#5}}{}% \csuse{Xendbhooknote@#4}% @@ -3446,8 +3457,8 @@ }% #3% \nottoggle{Xendparagraph@#4}{\par}{}% - \def\do##1{% - \togglefalse{##1@}% + \def\do##1{% + \setkeys[mac]{falsefootnoteoption}{##1}% }% \notblank{#5}{\docsvlist{#5}}{}% }}% @@ -3591,7 +3602,13 @@ \csuse{Xendtwolines@\@currentseries}% \fi% \else% - \ifl@d@dash \endashchar\fi% + \ifl@d@dash% + \ifdefined\linerangesep@% + \linerangesep@% + \else% + \csuse{Xendlinerangeseparator@\@currentseries}% + \fi% + \fi% \ifl@d@pnum \printnpnum{#4}\fi% \ifl@d@elin \linenumrep{#5}\fi% \ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi% @@ -3689,6 +3706,7 @@ \newtoggle{Xnoteswidthliketwocolumns@#1}% \csgdef{Xparafootsep@#1}{}% \csgdef{Xafternote@#1}{1em plus.4em minus.4em} + \csgdef{Xlinerangeseparator@#1}{\endashchar}% \expandafter\newinsert\csname #1footins\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mp#1footins\endcsname% @@ -3705,7 +3723,7 @@ \@ifundefined{xpg@main@language}%if polyglossia {}% {\footnotelang@poly[R]}% - \footnoteoptions@[R]{##1}{true}% + \footnoteoptions@{R}{##1}{true}% \xright@appenditem{% \noexpand\prepare@preXnotes{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% @@ -3714,7 +3732,7 @@ \noexpand\csuse{v#1footnote}{#1}% {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% }\to\inserts@listR - \footnoteoptions@[R]{##1}{false}% + \footnoteoptions@{R}{##1}{false}% \global\advance\insert@countR \@ne% \else% \ifluatex% @@ -3723,7 +3741,7 @@ \@ifundefined{xpg@main@language}%if polyglossia {}% {\footnotelang@poly}% - \footnoteoptions@{##1}{true}% + \footnoteoptions@{L}{##1}{true}% \xright@appenditem{% \noexpand\prepare@preXnotes{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% @@ -3735,7 +3753,7 @@ {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% }\to\inserts@list \global\advance\insert@count \@ne% - \footnoteoptions@{##1}{false}% + \footnoteoptions@{L}{##1}{false}% \fi \else \csuse{v#1footnote}{#1}{{0|0|0|0|0|0|0}{}{##1}}% @@ -3805,7 +3823,7 @@ {\ifnumberedpar@\expandonce\@tag\fi}% {\expandonce\content}% {#1}% - {##1}% + {\unexpanded{##1}}% \@percentchar% }% \egroup% @@ -3857,6 +3875,8 @@ \csgdef{Xendehooklinenumber@#1}{}% \csgdef{Xendbhookinplaceofnumber@#1}{}% \csgdef{Xendehookinplaceofnumber@#1}{}% + + \csgdef{Xendlinerangeseparator@#1}{\endashchar}% \fi% \listxadd{\@series}{#1} } @@ -4014,6 +4034,8 @@ \newhookcommand@series{Xafternote}% \newhookcommand@series{Xparafootsep} + \newhookcommand@series{Xlinerangeseparator} + \fi \unless\ifnofamiliar@ \newhooktoggle@series{parindentX} @@ -4077,10 +4099,22 @@ \newhookcommand@series{Xendahookinplaceofnumber}% \newhookcommand@series{Xendhangindent}% + + \newhookcommand@series{Xendlinerangeseparator} \fi -\newtoggle{fulllines@}% -\newtoggle{nonum@} -\newtoggle{nosep@} +\newcommand{\newhooktoggle@specific}[1]{% + \newtoggle{#1@}% + \define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option + \define@key[mac]{falsefootnoteoption}{#1}[]{\global\settoggle{#1@}{false}} +} +\newcommand{\newhookarg@specific}[1]{% + \define@key[mac]{truefootnoteoption}{#1}{\global\def\linerangesep@{##1}}%When enabling footnote option + \define@key[mac]{falsefootnoteoption}{#1}{\global\undef\linerangesep@}%When +} +\newhooktoggle@specific{fulllines}% +\newhooktoggle@specific{nonum} +\newhooktoggle@specific{nosep} +\newhookarg@specific{linerangesep} \newtoggle{nomk@}% \newcommandx*{\Xnolemmaseparator}[1][1]{\Xlemmaseparator[#1]{}} \countdef\pageno=0 \pageno=1 @@ -5194,7 +5228,7 @@ \def\noexpand\&{\noexpand\@stopstanza}% \noexpand\@advancestanzanumber% \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber% - \let\par\relax%No paragraph in verses + \let\par\relax\ignorespaces%No paragraph in verses } \newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index c6eb2776207..bdf0ddb54a9 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/10/14 v2.5.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/10/19 v2.5.1 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -1594,7 +1594,7 @@ \def\&{\@stopastanza}% \pstart[#1]% \@astanza@line - \let\par\relax%No paragraph in verses + \let\par\relax\ignorespaces%No paragraph in verses }{} \newcommandx{\@stopastanza}[1][1,usedefault]{% |