summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-03-24 22:23:43 +0000
committerKarl Berry <karl@freefriends.org>2016-03-24 22:23:43 +0000
commitda3caec89e8d5b90807e5b6beb49a8e021aea73e (patch)
tree1c855c042ec95508fda60fea35031a1fa4026566 /Master/texmf-dist/tex
parent771e6ebc228a519713b647dc0d21a370136a1098 (diff)
reledmac (24mar16)
git-svn-id: svn://tug.org/texlive/trunk@40117 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty52
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty49
2 files changed, 84 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index c5b2a060489..533987befdd 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}[2016/02/27 v2.8.2 typeset critical edition]%
+\ProvidesPackage{reledmac}[2016/03/23 v2.9.0 typeset critical edition]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -78,6 +78,9 @@
\newif\ifwidthliketwocolumns%
\DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}%
+\newif\ifcontinuousnumberingwithcolumns
+\DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}%
+
\newif\ifxindy@
\DeclareOptionX{xindy}[eledmac-markup-attr.xdy]{%
\AtBeginDocument{\immediate\openout\eledmac@xindy@out=#1}%
@@ -410,6 +413,16 @@
\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%
\else
\led@err@NumberingShouldHaveStarted
\endnumbering
@@ -767,8 +780,8 @@
\ifbypage@R
\line@numR \z@ \subline@numR \z@
\fi
- \page@numR=#1\relax
- \last@page@numR=#1\relax
+ \global\page@numR=#1\relax
+ \global\last@page@numR=#1\relax
\def\next@page@numR{#1}%
\fi
\else
@@ -777,8 +790,8 @@
\ifbypage@
\line@num \z@ \subline@num \z@
\fi
- \page@num=#1\relax
- \last@page@num=#1\relax
+ \global\page@num=#1\relax
+ \global\last@page@num=#1\relax
\def\next@page@num{#1}%
\listxadd{\normal@page@break}{\the\absline@num}
\fi
@@ -1079,6 +1092,10 @@
\fi%
\closeout\linenum@out%
\openout\linenum@out=#1\relax%
+ \write\linenum@out{\string\line@list@version{\this@line@list@version}}%
+ \ifl@dpaging%
+ \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}%
+ \fi%
\fi}
\newcommand*{\new@line}{%
@@ -2393,12 +2410,14 @@
\nottoggle{Xparindent@#4}{\parindent=\z@}{}%
\tolerance=5000%
\hangindent=\csuse{Xhangindent@#4}%
- \par%
\everypar{\hangindent=\csuse{Xhangindent@#4}}%
\@tempdima=\parindent%
\csuse{Xcolalign@#4}%
\parindent=\@tempdima%
- \strut{\printlinefootnote{#1}{#4}}%
+ \strut{%
+ \hspace{\parindent}%
+ \printlinefootnote{#1}{#4}%
+ }%
{\nottoggle{Xlemmadisablefontselection@#4}%
{\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}%
{{\csuse{Xlemmafont@#4}#2}}%
@@ -2474,12 +2493,14 @@
\nottoggle{Xparindent@#4}{\parindent=\z@}{}%
\tolerance=5000%
\hangindent=\csuse{Xhangindent@#4}%
- \par%
\everypar{\hangindent=\csuse{Xhangindent@#4}}%
\@tempdima=\parindent%
\csuse{Xcolalign@#4}%
\parindent=\@tempdima%
- \strut{\printlinefootnote{#1}{#4}}%
+ \strut{%
+ \hspace{\parindent}%
+ \printlinefootnote{#1}{#4}%
+ }%
{\nottoggle{Xlemmadisablefontselection@#4}%
{\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}%
{{\csuse{Xlemmafont@#4}#2}}%
@@ -3194,8 +3215,11 @@
\@tempdima=\parindent%
\csuse{colalignX@#1}%
\parindent=\@tempdima%
- {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut%
- #2\strut\par}\allowbreak}
+ {\hspace{\parindent}%
+ \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut%
+ #2\strut\par}%
+ \allowbreak%
+}%
\newcommand*{\twocolfootgroupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1}
\splittopskip=\ht\strutbox
@@ -3256,7 +3280,7 @@
\insert\csname footins#1\endcsname\bgroup%
\hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
\noindent\csuse{bhooknoteX@#1}%
- \csuse{notefontsizeX@#1}
+ \csuse{notefontsizeX@#1}%
\footsplitskips%
\@nameuse{footfmt#1}{#1}{#2}\egroup}
@@ -3270,11 +3294,11 @@
\hsize \csuse{hsizethreecolX@#1}%
\nottoggle{parindentX@#1}{\parindent=\z@}{}%
\tolerance=5000\relax%
- \par%
\@tempdima=\parindent%
\csuse{colalignX@#1}%
\parindent=\@tempdima%
- {\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut%
+ {\hspace{\parindent}%
+ \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut%
#2\strut\par}\allowbreak}
\newcommand*{\threecolfootgroupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 3833de76c31..438858dee0c 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}[2016/03/06 v2.7.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/03/23 v2.8.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -59,6 +59,7 @@
}%
\DeclareOptionX{parledgroup}{\parledgrouptrue}
\DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}%
+\DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}%
\newif\ifsameparallelpagenumber
\newif\ifprevpgnotnumbered
\DeclareOptionX{sameparallelpagenumber}{\sameparallelpagenumbertrue}
@@ -145,6 +146,7 @@
\global\sublines@false
\global\let\next@page@numR\relax
\global\let\sub@change\relax
+ \set@continuousnumberingforR%
\message{Section \the\section@numR R }%
\line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
\l@dend@stuff
@@ -229,6 +231,7 @@
\l@dend@stuff
\begingroup%
\initnumbering@sectcountR%
+ \set@continuousnumberingforR%
\else
\led@err@numberingShouldHaveStarted
\endnumberingR
@@ -288,6 +291,16 @@
\fi
\fi
\fi}}
+\newcommand{\set@continuousnumberingforR}{%
+ \ifcontinuousnumberingwithcolumns%
+ \ifnum\line@numR<\line@num%
+ \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}%
@@ -366,6 +379,8 @@
\sublinenumberstyle{#1}%
\sublinenumberstyleR{#1}%
}%
+\newif\iflinenumberLevenifblank
+\newif\iflinenumberRevenifblank
\newcommand*{\leftlinenumR}{%
\l@dlinenumR
\kern\linenumsep}
@@ -978,7 +993,19 @@
\global\advance\@donereallinesL\@ne%
\global\advance\@donetotallinesL\@ne%
\else%
- \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}%
+ \iflinenumberLevenifblank
+ \new@lineL%
+ \l@demptyd@ta%
+ \getline@numL%
+ \affixline@num%
+ \setbox\l@dleftbox \hb@xt@ \Lcolwidth{%
+ \l@dld@ta %space kept for backward compatibility
+ \hspace*{\Lcolwidth}%
+ \ledrlfill\l@drd@ta%
+ }%
+ \else%
+ \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}%
+ \fi%
\global\advance\@donetotallinesL\@ne%
\fi%
}%
@@ -1037,6 +1064,8 @@
\newcommand*{\do@insidelineRhook}{}
\newcommand*{\do@lineR}{%
+ \let\linenumrepL\linenumrep%
+ \let\sublinenumrepL\sublinenumrep%
\let\linenumrep\linenumrepR%
\let\sublinenumrep\sublinenumrepR%
\letcs{\ifnumberpstart}{numberpstart@R\the\l@dpscR}%
@@ -1074,10 +1103,24 @@
\global\advance\@donereallinesR\@ne%
\global\advance\@donetotallinesR\@ne%
\else%
- \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}%
+ \iflinenumberRevenifblank%
+ \new@lineR
+ \l@demptyd@ta%
+ \getline@numR%
+ \setbox\l@drightbox \hb@xt@ \Rcolwidth{%
+ \affixline@numR%
+ \l@dld@ta %space kept for backward compatibility
+ \hspace*{\Rcolwidth}%
+ \ledrlfill\l@drd@ta%
+ }%
+ \else%
+ \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}}%
+ \fi%
\global\advance\@donetotallinesR\@ne%
\fi%
\ledRcol@false%
+ \let\linenumrep\linenumrepL%
+ \let\sublinenumrep\sublinenumrepL%
}
\def\print@lineR{%