diff options
author | Karl Berry <karl@freefriends.org> | 2016-12-12 22:54:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-12-12 22:54:22 +0000 |
commit | 00db3b3ef04868e84ab4abccf4ece66d3fc77e60 (patch) | |
tree | bf5b0ddc8990b9646d290e2cb929eacbb3430105 /Master/texmf-dist/tex/latex/reledmac | |
parent | 8fb9e20f14ce6565321b8910d17919aee9cb37c0 (diff) |
reledmac (12dec16)
git-svn-id: svn://tug.org/texlive/trunk@42689 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 90 |
2 files changed, 89 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index e5ba24f9641..e6480628852 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/11/14 v2.16.6 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/12/12 v2.16.7 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -237,7 +237,7 @@ \reledmac@warning{Series #1 is still existing !}% }% \newcommand*{\led@err@StanzaIndentNotDefined}{% - \reledmac@error{You have not defined indentation for the line of verse \number\stanza@count}{\@ehc}}% + \reledmac@error{You have not defined the indentation for the line \number\stanza@count}{\@ehc}}% \newcommand{\led@err@ManySidenotes}{% \ifledRcol@% \reledmac@warning{\itemcount@\space sidenotes on line \the\line@numR\space p. \the\page@numR}% @@ -295,10 +295,10 @@ \reledmac@error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}% }% \newcommand{\led@error@fail@patch@endminipage}{% - \reledmac@error{Fail to patch \string\endminipage\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\endminipage\space command.}{\@ehc}% }% \newcommand{\led@error@fail@patch@makeindex}{% - \reledmac@error{Fail to patch \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.}% @@ -392,6 +392,8 @@ \resetprevline@ \resetprevpage@num \global\stopmsdata@inserted@true% + \global\let\@msdata@list\relax% + \global\csundef{@msdata@\add@msd@c @data}% } \def\endnumbering{% @@ -1697,7 +1699,7 @@ \endgroup% \ignorespaces% \ifnumberpstart% - \pstartnumtrue% + \global\pstartnumtrue% \fi% \addtocounter{pstart}{1}% \normal@pars% @@ -2064,7 +2066,7 @@ \gdef\l@drd@ta{\rlap{{\rightpstartnum}}}% \fi \else - \@l@dtempcntb=\line@margin + \@l@dtempcntb=\line@margin% \ifnum\@l@dtempcntb>\@ne \advance\@l@dtempcntb \page@num \fi @@ -4662,7 +4664,7 @@ \newcommand{\content}{##2}% \stepcounter{labidx}% \expandafter\immediate\expandafter\write\csname l@d@#1end\endcsname{% - \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Volountary space, to add linebreak in the output file + \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Explicit space, to add a linebreak in the output file \expandafter\string\csname #1end\endcsname% {\ifnumberedpar@\l@d@nums\fi}% {\ifnumberedpar@\expandonce\@tag\fi}% @@ -5383,7 +5385,7 @@ \newcommand*{\edlineref}[1]{% \l@dref@undefined{#1}% \wrap@edcrossref{#1}{% - \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not yet been parsed on the .aux file \iftoggle{label@#1@ledRcol}% {\linenumrepR{\l@dgetref@num{2}{#1}}}% {\linenumrep{\l@dgetref@num{2}{#1}}}% @@ -5395,7 +5397,7 @@ \newcommand*{\sublineref}[1]{% \l@dref@undefined{#1}% \wrap@edcrossref{#1}{% - \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not yet been parsed on the .aux file \iftoggle{label@#1@ledRcol}% {\sublinenumrepR{\l@dgetref@num{3}{#1}}}% {\sublinenumrep{\l@dgetref@num{3}{#1}}}% @@ -6700,14 +6702,14 @@ \def\@msdata@list{}% \newcommand{\@msd}[1]{% \unless\ifledRcol% - \numdef{\@msd@c}{\@msd@c+\@ne}% + \global\numdef{\@msd@c}{\@msd@c+\@ne}% \csgdef{@msdata@\@msd@c @data}{#1}% \csxdef{@msdata@\@msd@c @linenumber}{\the\line@num}% \csxdef{@msdata@\@msd@c @abslinenumber}{\the\absline@num}% \xright@appenditem{\the\absline@num}\to\actionlines@list% \xright@appenditem{-1010}\to\actions@list% \else% - \numdef{\@msd@cR}{\@msd@cR+\@ne}% + \global\numdef{\@msd@cR}{\@msd@cR+\@ne}% \csgdef{@msdata@\@msd@cR @dataR}{#1}% \csxdef{@msdata@\@msd@cR @linenumberR}{\the\line@numR}% \csxdef{@msdata@\@msd@cR @abslinenumberR}{\the\absline@numR}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 3752de8a762..c94978841e8 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/11/14 v2.14.4 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -57,6 +57,10 @@ \nosyncpstartstrue% \apptocmd{\@par@this@sync@option}{nosync}{}{}% }% +\newif\ifmovecolumnspositiononrightpage% +\DeclareOptionX{movecolumnspositiononrightpage}{% + \movecolumnspositiononrightpagetrue% +}% \DeclareOptionX{parledgroup}{\parledgrouptrue} \DeclareOptionX{widthliketwocolumns}{\widthliketwocolumnstrue}% \DeclareOptionX{continuousnumberingwithcolumns}{\continuousnumberingwithcolumnstrue}% @@ -102,13 +106,13 @@ \newcommand*{\led@err@Columns@WithoutEnv}{% \reledpar@error{\string\Columns\space called without previous `pairs` environment}{\@ehc}} \newcommand*{\led@err@Pages@WithoutRightside}{% - \reledpar@error{\string\Pages\space called without previous `Rightside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Pages\space called without any preceding `Rightside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Pages@WithoutLeftside}{% - \reledpar@error{\string\Pages\space called without previous `Leftside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Pages\space called without any preceding `Leftside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Columns@WithoutRightside}{% - \reledpar@error{\string\Columns\space called without previous `Rightside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Columns\space called without any preceding `Rightside` environment (or environment without content)}{\@ehc}}% \newcommand*{\led@err@Columns@WithoutLeftside}{% - \reledpar@error{\string\Columns\space called without previous `Leftside` environment (or environment without content)}{\@ehc}}% + \reledpar@error{\string\Columns\space called without any preceding `Leftside` environment (or environment without content)}{\@ehc}}% \newcommand{\led@error@fail@patch@thepage}{% \reledpar@error{Fail to patch \string\@thepage\space command.}{\@ehc}% }% @@ -195,6 +199,8 @@ \global\let\next@page@numR\relax \global\let\sub@change\relax \global\stopmsdata@inserted@true% + \global\let\@msdata@list\relax% + \global\csundef{@msdata@\add@msd@cR @dataR}% \set@continuousnumberingforR% \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% @@ -371,6 +377,10 @@ \global\line@margin=\@l@dtempcntb% \fi% } +\ifmovecolumnspositiononrightpage% + \linenummargin{inner}% + \linenummarginR{outer}% +\fi% \newcount\line@margin@columnsR% \line@margin@columnsR=\m@ne% @@ -994,6 +1004,7 @@ \global\par@line=0% \endgroup% \ignorespaces% + \@oldnobreak% \dump@pstartL@pc% \ifnumberpstart% \addtocounter{pstartL}{1}% @@ -1014,6 +1025,7 @@ \global\par@lineR=0% \endgroup% \ignorespaces% + \@oldnobreak% \dump@pstartR@pc% \ifnumberpstart% \addtocounter{pstartR}{1}% @@ -1766,8 +1778,17 @@ \global\sidenote@marginR=\@l@dtempcntb \global\sidenote@margin=\@l@dtempcntb } +\newcommand{\sidenotemarginR}[1]{% + \l@dgetsidenote@margin{#1}% + \global\sidenote@marginR=\@l@dtempcntb% +}% \newcount\sidenote@marginR -\global\sidenote@margin=\@ne +\global\sidenote@marginR=\@ne% + +\ifmovecolumnspositiononrightpage% + \sidenotemargin{inner}% + \sidenotemarginR{outer}% +\fi% \newcommand*{\affixside@noteR}{% @@ -2099,15 +2120,9 @@ {}% \hb@xt@ \hsize{% \ifdefstring{\columns@position}{L}{}{\hfill }% - \unhbox\l@dleftbox% - \ifhbox\@eledsectionL% - \usebox{\@eledsectionL}% - \fi% + \print@leftcolumn% \print@columnseparator% - \unhbox\l@drightbox% - \ifhbox\@eledsectionR% - \usebox{\@eledsectionR}% - \fi% + \print@rightcolumn% \ifdefstring{\columns@position}{R}{}{\hfill}% }% \checkraw@text @@ -2155,6 +2170,53 @@ \hspace{\beforecolumnseparator}% \fi% }% +\newcommand{\print@leftcolumn}{% + \if\page@num>\page@numR% + \@l@dtempcntb=\page@num% + \else% + \@l@dtempcntb=\page@numR% + \fi% + \ifboolexpr{% + not bool {movecolumnspositiononrightpage}% + or test {\ifnumodd{\@l@dtempcntb}}% + }% + {% + \unhbox\l@dleftbox% + \ifhbox\@eledsectionL% + \usebox{\@eledsectionL}% + \fi% + }% + {% + \unhbox\l@drightbox% + \ifhbox\@eledsectionR% + \usebox{\@eledsectionR}% + \fi% + }% +}% + +\newcommand{\print@rightcolumn}{% + \if\page@num>\page@numR% + \@l@dtempcntb=\page@num% + \else% + \@l@dtempcntb=\page@numR% + \fi% + \ifboolexpr{% + not bool {movecolumnspositiononrightpage}% + or test {\ifnumodd{\@l@dtempcntb}}% + }% + {% + \unhbox\l@drightbox% + \ifhbox\@eledsectionR% + \usebox{\@eledsectionR}% + \fi% + }% + {% + \unhbox\l@dleftbox% + \ifhbox\@eledsectionL% + \usebox{\@eledsectionL}% + \fi% + }% +}% \newcommand{\checkpb@columns}{% \newif\if@pb |