diff options
Diffstat (limited to 'Master')
41 files changed, 64 insertions, 43 deletions
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 b0628899ea7..df7dedd06f9 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 fb888949960..d543f84299a 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 c1ab5100b6d..c27c849545d 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 07b6fe49b98..441b78206d9 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 951397b3472..6c9fb3b71a9 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 15aa470e67f..362af3eccf3 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 40992dff0a0..60fbd5a596d 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 dd9f072bf87..5dc7f916db0 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 e8461f0b9e1..78da94a54b4 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 208520abd38..8d680be08c9 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 73b06c8724b..f226c3fd581 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 868f3f42a86..b2978e79ef3 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 56bad12aa52..de4f545fb94 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 0bd7dd7c98f..8cfbc995fd6 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 08629bc4d7f..d2a7316f323 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 1a35feebf08..60561fafb5a 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 f4322b65250..6aa1cd81d4b 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 69b6c58eed6..ad2a3760bbc 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 6ab0772b59a..1b83256d609 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 645db06917f..3fb48f6e62c 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 a2f871c1ce0..bb06df3eb72 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 0fff5d68b01..b03cef5032e 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 dbcc40cf479..66b801b3b90 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 0b40af84a5f..bf5dc564dcd 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 7e50c7d07c1..f5204c8477e 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 f9bf511fd76..56767df64c0 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 83e0676955d..924385d48a8 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 2b9f0cc3424..f3cddc8bb6a 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 e5a4d581e40..b000b00634f 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 db4f02ae38f..5f637b4da92 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 221199356da..29630e722b5 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 dc71018ad1d..aef11a8df99 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 42ca9a10ebc..10e7868b472 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 bbcd198791a..7fb4a949f14 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 6cf71f2949a..533e6158cad 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 345b86af1a8..043c397d645 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 c5bd436f719..bbc20890336 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 50aa33c3511..0183b9d969e 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -344,6 +344,8 @@ % \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).} +% \changes{v2.4.1}{2015/10/26}{Fix bug with \protect\cs{appref} and \protect\cs{apprefwithpage} (introduced in v2.4.0).} +% \changes{v2.4.1}{2015/10/26}{Fix bug with tabular environments when using \protect\env{babel} or \protect\env{polyglossia} language which override \LaTeX\ \protect\cs{roman} command, like greek language.} % % % \title{\Macpackage \\ @@ -2513,6 +2515,7 @@ % % Note that if you have not used \protect\cs{setapprefprefixmore} is empty, argument of \protect\cs{setapprefprefixsingle} will used in any case. % + % \DescribeMacro{\Xtwolinesappref} % \DescribeMacro{\Xmorethantwolinesappref} % \DescribeMacro{\Xtwolinesbutnotmoreappref} @@ -2529,6 +2532,12 @@ % using \protect\cs{appref}\verb+[fulllines]+\marg{label}. % % +% \DescribeMacro{Xlinerangeseparatorappref} +% If you use \protect\cs{Xlinerangeseparator} \emph{without the optional +% series argument}, the setting will also be available for \protect\cs{appref}. +% +% The commands \protect\cs{Xlinerangeseparatorappref}\marg{text}, can also be used, if you +% only want to change the reference style of \protect\cs{appref}. % \DescribeMacro{\Xendtwolinesapprefwithpage} % \DescribeMacro{\Xendmorethantwolinesapprefwithpage} % \DescribeMacro{\Xendtwolinesbutnotmoreapprefwithpage} @@ -2545,6 +2554,12 @@ % It is possible to disable this setting for a specific \protect\cs{apprefwithpage} command by % using \protect\cs{apprefwithpage}\verb+[fulllines]+\marg{label}. % +% \DescribeMacro{Xendlinerangeseparatorapprefwithpage} +% If you use \protect\cs{Xendlinerangeseparator} \emph{without the optional +% series argument}, the setting will also be available for \protect\cs{apprefwithpage}. +% +% The commands \protect\cs{Xendlinerangeseparatorapprefwithpage}\marg{text}, can also be used, if you +% only want to change the reference style of \protect\cs{apprefwithpage}. % \section{Side notes} % % \subsection{Basics} @@ -3106,7 +3121,7 @@ % \item['no room for a new count'] is often caused by a conjunction with \protect\package{biblatex}. % Load \macpackage (and \parpackage) \emph{before} \protect\package{biblatex}. % \item['no room for a new write'] can be caused by with multiple indexes. -% In this case, use \protect\package{indextools} of \protect\package{imakeidx} with the \verb+splitindex+ option, in order to obtain only one \verb+.idx+ file. +% In this case, use \protect\package{indextools} of \protect\package{imakeidx} with the \verb+splitindex+ option, in order to obtain only one \verb+.idx+ file. % If that does not solve your problem, you can use \protect\package{morewrites} package. % That should solve the problem, but \LaTeX\ will be slower. % @@ -3321,7 +3336,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/10/19 v2.4.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/10/26 v2.4.1 typeset critical edition]% % \end{macrocode} % % \subsection{Package options} @@ -9960,7 +9975,7 @@ % \protect\cs{vl@dbfnote} calls the original \protect\cs{@footnotetext}. % \changes{v0.6.0}{2004/11/23}{Changed \protect\cs{l@dbfnote} and \protect\cs{vl@dbfnote} as % originals could give incorrect markers in the footnotes} -% \changes{v1.4.1}{2012/11/16}{Compatibility of standard footnotes with \eledmac when these footnotes contain any commands.} +% \changes{v1.4.1}{2012/11/16}{Compatibility of standard footnotes with \eledmac when these footnotes contain any commands.} % \begin{macrocode} \newcommand{\l@dbfnote}[1]{% @@ -11982,10 +11997,6 @@ % \begin{macrocode} \unless\ifnocritical@ \newhooktoggle@series{Xparindent} - \newhookcommand@series{Xtwolines}[appref] - \newhookcommand@series{Xmorethantwolines}[appref] - \newhooktoggle@series{Xtwolinesbutnotmore}[appref] - \newhooktoggle@series{Xtwolinesonlyinsamepage}[appref] \newhookcommand@series{Xhangindent} \newhookcommand@series{Xragged} \newhookcommand@series{Xhsizetwocol} @@ -12032,9 +12043,13 @@ \newhookcommand@series{Xafternote}% \newhookcommand@series{Xparafootsep} - \newhookcommand@series{Xlinerangeseparator} \fi +\newhookcommand@series{Xtwolines}[appref] +\newhookcommand@series{Xmorethantwolines}[appref] +\newhooktoggle@series{Xtwolinesbutnotmore}[appref] +\newhooktoggle@series{Xtwolinesonlyinsamepage}[appref] +\newhookcommand@series{Xlinerangeseparator}[appref] % \end{macrocode} % \subsubsection{Options for familiar notes} % Before generating the optional commands for familiar notes, we check the \protect\cs{nofamiliar} option. @@ -12061,10 +12076,6 @@ % Before generating the commands that are used to set the endnotes, such as \protect\cs{Xnumberonlyfirstinline}, \protect\cs{Xlemmaseparator}+ and the like, we check the \verb+noend+ option. % \begin{macrocode} \unless\ifnoend@ - \newhookcommand@series{Xendtwolines}[apprefwithpage] - \newhookcommand@series{Xendmorethantwolines}[apprefwithpage] - \newhooktoggle@series{Xendtwolinesbutnotmore}[apprefwithpage] - \newhooktoggle@series{Xendtwolinesonlyinsamepage}[apprefwithpage] \newhookcommand@series{Xendnotenumfont} \newhookcommand@series{Xendbhooknote} @@ -12106,8 +12117,12 @@ \newhookcommand@series{Xendhangindent}% - \newhookcommand@series{Xendlinerangeseparator} \fi +\newhookcommand@series{Xendtwolines}[apprefwithpage] +\newhookcommand@series{Xendmorethantwolines}[apprefwithpage] +\newhooktoggle@series{Xendtwolinesbutnotmore}[apprefwithpage] +\newhooktoggle@series{Xendtwolinesonlyinsamepage}[apprefwithpage] +\newhookcommand@series{Xendlinerangeseparator}[apprefwithpage] % \end{macrocode} % \subsection{Hooks for a particular footnote} % \begin{macro}{\newhooktoggle@specific} @@ -12913,13 +12928,15 @@ % So, first declare the default value of the hooks for the pseudo-series appref. % Also declare the internal toggle which are switch by \macpackage{}. % \begin{macrocode} -\xdef\Xtwolines@appref{}% -\xdef\Xmorethantwolines@appref{}% +\def\Xtwolines@appref{}% +\def\Xmorethantwolines@appref{}% +\def\Xlinerangeseparator@appref{\endashchar}% \newtoggle{Xtwolinesbutnotmore@appref}% \newtoggle{Xtwolinesonlyinsamepage@appref}% -\xdef\Xendtwolines@apprefwithpage{}% -\xdef\Xendmorethantwolines@apprefwithpage{}% +\def\Xendtwolines@apprefwithpage{}% +\def\Xendmorethantwolines@apprefwithpage{}% +\def\Xendlinerangeseparator@apprefwithpage{\endashchar}% \newtoggle{Xendtwolinesbutnotmore@apprefwithpage}% \newtoggle{Xendtwolinesonlyinsamepage@apprefwithpage}% @@ -15053,9 +15070,10 @@ % \begin{macro}{\theaddcolcount} % A counter to hold the number of a column. We use a roman number so % that we can grab the column dimension from \protect\cs{dcol}. +% We do not use \cs{roman} \LaTeX\ command, because some package, like \package{babel} can override it in some specific case (greek, for example). % \begin{macrocode} \newcounter{addcolcount} - \renewcommand{\theaddcolcount}{\roman{addcolcount}} + \renewcommand{\theaddcolcount}{\romannumeral \c@addcolcount} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 57ba96b85c5..df27a8862c6 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -251,6 +251,7 @@ % \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).} +% \changes{v2.5.2}{2015/10/26}{Fix bug introduced in v2.5.0 with \protect\cs{linenummargin}, \protect\cs{firstlinenum}, \protect\cs{linenumincrement}, \protect\cs{firstsublinenum}, \protect\cs{sublinenumincrement}.} % \hyphenation{man-u-script man-u-scripts} % % @@ -1117,7 +1118,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/10/19 v2.5.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/10/26 v2.5.2 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1353,9 +1354,9 @@ % \begin{macro}{\led@warn@setting@in@rightside} % \begin{macrocode} \newcommand{\led@warn@setting@in@rightside}[1]{% - \reledpar@warning{You use #1 inside rightside environment.\MessageBreak - Such behavior is deprecated.\MessageBreak - Use instead #1R or #1* in your preamble}. + \reledpar@warning{You use #1 inside rightside environment.\MessageBreak% + Such behavior is deprecated.\MessageBreak% + Use instead #1R or #1* in your preamble}.% } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 8b1dbd5ee68..82613f160ba 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -29,10 +29,11 @@ + %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/10/19 v2.4.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/10/26 v2.4.1 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -3984,10 +3985,6 @@ } \unless\ifnocritical@ \newhooktoggle@series{Xparindent} - \newhookcommand@series{Xtwolines}[appref] - \newhookcommand@series{Xmorethantwolines}[appref] - \newhooktoggle@series{Xtwolinesbutnotmore}[appref] - \newhooktoggle@series{Xtwolinesonlyinsamepage}[appref] \newhookcommand@series{Xhangindent} \newhookcommand@series{Xragged} \newhookcommand@series{Xhsizetwocol} @@ -4034,9 +4031,12 @@ \newhookcommand@series{Xafternote}% \newhookcommand@series{Xparafootsep} - \newhookcommand@series{Xlinerangeseparator} - \fi +\newhookcommand@series{Xtwolines}[appref] +\newhookcommand@series{Xmorethantwolines}[appref] +\newhooktoggle@series{Xtwolinesbutnotmore}[appref] +\newhooktoggle@series{Xtwolinesonlyinsamepage}[appref] +\newhookcommand@series{Xlinerangeseparator}[appref] \unless\ifnofamiliar@ \newhooktoggle@series{parindentX} \newhookcommand@series{hangindentX} @@ -4055,10 +4055,6 @@ \newhookcommand@series{parafootsepX} \fi \unless\ifnoend@ - \newhookcommand@series{Xendtwolines}[apprefwithpage] - \newhookcommand@series{Xendmorethantwolines}[apprefwithpage] - \newhooktoggle@series{Xendtwolinesbutnotmore}[apprefwithpage] - \newhooktoggle@series{Xendtwolinesonlyinsamepage}[apprefwithpage] \newhookcommand@series{Xendnotenumfont} \newhookcommand@series{Xendbhooknote} @@ -4100,8 +4096,12 @@ \newhookcommand@series{Xendhangindent}% - \newhookcommand@series{Xendlinerangeseparator} \fi +\newhookcommand@series{Xendtwolines}[apprefwithpage] +\newhookcommand@series{Xendmorethantwolines}[apprefwithpage] +\newhooktoggle@series{Xendtwolinesbutnotmore}[apprefwithpage] +\newhooktoggle@series{Xendtwolinesonlyinsamepage}[apprefwithpage] +\newhookcommand@series{Xendlinerangeseparator}[apprefwithpage] \newcommand{\newhooktoggle@specific}[1]{% \newtoggle{#1@}% \define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option @@ -4450,13 +4450,15 @@ \linenum{\@tempa|% \@tempb}}}% -\xdef\Xtwolines@appref{}% -\xdef\Xmorethantwolines@appref{}% +\def\Xtwolines@appref{}% +\def\Xmorethantwolines@appref{}% +\def\Xlinerangeseparator@appref{\endashchar}% \newtoggle{Xtwolinesbutnotmore@appref}% \newtoggle{Xtwolinesonlyinsamepage@appref}% -\xdef\Xendtwolines@apprefwithpage{}% -\xdef\Xendmorethantwolines@apprefwithpage{}% +\def\Xendtwolines@apprefwithpage{}% +\def\Xendmorethantwolines@apprefwithpage{}% +\def\Xendlinerangeseparator@apprefwithpage{\endashchar}% \newtoggle{Xendtwolinesbutnotmore@apprefwithpage}% \newtoggle{Xendtwolinesonlyinsamepage@apprefwithpage}% @@ -5511,7 +5513,7 @@ \edfilldimen=0pt \newcounter{addcolcount} - \renewcommand{\theaddcolcount}{\roman{addcolcount}} + \renewcommand{\theaddcolcount}{\romannumeral \c@addcolcount} \def\setmcellright #1&{\def\edlabel##1{}% \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0%\removelastskip diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index bdf0ddb54a9..296d26489e3 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/19 v2.5.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/10/26 v2.5.2 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -104,9 +104,9 @@ \reledpar@warning{You have changed synchronization's options since last run. We have not read line-list file #1. Please run LaTeX again.}% }% \newcommand{\led@warn@setting@in@rightside}[1]{% - \reledpar@warning{You use #1 inside rightside environment.\MessageBreak - Such behavior is deprecated.\MessageBreak - Use instead #1R or #1* in your preamble}. + \reledpar@warning{You use #1 inside rightside environment.\MessageBreak% + Such behavior is deprecated.\MessageBreak% + Use instead #1R or #1* in your preamble}.% } \newcount\section@numR \section@numR=\z@ |