summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-09-02 21:44:34 +0000
committerKarl Berry <karl@freefriends.org>2017-09-02 21:44:34 +0000
commita7f7f3b04a2de49df22e775296655dc13bfe53bc (patch)
tree138cb34a518ba5fc6d2a6b7fcd02e9037d7fb71d /Master/texmf-dist/tex/latex/reledmac
parent61fbab0a750d1a8e32eacd11f3421b7c84820fe7 (diff)
reledmac (1sep17)
git-svn-id: svn://tug.org/texlive/trunk@45201 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty110
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty97
2 files changed, 115 insertions, 92 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 5e12a48f12f..dae1ca5172a 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}[2017/08/17 v2.24.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/08/31 v2.24.1 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -160,7 +160,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…\pend)}{\@ehc}}%
+ \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}%
\newcommand*{\led@mess@NotesChanged}{%
\typeout{reledmac reminder: }%
\typeout{ The number of the footnotes in this section
@@ -199,7 +199,7 @@
\newcommand*{\led@err@PstartNotNumbered}{%
\reledmac@error{\string\pstart\space must be used within a
numbered section %
- (\string\beginnumbering…\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}}
@@ -277,7 +277,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…\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}%
@@ -307,7 +307,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…\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.}%
@@ -343,6 +343,7 @@
\newif\ifledRcol
\newif\ifledRcol@
\newif\ifnumberingR
+\newif\ifafterendnumberingR%
\newif\ifXnote@%
\providebool{indtl@innote}%
\providebool{indtl@notenumber}%
@@ -357,10 +358,22 @@
\endnumbering
\fi
\global\numberingtrue
+ \global\afterendnumberingRfalse%
\global\advance\section@num \@ne
\initnumbering@reg
\message{Section \the\section@num }%
\line@list@stuff{\jobname.\extensionchars\the\section@num}%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \unless\ifl@dpairing%
+ \ledRcoltrue%
+ \global\advance\section@numR \@ne%
+ \message{Section \the\section@numR R (continuoousnumbering)}%
+ \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
+ \ledRcolfalse%
+ \fi%
+ \fi%
+ \fi%
\l@dend@stuff
\setcounter{pstart}{1}
\ifl@dpairing
@@ -463,6 +476,17 @@
\led@mess@SectionContinued{\the\section@num}%
\set@continuousnumberingforL%
\line@list@stuff{\jobname.\extensionchars\the\section@num}%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \unless\ifl@dpairing%
+ \ledRcoltrue%
+ \global\advance\section@numR \@ne%
+ \message{Section \the\section@numR R (continuoousnumbering)}%
+ \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
+ \ledRcolfalse%
+ \fi%
+ \fi%
+ \fi%
\l@dend@stuff
\ifl@dpairing\else%
\begingroup%
@@ -480,16 +504,6 @@
\newcommand{\set@continuousnumberingforL}{%
\ifcontinuousnumberingwithcolumns%
- \ifdefined\line@numR%
- \ifnum\line@numR>\line@num%
- \global\appto\next@line@list@stuff{%
- \expandafter\setlinenum\expandafter{\the\line@numR}%
- }%
- \fi%
- \ifnum\last@page@numR>\last@page@num%
- \global\last@page@num=\last@page@numR%
- \fi%
- \fi%
\ifl@dpairing%
\unless\ifl@dpaging%
\global\c@pstartL=\c@pstart%
@@ -871,7 +885,16 @@
\csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}%
\ifbypage@R
\ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum
- \line@numR \z@ \subline@numR \z@%
+ \ifboolexpr{%
+ bool{resumenumberingR@start}%
+ and test {\ifnumequal{\last@page@numR}{-10000}}%
+ }%
+ {}%
+ {%
+ \line@numR \z@%
+ \subline@numR \z@%
+ \global\csdef{reset@lineR\the\numexpr\absline@numR+1\relax @\the\section@numR}{}%
+ }%
\fi%
\fi
\global\page@numR=#1%
@@ -886,6 +909,7 @@
\ifbypage@
\ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum
\line@num \z@ \subline@num \z@%
+ \global\csdef{reset@line\the\numexpr\absline@num+1\relax @\the\section@num}{}%
\fi%
\fi
\global\page@num=#1%
@@ -1236,6 +1260,8 @@
\IfFileExists{\l@auxdir#1}%
{\global\toggletrue{notfirstrun@#1}}%
{\global\togglefalse{notfirstrun@#1}}%
+ \next@line@list@stuff%
+ \global\let\next@line@list@stuff\relax%
\read@linelist{#1}%
\iffirst@linenum@out@
\global\first@linenum@out@false%
@@ -1255,8 +1281,6 @@
\write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}%
\fi%
\fi%
- \next@line@list@stuff%
- \global\let\next@line@list@stuff\relax%
}%
\newcommand*{\new@line}{%
@@ -1942,14 +1966,23 @@
}%
\affixside@note%
\l@dlsn@te
- {\ledllfill\hb@xt@ \wd\one@line{\new@line%
- \ifluatex%
- \textdir\l@luatextextdir@L%
+ {\ledllfill\hb@xt@ \wd\one@line{%
+ \new@line%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \new@lineR%
+ \xappto\next@line@list@stuffR{%
+ \unexpanded{\global\line@numR=}\the\line@num%
+ }%
+ \fi%
\fi%
- \inserthangingsymbol%
- \l@dunhbox@line{\one@line}}%
- \ledrlfill\l@drd@ta%
- \l@drsn@te
+ \ifluatex%
+ \textdir\l@luatextextdir@L%
+ \fi%
+ \inserthangingsymbol%
+ \l@dunhbox@line{\one@line}}%
+ \ledrlfill\l@drd@ta%
+ \l@drsn@te%
}}%
\add@penalties%
}
@@ -2062,21 +2095,18 @@
\global\resumenumbering@startfalse%
\fi%
\fi%
- \unless\ifresumenumbering@start%
- \global\@firstlineofpagetrue%
- \fi%
- \ifbypage@
- \ifcsdef{l@dchset@num@\the\absline@num}%
- {%
- \global\csundef{l@dchset@num@\the\absline@num}%
- }%
- {%
- \unless\ifresumenumbering@start%
- \global\line@num=\z@ \global\subline@num=\z@%
- \resetprevline@%
- \fi%
- }%
- \fi
+ \ifboolexpr{%
+ bool{resumenumbering@start}%
+ and test {\ifdimgreater{\pagedepth}{\z@}}%
+ }%
+ {}%
+ {\global\@firstlineofpagetrue}%
+ \ifcsdef{reset@line\the\absline@num @\the\section@num}%
+ {%
+ \global\line@num=\z@ \global\subline@num=\z@%
+ \resetprevline@%
+ }%
+ {}%
\global\resumenumbering@startfalse%
\add@msdata@firstlineofpage%
\else
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 482b50f5f48..0e7a22478e9 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -27,9 +27,8 @@
-
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/08/23 v2.20.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/08/31 v2.20.2 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -149,7 +148,7 @@
Use instead #1R or #1* in your preamble.}%
}
\newcommand{\led@error@missing@numbering}[1]{%
- \reledpar@error{Missing \string\pstart…\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}
@@ -193,6 +192,7 @@
\global\l@dnumpstartsR \z@
\global\pst@rtedRfalse
\global\numberingRtrue
+ \global\afterendnumberingRfalse%
\global\advance\section@numR \@ne
\global\absline@numR \z@
\gdef\normal@page@breakR{}
@@ -209,6 +209,9 @@
\global\let\@msdata@list\relax%
\global\csundef{@msdata@\add@msd@cR @dataR}%
\ifcontinuousnumberingwithcolumns%
+ \ifnumbering%
+ \global\resumenumberingR@starttrue%
+ \fi%
\ifnumberpstart%
\addtocounter{pstartR}{1}%
\fi%
@@ -216,7 +219,6 @@
\setcounter{pstartR}{1}%
\fi%
\message{Section \the\section@numR R }%
- \set@continuousnumberingforR%
\line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
\l@dend@stuff
\begingroup
@@ -235,6 +237,7 @@
\def\endnumberingR{%
\ifnumberingR
\global\numberingRfalse
+ \global\afterendnumberingRtrue%
\normal@pars
\ifnum\l@dnumpstartsR=0%
\led@err@NumberingWithoutPstart%
@@ -300,7 +303,10 @@
\else%
\global\pausenumbering@page@numR=\next@page@numR%
\fi%
- \endnumberingR\global\numberingRtrue}
+ \endnumberingR%
+ \global\numberingRtrue%
+ \global\afterendnumberingRfalse%
+}%
\newif\ifresumenumberingR@start%
\newcommand*{\resumenumberingR}{%
\ifnumberingR
@@ -308,7 +314,6 @@
\global\advance\section@numR \@ne
\global\resumenumberingR@starttrue%
\led@mess@SectionContinued{\the\section@numR R}%
- \set@continuousnumberingforR%
\line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
\l@dend@stuff
\begingroup%
@@ -372,18 +377,6 @@
\fi
\fi
\fi}}
-\newcommand{\set@continuousnumberingforR}{%
- \ifcontinuousnumberingwithcolumns%
- \ifnum\line@numR<\line@num%
- \global\appto\next@line@list@stuffR{%
- \expandafter\setlinenum\expandafter{\the\line@num}%
- }%
- \fi%
- \ifnum\last@page@num>\last@page@numR%
- \global\last@page@numR=\last@page@num%
- \fi%
- \fi%
-}
\WithSuffix\newcommand\lineation*[1]{%
\lineation{#1}%
\lineationR{#1}%
@@ -734,6 +727,8 @@
\IfFileExists{\l@auxdir#1}%
{\global\toggletrue{notfirstrun@#1}}%
{\global\togglefalse{notfirstrun@#1}}%
+ \next@line@list@stuffR%
+ \global\let\next@line@list@stuffR\relax%
\read@linelist{#1}%
\iffirst@linenum@out@R
\global\first@linenum@out@Rfalse
@@ -749,8 +744,6 @@
\closeout\linenum@outR%
\openout\linenum@outR=\l@auxdir#1%
\fi%
- \next@line@list@stuffR%
- \global\let\next@line@list@stuffR\relax%
}%
\newcommand*{\new@lineL}{%
@@ -1232,21 +1225,23 @@
\global\advance\@donetotallinesL\@ne%
\else%
\iflinenumberLevenifblank
- \new@lineL%
- \l@demptyd@ta%
- \getline@numL%
- \affixline@num%
\setbox\l@dleftbox \hb@xt@ \Lcolwidth{%
+ \new@lineL%
+ \l@demptyd@ta%
+ \getline@numL%
+ \affixline@num%
\l@dld@ta%
\hspace*{\Lcolwidth}%
\ledrlfill\l@drd@ta%
}%
\else%
- \ifcontinuousnumberingwithcolumns%
- \new@lineL%
- \getline@numL%
- \fi%
- \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}%
+ \setbox\l@dleftbox \hb@xt@ \Lcolwidth{%
+ \ifcontinuousnumberingwithcolumns%
+ \new@lineL%
+ \getline@numL%
+ \fi%
+ \hspace*{\Lcolwidth}%
+ }%
\fi%
\global\advance\@donetotallinesL\@ne%
\fi%
@@ -1366,21 +1361,23 @@
\global\advance\@donetotallinesR\@ne%
\else%
\iflinenumberRevenifblank%
- \new@lineR
- \l@demptyd@ta%
- \getline@numR%
\setbox\l@drightbox \hb@xt@ \Rcolwidth{%
+ \new@lineR%
+ \l@demptyd@ta%
+ \getline@numR%
\affixline@numR%
\l@dld@ta%
\hspace*{\Rcolwidth}%
\ledrlfill\l@drd@ta%
}%
\else%
- \ifcontinuousnumberingwithcolumns%
- \new@lineR%
- \getline@numR%
- \fi%
- \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}%
+ \setbox\l@drightbox \hb@xt@ \Rcolwidth{%
+ \ifcontinuousnumberingwithcolumns%
+ \new@lineR%
+ \getline@numR%
+ \fi%
+ \hspace*{\Rcolwidth}%
+ }%
\fi%
\global\advance\@donetotallinesR\@ne%
\fi%
@@ -1541,22 +1538,18 @@
\@l@dtempcntb=\absline@numR
\ifnum\@l@dtempcntb<\next@actionlineR\else
\ifnum\next@actionR>-1001\relax
- \unless\ifresumenumberingR@start%
- \@firstlineofpageRtrue%
- \fi%
+ \ifboolexpr{%
+ bool{resumenumberingR@start}%
+ and test {\ifdimgreater{\pagedepth}{\z@}}%
+ }%
+ {}%
+ {\@firstlineofpageRtrue}%
\global\page@numR=\next@actionR
- \ifbypage@R
- \ifcsdef{l@dchset@num@R\the\absline@numR}%
- {%
- \global\csundef{l@dchset@num@R\the\absline@numR}%
- }%
- {%
- \unless\ifresumenumberingR@start%
- \global\line@numR \z@%
- \global\subline@numR \z@%
- \fi%
- }%
- \fi
+ \ifcsdef{reset@lineR\the\absline@numR @\the\section@numR}%
+ {%
+ \global\line@numR=\z@ \global\subline@numR=\z@%
+ }%
+ {}%
\global\resumenumberingR@startfalse%
\add@msdata@firstlineofpage%
\else