summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-04-07 20:58:43 +0000
committerKarl Berry <karl@freefriends.org>2018-04-07 20:58:43 +0000
commit84deb36e8bed487533cffa6c630f307f030cb590 (patch)
treef8dc1828fb9192d9d5459349df3ee877f7f7e55b /Master/texmf-dist/tex/latex/reledmac
parent9e5940c56dfe63fab26f34250ac55e37ece2c560 (diff)
reledmac (7apr18)
git-svn-id: svn://tug.org/texlive/trunk@47359 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty93
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty79
2 files changed, 88 insertions, 84 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 1e6b2346737..fa11aae4eab 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -35,9 +35,11 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/02/28 v2.26.6 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/04/07 v2.26.7 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
+\newif\ifsameparallelpagenumber%
+\newif\ifprevpgnotnumbered%%
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
\ExecuteOptionsX{series}%
@@ -1328,28 +1330,42 @@
\IfStrEq{\led@pb@setting}{after}%
{\xifinlist{\the\absline@num}{\l@prev@nopb}%
{\xifinlist{\the\absline@num}{\normal@page@break}%
- {\numgdef{\@next@page}{\c@page+\@ne}%
+ {\numgdef{\@next@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\@next@page][\@next@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@c@par@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@page][\thepage]}}}%
+ {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}}%
{}%
\IfStrEq{\led@pb@setting}{before}%
{\numdef{\next@absline}{\the\absline@num+\@ne}%
\xifinlist{\next@absline}{\l@prev@nopb}%
{\xifinlist{\the\absline@num}{\normal@page@break}%
- {\numgdef{\nc@page}{\c@page+\@ne}%
+ {\numgdef{\nc@page}{\c@par@page+\@ne}%
\write\linenum@out{\string\@nl[\nc@page][\nc@page]}%
}%
- {\write\linenum@out{\string\@nl[\the\c@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\@c@par@page][\thepage]}}%
}%
- {\write\linenum@out{\string\@nl[\the\c@page][\thepage]}}%
+ {\write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}}%
}%
{}%
- \IfStrEqCase{\led@pb@setting}{{before}{\relax}{after}{\relax}}[\write\linenum@out{\string\@nl[\the\c@page][\thepage]}]%
+ \IfStrEqCase{\led@pb@setting}%
+ {%
+ {before}{\relax}%
+ {after}{\relax}%
+ }[%
+ \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
+ ]%
}
+\newcommand{\l@the@c@page}{%
+ \ifboolexpr{%
+ bool{sameparallelpagenumber}%
+ or bool{prevpgnotnumbered}%
+ }%
+ {\the\c@par@page}%
+ {\the\c@page}%
+}%
\newif\if@noneed@Footnote%
\newcommand*{\flag@start}{%
@@ -5818,6 +5834,67 @@
}
+
+
+
+\newcommand{\par@patch@thepage}{%
+ \ifboolexpr{%
+ bool{sameparallelpagenumber}%
+ or bool{prevpgnotnumbered}%
+ }%
+ {%
+ \patchcmd{\thepage}%
+ {page}{par@page}%
+ {}%
+ {\led@error@fail@patch@thepage}%
+ }{}%
+}%
+
+\newcommand{\par@patch@pagenumbering}{%
+ \ifboolexpr{%
+ bool{sameparallelpagenumber}%
+ or bool{prevpgnotnumbered}%
+ }%
+ {%
+ \setcounter{par@page}{1}%
+ }%
+ {}%
+ \par@patch@thepage%
+}%
+
+\ifl@dmemoir%
+ \apptocmd{\@mempnum}%
+ {\par@patch@pagenumbering}%
+ {}%%
+ {\led@error@fail@patch@@mempnum}%
+
+\else%
+ \apptocmd{\pagenumbering}%
+ {\par@patch@pagenumbering}%
+ {}%
+ {\led@error@fail@patch@pagenumbering}%
+\fi%
+
+\AtBeginDocument{\par@patch@thepage}%
+\AtBeginDocument{%
+ \apptocmd{\@outputpage}{%
+ \ifsameparallelpagenumber%
+ \ifl@dprintingpages%
+ \ifodd\c@page\else%
+ \stepcounter{par@page}%
+ \fi%
+ \else%
+ \stepcounter{par@page}%
+ \fi%
+ \else%
+ \stepcounter{par@page}%
+ \fi%
+ }%
+ {}%
+ {\led@error@fail@patch@@outputpage}%
+}%
+\newcounter{par@page}%
+\setcounter{par@page}{1}%
\list@create{\labelref@list}
\newcommand*{\zz@@@}{000|000|000}% Set three counters to zero in one go
\newcommand*{\zz@@@@}{000|000|000|000}% Set four counters to zero in one go
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 7b32b3b2a0f..fbab2637338 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/04/06 v2.21.6 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/04/07 v2.21.7 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -67,8 +67,6 @@
\DeclareOptionX{parledgroup}{\parledgrouptrue}
\DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}%
\DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}%
-\newif\ifsameparallelpagenumber
-\newif\ifprevpgnotnumbered
\DeclareOptionX{sameparallelpagenumber}{\sameparallelpagenumbertrue}
\DeclareOptionX{prevpgnotnumbered}{\prevpgnotnumberedtrue}
\DeclareOptionX{prevpgstyle}{\gdef\prevpgstyle{#1}}%
@@ -770,20 +768,10 @@
}%
\newcommand*{\new@lineL}{%
- \ifboolexpr{%
- bool{sameparallelpagenumber}%
- or bool{prevpgnotnumbered}%
- }%
- {\write\linenum@out{\string\@nl[\the\c@par@page][\thepar@page]}}%
- {\write\linenum@out{\string\@nl[\the\c@page][\thepage]}}%
+ \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}%
}%
\newcommand*{\new@lineR}{%
- \ifboolexpr{%
- bool{sameparallelpagenumber}%
- or bool{prevpgnotnumbered}%
- }%
- {\write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}}%
- {\write\linenum@outR{\string\@nl[\the\c@page][\thepage]}}%
+ \write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}%
}%
\newcommand{\newseries@par}[1]{%
@@ -3283,67 +3271,6 @@
\fi
\fi}
-
-
-
-\newcommand{\par@patch@thepage}{%
- \ifboolexpr{%
- bool{sameparallelpagenumber}%
- or bool{prevpgnotnumbered}%
- }%
- {%
- \patchcmd{\thepage}%
- {page}{par@page}%
- {}%
- {\led@error@fail@patch@thepage}%
- }{}%
-}%
-
-\newcommand{\par@patch@pagenumbering}{%
- \ifboolexpr{%
- bool{sameparallelpagenumber}%
- or bool{prevpgnotnumbered}%
- }%
- {%
- \setcounter{par@page}{1}%
- }%
- {}%
- \par@patch@thepage%
-}%
-
-\ifl@dmemoir%
- \apptocmd{\@mempnum}%
- {\par@patch@pagenumbering}%
- {}%%
- {\led@error@fail@patch@@mempnum}%
-
-\else%
- \apptocmd{\pagenumbering}%
- {\par@patch@pagenumbering}%
- {}%
- {\led@error@fail@patch@pagenumbering}%
-\fi%
-
-\AtBeginDocument{\par@patch@thepage}%
-\AtBeginDocument{%
- \apptocmd{\@outputpage}{%
- \ifsameparallelpagenumber%
- \ifl@dprintingpages%
- \ifodd\c@page\else%
- \stepcounter{par@page}%
- \fi%
- \else%
- \stepcounter{par@page}%
- \fi%
- \else%
- \stepcounter{par@page}%
- \fi%
- }%
- {}%
- {\led@error@fail@patch@@outputpage}%
-}
-\newcounter{par@page}%
-\setcounter{par@page}{1}%
\newif\ifPages@mainmatter
\newcommand{\Pages@mainmatter}{%
\ifPages@mainmatter%