summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty26
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty32
2 files changed, 45 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 2d4603b3192..9c57ae558e9 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2015/10/09 v2.2.2 typeset critical edition]%
+\ProvidesPackage{reledmac}[2015/10/14 v2.3.0 typeset critical edition]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -453,6 +453,7 @@
\ifnum\@l@dtempcntb>\m@ne
\ifledRcol
\global\line@marginR=\@l@dtempcntb
+ \led@warn@setting@in@rightside{\linenummargin}%
\else
\global\line@margin=\@l@dtempcntb
\fi
@@ -495,6 +496,7 @@
\newcommand*{\firstlinenum}[1]{%
\ifledRcol%
\setcounter{firstlinenumR}{#1}%
+ \led@warn@setting@in@rightside{\firstlinenum}
\else%
\setcounter{firstlinenum}{#1}%
\fi%
@@ -502,6 +504,7 @@
\newcommand*{\linenumincrement}[1]{%
\ifledRcol%
\setcounter{linenumincrementR}{#1}%
+ \led@warn@setting@in@rightside{\linenumincrement}
\else%
\setcounter{linenumincrement}{#1}%
\fi%
@@ -509,6 +512,7 @@
\newcommand*{\firstsublinenum}[1]{%
\ifledRcol%
\setcounter{firstsublinenumR}{#1}%
+ \led@warn@setting@in@rightside{\firstsublinenum}
\else%
\setcounter{firstsublinenum}{#1}%
\fi%
@@ -516,6 +520,7 @@
\newcommand*{\sublinenumincrement}[1]{%
\ifledRcol%
\setcounter{sublinenumincrementR}{#1}%
+ \led@warn@setting@in@rightside{\sublinenumincrement}
\else%
\setcounter{sublinenumincrement}{#1}%
\fi%
@@ -2168,14 +2173,16 @@
\vskip\skip\csname #1footins\endcsname%
\setXnoteswidthliketwocolumns@{#1}%
\setXnotespositionliketwocolumns@{#1}%
- \print@Xfootnoterule{#1}%%
+ \print@Xfootnoterule{#1}%
+ \let\bidi@RTL@everypar\@empty%
\noindent\leavevmode}
\newcommand*{\paravfootnote}[2]{%
\insert\csname #1footins\endcsname
\bgroup
\csuse{Xnotefontsize@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}}%
\setbox0=\hbox{\Xunvxh{0}{#1}}%
@@ -2190,7 +2197,8 @@
\unvbox\@nameuse{mp#1footins}%
\csuse{Xnotefontsize@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\color@begingroup%
\csuse{Xbhooknote@#1}%
\csname #1footfmt\endcsname #2{#1}\color@endgroup}%
@@ -3163,7 +3171,8 @@
\bgroup
\csuse{notefontsizeX@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\csuse{bhooknoteX@#1}%
\@nameuse{footfmt#1}{#1}{#2}}%
\setbox0=\hbox{\unvxhX{0}{#1}}%
@@ -3177,7 +3186,8 @@
\unvbox\@nameuse{mpfootins#1}
\csuse{notefontsizeX@#1}
\footsplitskips
- \setbox0=\vbox{\hsize=\maxdimen
+ \setbox0=\vbox{\hsize=\maxdimen%
+ \let\bidi@RTL@everypar\@empty%
\noindent\color@begingroup%
\csuse{bhooknoteX@#1}%
\@nameuse{footfmt#1}{#1}{#2}\color@endgroup}%
@@ -5183,7 +5193,9 @@
\noexpand\newverse[][]}%
\def\noexpand\&{\noexpand\@stopstanza}%
\noexpand\@advancestanzanumber%
- \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber}
+ \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber%
+ \let\par\relax%No paragraph in verses
+}
\newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index c14c9498cf6..c6eb2776207 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -26,8 +26,9 @@
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2015/09/29 v2.4.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2015/10/14 v2.5.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -102,6 +103,11 @@
\newcommand*{\led@warn@ChangeSyncOption}[1]{%
\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}.
+}
\newcount\section@numR
\section@numR=\z@
\pst@rtedLfalse
@@ -255,6 +261,19 @@
\newcount\line@marginR
\line@marginR=\@ne
+\newcommand{\linenummarginR}[1]{%
+ \l@dgetline@margin{#1}%
+ \ifnum\@l@dtempcntb>\m@ne%
+ \global\line@marginR=\@l@dtempcntb%
+ \fi%
+}
+\WithSuffix\newcommand\linenummargin*[1]{%
+ \l@dgetline@margin{#1}%
+ \ifnum\@l@dtempcntb>\m@ne%
+ \global\line@marginR=\@l@dtempcntb%
+ \global\line@margin=\@l@dtempcntb%
+ \fi%
+}
\newcounter{firstlinenumR}
\setcounter{firstlinenumR}{5}
\newcounter{linenumincrementR}
@@ -907,7 +926,7 @@
\l@dld@ta %space kept for backward compatibility
\add@inserts\affixside@note%
\l@dlsn@te %space kept for backward compatibility
- {\ledllfill\hb@xt@ \Lcolwidth{%
+ \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{%
\do@insidelineLhook%
\ifluatex%
\textdir\l@luatextextdir@L%
@@ -1004,7 +1023,7 @@
\l@dld@ta %space kept for backward compatibility
\add@insertsR\affixside@noteR%
\l@dlsn@te %space kept for backward compatibility
- \ledllfill\hb@xt@ \Rcolwidth{%
+ \hb@xt@ \Rcolwidth{\ledllfill\hb@xt@ \wd\one@lineR{%
\do@insidelineRhook%
\new@lineR%
\inserthangingsymbolR%
@@ -1013,7 +1032,7 @@
\fi%
\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta%
\l@drsn@te%
- }
+ }}
\def\print@eledsectionR{%
\addtocounter{pstartR}{-1}%
@@ -1575,6 +1594,7 @@
\def\&{\@stopastanza}%
\pstart[#1]%
\@astanza@line
+ \let\par\relax%No paragraph in verses
}{}
\newcommandx{\@stopastanza}[1][1,usedefault]{%
@@ -1590,8 +1610,8 @@
@\endcsname\stanzaindentbase
\managestanza@modulo
\fi
- \par
- \stanza@hang%\mbox{}%
+ \endgraf
+ \stanza@hang%
\ignorespaces}
\catcode`\&=\next