diff options
author | Karl Berry <karl@freefriends.org> | 2015-10-15 21:19:17 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-10-15 21:19:17 +0000 |
commit | 99fb070ba6190c34b58106fa0f84859114f955f2 (patch) | |
tree | 571bf8d9ac17015fed2ede5ebf13a2fee0d47b5f /Master | |
parent | 50c72771f590cd9092e90e223057639ea1e969f9 (diff) |
reledmac (15oct15)
git-svn-id: svn://tug.org/texlive/trunk@38652 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
43 files changed, 132 insertions, 36 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 da92f526d71..bbcee490256 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 @@ -372,5 +372,9 @@ % \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}. +% % % 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 0ff1f10489d..2a717ab0674 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 @@ -69,3 +69,5 @@ % We have fixed a bug which which misaligned left and right sides when a line contained a dotted letter. % % We have tested and saw no problem with this correction, but if you see a difference in alignment between version 2.3.0 and 2.4.0, please contact us. +% \subsection{Migration to \reledpar~2.5.0} +% If you use \cs{stanza} or \env{astanza} environment, please read \reff{reledmac-mac2.5.0migration}. 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 0025eb191c6..ae2bb504c13 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 91dda07c864..a0bbe076926 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 b0e63bf53bc..435efdbccae 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 3fabb73512d..acfa970869c 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 0130193792e..7348c8be9e3 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 f56f815b616..ae1b32b2f1f 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 ff2794babc0..b5c6ec86f7c 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 78d30033c03..902d80a0a22 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 ecfcdb32537..e7f35789b4c 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 f776ac5820b..d31e333681b 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 c0fe3b4135e..162769ce59f 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 c2a65b07cad..f4794939e9c 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 c1b66c06f0e..95764293a84 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 4672187634d..c8c1ddd2420 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 e93dd60cb43..be4e3f73cd2 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 ce64e2c40a9..77693457829 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 2163b8f541a..2d7128cca03 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 5670a7c6f71..1ef7de27e49 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 d5582e50b49..b5b42df89d8 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 811bb743127..7b5a47131b9 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 e46a2923b2b..8e4e882b42d 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 30a4e03b3bc..cb89797a1ae 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 578a93ff4a4..4aa3b834b1c 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 f238395c1ab..a7e99b131d4 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 2f4899aee50..06e3bd10172 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 afd93afd40a..15382e332a0 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 9e216022321..98563a3751b 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 ee4c6bd6526..e65b22d3734 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 947de213459..cba0d290b82 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 805ec410e94..7c370193484 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 3b5097b3184..c5c676605ef 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 8285974a6d7..803c3662069 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 2dfbb4e9732..edf9de66756 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 696c28e20d9..54cc71fa8bb 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 be8158569ce..d0b3f9727a3 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 3a1d56bc4ed..35a9abfd5be 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 5eb4c28daef..3b70b818891 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 ad4acd16357..1dbaf009d97 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -335,6 +335,9 @@ % \changes{v2.2.2}{2015/10/09}{Fix bug in \protect\cs{sethangingsymbol}.} % \changes{v2.2.2}{2015/10/09}{Fix bug with old version of \protect\package{etex}.} % \hyphenation{man-u-script man-u-scripts} +% \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.} % % % @@ -2237,7 +2240,7 @@ % \subsection{Long verse and page break} % If you want to prevent page breaks inside long verses, use the option \verb+nopbinverse+ when loading package, or use \protect\cs{lednopbinversetrue}. % Read \reff{lednopbinversetrue} for further details. -% \subsection{Content before/after verses} +% \subsection{Content before/after verses}\label{contentverse} % It is possible to add content, like a subtitle or a spacing, before or after verse: % \begin{itemize} % \item \protect\cs{stanza} command can take a optional argument (in brackets). Its content will be printed before the stanza. @@ -2287,6 +2290,9 @@ % distance \meta{len} before % 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. +% 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 % arabic to alphabetic and puts the footnotes at the end of the minipage. @@ -3305,7 +3311,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/10/09 v2.2.2 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/10/14 v2.3.0 typeset critical edition]% % \end{macrocode} % % \subsection{Package options} @@ -4376,6 +4382,7 @@ \ifnum\@l@dtempcntb>\m@ne \ifledRcol \global\line@marginR=\@l@dtempcntb + \led@warn@setting@in@rightside{\linenummargin}% \else \global\line@margin=\@l@dtempcntb \fi @@ -4457,6 +4464,7 @@ \newcommand*{\firstlinenum}[1]{% \ifledRcol% \setcounter{firstlinenumR}{#1}% + \led@warn@setting@in@rightside{\firstlinenum} \else% \setcounter{firstlinenum}{#1}% \fi% @@ -4464,6 +4472,7 @@ \newcommand*{\linenumincrement}[1]{% \ifledRcol% \setcounter{linenumincrementR}{#1}% + \led@warn@setting@in@rightside{\linenumincrement} \else% \setcounter{linenumincrement}{#1}% \fi% @@ -4471,6 +4480,7 @@ \newcommand*{\firstsublinenum}[1]{% \ifledRcol% \setcounter{firstsublinenumR}{#1}% + \led@warn@setting@in@rightside{\firstsublinenum} \else% \setcounter{firstsublinenum}{#1}% \fi% @@ -4478,6 +4488,7 @@ \newcommand*{\sublinenumincrement}[1]{% \ifledRcol% \setcounter{sublinenumincrementR}{#1}% + \led@warn@setting@in@rightside{\sublinenumincrement} \else% \setcounter{sublinenumincrement}{#1}% \fi% @@ -8670,7 +8681,8 @@ \vskip\skip\csname #1footins\endcsname% \setXnoteswidthliketwocolumns@{#1}% \setXnotespositionliketwocolumns@{#1}% - \print@Xfootnoterule{#1}%% + \print@Xfootnoterule{#1}% + \let\bidi@RTL@everypar\@empty% \noindent\leavevmode} % \end{macrocode} % \end{macro} @@ -8762,7 +8774,8 @@ \bgroup \csuse{Xnotefontsize@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\csuse{Xbhooknote@#1}% \csname #1footfmt\endcsname #2{#1}}% \setbox0=\hbox{\Xunvxh{0}{#1}}% @@ -8802,7 +8815,8 @@ \unvbox\@nameuse{mp#1footins}% \csuse{Xnotefontsize@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\color@begingroup% \csuse{Xbhooknote@#1}% \csname #1footfmt\endcsname #2{#1}\color@endgroup}% @@ -10582,7 +10596,8 @@ \bgroup \csuse{notefontsizeX@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\csuse{bhooknoteX@#1}% \@nameuse{footfmt#1}{#1}{#2}}% \setbox0=\hbox{\unvxhX{0}{#1}}% @@ -10596,7 +10611,8 @@ \unvbox\@nameuse{mpfootins#1} \csuse{notefontsizeX@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\color@begingroup% \csuse{bhooknoteX@#1}% \@nameuse{footfmt#1}{#1}{#2}\color@endgroup}% @@ -14293,7 +14309,9 @@ \noexpand\newverse[][]}% \def\noexpand\&{\noexpand\@stopstanza}% \noexpand\@advancestanzanumber% - \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber} + \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber% + \let\par\relax%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 653d943da40..143992208b9 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -247,6 +247,9 @@ % \changes{v2.3.0}{2015/09/05}{New line setting command suffixed by R to set only the right side.} % \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.} % \hyphenation{man-u-script man-u-scripts} % % @@ -836,15 +839,16 @@ % Following % \protect\cs{firstlinenum}\marg{num} the first line number will be \meta{num}, and % following \protect\cs{linenumincrement}\marg{num} only every \meta{num}th -% line will have a printed number. Using these macros inside the -% \verb?Leftside? and \verb?Rightside? environments gives you independent -% control over the left and right numbering schemes. The \protect\cs{firstsublinenum} -% and \protect\cs{sublinenumincrement} macros correspondingly set the numbering -% scheme for sublines. -% Generally speaking, controls like \protect\cs{firstlinenum} or \protect\cs{linenummargin} -% apply to sequential and left texts. -% To effect right texts only, they have -% to be within a \verb?Rightside? environment. +% 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. +% \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. +%} % % \DescribeMacro{\firstlinenum*} % \DescribeMacro{\linenumincrement*} @@ -871,6 +875,12 @@ % \cs{linenumberstyleR} is the equivalent of \macpackage \cs{linenumberstyle} for right text. % \cs{sublinenumberstyleR} is the equivalent of \macpackage \cs{sublinenumberstyle} right text. % The starred version are for both side. + +% \DescribeMacro{\linenummarginR} +% \DescribeMacro{\linenummargin*} +% \cs{linenummarginR}\marg{margin} sets the line margin for right side. +% \cs{linenummargin*}\marg{margin} sets for both side. +% \meta{margin} can be, as for \macpackage's \cs{linenummargin} one of these values: \verb+left+, \verb+right+, \verb+inner+, \verb+outer+. % \DescribeMacro{\setRlineflag} % A ``R'' is appended to the line numbers of the % right texts. @@ -1106,7 +1116,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/09/29 v2.4.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/10/14 v2.5.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1339,6 +1349,15 @@ }% % \end{macrocode} % \end{macro} +% \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}. +} +% \end{macrocode} +% \end{macro} % \section{Sectioning commands} % % \begin{macro}{\section@numR} @@ -1624,6 +1643,26 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \begin{macro}{\linenummarginR} +% \begin{macro}{\linenummargin*} +% \cs{linenummarginR} applies directly for right side, while \cs{linenummargin*} applies for both side. +% \begin{macrocode} +\newcommand{\linenummarginR}[1]{% + \l@dgetline@margin{#1}% + \ifnum\@l@dtempcntb>\m@ne% + \global\line@marginR=\@l@dtempcntb% + \fi% +} +\WithSuffix\newcommand\linenummargin*[1]{% + \l@dgetline@margin{#1}% + \ifnum\@l@dtempcntb>\m@ne% + \global\line@marginR=\@l@dtempcntb% + \global\line@margin=\@l@dtempcntb% + \fi% +} +% \end{macrocode} +% \end{macro} +% \end{macro} % \subsection{Setting lineation start and step} % \begin{macro}{\c@firstlinenumR} % \begin{macro}{\c@linenumincrementR} @@ -3186,7 +3225,7 @@ \l@dld@ta %space kept for backward compatibility \add@inserts\affixside@note% \l@dlsn@te %space kept for backward compatibility - {\ledllfill\hb@xt@ \Lcolwidth{% + \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{% \do@insidelineLhook% \ifluatex% \textdir\l@luatextextdir@L% @@ -3331,7 +3370,7 @@ \l@dld@ta %space kept for backward compatibility \add@insertsR\affixside@noteR% \l@dlsn@te %space kept for backward compatibility - \ledllfill\hb@xt@ \Rcolwidth{% + \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{% \do@insidelineRhook% \new@lineR% \inserthangingsymbolR% @@ -3340,7 +3379,7 @@ \fi% \l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta% \l@drsn@te% - } + }} \def\print@eledsectionR{% \addtocounter{pstartR}{-1}% @@ -4314,6 +4353,7 @@ \def\&{\@stopastanza}% \pstart[#1]% \@astanza@line + \let\par\relax%No paragraph in verses }{} % \end{macrocode} @@ -4342,8 +4382,8 @@ @\endcsname\stanzaindentbase \managestanza@modulo \fi - \par - \stanza@hang%\mbox{}% + \endgraf + \stanza@hang% \ignorespaces} % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 2d4603b3192..9c57ae558e9 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/09 v2.2.2 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/10/14 v2.3.0 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -453,6 +453,7 @@ \ifnum\@l@dtempcntb>\m@ne \ifledRcol \global\line@marginR=\@l@dtempcntb + \led@warn@setting@in@rightside{\linenummargin}% \else \global\line@margin=\@l@dtempcntb \fi @@ -495,6 +496,7 @@ \newcommand*{\firstlinenum}[1]{% \ifledRcol% \setcounter{firstlinenumR}{#1}% + \led@warn@setting@in@rightside{\firstlinenum} \else% \setcounter{firstlinenum}{#1}% \fi% @@ -502,6 +504,7 @@ \newcommand*{\linenumincrement}[1]{% \ifledRcol% \setcounter{linenumincrementR}{#1}% + \led@warn@setting@in@rightside{\linenumincrement} \else% \setcounter{linenumincrement}{#1}% \fi% @@ -509,6 +512,7 @@ \newcommand*{\firstsublinenum}[1]{% \ifledRcol% \setcounter{firstsublinenumR}{#1}% + \led@warn@setting@in@rightside{\firstsublinenum} \else% \setcounter{firstsublinenum}{#1}% \fi% @@ -516,6 +520,7 @@ \newcommand*{\sublinenumincrement}[1]{% \ifledRcol% \setcounter{sublinenumincrementR}{#1}% + \led@warn@setting@in@rightside{\sublinenumincrement} \else% \setcounter{sublinenumincrement}{#1}% \fi% @@ -2168,14 +2173,16 @@ \vskip\skip\csname #1footins\endcsname% \setXnoteswidthliketwocolumns@{#1}% \setXnotespositionliketwocolumns@{#1}% - \print@Xfootnoterule{#1}%% + \print@Xfootnoterule{#1}% + \let\bidi@RTL@everypar\@empty% \noindent\leavevmode} \newcommand*{\paravfootnote}[2]{% \insert\csname #1footins\endcsname \bgroup \csuse{Xnotefontsize@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\csuse{Xbhooknote@#1}% \csname #1footfmt\endcsname #2{#1}}% \setbox0=\hbox{\Xunvxh{0}{#1}}% @@ -2190,7 +2197,8 @@ \unvbox\@nameuse{mp#1footins}% \csuse{Xnotefontsize@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\color@begingroup% \csuse{Xbhooknote@#1}% \csname #1footfmt\endcsname #2{#1}\color@endgroup}% @@ -3163,7 +3171,8 @@ \bgroup \csuse{notefontsizeX@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\csuse{bhooknoteX@#1}% \@nameuse{footfmt#1}{#1}{#2}}% \setbox0=\hbox{\unvxhX{0}{#1}}% @@ -3177,7 +3186,8 @@ \unvbox\@nameuse{mpfootins#1} \csuse{notefontsizeX@#1} \footsplitskips - \setbox0=\vbox{\hsize=\maxdimen + \setbox0=\vbox{\hsize=\maxdimen% + \let\bidi@RTL@everypar\@empty% \noindent\color@begingroup% \csuse{bhooknoteX@#1}% \@nameuse{footfmt#1}{#1}{#2}\color@endgroup}% @@ -5183,7 +5193,9 @@ \noexpand\newverse[][]}% \def\noexpand\&{\noexpand\@stopstanza}% \noexpand\@advancestanzanumber% - \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber} + \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber% + \let\par\relax%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 c14c9498cf6..c6eb2776207 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -26,8 +26,9 @@ + \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/09/29 v2.4.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/10/14 v2.5.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -102,6 +103,11 @@ \newcommand*{\led@warn@ChangeSyncOption}[1]{% \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}. +} \newcount\section@numR \section@numR=\z@ \pst@rtedLfalse @@ -255,6 +261,19 @@ \newcount\line@marginR \line@marginR=\@ne +\newcommand{\linenummarginR}[1]{% + \l@dgetline@margin{#1}% + \ifnum\@l@dtempcntb>\m@ne% + \global\line@marginR=\@l@dtempcntb% + \fi% +} +\WithSuffix\newcommand\linenummargin*[1]{% + \l@dgetline@margin{#1}% + \ifnum\@l@dtempcntb>\m@ne% + \global\line@marginR=\@l@dtempcntb% + \global\line@margin=\@l@dtempcntb% + \fi% +} \newcounter{firstlinenumR} \setcounter{firstlinenumR}{5} \newcounter{linenumincrementR} @@ -907,7 +926,7 @@ \l@dld@ta %space kept for backward compatibility \add@inserts\affixside@note% \l@dlsn@te %space kept for backward compatibility - {\ledllfill\hb@xt@ \Lcolwidth{% + \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{% \do@insidelineLhook% \ifluatex% \textdir\l@luatextextdir@L% @@ -1004,7 +1023,7 @@ \l@dld@ta %space kept for backward compatibility \add@insertsR\affixside@noteR% \l@dlsn@te %space kept for backward compatibility - \ledllfill\hb@xt@ \Rcolwidth{% + \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{% \do@insidelineRhook% \new@lineR% \inserthangingsymbolR% @@ -1013,7 +1032,7 @@ \fi% \l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta% \l@drsn@te% - } + }} \def\print@eledsectionR{% \addtocounter{pstartR}{-1}% @@ -1575,6 +1594,7 @@ \def\&{\@stopastanza}% \pstart[#1]% \@astanza@line + \let\par\relax%No paragraph in verses }{} \newcommandx{\@stopastanza}[1][1,usedefault]{% @@ -1590,8 +1610,8 @@ @\endcsname\stanzaindentbase \managestanza@modulo \fi - \par - \stanza@hang%\mbox{}% + \endgraf + \stanza@hang% \ignorespaces} \catcode`\&=\next |