texlive[42785] Master/texmf-dist: reledmac (24dec16)
commits+karl at tug.org
commits+karl at tug.org
Sat Dec 24 23:12:47 CET 2016
Revision: 42785
http://tug.org/svn/texlive?view=revision&revision=42785
Author: karl
Date: 2016-12-24 23:12:46 +0100 (Sat, 24 Dec 2016)
Log Message:
-----------
reledmac (24dec16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-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_inside-outside-columns.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_pages_titles_in_line_numbering_with_notes.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/makefile
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
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
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_inside-outside-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/makefile 2016-12-24 10:43:10 UTC (rev 42784)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/makefile 2016-12-24 22:12:46 UTC (rev 42785)
@@ -42,7 +42,7 @@
rm -rf reledmac
mkdir reledmac
@xelatex reledmac.dtx #We call it at last time because reledmac handbook can refer to page of reledpar handbook, and so we need to run reledmac.dtx a last time after reledpar.dtx has been run
- rm examples/*pdf
+ rm -f examples/*pdf
$(MAKE) -C examples all
mkdir reledmac/examples
ln examples/latexmkrc reledmac/examples
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-12-24 10:43:10 UTC (rev 42784)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-12-24 22:12:46 UTC (rev 42785)
@@ -452,6 +452,8 @@
% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
% \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
% \changes{v2.16.8}{2016/12/16}{Fix bug with \protect\cs{edindex} in footnote in parallel typesetting}
+% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.}
+% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.}
% \title{\Macpackage \\
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
@@ -1698,6 +1700,12 @@
% By default, it is \enquote{Ms.}.
% You can change it using \cs{setmsdatalabel}\marg{txt}.
%
+% \DescribeMacro{\setmsdataposition}
+% If you tel that the manuscript apparatus will be on the same level of critical footnotes than other apparatus, for each line, reledmac will first insert manuscript apparatus, then other footnotes.
+% You can change it using:\\
+% \cs{msdataposition}\arg{regular-msdata}\\
+% And restore the default behavior using
+% \cs{msdataposition}\arg{msdata-regular}
% \subsection{Familiar notes} \label{sec:desc:familiar}
%
%
@@ -3848,7 +3856,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/12/16 v2.16.8 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/12/23 v2.17.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4370,7 +4378,7 @@
% \begin{macro}{\led at error@PackageAfterEledmac}
% \begin{macrocode}
\newcommand{\led at error@PackageAfterEledmac}[1]{%
- \reledmac at error{#1 must be loaded before reledmac.}{\@ehc}%
+ \reledmac at error{#1 must be loaded before reledmac}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4377,7 +4385,7 @@
% \begin{macro}{\led at error@fail at patch@@makecol}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@@makecol}{%
- \reledmac at error{Fail to patch \string\@makecol\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@makecol\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4384,7 +4392,7 @@
% \begin{macro}{\led at error@fail at patch@@reinserts}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@@reinserts}{%
- \reledmac at error{Fail to patch \string\@reinserts\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@reinserts\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4391,7 +4399,7 @@
% \begin{macro}{\led at error@fail at patch@@doclearpage}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@@doclearpage}{%
- \reledmac at error{Fail to patch \string\@doclearpage\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@doclearpage\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4399,7 +4407,7 @@
% \begin{macro}{\led at error@fail at patch@@iiiminipage}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@@iiiminipage}{%
- \reledmac at error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@iiiminipage\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4406,7 +4414,7 @@
% \begin{macro}{\led at error@fail at patch@endminipage}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@endminipage}{%
- \reledmac at error{Failed to patch the \string\endminipage\space command.}{\@ehc}%
+ \reledmac at error{Failed to patch the \string\endminipage\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4413,7 +4421,7 @@
% \begin{macro}{\led at error@fail at patch@endminipage}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@makeindex}{%
- \reledmac at error{Failed to patch the \string\makeindex\space command.}{\@ehc}%
+ \reledmac at error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -8121,14 +8129,20 @@
\global\@firstlineofpagefalse%
\fi%
% \end{macrocode}
-% Insert footnotes made of manuscripts data.
+% Insert footnotes made of manuscripts data and critical footnotes.
% \begin{macrocode}
- \insert at msdata%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
% \end{macrocode}
-% Restore marginal and footnotes.
+% Insert marginal notes.
% \begin{macrocode}
- \add at inserts%
- \add at Xgroupbyline%
\affixside at note%
% \end{macrocode}
% Print left notes.
@@ -8179,9 +8193,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert at msdata%
- \add at inserts%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at note%
\numdef{\temp@}{\l at dnumpstartsL-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
@@ -16286,7 +16306,7 @@
GLSuservi%
}%
% \end{macrocode}
-% First those which arguments are \oarg{options}\marg{label}\marg{link text}.
+% Then those which arguments are \oarg{options}\marg{label}\marg{link text}.
% \begin{macrocode}
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{%
@@ -16299,6 +16319,20 @@
}%
}%
\docsvlist{glsdisp,glslink}%
+% \end{macrocode}
+% Then those which arguments are \oarg{options}\marg{label}.
+% \begin{macrocode}
+ \renewcommand{\do}[1]{%
+ \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname[counter=pageline,##1]{##2}%
+ }%
+ \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ }%
+ }%
+ \docsvlist{glsadd}%
}{}%
}%
% \end{macrocode}
@@ -16770,6 +16804,15 @@
\def\@msdata at series{A}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\setmsdataposition}
+% The label for the manuscripts data.
+% \begin{macrocode}
+\def\ms at data@position{msdata-regular}%
+\newcommand{\setmsdataposition}[1]{%
+ \gdef\ms at data@position{#1}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\setmsdatalabel}
% The label for the manuscripts data.
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-12-24 10:43:10 UTC (rev 42784)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2016-12-24 22:12:46 UTC (rev 42785)
@@ -295,6 +295,7 @@
% \changes{v.2.15.0}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
% \changes{v2.15.0}{2016/12/12}{Fix bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
% \changes{v2.15.0}{2016/12/12}{Fix bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
+% \changes{v2.15.0}{2016/12/12}{Compatibility with \protect\cs{setmsdataposition}}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1250,7 +1251,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/12/23 v2.16.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3657,9 +3658,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert at msdata%
- \add at inserts%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at note%
}%
{\print at lineL}%
@@ -3700,10 +3707,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert at msdata%
- \add at inserts%
- \add at Xgroupbyline%
- \affixside at note%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\l at dlsn@te%
\do at insidelineLhook%
\hb at xt@ \Lcolwidth{\ledllfill\hb at xt@ \wd\one at line{%
@@ -3832,9 +3844,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert at msdata%
- \add at insertsR%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ }{%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at noteR%
}%
{\print at lineR}%
@@ -3877,9 +3895,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert at msdata%
- \add at insertsR%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ }{%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at noteR%
\l at dlsn@te%
\do at insidelineRhook%
@@ -3891,7 +3915,8 @@
\fi%
\l at dunhbox@line{\one at lineR}}\ledrlfill\l at drd@ta%
\l at drsn@te%
- }}
+ }%
+}
\def\print at eledsectionR{%
\addtocounter{pstartR}{-1}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-12-24 10:43:10 UTC (rev 42784)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-12-24 22:12:46 UTC (rev 42785)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/12/16 v2.16.8 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/12/23 v2.17.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -280,25 +280,25 @@
\reledmac at error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}%
}%
\newcommand{\led at error@PackageAfterEledmac}[1]{%
- \reledmac at error{#1 must be loaded before reledmac.}{\@ehc}%
+ \reledmac at error{#1 must be loaded before reledmac}{\@ehc}%
}%
\newcommand{\led at error@fail at patch@@makecol}{%
- \reledmac at error{Fail to patch \string\@makecol\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@makecol\space command}{\@ehc}%
}%
\newcommand{\led at error@fail at patch@@reinserts}{%
- \reledmac at error{Fail to patch \string\@reinserts\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@reinserts\space command}{\@ehc}%
}%
\newcommand{\led at error@fail at patch@@doclearpage}{%
- \reledmac at error{Fail to patch \string\@doclearpage\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@doclearpage\space command}{\@ehc}%
}%
\newcommand{\led at error@fail at patch@@iiiminipage}{%
- \reledmac at error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}%
+ \reledmac at error{Fail to patch \string\@iiiminipage\space command}{\@ehc}%
}%
\newcommand{\led at error@fail at patch@endminipage}{%
- \reledmac at error{Failed to patch the \string\endminipage\space command.}{\@ehc}%
+ \reledmac at error{Failed to patch the \string\endminipage\space command}{\@ehc}%
}%
\newcommand{\led at error@fail at patch@makeindex}{%
- \reledmac at error{Failed to patch the \string\makeindex\space command.}{\@ehc}%
+ \reledmac at error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
\newcommand{\led at warn@edinde at outsidenumbering}{%
\reledmac at warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
@@ -1781,9 +1781,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert at msdata%
- \add at inserts%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at note%
\l at dlsn@te
{\ledllfill\hb at xt@ \wd\one at line{\new at line%
@@ -1802,9 +1808,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert at msdata%
- \add at inserts%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at note%
\numdef{\temp@}{\l at dnumpstartsL-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
@@ -6462,6 +6474,17 @@
}%
}%
\docsvlist{glsdisp,glslink}%
+ \renewcommand{\do}[1]{%
+ \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname[counter=pageline,##1]{##2}%
+ }%
+ \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ }%
+ }%
+ \docsvlist{glsadd}%
}{}%
}%
\def\@hangingsymbol{}
@@ -6691,6 +6714,10 @@
\gdef\@msdata at series{#1}%
}%
\def\@msdata at series{A}%
+\def\ms at data@position{msdata-regular}%
+\newcommand{\setmsdataposition}[1]{%
+ \gdef\ms at data@position{#1}%
+}%
\def\ms at data@label{Ms.}%
\newcommand{\setmsdatalabel}[1]{%
\gdef\ms at data@label{#1}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-12-24 10:43:10 UTC (rev 42784)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2016-12-24 22:12:46 UTC (rev 42785)
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/12/23 v2.16.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1086,9 +1086,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert at msdata%
- \add at inserts%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at note%
}%
{\print at lineL}%
@@ -1121,10 +1127,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert at msdata%
- \add at inserts%
- \add at Xgroupbyline%
- \affixside at note%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at inserts%
+ \add at Xgroupbyline%
+ }{%
+ \add at inserts%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\l at dlsn@te%
\do at insidelineLhook%
\hb at xt@ \Lcolwidth{\ledllfill\hb at xt@ \wd\one at line{%
@@ -1212,9 +1223,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert at msdata%
- \add at insertsR%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ }{%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at noteR%
}%
{\print at lineR}%
@@ -1250,9 +1267,15 @@
\set at Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert at msdata%
- \add at insertsR%
- \add at Xgroupbyline%
+ \ifdefstring{\ms at data@position}{msdata-regular}{%
+ \insert at msdata%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ }{%
+ \add at insertsR%
+ \add at Xgroupbyline%
+ \insert at msdata%
+ }%
\affixside at noteR%
\l at dlsn@te%
\do at insidelineRhook%
@@ -1264,7 +1287,8 @@
\fi%
\l at dunhbox@line{\one at lineR}}\ledrlfill\l at drd@ta%
\l at drsn@te%
- }}
+ }%
+}
\def\print at eledsectionR{%
\addtocounter{pstartR}{-1}%
More information about the tex-live-commits
mailing list