diff options
author | Karl Berry <karl@freefriends.org> | 2017-11-06 21:58:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-11-06 21:58:48 +0000 |
commit | 8250d9a7dd7d0b665030bd401781a79022ddc865 (patch) | |
tree | f2df69706bd33b51880b83e9d722b8d2a4007131 | |
parent | 5949a9aee0bb29a10f1ec50a6cb8dd50a1c7de81 (diff) |
reledmac (6nov17)
git-svn-id: svn://tug.org/texlive/trunk@45709 c570f23f-e606-0410-a88d-b1316a301751
50 files changed, 133 insertions, 45 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex f9ada8f35d1..7bee614970a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf Binary files differnew file mode 100644 index 00000000000..bdbbc65c647 --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.tex b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.tex new file mode 100644 index 00000000000..c1093ba3b50 --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.tex @@ -0,0 +1,54 @@ +\documentclass{article} +\usepackage{polyglossia,fontspec} +\usepackage{libertineotf} +\setmainlanguage{latin} +\setotherlanguage{english} + +\usepackage[series={A,B},nocritical,noeledsec,nofamiliar,noledgroup]{reledmac} +\Xendparagraph[B] +\begin{document} + +\begin{english} +\date{} +\title{Critical endnotes} +\maketitle +\begin{abstract} +This file provides examples of critical endnotes with reledmac. +A critical note is associated to a lemma, marked by \verb+\edtext+, and referenced by the line and page numbers of the lemma. +If a critical notes refers to a long lemma, we can use \verb+lemma+ to obtain an abbreviated form. + +Here we use two series of critical notes. +\begin{itemize} +\item Each note of series A has its own paragraph. +\item The notes of series B are arranged in the same paragraph. +\end{itemize} +\end{abstract} +\end{english} + +\beginnumbering +\pstart +\edtext{Lorem}{ + \Aendnote{A critical note} + \Aendnote{Critical note in series A} + \Aendnote{Critical note in series A} + \Bendnote{loram}} +\edtext{ipsum}{ + \Aendnote{An other critical note} + \Bendnote{Other critical note in series A}} + dolor sit amet, consectetur adipiscing elit. + \edtext{Fusce sed dolor libero. Aenean rutrum vestibulum lacus ut pretium. Fusce et auctor lectus. Ut et commodo quam, quis gravida orci. Nullam at risus elementum, suscipit enim a, pellentesque mi} + {\lemma{Fusce\ldots mi} + \Aendnote{A long critical note} + \Bendnote{omit}}. +Morbi \edtext{commodo}{\Bendnote{quommodo}}, ligula vel consectetur accumsan, massa metus egestas velit, eu fringilla leo ante in turpis. \edtext{Vivamus}{\Bendnote{Vivit}} ut tellus sollicitudin, facilisis ipsum sit amet, tincidunt odio. Maecenas tincidunt dolor sed ante blandit tincidunt. Etiam vulputate ultricies facilisis. +\pend +\endnumbering + +\section{A series} +\doendnotes{A} + +\section{B series} +\doendnotes{B} + + +\end{document}
\ No newline at end of file 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 0ea52a72610..7a0685f185b 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 0f6e5759f8f..dbd4642c143 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 d0bcda09f78..8c2207078eb 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 957cacc98c2..deeb2bbf08b 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/1-verses.tex b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex index 50c12ca81aa..7b2f27ee047 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex @@ -20,6 +20,8 @@ This file provides an example of verse's typesetting with reledmac. The odd verses are not indented, the even are indented. When a verse is too long, the end is printed after a long indentation, and a left bracket is inserted (\verb+\sethangingsymbol+). Two levels of critical footnotes are used. + +We also add example of notes overlapping two lines of verse, using \verb+xxref+ and \verb+lemma+. \end{abstract} \end{english} @@ -27,17 +29,17 @@ Two levels of critical footnotes are used. \setcounter{stanzaindentsrepetition}{2} \setstanzaindents{8,0,1} \stanza -Lorem ipsum dolor sit amet, consectetur adipisicing elit,& +\edlabel{begin:1}\edtext{Lorem}{\lemma{Lorem\ldots nisis}\xxref{begin:1}{end:1}\Afootnote{A note on two verses}} ipsum dolor sit amet, consectetur adipisicing elit,& sed do eiusmod tempor incididunt ut labore et dolore& magna aliqua. Ut enim ad minim veniam, quis nostrud& -exercitation ullamco laboris nisi& +exercitation ullamco laboris nisi\edlabel{end:1}& \edtext{ut aliquip}{\Afootnote{ut aliliquip}} consequat ut aliquip consequat irure dolor in reprehenderit irure dolor in reprehenderit& \edtext{Duis aute}{\Bfootnote{Some comments}} irure dolor in reprehenderit& in voluptate velit esse cillum dolore eu ur. Excepteur sint occaecat& cupidatat non proident, sunt in culpa qui officia deserunt& -Duis aute irure dolor in reprehenderit& +\edlabel{begin:2}\edtext{Duis}{\xxref{begin:2}{end:2}\lemma{Duis\ldots occaecat}\Afootnote{A other note on two verses}} aute irure dolor in reprehenderit& in voluptate velit esse cillum dolore eu fugiat nulla& -pariatur. Excepteur sint occaecat\& +pariatur. Excepteur sint occaecat\edlabel{end:2}\& \endnumbering \end{document} 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 044ddec06b4..ae392cb5b33 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 2acd379e171..ec2c9d8c0cf 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-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf Binary files differindex dcd6959f5dc..cb1322ef1ca 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.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 4ebc281e998..41df2eaf8b4 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 42d3b50905b..d947ab68038 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 4b6cd251d03..12f7ab3a712 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-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf Binary files differindex 2328563d911..57327143531 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf 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 Binary files differindex 124493409cc..cf53aed467a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf 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 Binary files differindex fcd1ba124f3..61ca0f67449 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.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 4aca3375ca6..b90223c0f08 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 b19bb44233a..f19237a1224 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-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 77fa87d9250..9745b39dbfc 100644 --- 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 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 1ed90b87763..76ec4732de8 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 1955742d0c1..a618b845968 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 a41303bc0f5..6395ed8f2d3 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 9e5acf23758..ff819ea06d0 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 9ed370027a6..801aaf430ee 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 86e3034a7e0..c6a986ba086 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 6d25b64ab6c..97706d5b58a 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 66675f414fc..c51b104d19a 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 1f0c661c465..b5382d928e3 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 92e6903ca6d..0618d141fca 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 c8a1d59a33d..69e707121a2 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 ef130256377..3e19789cdd2 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 6a52374ac8f..d4b9137d918 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-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex 8564f14e41c..0a7b1a66d35 100644 --- 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 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 062c5eb9b6d..693cf5ddc47 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 e4214bb283a..90eaf8d1cdd 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 1536241dd71..49bccfc1dcc 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_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex 6c7fb5ba1c7..beb3063a0fe 100644 --- 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 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 f9648e51e29..fa0e7e3eb96 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_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex 25ed58e2564..4e8554b3910 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 a54f8175e78..bc0ca8898c6 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 0d44cbeea6f..5ff69cbced5 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_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 Binary files differindex 2deb01c8f26..b431f51d288 100644 --- 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 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 12c1c8bdd33..fd087f336b7 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 cdfb6a9f88c..24947bb17f6 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 3afac10e181..69db8c173df 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 65ca458b72b..033e5418045 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 d82bde724ad..fb50426bcb3 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 fe550515fbb..6acb2f99500 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -429,7 +429,7 @@ % \changes{v2.15.2}{2016/09/12}{Fix a bug with \protect\package{fancyhdr} package 3.8 and later.} % \changes{v2.15.3}{2016/09/26}{Fix a 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 a warning message if using a version of \protect\LaTeX that is too old.} +% \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} @@ -490,6 +490,7 @@ % \changes{v2.24.0}{2017/08/17}{Fix spurious space with \protect\cs{labelpstarttrue}} % \changes{v2.24.1}{2017/08/31}{Compatibility with \protect\parpackage 2.20.2} % \changes{v2.24.2}{2017/10/21}{Fix bug between tabular environments and endnotes} +%% \changes{v2.25.0}{2017/11/05}{Add \protect\cs{Xendtxtbeforenotes} hook} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -1135,6 +1136,8 @@ % or sub-line depending on what it started out as, even if it % changes in the middle. % +% \DescribeMacro{Xsublinesep} +% \DescribeMacro{Xsublinesepside} % You can change the separator between the line number and the subline number either by using \cs{Xsublinesep} without any optional argument (\reff{Xsublinesep}) or by using \cs{Xsublinesepside}. In the second case, it will change the separator only for line numbers in the margins, not in the footnotes. % \subsubsection{Locking lineation} % \DescribeMacro{\startlock} @@ -1798,7 +1801,7 @@ % % Please not that the maintainer of this script is not the maintainer of \macpackage. % -% \subsection{Apparatus of Manuscripts} +% \subsection{Apparatus of manuscripts} % The critical notes mostly refer to textual variants between manuscripts which contain the text to be edited. % It may so happen that the manuscripts only contain parts of the text. % Depending on one's wishes, \macpackage\ can generate lists of relevant manuscripts for any delimited portion of text. @@ -2110,6 +2113,16 @@ % \subsubsection{Arbitrary text before line number} % \DescribeMacro{\Xbeforenumber} % \cs{Xbeforenumber}\oarg{s}\marg{txt} allow to insert \meta{txt} before the line number, only when the line number is printed, so taking into accout \cs{Xnumberonlyfirstinline} and similar. +% \paragraph{For endnotes}\label{pagelineendnotes} +% \DescribeMacro{\Xendbeforepagenumber} +% \cs{Xendbeforepagenumber}\oarg{s}\marg{text} defines the text before the page number in endnotes. Default value is \verb+p.+ (``p'' followed by a dot). +% +% \DescribeMacro{\Xendafterpagenumber} +% \cs{Xendafterpagenumber}\oarg{s}\marg{text} defines the text after the page number in endnotes. Default value is \verb+) + (open parenthesis followed by a single space). +% \DescribeMacro{\Xendlineprefixsingle} +% \cs{Xendlineprefixsingle}\oarg{s}\marg{text} defines the text before the line number in endnotes, when there is only one line. Default value is empty. +% \DescribeMacro{\Xendlineprefixmore} +% \cs{Xendlineprefixmore}\oarg{s}\marg{text} defines the text before the line number in endnotes, when there is more than one line. Default value is empty. If you don't define it, use the value defined by \cs{Xendlineprefixsingle}. % \subsubsection{Separator for line range}\label{linerangeseparator} % \changes{v2.4.0}{2015/10/19}{New hooks: \protect\cs{Xlinerangeseparator} and \protect\cs{Xendlinerangeseparator}.} % \changes{v2.4.0}{2015/10/19}{Option linerangesep for critical footnotes and endnotes.} @@ -2295,16 +2308,6 @@ % \protect\cs{Xendboxlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxlinenumalign}\oarg{s}\marg{text}, \protect\cs{Xendboxstartlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxendlinenum}\oarg{s}\marg{l} are the same as, respectively, \protect\cs{Xboxlinenum} and \protect\cs{Xboxlinenumalign}, \protect\cs{Xboxstartlinenum}, \protect\cs{Xboxendlinenum} except in endnotes. % % -% \subsection{For endnotes}\label{pagelineendnotes} -% \DescribeMacro{\Xendbeforepagenumber} -% \cs{Xendbeforepagenumber}\oarg{s}\marg{text} defines the text before the page number in endnotes. Default value is \verb+p.+ (``p'' followed by a dot). -% -% \DescribeMacro{\Xendafterpagenumber} -% \cs{Xendafterpagenumber}\oarg{s}\marg{text} defines the text after the page number in endnotes. Default value is \verb+) + (open parenthesis followed by a single space). -% \DescribeMacro{\Xendlineprefixsingle} -% \cs{Xendlineprefixsingle}\oarg{s}\marg{text} defines the text before the line number in endnotes, when there is only one line. Default value is empty. -% \DescribeMacro{\Xendlineprefixmore} -% \cs{Xendlineprefixmore}\oarg{s}\marg{text} defines the text before the line number in endnotes, when there is more than one line. Default value is empty. If you don't define it, use the value defined by \cs{Xendlineprefixsingle}. % \subsection{Arbitrary code around line number} % \DescribeMacro{\Xendbhooklinenumber} % \cs{Xendbhooklinenumber}\oarg{s}\marg{code} is used to execute code before line number in endnotes. The code is executed before the \cs{Xendbeforelinenumber} space and before the \cs{Xendnotenumfont} font setting. @@ -2355,7 +2358,7 @@ % % % \DescribeMacro{\Xendinplaceoflemmaseparator}\label{Xendinplaceoflemmaseparator} -% With \protect\cs{Xendinplaceoflemmaseparator}\oarg{s}\marg{l} you can add some space if you chose to remove the lemma separator. The default value is 0.5~em. +% With \protect\cs{Xendinplaceoflemmaseparator}\oarg{s}\marg{l} you can add some space if you choose to remove the lemma separator. The default value is 0.5~em. % % % \subsection{Font style} @@ -2457,15 +2460,15 @@ % \end{verbatim} % % \DescribeMacro{\Xbhooknote} -% \protect\cs{Xbhooknote}\oarg{s}\marg{code} is to be used at the beginning of the critical footnotes. +% \protect\cs{Xbhooknote}\oarg{s}\marg{code} is to be used at the beginning of each critical footnotes. % % % \DescribeMacro{\bhooknoteX} -% \protect\cs{bhooknoteX}\oarg{s}\marg{code} is to be used at the beginning of the familiar footnotes. +% \protect\cs{bhooknoteX}\oarg{s}\marg{code} is to be used at the beginning of each familiar footnote. % % % \DescribeMacro{\Xendbhooknote} -% \protect\cs{Xendbhooknote}\oarg{s}\marg{code} is to be used at the beginning of the endnotes. +% \protect\cs{Xendbhooknote}\oarg{s}\marg{code} is to be used at the beginning of each endnote. % % \subsection{Arbitrary code before inserting note} % \DescribeMacro{\Xbeforeinserting} @@ -2560,8 +2563,12 @@ % \DescribeMacro{\Xtxtbeforenotes} % You can add text before critical footnotes with \protect\cs{Xtxtbeforenotes}\oarg{s}\marg{text}. % \DescribeMacro{\txtbeforenotesX} +% % You can add text before familiar footnotes with \protect\cs{txtbeforenotesX}\oarg{s}\marg{text}. % +% \DescribeMacro{\Xendtxtbeforenotes} +% You can add text before endnotes with \protect\cs{Xendtxtbeforenotes}\oarg{s}\marg{text}. The text will be typeset only if we have endnotes. +% % \DescribeMacro{\Xtxtbeforenotesonlyonce} % \DescribeMacro{\txtbeforenotesonlyonceX} By default, such texts are inserted at the beginning of the groups of notes on each pages. % You can add \cs{Xtxtbeforenotesonlyonce} (for critical footnotes) and \cs{txtbeforenotesonlyonceX} (for familiar footnotes) to insert them only the first time notes are typeset. @@ -3394,7 +3401,7 @@ % Its default name is \verb+reledmac-markup-attr.xdy+, % but you can change it by using your own as an argument of the \verb|xindy+hyperref| option. % -% If you chose to use both \verb+xindy+ and the \verb+hyperref+ package, +% If you choose to use both \verb+xindy+ and the \verb+hyperref+ package, % you must do three more things: % \begin{enumerate} % \item Use \verb|xindy+hyperref| option when loading the \macpackage package. @@ -4062,7 +4069,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2017/10/21 v2.24.2 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/11/05 v2.25.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -9598,7 +9605,8 @@ \ifcsdef{\csuse{series@display#1}@begin@insert}{% \csuse{\csuse{series@display#1}@begin@insert}{#1}% }{}% - \strut\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}% + \strut\csuse{Xnotefontsize@#1}% + \csuse{Xtxtbeforenotes@#1}% \egroup% }% }% @@ -13036,6 +13044,10 @@ % \end{itemize} % \begin{macrocode} \global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4#5#6#7{{% + \iftoggle{Xendfirstnote@#4}{% + \global\togglefalse{Xendfirstnote@#4}% + \csuse{Xendtxtbeforenotes@#4}% + }{}% \csuse{Xendbhooknote@#4}% \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% @@ -13217,6 +13229,7 @@ \begingroup \csxdef{prevpagenum@#1}{}% \csxdef{prevpagerange@#1}{}% + \global\toggletrue{Xendfirstnote@#1}% \makeatletter \expandafter\let\csname #1end\endcsname=\endprint \input\l@auxdir\jobname.#1end% @@ -13238,6 +13251,7 @@ \begingroup% \makeatletter% \def\l@d@section##1{% + \global\toggletrue{Xendfirstnote@#1}% \ifnumequal{##1}{\csname #1end@bysection\endcsname}% {\cslet{#1end}{\endprint}}% {\cslet{#1end}{\@gobbleseven}}% @@ -14054,11 +14068,14 @@ \csgdef{Xendlemmafont@#1}{}% - \newtoggle{Xendpagenumberonlyfirst@#1}% - \newtoggle{Xendpagenumberonlyfirstifsingle@#1}% - \newtoggle{Xendpagenumberonlyfirstintwo@#1}% - \csgdef{Xendsympagenum@#1}{}% - \csgdef{Xendinplaceofpagenumber@#1}{0pt}% + \newtoggle{Xendpagenumberonlyfirst@#1}% + \newtoggle{Xendpagenumberonlyfirstifsingle@#1}% + \newtoggle{Xendpagenumberonlyfirstintwo@#1}% + \csgdef{Xendsympagenum@#1}{}% + \csgdef{Xendinplaceofpagenumber@#1}{0pt}% + + \csgdef{Xendtxtbeforenotes@#1}{}% + \newtoggle{Xendfirstnote@#1}%Not a hook, but used to apply Xendtxtbeforenotes % \end{macrocode} % End of endnotes declaration @@ -14452,12 +14469,14 @@ \newhookcommand@series{Xendhangindent}% - \newhooktoggle@series{Xendpagenumberonlyfirst}% - \newhooktoggle@series{Xendpagenumberonlyfirstifsingle}% - \newhooktoggle@series{Xendpagenumberonlyfirstintwo}% - \newhookcommand@series{Xendsympagenum}% - \newhookcommand@series{Xendinplaceofpagenumber}% + \newhooktoggle@series{Xendpagenumberonlyfirst}% + \newhooktoggle@series{Xendpagenumberonlyfirstifsingle}% + \newhooktoggle@series{Xendpagenumberonlyfirstintwo}% + \newhookcommand@series{Xendsympagenum}% + \newhookcommand@series{Xendinplaceofpagenumber}% + \newhookcommand@series{Xendtxtbeforenotes}% + \fi \newhooktoggle@series{Xendlineflag}[apprefwithpage,SErefwithpage] \newhookcommand@series{Xendtwolines}[apprefwithpage,SErefwithpage] diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 52280b167d5..87a5dd36cfc 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -25,6 +25,7 @@ +%% \changes{v2.25.0}{2017/11/05}{Add \protect\cs{Xendtxtbeforenotes} hook} @@ -35,7 +36,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2017/10/21 v2.24.2 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/11/05 v2.25.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -2471,7 +2472,8 @@ \ifcsdef{\csuse{series@display#1}@begin@insert}{% \csuse{\csuse{series@display#1}@begin@insert}{#1}% }{}% - \strut\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}% + \strut\csuse{Xnotefontsize@#1}% + \csuse{Xtxtbeforenotes@#1}% \egroup% }% }% @@ -4352,6 +4354,10 @@ }% \global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4#5#6#7{{% + \iftoggle{Xendfirstnote@#4}{% + \global\togglefalse{Xendfirstnote@#4}% + \csuse{Xendtxtbeforenotes@#4}% + }{}% \csuse{Xendbhooknote@#4}% \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% @@ -4490,6 +4496,7 @@ \begingroup \csxdef{prevpagenum@#1}{}% \csxdef{prevpagerange@#1}{}% + \global\toggletrue{Xendfirstnote@#1}% \makeatletter \expandafter\let\csname #1end\endcsname=\endprint \input\l@auxdir\jobname.#1end% @@ -4503,6 +4510,7 @@ \begingroup% \makeatletter% \def\l@d@section##1{% + \global\toggletrue{Xendfirstnote@#1}% \ifnumequal{##1}{\csname #1end@bysection\endcsname}% {\cslet{#1end}{\endprint}}% {\cslet{#1end}{\@gobbleseven}}% @@ -5065,11 +5073,14 @@ \csgdef{Xendlemmafont@#1}{}% - \newtoggle{Xendpagenumberonlyfirst@#1}% - \newtoggle{Xendpagenumberonlyfirstifsingle@#1}% - \newtoggle{Xendpagenumberonlyfirstintwo@#1}% - \csgdef{Xendsympagenum@#1}{}% - \csgdef{Xendinplaceofpagenumber@#1}{0pt}% + \newtoggle{Xendpagenumberonlyfirst@#1}% + \newtoggle{Xendpagenumberonlyfirstifsingle@#1}% + \newtoggle{Xendpagenumberonlyfirstintwo@#1}% + \csgdef{Xendsympagenum@#1}{}% + \csgdef{Xendinplaceofpagenumber@#1}{0pt}% + + \csgdef{Xendtxtbeforenotes@#1}{}% + \newtoggle{Xendfirstnote@#1}%Not a hook, but used to apply Xendtxtbeforenotes \fi% \listxadd{\@series}{#1} @@ -5328,11 +5339,13 @@ \newhookcommand@series{Xendhangindent}% - \newhooktoggle@series{Xendpagenumberonlyfirst}% - \newhooktoggle@series{Xendpagenumberonlyfirstifsingle}% - \newhooktoggle@series{Xendpagenumberonlyfirstintwo}% - \newhookcommand@series{Xendsympagenum}% - \newhookcommand@series{Xendinplaceofpagenumber}% + \newhooktoggle@series{Xendpagenumberonlyfirst}% + \newhooktoggle@series{Xendpagenumberonlyfirstifsingle}% + \newhooktoggle@series{Xendpagenumberonlyfirstintwo}% + \newhookcommand@series{Xendsympagenum}% + \newhookcommand@series{Xendinplaceofpagenumber}% + + \newhookcommand@series{Xendtxtbeforenotes}% \fi \newhooktoggle@series{Xendlineflag}[apprefwithpage,SErefwithpage] |