summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-07-15 20:48:30 +0000
committerKarl Berry <karl@freefriends.org>2019-07-15 20:48:30 +0000
commit7a4db7bf8cd94e48795dc8fdf633969f194dc121 (patch)
tree0fb1a3186d0ce9fca3798e26c3f8f03b29f46a66 /Master/texmf-dist/tex/latex/reledmac
parentd9868fe3a5f5102ec308dbd78e705b29a1773fe8 (diff)
reledmac (15jul19)
git-svn-id: svn://tug.org/texlive/trunk@51645 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty95
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty2
2 files changed, 88 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index b27772787dc..f383181c2a4 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/06/19 v2.31.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/07/15 v2.32.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -166,7 +166,7 @@
\newcommand*{\led@err@NumberingShouldHaveStarted}{%
\reledmac@error{Numbering should already have been started}{\@ehc}}
\newcommand*{\led@err@edtextoutsidepstart}{%
- \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}%
+ \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space ...\space\pend)}{\@ehc}}%
\newcommand{\led@err@PstartInEdtext}[1]{%
\reledmac@error{\string\pstart\space in \string\edtext\space #1 argument}{\@ehc}%
@@ -213,7 +213,7 @@
\newcommand*{\led@err@PstartNotNumbered}{%
\reledmac@error{\string\pstart\space must be used within a
numbered section %
- (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}%
+ (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}}%
\newcommand*{\led@err@PstartInPstart}{%
\reledmac@error{\string\pstart\space encountered while another
\string\pstart\space was in effect}{\@ehc}}
@@ -291,7 +291,7 @@
\newcommand*{\led@err@ReverseColumns}{%
\reledmac@error{Start column is greater than end column}{\@ehc}}
\newcommand{\led@err@toendnotes@outsidenumbering}{%
- \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}%
+ \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}%
}%
\newcommand{\led@err@EdtextWithoutFootnote}{%
\reledmac@error{edtext without Xfootnote. Check syntaxis}{\@ehc}%
@@ -321,7 +321,7 @@
\reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
\newcommand{\led@warn@edinde@outsidenumbering}{%
- \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
+ \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
\newcommand{\led@warning@hsizeX@deprecated}{%
\reledmac@warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}%
@@ -3640,6 +3640,31 @@
\fi%
\fi%
}{}%
+ \iftoggle{Xlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ and test{\ifcsequal{annot@end}{prevannot@end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot@start@print{%
+ \l@wrapcs@ifnotemptybox{Xwraplinenumannotation@\@currentseries}{\csuse{Xsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot@end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l@d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot@start@\@currentseries}{\annot@start}%
+ \global\cslet{prevannot@end@\@currentseries}{\annot@end}%
+ }%
+ {}%
}%
\newif\ifistwofollowinglines@%
\newcommand{\setistwofollowinglines}[4]{%
@@ -4930,6 +4955,31 @@
\fi%
\fi%
}{}%
+ \iftoggle{Xendlinenumannotationonlyfirst@\@currentseries}{%
+ \ifboolexpr{%
+ (%
+ togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ and test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ and test{\ifcsequal{annot@end}{prevannot@end@\@currentseries}}%
+ )%
+ or%
+ (%
+ not togl{Xendlinenumannotationonlyfirstintwo@\@currentseries}%
+ test{\ifcsequal{annot@start}{prevannot@start@\@currentseries}}%
+ )%
+ }{%
+ \def\@annot@start@print{%
+ \l@wrapcs@ifnotemptybox{Xendwraplinenumannotation@\@currentseries}{\csuse{Xendsymlinenumannotation@\@currentseries}}%
+ }%
+ \let\@annot@end@print\relax%
+ \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number
+ \l@d@dashfalse%
+ \fi%
+ }{}%
+ \global\cslet{prevannot@start@\@currentseries}{\annot@start}%
+ \global\cslet{prevannot@end@\@currentseries}{\annot@end}%
+ }%
+ {}%
}%
\def\printendlines#1|#2|#3|#4|#5|#6|#7|#8|{%
\begingroup
@@ -5099,10 +5149,15 @@
\csgdef{Xboxendlinenum@#1}{0pt}%
\csgdef{Xboxsymlinenum@#1}{0pt}%
- \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xgroupbyline@#1}%
\newtoggle{Xgroupbylineseparetwolines@#1}%
+
+ \newtoggle{Xnumberonlyfirstinline@#1}%
\newtoggle{Xnumberonlyfirstintwolines@#1}%
+
+ \newtoggle{Xlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xtwolines@#1}{}%
\csgdef{Xmorethantwolines@#1}{}%
\csgdef{Xsublinesep@#1}{\fullstop}%
@@ -5114,7 +5169,10 @@
\newtoggle{Xpstart@#1}%
\newtoggle{Xstanza@#1}%
\csgdef{Xstanzaseparator@#1}{}%
+
\csgdef{Xsymlinenum@#1}{}%
+ \csgdef{Xsymlinenumannotation@#1}{}%
+
\newtoggle{Xnonumber@#1}%
\csgdef{Xbeforenumber@#1}{0pt}%
\csgdef{Xtxtbeforenumber@#1}{}%
@@ -5173,7 +5231,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl@notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote@true%
\noexpand\prepare@Xprenotes{#1}%
@@ -5210,7 +5268,7 @@
{\unexpanded{\let\index\nindex}}%
{}%
\ifbool{indtl@notenumber}%
- {\unexpanded{\let\index\nindex}}%There is no note number… so
+ {\unexpanded{\let\index\nindex}}%There is no note number... so
{}%
\noexpand\Xnote@true%
\noexpand\prepare@Xprenotes{#1}%
@@ -5421,12 +5479,19 @@
\newtoggle{Xendnonumber@#1}%
\csgdef{Xendhangindent@#1}{0pt}%
+
\newtoggle{Xendnumberonlyfirstinline@#1}%
\newtoggle{Xendnumberonlyfirstintwolines@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirst@#1}%
+ \newtoggle{Xendlinenumannotationonlyfirstintwo@#1}%
+
\csgdef{Xendbeforesymlinenum@#1}{\csuse{Xendbeforenumber@#1}}%
\csgdef{Xendaftersymlinenum@#1}{\csuse{Xendafternumber@#1}}%
+
\csgdef{Xendsymlinenum@#1}{}%
+ \csgdef{Xendsymlinenumannotation@#1}{}%
+
\csgdef{Xendboxsymlinenum@#1}{0pt}%
\csgdef{Xendbhooklinenumber@#1}{}%
@@ -5579,6 +5644,7 @@
\newhookcommand@series@reload{Xbhookgroup}{critical}
\newhookcommand@series{Xboxsymlinenum}%
\newhookcommand@series{Xsymlinenum}
+ \newhookcommand@series{Xsymlinenumannotation}%
\newhookcommand@series{Xbeforenumber}
\newhookcommand@series{Xtxtbeforenumber}
\newhookcommand@series{Xafternumber}
@@ -5594,6 +5660,8 @@
\newhookcommand@series@reload{Xafterrule}{critical}
\newhooktoggle@series{Xnumberonlyfirstinline}
\newhooktoggle@series{Xnumberonlyfirstintwolines}
+ \newhooktoggle@series{Xlinenumannotationonlyfirst}%
+ \newhooktoggle@series{Xlinenumannotationonlyfirstintwo}%
\newhooktoggle@series{Xgroupbyline}%
\newhooktoggle@series{Xgroupbylineseparetwolines}%
\newhooktoggle@series{Xnonumber}
@@ -5705,11 +5773,16 @@
\newhooktoggle@series{Xendnumberonlyfirstinline}%
\newhooktoggle@series{Xendnumberonlyfirstintwolines}%
+ \newhooktoggle@series{Xendlinenumannotationonlyfirst}%
+ \newhooktoggle@series{Xendlinenumannotationonlyfirstintwo}%
+
\newhookcommand@series{Xendsymlinenum}%
\newhookcommand@series{Xendbeforesymlinenum}%
\newhookcommand@series{Xendaftersymlinenum}%
\newhookcommand@series{Xendboxsymlinenum}%
+ \newhookcommand@series{Xendsymlinenumannotation}%
+
\newhookcommand@series{Xendbhooklinenumber}%
\newhookcommand@series{Xendahooklinenumber}%
\newhookcommand@series{Xendbhookinplaceofnumber}%
@@ -6361,6 +6434,9 @@
\newtoggle{Xlineflag@SEref}%
\toggletrue{Xlineflag@SEref}%%Here exception
+\newtoggle{Xlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintlines
+\newtoggle{Xlinenumannotationonlyfirst@appref}%Idem
+
\def\Xlinenumannotationposition@appref{after}%
\def\Xlinenumannotationposition@SEref{after}%
@@ -6406,6 +6482,9 @@
\newtoggle{Xendlineflag@SErefwithpage}
\toggletrue{Xendlineflag@SErefwithpage}%Here, exception
+\newtoggle{Xendlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintendlines
+\newtoggle{Xendlinenumannotationonlyfirst@appref}%Idem
+
\def\Xendlinenumannotationposition@apprefwithpage{after}%
\def\Xendlinenumannotationposition@apprefwithpage@SErefwithpage{after}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index e2a5ffc3ec9..daeadd1eb8a 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -146,7 +146,7 @@
Use instead #1R or #1* in your preamble.}%
}
\newcommand{\led@error@missing@numbering}[1]{%
- \reledpar@error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}%
+ \reledpar@error{Missing \string\pstart\space ...\space\string\pend\space inside `#1` environment}{\@ehc}%
}%
\providecommand*{\newnamebox}[1]{%
\expandafter\newbox\csname #1\endcsname}