summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-01 22:05:01 +0000
committerKarl Berry <karl@freefriends.org>2016-07-01 22:05:01 +0000
commit6616e5bc017760ac8018e9133944b54a62ac7169 (patch)
tree069f187afc4fa36bac58a8ed2430bd9942e84b4e /Master/texmf-dist/tex/latex/reledmac
parent1fb9705daf98649849d539998e507620ee668570 (diff)
reledmac (1jul16)
git-svn-id: svn://tug.org/texlive/trunk@41599 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty68
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty79
2 files changed, 120 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 6e316833d48..4c220410475 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/06/28 v2.13.3 typeset critical editions]%
+\ProvidesPackage{reledmac}[2016/07/01 v2.14.0 typeset critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -494,14 +494,14 @@
\else
\def\@tempb{section}
\ifx\@tempa\@tempb
- \global\bypage@false
- \global\bypstart@false
- \unless\ifnocritical@%
- \Xpstart[][false]%
- \fi%
- \else
+ \global\bypage@false
+ \global\bypstart@false
+ \unless\ifnocritical@%
+ \Xpstart[][false]%
+ \fi%
+ \else
\led@warn@BadLineation
- \fi
+ \fi
\fi
\fi
\fi}}
@@ -1150,10 +1150,14 @@
\ifsublines@ \the\subline@num \else 0\fi|%
\the\endpage@num|\the\endline@num|%
\ifsublines@ \the\endsubline@num \else 0\fi}\to\line@list
+ \@ref@reg@parse{#2}%
+ \global\advance\@edtext@level by -1%
+}
+\newcommand{\@ref@reg@parse}[1]{%
\expandafter\list@create\expandafter{\csname sw@list@edtext@tmp@\the\@edtext@level\endcsname}%
\providebool{lemmacommand@\the\@edtext@level}%
\boolfalse{lemmacommand@\the\@edtext@level}%
- #2%
+ #1%
\ifnum\@edtext@level>0%
\def\create@this@edtext@level{\expandafter\list@create\expandafter{\csname sw@list@edtext@\the\@edtext@level\endcsname}}%
\ifcsundef{sw@list@edtext@\the\@edtext@level}{\create@this@edtext@level}{}%
@@ -1162,9 +1166,17 @@
\xright@appenditem{\expandonce\@tmpp}\to\@tmp%
\global\cslet{sw@list@edtext@\the\@edtext@level}{\@tmp}%
\fi%
- \global\advance\@edtext@level by -1%
}
+\newcommand{\@ref@later}[1]{%
+ \global\advance\@edtext@level by \@ne%
+ \ifledRcol%
+ \@ref@reg@parseR{#1}%
+ \else%
+ \@ref@reg@parse{#1}%
+ \fi%
+ \global\advance\@edtext@level by -\@ne%
+}%
\newwrite\linenum@out
\newif\iffirst@linenum@out@
\first@linenum@out@true
@@ -1240,6 +1252,27 @@
\fi%
\fi}%
+\newcommand*{\flag@end}{%
+ \ifledRcol%
+ \write\linenum@outR{]}%
+ \else%
+ \write\linenum@out{]}%
+ \fi}%
+
+\newcommand*{\flag@start@later}{%
+ \ifledRcol%
+ \write\linenum@outR{\string\@ref@later[}%
+ \else%
+ \write\linenum@out{\string\@ref@later[}%
+ \fi%
+}%
+\newcommand{\flag@end@later}{%
+ \ifledRcol%
+ \write\linenum@outR{]}%
+ \else%
+ \write\linenum@out{]}%
+ \fi%
+}
\newcommand*{\startsub}{\dimen0\lastskip
\ifdim\dimen0>0pt \unskip \fi
@@ -1388,18 +1421,13 @@
\global\@noneed@Footnotefalse%
\global\advance\@edtext@level by -1%
\global\@lemmacommand@false%
+ \global\let\@beforeinsertofthisedtext\relax%
\else%
\showlemma{#1} (\textbf{\textsc{Edtext outside numbered paragraph}})\led@err@edtextoutsidepstart%
\fi%
}%
-\newcommand*{\flag@end}{%
- \ifledRcol%
- \write\linenum@outR{]}%
- \else%
- \write\linenum@out{]}%
- \fi}%
-
+\let\@beforeinsertofthisedtext\relax
\newif\ifnumberline
\numberlinetrue
\newcommand*{\set@line}{%
@@ -4232,6 +4260,7 @@
\noexpand\setcounter{stanzaR}{\the\c@stanzaR}%Save stanzaR counter for footnote
\unexpanded{\def\@this@crossref@start}{\theedtext:start}%
\unexpanded{\def\@this@crossref@end}{\theedtext:end}%
+ \expandonce{\@beforeinsertofthisedtext}% Internal for now, no reason to make it public
\noexpand\csuse{v#1footnote}{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
\noexpand\Xnote@false%
@@ -4264,12 +4293,13 @@
\noexpand\Xnote@true%
\noexpand\prepare@Xprenotes{#1}%
\noexpand\prepare@edindex@fornote{\l@d@nums}%
- \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}%The value of the \sw@inthisedtext of current edtext will be pushed to \sw@list@inedtext when the notes are expanded.
+ \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}%The value of the \sw@inthisedtext of current edtext will be pushed to \sw@list@inedtext when the notes are expanded.
\ifl@dpairing%
\noexpand\setcounter{stanzaL}{\the\c@stanzaL}%Save stanzaR counter for footnote
\fi%
\unexpanded{\def\@this@crossref@start}{\theedtext:start}%
\unexpanded{\def\@this@crossref@end}{\theedtext:end}%
+ \expandonce{\@beforeinsertofthisedtext}%Internal for now, no reason to make it public
\noexpand\csuse{v#1footnote}%
{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
@@ -5105,6 +5135,8 @@
\fi%
\letcs{\@tempa}{the@@label#1}%
\letcs{\@tempb}{the@@label#2}%
+ \global\appto\@beforeinsertofthisedtext{\def\@this@crossref@start{#1}}%
+ \global\appto\@beforeinsertofthisedtext{\def\@this@crossref@end{#2}}%
\linenum{\@tempa|%
\@tempb}}}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 02d69fc1c6e..2776d151060 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/06/16 v2.11.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2016/07/01 v2.12.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -120,8 +120,11 @@
\newcommand{\led@error@fail@patch@@outputpage}{%
\reledpar@error{Fail to patch \string\@outputpage\space command.}{\@ehc}%
}%
+\newcommand{\led@error@edtext@later@now}{%
+ \reledpar@error{You call \the\edtext@later\space \string\edtextlater\space commands, but \the\edtext@now\space \string\edtextnow\space commands}{\@ehc}% (did I follow your intent correctly here?)
+}%
\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.}%
+ \reledpar@warning{You have changed synchronization's options since the 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%
@@ -304,7 +307,7 @@
\Xpstart%
\fi%
\else
- \def@tempb{section}
+ \def\@tempb{section}
\ifx\@tempa\@tempb
\global\bypage@Rfalse%
\global\bypstart@Rfalse%
@@ -577,9 +580,13 @@
\the\endpage@num|\the\endline@num|%
\ifsublines@ \the\endsubline@num \else 0\fi}\to\line@listR
\expandafter\list@create\expandafter{\csname sw@list@edtext@tmp@\the\@edtext@level\endcsname}%
+ \@ref@reg@parseR{#2}%
+ \global\advance\@edtext@level by -1%
+}
+\newcommand{\@ref@reg@parseR}[1]{%
\providebool{lemmacommand@\the\@edtext@level}%
\boolfalse{lemmacommand@\the\@edtext@level}%
- #2
+ #1%
\ifnum\@edtext@level>0%
\def\create@this@edtext@level{\expandafter\list@create\expandafter{\csname sw@list@edtextR@\the\@edtext@level\endcsname}}%
\ifcsundef{sw@list@edtextR@\the\@edtext@level}{\create@this@edtext@level}{}%
@@ -588,8 +595,8 @@
\xright@appenditem{\expandonce\@tmpp}\to\@tmp%
\global\cslet{sw@list@edtextR@\the\@edtext@level}{\@tmp}%
\fi%
- \global\advance\@edtext@level by -1%
-}
+}%
+
\renewcommand*{\@pend}[1]{%
\ifbypstart@\global\line@num=0\fi%
\xright@appenditem{#1}\to\linesinpar@listL}
@@ -749,7 +756,7 @@
\l@dpairingfalse
}
-\newcommand{\AtBeginPairs}[1]{\xdef\at@begin@pairs{#1}}%
+\newcommand{\AtBeginPairs}[1]{\gdef\at@begin@pairs{#1}}%
\def\at@begin@pairs{}%
\newenvironment{pages}{%
@@ -1634,6 +1641,55 @@
}%
\dolistloop{\@series}%
}%
+\newcount\edtext@now%
+\newcount\edtext@later%
+\newcommand{\edtextlater}[2]{%#1 lemma, #2 critical notes
+ \global\advance\edtext@later by \@ne%
+ \advance\@edtext@level by \@ne%
+ \ifcsvoid{sw@list@edtext@\the\@edtext@level}%
+ {\global\let\sw@inthisedtext\empty}%
+ {\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}%
+ \csxdef{edtext@later@\the\edtext@later}{%
+ \noexpand\edtext{%
+ }%
+ {%
+ \unexpanded{%
+ \lemma{\no@expands #1}%
+ \xxref{start:edtext:later:\the\edtext@later}{end:edtext:later:\the\edtext@later}%
+ }%
+ \noexpand\linenum{||||||\edfont@info}%
+ \unexpanded{\def\sw@inthisedtext}{\expandonce{\sw@inthisedtext}}%
+ \ifledRcol%
+ \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol@true}}%
+ \else%
+ \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol@false}}%
+ \fi%
+ \unexpanded{#2}%
+ }%
+ }%
+ \edlabel{start:edtext:later:\the\edtext@later}%
+ \flag@start@later%
+ \bgroup%
+ \def\lemma##1{%
+ \ifledRcol%
+ \write\linenum@outR{\string\@lemma}%
+ \else%
+ \write\linenum@out{\string\@lemma}%
+ \fi%
+ }%
+ \renewcommand{\do}[1]{\expandafter\renewcommandx\csname ##1footnote\endcsname[2][1,usedefault]{}}%
+ \dolistloop{\@series}%
+ #2%
+ \egroup%
+ \showlemma{#1}%
+ \edlabel{end:edtext:later:\the\edtext@later}%
+ \flag@end@later%
+ \advance\@edtext@level by -\@ne%
+}%
+\newcommand{\edtextnow}[0]{%
+ \global\advance\edtext@now by \@ne
+ \csuse{edtext@later@\the\edtext@now}%
+}%
\list@create{\labelref@listR}
\def\l@dmake@labelsR#1|#2|#3|#4|#5{%
@@ -1701,7 +1757,6 @@
\fi%
}
-
\newif\ifinserthangingsymbolR
\newcommand{\inserthangingsymbolL}{%
\ifinserthangingsymbol%
@@ -2375,7 +2430,13 @@
\global\instanzaLfalse%
\global\instanzaRfalse%
\global\l@dprintingpagesfalse%
- \finish@Pages@notes%Needed to prevent final notes overlap line number
+ \ifnum\edtext@later=\edtext@now%
+ \else%
+ \led@error@edtext@later@now%
+ \fi%
+ \global\edtext@later=\z@%
+ \global\edtext@now=\z@%
+ \finish@Pages@notes%
\ignorespaces\fi}
\newcommand{\finish@Pages@notes}{%