summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-10-26 22:26:42 +0000
committerKarl Berry <karl@freefriends.org>2015-10-26 22:26:42 +0000
commit6ae1f91d0f9d5b82e318567371ca9aede208cdee (patch)
treeb0b721d07507361177ebcb58583075224d5bf03a /Master/texmf-dist/tex
parentc3c05c492a51e51e3e1bbf168e2012e5350918f5 (diff)
reledmac (26oct15)
git-svn-id: svn://tug.org/texlive/trunk@38717 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty36
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty8
2 files changed, 23 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 8b1dbd5ee68..82613f160ba 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -29,10 +29,11 @@
+
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/10/19 v2.4.0 typeset critical edition]%
+\ProvidesPackage{reledmac}[2015/10/26 v2.4.1 typeset critical edition]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -3984,10 +3985,6 @@
}
\unless\ifnocritical@
\newhooktoggle@series{Xparindent}
- \newhookcommand@series{Xtwolines}[appref]
- \newhookcommand@series{Xmorethantwolines}[appref]
- \newhooktoggle@series{Xtwolinesbutnotmore}[appref]
- \newhooktoggle@series{Xtwolinesonlyinsamepage}[appref]
\newhookcommand@series{Xhangindent}
\newhookcommand@series{Xragged}
\newhookcommand@series{Xhsizetwocol}
@@ -4034,9 +4031,12 @@
\newhookcommand@series{Xafternote}%
\newhookcommand@series{Xparafootsep}
- \newhookcommand@series{Xlinerangeseparator}
-
\fi
+\newhookcommand@series{Xtwolines}[appref]
+\newhookcommand@series{Xmorethantwolines}[appref]
+\newhooktoggle@series{Xtwolinesbutnotmore}[appref]
+\newhooktoggle@series{Xtwolinesonlyinsamepage}[appref]
+\newhookcommand@series{Xlinerangeseparator}[appref]
\unless\ifnofamiliar@
\newhooktoggle@series{parindentX}
\newhookcommand@series{hangindentX}
@@ -4055,10 +4055,6 @@
\newhookcommand@series{parafootsepX}
\fi
\unless\ifnoend@
- \newhookcommand@series{Xendtwolines}[apprefwithpage]
- \newhookcommand@series{Xendmorethantwolines}[apprefwithpage]
- \newhooktoggle@series{Xendtwolinesbutnotmore}[apprefwithpage]
- \newhooktoggle@series{Xendtwolinesonlyinsamepage}[apprefwithpage]
\newhookcommand@series{Xendnotenumfont}
\newhookcommand@series{Xendbhooknote}
@@ -4100,8 +4096,12 @@
\newhookcommand@series{Xendhangindent}%
- \newhookcommand@series{Xendlinerangeseparator}
\fi
+\newhookcommand@series{Xendtwolines}[apprefwithpage]
+\newhookcommand@series{Xendmorethantwolines}[apprefwithpage]
+\newhooktoggle@series{Xendtwolinesbutnotmore}[apprefwithpage]
+\newhooktoggle@series{Xendtwolinesonlyinsamepage}[apprefwithpage]
+\newhookcommand@series{Xendlinerangeseparator}[apprefwithpage]
\newcommand{\newhooktoggle@specific}[1]{%
\newtoggle{#1@}%
\define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option
@@ -4450,13 +4450,15 @@
\linenum{\@tempa|%
\@tempb}}}%
-\xdef\Xtwolines@appref{}%
-\xdef\Xmorethantwolines@appref{}%
+\def\Xtwolines@appref{}%
+\def\Xmorethantwolines@appref{}%
+\def\Xlinerangeseparator@appref{\endashchar}%
\newtoggle{Xtwolinesbutnotmore@appref}%
\newtoggle{Xtwolinesonlyinsamepage@appref}%
-\xdef\Xendtwolines@apprefwithpage{}%
-\xdef\Xendmorethantwolines@apprefwithpage{}%
+\def\Xendtwolines@apprefwithpage{}%
+\def\Xendmorethantwolines@apprefwithpage{}%
+\def\Xendlinerangeseparator@apprefwithpage{\endashchar}%
\newtoggle{Xendtwolinesbutnotmore@apprefwithpage}%
\newtoggle{Xendtwolinesonlyinsamepage@apprefwithpage}%
@@ -5511,7 +5513,7 @@
\edfilldimen=0pt
\newcounter{addcolcount}
- \renewcommand{\theaddcolcount}{\roman{addcolcount}}
+ \renewcommand{\theaddcolcount}{\romannumeral \c@addcolcount}
\def\setmcellright #1&{\def\edlabel##1{}%
\let\edindex\nulledindex
\ifx #1\\ \ifnum\l@dcolcount=0%\removelastskip
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index bdf0ddb54a9..296d26489e3 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}[2015/10/19 v2.5.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/10/26 v2.5.2 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -104,9 +104,9 @@
\reledpar@warning{You have changed synchronization's options since last run. We have not read line-list file #1. Please run LaTeX again.}%
}%
\newcommand{\led@warn@setting@in@rightside}[1]{%
- \reledpar@warning{You use #1 inside rightside environment.\MessageBreak
- Such behavior is deprecated.\MessageBreak
- Use instead #1R or #1* in your preamble}.
+ \reledpar@warning{You use #1 inside rightside environment.\MessageBreak%
+ Such behavior is deprecated.\MessageBreak%
+ Use instead #1R or #1* in your preamble}.%
}
\newcount\section@numR
\section@numR=\z@