summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-07-07 21:07:15 +0000
committerKarl Berry <karl@freefriends.org>2017-07-07 21:07:15 +0000
commit53377e1f01537a2ee3e43cd67f0c41c9cb34cd20 (patch)
treef2f07cd0864a16dabd4c57e68dd55da2bfa4960a /Master/texmf-dist/tex/latex/reledmac
parent0b3bc08010f3aba0300a4cf48d6decd6fe1f5160 (diff)
reledmac (7jul17)
git-svn-id: svn://tug.org/texlive/trunk@44765 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty39
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty11
2 files changed, 37 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index ce67d1d6b93..3b9ec62d8d3 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/06/08 v2.22.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/07/07 v2.22.1 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -452,22 +452,30 @@
\csuse{setpositionliketwocolumns@\columns@position}%
\fi%
\fi%
- \ifcontinuousnumberingwithcolumns%
- \ifdefined\line@numR%
- \ifnum\line@numR>\line@num%
- \expandafter\setlinenum\expandafter{\the\line@numR}%
- \fi%
- \ifnum\last@page@numR>\last@page@num%
- \global\last@page@num=\last@page@numR%
- \fi%
- \fi%
- \fi%
+ \set@continuousnumberingforL%
\else
\led@err@NumberingShouldHaveStarted
\endnumbering
\beginnumbering
\fi}
+\newcommand{\set@continuousnumberingforL}{%
+ \ifcontinuousnumberingwithcolumns%
+ \ifdefined\line@numR%
+ \ifnum\line@numR>\line@num%
+ \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%
+ \fi%
+ \fi%
+ \fi%
+}%
\newcommand*{\list@create}[1]{%
\global\let#1=\empty%
}%
@@ -1536,6 +1544,11 @@
\newcommand{\get@sw@txt}[1]{%
\begingroup%
\let\sameword\@firstofone%Allow to have nested \sameword
+ \let\emph\@firstofone%
+ \let\textit\@firstofone%
+ \let\textbf\@firstofone%
+ \let\textsc\@firstofone%
+ \let\framebox\@firstofone%
\ifxetex%
\xdef\sw@txt{#1}%
\else%
@@ -1766,6 +1779,10 @@
\global\pstartnumtrue%
\fi%
\addtocounter{pstart}{1}%
+ \ifcontinuousnumberingwithcolumns%
+ \addtocounter{pstartL}{1}%
+ \addtocounter{pstartR}{1}%
+ \fi%
\normal@pars%
\ifboolexpr{%
test {\ifstrempty{#1}}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 111c7f61ea5..007908d4171 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/06/15 v2.19.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/07/07 v2.19.2 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -203,11 +203,15 @@
\global\stopmsdata@inserted@true%
\global\let\@msdata@list\relax%
\global\csundef{@msdata@\add@msd@cR @dataR}%
+ \ifcontinuousnumberingwithcolumns%
+ \addtocounter{pstartR}{1}%
+ \else%
+ \setcounter{pstartR}{1}%
+ \fi%
\set@continuousnumberingforR%
\message{Section \the\section@numR R }%
\line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
\l@dend@stuff
- \setcounter{pstartR}{1}
\begingroup
\initnumbering@sectcountR
\gdef\eled@sectionsR@@{}%
@@ -1064,6 +1068,9 @@
\ifnumberpstart%
\addtocounter{pstartL}{1}%
\fi
+ \ifcontinuousnumberingwithcolumns%
+ \addtocounter{pstart}{1}%
+ \fi%
\parledgroup@beforenotes@save{L}%
\providetoggle{after@pendL@\the\l@dnumpstartsL @par}%
\ifboolexpr{%