reledmac (13dec15)

git-svn-id: svn://tug.org/texlive/trunk@39095 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 93 insertions, 38 deletions

diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 06f46e4d199..cf3029a0d03 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/06 v2.7.1 typeset critical edition]%
+\ProvidesPackage{reledmac}[2015/12/13 v2.7.2 typeset critical edition]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -274,6 +274,12 @@
 \newcommand{\led@error@fail@patch@endminipage}{%
   \reledmac@error{Fail to patch \string\endminipage\space command.}{\@ehc}%
 }%
+\newcommand{\led@warning@hsizeX@deprecated}{%
+  \reledmac@warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}%
+}%
+\newcommand{\led@warning@Xhsize@deprecated}{%
+  \reledmac@warning{\string\Xhsize\space command deprecated, use \string\Xwidth\space instead.}%
+}%
 \providecommand*{\@gobblethree}[3]{}
 \providecommand*{\@gobblefour}[4]{}
 \providecommand*{\@gobblefive}[5]{}
@@ -515,7 +521,7 @@
 \newcommand*{\firstlinenum}[1]{%
   \ifledRcol%
     \setcounter{firstlinenumR}{#1}%
-    \led@warn@setting@in@rightside{\firstlinenum}
+    \led@warn@setting@in@rightside{\firstlinenum}%
   \else%
     \setcounter{firstlinenum}{#1}%
   \fi%
@@ -523,7 +529,7 @@
 \newcommand*{\linenumincrement}[1]{%
   \ifledRcol%
     \setcounter{linenumincrementR}{#1}%
-    \led@warn@setting@in@rightside{\linenumincrement}
+    \led@warn@setting@in@rightside{\linenumincrement}%
   \else%
     \setcounter{linenumincrement}{#1}%
   \fi%
@@ -531,7 +537,7 @@
 \newcommand*{\firstsublinenum}[1]{%
   \ifledRcol%
     \setcounter{firstsublinenumR}{#1}%
-    \led@warn@setting@in@rightside{\firstsublinenum}
+    \led@warn@setting@in@rightside{\firstsublinenum}%
   \else%
     \setcounter{firstsublinenum}{#1}%
   \fi%
@@ -539,7 +545,7 @@
 \newcommand*{\sublinenumincrement}[1]{%
   \ifledRcol%
     \setcounter{sublinenumincrementR}{#1}%
-    \led@warn@setting@in@rightside{\sublinenumincrement}
+    \led@warn@setting@in@rightside{\sublinenumincrement}%
   \else%
     \setcounter{sublinenumincrement}{#1}%
   \fi%
@@ -1249,7 +1255,7 @@
       \ifdef{\hypertarget}%
         {%
         \csedef{thisedtext@\the\@edtext@level}{\theedtext}%
-        \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}%
+        \Hy@raisedlink@left{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}%
         \showlemma{#1}%
         \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:end}{}}%
         }%
@@ -2072,7 +2078,7 @@
 
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{%
   \insert\csname #1footins\endcsname\bgroup
-  \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax%
+  \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax%
   \noindent\csuse{Xbhooknote@#1}%
   \csuse{Xnotefontsize@#1}%
   \footsplitskips
@@ -2183,9 +2189,9 @@
 \providecommand{\footfudgefiddle}{64}
 \newcommand*{\para@footsetup}[1]{{\csuse{Xbhookgroup@#1}\csuse{Xnotefontsize@#1}
   \setXnoteswidthliketwocolumns@{#1}%
-  \ifcsempty{Xhsize@#1}%
+  \ifcsempty{Xwidth@#1}%
     {}%
-    {\columnwidth=\expandafter\dimexpr\csuse{Xhsize@#1}\relax}%
+    {\columnwidth=\expandafter\dimexpr\csuse{Xwidth@#1}\relax}%
   \dimen0=\baselineskip
   \multiply\dimen0 by 1024
   \divide \dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax
@@ -2266,7 +2272,7 @@
   }}%
   #3\penalty-10 }
 \newcommand*{\parafootgroup}[1]{%
-  \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax%
+  \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax%
   \unvbox\csname #1footins\endcsname
   \ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}%
   \ifcsstring{Xragged@#1}{R}{\RaggedRight}{}%
@@ -2332,12 +2338,12 @@
 }
 \newcount\@k \newdimen\@h
 \newcommand*{\Xrigidbalance}[3]{%
-    \hsize=\expandafter\dimexpr\csuse{Xhsize@\@currentseries}\relax%
+    \hsize=\expandafter\dimexpr\csuse{Xwidth@\@currentseries}\relax%
     \rigidbalance{#1}{#2}{#3}%
 }%
 
 \newcommand*{\rigidbalanceX}[3]{%
-    \hsize=\expandafter\dimexpr\csuse{hsizeX@\@currentseries}\relax%
+    \hsize=\expandafter\dimexpr\csuse{widthX@\@currentseries}\relax%
     \rigidbalance{#1}{#2}{#3}%
 }%
 
@@ -2382,7 +2388,7 @@
 
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{%
   \insert\csname #1footins\endcsname\bgroup%
-  \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax%
+  \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax%
   \noindent\csuse{Xbhooknote@#1}%
   \csuse{Xnotefontsize@#1}%
   \footsplitskips%
@@ -2463,7 +2469,7 @@
   \multiply\dimen\csname #1footins\endcsname \tw@}
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{%
   \insert\csname #1footins\endcsname\bgroup%
-  \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax%
+  \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax%
   \noindent\csuse{Xbhooknote@#1}%
   \csuse{Xnotefontsize@#1}%
   \footsplitskips%
@@ -2955,7 +2961,7 @@
   \hbox{\textsuperscript{\normalfont\@nameuse{@thefnmark#1}}}}
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{%
   \insert\@nameuse{footins#1}\bgroup
-    \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax%
+    \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
     \noindent\csuse{bhooknoteX@#1}%
     \csuse{notefontsizeX@#1}%
     \footsplitskips
@@ -3173,7 +3179,7 @@
 
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{%
   \insert\csname footins#1\endcsname\bgroup%
-    \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax%
+    \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
     \noindent\csuse{bhooknoteX@#1}%
     \csuse{notefontsizeX@#1}%
     \footsplitskips%
@@ -3254,7 +3260,7 @@
 
 \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{%
   \insert\csname footins#1\endcsname\bgroup%
-    \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax%
+    \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
     \noindent\csuse{bhooknoteX@#1}%
     \csuse{notefontsizeX@#1}
     \footsplitskips%
@@ -3332,9 +3338,9 @@
 
 \newcommand*{\para@footsetupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1}
   \setnoteswidthliketwocolumnsX@{#1}%
-  \ifcsempty{hsizeX@#1}%
+  \ifcsempty{widthX@#1}%
     {}%
-    {\columnwidth=\expandafter\dimexpr\csuse{hsizeX@#1}\relax}%
+    {\columnwidth=\expandafter\dimexpr\csuse{widthX@#1}\relax}%
   \dimen0=\baselineskip
   \multiply\dimen0 by 1024
   \divide\dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax%
@@ -3417,7 +3423,7 @@
     #2\penalty-10}}
 
 \newcommand*{\para@footgroupX}[1]{%
-  \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax%
+  \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
   \unvbox\csname footins#1\endcsname
   \ifcsstring{raggedX@#1}{L}{\RaggedLeft}{}%
   \ifcsstring{raggedX@#1}{R}{\RaggedRight}{}%
@@ -3464,28 +3470,28 @@
 }
 \newcommand{\wrapped@footfootmarkX}[1]{%
   \ifdefined\hypertarget%
+    \hyperlink%
+        {@bodyfootmark#1@\this@footnoteX@reading}%
+        {\@nameuse{footfootmark#1}}%
     \Hy@raisedlink{%
       \hypertarget%
         {@footnotemark#1@\this@footnoteX@reading}%
         {}%
       }%
-    \hyperlink%
-        {@bodyfootmark#1@\this@footnoteX@reading}%
-        {\@nameuse{footfootmark#1}}%
   \else%
     \@nameuse{footfootmark#1}%
   \fi%
 }%
 \newcommand{\wrapped@bodyfootmarkX}[1]{%
   \ifdefined\hypertarget%
+    \hyperlink%
+        {@footnotemark#1@\expandafter\the\csname footnote#1@reading\endcsname}%
+        {\@nameuse{bodyfootmark#1}}%
     \Hy@raisedlink{%
       \hypertarget%
         {@bodyfootmark#1@\expandafter\the\csname footnote#1@reading\endcsname}%
         {}%
       }%
-      \hyperlink%
-        {@footnotemark#1@\expandafter\the\csname footnote#1@reading\endcsname}%
-        {\@nameuse{bodyfootmark#1}}%
   \else%
     \@nameuse{bodyfootmark#1}%
   \fi%
@@ -3966,7 +3972,7 @@
       \csgdef{Xlinerangeseparator@#1}{\endashchar}%
 
       \csgdef{Xlemmafont@#1}{}%
-      \csgdef{Xhsize@#1}{\hsize}%
+      \csgdef{Xwidth@#1}{\hsize}%
       \expandafter\newinsert\csname #1footins\endcsname%
       \unless\ifnoledgroup@%
         \expandafter\newinsert\csname mp#1footins\endcsname%
@@ -4081,7 +4087,7 @@
       \newtoggle{noteswidthliketwocolumnsX@#1}%
       \csgdef{parafootsepX@#1}{}%
       \csgdef{afternoteX@#1}{1em plus.4em minus.4em}
-      \csgdef{hsizeX@#1}{\hsize}%
+      \csgdef{widthX@#1}{\hsize}%
       \expandafter\newinsert\csname footins#1\endcsname%
       \unless\ifnoledgroup@%
         \expandafter\newinsert\csname mpfootins#1\endcsname%
@@ -4363,8 +4369,16 @@
   \newhookcommand@series{Xafternote}%
   \newhookcommand@series{Xparafootsep}
 
-  \newhookcommand@series@reload{Xhsize}{critical}%
+  \newhookcommand@series@reload{Xwidth}{critical}%
 
+  \ifundef{\Xhsize}%
+    {%
+      \newcommandx{\Xhsize}[2][1,usedefault]{%
+        \led@warning@Xhsize@deprecated%
+        \Xwidth[#1]{#2}%
+      }%
+    }%
+    {}%
 \fi
 \newhooktoggle@series{Xlineflag}[appref,SEref]
 \newhookcommand@series{Xtwolines}[appref,SEref]
@@ -4390,7 +4404,15 @@
   \newhookcommand@series@reload{notefontsizeX}{familiar}
   \newhookcommand@series{afternoteX}
   \newhookcommand@series{parafootsepX}
-  \newhookcommand@series@reload{hsizeX}{familiar}%
+  \newhookcommand@series@reload{widthX}{familiar}%
+  \ifundef{\hsizeX}%
+    {%
+      \newcommandx{\hsizeX}[2][1,usedefault]{%
+        \led@warning@hsizeX@deprecated%
+        \widthX[#1]{#2}%
+      }%
+    }%
+    {}%
 \fi
 \unless\ifnoend@
   \newhookcommand@series{Xendnotenumfont}
@@ -4645,7 +4667,9 @@
     \ifXnote@%
      \protected@write\@auxout{}%
       {\string\l@dmake@labelsR\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1}}%
-      \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}%
+      \ifdef{\hypertarget}%
+        {\Hy@raisedlink{\hypertarget{#1}{}}}%
+        {}%
     \else%
       \write\linenum@outR{\string\@lab}%
       \ifx\labelref@listR\empty%
@@ -4658,13 +4682,17 @@
       \fi%
       \protected@write\@auxout{}%
         {\string\l@dmake@labelsR\space\thepage|\label@refs|\the\c@pstartR|{#1}}%
-      \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}%
+      \ifdef{\hypertarget}%
+        {\Hy@raisedlink{\hypertarget{#1}{}}}%
+        {}%
     \fi%
   }{%
     \ifXnote@%
        \protected@write\@auxout{}%
         {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1}}%
-        \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}%
+        \ifdef{\hypertarget}%
+          {\Hy@raisedlink{\hypertarget{#1}{}}}%
+          {}%
     \else%
       \write\linenum@out{\string\@lab}%
       \ifx\labelref@list\empty%
@@ -4677,7 +4705,9 @@
       \fi%
       \protected@write\@auxout{}%
         {\string\l@dmake@labels\space\thepage|\label@refs|\the\c@pstart|{#1}}%
-        \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}%
+        \ifdef{\hypertarget}%
+          {\Hy@raisedlink{\hypertarget{#1}{}}}%
+          {}%
     \fi%
   }%
 \@esphack}%
@@ -4733,13 +4763,17 @@
       \ifledRcol%
         \protected@write\@auxout{}%
           {\string\l@dmake@labelsR\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1:start}}%
-        \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1:start}{}}}{}%
+        \ifdef{\hypertarget}%
+          {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
+          {}%
         \protected@write\@auxout{}%
           {\string\l@dmake@labelsR\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstartR|{#1:end}}%
       \else%
         \protected@write\@auxout{}%
           {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1:start}}%
-        \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1:start}{}}}{}%
+        \ifdef{\hypertarget}%
+          {\Hy@raisedlink{\hypertarget{#1:start}{}}}%
+          {}%
         \protected@write\@auxout{}%
           {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstart|{#1:end}}%
       \fi%
@@ -6975,6 +7009,27 @@
         \fi%
     \fi\fi\fi%
 }
+\def\Hy@raisedlink@left#1{%
+    \ifvmode
+        #1%
+    \else
+        \Hy@SaveSpaceFactor
+        \llap{\smash{%
+        \begingroup
+            \let\HyperRaiseLinkLength\@tempdima
+            \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault
+            \HyperRaiseLinkHook
+        \expandafter\endgroup
+        \expandafter\raise\the\HyperRaiseLinkLength\hbox{%
+            \Hy@RestoreSpaceFactor
+            #1%
+            \Hy@SaveSpaceFactor
+        }%
+        }}%
+        \Hy@RestoreSpaceFactor
+        \penalty\@M\hskip\z@
+    \fi
+}
 \ifeledmaccompat@%
 
 \newcommand{\footnormalX}[1]{\arrangementX[#1]{normal}}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index be0291d00a9..995184f77d1 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/11/29 v2.6.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/12/13 v2.6.3 reledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \RequirePackage{xkeyval}
@@ -119,7 +119,7 @@
 \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}.%
+  Use instead #1R or #1* in your preamble.}%
 }
 \newcount\section@numR
   \section@numR=\z@