From 00db3b3ef04868e84ab4abccf4ece66d3fc77e60 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 12 Dec 2016 22:54:22 +0000 Subject: reledmac (12dec16) git-svn-id: svn://tug.org/texlive/trunk@42689 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/reledmac/README | 4 +- .../doc/latex/reledmac/doc-include/migrate-par.dtx | 6 +- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17330 -> 17194 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26408 -> 26401 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 21080 -> 21002 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17432 -> 17436 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18591 -> 18590 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20924 -> 20834 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21732 -> 21684 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21751 -> 21747 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17115 -> 17112 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31424 -> 31417 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26433 -> 26284 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36336 -> 36332 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24827 -> 24693 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25889 -> 25879 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23281 -> 23136 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 33911 -> 33911 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22853 -> 22854 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17192 -> 17193 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26354 -> 26265 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12216 -> 12212 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 42530 -> 42530 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 22982 -> 22897 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35109 -> 35106 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34850 -> 34847 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33394 -> 33400 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 35010 -> 35011 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34576 -> 34579 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34614 -> 34618 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34837 -> 34833 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22305 -> 22306 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27064 -> 27058 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21261 -> 21258 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29711 -> 29630 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 0 -> 22443 bytes .../examples/4-reledpar_inside-outside-columns.tex | 181 +++++++++++++++++++++ .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36415 -> 36407 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58539 -> 58538 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22745 -> 22746 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 19019 -> 18882 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32606 -> 32515 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22209 -> 22206 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16250 -> 16250 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 88648 -> 88634 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1252483 -> 1251490 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 477824 -> 485352 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 103 ++++++------ .../texmf-dist/source/latex/reledmac/reledpar.dtx | 140 +++++++++++++--- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 24 +-- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 90 ++++++++-- 51 files changed, 447 insertions(+), 101 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf create mode 100644 Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.tex (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/reledmac/README b/Master/texmf-dist/doc/latex/reledmac/README index ee7806face0..ae0eff8bebe 100644 --- a/Master/texmf-dist/doc/latex/reledmac/README +++ b/Master/texmf-dist/doc/latex/reledmac/README @@ -113,8 +113,8 @@ please follow these rules: the branch there): - Go to [the project page](https://github.com/maieul/ledmac/). - Choose the correct branch in the "branch" menu. - - Choose "Dowload zip" on the "Clone or download" menu, in the - right side. + - Choose "Download zip" in the "Clone or download" menu, on + the right side. - Unzip the file - Run the `.ins` files with pdflatex, to obtain the `.sty` files. - Put the `.sty` files with your test files (in the same folder). 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 c439dd126a5..d140f0ca5a9 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 @@ -77,8 +77,8 @@ % \subsection{Migration to \reledpar~2.14.0} % The \cs{linenumberlist} command is reserved for the left side. For the equivalent feature on the right side, define \cs{linenumberlistR}. % \subsection{Migration to \reledpar~2.14.1} -% The execution of the code sent to \cs{doinsidelineLhook} and \cs{doinsidelineRhook} have been moved to a position where \cs{markboth} could work. +% The execution of the code sent to \cs{doinsidelineLhook} and \cs{doinsidelineRhook} has been moved to a place where \cs{markboth} can work. % -% Normally, it should do not have impact on your previous use of \cs{doinsidelineLhook} and \cs{doinsidelineRhook}. +% Normally, it should not interfere with your prior use of \cs{doinsidelineLhook} and \cs{doinsidelineRhook}. % -% Please contact us if that cause problem. +% Please contact us if that causes problems. diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf index 0f68afe8134..f1cf27147c4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf index 86a9a407fac..bc2a3776b61 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf index 84239274692..2a864fdd6af 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index 297de6f4033..38a1ca4b3c4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf index 4a11b810a05..1200b5ac39b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf index 17242f4eed2..f509382e227 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf index 8f2c24dc3ec..28cb0f91107 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf index 78a5d97f775..5c70b0c7df5 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf index 23548b6b4ec..9725f486b32 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf index 9335801d90a..49b7dc85a73 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf index b5196627689..e826e5060fa 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf index 3713bc29653..584122c518b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf index abe1f96aa5c..f3b12d35840 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf index e9a64a4dd20..644b5c5b193 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf index 4441ebc2016..2416c653fd9 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf index 3bc6d7eb079..e149c6b0729 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf index 6f46a48812b..589c1485e4f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf index 397e64dd354..57474ed92d1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf index 0d95c3b7140..4fdc0d2a9e4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf index 1f321ab1156..f0af9558618 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf index 14fa6840604..bc054b6a0d2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf index 6d4a4490b25..320d7677c7b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ 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 index 91d3a4bab37..fb2d46ae053 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ 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 index 6817c696bfc..2997efb8042 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ 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 index 9a29bc6cd5d..992a3c64ef7 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf differ 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 index 701508cdd5d..02a568a0e79 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ 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 index cd6b932847b..7171d9f9360 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ 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 index a823cfb3554..8a70a96a2e9 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ 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 index 64ef027149c..b9012972733 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf index 1b5f3aec321..fef5ab60594 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf index 68a6f4be918..88d80a95d8c 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf index d905691f472..2aa4e9c0b0d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf index c19ae99886c..35590cc192d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf new file mode 100644 index 00000000000..76a35cc0b6d Binary files /dev/null and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.tex new file mode 100644 index 00000000000..d4973c64dde --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.tex @@ -0,0 +1,181 @@ +\documentclass{article} +\usepackage{polyglossia,fontspec,xunicode} +\usepackage{libertineotf} +\setmainlanguage{english} + + +\usepackage[series={},nocritical,noend,noeledsec,nofamiliar,noledgroup]{reledmac} +\usepackage[movecolumnspositiononrightpage]{reledpar} +\setlength{\columnrulewidth}{0.4pt} +\setlength{\Lcolwidth}{0.65\textwidth} +\setlength{\Rcolwidth}{0.25\textwidth} + + +\begin{document} +\begin{english} +\title{Working with outside and inside columns} +\date{} +\maketitle +\begin{abstract} +This file shows an example of the \verb+movecolumnspositiononrightpage+ option in action. This option allows to have inside and outside columns, rather than left and right columns. +\end{abstract} +\end{english} +\AtBeginPairs{\sloppy} +\begin{pairs} + \begin{Leftside} + \beginnumbering + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \pstart + Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. Inside paragraph. + \pend + \pstart + Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. Other inside paragraph. + \pend + \endnumbering + \end{Leftside} + \begin{Rightside} + \beginnumbering + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \pstart + Outside paragraph. Outside paragraph. Outside paragraph. Outside paragraph. + \pend + \pstart + Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. Other outside paragraph. + \pend + \endnumbering + \end{Rightside} + +\end{pairs} +\Columns + +\end{document} diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index 7ecc61975f4..69f280f96e5 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf index de24cbaa624..38fb4558252 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf index 9a9d2268dfa..6d21f5d8cd7 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf index 9682b0b2ede..806bdc84a02 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf index 2ff6db657a4..d143eeb1c3e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf index bc63db90a9c..af4a34a706e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf index c061734f269..96de2354203 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index c935fe1072c..58cfd6bd990 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/migration.pdf and b/Master/texmf-dist/doc/latex/reledmac/migration.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf index 953f679c378..b0ae5452464 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf index c56af0326a2..21b14b40790 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf differ diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index d47496b7602..24cb7ada17d 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -429,26 +429,28 @@ % \changes{v2.15.2}{2016/09/12}{Fix bug with \protect\package{fancyhdr} package 3.8 and later.} % \changes{v2.15.3}{2016/09/26}{Fix bug with \protect\cs{section} in optional argument of \protect\cs{pstart} and empty line before \protect\cs{pend} (bug added in v2.8.2).} % \changes{v2.15.3}{2016/09/26}{Simplification of the sectioning command code.} -% \changes{v2.16.0}{2016/10/02}{Display warning message if using a version of \protect\LaTeX that is too old.} -% \changes{v2.16.0}{2016/10/02}{Deleting dead code.} -% \changes{v2.16.0}{2016/10/02}{New options of \protect\cs{fnpos} and \protect\cs{mpfnpos} to set a customized order for familiar and critical footnotes.} +% \changes{v2.16.0}{2016/10/02}{Display a warning message if using a version of \protect\LaTeX that is too old.} +% \changes{v2.16.0}{2016/10/02}{Deleted dead code.} +% \changes{v2.16.0}{2016/10/02}{New options for \protect\cs{fnpos} and \protect\cs{mpfnpos} to set a customized order for familiar and critical footnotes.} % \changes{v2.16.0}{2016/10/02}{Compatibility with new features of \protect\reledpar} % \changes{v2.16.0}{2016/10/02}{Fix bug with \protect\cs{Xtxtbeforenotes} for notes in three or two columns} % \changes{v2.16.0}{2016/10/02}{Fix bug with \protect\cs{Xgroupbylines} for notes in two columns} % \changes{v2.16.0}{2016/10/02}{Fix bug with `notenumber' option of \protect\package{indextools} package when indexing texts in familiar footnotes.} -% \changes{v2.16.0}{2016/10/02}{When indexing texts in familiar footnotes with \protect\cs{edtext}, referring to the line number where the footnote is called.} -% \changes{v2.16.0}{2016/10/02}{When indexing texts in sidenotes with \protect\cs{edtext}, referring to the line number where the sidenote is called.} +% \changes{v2.16.0}{2016/10/02}{When indexing texts in familiar footnotes with \protect\cs{edtext}, refer to the line number where the footnote is called.} +% \changes{v2.16.0}{2016/10/02}{When indexing texts in sidenotes with \protect\cs{edtext}, refer to the line number where the sidenote is called.} % \changes{v2.16.0}{2016/10/02}{Fix potential bug when using \protect\cs{edindex} in critical footnotes.} % \changes{v2.16.0}{2016/10/02}{Add \protect\cs{Xendpagenumberonlyfirst}, \protect\cs{Xendpagenumberonlyfirstifsingle}, \protect\cs{Xendpagenumberonlyfirstintwo}, \protect\cs{Xendinplaceofpagenumber} and \protect\cs{Xendsympagenum} hooks.} % \changes{v2.16.0}{2016/10/02}{When \protect\cs{edindex} is called outside of a \protect\cs{beginnumbering}\protect\ldots\protect\cs{endnumbering} structure, it is automatically switched to \protect\cs{index}, with a warning message.} % \changes{v2.16.1}{2016/10/04}{Fix bug with redefinition of the style of the footnote number (bug added in v2.12.0)} % \changes{v2.16.2}{2016/10/07}{Error message if \protect\package{footmisc} is loaded after \protect\package{reledmac}.} -% \changes{v2.16.2}{2016/10/07}{Fix bug introduced by v2.16.1 when using not expandable control sequence, like \protect\cs{normalfont}, in the footnote number style.} +% \changes{v2.16.2}{2016/10/07}{Fix bug introduced by v2.16.1 when using non-expandable control sequence, like \protect\cs{normalfont}, in the footnote number style.} % \changes{v2.16.3}{2016/10/12}{Fix bug with \protect\cs{SEref} (bug added in v2.7.0).} % \changes{v2.16.4}{2016/10/16}{Fix bug with vertical space before sectioning command in optional argument of \protect\cs{pstart} (bug added in v2.15.3).} % \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.} -% \changes{v2.16.6}{2016/11/14}{Take account of \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} +% \changes{v2.16.6}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} % \changes{v2.16.6}{2016/11/14}{Fix bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.} +% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}} +% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -1157,7 +1159,7 @@ % \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook} % The argument passed to \protect\cs{dolinehook}\marg{arg} will be executed % before slicing a new line in the paragraph. -% The argument passed to \protect\cs{doinsidelinehook}\marg{arg} will be executed before printing a new line, when the line number have already been fixed. +% The argument passed to \protect\cs{doinsidelinehook}\marg{arg} will be executed before printing a new line, when the line number has already been fixed. % In many cases, the latter is more useful than the former. % The file \href{examples/2-line_numbers_in_header.tex}{examples/2-line\_numbers\_in\_header.tex} provides % an example for printing the first and last line numbers of a page in the header. @@ -1898,28 +1900,28 @@ % \\ \cs{Xnumberonlyfirstinline}; \cs{Xnumberonlyfirstintwolines} and \cs{Xsymlinenum}. % % \subsubsection{Print page number only at first time} -% For endnotes, \reledmac provides tools to print the page number only the first time it is seen. -% However, when a lemma spans over two pages, the line numbers are normally printed following this pattern: start page number - start line number - end page number - end line number. -% Consequently, what is the `page number' is not obvious. So: -% \DescribeMacro{\Xendpagenumberonlyfirst} \cs{Xendpagenumberonlyfirst}\oarg{s} can be called to tell that the start page number of a lemma is not printed if it is equal to the end page number of the previous lemma. -% You can use \emph{as complement} one (and only one) of the following commands: +% For endnotes, \reledmac\ provides a mechanism for printing the page number only the first time it is seen. +% However, when a lemma spans over two pages, the line numbers are normally printed in the following pattern: starting page number - starting line number - ending page number - ending line number. +% It follows that what corresponds to the actual `page number' may not be self-evident. So: +% \DescribeMacro{\Xendpagenumberonlyfirst} \cs{Xendpagenumberonlyfirst}\oarg{s} can be called to ensure that the starting page number of a lemma be not printed if it is the same as the ending page number of the preceding lemma. +% You can use \emph{additionally} one (and only one) of the following commands: % \begin{itemize} % \item \cs{Xendpagenumberonlyfirstifsingle}\oarg{s}: % the first page number of the lemma will not be printed only if the following conditions are true: % \begin{enumerate} -% \item The start page number of the lemma is equal to the end page number of the previous lemma. -% \item The end page number of the lemma is equal to the start page number of the lemma. +% \item The starting page number of the lemma is the same as the ending page number of the preceding lemma. +% \item The ending page number of the lemma is the same as the starting page number of the lemma. % \end{enumerate} -% In this case the end page number will always be printed if differing from the start page number. -% \item \cs{Xendpagenumberonlyfirstintwo}\oarg{s}: both the start page number and the end page number of a lemma are not printed if they are both equal to respectively the start page number and the end page number of the previous lemma. +% In this case the ending page number will always be printed if it is different from the starting page number. +% \item \cs{Xendpagenumberonlyfirstintwo}\oarg{s}: both the starting page number and the ending page number of a lemma are not printed if they are both the same as the starting page number and the ending page number of the preceding lemma respectively. % % \end{itemize} % % In any case, you can use: % \begin{itemize} -% \item \DescribeMacro{\Xendsympagenum} \cs{Xendsympagenum}\oarg{series}\marg{c} to tell to print \meta{c} when the page number is not printed. -% \item \DescribeMacro{\Xendinplaceofpagenumber} \cs{Xendinplaceofpagenumber}\oarg{series}\marg{l} to tell to print a horizontal space of \meta{l} if no symbol is printed instead of page number. +% \item \DescribeMacro{\Xendsympagenum} \cs{Xendsympagenum}\oarg{series}\marg{c} to print \meta{c} when the page number is not printed. +% \item \DescribeMacro{\Xendinplaceofpagenumber} \cs{Xendinplaceofpagenumber}\oarg{series}\marg{l} to print a \meta{l} length horizontal space in case no symbol is printed instead of the page number. % % \end{itemize} % @@ -2788,8 +2790,9 @@ % \DescribeMacro{\sublineref} % \DescribeMacro{\pstartref} % Elsewhere in the text, either before or after the \protect\cs{edlabel}, -% you can refer to its location via \protect\cs{edpageref}\marg{lab}, or -% \protect\cs{edlineref}\marg{lab}% +% you can refer to its location with \protect\cs{edpageref}\marg{lab}, +% \protect\cs{edlineref}\marg{lab}, \cs{edsublineref}\marg{lab} or \cs{pstartref}\marg{lab}, +% that % will produce, respectively, the page, line, sub-line and pstart on which % the \protect\cs{edlabel}\marg{lab} command occurred. % @@ -3120,7 +3123,7 @@ % \item Declare the index with the macro \cs{makeindex} of \package{imakeidx} and \package{indextools}. % \end{enumerate} % -% Also note that using \cs{edtext} in familiar footnotes refer to the line the footnotes are called +% Also note that using \cs{edtext} in familiar footnotes refers to the line where the footnotes are called % \subsection{Referring to critical notes} % If you want to refer to a word inside an % \protect\cs{edtext}\marg{lemma}\marg{app} command, \protect\cs{edindex} should be defined inside @@ -3844,7 +3847,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/11/14 v2.16.6 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/12/12 v2.16.7 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -4037,7 +4040,7 @@ %False is the default value. We consider \protect\package{indextools} as a variant of \protect\package{imakeidx}. That is why we set \protect\cs{ifl@imakeidx} to true. We also let \protect\cs{imki@wrindexentry} to \protect\cs{indtl@wrindexentry}. % \end{macro} % \begin{macro}{\ifl@footmisc} -% Define a flag for if the \protect\package{footmisc} package has been used. +% Define a flag if the \protect\package{footmisc} package has been loaded. % \begin{macrocode} \newif\ifl@footmisc \@ifpackageloaded{footmisc}{\l@footmisctrue}{}%False is the default value @@ -4286,7 +4289,7 @@ % \begin{macro}{\led@err@BadAction} % \begin{macrocode} \newcommand*{\led@err@StanzaIndentNotDefined}{% - \reledmac@error{You have not defined indentation for the line of verse \number\stanza@count}{\@ehc}}% + \reledmac@error{You have not defined the indentation for the line \number\stanza@count}{\@ehc}}% % \end{macrocode} % \end{macro} % \begin{macro}{\led@err@ManySidenotes} @@ -4402,14 +4405,14 @@ % \begin{macro}{\led@error@fail@patch@endminipage} % \begin{macrocode} \newcommand{\led@error@fail@patch@endminipage}{% - \reledmac@error{Fail to patch \string\endminipage\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\endminipage\space command.}{\@ehc}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\led@error@fail@patch@endminipage} % \begin{macrocode} \newcommand{\led@error@fail@patch@makeindex}{% - \reledmac@error{Fail to patch \string\makeindex\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\makeindex\space command.}{\@ehc}% }% % \end{macrocode} % \end{macro} @@ -4702,6 +4705,8 @@ \resetprevline@ \resetprevpage@num \global\stopmsdata@inserted@true% + \global\let\@msdata@list\relax% + \global\csundef{@msdata@\add@msd@c @data}% } % \end{macrocode} @@ -7912,7 +7917,7 @@ % Increase pstart counter. % \begin{macrocode} \ifnumberpstart% - \pstartnumtrue% + \global\pstartnumtrue% \fi% \addtocounter{pstart}{1}% % \end{macrocode} @@ -7921,8 +7926,8 @@ \normal@pars% \ifstrempty{#1}{\at@every@pend}{\noindent#1}% % \end{macrocode} -% Restore standard nobreak setting and autopar setting. -% Normally, \cs{if@nobreak} is equal to true only immediately after a sectioning command (read latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. +% Restore standard \enquote{nobreak} and \enquote{autopar} settings. +% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. % \begin{macrocode} \@nobreakfalse% \ifautopar% @@ -8741,7 +8746,7 @@ \gdef\l@drd@ta{\rlap{{\rightpstartnum}}}% \fi \else - \@l@dtempcntb=\line@margin + \@l@dtempcntb=\line@margin% \ifnum\@l@dtempcntb>\@ne \advance\@l@dtempcntb \page@num \fi @@ -12752,13 +12757,13 @@ % sub-line number (in which case we want only the dash) or after an % ending line number (in which case we need to insert a period). % -% So, first, start the start line box, if required. +% So, first, start the starting line box, if needed. % \begin{macrocode} \ifdimequal{\csuse{Xendboxstartlinenum@\@currentseries}}{0pt}% {\bgroup}% {\leavevmode\hbox to \csuse{Xendboxstartlinenum@\@currentseries}\bgroup\hfill}% % \end{macrocode} -% Then, print the start page- +% Then, print the starting page number- % \begin{macrocode} \ifboolexpr{% (% @@ -12794,7 +12799,7 @@ \csuse{Xendlineprefixsingle@\@currentseries}% \fi% % \end{macrocode} -% The print the start line, following, if required, by the side flag and the start sub line. +% The print the starting line, followed, if needed, by the side flag and the starting sub line number. % \begin{macrocode} \wrap@edcrossref{\@this@crossref@start}{% \ifledRcol@% @@ -12819,13 +12824,13 @@ % \begin{macrocode} \egroup% % \end{macrocode} -% Open the box for the end line. +% Open the box for the ending line number. % \begin{macrocode} \ifdimequal{\csuse{Xendboxendlinenum@\@currentseries}}{0pt}% {\bgroup}% {\hbox to \csuse{Xendboxendlinenum@\@currentseries}\bgroup}% % \end{macrocode} -% Print the dash + the end line number, or the line number range symbol. +% Print the dash + the ending line number, or the line number range symbol. % \begin{macrocode} \ifl@d@Xtwolines% \ifl@d@Xmorethantwolines% @@ -12842,7 +12847,7 @@ \fi% \fi% % \end{macrocode} -% Print the end page number. +% Print the ending page number. % \begin{macrocode} \ifl@d@pnum% \ifcsstring{prevpagerange@\@currentseries}{#1-#4}% @@ -12856,7 +12861,7 @@ }% \fi% % \end{macrocode} -% Print the end line number, with if required the line prefix, and followed by the side flag and the subline number. +% Print the ending line number, with, if needed, the line prefix, and followed by the side flag and the subline number. % \begin{macrocode} \ifl@d@elin% \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% @@ -12883,7 +12888,7 @@ \fi% \fi% % \end{macrocode} -% Close the end line box. +% Close the ending line box. % \begin{macrocode} \ifdimequal{\csuse{Xendboxendlinenum@\@currentseries}}{0pt}% {}% @@ -13306,7 +13311,7 @@ \newcommand{\content}{##2}% \stepcounter{labidx}% \expandafter\immediate\expandafter\write\csname l@d@#1end\endcsname{% - \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Volountary space, to add linebreak in the output file + \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Explicit space, to add a linebreak in the output file \expandafter\string\csname #1end\endcsname% {\ifnumberedpar@\l@d@nums\fi}% {\ifnumberedpar@\expandonce\@tag\fi}% @@ -14104,7 +14109,7 @@ % \protect\cs{doreinxtrafeetii} becomes \protect\cs{X@doreinfeet}; % \protect\cs{doreinxtrafeeti} becomes \protect\cs{@doreinfeetX}.} % \changes{v2.16.0}{2016/10/02}{\protect\cs{Xdo@feet} becomes \protect\cs{do@Xfeet}} -% \changes{v2.16.0}{2016/10/02}{More explicit error message when missing to define stanza indent.} +% \changes{v2.16.0}{2016/10/02}{More explicit error message in case the stanza indentation is not defined.} % \begin{macrocode} \@ifclassloaded{memoir}{% % \end{macrocode} @@ -14567,7 +14572,7 @@ \newcommand*{\edlineref}[1]{% \l@dref@undefined{#1}% \wrap@edcrossref{#1}{% - \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not yet been parsed on the .aux file \iftoggle{label@#1@ledRcol}% {\linenumrepR{\l@dgetref@num{2}{#1}}}% {\linenumrep{\l@dgetref@num{2}{#1}}}% @@ -14587,7 +14592,7 @@ \newcommand*{\sublineref}[1]{% \l@dref@undefined{#1}% \wrap@edcrossref{#1}{% - \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not yet been parsed on the .aux file \iftoggle{label@#1@ledRcol}% {\sublinenumrepR{\l@dgetref@num{3}{#1}}}% {\sublinenumrep{\l@dgetref@num{3}{#1}}}% @@ -15862,7 +15867,7 @@ % % \subsection{Code specific to \cs{edindex} in critical footnotes} % \begin{macro}{\@edindex@fornote@} -% This counter is increased at the beginning of every notes (footnote and and sidenotes), and decreased at the end of every notes. +% This counter is incremented at the beginning of each note (either a footnote or a sidenote), and decremented at the end of each note. % If its value is greater than 0, that means we are inside a note. % \begin{macrocode} \newcount\@edindex@fornote@ @@ -16781,7 +16786,7 @@ \numdef{\@msd@cR}{0} % \end{macrocode} % \end{macro} -% \begin{macro}{\@msd@c} +% \begin{macro}{\add@msd@} % \cs{add@msd@} is a counter incremented at each \cs{add@msddata}, that is at each time we prepare the insertion of manuscripts data footnote. % \begin{macrocode} \numdef{\add@msd@c}{0}% @@ -16804,14 +16809,14 @@ % \begin{macrocode} \newcommand{\@msd}[1]{% \unless\ifledRcol% - \numdef{\@msd@c}{\@msd@c+\@ne}% + \global\numdef{\@msd@c}{\@msd@c+\@ne}% \csgdef{@msdata@\@msd@c @data}{#1}% \csxdef{@msdata@\@msd@c @linenumber}{\the\line@num}% \csxdef{@msdata@\@msd@c @abslinenumber}{\the\absline@num}% \xright@appenditem{\the\absline@num}\to\actionlines@list% \xright@appenditem{-1010}\to\actions@list% \else% - \numdef{\@msd@cR}{\@msd@cR+\@ne}% + \global\numdef{\@msd@cR}{\@msd@cR+\@ne}% \csgdef{@msdata@\@msd@cR @dataR}{#1}% \csxdef{@msdata@\@msd@cR @linenumberR}{\the\line@numR}% \csxdef{@msdata@\@msd@cR @abslinenumberR}{\the\absline@numR}% @@ -16821,7 +16826,7 @@ }% % \end{macrocode} % \end{macro} -% \begin{macro}{\@endmsd} +% \begin{macro}{\@stopmsd} % Inserted in the auxiliary file by \cs{stopmsd}, the \cs{@stopmsd} macro will store in two commands the line number and the absolute line number on which it is called. % \begin{macrocode} \newcommand{\@stopmsd}[0]{% @@ -16844,7 +16849,7 @@ % \begin{macro}{\add@msdata} % \cs{add@msdata} is executed on each line when action code $1010$ is seen. % It will not insert immediately the manuscript data footnote, as action code are executed before the line be typeset, and, consequently, could be on the previous page. -% So it just store the manuscript data footnote to \cs{@msdata@list}. +% So it just stores the manuscript data footnote to \cs{@msdata@list}. % \begin{macrocode} \newcommand{\add@msdata}{% \bgroup% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index bf7b1e101d9..004444aaa54 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -280,16 +280,21 @@ % \changes{v2.12.0}{2016/07/01}{Fix bug with \protect\cs{AtBeginPairs}.} % \changes{v2.13.0}{2016/07/22}{Compatibility with the new features of \protect\macpackage 2.15.0} % \changes{v2.13.1}{2016/09/26}{Simplification of the code concerning the sectioning command} -% \changes{v2.14.0}{2016/10/02}{New commands to have specific line margins for text in parallel columns} +% \changes{v2.14.0}{2016/10/02}{New commands to have specific line margins for text running in parallel columns} % \changes{v2.14.0}{2016/10/02}{Add \protect\cs{linenumberlistR}, equivalent to \protect\cs{linenumberlist} for the right side.} % \changes{v2.14.0}{2016/10/02}{When indexing texts in sidenotes with \protect\cs{edtext}, referring to the line number where the sidenote is called.} -% \changes{v2.14.0}{2016/10/02}{More explicit error message when missing to define stanza indent.} -% \changes{v2.14.0}{2016/10/02}{Error message when missing to define left / right side.} +% \changes{v2.14.0}{2016/10/02}{More explicit error message when the stanza indentation is not defined.} +% \changes{v2.14.0}{2016/10/02}{Error message when left / right side are not defined.} % \changes{v2.14.1}{2016/10/16}{Fix bug with vertical space before sectioning command in optional argument of \protect\cs{pstart} (bug added in v2.13.1).} % \changes{v2.14.1}{2016/10/16}{Fix bug when using \protect\cs{markboth} on \protect\cs{doinsidelineLhook} and \protect\cs{doinsidelineRhook}.} % \changes{v2.14.2}{2016/10/31}{Fix spurious space with \protect\cs{edtextlater}.} % \changes{v2.14.3}{2016/11/04}{Fix bug in \protect\cs{edtextnow}.} -% \changes{v2.14.4}{2016/11/14}{Take account of \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} +% \changes{v2.14.4}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} +% \changes{v2.15.0}{2016/12/12}{Add \protect\option{movecolumnspositiononrightpage} option.} +% \changes{v2.15.0}{2016/12/12}{New macro \protect\cs{sidenotemarginR}, fix default value to right.} +% \changes{v.2.15.0}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}} +% \changes{v2.15.0}{2016/12/12}{Fix bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).} +% \changes{v2.15.0}{2016/12/12}{Fix bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -406,6 +411,8 @@ % \item [prevpgnotnumbered] enables that the page before facing pages (the one % automatically inserted to start parallel pages on a left page) is not % counted. This applies only if the page is empty. +% \item[movecolumnspositiononrightpage] make the left column on the right page become the right column, and the left column become the right column. +% It allows to have a text running on the inner column, and an other one on the outer column. % \end{description} % % @@ -569,7 +576,13 @@ % If you want to have continuous line numbers between multiple columns and single columns, use the \option{continuousnumberingwithcolumns} option when loading \macpackage or \parpackage. % You will need to use \cs{pausenumbering}\ldots\cs{resumenumbering} instead of \cs{endnumbering}\ldots{endnumbering} (see \reff{reledmac-pause}). % +% \section{Keeping translation in the outside/inside column} +% By default, \parpackage works with left and right columns. +% However, it is possible to work with inner and outer column. +% In this case, use the \option{movecolumnspositiononrightpage} at loading time of the package. % +% The \env{Leftside} environment will correspond to the inner column, and the \env{Rightside} environment will correspond to the outer column. +% % \section{Facing pages}\label{pages} % \subsection{Basic usage} % \DescribeEnv{pages} @@ -1060,7 +1073,7 @@ % % \DescribeMacro{\doinsidelineLhook} % \DescribeMacro{\doinsidelineRhook} -% \cs{doinsidelineLhook} and \cs{doinsidelineRhook} are the equivalent to the \macpackage \cs{doinsidelinehook}, respectively for left and right side. +% \cs{doinsidelineLhook} and \cs{doinsidelineRhook} are the equivalent to the \macpackage \cs{doinsidelinehook}, for the left and the right sides respectively. % % About these two hooks, read \macpackage's handbook (\reff{reledmac-linehook}). % @@ -1121,6 +1134,9 @@ % As in \macpackage, you must use one of the following commands to add side notes: \protect\cs{ledsidenote}, \protect\cs{ledleftnote}, \protect\cs{ledrightnote}, \protect\cs{ledouterote}, \protect\cs{ledinnerrote}. % % The \protect\cs{sidenotemargin} defines the margin of the sidenote for either left or right side, depending on the current environment. +% +% The \cs{sidenotemarginR} defines the margin of the sidenote for the right side. +% % You can use \protect\cs{sidenotemargin*} to define it for both sides. % \section{Parallel ledgroups} % \subsection{General} @@ -1234,7 +1250,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/11/14 v2.14.4 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1301,6 +1317,16 @@ }% % \end{macrocode} % \end{macro} +% \subsubsection{Position option} +% \begin{macro}{\ifmovecolumnspositiononrightpage} +% The \cs{ifmovecolumnspositiononrightpage} boolean is set to true if, for a right page, we want the left column become a right column and the right column become a left column. +% \begin{macrocode} +\newif\ifmovecolumnspositiononrightpage% +\DeclareOptionX{movecolumnspositiononrightpage}{% + \movecolumnspositiononrightpagetrue% +}% +% \end{macrocode} +% \end{macro} % \subsubsection{Other options} % The \verb+parledgroup+ can be called either on \macpackage or \parpackage. % \begin{macrocode} @@ -1455,13 +1481,13 @@ % \begin{macro}{\led@err@Columns@WithoutLeftside} % \begin{macrocode} \newcommand*{\led@err@Pages@WithoutRightside}{% - \reledpar@error{\string\Pages\space called without previous `Rightside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Pages\space called without any preceding `Rightside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Pages@WithoutLeftside}{% - \reledpar@error{\string\Pages\space called without previous `Leftside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Pages\space called without any preceding `Leftside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Columns@WithoutRightside}{% - \reledpar@error{\string\Columns\space called without previous `Rightside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Columns\space called without any preceding `Rightside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Columns@WithoutLeftside}{% - \reledpar@error{\string\Columns\space called without previous `Leftside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Columns\space called without any preceding `Leftside` environment (or environment without content)}{\@ehc}}% % \end{macrocode} % \end{macro} % \end{macro} @@ -1571,9 +1597,9 @@ % \end{macro} % \end{macro} % \begin{macro}{\ifcsboxvoid} -% The \cs{ifcsboxvoid} is a complement to the \package{etoolbox} package. -% The first argument is a box name, the second is a the \meta{true} value, the third the \meta{false} value. -% If the first argument refers to a not existing box, or if it refers to a void box, the \meta{true} value is returned. In other case, the \meta{false} is returned. +% The \cs{ifcsboxvoid} command comes on top of the \package{etoolbox} package. +% The first argument is a box name, the second is the \meta{true} value, the third the \meta{false} value. +% If the first argument refers to a non-existing box, or if it refers to a box that is void, the \meta{true} value is returned. otherwise, \meta{false} is returned. % \begin{macrocode} \newcommand*{\ifcsboxvoid}[1]{% \ifcsname#1\endcsname% @@ -1662,6 +1688,8 @@ \global\let\next@page@numR\relax \global\let\sub@change\relax \global\stopmsdata@inserted@true% + \global\let\@msdata@list\relax% + \global\csundef{@msdata@\add@msd@cR @dataR}% \set@continuousnumberingforR% \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% @@ -1952,6 +1980,10 @@ \global\line@margin=\@l@dtempcntb% \fi% } +\ifmovecolumnspositiononrightpage% + \linenummargin{inner}% + \linenummarginR{outer}% +\fi% % \end{macrocode} % \end{macro} % \end{macro} @@ -3466,6 +3498,7 @@ % \begin{macrocode} \endgroup% \ignorespaces% + \@oldnobreak% \dump@pstartL@pc% \ifnumberpstart% \addtocounter{pstartL}{1}% @@ -3498,6 +3531,7 @@ \global\par@lineR=0% \endgroup% \ignorespaces% + \@oldnobreak% \dump@pstartR@pc% \ifnumberpstart% \addtocounter{pstartR}{1}% @@ -4706,6 +4740,7 @@ % the text. % \begin{macro}{\sidenote@marginR} % \begin{macro}{\sidenotemargin*} +% \begin{macro}{\sidenotemarginR} % \changes{v1.8.0}{2014/08/05}{\protect\cs{sidenotemargin} is now directly defined in \protect\package{eledmac} to be able to manage \protect\package{eledpar}.} % \changes{v1.8.0}{2014/08/05}{Add \protect\cs{sidenotemargin*}} % Specifies which margin sidenotes can be in. @@ -4715,12 +4750,22 @@ \global\sidenote@marginR=\@l@dtempcntb \global\sidenote@margin=\@l@dtempcntb } +\newcommand{\sidenotemarginR}[1]{% + \l@dgetsidenote@margin{#1}% + \global\sidenote@marginR=\@l@dtempcntb% +}% \newcount\sidenote@marginR -\global\sidenote@margin=\@ne +\global\sidenote@marginR=\@ne% + +\ifmovecolumnspositiononrightpage% + \sidenotemargin{inner}% + \sidenotemarginR{outer}% +\fi% % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % \changes{v1.3.3}{2012/12/19}{Debugging the left notes of the right column.} @@ -5362,15 +5407,9 @@ {}% \hb@xt@ \hsize{% \ifdefstring{\columns@position}{L}{}{\hfill }% - \unhbox\l@dleftbox% - \ifhbox\@eledsectionL% - \usebox{\@eledsectionL}% - \fi% + \print@leftcolumn% \print@columnseparator% - \unhbox\l@drightbox% - \ifhbox\@eledsectionR% - \usebox{\@eledsectionR}% - \fi% + \print@rightcolumn% \ifdefstring{\columns@position}{R}{}{\hfill}% }% \checkraw@text @@ -5440,6 +5479,63 @@ }% %\end{macrocode} % \end{macro} +% \begin{macro}{\print@leftcolumn} +% \begin{macro}{\print@rightcolumn} +% \cs{print@leftcolumn} and \cs{print@rightcolumn} print the line number of the left or right column respectively. +% Normally, it is defined by the content of the \env{Leftside} or \env{Rightside} environments. +% But if \cs{movecolumnspositiononrightpage} is set to TRUE, it also depends on the page number. +% \begin{macrocode} +\newcommand{\print@leftcolumn}{% + \if\page@num>\page@numR% + \@l@dtempcntb=\page@num% + \else% + \@l@dtempcntb=\page@numR% + \fi% + \ifboolexpr{% + not bool {movecolumnspositiononrightpage}% + or test {\ifnumodd{\@l@dtempcntb}}% + }% + {% + \unhbox\l@dleftbox% + \ifhbox\@eledsectionL% + \usebox{\@eledsectionL}% + \fi% + }% + {% + \unhbox\l@drightbox% + \ifhbox\@eledsectionR% + \usebox{\@eledsectionR}% + \fi% + }% +}% + + +\newcommand{\print@rightcolumn}{% + \if\page@num>\page@numR% + \@l@dtempcntb=\page@num% + \else% + \@l@dtempcntb=\page@numR% + \fi% + \ifboolexpr{% + not bool {movecolumnspositiononrightpage}% + or test {\ifnumodd{\@l@dtempcntb}}% + }% + {% + \unhbox\l@drightbox% + \ifhbox\@eledsectionR% + \usebox{\@eledsectionR}% + \fi% + }% + {% + \unhbox\l@dleftbox% + \ifhbox\@eledsectionL% + \usebox{\@eledsectionL}% + \fi% + }% +}% +% \end{macrocode} +% \end{macro} +% \end{macro} % \begin{macro}{\checkpb@columns} % \protect\cs{checkpb@columns} prevent or make pagebreaking in columns, depending of the use of \protect\cs{ledpb} or \protect\cs{lednopb}. % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index e5ba24f9641..e6480628852 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/11/14 v2.16.6 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/12/12 v2.16.7 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -237,7 +237,7 @@ \reledmac@warning{Series #1 is still existing !}% }% \newcommand*{\led@err@StanzaIndentNotDefined}{% - \reledmac@error{You have not defined indentation for the line of verse \number\stanza@count}{\@ehc}}% + \reledmac@error{You have not defined the indentation for the line \number\stanza@count}{\@ehc}}% \newcommand{\led@err@ManySidenotes}{% \ifledRcol@% \reledmac@warning{\itemcount@\space sidenotes on line \the\line@numR\space p. \the\page@numR}% @@ -295,10 +295,10 @@ \reledmac@error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}% }% \newcommand{\led@error@fail@patch@endminipage}{% - \reledmac@error{Fail to patch \string\endminipage\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\endminipage\space command.}{\@ehc}% }% \newcommand{\led@error@fail@patch@makeindex}{% - \reledmac@error{Fail to patch \string\makeindex\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\makeindex\space command.}{\@ehc}% }% \newcommand{\led@warn@edinde@outsidenumbering}{% \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}% @@ -392,6 +392,8 @@ \resetprevline@ \resetprevpage@num \global\stopmsdata@inserted@true% + \global\let\@msdata@list\relax% + \global\csundef{@msdata@\add@msd@c @data}% } \def\endnumbering{% @@ -1697,7 +1699,7 @@ \endgroup% \ignorespaces% \ifnumberpstart% - \pstartnumtrue% + \global\pstartnumtrue% \fi% \addtocounter{pstart}{1}% \normal@pars% @@ -2064,7 +2066,7 @@ \gdef\l@drd@ta{\rlap{{\rightpstartnum}}}% \fi \else - \@l@dtempcntb=\line@margin + \@l@dtempcntb=\line@margin% \ifnum\@l@dtempcntb>\@ne \advance\@l@dtempcntb \page@num \fi @@ -4662,7 +4664,7 @@ \newcommand{\content}{##2}% \stepcounter{labidx}% \expandafter\immediate\expandafter\write\csname l@d@#1end\endcsname{% - \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Volountary space, to add linebreak in the output file + \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Explicit space, to add a linebreak in the output file \expandafter\string\csname #1end\endcsname% {\ifnumberedpar@\l@d@nums\fi}% {\ifnumberedpar@\expandonce\@tag\fi}% @@ -5383,7 +5385,7 @@ \newcommand*{\edlineref}[1]{% \l@dref@undefined{#1}% \wrap@edcrossref{#1}{% - \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not yet been parsed on the .aux file \iftoggle{label@#1@ledRcol}% {\linenumrepR{\l@dgetref@num{2}{#1}}}% {\linenumrep{\l@dgetref@num{2}{#1}}}% @@ -5395,7 +5397,7 @@ \newcommand*{\sublineref}[1]{% \l@dref@undefined{#1}% \wrap@edcrossref{#1}{% - \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not yet been parsed on the .aux file \iftoggle{label@#1@ledRcol}% {\sublinenumrepR{\l@dgetref@num{3}{#1}}}% {\sublinenumrep{\l@dgetref@num{3}{#1}}}% @@ -6700,14 +6702,14 @@ \def\@msdata@list{}% \newcommand{\@msd}[1]{% \unless\ifledRcol% - \numdef{\@msd@c}{\@msd@c+\@ne}% + \global\numdef{\@msd@c}{\@msd@c+\@ne}% \csgdef{@msdata@\@msd@c @data}{#1}% \csxdef{@msdata@\@msd@c @linenumber}{\the\line@num}% \csxdef{@msdata@\@msd@c @abslinenumber}{\the\absline@num}% \xright@appenditem{\the\absline@num}\to\actionlines@list% \xright@appenditem{-1010}\to\actions@list% \else% - \numdef{\@msd@cR}{\@msd@cR+\@ne}% + \global\numdef{\@msd@cR}{\@msd@cR+\@ne}% \csgdef{@msdata@\@msd@cR @dataR}{#1}% \csxdef{@msdata@\@msd@cR @linenumberR}{\the\line@numR}% \csxdef{@msdata@\@msd@cR @abslinenumberR}{\the\absline@numR}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 3752de8a762..c94978841e8 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/11/14 v2.14.4 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -57,6 +57,10 @@ \nosyncpstartstrue% \apptocmd{\@par@this@sync@option}{nosync}{}{}% }% +\newif\ifmovecolumnspositiononrightpage% +\DeclareOptionX{movecolumnspositiononrightpage}{% + \movecolumnspositiononrightpagetrue% +}% \DeclareOptionX{parledgroup}{\parledgrouptrue} \DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% \DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}% @@ -102,13 +106,13 @@ \newcommand*{\led@err@Columns@WithoutEnv}{% \reledpar@error{\string\Columns\space called without previous `pairs` environment}{\@ehc}} \newcommand*{\led@err@Pages@WithoutRightside}{% - \reledpar@error{\string\Pages\space called without previous `Rightside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Pages\space called without any preceding `Rightside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Pages@WithoutLeftside}{% - \reledpar@error{\string\Pages\space called without previous `Leftside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Pages\space called without any preceding `Leftside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Columns@WithoutRightside}{% - \reledpar@error{\string\Columns\space called without previous `Rightside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Columns\space called without any preceding `Rightside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Columns@WithoutLeftside}{% - \reledpar@error{\string\Columns\space called without previous `Leftside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Columns\space called without any preceding `Leftside` environment (or environment without content)}{\@ehc}}% \newcommand{\led@error@fail@patch@thepage}{% \reledpar@error{Fail to patch \string\@thepage\space command.}{\@ehc}% }% @@ -195,6 +199,8 @@ \global\let\next@page@numR\relax \global\let\sub@change\relax \global\stopmsdata@inserted@true% + \global\let\@msdata@list\relax% + \global\csundef{@msdata@\add@msd@cR @dataR}% \set@continuousnumberingforR% \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% @@ -371,6 +377,10 @@ \global\line@margin=\@l@dtempcntb% \fi% } +\ifmovecolumnspositiononrightpage% + \linenummargin{inner}% + \linenummarginR{outer}% +\fi% \newcount\line@margin@columnsR% \line@margin@columnsR=\m@ne% @@ -994,6 +1004,7 @@ \global\par@line=0% \endgroup% \ignorespaces% + \@oldnobreak% \dump@pstartL@pc% \ifnumberpstart% \addtocounter{pstartL}{1}% @@ -1014,6 +1025,7 @@ \global\par@lineR=0% \endgroup% \ignorespaces% + \@oldnobreak% \dump@pstartR@pc% \ifnumberpstart% \addtocounter{pstartR}{1}% @@ -1766,8 +1778,17 @@ \global\sidenote@marginR=\@l@dtempcntb \global\sidenote@margin=\@l@dtempcntb } +\newcommand{\sidenotemarginR}[1]{% + \l@dgetsidenote@margin{#1}% + \global\sidenote@marginR=\@l@dtempcntb% +}% \newcount\sidenote@marginR -\global\sidenote@margin=\@ne +\global\sidenote@marginR=\@ne% + +\ifmovecolumnspositiononrightpage% + \sidenotemargin{inner}% + \sidenotemarginR{outer}% +\fi% \newcommand*{\affixside@noteR}{% @@ -2099,15 +2120,9 @@ {}% \hb@xt@ \hsize{% \ifdefstring{\columns@position}{L}{}{\hfill }% - \unhbox\l@dleftbox% - \ifhbox\@eledsectionL% - \usebox{\@eledsectionL}% - \fi% + \print@leftcolumn% \print@columnseparator% - \unhbox\l@drightbox% - \ifhbox\@eledsectionR% - \usebox{\@eledsectionR}% - \fi% + \print@rightcolumn% \ifdefstring{\columns@position}{R}{}{\hfill}% }% \checkraw@text @@ -2155,6 +2170,53 @@ \hspace{\beforecolumnseparator}% \fi% }% +\newcommand{\print@leftcolumn}{% + \if\page@num>\page@numR% + \@l@dtempcntb=\page@num% + \else% + \@l@dtempcntb=\page@numR% + \fi% + \ifboolexpr{% + not bool {movecolumnspositiononrightpage}% + or test {\ifnumodd{\@l@dtempcntb}}% + }% + {% + \unhbox\l@dleftbox% + \ifhbox\@eledsectionL% + \usebox{\@eledsectionL}% + \fi% + }% + {% + \unhbox\l@drightbox% + \ifhbox\@eledsectionR% + \usebox{\@eledsectionR}% + \fi% + }% +}% + +\newcommand{\print@rightcolumn}{% + \if\page@num>\page@numR% + \@l@dtempcntb=\page@num% + \else% + \@l@dtempcntb=\page@numR% + \fi% + \ifboolexpr{% + not bool {movecolumnspositiononrightpage}% + or test {\ifnumodd{\@l@dtempcntb}}% + }% + {% + \unhbox\l@drightbox% + \ifhbox\@eledsectionR% + \usebox{\@eledsectionR}% + \fi% + }% + {% + \unhbox\l@dleftbox% + \ifhbox\@eledsectionL% + \usebox{\@eledsectionL}% + \fi% + }% +}% \newcommand{\checkpb@columns}{% \newif\if@pb -- cgit v1.2.3