eledmac (28aug14)

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

1 files changed, 41 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index e4af0ee1665..596ee036f8c 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -25,7 +25,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/08/25 v1.12.4 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2014/08/28 v1.12.5 LaTeX port of EDMAC]%
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -3494,6 +3494,8 @@
     \@wredindex}}{}{}
   \newcommand{\edindex}[1]{\@bsphack\@esphack}
   \newcommandx{\@wredindex}[2][1=\expandonce\jobname,usedefault]{%#1 = the index name, #2 = the text
+    \global\let\old@Rlineflag\Rlineflag%
+    \gdef\Rlineflag{}%
     \ifl@imakeidx%
       \if@edindex@fornote@%
         \IfSubStr[1]{#2}{|}{\get@index@command#2+}{\get@index@command#2|+}%
@@ -3519,6 +3521,7 @@
       \fi%
      \fi%
   \endgroup
+  \global\let\Rlineflag\old@Rlineflag%
   \@esphack}
 }
 
@@ -3527,17 +3530,45 @@
     {\hyperlink{#2}{#3}}%
     {\csuse{#1}{\hyperlink{#2}{#3}}%
   }}
+\newcommand{\hyperlinkR}[2]{%
+ \hyperlink{#1}{#2\Rlineflag}%
+}%
+
+\newcommand{\hyperlinkformatR}[3]{%
+  \hyperlinkformat{#1}{#2}{#3\Rlineflag}%
+}%
+
 \newcommand{\get@edindex@hyperref}[1]{%
   \ifcsdef{hyperlink}%
-    {\IfSubStr{#1}{|}%
+    {%
+    \edef\temp@{%
+    \catcode`\ =9 %space need for catcode
+    #1%
+    \catcode`\ =10 % space need for catcode
+    }%
+    \IfSubStr{\temp@}{|}%
       {\get@index@command#1+%
-      \gdef\@edindex@hyperref{|\@index@parenthesis %
-        hyperlinkformat{\@index@command}
-        {\edindexlab\thelabidx}}}%
+      \ifledRcol%
+        \gdef\@edindex@hyperref{|\@index@parenthesis %space kept
+        hyperlinkformatR{\@index@command}%
+        {\edindexlab\thelabidx}}%
+      \else%
+        \gdef\@edindex@hyperref{|\@index@parenthesis %space kept
+        hyperlinkformat{\@index@command}%
+        {\edindexlab\thelabidx}}%
+      \fi%
+      }%
       {\get@index@command#1|+
-      \gdef\@edindex@hyperref{|hyperlink{\edindexlab\thelabidx}}}%
+       \ifledRcol%
+        \gdef\@edindex@hyperref{|hyperlinkR{\edindexlab\thelabidx}}%
+       \else%
+        \gdef\@edindex@hyperref{|hyperlink{\edindexlab\thelabidx}}%
+       \fi%
+      }%
     }%
-    {\gdef\@edindex@hyperref{}}%
+    {%
+    \gdef\@index@txt{#1}%
+    \gdef\@edindex@hyperref{}}%
 }
 \AtBeginDocument{\@ifpackageloaded{hyperref}{}{%
   \def\l@d@@wrindexhyp#1||\\{%
@@ -3837,7 +3868,7 @@
 
 \let\@line@@num=\linenum
 \def\l@dgobbledarg #1/{\relax}
-\newcommand*{\l@dgobblearg}[1]{\relax}
+\newcommand*{\l@dgobbleoptarg}[2][]{\relax}%
 
 \let\Relax=\relax
 \let\NEXT=\next
@@ -3911,7 +3942,7 @@
 
 \newcommand{\l@dmodforedtext}{%
   \let\edtext\relax
-  \def\do##1{\global\csletcs{##1footnote}{l@dgobblearg}}
+  \def\do##1{\global\csletcs{##1footnote}{l@dgobbleoptarg}}%
   \dolistloop{\@series}%
   \let\edindex\nulledindex
   \let\linenum\@gobble}
@@ -4531,7 +4562,7 @@
 \catcode`\#=12 % Space NEEDS by \catcode
 \AtBeginDocument{%
 \patchcmd{\chapter}{\clearforchapter}{%
-  \ifnumbering\else%
+  \if@eled@sectioning\else%
     \clearforchapter
   \fi%
   }