texlive[41481] Master/texmf-dist: reledmac (16jun16)
commits+karl at tug.org
commits+karl at tug.org
Sat Jun 18 17:50:01 CEST 2016
Revision: 41481
http://tug.org/svn/texlive?view=revision&revision=41481
Author: karl
Date: 2016-06-18 17:50:00 +0200 (Sat, 18 Jun 2016)
Log Message:
-----------
reledmac (16jun16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/README
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-sidenotes.tex
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-footnote_spacing.tex
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-manuscript-apparatus.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-reledmac-right-to-left.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_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/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
Removed Paths:
-------------
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_page_titles_in_line_numbering_with_notes.tex
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/README 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/README 2016-06-18 15:50:00 UTC (rev 41481)
@@ -116,5 +116,6 @@
- Click on the cloud, in the right side.
- Run the `.ins` files with pdflatex, to obtain the `.sty` files.
- Put the `.sty` files with your test files (in the same folder).
+ - Look on file issueXXX.tex get a MWE of the new feature.
- Make your report.
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-sidenotes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.tex 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.tex 2016-06-18 15:50:00 UTC (rev 41481)
@@ -23,6 +23,8 @@
\begin{itemize}
\item \verb+\ledleftnote+ (left notes);
\item \verb+\ledrightnote+ (right notes);
+ \item \verb+\ledinnernote+ (inner notes);
+ \item \verb+\ledouternote+ (outer notes);
\item \verb+\ledsidenote+ (configurable notes).
\end{itemize}
@@ -34,6 +36,14 @@
\beginnumbering
\pstart
Lorem\ledrightnote{1-R}\ledleftnote{1-L} \ledsidenote{1-M}\ledsidenote{2-M}ipsum\ledrightnote{2-R} dolor\ledleftnote{2-L} sit amet, consectetur adipiscing elit. Fusce sed dolor libero. Aenean rutrum vestibulum lacus ut pretium. Fusce et auctor lectus. Ut et commodo quam, quis gravida orci. Nullam at risus elementum, suscipit enim a, pellentesque mi. Morbi commodo, ligula vel consectetur accumsan, massa metus egestas velit, eu fringilla leo ante in turpis. Vivamus ut tellus sollicitudin, facilisis ipsum sit amet, tincidunt odio. Maecenas tincidunt dolor sed ante blandit tincidunt. Etiam vulputate ultricies facilisis.
+Donec sollicitudin molestie malesuada. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Cras ultricies ligula sed magna dictum porta. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur 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. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Curabitur aliquet quam id dui posuere blandit. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla quis lorem ut libero malesuada feugiat. Pellentesque in ipsum id orci porta dapibus.
+Donec sollicitudin molestie malesuada. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Cras ultricies ligula sed magna dictum porta. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur 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\ledinnernote{1-I} aliquam\ledouternote{1-O} vel, ullamcorper sit amet ligula. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Curabitur aliquet quam id dui posuere blandit. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla quis lorem ut libero malesuada feugiat. Pellentesque in ipsum id orci porta dapibus.
+Donec sollicitudin molestie malesuada. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Cras ultricies ligula sed magna dictum porta. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur 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. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Curabitur aliquet quam id dui posuere blandit. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla quis lorem ut libero malesuada feugiat. Pellentesque in ipsum id orci porta dapibus.
+Donec sollicitudin molestie malesuada. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Cras ultricies ligula sed magna dictum porta. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur 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. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Curabitur aliquet quam id dui posuere blandit. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla quis lorem ut libero malesuada feugiat. Pellentesque in ipsum id orci porta dapibus.
+Donec sollicitudin molestie malesuada. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Cras ultricies ligula sed magna dictum porta. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur 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. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Curabitur aliquet quam id dui posuere blandit. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla quis lorem ut libero malesuada feugiat. Pellentesque in ipsum id orci porta dapibus.
+Donec sollicitudin molestie malesuada. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Cras ultricies ligula sed magna dictum porta. Mauris blandit aliquet elit, eget tincidunt nibh pulvinar a. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur 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. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Curabitur aliquet quam id dui posuere blandit. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla quis lorem ut libero malesuada feugiat. Pellentesque in ipsum id orci porta dapibus.
+ Donec velit neque, auctor sit amet\ledinnernote{2-I} aliquam\ledouternote{2-O} vel, ullamcorper sit amet ligula. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Curabitur aliquet quam id dui posuere blandit. Curabitur arcu erat, accumsan id imperdiet et, porttitor at sem. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Quisque velit nisi, pretium ut lacinia in, elementum id enim. Curabitur non nulla sit amet nisl tempus convallis quis ac lectus. Cras ultricies ligula sed magna dictum porta. Sed porttitor lectus nibh. Praesent sapien massa, convallis a pellentesque nec, egestas non nisi. Nulla quis lorem ut libero malesuada feugiat. Pellentesque in ipsum id orci porta dapibus.
\pend
\endnumbering
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-footnote_spacing.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.tex 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.tex 2016-06-18 15:50:00 UTC (rev 41481)
@@ -13,7 +13,7 @@
%VERTICAL SPACES BEFORE APPARATUS
-\preXnotes{0.5cm}
+\Xprenotes{0.5cm}
% VERTICAL SPACE BEFORE RULES
\newlength{\before} % A length which will contains the space before the rule
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)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
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)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
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)
Deleted: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.tex 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.tex 2016-06-18 15:50:00 UTC (rev 41481)
@@ -1,361 +0,0 @@
-\documentclass[twoside,12pt]{book}
-\usepackage{polyglossia,fontspec,xunicode}
-\usepackage{libertineotf}
-\setmainlanguage{english}
-
-\usepackage[series={A},noend,nofamiliar,noledgroup]{reledmac}
-\usepackage{reledpar}
-\linenumincrement*{1}
-\firstlinenum*{1}
-\begin{document}
-
-\title{Sectioning commands with critical notes in parallel pages}
-
-
-
-{\let\newpage\relax\maketitle}
-{\small
-This file provides examples for using the sectioning command with reledpar. The section titles are in the line numbering, and have critical notes.
-
-The left and right sides are put in parallel pages. Following the standard behavior of reledpar, only the left titles are put to the table of contents.
-
-We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
-
-Page breaks are manually added before chapter with \verb+\beforeeledchapter+.
-}
-
-
-\tableofcontents
-
-\beforeeledchapter
-
-\chapter{Preamble}
-A chapter outside any parallel typesetting environment.
-
-\begin{pages}
-\begin{Leftside}
-\beginnumbering
-\pstart
-\eledchapter{Left \edtext{chapter}{\Afootnote{chapitre}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-
-\endnumbering
-\end{Leftside}
-
-\begin{Rightside}
-
-\beginnumbering
-\pstart
-\eledchapter{Right \edtext{chapter}{\Afootnote{chapitre}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\endnumbering
-
-\end{Rightside}
-
-\end{pages}
-\Pages
-
-\begin{pages}
-\begin{Leftside}
-\beginnumbering
-\pstart
-\eledchapter{Left \edtext{chapter}{\Afootnote{chapitre}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Left section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-
-\endnumbering
-\end{Leftside}
-
-\begin{Rightside}
-
-\beginnumbering
-\pstart
-\eledchapter{Right \edtext{chapter}{\Afootnote{chapitre}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
-\pend
-
-\pstart
-\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-\pstart
-\eledsection{Right section}
-\pend
-
-\pstart
-I use git to manage some packages.
-I would like to add a pre-commit hook, to check if I have forgotten
-For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
-\pend
-
-
-\endnumbering
-
-\end{Rightside}
-
-\end{pages}
-\Pages
-
-
-\end{document}
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)
Added: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf 2016-06-18 15:50:00 UTC (rev 41481)
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.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/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex 2016-06-18 15:50:00 UTC (rev 41481)
@@ -0,0 +1,361 @@
+\documentclass[twoside,12pt]{book}
+\usepackage{polyglossia,fontspec,xunicode}
+\usepackage{libertineotf}
+\setmainlanguage{english}
+
+\usepackage[series={A},noend,nofamiliar,noledgroup]{reledmac}
+\usepackage{reledpar}
+\linenumincrement*{1}
+\firstlinenum*{1}
+\begin{document}
+
+\title{Sectioning commands with critical notes in parallel pages}
+
+
+
+{\let\newpage\relax\maketitle}
+{\small
+This file provides examples for using the sectioning command with reledpar. The section titles are in the line numbering, and have critical notes.
+
+The left and right sides are put in parallel pages. Following the standard behavior of reledpar, only the left titles are put to the table of contents.
+
+We use the \verb+\reledxxx+ commands, each of them in their own \verb+\pstart…\pend+ group.
+
+Page breaks are manually added before chapter with \verb+\beforeeledchapter+.
+}
+
+
+\tableofcontents
+
+\beforeeledchapter
+
+\chapter{Preamble}
+A chapter outside any parallel typesetting environment.
+
+\begin{pages}
+\begin{Leftside}
+\beginnumbering
+\pstart
+\eledchapter{Left \edtext{chapter}{\Afootnote{chapitre}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+
+\endnumbering
+\end{Leftside}
+
+\begin{Rightside}
+
+\beginnumbering
+\pstart
+\eledchapter{Right \edtext{chapter}{\Afootnote{chapitre}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\endnumbering
+
+\end{Rightside}
+
+\end{pages}
+\Pages
+
+\begin{pages}
+\begin{Leftside}
+\beginnumbering
+\pstart
+\eledchapter{Left \edtext{chapter}{\Afootnote{chapitre}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+\eledsubsection{Left \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Left \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Left section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+
+\endnumbering
+\end{Leftside}
+
+\begin{Rightside}
+
+\beginnumbering
+\pstart
+\eledchapter{Right \edtext{chapter}{\Afootnote{chapitre}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+\eledsubsection{Right \edtext{subsection}{\Afootnote{sous-section}}}
+\pend
+
+\pstart
+\eledsubsubsection{Right \edtext{subsubsection}{\Afootnote{sous-sous-section}}}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+\pstart
+\eledsection{Right section}
+\pend
+
+\pstart
+I use git to manage some packages.
+I would like to add a pre-commit hook, to check if I have forgotten
+For now, I have a minimal pre-commit, which tests only the blank spaces at ends of lines, but not the forgotten.
+\pend
+
+
+\endnumbering
+
+\end{Rightside}
+
+\end{pages}
+\Pages
+
+
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
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-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-06-18 15:50:00 UTC (rev 41481)
@@ -404,6 +404,17 @@
% \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}
+% \changes{v2.12.0}{2016/06/16}{Fix bug with familiar footnote number in optional argument of \protect\cs{pstart} or \protect\cs{pend} in parallel typesetting}
+% \changes{v2.12.0}{2016/06/16}{Add \protect\cs{hidenumberingonleftpage} and \protect\cs{hidenumberingonrightpage}}
+% \changes{v2.12.0}{2016/06/16}{\protect\cs{preXnotes} become \protect\cs{Xprenotes} (naming convention)}
+% \changes{v2.12.0}{2016/06/16}{Add \protect\option{auxdir} option.}
+% \changes{v2.12.0}{2016/06/16}{Add \protect\cs{toendnotes} and related.}
+% \changes{v2.12.0}{2016/06/16}{Fix bug when using \protect\cs{chapter} in optional argument of \protect\cs{pstart} in parallel typesetting in combination with the \protect\option{noeledsec} option.}
+% \changes{v2.12.0}{2016/06/16}{Fix spurious vertical space in \protect\cs{chapter} when used as optional argument of \protect\cs{pstart} in parallel tyepsetting.}
+% \changes{v2.12.0}{2016/06/16}{Fix bug with \protect\cs{ledinnernote} and \protect\cs{ledouternote} in parallel typesetting}
+% \changes{v2.12.0}{2016/06/16}{More accurate message to control the position of \protect\cs{Xfootnote} and \protect\cs{applabel} in the \protect\LaTeX\ code}
+% \changes{v2.12.0}{2016/06/16}{Fix bug in critical and familiar footnotes when using uppercase letters with accent mark}
+% \changes{v2.12.0}{2016/06/16}{Make endnote compatible with \protect\cs{sameword} mechanism}
% \title{\Macpackage \\
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
@@ -681,6 +692,14 @@
% \subsection{Specific features}
% \begin{description}
% \item[draft] underlines lemmas in the main text.
+% \item[auxdir] \macpackage generates auxiliary files.
+% It could be useful to store them in a specific directory.
+% You can set it using \option{auxdir}=\meta{folder} option.
+% Note the two following point:
+% \begin{enumerate}
+% \item \TeX\ is not able to create folder. You should create it yourself.
+% \item The option does not change the default \LaTeX auxiliary files (.aux, .toc, \ldots).
+% \end{enumerate}
% \item[eledmac-compat] help to migrate from \eledmac to \reledmac (see \reff{eledmac-compat}).
% \item[nopenalties] must be called in some cases when using paragraphed endnotes (\reff{nopenalties)}
% \item[nopbinverse] prevents page break within verse environment.
@@ -1096,6 +1115,9 @@
% the number for that particular line to be hidden; namely, no line number will print.
% Note that if you use it in \protect\cs{stanza}, you must call it at the beginning of the verse.
%
+% \DescribeMacro{\hidenumberingonleftpage}
+% \cs{hidenumberingonleftpage} is like \protect{hidenumbering}, but is applied only on left page. \cs{hidenumberingonrightpage} is applied on right page.
+% They can be useful if the position of the line number is depending of the position of the page, but the position of marginal note is fixed.
% \subsubsection{Execute code at each line}
% \Macpackage provides an advanced feature for users.
% \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook}
@@ -1237,6 +1259,7 @@
% Example: \protect\cs{Afootnote}\verb|[nonum]|\marg{text}.
%
% \subsubsection{Endnotes}
+% \paragraph{Inserting endnotes}
% \DescribeMacro{\Aendnote}
% \DescribeMacro{\Bendnote}
% \DescribeMacro{\Cendnote}
@@ -1257,6 +1280,8 @@
% \item \verb|linerangesep=|\meta{c} to change to \meta{c} the separator between start line and end line for this particular note.
% \end{itemize}
%
+%
+% \paragraph{Printing endnotes}
% \DescribeMacro{\doendnotes}\label{doendnotes} Normally, endnotes are not printed: you must use the
% \protect\cs{doendnotes}\marg{s}, where \meta{s} is the letter of the series to be printed. Put this command where you want the corresponding set of endnotes printed.
% In this case, all the endnotes of the \meta{s} series are printed, for all numbered sections.
@@ -1283,8 +1308,37 @@
% As endnotes may be printed at any point in the document they always
% start with the page number where they are called.
%
+% \paragraph{Code between endnotes}
+% \DescribeMacro{toendnotes}
+% \DescribeMacro{Xtoendnotes}
+% Sometimes, it is useful to insert content between endnotes of the same series: for example to separate endnotes of different sections of the same text.
+% In this case, you could use \emph{inside
+% numbered text} the command:\\
+% \cs{toendnotes}\oarg{series}\marg{content}
+% where \meta{series} is a comma-separated list of the series of endnotes where \meta{content} must be inserted.
+% If \meta{series} is empty, then \meta{content} is inserted to all the series.
+%
+% For example:
+% \begin{verbatim}
+% \toendnotes{\section{Section's title}}
+% \end{verbatim}
+%
+% Alternatively, you can use \cs{Xtoendnotes}\marg{content}, where \enquote{X} must be replaced by a series letter.
+%
+% Remember that the endnotes are temporarily stored in an auxiliary file. That means in general you want to write the \meta{content} in the auxiliary file \emph{without expanding it}, that is without interpreting \TeX\ content.
+%
+% However, in some case, you may want to write
+% once-expanded\footnote{The expansion mechanism' of \TeX is a quite complex problem, but fundamental. We have no place to explain it fully here. Read introduction to \TeX to understand well.}
+% version of the \meta{content}, that is the version where the commands are expanded on the first level.
+% This can be, for example, to get a counter value.
+% Use the starred version in this case.
+% For example:
+% \begin{verbatim}
+% \Atoendnotes*{\string\section{Letter 1 (chap. \thechapter)}}
+% \end{verbatim}
+%
% \subsubsection{Paragraph in critical apparatus}
-% By default, no paragraph can be made in the notes of critical apparatus.
+% By default, no paragraph can be made in the notes of the critical apparatus.
% You can allow it by adding the options \verb+parapparatus+ when loading the package :
% \begin{verbatim}
% \usepackage[parapparatus]{eledmac}
@@ -2173,10 +2227,10 @@
%
% \textbf{Be careful, the standard \LaTeX\ footnote rule, which is used by \macpackage, decreases 3pt. These 3pt are not changed by this command.}
%
-% \DescribeMacro{\preXnotes}
+% \DescribeMacro{\Xprenotes}
% You can set the space before the first series of critical notes printed on each page
% and set a different amount of space for each subsequent series on the page.
-% You can do it with \protect\cs{preXnotes}\marg{l}. The default value is \verb+0pt+.
+% You can do it with \protect\cs{Xprenotes}\marg{l}. The default value is \verb+0pt+.
% You can disable this feature by setting the length to 0pt.
%
% \DescribeMacro{\prenotesX}
@@ -3621,7 +3675,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/06/03 v2.11.0a typeset critical editions]%
+\ProvidesPackage{reledmac}[2016/06/16 v2.12.0 typeset critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -3719,6 +3773,10 @@
\DeclareOptionX{nopenalties}{%
\AtBeginDocument{\let\add at penalties\relax}%
}
+\def\l at auxdir{}%
+\DeclareOptionX{auxdir}{%
+ \xdef\l at auxdir{#1/}%
+}%
% \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
@@ -3860,7 +3918,7 @@
% \begin{macro}{\led at err@edtextoutsidepstart}
% \begin{macrocode}
\newcommand*{\led at err@edtextoutsidepstart}{%
- \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\ldots\pend)}{\@ehc}}%
+ \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart…\pend)}{\@ehc}}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led at mess@NotesChanged}
@@ -3988,7 +4046,7 @@
% \end{macro}
%
% \begin{macro}{\led at warn@DuplicateLabel}
-% \begin{macro}{\led at warn@AppLabelOutEdtext}
+% \begin{macro}{\led at warn@AppLabelOutSecondArgEdtext}
% \begin{macro}{\led at warn@RefUndefined}
% \begin{macro}{\led at warn@RefUndefined}
% \begin{macrocode}
@@ -3996,8 +4054,8 @@
\reledmac at warning{Duplicate definition of label `#1'\@gobble}%
\@latex at warning@no at line{Label `#1' multiply defined}%
}%
-\newcommand*{\led at warn@AppLabelOutEdtext}[1]{%
- \reledmac at warning{\string\applabel\space outside of \string\edtext\space `#1' on page \the\pageno.}}%
+\newcommand*{\led at warn@AppLabelOutSecondArgEdtext}[1]{%
+ \reledmac at warning{\string\applabel\space outside of the second argument of an \string\edtext\space `#1' on page \the\pageno.}}%
\newcommand*{\led at warn@RefUndefined}[1]{%
\G at refundefinedtrue%
\reledmac at warning{Reference `#1' on page \the\pageno\space undefined.%
@@ -4097,17 +4155,24 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\led at err@toendnotes at outsidenumbering}
+% \begin{macrocode}
+\newcommand{\led at err@toendnotes at outsidenumbering}{%
+ \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering…\string\endnumbering)}{\@ehc}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led at err@EdtextWithoutFootnote}
% \begin{macrocode}
\newcommand{\led at err@EdtextWithoutFootnote}{%
- \reledmac at error{edtext without Xfootnote. Check syntaxis.}{\@ehc}%
+ \reledmac at error{edtext without Xfootnote. Check syntaxis}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\led at err@FootnoteWithoutEdtext}
+% \begin{macro}{\led at err@FootnoteNotInSecondArgEdtext}
% \begin{macrocode}
-\newcommand{\led at err@FootnoteWithoutEdtext}{%
- \reledmac at error{Xfootnote without edtext. Check syntax.}{\@ehc}%
+\newcommand{\led at err@FootnoteNotInSecondArgEdtext}[1]{%
+ \reledmac at error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4182,6 +4247,13 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\led at warning@preXnotes at deprecated}
+% \begin{macrocode}
+\newcommand{\led at warning@preXnotes at deprecated}{%
+ \reledmac at warning@preXnotes at deprecated%
+}%
+% \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}
@@ -4415,8 +4487,8 @@
\fi
\gdef\eled at sections@@{}%
\if at noeled@sec\else%
- \makeatletter\InputIfFileExists{\jobname.eledsec\the\section at num}{}{}\makeatother%
- \immediate\openout\eled at sectioning@out=\jobname.eledsec\the\section at num\relax%
+ \makeatletter\InputIfFileExists{\l at auxdir\jobname.eledsec\the\section at num}{}{}\makeatother%
+ \immediate\openout\eled at sectioning@out=\l at auxdir\jobname.eledsec\the\section at num\relax%
\fi%
}
\newcommand*{\initnumbering at reg}{%
@@ -5481,12 +5553,12 @@
% \changes{v0.7.0}{2005/02/22}{Added \protect\cs{get at linelistfile}}
% \begin{macrocode}
\newcommand*{\get at linelistfile}[1]{%
- \InputIfFileExists{#1}{%
+ \InputIfFileExists{\l at auxdir#1}{%
\global\noteschanged at false
\begingroup
\catcode`\[=1 \catcode`\]=2
\makeatletter \catcode`\^^M=9}{%
- \led at warn@NoLineFile{#1}%
+ \led at warn@NoLineFile{\l at auxdir#1}%
\global\noteschanged at true
\begingroup}%
}
@@ -6030,8 +6102,11 @@
% \end{macro}
% \begin{macro}{\ifl at dhidenumber}
% \begin{macro}{\hidenumbering}
+% \begin{macro}{\hidenumberingonleftpage}
+% \begin{macro}{\hidenumberingonrightpage}
% \protect\cs{hidenumbering} hides number in margin.
% It uses action code 1009.
+% \cs{hidenumberingonleftpage} and \cs{hidenumberingonrightpage} ara variant, using action code only conditionnaly
% \begin{macro}{\h at num}
% \begin{macrocode}
\newif\ifl at dhidenumber
@@ -6051,10 +6126,56 @@
\xright at appenditem{-1009}\to\actions at list%
\fi%
}
+\newcommand*{\hidenumberingonleftpage}{%
+ \ifledRcol%
+ \write\linenum at outR{\string\hide at num@left}%
+ \else%
+ \write\linenum at out{\string\hide at num@left}%
+ \fi%
+}%
+
+\newcommand*{\hide at num@left}{%
+ \ifledRcol%
+ \ifodd\page at numR\else%
+ \xright at appenditem{\the\absline at numR}\to\actionlines at listR%
+ \xright at appenditem{-1009}\to\actions at listR%
+ \fi%
+ \else%
+ \ifodd\page at num\else%
+ \xright at appenditem{\the\absline at num}\to\actionlines at list%%
+ \xright at appenditem{-1009}\to\actions at list%
+ \fi%
+ \fi%
+}%
+
+\newcommand*{\hidenumberingonrightpage}{%
+ \ifledRcol%
+ \write\linenum at outR{\string\hide at num@right}%
+ \else%
+ \write\linenum at out{\string\hide at num@right}%
+ \fi%
+}%
+
+\newcommand*{\hide at num@right}{%
+ \ifledRcol%
+ \ifodd\page at numR%
+ \xright at appenditem{\the\absline at numR}\to\actionlines at listR%
+ \xright at appenditem{-1009}\to\actions at listR%
+ \fi%
+ \else%
+ \ifodd\page at num%
+ \xright at appenditem{\the\absline at num}\to\actionlines at list%%
+ \xright at appenditem{-1009}\to\actions at list%
+ \fi%
+ \fi%
+}%
+
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\@ref}
% \begin{macro}{\insert at count}
% \protect\cs{@ref}
@@ -6255,7 +6376,7 @@
\iffirst at linenum@out@
\immediate\closeout\linenum at out%
\global\first at linenum@out at false%
- \immediate\openout\linenum at out=#1\relax%
+ \immediate\openout\linenum at out=\l at auxdir#1\relax%
\immediate\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
\ifl at dpaging%
\immediate\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
@@ -6270,7 +6391,7 @@
\leavevmode%
\fi%
\closeout\linenum at out%
- \openout\linenum at out=#1\relax%
+ \openout\linenum at out=\l at auxdir#1\relax%
\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
\ifl at dpaging%
\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
@@ -6728,12 +6849,18 @@
% \changes{v1.15.0}{2015/01/12}{New boolean \protect\cs{if at edtext@}.}
% \changes{v1.23.0}{2015/05/18}{The boolean \protect\cs{if at edtext@} becomes the counter \protect\cs{edtext at level}.}
% This counter is increased by 1 at each level of \protect\cs{edtext}.
-% That is useful for some commands which can have a different behavior if called inside or outside of the \marg{lemma} argument.
% \begin{macrocode}
\newcount\@edtext at level%
\@edtext at level=0%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\if at edtext@secondarg@}
+% This boolean is set to TRUE before reading the second argument of a \cs{edtext}.
+% It is tested on some macro which must be executed only inside a second argument.
+% \begin{macrocode}
+\newif\if at edtext@secondarg@%
+% \end{macrocode}
+% \end{macro}
% \changes{v1.16.0}{2014/01/23}{\protect\cs{edtext} is now defined only in \eledmac, not in \eledpar. Debug wrong numbering when using \protect\cs{sameword} + \protect\package{eledpar} + \protect\cs{tag} command.}
%
%
@@ -6828,7 +6955,9 @@
% \protect\cs{ignorespaces} as well, to skip any spaces between macros when
% several are used in series.
% \begin{macrocode}
+ \@edtext at secondarg@true%
\ignorespaces #2\relax%
+ \@edtext at secondarg@false%
% \end{macrocode}
% With \protect\package{polyglossia}, you must track whether the language reads left to right (English) or right to left (Arabic).
% \begin{macrocode}
@@ -6860,7 +6989,7 @@
\endgroup%
\ifdef{\hypertarget}%
{%
- \csedef{thisedtext@\the\@edtext at level}{\theedtext}%
+ \csedef{thisedtext@\the\@edtext at level}{\theedtext}%We need one macro by level, as #1 can contain new \edtext
\Hy at raisedlink@left{\hypertarget{\csuse{thisedtext@\the\@edtext at level}:start}{}}%
\showlemma{#1}%
\Hy at raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext at level}:end}{}}%
@@ -8915,9 +9044,10 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmt}[4]{%
\Xledsetnormalparstuff{#4}%
- \hangindent=\csuse{Xhangindent@#4}
+ \hangindent=\csuse{Xhangindent@#4}%
\everypar{\hangindent=\csuse{Xhangindent@#4}}%
- \strut{\printlinefootnote{#1}{#4}}%
+ \rule\z@\splittopskip%
+ {\printlinefootnote{#1}{#4}}%
\print at lemma{#1}{#2}{#4}%
\csuse{Xwrapcontent@#4}{#3}%
\strut\par}
@@ -8938,7 +9068,7 @@
% spacing problems if what you add takes up a different amount of
% space.
%
-% But if the skip \protect\cs{preXnotes@} is greater than 0~pt,
+% But if the skip \protect\cs{Xprenotes@} is greater than 0~pt,
% it is used instead of \protect\cs{skip}\protect\cs{footins} for the first printed series in one page.
%
% The \protect\cs{leftskip} and \protect\cs{rightskip} values
@@ -8960,12 +9090,12 @@
% In order to insert this specific skip without overlap the bottom margin of the page, Maïeul Rouquette have defined an algorithm explained in \reff{skipfirstseries}.
% Here is part of this algorithm, when the block of notes are ready to be printed.
% \begin{macrocode}
- \ifdimequal{0pt}{\preXnotes@}{}%
+ \ifdimequal{0pt}{\Xprenotes@}{}%
{%
- \iftoggle{preXnotes@}{%
- \togglefalse{preXnotes@}%
+ \iftoggle{Xprenotes@}{%
+ \togglefalse{Xprenotes@}%
\skip\csname #1footins\endcsname=%
- \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{Xprenotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -9141,12 +9271,12 @@
\newcommand*{\parafootstart}[1]{%
\rightskip=0pt \leftskip=0pt%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
- \ifdimequal{0pt}{\preXnotes@}{}%
+ \ifdimequal{0pt}{\Xprenotes@}{}%
{%
- \iftoggle{preXnotes@}{%
- \togglefalse{preXnotes@}%
+ \iftoggle{Xprenotes@}{%
+ \togglefalse{Xprenotes@}%
\skip\csname #1footins\endcsname=%
- \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{Xprenotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -10527,26 +10657,26 @@
{\footnote}%
{\stepcounter\@mpfn}%
{%
- \ifl at dpairing%
- \global\advance\footnote at reading by \@ne%
- \get at thisfootnote%
- \get at fnmark{\thisfootnote}%
- \ifcsdef{footnotereading\the\footnote at reading=typeset}%
- {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
- {\setcounter{\@mpfn}{\footnote at reading}}%
- \else%
- \stepcounter\@mpfn%
- \fi%
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
+ \global\advance\footnote at reading by \@ne%
+ \get at thisfootnote%
+ \get at fnmark{\thisfootnote}%
+ \ifcsdef{footnotereading\the\footnote at reading=typeset}%
+ {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
+ {\setcounter{\@mpfn}{\footnote at reading}}%
+ }{%
+ \stepcounter\@mpfn%
+ }%
}%
{}
{}
\newcommand{\get at thisfootnote}{%
- \ifl at dpairing
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\footnote at reading}%
- \else%
- \protected at xdef\thisfootnote{\thefootnote}%
- \fi%
+ }{%
+ \protected at xdef\thisfootnote{\the\c at footnote}%
+ }%
}%
\newcommand{\l at dbfnote}[1]{%
@@ -10580,7 +10710,7 @@
\stepcounter{footnote at typeset}%
\setcounter{footnote}{\c at footnote@typeset}%
\immediate\write\@mainaux{%
- \global\csdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
+ \csgdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
}%
\def\@thefnmark{\thefootnote}%
}%
@@ -10730,7 +10860,8 @@
\ledsetnormalparstuffX{#1}%
\hangindent=\csuse{hangindentX@#1}%
\everypar{\hangindent=\csuse{hangindentX@#1}}%
- {{\csuse{notenumfontX@#1}\wrapped at footfootmarkX{#1}}\strut%
+ \rule\z@\splittopskip%
+ {{\csuse{notenumfontX@#1}\wrapped at footfootmarkX{#1}}%
\csuse{wrapcontentX@#1}{#2}%
\strut\par}}
@@ -10872,11 +11003,11 @@
% The macro \cs{get at thisfootnote} command just saves the footnote number in the \cs{thisfootnote} macro, depending on the use of pairing environments.
% \begin{macrocode}
\newcommand{\get at thisfootnoteX}[1]{%
- \ifl at dpairing%
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\csname footnote#1 at reading\endcsname}%
- \else%
- \protected at xdef\thisfootnote{\csuse{thefootnote#1}}%
- \fi%
+ }{%
+ \protected at xdef\thisfootnote{\the\csname c at footnote#1\endcsname}%
+ }%
}%
% \end{macrocode}
% \end{macro}
@@ -10902,7 +11033,7 @@
\setcounter{footnote#1}{\value{footnote#1 at typeset}}%
\@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
\immediate\write\@mainaux{%
- \global\csdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
+ \csgdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
}%
}%
{%
@@ -10920,6 +11051,8 @@
\edtext{}{\normalbfnoteX{#1}{#2}}%
\else
\def\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
+ \get at thisfootnoteX{#1}%
+ \get at fnmarkX{#1}{\expandonce\thisfootnote}%
\@nameuse{regvfootnote#1}{#1}{#2}%
\fi}
@@ -11629,7 +11762,7 @@
% \section{Specific skip for first series of footnotes}\label{skipfirstseries}
% \subsubsection{Overview}
% \protect\cs{Xbeforenotes} inserts a specific skip for the first series of notes in a page.
-% As we can't know in advance which series will be the first, we call \protect\cs{prepare at preXnotes} before inserting any critical notes, in order to prevent page number overlapping.
+% As we can't know in advance which series will be the first, we call \protect\cs{prepare at Xprenotes} before inserting any critical notes, in order to prevent page number overlapping.
% \begin{enumerate}
% \item If it is the first note of the current page, it changes the footnote skip for the series to the value specified to \protect\cs{Xbeforenotes}. It also keeps the series of the note as the first one of the current page.
% \item If it is not the first note of the current page:
@@ -11651,24 +11784,25 @@
%
% And now, implementation !
% \subsubsection{User level command}
-% \begin{macro}{\preXnotes@}
-% \begin{macro}{\preXnotes}
-% \changes{v1.1.0}{2012/09/25}{New skip \protect\cs{preXnotes@}}
+% \begin{macro}{\Xprenotes@}
+% \begin{macro}{\Xprenotes}
+% \changes{v1.1.0}{2012/09/25}{New skip \protect\cs{Xprenotes@}}
% \changes{v1.2.0}{2012/10/08}{Debug in familiar footnotes (bug introduced by v1.1).}
-% If user redefines \protect\cs{preXnotes@}, via \protect\cs{preXnotes} to a value greater than 0~pt,
+% If user redefines \protect\cs{Xprenotes@}, via \protect\cs{Xprenotes} to a value greater than 0~pt,
% this skip will be added before first series notes
% instead of the notes skip.
% \begin{macrocode}
-\newtoggle{preXnotes@}
-\toggletrue{preXnotes@}
-\newcommand{\preXnotes@}{0pt}
-\newcommand*{\preXnotes}[1]{\renewcommand{\preXnotes@}{#1}}
+\newtoggle{Xprenotes@}%
+\toggletrue{Xprenotes@}%
+\newcommand{\Xprenotes@}{0pt}%
+\newcommand*{\Xprenotes}[1]{\renewcommand{\Xprenotes@}{#1}}%
+\newcommand{\preXnotes}[1]{\led at warning@preXnotes at deprecated\Xprenotes{#1}}%For compatibility
% \end{macrocode}
% \end{macro}
% \end{macro}
% The same, but for familiar footnotes.
-% \begin{macro}{\preXnotes}
-% \begin{macro}{\preXnotes@}
+% \begin{macro}{\Xprenotes}
+% \begin{macro}{\Xprenotes@}
% \begin{macrocode}
\newtoggle{prenotesX@}
\toggletrue{prenotesX@}
@@ -11680,15 +11814,15 @@
%
% \subsubsection{Internal commands}
% \begin{macro}{firstXseries@}
-% \begin{macro}{prepare at preXnotes}
+% \begin{macro}{prepare at Xprenotes}
% \begin{macrocode}
\gdef\firstXseries@{}
-\newcommand{\prepare at preXnotes}[1]{%
- \ifdimequal{0pt}{\preXnotes@}%
+\newcommand{\prepare at Xprenotes}[1]{%
+ \ifdimequal{0pt}{\Xprenotes@}%
{}%
{%
\IfStrEq{\firstXseries@}{}{%
- \global\skip\csuse{#1footins}=\preXnotes@%
+ \global\skip\csuse{#1footins}=\Xprenotes@%
\global\advance\skip\csname #1footins\endcsname by\csuse{Xafterrule@#1}%
\gdef\firstXseries@{#1}%
}%
@@ -11745,6 +11879,7 @@
\ifbool{noend@}{}{%Used instead of \ifnoend@ to prevent expansion problem
% \end{macrocode}
%
+% \subsection{Internal commands}
% \begin{macro}{\l at dend@open}
% \begin{macro}{\l at dend@close}
% \protect\cs{l at dend@open} and \protect\cs{l at dend@close} are the
@@ -11760,7 +11895,7 @@
\expandafter\immediate%
\expandafter\openout%
\csname l at d@#1end\endcsname%
- =\jobname.#1end\relax%
+ =\l at auxdir\jobname.#1end\relax%
}%
\newcommand{\l at dend@close}[1]{%
\global\boolfalse{l at dend@#1}%
@@ -11947,6 +12082,42 @@
}%
% \end{macrocode}
% \end{macro}
+% \subsection{User level commands}
+% \subsubsection{Inserting contents to endnotes}
+% The \cs{Xendnotes} commands are defined upper, when defining apparatus commands by series.
+% Here, we define.
+% only \cs{toendnotes} command not specific to a series, in order to insert arbitrary code.
+% The regular version writes an unexpanded argument, while the regular version writes a once-expanded argument.
+%
+% \begin{macro}{\toendnotes*}
+% \begin{macro}{\toendnotes*}
+% \begin{macrocode}
+\newcommandx{\toendnotes}[2][1,usedefault]{%
+ \ifboolexpr{bool{numbering} or bool{numberingR}}{%
+ \def\do##1{%
+ \reledmac at warning{toto}\expandafter\immediate\expandafter\write\csname l at d@##1end\endcsname%
+ {\unexpanded{#2}\@percentchar}%
+ }%
+ \ifstrempty{#1}%
+ {\dolistloop{\@series}}%
+ {\docsvlist{#1}}%
+ }{\led at err@toendnotes at outsidenumbering}%
+}%
+\WithSuffix\newcommandx\toendnotes*[2][1,usedefault]{%
+ \ifboolexpr{bool{numbering} or bool{numberingR}}{%
+ \def\do##1{%
+ \reledmac at warning{toto}\expandafter\immediate\expandafter\write\csname l at d@##1end\endcsname%
+ {#2\@percentchar}%
+ }%
+ \ifstrempty{#1}%
+ {\dolistloop{\@series}}%
+ {\docsvlist{#1}}%
+ }{\led at err@toendnotes at outsidenumbering}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \subsubsection{Printing endnotes}
% \begin{macro}{\doendnotes}
% \begin{macro}{\ifXendinsertsep@}
% \protect\cs{doendnotes} is
@@ -11961,7 +12132,7 @@
\begingroup
\makeatletter
\expandafter\let\csname #1end\endcsname=\endprint
- \input\jobname.#1end%
+ \input\l at auxdir\jobname.#1end%
\global\Xendinsertsep at false%
\endgroup}
% \end{macrocode}
@@ -11982,7 +12153,7 @@
{\cslet{#1end}{\endprint}}%
{\cslet{#1end}{\@gobblefive}}%
}%
- \input\jobname.#1end%
+ \input\l at auxdir\jobname.#1end%
\global\Xendinsertsep at false%
\endgroup%
}%
@@ -12302,7 +12473,12 @@
% \changes{v1.23.0}{2015/04/29}{Prevent spurious spaces when \protect\cs{Afootnote} and similar commands are followed by spaces (bug added on 1.0.0!).}
% \begin{macrocode}
\global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{%
- \ifnum\@edtext at level>0%
+ \if at edtext@secondarg@%
+ \ifledRcol%
+ \ifcsstring{Xonlyside@#1}{L}{\led at error@note at called@onrightside{#1footnote}}{}%
+ \else%
+ \ifcsstring{Xonlyside@#1}{R}{\led at error@note at called@onleftside{#1footnote}}{}%
+ \fi%
\begingroup%
\newcommand{\content}{##2}%
\ifnumberedpar@%
@@ -12322,7 +12498,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number… so
{}%
\noexpand\Xnote at true%
- \noexpand\prepare at preXnotes{#1}%
+ \noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current \edtext will be pushed to \sw at list@inedtext when the notes are expanded.
\noexpand\setcounter{stanzaR}{\the\c at stanzaR}%Save stanzaR counter for footnote
@@ -12358,7 +12534,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number… so
{}%
\noexpand\Xnote at true%
- \noexpand\prepare at preXnotes{#1}%
+ \noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
\ifl at dpairing%
@@ -12387,7 +12563,7 @@
\fi%
\endgroup%
\else%
- \led at err@FootnoteWithoutEdtext%
+ \led at err@FootnoteNotInSecondArgEdtext{#1}%
\fi%
\ignorespaces%
}
@@ -12454,14 +12630,22 @@
% Read \parpackage's handbook about that (\reff{reledpar-familiarfootnotenumber}).
% \begin{macrocode}
\global\expandafter\advance\csname footnote#1 at reading\endcsname by \@ne%
- \ifl at dpairing%
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\ifcsdef{footnote#1reading\the\csname footnote#1 at reading\endcsname=typeset}%
{\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1 at reading\endcsname=typeset}}}%
{\setcounter{footnote#1}{\the\csname footnote#1 at reading\endcsname}}%
- \else%
+ }{%
\stepcounter{footnote#1}%
- \fi%
+ }%
% \end{macrocode}
+% We also have to check consistency with \cs{onlysideX} setting.
+% \begin{macrocode}
+ \ifledRcol%
+ \ifcsstring{onlysideX@#1}{L}{\led at error@note at called@onrightside{footnote#1}}{}%
+ \else%
+ \ifcsstring{onlysideX@#1}{R}{\led at error@note at called@onleftside{footnote#1}}{}%
+ \fi%
+% \end{macrocode}
% And now, the feature not depending of wether we are preparing parallel typesetting
% \begin{macrocode}
\protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
@@ -12539,6 +12723,7 @@
\newcommand{\content}{##2}%
\stepcounter{labidx}%
\expandafter\immediate\expandafter\write\csname l at d@#1end\endcsname{%
+ \unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}} %Volountary space, to add linebreak in the output file
\expandafter\string\csname #1end\endcsname%
{\ifnumberedpar@\l at d@nums\fi}%
{\ifnumberedpar@\expandonce\@tag\fi}%
@@ -12553,6 +12738,21 @@
\ignorespaces%
}%
% \end{macrocode}
+% \subsubsection{Tools}
+% The \cs{Xtoendnotes} command inserts any arbitrary content into the endnote file.
+% It is an alias of the more generalist \cs{addtoennotes}
+% \begin{macrocode}
+
+ \global\expandafter\newcommand\csname #1toendnotes\endcsname[1]{%
+ \toendnotes[#1]{##1}%
+ }%
+
+ \expandafter\WithSuffix\expandafter\newcommand\csname #1toendnotes\endcsname*[1]{%
+ \toendnotes*[#1]{##1}%
+ }%
+
+% \end{macrocode}
+% \subsubsection{Internal commands}
% \protect\cs{Xendnote} commands called \protect\cs{Xend} commands on to the endnote file; these are analogous to the various
% \verb"footfmt" commands above, and they take the same arguments.
% When we process this file, we want to pick out the notes of one
@@ -12568,6 +12768,7 @@
% \begin{macrocode}
\global\expandafter\newcount\csname #1end at bysection\endcsname%
% \end{macrocode}
+%
% \subsubsection{The options}
% \begin{macrocode}
\csgdef{Xendwraplemma@#1}{}
@@ -13614,7 +13815,7 @@
% \protect\cs{applabel}, if called in \protect\cs{edtext} will insert automatically both a start and an end label for the current edtext lines.
% \begin{macrocode}
\newcommand*{\applabel}[1]{%
- \ifnum\@edtext at level>0%
+ \if at edtext@secondarg@%
% \end{macrocode}
% Label should not be already defined.
% \begin{macrocode}
@@ -13660,7 +13861,7 @@
% Warning if \protect\cs{applabel} is called outside of \protect\cs{edtext}.
% \begin{macrocode}
\else%
- \led at warn@AppLabelOutEdtext{#1}%
+ \led at warn@AppLabelOutSecondArgEdtext{#1}%
\fi%
% \end{macrocode}
% End of \protect\cs{applabel}
@@ -14199,10 +14400,10 @@
% the default for line numbers).
% \protect\cs{l at dgetsidenote@margin} returns the number associated to side note margin:
% \begin{description}
-% \item[left]: 0
-% \item[right]: 1
-% \item[outer]: 2
-% \item[inner]: 3
+% \item[left:] 0
+% \item[right:] 1
+% \item[outer:] 2
+% \item[inner:] 3
% \end{description}
% \changes{v0.5.1}{2004/04/10}{Added \protect\cs{sidenotemargin} and \protect\cs{sidenote at margin}}
% \changes{v0.7.0}{2005/02/23}{Added \protect\cs{l at dgetsidenote@margin}}
@@ -14298,24 +14499,9 @@
% \begin{macrocode}
\newcommand*{\ledleftnote}[1]{\edtext{}{\l at dlsnote{#1}}}
\newcommand*{\ledrightnote}[1]{\edtext{}{\l at drsnote{#1}}}
-
-\newcommand*{\ledinnernote}[1]{%
- \ifodd\c at page% Do not use \page at num, because it is not yet calculated when command is called
- \ledleftnote{#1}%
- \else%
- \ledrightnote{#1}%
- \fi%
-}
-
-\newcommand*{\ledouternote}[1]{%
- \ifodd\c at page% Do not use \page at num, because it is not yet calculated when command is called
- \ledrightnote{#1}%
- \else%
- \ledleftnote{#1}%
- \fi%
-}
-
-\newcommand*{\ledsidenote}[1]{\edtext{}{\l at dcsnote{#1}}}
+\newcommand*{\ledsidenote}[1]{\edtext{}{\l at dcsnote{#1}}}%
+\newcommand*{\ledinnernote}[1]{\edtext{}{\l at disnote{#1}}}%
+\newcommand*{\ledouternote}[1]{\edtext{}{\l at dosnote{#1}}}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -14327,6 +14513,8 @@
% \begin{macro}{\l at dlsnote}
% \begin{macro}{\l at drsnote}
% \begin{macro}{\l at dcsnote}
+% \begin{macro}{\l at desnote}
+% \begin{macro}{\l at disnote}
% \changes{v1.12.0}{2014/08/05}{\protect\cs{l at dlsnote},\protect\cs{l at drsnote} and \protect\cs{l at dcsnote} defined only one time, in \eledmac, including needs for eledpar case.}.
% The `footnotes' for left, right, and moveable sidenotes. The whole
% scheme is reminiscent of the critical footnotes code.
@@ -14347,7 +14535,10 @@
\to\inserts at list
\global\advance\insert at count \@ne%
\fi
- \fi\ignorespaces\endgroup}
+ \fi%
+ \ignorespaces%
+ \endgroup%
+}%
\newcommand*{\l at drsnote}[1]{%
\begingroup%
@@ -14362,7 +14553,9 @@
\to\inserts at list
\global\advance\insert at count \@ne%
\fi
- \fi\ignorespaces\endgroup}
+ \fi\ignorespaces%
+ \endgroup%
+}%
\newcommand*{\l at dcsnote}[1]{%
\begingroup%
@@ -14377,16 +14570,56 @@
\to\inserts at list
\global\advance\insert at count \@ne%
\fi
- \fi\ignorespaces\endgroup}
+ \fi\ignorespaces%
+ \endgroup%
+}%
+\newcommand*{\l at disnote}[1]{%
+ \begingroup%
+ \newcommand{\content}{#1}%
+ \ifnumberedpar@%
+ \ifledRcol%
+ \xright at appenditem{\noexpand\vl at disnote{\expandonce\content}}%
+ \to\inserts at listR%
+ \global\advance\insert at countR \@ne%
+ \else%
+ \xright at appenditem{\noexpand\vl at disnote{\expandonce\content}}%
+ \to\inserts at list%
+ \global\advance\insert at count \@ne%
+ \fi%
+ \fi\ignorespaces%
+ \endgroup%
+}%
+
+\newcommand*{\l at dosnote}[1]{%
+ \begingroup%
+ \newcommand{\content}{#1}%
+ \ifnumberedpar@%
+ \ifledRcol%
+ \xright at appenditem{\noexpand\vl at dosnote{\expandonce\content}}%
+ \to\inserts at listR%
+ \global\advance\insert at countR \@ne%
+ \else%
+ \xright at appenditem{\noexpand\vl at dosnote{\expandonce\content}}%
+ \to\inserts at list%
+ \global\advance\insert at count \@ne%
+ \fi%
+ \fi\ignorespaces%
+ \endgroup%
+}%
+
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
% \begin{macro}{\vl at dlsnote}
% \begin{macro}{\vl at drsnote}
% \begin{macro}{\vl at dcsnote}
+% \begin{macro}{\vl at disnote}
+% \begin{macro}{\vl at dosnote}
% Put the left/right text into boxes, but just save the moveable text.
% \protect\cs{l at dcsnotetext}, \protect\cs{l at dcsnotetext@l} and \protect\cs{l at dcsnotetext@r} are \protect\package{etoolbox}'s lists which will store the content of side notes.
% We store the content in lists, because we need to loop later on them, in case many sidenote co-exist for the same line.
@@ -14404,6 +14637,7 @@
% \item \protect\cs{l at dcsnotetext@l} if \protect\cs{ledsidenote} is to be put on right.
% \end{itemize}
% \end{itemize}
+% \cs{vl at disnote} and \cs{vl at dosnote} just call \cs{vl at dlsnote} or \cs{vl at drsnote}, depending of the page.
% \begin{macrocode}
\newcommand*{\vl at dlsnote}[1]{%
\ifledRcol@%
@@ -14443,10 +14677,38 @@
}
\newcommand*{\vl at dcsnote}[1]{\listgadd{\l at dcsnotetext}{#1}}
+\newcommand{\vl at disnote}[1]{%
+ \ifledRcol@%
+ \@tempcnta=\page at numR%
+ \else%
+ \@tempcnta=\page at num%
+ \fi%
+ \ifodd\@tempcnta% ODD => right page => inner side = left side
+ \vl at dlsnote{#1}%
+ \else%
+ \vl at drsnote{#1}%
+ \fi%
+}%
+
+\newcommand{\vl at dosnote}[1]{%
+ \ifledRcol@%
+ \@tempcnta=\page at numR%
+ \else%
+ \@tempcnta=\page at num%
+ \fi%
+ \ifodd\@tempcnta% ODD => right page => outer side = right side
+ \vl at drsnote{#1}%
+ \else%
+ \vl at dlsnote{#1}%
+ \fi%
+}%
+
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
%
%
% \begin{macro}{\setl at dlp@rbox}
@@ -17573,12 +17835,6 @@
% \end{macrocode}
% \end{macro}
% \subsection{Auxiliary commands}
-% \begin{macro}{\if at eled@sectioning}
-% The boolean \protect\cs{if at eled@sectioning} is set to true when a sectioning command is called by a \protect\cs{eledxxx} command, and set to false after. It is used to enable/disable line number printing.
-% \begin{macrocode}
-\newif\if at eled@sectioning
-% \end{macrocode}
-% \end{macro}
% \begin{macro}{\print at leftmargin@eledsection}
% \begin{macro}{\print at rightmargin@eledsection}
% \protect\cs{print at leftmargin@eledsection} and \protect\cs{print at rightmargin@eledsection} are added by \macpackage inside the code of sectioning command, in order to affix lines numbers.
@@ -17619,7 +17875,6 @@
% \end{macro}
% \end{macro}
% \subsection{Patching standard commands}
-% \begin{macro}{\chapter}
% \begin{macro}{\M at sect}
% \begin{macro}{\@mem at old@ssect}
% \begin{macro}{\@makechapterhead}
@@ -17640,15 +17895,6 @@
%
% \begin{macrocode}
\AtBeginDocument{%
-\patchcmd{\chapter}{\clearforchapter}{%
- \if at eled@sectioning\else%
- \ifl at dprintingpages\else%
- \clearforchapter%
- \fi%
- \fi%
- }
- {}
- {}
\pretocmd{\M at sect}
@@ -17695,16 +17941,8 @@
{}
{}
-\patchcmd{\chapter}{\if at openright\cleardoublepage\else\clearpage\fi}{%
- \if at eled@sectioning\else%
- \ifl at dprintingpages\else%
- \if at openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for classical classes
- \fi%
- \fi%
- }%
- {}%
- {}%
+
\patchcmd{\scr at startchapter}{\if at openright\cleardoublepage\else\clearpage\fi}{%
\if at eled@sectioning\else%
\ifl at dprintingpages\else%
@@ -17837,13 +18075,13 @@
{}
{}
}%
-}
+}%
% \end{macrocode}
-% Now, we have finished to patch the commands, using \# with a catcode equals to 12. We close the \verb+\notbool{@noeled at sec}+ statement, restore the normal catcode for \# and reopen a new \verb+\notbool{@noeled at sec}+ statement.
+% Close the \verb+\notbool{@noeled at sec}+ statement.
+% Also, we have finished patching the commands, using \# with a catcode equal to 12, so we are restoring the normal catcode for \#.
% \begin{macrocode}
{}}%
\protect\catcode`\#=6 %Space NEEDS by \catcode
-\notbool{@noeled at sec}{%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -17852,7 +18090,44 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \begin{macro}{\chapter}
+% We patch the \protect\cs{chapter} command even if the \option{noeledsec} option is called, because we can use \cs{chapter} in the optional argument of a \cs{pstart} in parallel typesetting.
+% \begin{macrocode}
+\AtBeginDocument{%
+\patchcmd{\chapter}{\clearforchapter}{%
+ \if at eled@sectioning\else%
+ \ifl at dprintingpages\else%
+ \clearforchapter%
+ \fi%
+ \fi%
+ }%
+ {}%
+ {}%
+
+\patchcmd{\chapter}{\if at openright\cleardoublepage\else\clearpage\fi}{%
+ \if at eled@sectioning\else%
+ \ifl at dprintingpages%
+ \endgraf%
+ \else%
+ \if at openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for classical classes
+ \fi%
+ \fi%
+ }%
+ {}%
+ {}%
+}%
+% \end{macrocode}
% \end{macro}
+% \begin{macro}{\if at eled@sectioning}
+% The boolean \protect\cs{if at eled@sectioning} is set to true when a sectioning command is called by a \protect\cs{eledxxx} command, and set to false after. It is used to enable/disable line number printing.
+% \begin{macrocode}
+\newif\if at eled@sectioning%
+% \end{macrocode}
+% \end{macro}
+% We reopen a new \verb+\notbool{@noeled at sec}+ statement, as we will define the \cs{elesection} commands.
+% \begin{macrocode}
+\notbool{@noeled at sec}{%
+% \end{macrocode}
% \subsection{Main code of \protect\cs{eledxxx} commands}
% \begin{macro}{\eled at sectioning@out}
% \protect\cs{eled at sectioning@out} is the output file, to dump the pstarts where a sectioning command is used.
@@ -18001,18 +18276,18 @@
{%
\ifstrempty{#1}%
{%
- \global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%
+ \csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%
}%Need for \pairs, because of using parbox.
{%
- \global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter[#1]{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%Need for \pairs, because of using parbox.
+ \csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter[#1]{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%Need for \pairs, because of using parbox.
}%
}%
{%
\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*[#1]{#2}}}%Bug in LaTeX!
}%
\listcsgadd{eled at sections#5@@}{#3}%
}
@@ -18020,17 +18295,17 @@
\ifstrempty{#4}%
{\ifstrempty{#1}%
{%
- \global\csdef{eled at sectioning@#3#5}{\section{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#2}}%Need for \pairs, because of using parbox.
+ \csgdef{eled at sectioning@#3#5}{\section{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#2}}%Need for \pairs, because of using parbox.
}%
{%
- \global\csdef{eled at sectioning@#3#5}{\section[#1]{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#1}}%Need for \pairs, because of using parbox.
+ \csgdef{eled at sectioning@#3#5}{\section[#1]{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#1}}%Need for \pairs, because of using parbox.
}%
}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\section*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\section*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\section*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\section*[#1]{#2}}}%Bug in LaTeX!
}
\listcsgadd{eled at sections#5@@}{#3}%
}
@@ -18038,17 +18313,17 @@
\ifstrempty{#4}%
{\ifstrempty{#1}%
{%
- \global\csdef{eled at sectioning@#3#5}{\subsection{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#2}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
+ \csgdef{eled at sectioning@#3#5}{\subsection{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#2}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
}%
{%
- \global\csdef{eled at sectioning@#3#5}{\subsection[#1]{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#1}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
+ \csgdef{eled at sectioning@#3#5}{\subsection[#1]{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#1}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
}%
}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\subsection*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\subsection*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\subsection*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsection*[#1]{#2}}}%Bug in LaTeX!
}
\listcsgadd{eled at sections#5@@}{#3}%
}
@@ -18055,12 +18330,12 @@
\def\eled at subsubsection#1#2#3#4#5{%
\ifstrempty{#4}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection[#1]{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection[#1]{#2}}}%
}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection*[#1]{#2}}}%Bug in LaTeX!
}
\listcsgadd{eled at sections#5@@}{#3}%
}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-06-18 15:50:00 UTC (rev 41481)
@@ -274,6 +274,7 @@
% \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}
+% \changes{v2.11.0}{2016/06/16}{Compatibility with \protect\reledmac's \protect\option{auxdir} option.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -770,6 +771,9 @@
% You may want to typeset notes on one side only (either left or right).
% Use \protect\cs{Xonlyside}\oarg{s}\marg{p} to set critical notes, and \protect\cs{onlysideX}\oarg{s}\marg{p} to set familiar notes.
% \meta{p} must be set to \verb+L+ for notes to be confined only on the left side and to \verb+R+ for notes to be confined only on the right side.
+%
+% Notice that these options just tell you \LaTeX\ to not continue long notes on the other side.
+% It is not designed to allow you to call footnotes on one side but print them on the other side.
% \subsubsection{Familiar notes called in the right side, but to be printed in the left side}
% \DescribeMacro{\footnoteXnomk}
% \DescribeMacro{\footnoteXmk}
@@ -1174,7 +1178,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/06/03 v2.10.0a reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/06/16 v2.11.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1405,6 +1409,18 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\led at error@note at called@onrightside}
+% \begin{macro}{\led at error@note at called@onleftside}
+% \begin{macrocode}
+\newcommand{\led at error@note at called@onrightside}[1]{%
+ \reledpar at error{#1 called on right side, despite your configuring it to be for the left side only}{\@ehc}%
+}%
+\newcommand{\led at error@note at called@onleftside}[1]{%
+ \reledpar at error{#1 called on left side, despite your configuring it to be for the right side only}{\@ehc}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\led at error@fail at patch@@mempnum}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@@mempnum}{%
@@ -1442,6 +1458,52 @@
}%
% \end{macrocode}
% \end{macro}
+% \subsection{Naming macros}
+%
+% The \LaTeX\ kernel provides \protect\cs{@namedef} and \protect\cs{@namuse} for defining
+% and using macros that may have non-letters in their names. We need
+% something similar here as we are going to need and use some numbered
+% boxes and counters.
+%
+% \begin{macro}{\newnamebox}
+% \begin{macro}{\setnamebox}
+% \begin{macro}{\unhnamebox}
+% \begin{macro}{\unvnamebox}
+% \begin{macro}{\namebox}
+% A set of macros for creating and using `named' boxes; the macros are called
+% after the regular box macros, but including the string `name'.
+% \begin{macrocode}
+\providecommand*{\newnamebox}[1]{%
+ \expandafter\newbox\csname #1\endcsname}
+\providecommand*{\setnamebox}[1]{%
+ \expandafter\setbox\csname #1\endcsname}
+\providecommand*{\unhnamebox}[1]{%
+ \expandafter\unhbox\csname #1\endcsname}
+\providecommand*{\unvnamebox}[1]{%
+ \expandafter\unvbox\csname #1\endcsname}
+\providecommand*{\namebox}[1]{%
+ \csname #1\endcsname}
+
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\newnamecount}
+% \begin{macro}{\usenamecount}
+% Macros for creating and using `named' counts.
+% \begin{macrocode}
+\providecommand*{\newnamecount}[1]{%
+ \expandafter\newcount\csname #1\endcsname}
+\providecommand*{\usenamecount}[1]{%
+ \csname #1\endcsname}
+
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
% \section{Sectioning commands}
%
% \begin{macro}{\section at numR}
@@ -1510,7 +1572,7 @@
\gdef\eled at sectionsR@@{}%
\if at noeled@sec\else%
\makeatletter\InputIfFileExists{\jobname.eledsec\the\section at numR R}{}{}\makeatother%
- \immediate\openout\eled at sectioningR@out=\jobname.eledsec\the\section at numR R\relax%
+ \immediate\openout\eled at sectioningR@out=\l at auxdir\jobname.eledsec\the\section at numR R\relax%
\fi%
}
% \end{macrocode}
@@ -2518,7 +2580,7 @@
\iffirst at linenum@out at R
\immediate\closeout\linenum at outR
\global\first at linenum@out at Rfalse
- \immediate\openout\linenum at outR=#1
+ \immediate\openout\linenum at outR=\l at auxdir#1%
\immediate\write\linenum at outR{\string\line at list@version{\this at line@list at version}}%
\ifl at dpaging%
\immediate\write\linenum at outR{\string\@par at sync@option{\@par at this@sync at option}}%
@@ -2528,7 +2590,7 @@
\leavevmode%
\fi%
\closeout\linenum at outR%
- \openout\linenum at outR=#1%
+ \openout\linenum at outR=\l at auxdir#1%
\fi}
% \end{macrocode}
@@ -2653,17 +2715,17 @@
% \subsubsection{Notes to be printed on one side only}
% \Parpackage allows notes to be printed on one side only.
% We need to declare these options.
-% We also need boolean flags, and to set them to true when a note series is not printed on one side.
-% We check the \verb+nofamiliar+ and \verb+nocritical+ \Eledmac{} options.
+% We also need box to store temporary the footnote not printed.
+% We check the \verb+nofamiliar+ and \verb+nocritical+ \macpackage\ options.
% \changes{v1.16.0}{2015/05/18}{Fix bug with \protect\cs{onlysideX}.}
% \begin{macrocode}
\unless\ifnofamiliar@%
\csgdef{onlysideX@#1}{}%
- \global\newbool{keepforsideX@#1}%
+ \newnamebox{footins#1 at kept}%
\fi%
\unless\ifnocritical@%
- \global\newbool{keepforXside@#1}%
\csgdef{Xonlyside@#1}{}%
+ \newnamebox{#1footins at kept}%
\fi%
% \end{macrocode}
% \subsection{Tools specific to familiar footnotes}
@@ -3417,8 +3479,8 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
+ \insert at msdata%
\add at inserts%
- \insert at msdata%
\affixside at note%
}%
{\print at lineL}%
@@ -4190,6 +4252,8 @@
% \begin{macro}{\correct at footinsX@box}
% \changes{v1.13.1}{2015/03/12}{Correct \protect\cs{correct at footinsX@box} and \protect\cs{correct at Xfootins@box}}
% \changes{v1.13.1}{2015/03/12}{Call \protect\cs{correct at footinsX@box} and \protect\cs{correct at Xfootins@box} directly in \protect\cs{print at notesX@forpages} and \protect\cs{print at Xnotes@forpages}.}
+% \changes{v2.11.0}{2016/06/16}{New implementation of \protect\cs{Xonlyside} and \protect\cs{onlysideX} hooks, prevent trouble with vertical spacing.}
+% \changes{v2.11.0}{2016/06/16}{Clarification in the handbook about the use of \protect\cs{Xonlyside} and \protect{onlysideX} and error message if mesuse.}
% The \protect\cs{Xonlyside} and \protect\cs{onlysideX} hooks for \protect\cs{Pages}
% allow notes to be printed either in left or right pages only.
% The implementation of such features is delegated to \protect\cs{print at Xnotes@forpages},
@@ -4201,23 +4265,11 @@
% \item However, that is not enough. Because the problem does not only consists in printing notes in any particular page. It is also not to put aside room for notes in the pages where we do not want to print them.
% To take an example: if some note in the left side is too long by 160pt to be printed in full in the left page, we do not want to put aside 160pt a space for it in the following right page.
% \item To solve this problem, we change the magnification factor associated with notes before going to the next page.
-% If we start a page where no notes are supposed to be printed, the magnification counter is set to 0. We also set the note skip to 0pt. Before starting a new page where these notes are supposed to be printed, we reset these counter and skip to their default values. (About these counter and skip, read \thetexbook\ p.~122-125).
-% \item There still remains a last problem. This problem is quite complex to understand, so an example will speak for itself. Suppose we allow 10 lines of notes by page.
-% Suppose a long note, be it 25 lines, which needs three pages to be printed. Suppose it must be printed only on left pages, namely odd pages.
-%
-% On p.~2, the first 10 lines of the notes are printed.
-% On p.~3, the box associated to the notes contains 10 lines. However, as we are in a right page, we do not void this box. So \TeX\ will keep its content for the pages to come. However, on p.~4 it will also add one line in the footnote box, because in any case, \TeX adds some content in the box when preparing the output routines, even if there is some content left in this box from the previous pages.
-% So the lines in the note box at p.~4 will be $10+1=11$. There is one line which should not be there. Furthermore, as the box size is for 10~lines and not for 11~lines, this last line will be glued to the previous one.
-%
-% To fix this double issue:
-% \begin{itemize}
-% \item For the pages where notes must be NOT printed, we allow to every note box one line less than it ought to be.
-% In our example, that means that we allow \TeX\ to add only $10-1=9$ line in the note box on p.~3.
-% Before shifting to the pages where notes must be printed, we allow to every notes the expected number of lines. In our example, that means that we allow \TeX to add 10~lines in the note box on p.~4. As on p.~3 only 9 lines were allowed, that means note box of p.~4 will contain $9+1=10$ lines. So the ``one line too many'' problem is solved.
-% \item Still remains the ``glue'' problem. We solve it by recreating a clean note box. We split the one which is created by \TeX\ to get the next line printed. Then, we create the new box, by bringing together the first part and the last part of the split box, adding some skip between them. That is achieved by \protect\cs{correct at Xfootins@box} (or \protect\cs{correct at footinsX@box} for familiar notes).
-% \end{itemize}
+% If we start a page where no notes are supposed to be printed, the magnification counter is set to 0. The dimension associated to footnote is set to \cs{maxdimen}, and so we can keep all the notes we want, without any break inside We also set the note skip to 0pt. Before starting a new page where these notes are supposed to be printed, we reset these counter and skip to their default values. (About these counter, dimension and skip, read \thetexbook\ p.~122-125).
+% \item In the output macro of the page where notes must NOT be printed, we store the content of the footnote box produced by \TeX\ to a temporary box.
+% \item After going to the next page, before typesetting any thing in this page, we put the content of this temporary box the footnote insert box.
% \end{itemize}
-% The code to print critical notes, when processing \protect\cs{Pages}.
+% The code to print critical notes, when processing \protect\cs{Pages}, called in the output routine.
% \begin{macrocode}
\newcommand\print at Xnotes@forpages[1]{%
% \end{macrocode}
@@ -4238,77 +4290,39 @@
(test {\ifcsstring{Xonlyside@#1}{R}} and test{\ifnumodd{\c at page}}))%
}%
% \end{macrocode}
-% If we are in a page where notes must be printed, print the notes, after having made the corrections which are needed for boxes.
+% If we are in a page where notes must be printed, print the notes.
% \begin{macrocode}
{%
- \correct at Xfootins@box{#1}%
\csuse{#1footstart}{#1}%
\csuse{#1footgroup}{#1}%
% \end{macrocode}
-% Then, say not to keep room for notes in the next page.
+% Then, set to not to keep room for notes in the next page.
+% Also set to that, in the next page, notes are not to be split, using \cs{maxdimen}.
% \begin{macrocode}
- \global\count\csuse{#1footins}=0%
- \global\skip\csuse{#1footins}=0pt%
+ \global\count\csuse{#1footins}=\z@%
+ \global\skip\csuse{#1footins}=\z@%
+ \global\dimen\csuse{#1footins}=\maxdimen%
+ }%
% \end{macrocode}
-% And also, allow one line less for notes in the next page.
-% \begin{macrocode}
- \csuse{Xnotefontsize@#1}%
- \global\advance\dimen\csuse{#1footins} by -\baselineskip%
-% \end{macrocode}
-% Now we have printed the notes. So we put aside this fact.
-% \begin{macrocode}
- \global\boolfalse{keepforXside@#1}%
- }%
-% \end{macrocode}
% In case we are on a page where notes must NOT be printed.
-% First, memorize that we have not printed the notes, despite having some to print.
+% First restore expected rooms for notes on the next page. Also reset expected vertical size allowed to notes.
% \begin{macrocode}
{%
- \global\booltrue{keepforXside@#1}%
-% \end{macrocode}
-% Then restore expected rooms for notes on the next page.
-% \begin{macrocode}
\global\count\csuse{#1footins}=\csuse{default@#1footins}%
\global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}%
-% \end{macrocode}
-% Last but not least, restore the normal line number allowed to notes for the following page.
-% \begin{macrocode}
\bgroup%
\csuse{Xnotefontsize@#1}%
- \global\advance\dimen\csuse{#1footins} by \baselineskip%
+ \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}%
\egroup%
% \end{macrocode}
+% Then, save the current insert box to a temporary insert box.
% \begin{macrocode}
-% End of \protect\cs{print at Xnotes@forpages}.
+ \global\setnamebox{#1footins at kept}=\box\namebox{#1footins}%
}%
- }%
-}%
% \end{macrocode}
-% Now, \protect\cs{correct at Xfootins@box}, to fix problem of last line being glued to the previous one.
+% End of \protect\cs{print at Xnotes@forpages}.
% \begin{macrocode}
-\newcommand{\correct at Xfootins@box}[1]{%
-% \end{macrocode}
-% We need to make correction only in case we have not printed any note in the previous page,
-% although there was to be ``normally'' printed.
-% \begin{macrocode}
- \ifbool{keepforXside@#1}{%
-% \end{macrocode}
-% Some setting needed to do the right splitting.
-% \begin{macrocode}
- \csuse{Xnotefontsize@#1}%
- \splittopskip=0pt%
-% \end{macrocode}
-% And now, split the last line, and push in the right place.
-% \begin{macrocode}
- \global\setbox\csuse{#1footins}=\vbox{%
- \vsplit\csuse{#1footins} to \dimexpr\ht\csuse{#1footins}-1pt\relax%
- \vskip \dimexpr-0.5\baselineskip-0.5\lineskip-0.5pt\relax%
- \unvbox\csuse{#1footins}%
- }%
-% \end{macrocode}
-% End of the macro.
-% \begin{macrocode}
- }{}%
+ }%
}%
% \end{macrocode}
% And now, the same for familiar footnotes.
@@ -4325,42 +4339,56 @@
(test {\ifcsstring{onlysideX@#1}{R}} and test{\ifnumodd{\c at page}}))%
}%
{%
- \correct at footinsX@box{#1}%
\csuse{footstart#1}{#1}%
\csuse{footgroup#1}{#1}%
- \global\count\csuse{footins#1}=0%
- \global\skip\csuse{footins#1}=0pt%
- \csuse{notefontsizeX@#1}%
- \global\advance\dimen\csuse{footins#1} by -\baselineskip%
- \global\boolfalse{keepforsideX@#1}%
+ \global\count\csuse{footins#1}=\z@%
+ \global\skip\csuse{footins#1}=\z@%
+ \global\dimen\csuse{footins#1}=\maxdimen%
+
}%
{%
- \global\booltrue{keepforsideX@#1}%
\global\count\csuse{footins#1}=\csuse{default at footins#1}%
\global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}%
\bgroup%
- \csuse{notefontsizeX@#1}%
- \global\advance\dimen\csuse{footins#1} by \baselineskip%
- \egroup%
+ \csuse{Xnotefontsize@#1}%
+ \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}%
+ \egroup%
+ \global\setnamebox{footins#1 at kept}=\box\namebox{footins#1}%
}%
}%
}%
-\newcommand{\correct at footinsX@box}[1]{%
- \ifbool{keepforsideX@#1}{%
- \csuse{notefontsizeX@#1}%
- \splittopskip=0pt%
- \global\setbox\csuse{footins#1}=\vbox{%
- \vsplit\csuse{footins#1} to \dimexpr\ht\csuse{footins#1}-1pt\relax%
- \vskip \dimexpr-0.5\baselineskip-0.5\lineskip-0.5pt\relax%
- \unvbox\csuse{footins#1}%
- }%
- }{}%
-}%
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
% \end{macro}
+% \begin{macro}{\insert at notes@for at onlyside}
+% \cs{insert at notes@for at onlyside} is everytime \cs{Pages} go to the next side.
+% It just reinsert the notes note printed on the previous side because of \protect{Xonlyside} or \cs{onlysideX} setting.
+% \begin{macrocode}
+\newcommand{\insert at notes@for at onlyside}{%
+ \def\do##1{%
+ \unless\ifnocritical@%
+ \ifvoid\csuse{##1footins at kept}\else%
+ \expandafter\insert\csname ##1footins\endcsname%
+ \bgroup%
+ \unvnamebox{##1footins at kept}%
+ \egroup%
+ \fi%
+ \fi%
+ \unless\ifnofamiliar@%
+ \ifvoid\csuse{footins##1 at kept}\else%
+ \expandafter\insert\csname footins##1\endcsname%
+ \bgroup%
+ \unvnamebox{footins##1 at kept}%
+ \egroup%
+ \fi%
+ \fi%
+ }%
+ \dolistloop{\@series}%
+}%
+% \end{macrocode}
+% \end{macro}
% \section{Cross referencing}
% \label{xref}
%
@@ -4651,52 +4679,6 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
-% \section{Naming macros}
-%
-% The \LaTeX\ kernel provides \protect\cs{@namedef} and \protect\cs{@namuse} for defining
-% and using macros that may have non-letters in their names. We need
-% something similar here as we are going to need and use some numbered
-% boxes and counters.
-%
-% \begin{macro}{\newnamebox}
-% \begin{macro}{\setnamebox}
-% \begin{macro}{\unhnamebox}
-% \begin{macro}{\unvnamebox}
-% \begin{macro}{\namebox}
-% A set of macros for creating and using `named' boxes; the macros are called
-% after the regular box macros, but including the string `name'.
-% \begin{macrocode}
-\providecommand*{\newnamebox}[1]{%
- \expandafter\newbox\csname #1\endcsname}
-\providecommand*{\setnamebox}[1]{%
- \expandafter\setbox\csname #1\endcsname}
-\providecommand*{\unhnamebox}[1]{%
- \expandafter\unhbox\csname #1\endcsname}
-\providecommand*{\unvnamebox}[1]{%
- \expandafter\unvbox\csname #1\endcsname}
-\providecommand*{\namebox}[1]{%
- \csname #1\endcsname}
-
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\newnamecount}
-% \begin{macro}{\usenamecount}
-% Macros for creating and using `named' counts.
-% \begin{macrocode}
-\providecommand*{\newnamecount}[1]{%
- \expandafter\newcount\csname #1\endcsname}
-\providecommand*{\usenamecount}[1]{%
- \csname #1\endcsname}
-
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
% \section{Fixing babel and polyglossia}
%
% With parallel texts there is the possibility that the two sides
@@ -5816,10 +5798,10 @@
% E.g. if familiar or critical notes were disabled by \macpackage's options.
% \begin{macrocode}
\ifnocritical@%
- \global\newnamebox{##1footins}
+ \global\newnamebox{##1footins}%
\fi
\ifnofamiliar@%
- \global\newnamebox{footins##1}
+ \global\newnamebox{footins##1}%
\fi
% \end{macrocode}
% And now, add a \protect\cs{newpage} if there is no more footnote to print.
@@ -5898,6 +5880,7 @@
\newcommand*{\clearl at dleftpage}{%
\ifdim\pagetotal=0pt\hbox{}\fi%
\newpage%
+ \insert at notes@for at onlyside%
\ifodd\c at page\else
\led at err@LeftOnRightPage
\hbox{}%
@@ -5907,6 +5890,7 @@
\newcommand*{\clearl at drightpage}{%
\ifdim\pagetotal=0pt\hbox{}\fi%
\newpage%
+ \insert at notes@for at onlyside%
\ifodd\c at page
\led at err@RightOnLeftPage
\hbox{}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-06-18 15:50:00 UTC (rev 41481)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/06/03 v2.11.0a typeset critical editions]%
+\ProvidesPackage{reledmac}[2016/06/16 v2.12.0 typeset critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -102,6 +102,10 @@
\DeclareOptionX{nopenalties}{%
\AtBeginDocument{\let\add at penalties\relax}%
}
+\def\l at auxdir{}%
+\DeclareOptionX{auxdir}{%
+ \xdef\l at auxdir{#1/}%
+}%
\ProcessOptionsX*\relax
\RequirePackage{xargs}
@@ -143,7 +147,7 @@
\newcommand*{\led at err@NumberingShouldHaveStarted}{%
\reledmac at error{Numbering should already have been started}{\@ehc}}
\newcommand*{\led at err@edtextoutsidepstart}{%
- \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\ldots\pend)}{\@ehc}}%
+ \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart…\pend)}{\@ehc}}%
\newcommand*{\led at mess@NotesChanged}{%
\typeout{reledmac reminder: }%
\typeout{ The number of the footnotes in this section
@@ -202,8 +206,8 @@
\reledmac at warning{Duplicate definition of label `#1'\@gobble}%
\@latex at warning@no at line{Label `#1' multiply defined}%
}%
-\newcommand*{\led at warn@AppLabelOutEdtext}[1]{%
- \reledmac at warning{\string\applabel\space outside of \string\edtext\space `#1' on page \the\pageno.}}%
+\newcommand*{\led at warn@AppLabelOutSecondArgEdtext}[1]{%
+ \reledmac at warning{\string\applabel\space outside of the second argument of an \string\edtext\space `#1' on page \the\pageno.}}%
\newcommand*{\led at warn@RefUndefined}[1]{%
\G at refundefinedtrue%
\reledmac at warning{Reference `#1' on page \the\pageno\space undefined.%
@@ -257,11 +261,14 @@
\reledmac at error{End column is too high}{\@ehc}}
\newcommand*{\led at err@ReverseColumns}{%
\reledmac at error{Start column is greater than end column}{\@ehc}}
+\newcommand{\led at err@toendnotes at outsidenumbering}{%
+ \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering…\string\endnumbering)}{\@ehc}%
+}%
\newcommand{\led at err@EdtextWithoutFootnote}{%
- \reledmac at error{edtext without Xfootnote. Check syntaxis.}{\@ehc}%
+ \reledmac at error{edtext without Xfootnote. Check syntaxis}{\@ehc}%
}%
-\newcommand{\led at err@FootnoteWithoutEdtext}{%
- \reledmac at error{Xfootnote without edtext. Check syntax.}{\@ehc}%
+\newcommand{\led at err@FootnoteNotInSecondArgEdtext}[1]{%
+ \reledmac at error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}%
}%
\newcommand{\led at error@ImakeidxAfterEledmac}{%
\reledmac at error{Imakeidx must be loaded before reledmac.}{\@ehc}%
@@ -293,6 +300,9 @@
\newcommand{\led at warning@msdatawithoutstop}{%
\reledmac at warning{\string\msdata\space without corresponding \string\stopmsdata}%
}%
+\newcommand{\led at warning@preXnotes at deprecated}{%
+ \reledmac at warning@preXnotes at deprecated%
+}%
\providecommand*{\@gobblethree}[3]{}
\providecommand*{\@gobblefour}[4]{}
\providecommand*{\@gobblefive}[5]{}
@@ -349,8 +359,8 @@
\fi
\gdef\eled at sections@@{}%
\if at noeled@sec\else%
- \makeatletter\InputIfFileExists{\jobname.eledsec\the\section at num}{}{}\makeatother%
- \immediate\openout\eled at sectioning@out=\jobname.eledsec\the\section at num\relax%
+ \makeatletter\InputIfFileExists{\l at auxdir\jobname.eledsec\the\section at num}{}{}\makeatother%
+ \immediate\openout\eled at sectioning@out=\l at auxdir\jobname.eledsec\the\section at num\relax%
\fi%
}
\newcommand*{\initnumbering at reg}{%
@@ -731,12 +741,12 @@
\list at clear{\linesonpage at listL}%
}%
\newcommand*{\get at linelistfile}[1]{%
- \InputIfFileExists{#1}{%
+ \InputIfFileExists{\l at auxdir#1}{%
\global\noteschanged at false
\begingroup
\catcode`\[=1 \catcode`\]=2
\makeatletter \catcode`\^^M=9}{%
- \led at warn@NoLineFile{#1}%
+ \led at warn@NoLineFile{\l at auxdir#1}%
\global\noteschanged at true
\begingroup}%
}
@@ -1061,6 +1071,50 @@
\xright at appenditem{-1009}\to\actions at list%
\fi%
}
+\newcommand*{\hidenumberingonleftpage}{%
+ \ifledRcol%
+ \write\linenum at outR{\string\hide at num@left}%
+ \else%
+ \write\linenum at out{\string\hide at num@left}%
+ \fi%
+}%
+
+\newcommand*{\hide at num@left}{%
+ \ifledRcol%
+ \ifodd\page at numR\else%
+ \xright at appenditem{\the\absline at numR}\to\actionlines at listR%
+ \xright at appenditem{-1009}\to\actions at listR%
+ \fi%
+ \else%
+ \ifodd\page at num\else%
+ \xright at appenditem{\the\absline at num}\to\actionlines at list%%
+ \xright at appenditem{-1009}\to\actions at list%
+ \fi%
+ \fi%
+}%
+
+\newcommand*{\hidenumberingonrightpage}{%
+ \ifledRcol%
+ \write\linenum at outR{\string\hide at num@right}%
+ \else%
+ \write\linenum at out{\string\hide at num@right}%
+ \fi%
+}%
+
+\newcommand*{\hide at num@right}{%
+ \ifledRcol%
+ \ifodd\page at numR%
+ \xright at appenditem{\the\absline at numR}\to\actionlines at listR%
+ \xright at appenditem{-1009}\to\actions at listR%
+ \fi%
+ \else%
+ \ifodd\page at num%
+ \xright at appenditem{\the\absline at num}\to\actionlines at list%%
+ \xright at appenditem{-1009}\to\actions at list%
+ \fi%
+ \fi%
+}%
+
\newcount\insert at count
\newcommand*{\dummy at ref}[2]{#2}
\newcommand*{\@ref}[2]{%
@@ -1120,7 +1174,7 @@
\iffirst at linenum@out@
\immediate\closeout\linenum at out%
\global\first at linenum@out at false%
- \immediate\openout\linenum at out=#1\relax%
+ \immediate\openout\linenum at out=\l at auxdir#1\relax%
\immediate\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
\ifl at dpaging%
\immediate\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
@@ -1130,7 +1184,7 @@
\leavevmode%
\fi%
\closeout\linenum at out%
- \openout\linenum at out=#1\relax%
+ \openout\linenum at out=\l at auxdir#1\relax%
\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
\ifl at dpaging%
\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
@@ -1273,6 +1327,7 @@
\newcommand{\@tag}{}
\newcount\@edtext at level%
\@edtext at level=0%
+\newif\if at edtext@secondarg@%
\newcounter{edtext}
\renewcommand{\theedtext}{edtxt@\arabic{edtext}}%
\newcommand{\edtext}[2]{\leavevmode%
@@ -1296,7 +1351,9 @@
\set at line%
\ifledRcol \global\insert at countR \z@%
\else \global\insert at count \z@ \fi%
+ \@edtext at secondarg@true%
\ignorespaces #2\relax%
+ \@edtext at secondarg@false%
\@ifundefined{xpg at main@language}{%if not polyglossia
\flag at start}%
{\if at RTL\flag at end\else\flag at start\fi%
@@ -1311,7 +1368,7 @@
\endgroup%
\ifdef{\hypertarget}%
{%
- \csedef{thisedtext@\the\@edtext at level}{\theedtext}%
+ \csedef{thisedtext@\the\@edtext at level}{\theedtext}%We need one macro by level, as #1 can contain new \edtext
\Hy at raisedlink@left{\hypertarget{\csuse{thisedtext@\the\@edtext at level}:start}{}}%
\showlemma{#1}%
\Hy at raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext at level}:end}{}}%
@@ -2190,19 +2247,20 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmt}[4]{%
\Xledsetnormalparstuff{#4}%
- \hangindent=\csuse{Xhangindent@#4}
+ \hangindent=\csuse{Xhangindent@#4}%
\everypar{\hangindent=\csuse{Xhangindent@#4}}%
- \strut{\printlinefootnote{#1}{#4}}%
+ \rule\z@\splittopskip%
+ {\printlinefootnote{#1}{#4}}%
\print at lemma{#1}{#2}{#4}%
\csuse{Xwrapcontent@#4}{#3}%
\strut\par}
\newcommand*{\normalfootstart}[1]{%
- \ifdimequal{0pt}{\preXnotes@}{}%
+ \ifdimequal{0pt}{\Xprenotes@}{}%
{%
- \iftoggle{preXnotes@}{%
- \togglefalse{preXnotes@}%
+ \iftoggle{Xprenotes@}{%
+ \togglefalse{Xprenotes@}%
\skip\csname #1footins\endcsname=%
- \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{Xprenotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -2283,12 +2341,12 @@
\newcommand*{\parafootstart}[1]{%
\rightskip=0pt \leftskip=0pt%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
- \ifdimequal{0pt}{\preXnotes@}{}%
+ \ifdimequal{0pt}{\Xprenotes@}{}%
{%
- \iftoggle{preXnotes@}{%
- \togglefalse{preXnotes@}%
+ \iftoggle{Xprenotes@}{%
+ \togglefalse{Xprenotes@}%
\skip\csname #1footins\endcsname=%
- \glueexpr\csuse{preXnotes@}+\csuse{Xafterrule@#1}\relax%
+ \glueexpr\csuse{Xprenotes@}+\csuse{Xafterrule@#1}\relax%
}%
{}%
}%
@@ -2974,26 +3032,26 @@
{\footnote}%
{\stepcounter\@mpfn}%
{%
- \ifl at dpairing%
- \global\advance\footnote at reading by \@ne%
- \get at thisfootnote%
- \get at fnmark{\thisfootnote}%
- \ifcsdef{footnotereading\the\footnote at reading=typeset}%
- {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
- {\setcounter{\@mpfn}{\footnote at reading}}%
- \else%
- \stepcounter\@mpfn%
- \fi%
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
+ \global\advance\footnote at reading by \@ne%
+ \get at thisfootnote%
+ \get at fnmark{\thisfootnote}%
+ \ifcsdef{footnotereading\the\footnote at reading=typeset}%
+ {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
+ {\setcounter{\@mpfn}{\footnote at reading}}%
+ }{%
+ \stepcounter\@mpfn%
+ }%
}%
{}
{}
\newcommand{\get at thisfootnote}{%
- \ifl at dpairing
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\footnote at reading}%
- \else%
- \protected at xdef\thisfootnote{\thefootnote}%
- \fi%
+ }{%
+ \protected at xdef\thisfootnote{\the\c at footnote}%
+ }%
}%
\newcommand{\l at dbfnote}[1]{%
@@ -3027,7 +3085,7 @@
\stepcounter{footnote at typeset}%
\setcounter{footnote}{\c at footnote@typeset}%
\immediate\write\@mainaux{%
- \global\csdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
+ \csgdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
}%
\def\@thefnmark{\thefootnote}%
}%
@@ -3109,7 +3167,8 @@
\ledsetnormalparstuffX{#1}%
\hangindent=\csuse{hangindentX@#1}%
\everypar{\hangindent=\csuse{hangindentX@#1}}%
- {{\csuse{notenumfontX@#1}\wrapped at footfootmarkX{#1}}\strut%
+ \rule\z@\splittopskip%
+ {{\csuse{notenumfontX@#1}\wrapped at footfootmarkX{#1}}%
\csuse{wrapcontentX@#1}{#2}%
\strut\par}}
@@ -3204,11 +3263,11 @@
\ignorespaces}
\newcommand{\get at thisfootnoteX}[1]{%
- \ifl at dpairing%
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\csname footnote#1 at reading\endcsname}%
- \else%
- \protected at xdef\thisfootnote{\csuse{thefootnote#1}}%
- \fi%
+ }{%
+ \protected at xdef\thisfootnote{\the\csname c at footnote#1\endcsname}%
+ }%
}%
\newcommand{\vbfnoteX}[3]{%
\get at fnmarkX{#1}{#3}%
@@ -3222,7 +3281,7 @@
\setcounter{footnote#1}{\value{footnote#1 at typeset}}%
\@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
\immediate\write\@mainaux{%
- \global\csdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
+ \csgdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
}%
}%
{%
@@ -3234,6 +3293,8 @@
\edtext{}{\normalbfnoteX{#1}{#2}}%
\else
\def\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
+ \get at thisfootnoteX{#1}%
+ \get at fnmarkX{#1}{\expandonce\thisfootnote}%
\@nameuse{regvfootnote#1}{#1}{#2}%
\fi}
@@ -3712,21 +3773,22 @@
\vskip\csuse{afterruleX@#1}%
}%
-\newtoggle{preXnotes@}
-\toggletrue{preXnotes@}
-\newcommand{\preXnotes@}{0pt}
-\newcommand*{\preXnotes}[1]{\renewcommand{\preXnotes@}{#1}}
+\newtoggle{Xprenotes@}%
+\toggletrue{Xprenotes@}%
+\newcommand{\Xprenotes@}{0pt}%
+\newcommand*{\Xprenotes}[1]{\renewcommand{\Xprenotes@}{#1}}%
+\newcommand{\preXnotes}[1]{\led at warning@preXnotes at deprecated\Xprenotes{#1}}%For compatibility
\newtoggle{prenotesX@}
\toggletrue{prenotesX@}
\newcommand{\prenotesX@}{0pt}
\newcommand*{\prenotesX}[1]{\renewcommand{\prenotesX@}{#1}}
\gdef\firstXseries@{}
-\newcommand{\prepare at preXnotes}[1]{%
- \ifdimequal{0pt}{\preXnotes@}%
+\newcommand{\prepare at Xprenotes}[1]{%
+ \ifdimequal{0pt}{\Xprenotes@}%
{}%
{%
\IfStrEq{\firstXseries@}{}{%
- \global\skip\csuse{#1footins}=\preXnotes@%
+ \global\skip\csuse{#1footins}=\Xprenotes@%
\global\advance\skip\csname #1footins\endcsname by\csuse{Xafterrule@#1}%
\gdef\firstXseries@{#1}%
}%
@@ -3768,7 +3830,7 @@
\expandafter\immediate%
\expandafter\openout%
\csname l at d@#1end\endcsname%
- =\jobname.#1end\relax%
+ =\l at auxdir\jobname.#1end\relax%
}%
\newcommand{\l at dend@close}[1]{%
\global\boolfalse{l at dend@#1}%
@@ -3896,6 +3958,28 @@
\hspace{\csuse{Xendafternumber@#2}}%
\csuse{Xendahooklinenumber@#2}%
}%
+\newcommandx{\toendnotes}[2][1,usedefault]{%
+ \ifboolexpr{bool{numbering} or bool{numberingR}}{%
+ \def\do##1{%
+ \reledmac at warning{toto}\expandafter\immediate\expandafter\write\csname l at d@##1end\endcsname%
+ {\unexpanded{#2}\@percentchar}%
+ }%
+ \ifstrempty{#1}%
+ {\dolistloop{\@series}}%
+ {\docsvlist{#1}}%
+ }{\led at err@toendnotes at outsidenumbering}%
+}%
+\WithSuffix\newcommandx\toendnotes*[2][1,usedefault]{%
+ \ifboolexpr{bool{numbering} or bool{numberingR}}{%
+ \def\do##1{%
+ \reledmac at warning{toto}\expandafter\immediate\expandafter\write\csname l at d@##1end\endcsname%
+ {#2\@percentchar}%
+ }%
+ \ifstrempty{#1}%
+ {\dolistloop{\@series}}%
+ {\docsvlist{#1}}%
+ }{\led at err@toendnotes at outsidenumbering}%
+}%
\newif\ifXendinsertsep@%
\newcommand*{\doendnotes}[1]{%
\l at dend@close{#1}%
@@ -3902,7 +3986,7 @@
\begingroup
\makeatletter
\expandafter\let\csname #1end\endcsname=\endprint
- \input\jobname.#1end%
+ \input\l at auxdir\jobname.#1end%
\global\Xendinsertsep at false%
\endgroup}
\newcommand*{\doendnotesbysection}[1]{%
@@ -3915,7 +3999,7 @@
{\cslet{#1end}{\endprint}}%
{\cslet{#1end}{\@gobblefive}}%
}%
- \input\jobname.#1end%
+ \input\l at auxdir\jobname.#1end%
\global\Xendinsertsep at false%
\endgroup%
}%
@@ -4123,7 +4207,12 @@
\expandafter\newinsert\csname mp#1footins\endcsname%
\fi%
\global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{%
- \ifnum\@edtext at level>0%
+ \if at edtext@secondarg@%
+ \ifledRcol%
+ \ifcsstring{Xonlyside@#1}{L}{\led at error@note at called@onrightside{#1footnote}}{}%
+ \else%
+ \ifcsstring{Xonlyside@#1}{R}{\led at error@note at called@onleftside{#1footnote}}{}%
+ \fi%
\begingroup%
\newcommand{\content}{##2}%
\ifnumberedpar@%
@@ -4143,7 +4232,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number… so
{}%
\noexpand\Xnote at true%
- \noexpand\prepare at preXnotes{#1}%
+ \noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current \edtext will be pushed to \sw at list@inedtext when the notes are expanded.
\noexpand\setcounter{stanzaR}{\the\c at stanzaR}%Save stanzaR counter for footnote
@@ -4179,7 +4268,7 @@
{\unexpanded{\let\index\nindex}}%There is no note number… so
{}%
\noexpand\Xnote at true%
- \noexpand\prepare at preXnotes{#1}%
+ \noexpand\prepare at Xprenotes{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}}%The value of the \sw at inthisedtext of current edtext will be pushed to \sw at list@inedtext when the notes are expanded.
\ifl at dpairing%
@@ -4208,7 +4297,7 @@
\fi%
\endgroup%
\else%
- \led at err@FootnoteWithoutEdtext%
+ \led at err@FootnoteNotInSecondArgEdtext{#1}%
\fi%
\ignorespaces%
}
@@ -4245,13 +4334,18 @@
\prepare at prenotesX{#1}%
\newcommand{\content}{##1}%
\global\expandafter\advance\csname footnote#1 at reading\endcsname by \@ne%
- \ifl at dpairing%
+ \ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\ifcsdef{footnote#1reading\the\csname footnote#1 at reading\endcsname=typeset}%
{\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1 at reading\endcsname=typeset}}}%
{\setcounter{footnote#1}{\the\csname footnote#1 at reading\endcsname}}%
- \else%
+ }{%
\stepcounter{footnote#1}%
- \fi%
+ }%
+ \ifledRcol%
+ \ifcsstring{onlysideX@#1}{L}{\led at error@note at called@onrightside{footnote#1}}{}%
+ \else%
+ \ifcsstring{onlysideX@#1}{R}{\led at error@note at called@onleftside{footnote#1}}{}%
+ \fi%
\protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
\nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with \parpackage
{\csuse{@footnotemark#1}}%
@@ -4288,6 +4382,7 @@
\newcommand{\content}{##2}%
\stepcounter{labidx}%
\expandafter\immediate\expandafter\write\csname l at d@#1end\endcsname{%
+ \unexpanded{\def\sw at list@inedtext}{\expandafter\unexpanded\expandafter{\sw at inthisedtext}} %Volountary space, to add linebreak in the output file
\expandafter\string\csname #1end\endcsname%
{\ifnumberedpar@\l at d@nums\fi}%
{\ifnumberedpar@\expandonce\@tag\fi}%
@@ -4302,6 +4397,15 @@
\ignorespaces%
}%
+ \global\expandafter\newcommand\csname #1toendnotes\endcsname[1]{%
+ \toendnotes[#1]{##1}%
+ }%
+
+ \expandafter\WithSuffix\expandafter\newcommand\csname #1toendnotes\endcsname*[1]{%
+ \toendnotes*[#1]{##1}%
+ }%
+
+
\global\cslet{#1end}{\@gobblefive}
\global\expandafter\newcount\csname #1end at bysection\endcsname%
\csgdef{Xendwraplemma@#1}{}
@@ -4907,7 +5011,7 @@
\to\labelref at list
\fi}
\newcommand*{\applabel}[1]{%
- \ifnum\@edtext at level>0%
+ \if at edtext@secondarg@%
\ifcsundef{the at label#1}{%
\csdef{the at label#1}{applabel}%
}%
@@ -4935,7 +5039,7 @@
\fi%
\@esphack%
\else%
- \led at warn@AppLabelOutEdtext{#1}%
+ \led at warn@AppLabelOutSecondArgEdtext{#1}%
\fi%
}%
\newcommand{\edlabelS}[1]{%
@@ -5284,24 +5388,9 @@
\newcommand*{\ledleftnote}[1]{\edtext{}{\l at dlsnote{#1}}}
\newcommand*{\ledrightnote}[1]{\edtext{}{\l at drsnote{#1}}}
-
-\newcommand*{\ledinnernote}[1]{%
- \ifodd\c at page% Do not use \page at num, because it is not yet calculated when command is called
- \ledleftnote{#1}%
- \else%
- \ledrightnote{#1}%
- \fi%
-}
-
-\newcommand*{\ledouternote}[1]{%
- \ifodd\c at page% Do not use \page at num, because it is not yet calculated when command is called
- \ledrightnote{#1}%
- \else%
- \ledleftnote{#1}%
- \fi%
-}
-
-\newcommand*{\ledsidenote}[1]{\edtext{}{\l at dcsnote{#1}}}
+\newcommand*{\ledsidenote}[1]{\edtext{}{\l at dcsnote{#1}}}%
+\newcommand*{\ledinnernote}[1]{\edtext{}{\l at disnote{#1}}}%
+\newcommand*{\ledouternote}[1]{\edtext{}{\l at dosnote{#1}}}%
\newif\ifrightnoteup
\rightnoteuptrue
@@ -5318,7 +5407,10 @@
\to\inserts at list
\global\advance\insert at count \@ne%
\fi
- \fi\ignorespaces\endgroup}
+ \fi%
+ \ignorespaces%
+ \endgroup%
+}%
\newcommand*{\l at drsnote}[1]{%
\begingroup%
@@ -5333,7 +5425,9 @@
\to\inserts at list
\global\advance\insert at count \@ne%
\fi
- \fi\ignorespaces\endgroup}
+ \fi\ignorespaces%
+ \endgroup%
+}%
\newcommand*{\l at dcsnote}[1]{%
\begingroup%
@@ -5348,8 +5442,44 @@
\to\inserts at list
\global\advance\insert at count \@ne%
\fi
- \fi\ignorespaces\endgroup}
+ \fi\ignorespaces%
+ \endgroup%
+}%
+\newcommand*{\l at disnote}[1]{%
+ \begingroup%
+ \newcommand{\content}{#1}%
+ \ifnumberedpar@%
+ \ifledRcol%
+ \xright at appenditem{\noexpand\vl at disnote{\expandonce\content}}%
+ \to\inserts at listR%
+ \global\advance\insert at countR \@ne%
+ \else%
+ \xright at appenditem{\noexpand\vl at disnote{\expandonce\content}}%
+ \to\inserts at list%
+ \global\advance\insert at count \@ne%
+ \fi%
+ \fi\ignorespaces%
+ \endgroup%
+}%
+
+\newcommand*{\l at dosnote}[1]{%
+ \begingroup%
+ \newcommand{\content}{#1}%
+ \ifnumberedpar@%
+ \ifledRcol%
+ \xright at appenditem{\noexpand\vl at dosnote{\expandonce\content}}%
+ \to\inserts at listR%
+ \global\advance\insert at countR \@ne%
+ \else%
+ \xright at appenditem{\noexpand\vl at dosnote{\expandonce\content}}%
+ \to\inserts at list%
+ \global\advance\insert at count \@ne%
+ \fi%
+ \fi\ignorespaces%
+ \endgroup%
+}%
+
\newcommand*{\vl at dlsnote}[1]{%
\ifledRcol@%
\@l at dtempcntb=\sidenote at marginR%
@@ -5388,6 +5518,32 @@
}
\newcommand*{\vl at dcsnote}[1]{\listgadd{\l at dcsnotetext}{#1}}
+\newcommand{\vl at disnote}[1]{%
+ \ifledRcol@%
+ \@tempcnta=\page at numR%
+ \else%
+ \@tempcnta=\page at num%
+ \fi%
+ \ifodd\@tempcnta% ODD => right page => inner side = left side
+ \vl at dlsnote{#1}%
+ \else%
+ \vl at drsnote{#1}%
+ \fi%
+}%
+
+\newcommand{\vl at dosnote}[1]{%
+ \ifledRcol@%
+ \@tempcnta=\page at numR%
+ \else%
+ \@tempcnta=\page at num%
+ \fi%
+ \ifodd\@tempcnta% ODD => right page => outer side = right side
+ \vl at drsnote{#1}%
+ \else%
+ \vl at dlsnote{#1}%
+ \fi%
+}%
+
\newcommand*{\setl at dlp@rbox}[1]{%
\begingroup%
\parindent\z@\hsize=\ledlsnotewidth%
@@ -7062,7 +7218,6 @@
\fi%
}
\fi
-\newif\if at eled@sectioning
\def\print at rightmargin@eledsection{%
\if at eled@sectioning%
\begingroup%
@@ -7095,15 +7250,6 @@
}%
\AtBeginDocument{%
-\patchcmd{\chapter}{\clearforchapter}{%
- \if at eled@sectioning\else%
- \ifl at dprintingpages\else%
- \clearforchapter%
- \fi%
- \fi%
- }
- {}
- {}
\pretocmd{\M at sect}
{\let\old at edtext=\edtext%
@@ -7149,16 +7295,6 @@
{}
{}
-\patchcmd{\chapter}{\if at openright\cleardoublepage\else\clearpage\fi}{%
- \if at eled@sectioning\else%
- \ifl at dprintingpages\else%
- \if at openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for classical classes
- \fi%
- \fi%
- }%
- {}%
- {}%
-
\patchcmd{\scr at startchapter}{\if at openright\cleardoublepage\else\clearpage\fi}{%
\if at eled@sectioning\else%
\ifl at dprintingpages\else%
@@ -7287,9 +7423,33 @@
{}
{}
}%
-}
+}%
{}}%
\protect\catcode`\#=6 %Space NEEDS by \catcode
+\AtBeginDocument{%
+\patchcmd{\chapter}{\clearforchapter}{%
+ \if at eled@sectioning\else%
+ \ifl at dprintingpages\else%
+ \clearforchapter%
+ \fi%
+ \fi%
+ }%
+ {}%
+ {}%
+
+\patchcmd{\chapter}{\if at openright\cleardoublepage\else\clearpage\fi}{%
+ \if at eled@sectioning\else%
+ \ifl at dprintingpages%
+ \endgraf%
+ \else%
+ \if at openright\cleardoublepage\else\clearpage\fi%No clearpage inside a \Pages: will keep critical notes from printing on the title page. Here for classical classes
+ \fi%
+ \fi%
+ }%
+ {}%
+ {}%
+}%
+\newif\if at eled@sectioning%
\notbool{@noeled at sec}{%
\newwrite\eled at sectioning@out
\newcommand{\eledchapter}[2][]{%
@@ -7399,18 +7559,18 @@
{%
\ifstrempty{#1}%
{%
- \global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%
+ \csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%
}%Need for \pairs, because of using parbox.
{%
- \global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter[#1]{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%Need for \pairs, because of using parbox.
+ \csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter[#1]{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\chaptermark{#2}}%Need for \pairs, because of using parbox.
}%
}%
{%
\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\let\edtext=\dummy at edtext@showlemma\chapter*[#1]{#2}}}%Bug in LaTeX!
}%
\listcsgadd{eled at sections#5@@}{#3}%
}
@@ -7418,17 +7578,17 @@
\ifstrempty{#4}%
{\ifstrempty{#1}%
{%
- \global\csdef{eled at sectioning@#3#5}{\section{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#2}}%Need for \pairs, because of using parbox.
+ \csgdef{eled at sectioning@#3#5}{\section{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#2}}%Need for \pairs, because of using parbox.
}%
{%
- \global\csdef{eled at sectioning@#3#5}{\section[#1]{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#1}}%Need for \pairs, because of using parbox.
+ \csgdef{eled at sectioning@#3#5}{\section[#1]{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\sectionmark{#1}}%Need for \pairs, because of using parbox.
}%
}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\section*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\section*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\section*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\section*[#1]{#2}}}%Bug in LaTeX!
}
\listcsgadd{eled at sections#5@@}{#3}%
}
@@ -7436,17 +7596,17 @@
\ifstrempty{#4}%
{\ifstrempty{#1}%
{%
- \global\csdef{eled at sectioning@#3#5}{\subsection{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#2}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
+ \csgdef{eled at sectioning@#3#5}{\subsection{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#2}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
}%
{%
- \global\csdef{eled at sectioning@#3#5}{\subsection[#1]{#2}}%
- \global\csdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#1}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
+ \csgdef{eled at sectioning@#3#5}{\subsection[#1]{#2}}%
+ \csgdef{eled at sectmark@#3#5}{\let\edtext=\dummy at edtext{}\csuse{subsectionmark}{#1}}%Need for \pairs, because of using parbox. \csuse in case of \subsectionmark is not defined (book)
}%
}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\subsection*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\subsection*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\subsection*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsection*[#1]{#2}}}%Bug in LaTeX!
}
\listcsgadd{eled at sections#5@@}{#3}%
}
@@ -7453,12 +7613,12 @@
\def\eled at subsubsection#1#2#3#4#5{%
\ifstrempty{#4}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection[#1]{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection[#1]{#2}}}%
}%
{\ifstrempty{#1}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection*{#2}}}%
- {\global\csdef{eled at sectioning@#3#5}{\subsubsection*[#1]{#2}}}%Bug in LaTeX!
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection*{#2}}}%
+ {\csgdef{eled at sectioning@#3#5}{\subsubsection*[#1]{#2}}}%Bug in LaTeX!
}
\listcsgadd{eled at sections#5@@}{#3}%
}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-06-18 15:49:30 UTC (rev 41480)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-06-18 15:50:00 UTC (rev 41481)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/06/03 v2.10.0a reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/06/16 v2.11.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -108,6 +108,12 @@
\newcommand{\led at error@fail at patch@pagenumbering}{%
\reledpar at error{Fail to patch \string\pagenumbering\space command.}{\@ehc}%
}%
+\newcommand{\led at error@note at called@onrightside}[1]{%
+ \reledpar at error{#1 called on right side, despite your configuring it to be for the left side only}{\@ehc}%
+}%
+\newcommand{\led at error@note at called@onleftside}[1]{%
+ \reledpar at error{#1 called on left side, despite your configuring it to be for the right side only}{\@ehc}%
+}%
\newcommand{\led at error@fail at patch@@mempnum}{%
\reledpar at error{Fail to patch \string\@mempnum\space command.}{\@ehc}%
}%
@@ -125,6 +131,22 @@
\newcommand{\led at error@missing at numbering}[1]{%
\reledpar at error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}%
}%
+\providecommand*{\newnamebox}[1]{%
+ \expandafter\newbox\csname #1\endcsname}
+\providecommand*{\setnamebox}[1]{%
+ \expandafter\setbox\csname #1\endcsname}
+\providecommand*{\unhnamebox}[1]{%
+ \expandafter\unhbox\csname #1\endcsname}
+\providecommand*{\unvnamebox}[1]{%
+ \expandafter\unvbox\csname #1\endcsname}
+\providecommand*{\namebox}[1]{%
+ \csname #1\endcsname}
+
+\providecommand*{\newnamecount}[1]{%
+ \expandafter\newcount\csname #1\endcsname}
+\providecommand*{\usenamecount}[1]{%
+ \csname #1\endcsname}
+
\newcount\section at numR
\section at numR=\z@
\pst at rtedLfalse
@@ -160,7 +182,7 @@
\gdef\eled at sectionsR@@{}%
\if at noeled@sec\else%
\makeatletter\InputIfFileExists{\jobname.eledsec\the\section at numR R}{}{}\makeatother%
- \immediate\openout\eled at sectioningR@out=\jobname.eledsec\the\section at numR R\relax%
+ \immediate\openout\eled at sectioningR@out=\l at auxdir\jobname.eledsec\the\section at numR R\relax%
\fi%
}
\def\endnumberingR{%
@@ -608,7 +630,7 @@
\iffirst at linenum@out at R
\immediate\closeout\linenum at outR
\global\first at linenum@out at Rfalse
- \immediate\openout\linenum at outR=#1
+ \immediate\openout\linenum at outR=\l at auxdir#1%
\immediate\write\linenum at outR{\string\line at list@version{\this at line@list at version}}%
\ifl at dpaging%
\immediate\write\linenum at outR{\string\@par at sync@option{\@par at this@sync at option}}%
@@ -618,7 +640,7 @@
\leavevmode%
\fi%
\closeout\linenum at outR%
- \openout\linenum at outR=#1%
+ \openout\linenum at outR=\l at auxdir#1%
\fi}
\newcommand*{\new at lineL}{%
@@ -629,11 +651,11 @@
\newcommand{\newseries at par}[1]{%
\unless\ifnofamiliar@%
\csgdef{onlysideX@#1}{}%
- \global\newbool{keepforsideX@#1}%
+ \newnamebox{footins#1 at kept}%
\fi%
\unless\ifnocritical@%
- \global\newbool{keepforXside@#1}%
\csgdef{Xonlyside@#1}{}%
+ \newnamebox{#1footins at kept}%
\fi%
\unless\ifnofamiliar@%
\newcounter{footnote#1 at typeset}%
@@ -1001,8 +1023,8 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
+ \insert at msdata%
\add at inserts%
- \insert at msdata%
\affixside at note%
}%
{\print at lineL}%
@@ -1544,37 +1566,23 @@
(test {\ifcsstring{Xonlyside@#1}{R}} and test{\ifnumodd{\c at page}}))%
}%
{%
- \correct at Xfootins@box{#1}%
\csuse{#1footstart}{#1}%
\csuse{#1footgroup}{#1}%
- \global\count\csuse{#1footins}=0%
- \global\skip\csuse{#1footins}=0pt%
- \csuse{Xnotefontsize@#1}%
- \global\advance\dimen\csuse{#1footins} by -\baselineskip%
- \global\boolfalse{keepforXside@#1}%
- }%
+ \global\count\csuse{#1footins}=\z@%
+ \global\skip\csuse{#1footins}=\z@%
+ \global\dimen\csuse{#1footins}=\maxdimen%
+ }%
{%
- \global\booltrue{keepforXside@#1}%
\global\count\csuse{#1footins}=\csuse{default@#1footins}%
\global\skip\csuse{#1footins}=\csuse{Xbeforenotes@#1}%
\bgroup%
\csuse{Xnotefontsize@#1}%
- \global\advance\dimen\csuse{#1footins} by \baselineskip%
+ \global\dimen\csuse{#1footins}=\csuse{Xmaxhnotes@#1}%
\egroup%
+ \global\setnamebox{#1footins at kept}=\box\namebox{#1footins}%
}%
}%
}%
-\newcommand{\correct at Xfootins@box}[1]{%
- \ifbool{keepforXside@#1}{%
- \csuse{Xnotefontsize@#1}%
- \splittopskip=0pt%
- \global\setbox\csuse{#1footins}=\vbox{%
- \vsplit\csuse{#1footins} to \dimexpr\ht\csuse{#1footins}-1pt\relax%
- \vskip \dimexpr-0.5\baselineskip-0.5\lineskip-0.5pt\relax%
- \unvbox\csuse{#1footins}%
- }%
- }{}%
-}%
\newcommand\print at notesX@forpages[1]{%
\ifcsempty{onlysideX@#1}{%
\csuse{footstart#1}{#1}%
@@ -1587,36 +1595,44 @@
(test {\ifcsstring{onlysideX@#1}{R}} and test{\ifnumodd{\c at page}}))%
}%
{%
- \correct at footinsX@box{#1}%
\csuse{footstart#1}{#1}%
\csuse{footgroup#1}{#1}%
- \global\count\csuse{footins#1}=0%
- \global\skip\csuse{footins#1}=0pt%
- \csuse{notefontsizeX@#1}%
- \global\advance\dimen\csuse{footins#1} by -\baselineskip%
- \global\boolfalse{keepforsideX@#1}%
+ \global\count\csuse{footins#1}=\z@%
+ \global\skip\csuse{footins#1}=\z@%
+ \global\dimen\csuse{footins#1}=\maxdimen%
+
}%
{%
- \global\booltrue{keepforsideX@#1}%
\global\count\csuse{footins#1}=\csuse{default at footins#1}%
\global\skip\csuse{footins#1}=\csuse{beforenotesX@#1}%
\bgroup%
- \csuse{notefontsizeX@#1}%
- \global\advance\dimen\csuse{footins#1} by \baselineskip%
+ \csuse{Xnotefontsize@#1}%
+ \global\dimen\csuse{footins#1}=\csuse{maxhnotesX@#1}%
\egroup%
+ \global\setnamebox{footins#1 at kept}=\box\namebox{footins#1}%
}%
}%
}%
-\newcommand{\correct at footinsX@box}[1]{%
- \ifbool{keepforsideX@#1}{%
- \csuse{notefontsizeX@#1}%
- \splittopskip=0pt%
- \global\setbox\csuse{footins#1}=\vbox{%
- \vsplit\csuse{footins#1} to \dimexpr\ht\csuse{footins#1}-1pt\relax%
- \vskip \dimexpr-0.5\baselineskip-0.5\lineskip-0.5pt\relax%
- \unvbox\csuse{footins#1}%
- }%
- }{}%
+\newcommand{\insert at notes@for at onlyside}{%
+ \def\do##1{%
+ \unless\ifnocritical@%
+ \ifvoid\csuse{##1footins at kept}\else%
+ \expandafter\insert\csname ##1footins\endcsname%
+ \bgroup%
+ \unvnamebox{##1footins at kept}%
+ \egroup%
+ \fi%
+ \fi%
+ \unless\ifnofamiliar@%
+ \ifvoid\csuse{footins##1 at kept}\else%
+ \expandafter\insert\csname footins##1\endcsname%
+ \bgroup%
+ \unvnamebox{footins##1 at kept}%
+ \egroup%
+ \fi%
+ \fi%
+ }%
+ \dolistloop{\@series}%
}%
\list at create{\labelref at listR}
@@ -1763,22 +1779,6 @@
\renewcommand{\thestanzaR}{%
\textbf{\arabic{stanzaR}}%
}
-\providecommand*{\newnamebox}[1]{%
- \expandafter\newbox\csname #1\endcsname}
-\providecommand*{\setnamebox}[1]{%
- \expandafter\setbox\csname #1\endcsname}
-\providecommand*{\unhnamebox}[1]{%
- \expandafter\unhbox\csname #1\endcsname}
-\providecommand*{\unvnamebox}[1]{%
- \expandafter\unvbox\csname #1\endcsname}
-\providecommand*{\namebox}[1]{%
- \csname #1\endcsname}
-
-\providecommand*{\newnamecount}[1]{%
- \expandafter\newcount\csname #1\endcsname}
-\providecommand*{\usenamecount}[1]{%
- \csname #1\endcsname}
-
\newif\ifl at dusedbabel
\patchcmd{\bbl at set@language}%
{\select at language{\languagename}}%
@@ -2381,10 +2381,10 @@
\newcommand{\finish at Pages@notes}{%
\def\do##1{%
\ifnocritical@%
- \global\newnamebox{##1footins}
+ \global\newnamebox{##1footins}%
\fi
\ifnofamiliar@%
- \global\newnamebox{footins##1}
+ \global\newnamebox{footins##1}%
\fi
\ifvoid\csuse{##1footins}%
\ifvoid\csuse{footins##1}\else%
@@ -2422,6 +2422,7 @@
\newcommand*{\clearl at dleftpage}{%
\ifdim\pagetotal=0pt\hbox{}\fi%
\newpage%
+ \insert at notes@for at onlyside%
\ifodd\c at page\else
\led at err@LeftOnRightPage
\hbox{}%
@@ -2431,6 +2432,7 @@
\newcommand*{\clearl at drightpage}{%
\ifdim\pagetotal=0pt\hbox{}\fi%
\newpage%
+ \insert at notes@for at onlyside%
\ifodd\c at page
\led at err@RightOnLeftPage
\hbox{}%
More information about the tex-live-commits
mailing list