summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-12-24 22:12:46 +0000
committerKarl Berry <karl@freefriends.org>2016-12-24 22:12:46 +0000
commitbdc2fd6fc8085793ddd27d01d8ec34565f4905e9 (patch)
treefea0659889be6fd53ebc844f05c41f0b72406fb3 /Master/texmf-dist/tex
parent365d485fce4ef192ebc967c9a5804b3d3dbcf2d8 (diff)
reledmac (24dec16)
git-svn-id: svn://tug.org/texlive/trunk@42785 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty55
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty54
2 files changed, 80 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index f8abf59e550..75fe162aa11 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/12/16 v2.16.8 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/12/23 v2.17.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -280,25 +280,25 @@
\reledmac@error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}%
}%
\newcommand{\led@error@PackageAfterEledmac}[1]{%
- \reledmac@error{#1 must be loaded before reledmac.}{\@ehc}%
+ \reledmac@error{#1 must be loaded before reledmac}{\@ehc}%
}%
\newcommand{\led@error@fail@patch@@makecol}{%
- \reledmac@error{Fail to patch \string\@makecol\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@makecol\space command}{\@ehc}%
}%
\newcommand{\led@error@fail@patch@@reinserts}{%
- \reledmac@error{Fail to patch \string\@reinserts\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@reinserts\space command}{\@ehc}%
}%
\newcommand{\led@error@fail@patch@@doclearpage}{%
- \reledmac@error{Fail to patch \string\@doclearpage\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@doclearpage\space command}{\@ehc}%
}%
\newcommand{\led@error@fail@patch@@iiiminipage}{%
- \reledmac@error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}%
+ \reledmac@error{Fail to patch \string\@iiiminipage\space command}{\@ehc}%
}%
\newcommand{\led@error@fail@patch@endminipage}{%
- \reledmac@error{Failed to patch the \string\endminipage\space command.}{\@ehc}%
+ \reledmac@error{Failed to patch the \string\endminipage\space command}{\@ehc}%
}%
\newcommand{\led@error@fail@patch@makeindex}{%
- \reledmac@error{Failed to patch the \string\makeindex\space command.}{\@ehc}%
+ \reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
\newcommand{\led@warn@edinde@outsidenumbering}{%
\reledmac@warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
@@ -1781,9 +1781,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@note%
\l@dlsn@te
{\ledllfill\hb@xt@ \wd\one@line{\new@line%
@@ -1802,9 +1808,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@note%
\numdef{\temp@}{\l@dnumpstartsL-1}%
\xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}%
@@ -6462,6 +6474,17 @@
}%
}%
\docsvlist{glsdisp,glslink}%
+ \renewcommand{\do}[1]{%
+ \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname[counter=pageline,##1]{##2}%
+ }%
+ \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{%
+ \doedindexlabel%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ }%
+ }%
+ \docsvlist{glsadd}%
}{}%
}%
\def\@hangingsymbol{}
@@ -6691,6 +6714,10 @@
\gdef\@msdata@series{#1}%
}%
\def\@msdata@series{A}%
+\def\ms@data@position{msdata-regular}%
+\newcommand{\setmsdataposition}[1]{%
+ \gdef\ms@data@position{#1}%
+}%
\def\ms@data@label{Ms.}%
\newcommand{\setmsdatalabel}[1]{%
\gdef\ms@data@label{#1}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index c94978841e8..4c0800dca9b 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/12/12 v2.15.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/12/23 v2.16.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1086,9 +1086,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@note%
}%
{\print@lineL}%
@@ -1121,10 +1127,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpagefalse%
\fi%
- \insert@msdata%
- \add@inserts%
- \add@Xgroupbyline%
- \affixside@note%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@inserts%
+ \add@Xgroupbyline%
+ }{%
+ \add@inserts%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\l@dlsn@te%
\do@insidelineLhook%
\hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
@@ -1212,9 +1223,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert@msdata%
- \add@insertsR%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ }{%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@noteR%
}%
{\print@lineR}%
@@ -1250,9 +1267,15 @@
\set@Xtxtbeforenotes%
\global\@firstlineofpageRfalse%
\fi%
- \insert@msdata%
- \add@insertsR%
- \add@Xgroupbyline%
+ \ifdefstring{\ms@data@position}{msdata-regular}{%
+ \insert@msdata%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ }{%
+ \add@insertsR%
+ \add@Xgroupbyline%
+ \insert@msdata%
+ }%
\affixside@noteR%
\l@dlsn@te%
\do@insidelineRhook%
@@ -1264,7 +1287,8 @@
\fi%
\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
\l@drsn@te%
- }}
+ }%
+}
\def\print@eledsectionR{%
\addtocounter{pstartR}{-1}%