texlive[41380] Master/texmf-dist: reledmac (3jun16)
commits+karl at tug.org
commits+karl at tug.org
Sun Jun 12 01:16:50 CEST 2016
Revision: 41380
http://tug.org/svn/texlive?view=revision&revision=41380
Author: karl
Date: 2016-06-12 01:16:49 +0200 (Sun, 12 Jun 2016)
Log Message:
-----------
reledmac (3jun16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.tex
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.tex
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf 2016-06-11 23:16:26 UTC (rev 41379)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf 2016-06-11 23:16:49 UTC (rev 41380)
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.tex 2016-06-11 23:16:49 UTC (rev 41380)
@@ -0,0 +1,79 @@
+\documentclass{article}
+\usepackage{libertineotf}
+\usepackage{polyglossia}
+\setmainlanguage{english}
+\setotherlanguage{latin}
+\usepackage[noend, nopenalties, nofamiliar, noeledsec, series={A,B}]{reledmac}
+\usepackage{reledpar}
+
+% General settings of reledmac
+\Xarrangement{paragraph}
+\Xparafootsep{ $||$ }
+\lineation*{page}
+\firstlinenum*{1}
+\linenumincrement*{1}
+
+% Settings for apparatus of manuscripts
+\Xinplaceofnumber[A]{0pt}%Add no space in case the line number is not printed
+\Xafternote{0pt}%Add no space between notes
+\Xinplaceoflemmaseparator{0pt}%Add no space in case the lemma separator is not printed
+\Xafternumber[A]{0pt}%Add no space after the line number
+\Xlemmaseparator[A]{:}%Use ':' instead of ']' as lemma separator
+\Xtxtbeforenotes[A]{\textbf{\emph{Ms.\ }}}%Print this at the start of the apparatus of mss.
+\setmsdatalabel{}%No lemma, the Xtxtbeforenotes setting is used instead
+
+\begin{document}
+
+\begin{english}
+\title{Apparatus of Manuscripts}
+\date{}
+\maketitle
+
+\begin{abstract}
+This file provides an example on how to typeset an apparatus of manuscripts by using \verb+\msdata+ and \verb+\stopmsdata+.
+
+We also make some specific settings in order to format the apparatus in a more readable way.
+\end{abstract}
+\end{english}
+
+\beginnumbering
+\autopar
+
+
+\msdata{ABCD}\edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus suscipit tortor eget felis porttitor volutpat. Donec sollicitudin molestie malesuada. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vivamus suscipit tortor eget felis porttitor volutpat. Quisque velit nisi, pretium ut lacinia in, elementum id enim. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Nulla quis lorem ut libero malesuada feugiat. Sed porttitor lectus nibh. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula.\stopmsdata\ \msdata{ABC}Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla porttitor accumsan tincidunt.
+
+Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Proin eget tortor risus. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Donec sollicitudin molestie malesuada. Donec sollicitudin molestie malesuada. Proin eget tortor risus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit.
+
+\edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Vivamus suscipit tortor eget felis porttitor volutpat. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Sed porttitor lectus nibh. Vivamus suscipit tortor eget felis porttitor volutpat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec rutrum congue leo eget malesuada. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Cras ultricies ligula sed magna dictum porta. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Proin eget tortor risus. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui.
+
+Nulla quis lorem ut libero malesuada feugiat. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Nulla porttitor accumsan tincidunt. Nulla quis lorem ut libero malesuada feugiat. Donec rutrum congue leo eget malesuada. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Cras ultricies ligula sed magna dictum porta. Cras ultricies ligula sed magna dictum porta. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed porttitor lectus nibh. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Sed porttitor lectus nibh. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eget tortor risus.
+
+Donec rutrum congue leo eget malesuada.Donec sollicitudin molestie malesuada. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Proin eget tortor risus. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Donec rutrum congue leo eget malesuada. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Donec sollicitudin molestie malesuada. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Nulla porttitor accumsan tincidunt. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Donec sollicitudin molestie malesuada. Sed porttitor lectus nibh. Cras ultricies ligula sed magna dictum porta. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Pellentesque in ipsum id orci porta dapibus. Sed porttitor lectus nibh. Vivamus suscipit tortor eget felis porttitor volutpat. Donec sollicitudin molestie malesuada.
+
+
+\edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus suscipit tortor eget felis porttitor volutpat. Donec sollicitudin molestie malesuada. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vivamus suscipit tortor eget felis porttitor volutpat. Quisque velit nisi, pretium ut lacinia in, elementum id enim. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Nulla quis lorem ut libero malesuada feugiat. Sed porttitor lectus nibh. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla porttitor accumsan tincidunt.
+
+Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Proin eget tortor risus. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Donec sollicitudin molestie malesuada.\stopmsdata\ \msdata{ABCD} Donec sollicitudin molestie malesuada. Proin eget tortor risus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit.
+
+\edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Vivamus suscipit tortor eget felis porttitor volutpat. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Sed porttitor lectus nibh. Vivamus suscipit tortor eget felis porttitor volutpat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec rutrum congue leo eget malesuada. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Cras ultricies ligula sed magna dictum porta. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Proin eget tortor risus. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui.
+
+Nulla quis lorem ut libero malesuada feugiat. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Nulla porttitor accumsan tincidunt. Nulla quis lorem ut libero malesuada feugiat. Donec rutrum congue leo eget malesuada. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Cras ultricies ligula sed magna dictum porta. Cras ultricies ligula sed magna dictum porta. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed porttitor lectus nibh. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Sed porttitor lectus nibh. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eget tortor risus.
+
+Donec rutrum congue leo eget malesuada. Donec sollicitudin molestie malesuada. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Proin eget tortor risus. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Donec rutrum congue leo eget malesuada. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Donec sollicitudin molestie malesuada. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Nulla porttitor accumsan tincidunt. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Donec sollicitudin molestie malesuada. Sed porttitor lectus nibh. Cras ultricies ligula sed magna dictum porta. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Pellentesque in ipsum id orci porta dapibus. Sed porttitor lectus nibh. Vivamus suscipit tortor eget felis porttitor volutpat. Donec sollicitudin molestie malesuada.
+
+
+\edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus suscipit tortor eget felis porttitor volutpat. Donec sollicitudin molestie malesuada. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vivamus suscipit tortor eget felis porttitor volutpat. Quisque velit nisi, pretium ut lacinia in, elementum id enim. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Nulla quis lorem ut libero malesuada feugiat. Sed porttitor lectus nibh. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla porttitor accumsan tincidunt.
+
+Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Proin eget tortor risus. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Donec sollicitudin molestie malesuada. Donec sollicitudin molestie malesuada. Proin eget tortor risus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit.
+
+\edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Vivamus suscipit tortor eget felis porttitor volutpat. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Sed porttitor lectus nibh. Vivamus suscipit tortor eget felis porttitor volutpat. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec rutrum congue leo eget malesuada. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Cras ultricies ligula sed magna dictum porta. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Lorem ipsum dolor sit amet, consectetur adipiscing elit. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} non nulla sit amet nisl tempus convallis quis ac lectus. Proin eget tortor risus. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui.
+
+Nulla quis lorem ut libero malesuada feugiat. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Vestibulum\stopmsdata \msdata{A}ac diam sit amet quam vehicula elementum sed sit amet dui. Nulla porttitor accumsan tincidunt. Nulla quis lorem ut libero malesuada feugiat. Donec rutrum congue leo eget malesuada. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Cras ultricies ligula sed magna dictum porta. Cras ultricies ligula sed magna dictum porta. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} aliquet quam id dui posuere blandit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed porttitor lectus nibh. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Sed porttitor lectus nibh. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin eget tortor risus.
+
+Donec rutrum congue leo eget malesuada. Donec sollicitudin molestie malesuada. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Proin eget tortor risus. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Donec rutrum congue leo eget malesuada. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Donec sollicitudin molestie malesuada. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Vestibulum ac diam sit amet quam vehicula elementum sed sit amet dui. Nulla porttitor accumsan tincidunt. \edtext{Curabitur}{\Bfootnote{Curabibo (C)}} arcu erat, accumsan id imperdiet et, porttitor at sem. Donec sollicitudin molestie malesuada. Sed porttitor lectus nibh. Cras ultricies ligula sed magna dictum porta. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Donec velit neque, auctor sit amet aliquam vel, ullamcorper sit amet ligula. Pellentesque in ipsum id orci porta dapibus. Sed porttitor lectus nibh. Vivamus suscipit tortor eget felis porttitor volutpat. Donec sollicitudin molestie malesuada.\stopmsdata
+
+\endnumbering
+
+
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.tex 2016-06-11 23:16:26 UTC (rev 41379)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.tex 2016-06-11 23:16:49 UTC (rev 41380)
@@ -1,61 +0,0 @@
-\documentclass[12pt]{article}
-\usepackage{libertineotf}
-\usepackage[noend,nofamiliar,noeledsec,series={A}]{reledmac}
-\usepackage{fontspec}
-\usepackage{polyglossia}
-\setmainlanguage{english}
-\setotherlanguage{hebrew}
-
-\newfontfamily{\hebrewfont}[Scale=0.9]{Ezra SIL}
-
-\Xarrangement{paragraph}
-\Xbeforeinserting{\LTR}
-\Xlemmaseparator{[}%Will be reversed by Ezra SIL font
-\Xafterlemmaseparator{0.5em}
-\Xbeforelemmaseparator{0.25em}
-\Xwrapcontent{\textenglish}
-\Xwraplemma{\RL}
-
-\linenumincrement{2}
-\firstlinenum{1}
-
-\title{Editing right-to-left text with left-to-right notes}
-\date{}
-\begin{document}
-\maketitle
-\begin{abstract}
-
-
-In this file, we provide an example of an edition with right-to-left text and left-to-right notes, using \XeLaTeX.
-
-\begin{itemize}
- \item The `hebrew' environment allows us to write Hebrew right-to-left.
- \item The \verb+\Xbeforeinserting{\LTR}+ makes the critical notes to be typeset left-to-right.
- \item The \verb+\Xwraplemma{\RL}+ assures the lemmas, which are in Hebrew, be typeset right-to-left.
- \item The \verb+\Xwrapcontent{\textenglish}+ assures the content of the note is marked as English text.
- \item As the `Ezra SIL' font transforms a `]' to a `[', we use a `[' as lemma separator, that will be typeset as `]' by `Ezra SIL'. So the need for \verb+\Xlemmaseparator+ is not directly linked to reledmac.
-\end{itemize}
-
-\end{abstract}
-
-\begin{hebrew}
-\beginnumbering
-
-
-\pstart
-\edtext{בְּרֵאשִׁ֖ית בָּרָ֣א}{\Afootnote{Some comment}}
-אֱלֹהִ֑ים אֵ֥ת הַשָּׁמַ֖יִם וְאֵ֥ת הָאָֽרֶץ׃
-\edtext{וְהָאָ֗רֶץ הָיְתָ֥ה}{\Afootnote{Some comment}}
- תֹ֨הוּ֙ וָבֹ֔הוּ וְחֹ֖שֶׁךְ עַל־פְּנֵ֣י תְהֹ֑ום וְר֣וּחַ אֱלֹהִ֔ים מְרַחֶ֖פֶת עַל־פְּנֵ֥י הַמָּֽיִם׃
-וַיֹּ֥אמֶר אֱלֹהִ֖ים יְהִ֣י אֹ֑ור וַֽיְהִי־אֹֽור׃
-וַיַּ֧רְא אֱלֹהִ֛ים אֶת־הָאֹ֖ור כִּי־טֹ֑וב וַיַּבְדֵּ֣ל אֱלֹהִ֔ים בֵּ֥ין הָאֹ֖ור וּבֵ֥ין הַחֹֽשֶׁךְ׃
-\edtext{וַיִּקְרָ֨א אֱלֹהִ֤ים׀}{\Afootnote{Some comment}}
- לָאֹור֙ יֹ֔ום וְלַחֹ֖שֶׁךְ קָ֣רָא לָ֑יְלָה וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום אֶחָֽד׃ פ
-\edtext{וַיַּ֤רְא אֱלֹהִים֙}{\Afootnote{Some comment}}
- אֶת־כָּל־אֲשֶׁ֣ר עָשָׂ֔ה וְהִנֵּה־טֹ֖וב מְאֹ֑ד וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום הַשִּׁשִּֽׁי׃ פ
-
-\pend
-\endnumbering
-
-\end{hebrew}
-\end{document}
Added: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf 2016-06-11 23:16:26 UTC (rev 41379)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf 2016-06-11 23:16:49 UTC (rev 41380)
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex 2016-06-11 23:16:49 UTC (rev 41380)
@@ -0,0 +1,61 @@
+\documentclass[12pt]{article}
+\usepackage{libertineotf}
+\usepackage[noend,nofamiliar,noeledsec,series={A}]{reledmac}
+\usepackage{fontspec}
+\usepackage{polyglossia}
+\setmainlanguage{english}
+\setotherlanguage{hebrew}
+
+\newfontfamily{\hebrewfont}[Scale=0.9]{Ezra SIL}
+
+\Xarrangement{paragraph}
+\Xbeforeinserting{\LTR}
+\Xlemmaseparator{[}%Will be reversed by Ezra SIL font
+\Xafterlemmaseparator{0.5em}
+\Xbeforelemmaseparator{0.25em}
+\Xwrapcontent{\textenglish}
+\Xwraplemma{\RL}
+
+\linenumincrement{2}
+\firstlinenum{1}
+
+\title{Editing right-to-left text with left-to-right notes}
+\date{}
+\begin{document}
+\maketitle
+\begin{abstract}
+
+
+In this file, we provide an example of an edition with right-to-left text and left-to-right notes, using \XeLaTeX.
+
+\begin{itemize}
+ \item The `hebrew' environment allows us to write Hebrew right-to-left.
+ \item The \verb+\Xbeforeinserting{\LTR}+ makes the critical notes to be typeset left-to-right.
+ \item The \verb+\Xwraplemma{\RL}+ assures the lemmas, which are in Hebrew, be typeset right-to-left.
+ \item The \verb+\Xwrapcontent{\textenglish}+ assures the content of the note is marked as English text.
+ \item As the `Ezra SIL' font transforms a `]' to a `[', we use a `[' as lemma separator, that will be typeset as `]' by `Ezra SIL'. So the need for \verb+\Xlemmaseparator+ is not directly linked to reledmac.
+\end{itemize}
+
+\end{abstract}
+
+\begin{hebrew}
+\beginnumbering
+
+
+\pstart
+\edtext{בְּרֵאשִׁ֖ית בָּרָ֣א}{\Afootnote{Some comment}}
+אֱלֹהִ֑ים אֵ֥ת הַשָּׁמַ֖יִם וְאֵ֥ת הָאָֽרֶץ׃
+\edtext{וְהָאָ֗רֶץ הָיְתָ֥ה}{\Afootnote{Some comment}}
+ תֹ֨הוּ֙ וָבֹ֔הוּ וְחֹ֖שֶׁךְ עַל־פְּנֵ֣י תְהֹ֑ום וְר֣וּחַ אֱלֹהִ֔ים מְרַחֶ֖פֶת עַל־פְּנֵ֥י הַמָּֽיִם׃
+וַיֹּ֥אמֶר אֱלֹהִ֖ים יְהִ֣י אֹ֑ור וַֽיְהִי־אֹֽור׃
+וַיַּ֧רְא אֱלֹהִ֛ים אֶת־הָאֹ֖ור כִּי־טֹ֑וב וַיַּבְדֵּ֣ל אֱלֹהִ֔ים בֵּ֥ין הָאֹ֖ור וּבֵ֥ין הַחֹֽשֶׁךְ׃
+\edtext{וַיִּקְרָ֨א אֱלֹהִ֤ים׀}{\Afootnote{Some comment}}
+ לָאֹור֙ יֹ֔ום וְלַחֹ֖שֶׁךְ קָ֣רָא לָ֑יְלָה וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום אֶחָֽד׃ פ
+\edtext{וַיַּ֤רְא אֱלֹהִים֙}{\Afootnote{Some comment}}
+ אֶת־כָּל־אֲשֶׁ֣ר עָשָׂ֔ה וְהִנֵּה־טֹ֖וב מְאֹ֑ד וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום הַשִּׁשִּֽׁי׃ פ
+
+\pend
+\endnumbering
+
+\end{hebrew}
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-06-11 23:16:26 UTC (rev 41379)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-06-11 23:16:49 UTC (rev 41380)
@@ -39,6 +39,7 @@
\usepackage{xspace}
\usepackage{doctools}
\usepackage{graphicx,metalogo}
+\usepackage{csquotes}
% Index and Changelog in one column
\makeatletter
\renewenvironment{theglossary}{%
@@ -395,8 +396,14 @@
% \changes{v2.9.2}{2016/04/30}{Fix bug with \protect\package{hyperref} package when a lemma starts with ``plus'' or ``minus'' (bug introduced in v.~2.7.0).}
% \changes{v2.9.3}{2016/05/02}{Fix bug with line number position and reset added by v.~2.9.0}
% \changes{v2.10.0}{2016/05/08}{Add \protect\cs{AtEveryStanza} and \protect\cs{AtEveryStopStanza}.}
-% \changes{v2.10.0}{2016/05/08}{More accurate error messages.}
-% \changes{v2.10.0}{2016/05/08}{Fix bug with \protect\cs{ledlsnotefontsetup} and \protect\cs{ledrsnotefontsetup} when using \protect\cs{color} command inside.}
+% \changes{v2.10.0}{2016/05/08}{More specific error messages.}
+% \changes{v2.10.0}{2016/05/08}{Fix bug in \protect\cs{ledlsnotefontsetup} and \protect\cs{ledrsnotefontsetup} which could not handle \protect\cs{color} command properly.}
+% \changes{v2.10.1}{2016/05/18}{Add `nopenalties` option.}
+% \changes{v2.10.1}{2016/05/18}{Fix bug introduced in v.~1.4: not paragraphed critical footnotes could prevent marginal line number from being displayed}
+% \changes{v2.11.0}{2016/06/02}{Prevent \protect\cs{Xtxtbeforenotes} hook from causing notes to go beyond the bottom margin}
+% \changes{v2.11.0}{2016/06/02}{Make \protect\cs{parafootsepX} work}
+% \changes{v2.11.0}{2016/06/02}{Fix bug in \protect\cs{Xparafootsep} in parallel typesetting}
+% \changes{v2.11.0}{2016/06/02}{Add new tools to produce an apparatus of manuscripts}
% \title{\Macpackage \\
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
@@ -675,11 +682,12 @@
% \begin{description}
% \item[draft] underlines lemmas in the main text.
% \item[eledmac-compat] help to migrate from \eledmac to \reledmac (see \reff{eledmac-compat}).
-% \item[nopbinverse] prevents page breaks inside verses.
-% \item[noquotation] by default, the quotation environment is redefined inside numbered text. You can disable this redefinition with \verb|noquotation| (see \reff{noquotation}).
+% \item[nopenalties] must be called in some cases when using paragraphed endnotes (\reff{nopenalties)}
+% \item[nopbinverse] prevents page break within verse environment.
+% \item[noquotation] by default, the quotation environment is redefined within numbered text. You can disable this redefinition with \verb|noquotation| (see \reff{noquotation}).
% \item[parapparatus] by default, the apparatus cannot contain paragraph breaks; this option enables paragraphing inside the apparatus.
-% \item[xindy] and \verb|xindy+hyperref| are for selecting \verb+xindy+ as the index processor (\reff{xindy}).
% \item[widthliketwocolumns] set the width of the text printed in a single column to be the same as the width of the text printed in two parallel columns with \parpackage. This is useful when alternating between normal and parallel typesetting.
+% \item[xindy] and \verb|xindy+hyperref| select \verb+xindy+ as the index processor (\reff{xindy}).
% \end{description}
%
% \subsection{Optimizing package performance}\label{option:performance}
@@ -1480,6 +1488,66 @@
%}
% \end{verbatim}
%
+% \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.
+% Such lists are referred to as \enquote{apparatuses of manuscripts}.
+%
+% To produce an apparatus of manuscripts with \macpackage, you have to insert specific commands that are used to mark the sections for which only part of the manuscripts are relevant.
+% These commands will be processed, and \textbf{after the second \TeX{} run}, corresponding apparatuses of manuscripts will be inserted in the first (viz. 'A' series) level of footnotes.
+%
+% As the insertion of this apparatus can change the page breaks, you may have to run \TeX{} two or more times.
+% We strongly recommend to use tools like \emph{latexmk} to do that.
+%
+% \subsubsection{Marking sections of text}
+% \DescribeMacro{\msdata}
+% \cs{msdata}\marg{text} must be inserted at the point where a section for which only part of the manuscripts are relevant starts.
+% \meta{text} can be any arbitrary text, viz. a list of the manuscripts that are used for the section that starts.
+% The command must be attached right at the point where the section starts, with no space, like so:
+% \begin{verbatim}
+% \msdata{ABC}Lorem ipsum
+% \end{verbatim}
+% Which means that the section of text starting by \enquote{Lorem ipsum} is witnessed by manuscripts A, B and C.
+%
+% \DescribeMacro{\stopmsdata}
+% \cs{stopmsdata} must be inserted at the point where the section of text previously marked by \cs{msdata} ends.
+% The command must be attached right to the end of the section, with no space.
+% As \cs{stopmsdata} is a \LaTeX\ argumentless macro, it will gobble the following space.
+% To keep that space, you have to either append a backslash followed by a space or \verb+{}+ to \cs{stopmsdata}, like so:
+% \begin{verbatim}
+% \msdata{ABC}Lorem ipsum dolor
+% […]
+% amet\stopmsdata{} \msdata{ABCD}sic transit […]
+% \end{verbatim}
+% Which means that the part of text containing \enquote{Lorem ipsum dolor … amet} is witnessed by manuscripts A, B and C, while the part of text starting by \enquote{sic transit} is witnessed by manuscripts A, B, C and D.
+%
+% \cs{stopmsdata} is also automatically inserted by \cs{msdata}.
+%
+% Note that in most cases, any \cs{stopmsdata} is followed by \cs{msdata}. However, as these two command are usually separated by a space, it may happen that a line break be automatically inserted between them.
+% This is why it is advised to always insert \cs{stopmsdata}, even if \cs{msdata} inserts it in case it is forgotten.
+%
+% \subsubsection{Layout of the apparatus of manuscripts}
+% On every page, the apparatus of manuscripts marks the corresponding section with starting and ending line numbers.
+% However, the following rules will be applied:
+% \begin{itemize}
+% \item If the section does not start on the current page, the starting line number will be the line number of the first line on the page.
+% \item If the section does not stop on the current page, the ending line number will be the line number of the last line on the page.
+% \item If the section neither starts nor ends on the current page, no line number will be printed. The same is true in case both \cs{msdata} is called at the very beginning of the page and \cs{endmsdata} is called at the very end of the page.
+% \end{itemize}
+% \subsubsection{Settings}
+% As the apparatus of manuscripts technically consists of first-level critical notes ('A' series), any setting available for critical notes can be applied (\reff{displayoptions}).
+% However, the following \emph{additional} commands are available.
+%
+% \DescribeMacro{\setmsdataseries}
+% The series used by default for the apparatus of manuscripts is series A.
+% However, you can change it with \cs{setmsdataseries}\marg{series}.
+%
+% \DescribeMacro{\setmsdatalabel}
+% As the apparatus of manuscripts consists of regular critical footnotes, a lemma is associated to them.
+% By default, it is \enquote{Ms.}.
+% You can change it using \cs{setmsdatalabel}\marg{txt}.
+%
% \subsection{Familiar notes} \label{sec:desc:familiar}
%
%
@@ -3330,7 +3398,7 @@
%
% However, if with these options you still have such messages, here are some tricks.
% \begin{description}
-% \item['no room for a new count'] is often caused by a use in conjunction with \protect\package{biblatex}.
+% \item['no room for a new count'] is often caused by \protect\package{biblatex} being used at the same time.
% Load \macpackage (and \parpackage) \emph{before} \protect\package{biblatex}.
% \item['no room for a new write'] can be caused by multiple indexes.
% In this case, use \protect\package{indextools} of \protect\package{imakeidx} with the \verb+splitindex+ option, in order to obtain only one \verb+.idx+ file.
@@ -3379,7 +3447,12 @@
% solutions, described by Michael Downes\index{Downes, Michael},
% but this area remains unsatisfactory.
%
+% \label{nopenalties}If you use more than one series of paragraphed notes, it may happen, in some particular cases, that only the footnote rule, with no accompanying footnotes, be printed.
+% In this case use \reledmac\ package option \option{nopenalties}
+% which should solve the problem, but also may produce widow or orphan lines.
+% For the time being, we have no solution of this problem.
%
+%
%
% \DescribeMacro{\footfudgefiddle}
% For paragraphed footnotes \TeX{} has to estimate the amount of space
@@ -3548,7 +3621,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/05/08 v2.10.0 typeset critical editions]%
+\ProvidesPackage{reledmac}[2016/06/03 v2.11.0a typeset critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -3643,6 +3716,9 @@
\DeclareOptionX{eledmac-compat}{%
\eledmaccompat at true%
}%
+\DeclareOptionX{nopenalties}{%
+ \AtBeginDocument{\let\add at penalties\relax}%
+}
% \end{macrocode}
% We use the starred form of \protect\cs{ProcessOptionsX} which executes options in
% the order listed in the source file: class options, then listed package
@@ -3735,6 +3811,14 @@
\ifdef{\if at RTL}{}{\newif\if at RTL}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\if at firstlineofpage}
+% \cs{if at firstlineofpage} is set to TRUE at the first line of every page.
+% \cs{if at firstlineofpageR} is for the right side.
+% \begin{macrocode}
+\newif\if at firstlineofpage%
+\newif\if at firstlineofpageR%
+% \end{macrocode}
+% \end{macro}
% \subsection{Messages}
%
% All the messages are grouped here as macros. This saves \TeX's memory
@@ -4091,6 +4175,13 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\led at warning@msdatawithoutstop}
+% \begin{macrocode}
+\newcommand{\led at warning@msdatawithoutstop}{%
+ \reledmac at warning{\string\msdata\space without corresponding \string\stopmsdata}%
+}%
+% \end{macrocode}
+% \end{macro}
% \subsection{Gobbling}
% \changes{v1.14.0}{2014/10/27}{Provide \protect\cs{@gobblefour}}
% \changes{v1.14.0}{2014/10/27}{Move gobbling command}
@@ -4344,6 +4435,7 @@
\global\let\sub at change=\relax
\resetprevline@
\resetprevpage at num
+ \global\stopmsdata at inserted@true%
}
% \end{macrocode}
@@ -5250,7 +5342,18 @@
% \begin{macro}{\resetprevpage@}
% \begin{macrocode}
\newcommand*{\resetprevpage at num}{%
- \def\do##1{\ifcsdef{prevpage##1 at num}{\global\csname prevpage##1 at num\endcsname=0}{}}%
+ \def\do##1{%
+ \ifcsdef{prevpage##1 at num}{%
+ \global\csname prevpage##1 at num\endcsname=\z@%
+ \global\csname prevpage##1 at numR\endcsname=\z@%
+ }%
+ {}%
+ \ifcsdef{##1prevpage at num}{%
+ \global\csname ##1prevpage at num\endcsname=\z@%
+ \global\csname ##1prevpage at numR\endcsname=\z@%
+ }%
+ {}%
+ }%
\dolistloop{\@series}%
}
% \end{macrocode}
@@ -5317,6 +5420,14 @@
\global\page at num=\page at num\relax
\global\last at page@num=\last at page@num\relax
\fi
+ \@stopmsd%Security if last \endms{} is forgotten
+ \unless\ifledRcol%Get the last line of the last page
+ \csnumgdef{@lastabsline at forpage@\the\page at num}{\the\absline at num}%
+ \csnumgdef{@lastline at forpage@\the\page at num}{\the\line at num}%
+ \else%
+ \csnumgdef{@lastabsline at forpageR@\the\page at numR}{\the\absline at numR}%
+ \csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
+ \fi%
\endgroup
% \end{macrocode}
%
@@ -5554,6 +5665,8 @@
\ifledRcol
\ifnum #1=\last at page@numR
\else
+ \csnumgdef{@lastabsline at forpageR@\the\page at numR}{\the\absline at numR}%
+ \csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
\ifbypage at R
\line at numR \z@ \subline at numR \z@
\fi
@@ -5564,6 +5677,8 @@
\else
\ifnum #1=\last at page@num
\else
+ \csnumgdef{@lastabsline at forpage@\the\page at num}{\the\absline at num}%
+ \csnumgdef{@lastline at forpage@\the\page at num}{\the\line at num}%
\ifbypage@
\line at num \z@ \subline at num \z@
\fi
@@ -6174,7 +6289,7 @@
\IfStrEq{\led at pb@setting}{after}%
{\xifinlist{\the\absline at num}{\l at prev@nopb}%
{\xifinlist{\the\absline at num}{\normal at page@break}%
- {\numgdef{\@next at page}{\c at page+1}%
+ {\numgdef{\@next at page}{\c at page+\@ne}%
\write\linenum at out{\string\@nl[\@next at page][\@next at page]}%
}%
{\write\linenum at out{\string\@nl[\the\c at page][\thepage]}}%
@@ -6182,10 +6297,10 @@
{\write\linenum at out{\string\@nl[\the\c at page][\thepage]}}}%
{}%
\IfStrEq{\led at pb@setting}{before}%
- {\numdef{\next at absline}{\the\absline at num+1}%
+ {\numdef{\next at absline}{\the\absline at num+\@ne}%
\xifinlist{\next at absline}{\l at prev@nopb}%
{\xifinlist{\the\absline at num}{\normal at page@break}%
- {\numgdef{\nc at page}{\c at page+1}%
+ {\numgdef{\nc at page}{\c at page+\@ne}%
\write\linenum at out{\string\@nl[\nc at page][\nc at page]}%
}%
{\write\linenum at out{\string\@nl[\the\c at page][\thepage]}}%
@@ -6643,7 +6758,7 @@
% \begin{macrocode}
\ifnumberedpar@%
% \end{macrocode}
-% We increase the \cs{@edtext at level} \TeX\ counter to know in which level of \protect\cs{edtext} we are.
+% we increment the \cs{@edtext at level} \TeX\ counter to know in which level of \protect\cs{edtext} we are.
% \begin{macrocode}
\global\advance\@edtext at level by 1%
% \end{macrocode}
@@ -7057,7 +7172,7 @@
% Now, the real code. First, increment the counter corresponding to the argument.
% \begin{macrocode}
\unless\ifledRcol%
- \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+1}%
+ \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+\@ne}%
% \end{macrocode}
% Then, write its value to the numbered file.
% \begin{macrocode}
@@ -7066,7 +7181,7 @@
% Do the same thing if we are in the right columns.
% \begin{macrocode}
\else%
- \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+1}%
+ \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+\@ne}%
\protected at write\linenum at outR{}{\string\@sw{\sw at txt}{\csuse{sw@\sw at txt}}{#1}}%
\fi%
% \end{macrocode}
@@ -7380,7 +7495,7 @@
% \begin{macrocode}
\csnumdef{pstartline}{0}%
\loop\ifvbox\raw at text%
- \csnumdef{pstartline}{\pstartline+1}%
+ \csnumdef{pstartline}{\pstartline+\@ne}%
\do at line%
\ifbypstart@%
\ifnumequal{\pstartline}{1}{%
@@ -7593,12 +7708,23 @@
% \end{macrocode}
% User hook.
% \begin{macrocode}
- \do at insidelinehook%
+ \do at insidelinehook%
% \end{macrocode}
% Left line number
% \begin{macrocode}
- \l at dld@ta%
+ \l at dld@ta%
% \end{macrocode}
+% Prepare text to be inserted before notes.
+% \begin{macrocode}
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+% \end{macrocode}
+% Insert footnotes made of manuscripts data.
+% \begin{macrocode}
+ \insert at msdata%
+% \end{macrocode}
% Restore marginal and footnotes.
% \begin{macrocode}
\add at inserts\affixside at note%
@@ -7619,7 +7745,7 @@
% \end{macrocode}
% Insert, if needed, the hanging symbol.
% \begin{macrocode}
- \inserthangingsymbol %Space keept for backward compatibility
+ \inserthangingsymbol%
% \end{macrocode}
% And so, print the line.
% \begin{macrocode}
@@ -7647,6 +7773,11 @@
% Because of how this prints, a vertical spacing correction is added.
% \begin{macrocode}
\def\print at eledsection{%
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \insert at msdata%
\add at inserts\affixside at note%
\numdef{\temp@}{\l at dnumpstartsL-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
@@ -7840,10 +7971,12 @@
% \begin{macrocode}
\ifnum\next at action>-1001
\global\page at num=\next at action
+ \global\@firstlineofpagetrue%
\ifbypage@
\global\line at num=\z@ \global\subline at num=\z@
\resetprevline@
\fi
+ \add at msdata@firstlineofpage%
% \end{macrocode}
%
% Next, we handle
@@ -7904,35 +8037,38 @@
% This macro handles the fixed codes for \protect\cs{do at actions}. It is
% one big case statement.
% \changes{v0.7.0}{2005/02/24}{Added \protect\cs{do at actions@fixedcode}}
+% \changes{v2.11.0}{2016/06/02}{Add action 1010}
% \begin{macrocode}
\newcommand*{\do at actions@fixedcode}{%
\ifcase\@l at dtempcnta
- \or% % 1001
+ \or% % 1001 = starting sublineation
\global\sublines at true
- \or% % 1002
+ \or% % 1002 = ending sublineation
\global\sublines at false
- \or% % 1003
+ \or% % 1003 = starting locking number
\global\@lock=\@ne
- \or% % 1004
+ \or% % 1004 = ending locking number
\ifnum\@lock=\tw@
\global\@lock=\thr@@
\else
\global\@lock=\z@
\fi
- \or% % 1005
+ \or% % 1005 = starting locking subnumber
\global\sub at lock=\@ne
- \or% % 1006
+ \or% % 1006 = ending locking subnumber
\ifnum\sub at lock=\tw@
\global\sub at lock=\thr@@
\else
\global\sub at lock=\z@
\fi
- \or% % 1007
+ \or% % 1007 = skipping numbering
\l at dskipnumbertrue
- \or% % 1008
+ \or% % 1008 = skipping numbering in stanza
\l at dskipversenumbertrue%
- \or% % 1009
+ \or% % 1009 = hiding number
\l at dhidenumbertrue
+ \or% % 1010 = inserting msdata
+ \add at msdata%
\else
\led at warn@BadAction
\fi}
@@ -8420,7 +8556,42 @@
% \end{macrocode}
% \end{macro}
-%
+% \subsection{Text before notes}
+% \begin{macro}{\set at Xtxtbeforenotes}
+% The \cs{set at Xtxtbeforenotes} macro resets the Xtxtbeforesnotes@\meta{series}@typeset boolean to false. Just before the first note of the \meta{series} in a page, the Xtextbeforenotes will be inserted.
+% \begin{macrocode}
+\newcommand{\set at Xtxtbeforenotes}{%
+ \unless\ifnocritical@%
+ \def\do##1{%
+ \global\togglefalse{Xtxtbeforesnotes@##1 at typeset}%
+ }%
+ \dolistloop{\@series}%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\insert at Xtxtbeforenotes}
+% \cs{insert at Xtxtbeforenotes}\marg{series}, called when inserting a note, will insert the text before the note if it is not already inserted.
+% For paragraphed footnotes, it will insert it as a component of the first footnote.
+% For other types of footnotes, it will insert it as a regular footnote.
+% \begin{macrocode}
+\newcommand{\insert at Xtxtbeforenotes}[1]{%
+ \nottoggle{Xtxtbeforesnotes@#1 at typeset}{%
+ \global\toggletrue{Xtxtbeforesnotes@#1 at typeset}%
+ \ifcsvoid{Xtxtbeforenotes@#1}{}{%
+ \ifcsstring{series at display#1}{paragraph}%
+ {\noindent\csuse{Xtxtbeforenotes@#1}}%
+ {\expandafter\insert\csname#1footins\endcsname%
+ \bgroup%
+ \noindent\strut\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}%
+ \egroup%
+ }%
+ }%
+ }%
+ {}%
+}%
+% \end{macrocode}
+% \end{macro}
% \section{Critical footnotes}
% \label{footnotes}
%
@@ -8691,6 +8862,7 @@
% this note series to format the text of the note.
% \begin{macrocode}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{%
+ \insert at Xtxtbeforenotes{#1}%
\csuse{Xbeforeinserting@#1}%
\insert\csname #1footins\endcsname\bgroup
\hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax%
@@ -8712,6 +8884,7 @@
% \begin{macrocode}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\mpnormalvfootnote}[2]{%
\global\setbox\@nameuse{mp#1footins}\vbox{%
+ \insert at Xtxtbeforenotes{#1}%
\unvbox\@nameuse{mp#1footins}
\noindent\csuse{Xbhooknote@#1}%
\csuse{Xnotefontsize@#1}%
@@ -8792,7 +8965,7 @@
\iftoggle{preXnotes@}{%
\togglefalse{preXnotes@}%
\skip\csname #1footins\endcsname=%
- \dimexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -8812,7 +8985,7 @@
% And now, print the footnote's rule to finish the footnote's introduction.
% \begin{macrocode}
\print at Xfootnoterule{#1}%
- \noindent\leavevmode}
+}%
% \end{macrocode}
% \end{macro}
%
@@ -8824,7 +8997,6 @@
% alteration.
% \begin{macrocode}
\newcommand*{\normalfootgroup}[1]{%
- {\csuse{Xnotefontsize@#1}\noindent\csuse{Xtxtbeforenotes@#1}}%
\csuse{Xbhookgroup@#1}%
\unvbox\csname #1footins\endcsname%
\hsize=\old at hsize%
@@ -8859,7 +9031,6 @@
\print at Xfootnoterule{#1}%%
\fi%
\setlength{\parindent}{0pt}
- {\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}
\csuse{Xbhookgroup@#1}%
\unvbox\csname mp#1footins\endcsname}}
\fi
@@ -8892,6 +9063,7 @@
\newcommand*{\Xarrangement at paragraph}[1]{%
\csgdef{series at display#1}{paragraph}
\expandafter\newcount\csname #1prevpage at num\endcsname
+ \expandafter\newcount\csname #1prevpage at numR\endcsname%
\expandafter\let\csname #1footstart\endcsname=\parafootstart
\expandafter\let\csname v#1footnote\endcsname=\paravfootnote
\expandafter\let\csname #1footfmt\endcsname=\parafootfmt
@@ -8974,7 +9146,7 @@
\iftoggle{preXnotes@}{%
\togglefalse{preXnotes@}%
\skip\csname #1footins\endcsname=%
- \dimexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -9077,6 +9249,7 @@
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen%
\let\bidi at RTL@everypar\@empty%
+ \insert at Xtxtbeforenotes{#1}%
\noindent\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
@@ -9118,6 +9291,7 @@
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen%
\let\bidi at RTL@everypar\@empty%
+ \insert at Xtxtbeforenotes{#1}%
\noindent\color at begingroup%
\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}\color at endgroup}%
@@ -9184,7 +9358,7 @@
% \thetexbook, p.\,399. The only difference is the \protect\cs{unpenalty}
% in \protect\cs{makehboxofhboxes}, which is there to remove the penalty of
% $0$ which was added to the end of each footnote by
-% \protect\cs{para at vfootnote}.
+% \protect\cs{paravfootnote}.
%
% The call to \protect\cs{Xnotefontsize@\meta{s}} is to ensure that the correct
% \protect\cs{baselineskip} for the footnotes is used. The argument is the
@@ -9196,7 +9370,7 @@
\ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}%
\ifcsstring{Xragged@#1}{R}{\RaggedRight}{}%
\makehboxofhboxes
- \setbox0=\hbox{{\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}\unhbox0 \removehboxes}%
+ \setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{Xbhookgroup@#1}%
\csuse{Xnotefontsize@#1}%
\unhbox0\par%
@@ -9233,7 +9407,7 @@
\ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}%
\ifcsstring{Xragged@#1}{R}{\RaggedRight}{}%
\makehboxofhboxes
- \setbox0=\hbox{{\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}\unhbox0 \removehboxes}%
+ \setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{Xbhookgroup@#1}%
\csuse{Xnotefontsize@#1}%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
@@ -9270,16 +9444,29 @@
% \begin{macro}{\Xinsertparafootsep}
% \begin{macrocode}
\newcommand{\Xinsertparafootsep}[1]{%
- \ifnumequal{\csuse{#1prevpage at num}}{\page at num}%
- {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
- {\ifnumequal{\csuse{prevline#1}}{\line at num}%
- {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
- {\csuse{Xparafootsep@#1}}%
- }%
- {\csuse{Xparafootsep@#1}}%
- }%
- {}%
- \global\csname #1prevpage at num\endcsname=\page at num%
+ \ifledRcol@%
+ \ifnumequal{\csuse{#1prevpage at numR}}{\page at numR}%
+ {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+ {\ifnumequal{\csuse{prevline#1}}{\line at numR}%
+ {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {}%
+ \global\csname #1prevpage at numR\endcsname=\page at numR%
+ \else%
+ \ifnumequal{\csuse{#1prevpage at num}}{\page at num}%
+ {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+ {\ifnumequal{\csuse{prevline#1}}{\line at num}%
+ {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {}%
+ \global\csname #1prevpage at num\endcsname=\page at num%
+ \fi%
}
% \end{macrocode}
% \end{macro}
@@ -9481,8 +9668,7 @@
% box. Here, we just print the \protect\cs{line} which comes out of
% \protect\cs{rigidbalance} directly, without any re-boxing.
% \begin{macrocode}
-\newcommand*{\threecolfootgroup}[1]{{\csuse{Xnotefontsize@#1}%
- \noindent\csuse{Xtxtbeforenotes@#1}}%
+\newcommand*{\threecolfootgroup}[1]{%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -9512,7 +9698,6 @@
\setXnotespositionliketwocolumns@{#1}%
\print at Xfootnoterule{#1}%
\fi%
- {\csuse{Xnotefontsize@#1}\noindent\csuse{Xtxtbeforenotes@#1}}%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -9594,8 +9779,7 @@
\strut\par\allowbreak}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\twocolfootgroup}[1]{{\csuse{Xnotefontsize@#1}
- \noindent\csuse{Xtxtbeforenotes@#1}}%
+\newcommand*{\twocolfootgroup}[1]{%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -9635,7 +9819,6 @@
\setXnotespositionliketwocolumns@{#1}%
\print at Xfootnoterule{#1}%
\fi%
- {\csuse{Xnotefontsize@#1}\noindent\csuse{Xtxtbeforenotes@#1}}%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -10574,7 +10757,7 @@
\iftoggle{prenotesX@}{%
\togglefalse{prenotesX@}%
\skip\csname footins#1\endcsname=%
- \dimexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
+ \glueexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
}%
{}%
}%
@@ -10753,7 +10936,8 @@
\newcommand*{\arrangementX at normal}[1]{%
\csgdef{series at displayX#1}{normal}
\expandafter\let\csname footstart#1\endcsname=\normalfootstartX
- \expandafter\newcount\csname prevpage#1 at num\endcsname
+ \expandafter\newcount\csname prevpage#1 at num\endcsname%
+ \expandafter\newcount\csname prevpage#1 at numR\endcsname%
\@namedef{@footnotemark#1}{\normal at footnotemarkX{#1}}
\@namedef{bodyfootmark#1}{\normalbodyfootmarkX{#1}}
\expandafter\let\csname regvfootnote#1\endcsname=\normalvfootnoteX
@@ -11038,7 +11222,8 @@
% \begin{macrocode}
\newcommand*{\arrangementX at paragraph}[1]{%
\csgdef{series at displayX#1}{paragraph}%
- \expandafter\newcount\csname #1prevpage at num\endcsname
+ \expandafter\newcount\csname prevpage#1 at num\endcsname%
+ \expandafter\newcount\csname prevpage#1 at numR\endcsname%
\expandafter\let\csname footstart#1\endcsname=\parafootstartX
\expandafter\let\csname regvfootnote#1\endcsname=\para at vfootnoteX
\expandafter\let\csname footfmt#1\endcsname=\parafootfmtX
@@ -11092,7 +11277,7 @@
\iftoggle{prenotesX@}{%
\togglefalse{prenotesX@}%
\skip\csname footins#1\endcsname=%
- \dimexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
+ \glueexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
}%
{}%
}%
@@ -11234,17 +11419,23 @@
% \end{macro}
% \paragraph{Insertion of the footnotes separator}
% The command \protect\cs{insertparafootsepX}\marg{series} must be called at the beginning of \protect\cs{parafootftmX}.
-% \begin{macro}{\prevpage at num}
-% \begin{macro}{\Xinsertparafootsep}
+% \begin{macro}{\insertparafootsepX}
% \begin{macrocode}
\newcommand{\insertparafootsepX}[1]{%
- \ifnumequal{\csuse{prevpage#1 at num}}{\page at num}%
- {\csuse{parafootsepX@#1}}%
- {}%
+ \ifledRcol@%
+ \ifnumequal{\csuse{prevpage#1 at numR}}{\page at numR}%
+ {\csuse{Xparafootsep@#1}}%
+ {}%
+ \global\csname prevpage#1 at numR\endcsname=\page at numR%
+ \else%
+ \ifnumequal{\csuse{prevpage#1 at num}}{\page at num}%
+ {\csuse{Xparafootsep@#1}}%
+ {}%
+ \global\csname prevpage#1 at num\endcsname=\page at num%
+ \fi%
}
% \end{macrocode}
% \end{macro}
-% \end{macro}
% \subsection{Wrapping footnote marks in hyperlink}
% \begin{macro}{\wrapped at footfootmarkX}
% \cs{wrapped at footfootmarkX} prints the footnote mark of the footpage, wrapped in \package{hyperref} package's commands, if needed.
@@ -12083,7 +12274,10 @@
\csgdef{Xinplaceoflemmaseparator@#1}{1em}%
\csgdef{Xbeforenotes@#1}{1.2em \@plus .6em \@minus .6em}
\csgdef{Xafterrule@#1}{0pt}
+
\csgdef{Xtxtbeforenotes@#1}{}
+ \newtoggle{Xtxtbeforesnotes@#1 at typeset}%Not directly used by user, but internal
+
\csgdef{Xmaxhnotes@#1}{0.8\vsize}
\newtoggle{Xnoteswidthliketwocolumns@#1}%
\csgdef{Xparafootsep@#1}{}%
@@ -12891,7 +13085,7 @@
% Now we begin the output routine and associated things.
%
%
-% \subsubsection{Page number management}
+% \subsection{Page number management}
% \begin{macro}{\pageno}
% \begin{macro}{\advancepageno}
% \protect\cs{pageno} is a page number, starting at 1, and \protect\cs{advancepageno}
@@ -12906,7 +13100,7 @@
% \end{macro}
%
%
-% \subsubsection{Extra footnotes output}
+% \subsection{Extra footnotes output}
%
% With luck we might only have to change \protect\cs{@makecol} and
% \protect\cs{@reinserts} of the \LaTeX's kernel.
@@ -13070,7 +13264,7 @@
% \end{macro}
% \end{macro}
%
-% \subsubsection{Standard output's commands patching}
+% \subsection{Patching standard output of commands}
% The \protect\ltxclass{memoir} class does not use the `standard' versions of
% \protect\cs{@makecol} and \protect\cs{@reinserts}, due to its sidebar insert.
% We had better add that code if \protect\ltxclass{memoir} is used. (It can
@@ -14268,7 +14462,7 @@
\ledlsnotefontsetup%We kept it outside of the vbox, because can affect the ragging
\global\setbox\l at dlp@rbox%
\ifleftnoteup%
- =\vbox to\z@{{\ledlsnotefontsetup\vss #1}}%We put \ledlsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local.
+ =\vbox to\z@{{\ledlsnotefontsetup\vss #1}}%We put \ledlsnotefontsetup inside footnote because required for color command. Note the {} to keep setting local.
\else%
=\vbox to 0.70\baselineskip{{\ledlsnotefontsetup\strut#1\vss}}%
\fi%
@@ -14281,7 +14475,7 @@
\ledrsnotefontsetup%We kept it outside of the vbox, because can affect the ragging
\global\setbox\l at drp@rbox%
\ifrightnoteup%
- =\vbox to\z@{{\ledrsnotefontsetup\vss#1}}%We put \ledrsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local.
+ =\vbox to\z@{{\ledrsnotefontsetup\vss#1}}%We put \ledrsnotefontsetup inside footnote because required for color command. Note the {} to keep setting local.
\else%
=\vbox to0.7\baselineskip{{\ledrsnotefontsetup\strut#1\vss}}%
\fi%
@@ -14318,7 +14512,7 @@
\appto\sidenotecontent@{##1}}% Not print not separator before the 1st note
{\appto\sidenotecontent@{\@sidenotesep ##1}%
}%
- \numgdef{\itemcount@}{\itemcount at +1}%
+ \numgdef{\itemcount@}{\itemcount at +\@ne}%
}%
\dolistloop{\l at dcsnotetext}%
\ifnumgreater{\itemcount@}{1}{\led at err@ManySidenotes}{}%
@@ -15526,7 +15720,362 @@
%
%
%
+% \section{Apparatus of Manuscripts}
+% \subsection{User level macro}
+% \begin{macro}{\msdata}
+% The user level \cs{msdata} command only writes the manuscripts data in numbered auxiliary file.
+% \begin{macrocode}
+\newcommand{\msdata}[1]{%
+ \leavevmode%
+ \unless\ifstopmsdata at inserted@%
+ \stopmsdata%
+ \led at warning@msdatawithoutstop%
+ \fi%
+ \global\stopmsdata at inserted@false%
+ \unless\ifledRcol%
+ \protected at write\linenum at out{}{%
+ \string\@msd{#1}%
+ }%
+ \else%
+ \protected at write\linenum at outR{}{%
+ \string\@msd{#1}%
+ }%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\stopmsdata}
+% The user level \cs{stopmsdata} command only writes information about the end of manuscripts data in numbered auxiliary file.
+% \begin{macrocode}
+\newcommand{\stopmsdata}[0]{%
+ \leavevmode%
+ \unless\ifledRcol%
+ \protected at write\linenum at out{}{%
+ \string\@stopmsd%
+ }%
+ \else%
+ \protected at write\linenum at outR{}{%
+ \string\@stopmsd%
+ }%
+ \fi%
+ \global\stopmsdata at inserted@true%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\ifstopmsdata at inserted@}
+% The \cs{ifstopmsdata at inserted@} boolean is set to TRUE at every \cs{stopmsdata} and reset to FALSE at all \cs{msdata}. It also set to TRUE at every \cs{beginnumbering}.
+% It is used to automatically insert \cs{stopmsdata} if forgotten before \cs{msdata}
+% \begin{macrocode}
+\newif\ifstopmsdata at inserted@%
+% \end{macrocode}
+% \end{macro}
+% \subsection{Setting macro}
+% Setting macros for the manuscripts apparatus tools is very easy: they just save their argument in an internal macro.
+% \begin{macro}{\setmsdataseries}
+% In which series of notes will be printed the apparatus of manuscripts?
+% \begin{macrocode}
+\newcommand{\setmsdataseries}[1]{%
+ \gdef\@msdata at series{#1}%
+}%
+\def\@msdata at series{A}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\setmsdatalabel}
+% The label for the manuscripts data.
+% \begin{macrocode}
+\def\ms at data@label{Ms.}%
+\newcommand{\setmsdatalabel}[1]{%
+ \gdef\ms at data@label{#1}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \subsection{Counters and lists}
+% \begin{macro}{\@msd at c}
+% \cs{@msd at c} is a counter incremented at each \cs{@msd} read in auxiliary file.
+% \begin{macrocode}
+\numdef{\@msd at c}{0}
+\numdef{\@msd at cR}{0}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@msd at c}
+% \cs{add at msd@} is a counter incremented at each \cs{add at msddata}, that is at each time we prepare the insertion of manuscripts data footnote.
+% \begin{macrocode}
+\numdef{\add at msd@c}{0}%
+\numdef{\add at msd@cR}{0}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@msdata at list}
+% The \cs{@msdata at list} will contain, for each line, the lists of command to be executed to insert the manuscripts apparatus.
+% It will be filled on \cs{add at msdata} and looped on \cs{insert at msdata}, then emptied.
+% \begin{macrocode}
+\def\@msdata at list{}%
+% \end{macrocode}
+% \end{macro}
+% \subsection{Auxiliary file macros}
+% \begin{macro}{\@msd}
+% The \cs{@msd} macro is written in the auxiliary file.
+% It just defines three macros by \cs{msdata} macro, which allow us to know the manuscripts data, the line number and the absolute line number where it was called
%
+% It also stores the action code $1010$ in the list of actions by line.
+% \begin{macrocode}
+\newcommand{\@msd}[1]{%
+ \unless\ifledRcol%
+ \numdef{\@msd at c}{\@msd at c+\@ne}%
+ \csgdef{@msdata@\@msd at c @data}{#1}%
+ \csxdef{@msdata@\@msd at c @linenumber}{\the\line at num}%
+ \csxdef{@msdata@\@msd at c @abslinenumber}{\the\absline at num}%
+ \xright at appenditem{\the\absline at num}\to\actionlines at list%
+ \xright at appenditem{-1010}\to\actions at list%
+ \else%
+ \numdef{\@msd at cR}{\@msd at cR+\@ne}%
+ \csgdef{@msdata@\@msd at cR @dataR}{#1}%
+ \csxdef{@msdata@\@msd at cR @linenumberR}{\the\line at numR}%
+ \csxdef{@msdata@\@msd at cR @abslinenumberR}{\the\absline at numR}%
+ \xright at appenditem{\the\absline at numR}\to\actionlines at listR%
+ \xright at appenditem{-1010}\to\actions at listR%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\@endmsd}
+% 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]{%
+ \unless\ifledRcol%
+ \ifcsundef{@msdata@\@msd at c @stoplinenumber}{%
+ \csxdef{@msdata@\@msd at c @stopabslinenumber}{\the\absline at num}%
+ \csxdef{@msdata@\@msd at c @stoplinenumber}{\the\line at num}%
+ }{}%
+ \else%
+ \ifcsundef{@msdata@\@msd at cR @stoplinenumberR}{%
+ \csxdef{@msdata@\@msd at cR @stopabslinenumberR}{\the\absline at numR}%
+ \csxdef{@msdata@\@msd at cR @stoplinenumberR}{\the\line at numR}%
+ }%
+ {}%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
+% \subsection{Action macro}
+% \begin{macro}{\add at msdata}
+% \cs{add at 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 at list}.
+% \begin{macrocode}
+\newcommand{\add at msdata}{%
+ \bgroup%
+ \normalfont%
+ \unless\ifledRcol@%
+ \numgdef{\add at msd@c}{\add at msd@c+\@ne}%
+ \ifcsdef{@msdata@\add at msd@c @data}{%
+ \letcs{\@data}{@msdata@\add at msd@c @data}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \csuse{@msdata@\add at msd@c @linenumber}|% Start line number
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@c @stopabslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {\csuse{@msdata@\add at msd@c @stoplinenumber}}%End line number if in the same page
+ {\csuse{@lastline at forpage@\the\page at num}}%Otherwiser, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \if at firstlineofpage%Try if the data are for the full page. If yes, will add options to the list.
+ \unless\if at msdata@insertedfrompreviouspage%
+ \ifnumless{\csuse{@lastabsline at forpage@\the\page at num}}{\csuse{@msdata@\add at msd@c @stopabslinenumber}+\@ne}%
+ {%
+ \numdef{\@tmp}{\add at msd@c+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumber}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \fi%
+ \fi%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {}%
+ \else%
+ \numgdef{\add at msd@cR}{\add at msd@cR+\@ne}%
+ \ifcsdef{@msdata@\add at msd@cR @dataR}{%
+ \letcs{\@data}{@msdata@\add at msd@cR @dataR}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \csuse{@msdata@\add at msd@cR @linenumberR}|% Start line number
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}}{\csuse{@lastline at forpageR@\the\page at numR}}%
+ {\csuse{@msdata@\add at msd@cR @stoplinenumberR}}%End line number if in the same page
+ {\csuse{@lastline at forpageR@\the\page at numR}}%Otherwiser, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \if at firstlineofpageR%
+ \unless\if at msdata@insertedfrompreviouspage%
+ \ifnumless{\csuse{@lastabsline at forpageR@\the\page at numR}}{\csuse{@msdata@\add at msd@c @stopabslinenumberR}+\@ne}%
+ {%
+ \numdef{\@tmp}{\add at msd@cR+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumberR}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumberR}}{\csuse{@lastabsline at forpageR@\the\page at numR}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \fi%
+ \fi%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {}%
+ \fi%
+ \egroup%
+}%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\if at msdata@insertedfrompreviouspage}
+% The \cs{if at msdata@insertedfrompreviouspage} boolean is set to TRUE if \macpackage\ automatically inserts data from previous page in the first line of a page.
+% \begin{macrocode}
+\newif\if at msdata@insertedfrompreviouspage%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\add at msdata@firstlineofpage}
+% \cs{add at msdata@firstlineofpage} is called at the first line of every page. It inserts manuscript data which start on one of the previous pages and continue on this page.
+% \begin{macrocode}
+\newcommand{\add at msdata@firstlineofpage}{%
+ \bgroup%
+ \normalfont%
+ \unless\ifledRcol@%
+ \ifcsdef{@msdata@\add at msd@c @data}{%
+ \ifnumless{\the\absline at num-\@ne}{\csuse{@msdata@\add at msd@c @stopabslinenumber}}%
+ {%
+ \global\@msdata at insertedfrompreviouspagetrue%
+ \letcs{\@data}{@msdata@\add at msd@c @data}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \numexpr\the\line at num+\@ne\relax|% Start line number = first line of the page. As \add at msdata@firstlineofpage is called before line number has been incremented, we increment it for printing
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@c @stopabslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {\csuse{@msdata@\add at msd@c @stoplinenumber}}%End line number if in the same page
+ {\csuse{@lastline at forpage@\the\page at num}}%Otherwise, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \ifnumless{\csuse{@lastabsline at forpage@\the\page at num}}{\csuse{@msdata@\add at msd@c @stopabslinenumber}+\@ne}%We will test if the ms data is for the full page
+ {%
+ \numdef{\@tmp}{\add at msd@c+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumber}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {\global\@msdata at insertedfrompreviouspagefalse}%
+ }{}%
+ \else%
+ \ifcsdef{@msdata@\add at msd@cR @dataR}{%
+ \ifnumless{\the\absline at numR-\@ne}{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}}%
+ {%
+ \global\@msdata at insertedfrompreviouspagetrue%
+ \letcs{\@data}{@msdata@\add at msd@cR @dataR}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \numexpr\the\line at numR+\@ne\relax|% Start line number = first line of the page. As \add at msdata@firstlineofpage is called before line number has been incremented, we increment it for printing
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}}{\csuse{@lastline at forpageR@\the\page at numR}}%
+ {\csuse{@msdata@\add at msd@cR @stoplinenumberR}}%End line number if in the same page
+ {\csuse{@lastline at forpageR@\the\page at numR}}%Otherwise, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \ifnumless{\csuse{@lastabsline at forpageR@\the\page at numR}}{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}+\@ne}%
+ {%
+ \numdef{\@tmp}{\add at msd@cR+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumberR}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumberR}}{\csuse{@lastabsline at forpageR@\the\page at numR}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {\global\@msdata at insertedfrompreviouspagefalse}%
+ }{}%
+ \fi%
+ \egroup%
+}%
+% \end{macrocode}
+% \end{macro}
+% \subsection{Inserting footnote}
+% Just before inserting standard insert (familiar and critical footnotes, sidenotes), we call \cs{insert at msdata} to insert manuscripts data's footnotes.
+% \begin{macro}{\insert at msdata}
+% \begin{macrocode}
+\newcommand{\insert at msdata}{%
+ \def\do##1{##1}%
+ \dolistloop{\@msdata at list}%
+ \global\let\@msdata at list\relax%
+}%
+% \end{macrocode}
+% \end{macro}
+% \subsection{Other}
+% \begin{macro}{\@msd at options@iffullpage}
+% \begin{macro}{\reset at msd@options at iffullpage}
+% \cs{@msd at options@iffullpage} sets some options if the manuscripts data are for all the page.
+% \cs{reset at msd@options at iffullpage} resets them after the footnote.
+% \cs{if at msd@options at fullpage} is switch to true in \protect{add at msdata@firstlineofpage} if these option must be inserted.
+% \begin{macrocode}
+\newif\if at msd@options at fullpage%
+\newcommand{\@msd at options@iffullpage}[0]{%
+ \if at msd@options at fullpage%
+ \noexpand\toggletrue{nonum@}%
+ \ifdefvoid{\ms at data@label}%
+ {\noexpand\toggletrue{nosep@}}%
+ {}%
+ \fi%
+}%
+\newcommand{\reset at msd@options at iffullpage}[0]{%
+ \noexpand\togglefalse{nonum@}%
+ \noexpand\togglefalse{nosep@}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \section{Arrays and tables}
% \subsection{Preamble: macro as environment}
%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-06-11 23:16:26 UTC (rev 41379)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-06-11 23:16:49 UTC (rev 41380)
@@ -271,7 +271,9 @@
% \changes{v2.8.0}{2016/03/23}{Fix bug when the right line number style is not the same to the left line number style}
% \changes{v2.8.0}{2016/03/23}{Add \protect\cs{linenumberLevenifblanktrue} and \protect\cs{linenumberRevenifblank} commands}
% \changes{v2.9.0}{2016/05/08}{Add \protect\cs{AtEveryStanza} and \protect\cs{AtEveryStopStanza}.}
-% \changes{v2.9.0}{2016/05/08}{More accurate error messages.}
+% \changes{v2.9.0}{2016/05/08}{More specific error messages.}
+% \changes{v2.9.1}{2016/05/25}{Prevent \protect\cs{Xtxtbeforenotes} hook from causing notes to go beyond the bottom margin}
+% \changes{v2.10.0}{2016/06/02}{Add new tools to make apparatuses of manuscripts}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -474,12 +476,12 @@
% The general scheme for parallel columns looks like this:
% \begin{verbatim}
% \begin{pairs}
-% \begin{Leftside} reledmac numbering text command \end{Leftside}
-% \begin{Rightside} reledmac numbering text command \end{Rightside}
+% \begin{Leftside} reledmac numbered text commands \end{Leftside}
+% \begin{Rightside} reledmac numbered text commands \end{Rightside}
% \end{pairs}
% \Columns
% \begin{pairs}
-% \begin{Leftside} reledmac numbering text command \end{Leftside}
+% \begin{Leftside} reledmac numbered text commands \end{Leftside}
% ...
% \end{pairs}
% \Columns
@@ -566,9 +568,9 @@
% The general scheme for parallel pages looks like this:
% \begin{verbatim}
% \begin{pages}
-% \begin{Leftside} reledmac numbering text command \end{Leftside}
-% \begin{Rightside} reledmac numbering text command \end{Rightside}
-% \begin{Leftside} reledmac numbering text command \end{Leftside}
+% \begin{Leftside} reledmac numberied text commands \end{Leftside}
+% \begin{Rightside} reledmac numbered text commands \end{Rightside}
+% \begin{Leftside} reledmac numbered text commands \end{Leftside}
% ...
% \end{pages}
% \Pages
@@ -1172,7 +1174,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/05/08 v2.9.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/06/03 v2.10.0a reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1497,6 +1499,7 @@
\global\sublines at false
\global\let\next at page@numR\relax
\global\let\sub at change\relax
+ \global\stopmsdata at inserted@true%
\set at continuousnumberingforR%
\message{Section \the\section at numR R }%
\line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
@@ -3409,7 +3412,15 @@
\affixline at num%
\fi%
\xifinlist{\the\l at dpscL}{\eled at sections@@}%
- {\add at inserts\affixside at note}%
+ {%
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \add at inserts%
+ \insert at msdata%
+ \affixside at note%
+ }%
{\print at lineL}%
}%
\add at penaltiesL%
@@ -3422,7 +3433,7 @@
\getline at numL%
\affixline at num%
\setbox\l at dleftbox \hb at xt@ \Lcolwidth{%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
\hspace*{\Lcolwidth}%
\ledrlfill\l at drd@ta%
}%
@@ -3443,9 +3454,14 @@
% \begin{macrocode}
\def\print at lineL{%
\affixpstart at numL%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \insert at msdata%
\add at inserts\affixside at note%
- \l at dlsn@te %space kept for backward compatibility
+ \l at dlsn@te%
\hb at xt@ \Lcolwidth{\ledllfill\hb at xt@ \wd\one at line{%
\do at insidelineLhook%
\ifluatex%
@@ -3454,7 +3470,7 @@
\new at lineL%
\inserthangingsymbolL%
\l at dunhbox@line{\one at line}}\ledrlfill\l at drd@ta%
- \l at drsn@te}}
+ \l at drsn@te}}%
% \end{macrocode}
% \end{macro}
@@ -3568,7 +3584,15 @@
\affixline at numR%
\fi%
\xifinlist{\the\l at dpscR}{\eled at sectionsR@@}%
- {\add at insertsR\affixside at noteR}%
+ {%
+ \if at firstlineofpageR%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpageRfalse%
+ \fi%
+ \insert at msdata%
+ \add at insertsR%
+ \affixside at noteR%
+ }%
{\print at lineR}%
}%
\add at penaltiesR%
@@ -3581,7 +3605,7 @@
\getline at numR%
\setbox\l at drightbox \hb at xt@ \Rcolwidth{%
\affixline at numR%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
\hspace*{\Rcolwidth}%
\ledrlfill\l at drd@ta%
}%
@@ -3604,9 +3628,14 @@
% \changes{v1.12.0}{2015/02/23}{Compatibility with \LuaLaTeX\ RTL languages.}
\def\print at lineR{%
\affixpstart at numR%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
+ \if at firstlineofpageR%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpageRfalse%
+ \fi%
+ \insert at msdata%
\add at insertsR\affixside at noteR%
- \l at dlsn@te %space kept for backward compatibility
+ \l at dlsn@te%
\hb at xt@ \Rcolwidth{\ledllfill\hb at xt@ \wd\one at lineR{%
\do at insidelineRhook%
\new at lineR%
@@ -3731,38 +3760,41 @@
% It may call itself recursively and we use tail recursion, via
% \protect\cs{do at actions@nextR} for this.
% \changes{v0.3.0}{2005/02/24}{Used \protect\cs{do at actions@fixedcode} in \protect\cs{do at actionsR}}
-% \changes{v1.15.0}{2015/04/13}{Add action 1008 and 1009}
+% \changes{v1.15.0}{2015/04/13}{Add actions 1008 and 1009}
+% \changes{v2.10.0}{2016/06/02}{Add action 1010}
% \begin{macrocode}
\newif\ifl at dskipversenumberR
\newcommand*{\do at actions@fixedcodeR}{%
\ifcase\@l at dtempcnta%
- \or% % 1001
+ \or% % 1001 = starting sublineation
\global\sublines at true
- \or% % 1002
+ \or% % 1002 = ending sublineation
\global\sublines at false
- \or% % 1003
+ \or% % 1003 = starting locking number
\global\@lockR=\@ne
- \or% % 1004%
+ \or% % 1004 = ending locking number
\ifnum\@lockR=\tw@
\global\@lockR=\thr@@
\else
\global\@lockR=\z@
\fi
- \or% % 1005
+ \or% % 1005 = starting locking subnumber
\global\sub at lockR=\@ne
- \or% % 1006
+ \or% % 1006 = ending locking subnumber
\ifnum\sub at lockR=\tw@
\global\sub at lockR=\thr@@
\else
\global\sub at lockR=\z@
\fi
- \or% % 1007
+ \or% % 1007 = skipping numbering
\l at dskipnumbertrue
- \or% % 1008
+ \or% % 1008 = skipping numbering in stanza
\l at dskipversenumberRtrue%
- \or% % 1009
+ \or% % 1009 = hiding number
\l at dhidenumbertrue%
+ \or% % 1010 = inserting msdata
+ \add at msdata%
\else%
\led at warn@BadAction
\fi%
@@ -3774,10 +3806,12 @@
\@l at dtempcntb=\absline at numR
\ifnum\@l at dtempcntb<\next at actionlineR\else
\ifnum\next at actionR>-1001\relax
+ \@firstlineofpageRtrue%
\global\page at numR=\next at actionR
\ifbypage at R
\global\line at numR \z@ \global\subline at numR \z@
\fi
+ \add at msdata@firstlineofpage%
\else
\ifnum\next at actionR<-4999\relax % 9/05 added relax here
\@l at dtempcnta=-\next at actionR
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-06-11 23:16:26 UTC (rev 41379)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-06-11 23:16:49 UTC (rev 41380)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/05/08 v2.10.0 typeset critical editions]%
+\ProvidesPackage{reledmac}[2016/06/03 v2.11.0a typeset critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -99,6 +99,9 @@
\DeclareOptionX{eledmac-compat}{%
\eledmaccompat at true%
}%
+\DeclareOptionX{nopenalties}{%
+ \AtBeginDocument{\let\add at penalties\relax}%
+}
\ProcessOptionsX*\relax
\RequirePackage{xargs}
@@ -129,6 +132,8 @@
\let\imki at wrindexentry\indtl at wrindexentry%
}{}%
\ifdef{\if at RTL}{}{\newif\if at RTL}
+\newif\if at firstlineofpage%
+\newif\if at firstlineofpageR%
\newcommand{\reledmac at warning}[1]{\PackageWarning{reledmac}{#1}}
\newcommand{\reledmac at error}[2]{\PackageError{reledmac}{#1}{#2}}
\newcommand*{\led at err@NumberingStarted}{%
@@ -285,6 +290,9 @@
\newcommand{\led at warning@Xhsize at deprecated}{%
\reledmac at warning{\string\Xhsize\space command deprecated, use \string\Xwidth\space instead.}%
}%
+\newcommand{\led at warning@msdatawithoutstop}{%
+ \reledmac at warning{\string\msdata\space without corresponding \string\stopmsdata}%
+}%
\providecommand*{\@gobblethree}[3]{}
\providecommand*{\@gobblefour}[4]{}
\providecommand*{\@gobblefive}[5]{}
@@ -361,6 +369,7 @@
\global\let\sub at change=\relax
\resetprevline@
\resetprevpage at num
+ \global\stopmsdata at inserted@true%
}
\def\endnumbering{%
@@ -657,7 +666,18 @@
\dolistloop{\@series}%
}
\newcommand*{\resetprevpage at num}{%
- \def\do##1{\ifcsdef{prevpage##1 at num}{\global\csname prevpage##1 at num\endcsname=0}{}}%
+ \def\do##1{%
+ \ifcsdef{prevpage##1 at num}{%
+ \global\csname prevpage##1 at num\endcsname=\z@%
+ \global\csname prevpage##1 at numR\endcsname=\z@%
+ }%
+ {}%
+ \ifcsdef{##1prevpage at num}{%
+ \global\csname ##1prevpage at num\endcsname=\z@%
+ \global\csname ##1prevpage at numR\endcsname=\z@%
+ }%
+ {}%
+ }%
\dolistloop{\@series}%
}
\newread\@inputcheck
@@ -675,6 +695,14 @@
\global\page at num=\page at num\relax
\global\last at page@num=\last at page@num\relax
\fi
+ \@stopmsd%Security if last \endms{} is forgotten
+ \unless\ifledRcol%Get the last line of the last page
+ \csnumgdef{@lastabsline at forpage@\the\page at num}{\the\absline at num}%
+ \csnumgdef{@lastline at forpage@\the\page at num}{\the\line at num}%
+ \else%
+ \csnumgdef{@lastabsline at forpageR@\the\page at numR}{\the\absline at numR}%
+ \csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
+ \fi%
\endgroup
\ifledRcol
\global\page at numR=\m at ne
@@ -784,6 +812,8 @@
\ifledRcol
\ifnum #1=\last at page@numR
\else
+ \csnumgdef{@lastabsline at forpageR@\the\page at numR}{\the\absline at numR}%
+ \csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
\ifbypage at R
\line at numR \z@ \subline at numR \z@
\fi
@@ -794,6 +824,8 @@
\else
\ifnum #1=\last at page@num
\else
+ \csnumgdef{@lastabsline at forpage@\the\page at num}{\the\absline at num}%
+ \csnumgdef{@lastline at forpage@\the\page at num}{\the\line at num}%
\ifbypage@
\line at num \z@ \subline at num \z@
\fi
@@ -1109,7 +1141,7 @@
\IfStrEq{\led at pb@setting}{after}%
{\xifinlist{\the\absline at num}{\l at prev@nopb}%
{\xifinlist{\the\absline at num}{\normal at page@break}%
- {\numgdef{\@next at page}{\c at page+1}%
+ {\numgdef{\@next at page}{\c at page+\@ne}%
\write\linenum at out{\string\@nl[\@next at page][\@next at page]}%
}%
{\write\linenum at out{\string\@nl[\the\c at page][\thepage]}}%
@@ -1117,10 +1149,10 @@
{\write\linenum at out{\string\@nl[\the\c at page][\thepage]}}}%
{}%
\IfStrEq{\led at pb@setting}{before}%
- {\numdef{\next at absline}{\the\absline at num+1}%
+ {\numdef{\next at absline}{\the\absline at num+\@ne}%
\xifinlist{\next at absline}{\l at prev@nopb}%
{\xifinlist{\the\absline at num}{\normal at page@break}%
- {\numgdef{\nc at page}{\c at page+1}%
+ {\numgdef{\nc at page}{\c at page+\@ne}%
\write\linenum at out{\string\@nl[\nc at page][\nc at page]}%
}%
{\write\linenum at out{\string\@nl[\the\c at page][\thepage]}}%
@@ -1375,10 +1407,10 @@
\leavevmode%
\get at sw@txt{#2}%
\unless\ifledRcol%
- \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+1}%
+ \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+\@ne}%
\protected at write\linenum at out{}{\string\@sw{\sw at txt}{\csuse{sw@\sw at txt}}{#1}}%
\else%
- \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+1}%
+ \csnumgdef{sw@\sw at txt}{\csuse{sw@\sw at txt}+\@ne}%
\protected at write\linenum at outR{}{\string\@sw{\sw at txt}{\csuse{sw@\sw at txt}}{#1}}%
\fi%
#2%
@@ -1542,7 +1574,7 @@
\global\par at line=0%
\csnumdef{pstartline}{0}%
\loop\ifvbox\raw at text%
- \csnumdef{pstartline}{\pstartline+1}%
+ \csnumdef{pstartline}{\pstartline+\@ne}%
\do at line%
\ifbypstart@%
\ifnumequal{\pstartline}{1}{%
@@ -1634,8 +1666,13 @@
\def\print at line{
\affixpstart at num%
\hb at xt@ \linewidth{%
- \do at insidelinehook%
- \l at dld@ta%
+ \do at insidelinehook%
+ \l at dld@ta%
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \insert at msdata%
\add at inserts\affixside at note%
\l at dlsn@te
{\ledllfill\hb at xt@ \wd\one at line{\new at line%
@@ -1642,7 +1679,7 @@
\ifluatex%
\textdir\l at luatextextdir@L%
\fi%
- \inserthangingsymbol %Space keept for backward compatibility
+ \inserthangingsymbol%
\l at dunhbox@line{\one at line}}%
\ledrlfill\l at drd@ta%
\l at drsn@te
@@ -1650,6 +1687,11 @@
\add at penalties%
}
\def\print at eledsection{%
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \insert at msdata%
\add at inserts\affixside at note%
\numdef{\temp@}{\l at dnumpstartsL-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
@@ -1720,10 +1762,12 @@
\ifnum\absline at num<\next at actionline\else
\ifnum\next at action>-1001
\global\page at num=\next at action
+ \global\@firstlineofpagetrue%
\ifbypage@
\global\line at num=\z@ \global\subline at num=\z@
\resetprevline@
\fi
+ \add at msdata@firstlineofpage%
\else
\ifnum\next at action<-4999
\@l at dtempcnta=-\next at action
@@ -1751,32 +1795,34 @@
\newcommand*{\do at actions@fixedcode}{%
\ifcase\@l at dtempcnta
- \or% % 1001
+ \or% % 1001 = starting sublineation
\global\sublines at true
- \or% % 1002
+ \or% % 1002 = ending sublineation
\global\sublines at false
- \or% % 1003
+ \or% % 1003 = starting locking number
\global\@lock=\@ne
- \or% % 1004
+ \or% % 1004 = ending locking number
\ifnum\@lock=\tw@
\global\@lock=\thr@@
\else
\global\@lock=\z@
\fi
- \or% % 1005
+ \or% % 1005 = starting locking subnumber
\global\sub at lock=\@ne
- \or% % 1006
+ \or% % 1006 = ending locking subnumber
\ifnum\sub at lock=\tw@
\global\sub at lock=\thr@@
\else
\global\sub at lock=\z@
\fi
- \or% % 1007
+ \or% % 1007 = skipping numbering
\l at dskipnumbertrue
- \or% % 1008
+ \or% % 1008 = skipping numbering in stanza
\l at dskipversenumbertrue%
- \or% % 1009
+ \or% % 1009 = hiding number
\l at dhidenumbertrue
+ \or% % 1010 = inserting msdata
+ \add at msdata%
\else
\led at warn@BadAction
\fi}
@@ -1991,6 +2037,29 @@
\def\body{#1\expandafter\body\fi}%
\body}
+\newcommand{\set at Xtxtbeforenotes}{%
+ \unless\ifnocritical@%
+ \def\do##1{%
+ \global\togglefalse{Xtxtbeforesnotes@##1 at typeset}%
+ }%
+ \dolistloop{\@series}%
+ \fi%
+}%
+\newcommand{\insert at Xtxtbeforenotes}[1]{%
+ \nottoggle{Xtxtbeforesnotes@#1 at typeset}{%
+ \global\toggletrue{Xtxtbeforesnotes@#1 at typeset}%
+ \ifcsvoid{Xtxtbeforenotes@#1}{}{%
+ \ifcsstring{series at display#1}{paragraph}%
+ {\noindent\csuse{Xtxtbeforenotes@#1}}%
+ {\expandafter\insert\csname#1footins\endcsname%
+ \bgroup%
+ \noindent\strut\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}%
+ \egroup%
+ }%
+ }%
+ }%
+ {}%
+}%
\def\select at lemmafont#1|#2|#3|#4|#5|#6|#7|{\select@@lemmafont#7|}
\def\select@@lemmafont#1/#2/#3/#4|%
{\fontencoding{#1}\fontfamily{#2}\fontseries{#3}\fontshape{#4}%
@@ -2094,6 +2163,7 @@
}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{%
+ \insert at Xtxtbeforenotes{#1}%
\csuse{Xbeforeinserting@#1}%
\insert\csname #1footins\endcsname\bgroup
\hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax%
@@ -2108,6 +2178,7 @@
\csname #1footfmt\endcsname #2{#1}\egroup}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\mpnormalvfootnote}[2]{%
\global\setbox\@nameuse{mp#1footins}\vbox{%
+ \insert at Xtxtbeforenotes{#1}%
\unvbox\@nameuse{mp#1footins}
\noindent\csuse{Xbhooknote@#1}%
\csuse{Xnotefontsize@#1}%
@@ -2131,7 +2202,7 @@
\iftoggle{preXnotes@}{%
\togglefalse{preXnotes@}%
\skip\csname #1footins\endcsname=%
- \dimexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -2143,9 +2214,8 @@
\setXnoteswidthliketwocolumns@{#1}%
\setXnotespositionliketwocolumns@{#1}%
\print at Xfootnoterule{#1}%
- \noindent\leavevmode}
+}%
\newcommand*{\normalfootgroup}[1]{%
- {\csuse{Xnotefontsize@#1}\noindent\csuse{Xtxtbeforenotes@#1}}%
\csuse{Xbhookgroup@#1}%
\unvbox\csname #1footins\endcsname%
\hsize=\old at hsize%
@@ -2172,7 +2242,6 @@
\print at Xfootnoterule{#1}%%
\fi%
\setlength{\parindent}{0pt}
- {\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}
\csuse{Xbhookgroup@#1}%
\unvbox\csname mp#1footins\endcsname}}
\fi
@@ -2179,6 +2248,7 @@
\newcommand*{\Xarrangement at paragraph}[1]{%
\csgdef{series at display#1}{paragraph}
\expandafter\newcount\csname #1prevpage at num\endcsname
+ \expandafter\newcount\csname #1prevpage at numR\endcsname%
\expandafter\let\csname #1footstart\endcsname=\parafootstart
\expandafter\let\csname v#1footnote\endcsname=\paravfootnote
\expandafter\let\csname #1footfmt\endcsname=\parafootfmt
@@ -2218,7 +2288,7 @@
\iftoggle{preXnotes@}{%
\togglefalse{preXnotes@}%
\skip\csname #1footins\endcsname=%
- \dimexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -2236,6 +2306,7 @@
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen%
\let\bidi at RTL@everypar\@empty%
+ \insert at Xtxtbeforenotes{#1}%
\noindent\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
@@ -2252,6 +2323,7 @@
\footsplitskips
\setbox0=\vbox{\hsize=\maxdimen%
\let\bidi at RTL@everypar\@empty%
+ \insert at Xtxtbeforenotes{#1}%
\noindent\color at begingroup%
\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}\color at endgroup}%
@@ -2284,7 +2356,7 @@
\ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}%
\ifcsstring{Xragged@#1}{R}{\RaggedRight}{}%
\makehboxofhboxes
- \setbox0=\hbox{{\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}\unhbox0 \removehboxes}%
+ \setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{Xbhookgroup@#1}%
\csuse{Xnotefontsize@#1}%
\unhbox0\par%
@@ -2315,7 +2387,7 @@
\ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}%
\ifcsstring{Xragged@#1}{R}{\RaggedRight}{}%
\makehboxofhboxes
- \setbox0=\hbox{{\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}\unhbox0 \removehboxes}%
+ \setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{Xbhookgroup@#1}%
\csuse{Xnotefontsize@#1}%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
@@ -2333,16 +2405,29 @@
\ifhbox0{\removehboxes}\unhbox0 \fi}
\newcommand{\Xinsertparafootsep}[1]{%
- \ifnumequal{\csuse{#1prevpage at num}}{\page at num}%
- {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
- {\ifnumequal{\csuse{prevline#1}}{\line at num}%
- {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
- {\csuse{Xparafootsep@#1}}%
- }%
- {\csuse{Xparafootsep@#1}}%
- }%
- {}%
- \global\csname #1prevpage at num\endcsname=\page at num%
+ \ifledRcol@%
+ \ifnumequal{\csuse{#1prevpage at numR}}{\page at numR}%
+ {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+ {\ifnumequal{\csuse{prevline#1}}{\line at numR}%
+ {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {}%
+ \global\csname #1prevpage at numR\endcsname=\page at numR%
+ \else%
+ \ifnumequal{\csuse{#1prevpage at num}}{\page at num}%
+ {\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
+ {\ifnumequal{\csuse{prevline#1}}{\line at num}%
+ {\ifcsempty{Xsymlinenum@#1}{\csuse{Xparafootsep@#1}}{}}%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {\csuse{Xparafootsep@#1}}%
+ }%
+ {}%
+ \global\csname #1prevpage at num\endcsname=\page at num%
+ \fi%
}
\newcount\@k \newdimen\@h
\newcommand*{\Xrigidbalance}[3]{%
@@ -2419,8 +2504,7 @@
\print at lemma{#1}{#2}{#4}%
\csuse{Xwrapcontent@#4}{#3}%
\strut\par\allowbreak}
-\newcommand*{\threecolfootgroup}[1]{{\csuse{Xnotefontsize@#1}%
- \noindent\csuse{Xtxtbeforenotes@#1}}%
+\newcommand*{\threecolfootgroup}[1]{%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -2444,7 +2528,6 @@
\setXnotespositionliketwocolumns@{#1}%
\print at Xfootnoterule{#1}%
\fi%
- {\csuse{Xnotefontsize@#1}\noindent\csuse{Xtxtbeforenotes@#1}}%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -2497,8 +2580,7 @@
\print at lemma{#1}{#2}{#4}%
\csuse{Xwrapcontent@#4}{#3}%
\strut\par\allowbreak}
-\newcommand*{\twocolfootgroup}[1]{{\csuse{Xnotefontsize@#1}
- \noindent\csuse{Xtxtbeforenotes@#1}}%
+\newcommand*{\twocolfootgroup}[1]{%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -2526,7 +2608,6 @@
\setXnotespositionliketwocolumns@{#1}%
\print at Xfootnoterule{#1}%
\fi%
- {\csuse{Xnotefontsize@#1}\noindent\csuse{Xtxtbeforenotes@#1}}%
\csuse{Xbhookgroup@#1}\par%
\splittopskip=\ht\strutbox
\expandafter
@@ -3041,7 +3122,7 @@
\iftoggle{prenotesX@}{%
\togglefalse{prenotesX@}%
\skip\csname footins#1\endcsname=%
- \dimexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
+ \glueexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
}%
{}%
}%
@@ -3159,7 +3240,8 @@
\newcommand*{\arrangementX at normal}[1]{%
\csgdef{series at displayX#1}{normal}
\expandafter\let\csname footstart#1\endcsname=\normalfootstartX
- \expandafter\newcount\csname prevpage#1 at num\endcsname
+ \expandafter\newcount\csname prevpage#1 at num\endcsname%
+ \expandafter\newcount\csname prevpage#1 at numR\endcsname%
\@namedef{@footnotemark#1}{\normal at footnotemarkX{#1}}
\@namedef{bodyfootmark#1}{\normalbodyfootmarkX{#1}}
\expandafter\let\csname regvfootnote#1\endcsname=\normalvfootnoteX
@@ -3353,7 +3435,8 @@
\newcommand*{\arrangementX at paragraph}[1]{%
\csgdef{series at displayX#1}{paragraph}%
- \expandafter\newcount\csname #1prevpage at num\endcsname
+ \expandafter\newcount\csname prevpage#1 at num\endcsname%
+ \expandafter\newcount\csname prevpage#1 at numR\endcsname%
\expandafter\let\csname footstart#1\endcsname=\parafootstartX
\expandafter\let\csname regvfootnote#1\endcsname=\para at vfootnoteX
\expandafter\let\csname footfmt#1\endcsname=\parafootfmtX
@@ -3393,7 +3476,7 @@
\iftoggle{prenotesX@}{%
\togglefalse{prenotesX@}%
\skip\csname footins#1\endcsname=%
- \dimexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
+ \glueexpr\csuse{prenotesX@}+\csuse{afterruleX@#1}\relax%
}%
{}%
}%
@@ -3507,9 +3590,17 @@
\unhbox0\par}}
\newcommand{\insertparafootsepX}[1]{%
- \ifnumequal{\csuse{prevpage#1 at num}}{\page at num}%
- {\csuse{parafootsepX@#1}}%
- {}%
+ \ifledRcol@%
+ \ifnumequal{\csuse{prevpage#1 at numR}}{\page at numR}%
+ {\csuse{Xparafootsep@#1}}%
+ {}%
+ \global\csname prevpage#1 at numR\endcsname=\page at numR%
+ \else%
+ \ifnumequal{\csuse{prevpage#1 at num}}{\page at num}%
+ {\csuse{Xparafootsep@#1}}%
+ {}%
+ \global\csname prevpage#1 at num\endcsname=\page at num%
+ \fi%
}
\newcommand{\wrapped at footfootmarkX}[1]{%
\ifdefined\hypertarget%
@@ -4014,7 +4105,10 @@
\csgdef{Xinplaceoflemmaseparator@#1}{1em}%
\csgdef{Xbeforenotes@#1}{1.2em \@plus .6em \@minus .6em}
\csgdef{Xafterrule@#1}{0pt}
+
\csgdef{Xtxtbeforenotes@#1}{}
+ \newtoggle{Xtxtbeforesnotes@#1 at typeset}%Not directly used by user, but internal
+
\csgdef{Xmaxhnotes@#1}{0.8\vsize}
\newtoggle{Xnoteswidthliketwocolumns@#1}%
\csgdef{Xparafootsep@#1}{}%
@@ -5300,7 +5394,7 @@
\ledlsnotefontsetup%We kept it outside of the vbox, because can affect the ragging
\global\setbox\l at dlp@rbox%
\ifleftnoteup%
- =\vbox to\z@{{\ledlsnotefontsetup\vss #1}}%We put \ledlsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local.
+ =\vbox to\z@{{\ledlsnotefontsetup\vss #1}}%We put \ledlsnotefontsetup inside footnote because required for color command. Note the {} to keep setting local.
\else%
=\vbox to 0.70\baselineskip{{\ledlsnotefontsetup\strut#1\vss}}%
\fi%
@@ -5313,7 +5407,7 @@
\ledrsnotefontsetup%We kept it outside of the vbox, because can affect the ragging
\global\setbox\l at drp@rbox%
\ifrightnoteup%
- =\vbox to\z@{{\ledrsnotefontsetup\vss#1}}%We put \ledrsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local.
+ =\vbox to\z@{{\ledrsnotefontsetup\vss#1}}%We put \ledrsnotefontsetup inside footnote because required for color command. Note the {} to keep setting local.
\else%
=\vbox to0.7\baselineskip{{\ledrsnotefontsetup\strut#1\vss}}%
\fi%
@@ -5332,7 +5426,7 @@
\appto\sidenotecontent@{##1}}% Not print not separator before the 1st note
{\appto\sidenotecontent@{\@sidenotesep ##1}%
}%
- \numgdef{\itemcount@}{\itemcount at +1}%
+ \numgdef{\itemcount@}{\itemcount at +\@ne}%
}%
\dolistloop{\l at dcsnotetext}%
\ifnumgreater{\itemcount@}{1}{\led at err@ManySidenotes}{}%
@@ -6001,6 +6095,266 @@
\catcode`\@=\body
\setstanzavalues{szp}{0}
+\newcommand{\msdata}[1]{%
+ \leavevmode%
+ \unless\ifstopmsdata at inserted@%
+ \stopmsdata%
+ \led at warning@msdatawithoutstop%
+ \fi%
+ \global\stopmsdata at inserted@false%
+ \unless\ifledRcol%
+ \protected at write\linenum at out{}{%
+ \string\@msd{#1}%
+ }%
+ \else%
+ \protected at write\linenum at outR{}{%
+ \string\@msd{#1}%
+ }%
+ \fi%
+}%
+\newcommand{\stopmsdata}[0]{%
+ \leavevmode%
+ \unless\ifledRcol%
+ \protected at write\linenum at out{}{%
+ \string\@stopmsd%
+ }%
+ \else%
+ \protected at write\linenum at outR{}{%
+ \string\@stopmsd%
+ }%
+ \fi%
+ \global\stopmsdata at inserted@true%
+}%
+\newif\ifstopmsdata at inserted@%
+\newcommand{\setmsdataseries}[1]{%
+ \gdef\@msdata at series{#1}%
+}%
+\def\@msdata at series{A}%
+\def\ms at data@label{Ms.}%
+\newcommand{\setmsdatalabel}[1]{%
+ \gdef\ms at data@label{#1}%
+}%
+\numdef{\@msd at c}{0}
+\numdef{\@msd at cR}{0}
+\numdef{\add at msd@c}{0}%
+\numdef{\add at msd@cR}{0}%
+\def\@msdata at list{}%
+\newcommand{\@msd}[1]{%
+ \unless\ifledRcol%
+ \numdef{\@msd at c}{\@msd at c+\@ne}%
+ \csgdef{@msdata@\@msd at c @data}{#1}%
+ \csxdef{@msdata@\@msd at c @linenumber}{\the\line at num}%
+ \csxdef{@msdata@\@msd at c @abslinenumber}{\the\absline at num}%
+ \xright at appenditem{\the\absline at num}\to\actionlines at list%
+ \xright at appenditem{-1010}\to\actions at list%
+ \else%
+ \numdef{\@msd at cR}{\@msd at cR+\@ne}%
+ \csgdef{@msdata@\@msd at cR @dataR}{#1}%
+ \csxdef{@msdata@\@msd at cR @linenumberR}{\the\line at numR}%
+ \csxdef{@msdata@\@msd at cR @abslinenumberR}{\the\absline at numR}%
+ \xright at appenditem{\the\absline at numR}\to\actionlines at listR%
+ \xright at appenditem{-1010}\to\actions at listR%
+ \fi%
+}%
+\newcommand{\@stopmsd}[0]{%
+ \unless\ifledRcol%
+ \ifcsundef{@msdata@\@msd at c @stoplinenumber}{%
+ \csxdef{@msdata@\@msd at c @stopabslinenumber}{\the\absline at num}%
+ \csxdef{@msdata@\@msd at c @stoplinenumber}{\the\line at num}%
+ }{}%
+ \else%
+ \ifcsundef{@msdata@\@msd at cR @stoplinenumberR}{%
+ \csxdef{@msdata@\@msd at cR @stopabslinenumberR}{\the\absline at numR}%
+ \csxdef{@msdata@\@msd at cR @stoplinenumberR}{\the\line at numR}%
+ }%
+ {}%
+ \fi%
+}%
+\newcommand{\add at msdata}{%
+ \bgroup%
+ \normalfont%
+ \unless\ifledRcol@%
+ \numgdef{\add at msd@c}{\add at msd@c+\@ne}%
+ \ifcsdef{@msdata@\add at msd@c @data}{%
+ \letcs{\@data}{@msdata@\add at msd@c @data}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \csuse{@msdata@\add at msd@c @linenumber}|% Start line number
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@c @stopabslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {\csuse{@msdata@\add at msd@c @stoplinenumber}}%End line number if in the same page
+ {\csuse{@lastline at forpage@\the\page at num}}%Otherwiser, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \if at firstlineofpage%Try if the data are for the full page. If yes, will add options to the list.
+ \unless\if at msdata@insertedfrompreviouspage%
+ \ifnumless{\csuse{@lastabsline at forpage@\the\page at num}}{\csuse{@msdata@\add at msd@c @stopabslinenumber}+\@ne}%
+ {%
+ \numdef{\@tmp}{\add at msd@c+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumber}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \fi%
+ \fi%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {}%
+ \else%
+ \numgdef{\add at msd@cR}{\add at msd@cR+\@ne}%
+ \ifcsdef{@msdata@\add at msd@cR @dataR}{%
+ \letcs{\@data}{@msdata@\add at msd@cR @dataR}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \csuse{@msdata@\add at msd@cR @linenumberR}|% Start line number
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}}{\csuse{@lastline at forpageR@\the\page at numR}}%
+ {\csuse{@msdata@\add at msd@cR @stoplinenumberR}}%End line number if in the same page
+ {\csuse{@lastline at forpageR@\the\page at numR}}%Otherwiser, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \if at firstlineofpageR%
+ \unless\if at msdata@insertedfrompreviouspage%
+ \ifnumless{\csuse{@lastabsline at forpageR@\the\page at numR}}{\csuse{@msdata@\add at msd@c @stopabslinenumberR}+\@ne}%
+ {%
+ \numdef{\@tmp}{\add at msd@cR+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumberR}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumberR}}{\csuse{@lastabsline at forpageR@\the\page at numR}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \fi%
+ \fi%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {}%
+ \fi%
+ \egroup%
+}%
+\newif\if at msdata@insertedfrompreviouspage%
+\newcommand{\add at msdata@firstlineofpage}{%
+ \bgroup%
+ \normalfont%
+ \unless\ifledRcol@%
+ \ifcsdef{@msdata@\add at msd@c @data}{%
+ \ifnumless{\the\absline at num-\@ne}{\csuse{@msdata@\add at msd@c @stopabslinenumber}}%
+ {%
+ \global\@msdata at insertedfrompreviouspagetrue%
+ \letcs{\@data}{@msdata@\add at msd@c @data}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \numexpr\the\line at num+\@ne\relax|% Start line number = first line of the page. As \add at msdata@firstlineofpage is called before line number has been incremented, we increment it for printing
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@c @stopabslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {\csuse{@msdata@\add at msd@c @stoplinenumber}}%End line number if in the same page
+ {\csuse{@lastline at forpage@\the\page at num}}%Otherwise, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \ifnumless{\csuse{@lastabsline at forpage@\the\page at num}}{\csuse{@msdata@\add at msd@c @stopabslinenumber}+\@ne}%We will test if the ms data is for the full page
+ {%
+ \numdef{\@tmp}{\add at msd@c+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumber}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumber}}{\csuse{@lastabsline at forpage@\the\page at num}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {\global\@msdata at insertedfrompreviouspagefalse}%
+ }{}%
+ \else%
+ \ifcsdef{@msdata@\add at msd@cR @dataR}{%
+ \ifnumless{\the\absline at numR-\@ne}{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}}%
+ {%
+ \global\@msdata at insertedfrompreviouspagetrue%
+ \letcs{\@data}{@msdata@\add at msd@cR @dataR}%
+ \edef\l at d@nums{%
+ 000|% Start page = we don't print it
+ \numexpr\the\line at numR+\@ne\relax|% Start line number = first line of the page. As \add at msdata@firstlineofpage is called before line number has been incremented, we increment it for printing
+ 000|% Start subline number, for now, not used
+ 000|% End page number, we don't print it
+ \ifnumless{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}}{\csuse{@lastline at forpageR@\the\page at numR}}%
+ {\csuse{@msdata@\add at msd@cR @stoplinenumberR}}%End line number if in the same page
+ {\csuse{@lastline at forpageR@\the\page at numR}}%Otherwise, last number of the page
+ |%
+ 000|% End sub line number, for now, not used
+ \edfont at info%Font
+ }%
+ \@msd at options@fullpagefalse%
+ \ifnumless{\csuse{@lastabsline at forpageR@\the\page at numR}}{\csuse{@msdata@\add at msd@cR @stopabslinenumberR}+\@ne}%
+ {%
+ \numdef{\@tmp}{\add at msd@cR+\@ne}%
+ \ifcsdef{@msdata@\@tmp @abslinenumberR}%
+ {\ifnumequal{\csuse{@msdata@\@tmp @abslinenumberR}}{\csuse{@lastabsline at forpageR@\the\page at numR}}%
+ {}%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {\@msd at options@fullpagetrue}%
+ }%
+ {}%
+ \listxadd{\@msdata at list}{%
+ \@msd at options@iffullpage%
+ \noexpand\csuse{v\@msdata at series footnote}{\@msdata at series}{{\expandonce\l at d@nums}{\ms at data@label}{\expandonce\@data}}%
+ \reset at msd@options at iffullpage%
+ }%
+ }%
+ {\global\@msdata at insertedfrompreviouspagefalse}%
+ }{}%
+ \fi%
+ \egroup%
+}%
+\newcommand{\insert at msdata}{%
+ \def\do##1{##1}%
+ \dolistloop{\@msdata at list}%
+ \global\let\@msdata at list\relax%
+}%
+\newif\if at msd@options at fullpage%
+\newcommand{\@msd at options@iffullpage}[0]{%
+ \if at msd@options at fullpage%
+ \noexpand\toggletrue{nonum@}%
+ \ifdefvoid{\ms at data@label}%
+ {\noexpand\toggletrue{nosep@}}%
+ {}%
+ \fi%
+}%
+\newcommand{\reset at msd@options at iffullpage}[0]{%
+ \noexpand\togglefalse{nonum@}%
+ \noexpand\togglefalse{nosep@}%
+}%
\newtoks\@emptytoks
\newtoks\l at denvbody
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-06-11 23:16:26 UTC (rev 41379)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-06-11 23:16:49 UTC (rev 41380)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/05/08 v2.9.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/06/03 v2.10.0a reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -149,6 +149,7 @@
\global\sublines at false
\global\let\next at page@numR\relax
\global\let\sub at change\relax
+ \global\stopmsdata at inserted@true%
\set at continuousnumberingforR%
\message{Section \the\section at numR R }%
\line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
@@ -995,7 +996,15 @@
\affixline at num%
\fi%
\xifinlist{\the\l at dpscL}{\eled at sections@@}%
- {\add at inserts\affixside at note}%
+ {%
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \add at inserts%
+ \insert at msdata%
+ \affixside at note%
+ }%
{\print at lineL}%
}%
\add at penaltiesL%
@@ -1008,7 +1017,7 @@
\getline at numL%
\affixline at num%
\setbox\l at dleftbox \hb at xt@ \Lcolwidth{%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
\hspace*{\Lcolwidth}%
\ledrlfill\l at drd@ta%
}%
@@ -1021,9 +1030,14 @@
\def\print at lineL{%
\affixpstart at numL%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
+ \if at firstlineofpage%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpagefalse%
+ \fi%
+ \insert at msdata%
\add at inserts\affixside at note%
- \l at dlsn@te %space kept for backward compatibility
+ \l at dlsn@te%
\hb at xt@ \Lcolwidth{\ledllfill\hb at xt@ \wd\one at line{%
\do at insidelineLhook%
\ifluatex%
@@ -1032,7 +1046,7 @@
\new at lineL%
\inserthangingsymbolL%
\l at dunhbox@line{\one at line}}\ledrlfill\l at drd@ta%
- \l at drsn@te}}
+ \l at drsn@te}}%
\def\print at eledsectionL{%%
\addtocounter{pstartL}{-1}%
@@ -1105,7 +1119,15 @@
\affixline at numR%
\fi%
\xifinlist{\the\l at dpscR}{\eled at sectionsR@@}%
- {\add at insertsR\affixside at noteR}%
+ {%
+ \if at firstlineofpageR%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpageRfalse%
+ \fi%
+ \insert at msdata%
+ \add at insertsR%
+ \affixside at noteR%
+ }%
{\print at lineR}%
}%
\add at penaltiesR%
@@ -1118,7 +1140,7 @@
\getline at numR%
\setbox\l at drightbox \hb at xt@ \Rcolwidth{%
\affixline at numR%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
\hspace*{\Rcolwidth}%
\ledrlfill\l at drd@ta%
}%
@@ -1134,9 +1156,14 @@
\def\print at lineR{%
\affixpstart at numR%
- \l at dld@ta %space kept for backward compatibility
+ \l at dld@ta%
+ \if at firstlineofpageR%
+ \set at Xtxtbeforenotes%
+ \global\@firstlineofpageRfalse%
+ \fi%
+ \insert at msdata%
\add at insertsR\affixside at noteR%
- \l at dlsn@te %space kept for backward compatibility
+ \l at dlsn@te%
\hb at xt@ \Rcolwidth{\ledllfill\hb at xt@ \wd\one at lineR{%
\do at insidelineRhook%
\new at lineR%
@@ -1228,32 +1255,34 @@
\newif\ifl at dskipversenumberR
\newcommand*{\do at actions@fixedcodeR}{%
\ifcase\@l at dtempcnta%
- \or% % 1001
+ \or% % 1001 = starting sublineation
\global\sublines at true
- \or% % 1002
+ \or% % 1002 = ending sublineation
\global\sublines at false
- \or% % 1003
+ \or% % 1003 = starting locking number
\global\@lockR=\@ne
- \or% % 1004%
+ \or% % 1004 = ending locking number
\ifnum\@lockR=\tw@
\global\@lockR=\thr@@
\else
\global\@lockR=\z@
\fi
- \or% % 1005
+ \or% % 1005 = starting locking subnumber
\global\sub at lockR=\@ne
- \or% % 1006
+ \or% % 1006 = ending locking subnumber
\ifnum\sub at lockR=\tw@
\global\sub at lockR=\thr@@
\else
\global\sub at lockR=\z@
\fi
- \or% % 1007
+ \or% % 1007 = skipping numbering
\l at dskipnumbertrue
- \or% % 1008
+ \or% % 1008 = skipping numbering in stanza
\l at dskipversenumberRtrue%
- \or% % 1009
+ \or% % 1009 = hiding number
\l at dhidenumbertrue%
+ \or% % 1010 = inserting msdata
+ \add at msdata%
\else%
\led at warn@BadAction
\fi%
@@ -1264,10 +1293,12 @@
\@l at dtempcntb=\absline at numR
\ifnum\@l at dtempcntb<\next at actionlineR\else
\ifnum\next at actionR>-1001\relax
+ \@firstlineofpageRtrue%
\global\page at numR=\next at actionR
\ifbypage at R
\global\line at numR \z@ \global\subline at numR \z@
\fi
+ \add at msdata@firstlineofpage%
\else
\ifnum\next at actionR<-4999\relax % 9/05 added relax here
\@l at dtempcnta=-\next at actionR
More information about the tex-live-commits
mailing list