summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-01-15 23:00:13 +0000
committerKarl Berry <karl@freefriends.org>2016-01-15 23:00:13 +0000
commit79b0cb0ee590ef15c9104c36cd82ee8cd4871668 (patch)
tree4ba00bfbf7b3b7c48cd3e2a564152a0097fb2db0 /Master/texmf-dist/tex/latex
parentc8c5e8a45b2c390e1ebcaa37d2b124adf6d568ac (diff)
reledmac (15jan16)
git-svn-id: svn://tug.org/texlive/trunk@39395 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty129
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty8
2 files changed, 98 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index cf3029a0d03..e9dcdefa8f4 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}[2015/12/13 v2.7.2 typeset critical edition]%
+\ProvidesPackage{reledmac}[2016/01/15 v2.8.0 typeset critical edition]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -2311,6 +2311,7 @@
\setbox0=\hbox{{\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}\unhbox0 \removehboxes}%
\csuse{Xbhookgroup@#1}%
\csuse{Xnotefontsize@#1}%
+ \nottoggle{Xparindent@#1}{\parindent=\z@}{}%
\unhbox0\par}}
\newcommand*{\makehboxofhboxes}{\setbox0=\hbox{}%
@@ -3460,7 +3461,8 @@
\makehboxofhboxes
\setbox0=\hbox{\unhbox0 \removehboxes}%
\csuse{bhookgroupX@#1}%
- \csuse{notefontsizeX@#1}
+ \csuse{notefontsizeX@#1}%
+ \nottoggle{parindentX@#1}{\parindent=\z@}{}%
\unhbox0\par}}
\newcommand{\insertparafootsepX}[1]{%
@@ -3652,6 +3654,8 @@
}%
\global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4#5#6#7{{%
+ \csuse{Xendbhooknote@#4}%
+ \csuse{Xendnotefontsize@#4}%
\hangindent=\csuse{Xendhangindent@#4}%
\ifXendinsertsep@%
\hskip\csuse{Xendafternote@#4}%
@@ -3666,8 +3670,6 @@
\setkeys[mac]{truefootnoteoption}{##1}%
}%
\notblank{#5}{\docsvlist{#5}}{}%
- \csuse{Xendbhooknote@#4}%
- \csuse{Xendnotefontsize@#4}%
\IfStrEq{#6}{R}{\ledRcol@true}{}%
\def\@this@crossref@start{#7:start}%
\def\@this@crossref@end{#7:end}%
@@ -4729,10 +4731,10 @@
\def\labelrefsparsesubline#1|#2{#2}
\newcommand*{\l@dmake@labels}{}
\def\l@dmake@labels#1|#2|#3|#4|#5{%
- \expandafter\ifx\csname the@label#5\endcsname \relax\else
- \led@warn@DuplicateLabel{#5}%
+ \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else
+ \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}%
\fi
- \expandafter\gdef\csname the@label#5\endcsname{#1|#2|#3|#4|\relax}%
+ \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\relax}%
\ignorespaces}
\AtBeginDocument{%
@@ -5054,6 +5056,20 @@
}%
\newcommand*{\edmakelabel}[2]{\expandafter\xdef\csname the@label#1\endcsname{#2}}
+\pretocmd{\XR@test}%
+ {\XR@test@mac+++#1#2#3#4+++}%
+ {}%
+ {}%
+\long\def\XR@test@mac+++#1+++{\XR@test@mac@test#1}
+\long\def\XR@test@mac@test#1#2...{%The triple dots (NOT \ldots) are because of the line 22 of xr.sty v5.02 1994/05/28
+ \ifx#1\l@dmake@labels%
+ \l@dmake@labels#2%
+ \else
+ \ifx#1\l@dmake@labelsR%
+ \l@dmake@labelsR #2%
+ \fi%
+ \fi%
+}%
\pretocmd{\@xympar}%
{\ifnumberedpar@
\led@warn@NoMarginpars
@@ -5661,34 +5677,77 @@
{\let\index\orig@@index}%
{}%
}%
-\DeclareRobustCommandx{\edgls}[3][1,3,usedefault]{%
- \doedindexlabel%
- \gls[counter=pageline,#1]{#2}[#3]%
-}
-\DeclareRobustCommandx{\edGls}[3][1,3,usedefault]{%
- \doedindexlabel%
- \Gls[counter=pageline,#1]{#2}[#3]%
-}
-\DeclareRobustCommandx{\edGLS}[3][1,3,usedefault]{%
- \doedindexlabel%
- \GLS[counter=pageline,#1]{#2}[#3]%
-}
-\DeclareRobustCommandx{\edglspl}[3][1,3,usedefault]{%
- \doedindexlabel%
- \glspl[counter=pageline,#1]{#2}[#3]%
-}
-\DeclareRobustCommandx{\edGlspl}[3][1,3,usedefault]{%
- \doedindexlabel%
- \Glspl[counter=pageline,#1]{#2}[#3]%
-}
-\DeclareRobustCommandx{\edGLSpl}[3][1,3,usedefault]{%
- \doedindexlabel%
- \GLSpl[counter=pageline,#1]{#2}[#3]%
-}
-\DeclareRobustCommandx{\edglsdisp}[3][1,3,usedefault]{%
- \doedindexlabel%
- \glsdisp[counter=pageline,#1]{#2}[#3]%
-}
+\AtBeginDocument{%
+ \@ifpackageloaded{glossaries}{%
+ \renewcommand{\do}[1]{%
+ \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname[counter=pageline,##1]{##2}[##3]%
+ }%
+ \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]%
+ }%
+ }%
+ \docsvlist{%
+ gls,%
+ Gls,%
+ GLS,%
+ glspl,%
+ Glspl,%
+ GLSpl,%
+ glstext,%
+ Glstext,%
+ GLStext,%
+ Glsfirst,%
+ GLSfirst,%
+ glsplural%
+ Glsplural,%
+ GLSplural,%
+ glsfirstplural,%
+ Glsfirstplural,%
+ GLSfirstplural,%
+ glsname,%
+ Glsname,%
+ GLSname,%
+ glssymbol,%
+ Glssymbol,%
+ GLSsymbol,%
+ glsdesc,%
+ Glsdesc,%
+ GLSdesc,%
+ glsuseri,%
+ Glsuseri,%
+ GLSuseri,%
+ glsuserii,%
+ Glsuserii,%
+ GLSuserii,%
+ glsuseriii,%
+ Glsuseriii,%
+ GLSuseriii,%
+ glsuseriv,%
+ Glsuseriv,%
+ GLSuseriv,%
+ glsuserv,%
+ Glsuserv,%
+ GLSuserv,%
+ glsuservi,%
+ Glsuservi,%
+ GLSuservi%
+ }%
+ \renewcommand{\do}[1]{%
+ \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname[counter=pageline,##1]{##2}{##3}%
+ }%
+ \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}%
+ }%
+ }%
+ \docsvlist{glsdisp,glslink}%
+ }{}%
+}%
\def\@hangingsymbol{}
\newcommand*{\sethangingsymbol}[1]{%
\gdef\@hangingsymbol{#1}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 995184f77d1..cf94b8f3da3 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}[2015/12/13 v2.6.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/01/15 v2.7.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1538,10 +1538,10 @@
\list@create{\labelref@listR}
\def\l@dmake@labelsR#1|#2|#3|#4|#5{%
- \expandafter\ifx\csname the@label#5\endcsname \relax\else
- \led@warn@DuplicateLabel{#5}%
+ \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else
+ \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}%
\fi
- \expandafter\gdef\csname the@label#5\endcsname{#1|#2|#3|#4|\@Rlineflag}%
+ \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\@Rlineflag}%
\ignorespaces}
\AtBeginDocument{%
\def\l@dmake@labelsR#1|#2|#3|#4|#5{}%