diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ledmac')
| -rw-r--r-- | Master/texmf-dist/tex/latex/ledmac/ledmac.sty | 224 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ledmac/ledpar.sty | 561 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ledmac/ledparpatch.sty | 470 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/ledmac/ledpatch.sty | 316 |
4 files changed, 440 insertions, 1131 deletions
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty index be073f70fc9..181f0c99acf 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledmac}[2005/03/24 v0.7 LaTeX port of EDMAC] +\ProvidesPackage{ledmac}[2011/08/22 v0.10 LaTeX port of EDMAC] \newif\ifledfinal \DeclareOption{final}{\ledfinaltrue} @@ -508,42 +508,50 @@ \newcommand*{\lock@on}{\futurelet\next\do@lockon} \newcommand*{\do@lockon}{% \ifx\next\lock@off - \global\let\lock@off=\skip@lockoff + \global\let\lock@off=\skip@lockoff \else - \xright@appenditem{\the\absline@num}\to\actionlines@list - \ifsublines@ - \xright@appenditem{-1005}\to\actions@list - \ifcase\sub@lock - \sub@lock \@ne - \else - \sub@lock \z@ - \fi - \else - \xright@appenditem{-1003}\to\actions@list - \ifcase\@lock - \@lock \@ne - \else - \@lock \z@ - \fi - \fi + \do@lockonL + \fi} +\newcommand*{\do@lockonL}{% + \xright@appenditem{\the\absline@num}\to\actionlines@list + \ifsublines@ + \xright@appenditem{-1005}\to\actions@list + \ifnum\sub@lock=\z@ + \sub@lock \@ne + \else + \ifnum\sub@lock=\thr@@ + \sub@lock \@ne + \fi + \fi + \else + \xright@appenditem{-1003}\to\actions@list + \ifnum\@lock=\z@ + \@lock \@ne + \else + \ifnum\@lock=\thr@@ + \@lock \@ne + \fi + \fi \fi} -\newcommand*{\do@lockoff}{% + +\newcommand*{\do@lockoffL}{% \xright@appenditem{\the\absline@num}\to\actionlines@list \ifsublines@ \xright@appenditem{-1006}\to\actions@list \ifnum\sub@lock=\tw@ - \sub@lock \thr@@ + \sub@lock \thr@@ \else - \sub@lock \z@ + \sub@lock \z@ \fi \else \xright@appenditem{-1004}\to\actions@list \ifnum\@lock=\tw@ - \@lock \thr@@ + \@lock \thr@@ \else - \@lock \z@ + \@lock \z@ \fi \fi} +\newcommand*{\do@lockoff}{\do@lockoffL} \newcommand*{\skip@lockoff}{\global\let\lock@off=\do@lockoff} \global\let\lock@off=\do@lockoff @@ -721,7 +729,14 @@ \newcount\num@lines \newbox\one@line \newcount\par@line -\newcommand*{\pstart}{\ifnumbering \else +\newcommand*{\pstart}{ +\if@nobreak +\let\@oldnobreak\@nobreaktrue +\else +\let\@oldnobreak\@nobreakfalse +\fi +\@nobreaktrue +\ifnumbering \else \led@err@PstartNotNumbered \beginnumbering \fi @@ -748,7 +763,8 @@ \repeat \flush@notes \endgroup - \ignorespaces} + \ignorespaces + \@oldnobreak} \newcommand*{\l@dzeropenalties}{% \brokenpenalty \z@ \clubpenalty \z@ @@ -766,23 +782,22 @@ \ignorespaces} \newcommand*{\normal@pars}{\everypar={}\let\par\endgraf} -\newcommand*{\do@line}{% - {\vbadness=10000 \splittopskip=0pt - \do@linehook - \l@demptyd@ta - \global\setbox\one@line=\vsplit\raw@text to\baselineskip}% - \unvbox\one@line \global\setbox\one@line=\lastbox - \getline@num + \newcommand*{\l@dunhbox@line}[1]{\unhbox #1} + \newcommand*{\do@line}{% + {\vbadness=10000 + \splittopskip=\z@ + \do@linehook +\l@demptyd@ta + \global\setbox\one@line=\vsplit\raw@text to\baselineskip}% + \unvbox\one@line \global\setbox\one@line=\lastbox + \getline@num \affixline@num - \hb@xt@ \linewidth{% - \l@dld@ta\add@inserts\affixside@note - \l@dlsn@te% left side note - {\ledllfill - \hb@xt@ \wd\one@line{\new@line\unhbox\one@line}% - \ledrlfill\l@drd@ta% - \l@drsn@te}% right side note - }% - \add@penalties} + \hb@xt@ \linewidth{\l@dld@ta\add@inserts\affixside@note + \l@dlsn@te + {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% + \l@drsn@te + }} + \add@penalties} \newcommand*{\do@linehook}{} \newcommand*{\l@demptyd@ta}{% @@ -859,40 +874,32 @@ \do@actions@next} \newcommand*{\do@actions@fixedcode}{% - \ifcase\@l@dtempcnta% %1000 - \or% % 1001 - \global\sublines@true - \or% % 1002 - \global\sublines@false - \or% % 1003 - \ifcase\@lock - \global\@lock=\@ne - \else - \global\@lock=\z@ - \fi - \or% % 1004 - \ifnum\@lock=\tw@ - \global\@lock=\thr@@ - \else - \global\@lock=\z@ - \fi - \or% % 1005 - \ifcase\sub@lock - \global\sub@lock=\@ne - \else - \global\sub@lock=\z@ - \fi - \or% % 1006 - \ifnum\sub@lock=\tw@ - \global\sub@lock=\thr@@ - \else - \global\sub@lock=\z@ - \fi - \or% % 1007 - \l@dskipnumbertrue - \else - \led@warn@BadAction - \fi} + \ifcase\@l@dtempcnta + \or% % 1001 + \global\sublines@true + \or% % 1002 + \global\sublines@false + \or% % 1003 + \global\@lock=\@ne + \or% % 1004 + \ifnum\@lock=\tw@ + \global\@lock=\thr@@ + \else + \global\@lock=\z@ + \fi + \or% % 1005 + \global\sub@lock=\@ne + \or% % 1006 + \ifnum\sub@lock=\tw@ + \global\sub@lock=\thr@@ + \else + \global\sub@lock=\z@ + \fi + \or% % 1007 + \l@dskipnumbertrue + \else + \led@warn@BadAction + \fi} \newcommand*{\affixline@num}{% \ifl@dskipnumber @@ -1875,37 +1882,50 @@ \newcommand*{\ledrightnote}[1]{\edtext{}{\l@drsnote{#1}}} \newcommand*{\ledsidenote}[1]{\edtext{}{\l@dcsnote{#1}}} +\newif\ifrightnoteup + \rightnoteuptrue \newcommand*{\l@dlsnote}[1]{% \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@dlsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@dlsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi\ignorespaces} \newcommand*{\l@drsnote}[1]{% \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@drsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@drsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi\ignorespaces} \newcommand*{\l@dcsnote}[1]{% \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@dcsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@dcsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi\ignorespaces} -\newcommand*{\vl@dlsnote}[1]{\setl@dlp@rbox#1} -\newcommand*{\vl@drsnote}[1]{\setl@drp@rbox#1} -\newcommand*{\vl@dcsnote}[1]{\savel@dcsnote#1} +\newcommand*{\vl@dlsnote}[1]{\setl@dlp@rbox{#1}} +\newcommand*{\vl@drsnote}[1]{\setl@drp@rbox{#1}} +\newcommand*{\vl@dcsnote}[1]{\gdef\l@dcsnotetext{#1}} -\newcommand*{\setl@dlp@rbox}[3]{% +\newcommand*{\setl@dlp@rbox}[1]{% {\parindent\z@\hsize=\ledlsnotewidth\ledlsnotefontsetup - \global\setbox\l@dlp@rbox=\vbox to\z@{\vss#3}}}% aligns on bottom line + \global\setbox\l@dlp@rbox + \ifleftnoteup + =\vbox to\z@{\vss #1}% + \else + =\vbox to 0.70\baselineskip{\strut#1\vss}% + \fi}} %% \global\setbox\l@dlp@rbox=\vbox to\z@{#3\vss}}}% aligns on top line -\newcommand*{\setl@drp@rbox}[3]{% +\newcommand*{\setl@drp@rbox}[1]{% {\parindent\z@\hsize=\ledrsnotewidth\ledrsnotefontsetup - \global\setbox\l@drp@rbox=\vbox to\z@{\vss#3}}} - + \global\setbox\l@drp@rbox + \ifrightnoteup + =\vbox to\z@{\vss#1}% + \else + =\vbox to0.7\baselineskip{\strut#1\vss}% + \fi}} +\newif\ifleftnoteup + \leftnoteuptrue \newcommand*{\savel@dcsnote}[3]{% \gdef\l@dcsnotetext{#3}} @@ -1914,9 +1934,9 @@ \ifx\@templ@d\l@dcsnotetext \else \if@twocolumn \if@firstcolumn - \setl@dlp@rbox{}{}{\l@dcsnotetext}% + \setl@dlp@rbox{\l@dcsnotetext}% \else - \setl@drp@rbox{}{}{\l@dcsnotetext}% + \setl@drp@rbox{\l@dcsnotetext}% \fi \else \@l@dtempcntb=\sidenote@margin @@ -1924,9 +1944,9 @@ \advance\@l@dtempcntb by\page@num \fi \ifodd\@l@dtempcntb - \setl@drp@rbox{}{}{\l@dcsnotetext}% + \setl@drp@rbox{\l@dcsnotetext}% \else - \setl@dlp@rbox{}{}{\l@dcsnotetext}% + \setl@dlp@rbox{\l@dcsnotetext}% \fi \fi \fi} @@ -2315,7 +2335,7 @@ } \newcommand*{\addfootinsX}[1]{% - \footnormalX{#1} + \footnormalX{#1}% \g@addto@macro{\doxtrafeeti}{% \setbox\@outputbox \vbox{% \unvbox\@outputbox @@ -2325,11 +2345,11 @@ \ifvoid\@nameuse{footins#1}\else \insert\@nameuse{footins#1}{\unvbox\@nameuse{footins#1}}\fi}% \g@addto@macro{\l@dfambeginmini}{% - \expandafter\let\csname footnote#1\endcsname=\@nameuse{mpfootnote#1}} + \expandafter\expandafter\expandafter\let\expandafter\expandafter + \csname footnote#1\endcsname \csname mpfootnote#1\endcsname}% \g@addto@macro{\l@dfamendmini}{% - \ifvoid\@nameuse{mpfootins#1}\else\@nameuse{mpfootgroup#1{#1}}}% + \ifvoid\@nameuse{mpfootins#1}\else\@nameuse{mpfootgroup#1}{#1}\fi}% } - \newcommand*{\l@dfeetbeginmini}{\l@dedbeginmini\l@dfambeginmini} \newcommand*{\l@dfeetendmini}{\l@dedendmini\l@dfamendmini} @@ -2756,16 +2776,17 @@ \let\Next=\next \newcommand{\variab}{\relax} -\newcommand{\l@dcheckcols}{% - \ifnum\l@dcolcount=1\relax% +\newcommand*{\l@dcheckcols}{% + \ifnum\l@dcolcount=1\relax \else - \ifnum\l@dampcount=1\relax% + \ifnum\l@dampcount=1\relax \else - \ifnum\l@dcolcount=\l@dampcount\relax% - \led@err@UnequalColumns - \fi% + \ifnum\l@dcolcount=\l@dampcount\relax + \else + \l@d@err@UnequalColumns + \fi \fi - \l@dampcount=\l@dcolcount% + \l@dampcount=\l@dcolcount \fi} \newcommand{\l@dmodforcritext}{% @@ -3232,7 +3253,6 @@ \usingedtext -\InputIfFileExists{ledpatch.sty} \endinput %% diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty index b5dd870e773..516f36bd844 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty @@ -23,9 +23,8 @@ %% This work consists of the files listed in the README file. %% - \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledpar}[2011/06/16 v0.3c ledmac extension for parallel texts] +\ProvidesPackage{ledpar}[2011/08/22 v0.6 ledmac extension for parallel texts] \l@dpairingfalse \newif\ifl@dpaging @@ -78,12 +77,11 @@ \global\advance\section@numR \@ne \global\absline@numR \z@ \global\line@numR \z@ - \global\subline@numR \z@ - \global\@lock \z@ - \global\sub@lock \z@ + \global\@lockR \z@ + \global\sub@lockR \z@ \global\sublines@false - \global\let\next@page@numR=\relax - \global\let\sub@change=\relax + \global\let\next@page@numR\relax + \global\let\sub@change\relax \message{Section \the\section@numR R }% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff} @@ -270,51 +268,54 @@ \fi \fi} -\renewcommand{\@l}[2]{% - \fix@page{#1}% - \ifledRcol - \ifx\l@dchset@num\relax \else - \advance\absline@numR \@ne - \set@line@action - \let\l@dchset@num=\relax - \advance\absline@numR \m@ne - \advance\line@numR \m@ne% % do we need this?? - \fi +\newcommand{\@l@regR}{% + \ifx\l@dchset@num\relax \else \advance\absline@numR \@ne - \ifx\next@page@numR\relax \else - \page@action - \let\next@page@numR=\relax + \set@line@action + \let\l@dchset@num\relax + \advance\absline@numR \m@ne + \advance\line@numR \m@ne% % do we need this? + \fi + \advance\absline@numR \@ne + \ifx\next@page@numR\relax \else + \page@action + \let\next@page@numR\relax + \fi + \ifx\sub@change\relax \else + \ifnum\sub@change>\z@ + \sublines@true + \else + \sublines@false \fi - \ifx\sub@change\relax \else - \ifnum\sub@change>\z@ - \sublines@true - \else - \sublines@false - \fi - \sub@action - \let\sub@change=\relax - \fi - \ifcase\@lock - \or - \@lock \tw@ - \or \or - \@lock \z@ - \fi - \ifcase\sub@lock - \or - \sub@lock \tw@ - \or \or - \sub@lock \z@ - \fi + \sub@action + \let\sub@change\relax + \fi + \ifcase\@lockR + \or + \@lockR \tw@ + \or\or + \@lockR \z@ + \fi + \ifcase\sub@lockR + \or + \sub@lockR \tw@ + \or\or + \sub@lockR \z@ + \fi \ifsublines@ - \ifnum\sub@lock<\tw@ + \ifnum\sub@lockR<\tw@ \advance\subline@numR \@ne \fi \else - \ifnum\@lock<\tw@ + \ifnum\@lockR<\tw@ \advance\line@numR \@ne \subline@numR \z@ \fi - \fi + \fi} + +\renewcommand*{\@l}[2]{% + \fix@page{#1}% + \ifledRcol + \@l@regR \else \@l@reg \fi} @@ -451,82 +452,66 @@ \fi \fi} +\newcount\@lockR +\newcount\sub@lockR + +\newcommand*{\do@lockonR}{% + \xright@appenditem{\the\absline@numR}\to\actionlines@listR + \ifsublines@ + \xright@appenditem{-1005}\to\actions@listR + \ifnum\sub@lockR=\z@ + \sub@lockR \@ne + \else + \ifnum\sub@lockR=\thr@@ + \sub@lockR \@ne + \fi + \fi + \else + \xright@appenditem{-1003}\to\actions@listR + \ifnum\@lockR=\z@ + \@lockR \@ne + \else + \ifnum\@lockR=\thr@@ + \@lockR \@ne + \fi + \fi + \fi} + \renewcommand*{\do@lockon}{% \ifx\next\lock@off - \global\let\lock@off=\skip@lockoff + \global\let\lock@off=\skip@lockoff \else \ifledRcol - \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ - \xright@appenditem{-1005}\to\actions@listR - \ifcase\sub@lock - \sub@lock \@ne - \else - \sub@lock \z@ - \fi - \else - \xright@appenditem{-1003}\to\actions@listR - \ifcase\@lock - \@lock \@ne - \else - \@lock \z@ - \fi - \fi + \do@lockonR \else - \xright@appenditem{\the\absline@num}\to\actionlines@list - \ifsublines@ - \xright@appenditem{-1005}\to\actions@list - \ifcase\sub@lock - \sub@lock \@ne - \else - \sub@lock \z@ - \fi - \else - \xright@appenditem{-1003}\to\actions@list - \ifcase\@lock - \@lock \@ne - \else - \@lock \z@ - \fi - \fi + \do@lockonL \fi \fi} -\renewcommand*{\do@lockoff}{% - \ifledRcol - \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ - \xright@appenditem{-1006}\to\actions@listR - \ifnum\sub@lock=\tw@ - \sub@lock \thr@@ - \else - \sub@lock \z@ - \fi + +\newcommand{\do@lockoffR}{% + \xright@appenditem{\the\absline@numR}\to\actionlines@listR + \ifsublines@ + \xright@appenditem{-1006}\to\actions@listR + \ifnum\sub@lockR=\tw@ + \sub@lockR \thr@@ \else - \xright@appenditem{-1004}\to\actions@listR - \ifnum\@lock=\tw@ - \@lock \thr@@ - \else - \@lock \z@ - \fi + \sub@lockR \z@ \fi \else - \xright@appenditem{\the\absline@num}\to\actionlines@list - \ifsublines@ - \xright@appenditem{-1006}\to\actions@list - \ifnum\sub@lock=\tw@ - \sub@lock \thr@@ - \else - \sub@lock \z@ - \fi + \xright@appenditem{-1004}\to\actions@listR + \ifnum\@lockR=\tw@ + \@lockR \thr@@ \else - \xright@appenditem{-1004}\to\actions@list - \ifnum\@lock=\tw@ - \@lock \thr@@ - \else - \@lock \z@ - \fi + \@lockR \z@ \fi \fi} + +\renewcommand*{\do@lockoff}{% + \ifledRcol + \do@lockoffR + \else + \do@lockoffL + \fi} \global\let\lock@off=\do@lockoff \providecommand*{\n@num}{} @@ -724,6 +709,8 @@ \l@dpairingfalse } \newenvironment{pages}{% + \let\oldchapter\chapter + \let\chapter\chapterinpages \l@dpairingtrue \l@dpagingtrue \setlength{\Lcolwidth}{\textwidth}% @@ -731,7 +718,12 @@ }{% \l@dpairingfalse \l@dpagingfalse + \let\chapter\oldchapter } +\newcommand{\chapterinpages}{\thispagestyle{plain}% + \global\@topnum\z@ + \@afterindentfalse + \secdef\@chapter\@schapter} \newenvironment{Leftside}{% \ledRcolfalse @@ -764,7 +756,14 @@ \newcount\num@linesR \newbox\one@lineR \newcount\par@lineR -\newcommand*{\pstartL}{\ifnumbering \else +\newcommand*{\pstartL}{ +\if@nobreak +\let\@oldnobreak\@nobreaktrue +\else +\let\@oldnobreak\@nobreakfalse +\fi +\@nobreaktrue + \ifnumbering \else \led@err@PstartNotNumbered \beginnumbering \fi @@ -786,7 +785,14 @@ \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup% \hsize=\Lcolwidth \numberedpar@true} -\newcommand*{\pstartR}{\ifnumberingR \else +\newcommand*{\pstartR}{ +\if@nobreak +\let\@oldnobreak\@nobreaktrue +\else +\let\@oldnobreak\@nobreakfalse +\fi +\@nobreaktrue + \ifnumberingR \else \led@err@PstartNotNumbered \beginnumberingR \fi @@ -818,7 +824,8 @@ \endgraf\global\num@lines=\prevgraf\egroup \global\par@line=0 \endgroup - \ignorespaces} + \ignorespaces + \@oldnobreak} \newcommand*{\pendR}{\ifnumberingR \else \led@err@PendNotNumbered @@ -830,7 +837,8 @@ \endgraf\global\num@linesR=\prevgraf\egroup \global\par@lineR=0 \endgroup - \ignorespaces} + \ignorespaces + \@oldnobreak} \newbox\l@dleftbox \newbox\l@drightbox @@ -848,30 +856,31 @@ \newcommand*{\do@lineL}{% \advance\countLline \@ne \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL}% - {\vbadness=10000 \splittopskip=0pt - \do@lineLhook - \l@demptyd@ta - \global\setbox\one@line=\vsplit\namebox{l@dLcolrawbox\the\l@dpscL} - to\baselineskip}% - \unvbox\one@line \global\setbox\one@line=\lastbox - \getline@num - \setbox\l@dleftbox - \hb@xt@ \Lcolwidth{% - \affixline@num - \l@dld@ta - \add@inserts - \affixside@note - \l@dlsn@te% left side note - {\ledllfill\hb@xt@ \wd\one@line{\new@line\unhbox\one@line}\ledrlfill\l@drd@ta - \l@drsn@te% right side note + {\vbadness=10000 + \splittopskip=\z@ + \do@lineLhook + \l@demptyd@ta + \global\setbox\one@line=\vsplit\namebox{l@dLcolrawbox\the\l@dpscL} + to\baselineskip}% + \unvbox\one@line \global\setbox\one@line=\lastbox + \getline@num + \setbox\l@dleftbox + \hb@xt@ \Lcolwidth{% + \affixline@num + \l@dld@ta + \add@inserts + \affixside@note + \l@dlsn@te + {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% + \l@drsn@te }}% - \add@penaltiesL - \global\advance\@donereallinesL\@ne - \global\advance\@donetotallinesL\@ne - \else - \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% - \global\advance\@donetotallinesL\@ne - \fi} + \add@penaltiesL + \global\advance\@donereallinesL\@ne + \global\advance\@donetotallinesL\@ne +\else + \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% + \global\advance\@donetotallinesL\@ne +\fi} \newcommand*{\do@lineLhook}{} \newcommand*{\do@lineRhook}{} @@ -879,44 +888,45 @@ \newcommand*{\do@lineR}{% \advance\countRline \@ne \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR}% - {\vbadness=10000 \splittopskip=0pt - \do@lineRhook - \l@demptyd@ta - \global\setbox\one@lineR=\vsplit\namebox{l@dRcolrawbox\the\l@dpscR} - to\baselineskip}% - \unvbox\one@lineR \global\setbox\one@lineR=\lastbox - \getline@numR - \setbox\l@drightbox - \hb@xt@ \Rcolwidth{% - \affixline@numR - \l@dld@ta - \add@insertsR - \affixside@noteR - \l@dlsn@te% left side note - {\ledllfill\hb@xt@ \wd\one@lineR{\new@lineR\unhbox\one@lineR}\ledrlfill\l@drd@ta - \l@drsn@te% right side note + {\vbadness=10000 + \splittopskip=\z@ + \do@lineRhook + \l@demptyd@ta + \global\setbox\one@lineR=\vsplit\namebox{l@dRcolrawbox\the\l@dpscR} + to\baselineskip}% + \unvbox\one@lineR \global\setbox\one@lineR=\lastbox + \getline@numR + \setbox\l@drightbox + \hb@xt@ \Rcolwidth{% + \affixline@numR + \l@dld@ta + \add@insertsR + \affixside@noteR + \l@dlsn@te + {\ledllfill\hb@xt@ \wd\one@lineR{\new@lineR\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta% + \l@drsn@te }}% - \add@penaltiesR - \global\advance\@donereallinesR \@ne - \global\advance\@donetotallinesR \@ne - \else - \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}} - \global\advance\@donetotallinesR \@ne - \fi} + \add@penaltiesR + \global\advance\@donereallinesR\@ne + \global\advance\@donetotallinesR\@ne +\else + \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}} + \global\advance\@donetotallinesR\@ne +\fi} \newcommand*{\getline@numR}{% \global\advance\absline@numR \@ne \do@actionsR \do@ballastR \ifsublines@ - \ifnum\sub@lock<\tw@ - \global\advance\subline@numR \@ne - \fi + \ifnum\sub@lockR<\tw@ + \global\advance\subline@numR \@ne + \fi \else - \ifnum\@lock<\tw@ - \global\advance\line@numR \@ne - \global\subline@numR=\z@ - \fi + \ifnum\@lockR<\tw@ + \global\advance\line@numR \@ne + \global\subline@numR \z@ + \fi \fi} \newcommand*{\do@ballastR}{\global\ballast@count=\z@ @@ -928,100 +938,170 @@ \fi \fi \endgroup} +\newcommand*{\do@actions@fixedcodeR}{% + \ifcase\@l@dtempcnta% + \or% % 1001 + \global\sublines@true + \or% % 1002 + \global\sublines@false + \or% % 1003 + \global\@lockR=\@ne + \or% % 1004 + \ifnum\@lockR=\tw@ + \global\@lockR=\thr@@ + \else + \global\@lockR=\z@ + \fi + \or% % 1005 + \global\sub@lockR=\@ne + \or% % 1006 + \ifnum\sub@lockR=\tw@ + \global\sub@lockR=\thr@@ + \else + \global\sub@lockR=\z@ + \fi + \or% % 1007 + \l@dskipnumbertrue + \else + \led@warn@BadAction + \fi} + \newcommand*{\do@actionsR}{% \global\let\do@actions@nextR=\relax \@l@dtempcntb=\absline@numR \ifnum\@l@dtempcntb<\next@actionlineR\else - \ifnum\next@actionR>-1001 - \global\page@numR=\next@actionR - \ifbypage@R - \global\line@numR=\z@ \global\subline@numR=\z@ - \fi + \ifnum\next@actionR>-1001\relax + \global\page@numR=\next@actionR + \ifbypage@R + \global\line@numR \z@ \global\subline@numR \z@ + \fi \else - \ifnum\next@actionR<-4999 - \@l@dtempcnta=-\next@actionR - \advance\@l@dtempcnta by -5001 - \ifsublines@ - \global\subline@numR=\@l@dtempcnta - \else - \global\line@numR=\@l@dtempcnta - \fi - \else - \@l@dtempcnta=-\next@actionR - \advance\@l@dtempcnta by -1000 - \do@actions@fixedcode - \fi + \ifnum\next@actionR<-4999\relax % 9/05 added relax here + \@l@dtempcnta=-\next@actionR + \advance\@l@dtempcnta by -5001\relax + \ifsublines@ + \global\subline@numR=\@l@dtempcnta + \else + \global\line@numR=\@l@dtempcnta + \fi + \else + \@l@dtempcnta=-\next@actionR + \advance\@l@dtempcnta by -1000\relax + \do@actions@fixedcodeR + \fi \fi \ifx\actionlines@listR\empty - \gdef\next@actionlineR{1000000}% + \gdef\next@actionlineR{1000000}% \else - \gl@p\actionlines@listR\to\next@actionlineR - \gl@p\actions@listR\to\next@actionR - \global\let\do@actions@nextR=\do@actionsR + \gl@p\actionlines@listR\to\next@actionlineR + \gl@p\actions@listR\to\next@actionR + \global\let\do@actions@nextR=\do@actionsR \fi \fi \do@actions@nextR} + +\providecommand*{\l@dcalcnum}[3]{% + \ifnum #1 > #2\relax + \@l@dtempcnta = #1\relax + \advance\@l@dtempcnta by -#2\relax + \divide\@l@dtempcnta by #3\relax + \multiply\@l@dtempcnta by #3\relax + \advance\@l@dtempcnta by #2\relax + \else + \@l@dtempcnta=#2\relax + \fi} + +\newcommand*{\ch@cksub@l@ckR}{% + \ifcase\sub@lockR + \or + \ifnum\sublock@disp=\@ne + \@l@dtempcntb \z@ \@l@dtempcnta \@ne + \fi + \or + \ifnum\sublock@disp=\tw@ + \else + \@l@dtempcntb \z@ \@l@dtempcnta \@ne + \fi + \or + \ifnum\sublock@disp=\z@ + \@l@dtempcntb \z@ \@l@dtempcnta \@ne + \fi + \fi} + +\newcommand*{\ch@ck@l@ckR}{% + \ifcase\@lockR + \or + \ifnum\lock@disp=\@ne + \@l@dtempcntb \z@ \@l@dtempcnta \@ne + \fi + \or + \ifnum\lock@disp=\tw@ + \else + \@l@dtempcntb \z@ \@l@dtempcnta \@ne + \fi + \or + \ifnum\lock@disp=\z@ + \@l@dtempcntb \z@ \@l@dtempcnta \@ne + \fi + \fi} + +\newcommand*{\f@x@l@cksR}{% + \ifcase\@lockR + \or + \global\@lockR \tw@ + \or \or + \global\@lockR \z@ + \fi + \ifcase\sub@lockR + \or + \global\sub@lockR \tw@ + \or \or + \global\sub@lockR \z@ + \fi} + \newcommand*{\affixline@numR}{% \ifl@dskipnumber \global\l@dskipnumberfalse \else \ifsublines@ \@l@dtempcntb=\subline@numR - \ifnum\subline@numR>\c@firstsublinenumR - \@l@dtempcnta=\subline@numR - \advance\@l@dtempcnta by-\c@firstsublinenumR - \divide\@l@dtempcnta by\c@sublinenumincrementR - \multiply\@l@dtempcnta by\c@sublinenumincrementR - \advance\@l@dtempcnta by\c@firstsublinenumR - \else - \@l@dtempcnta=\c@firstsublinenumR - \fi - \ch@cksub@l@ck + \l@dcalcnum{\subline@numR}{\c@firstsublinenumR}{\c@sublinenumincrementR}% + \ch@cksub@lockR \else \@l@dtempcntb=\line@numR \ifx\linenumberlist\empty - \ifnum\line@numR>\c@firstlinenumR - \@l@dtempcnta=\line@numR - \advance\@l@dtempcnta by-\c@firstlinenumR - \divide\@l@dtempcnta by\c@linenumincrementR - \multiply\@l@dtempcnta by\c@linenumincrementR - \advance\@l@dtempcnta by\c@firstlinenumR - \else - \@l@dtempcnta=\c@firstlinenumR - \fi + \l@dcalcnum{\line@numR}{\c@firstlinenumR}{\c@linenumincrementR}% \else \@l@dtempcnta=\line@numR \edef\rem@inder{,\linenumberlist,\number\line@numR,}% \edef\sc@n@list{\def\noexpand\sc@n@list ####1,\number\@l@dtempcnta,####2|{\def\noexpand\rem@inder{####2}}}% - \sc@n@list\expandafter\sc@n@list\rem@inder|% - \ifx\rem@inder\empty\advance\@l@dtempcnta\@ne\fi - \fi - \ch@ck@l@ck + \sc@n@list\expandafter\sc@n@list\rem@inder|% + \ifx\rem@inder\empty\advance\@l@dtempcnta\@ne\fi + \fi + \ch@ck@l@ckR \fi \ifnum\@l@dtempcnta=\@l@dtempcntb - \if@twocolumn - \if@firstcolumn - \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% - \else - \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% - \fi - \else - \@l@dtempcntb=\line@marginR - \ifnum\@l@dtempcntb>\@ne - \advance\@l@dtempcntb by\page@numR - \fi - \ifodd\@l@dtempcntb - \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \if@twocolumn + \if@firstcolumn + \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \else + \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \fi \else - \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \@l@dtempcntb=\line@marginR + \ifnum\@l@dtempcntb>\@ne + \advance\@l@dtempcntb by\page@numR + \fi + \ifodd\@l@dtempcntb + \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \else + \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \fi \fi - \fi - \else -%% #1% \fi - \f@x@l@cks + \f@x@l@cksR \fi} \list@create{\inserts@listR} @@ -1272,11 +1352,11 @@ \renewcommand*{\l@dlsnote}[1]{% \ifnumberedpar@ \ifledRcol - \xright@appenditem{\noexpand\vl@dlsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@dlsnote{#1}}% \to\inserts@listR \global\advance\insert@countR \@ne \else - \xright@appenditem{\noexpand\vl@dlsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@dlsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi @@ -1284,11 +1364,11 @@ \renewcommand*{\l@drsnote}[1]{% \ifnumberedpar@ \ifledRcol - \xright@appenditem{\noexpand\vl@drsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@drsnote{#1}}% \to\inserts@listR \global\advance\insert@countR \@ne \else - \xright@appenditem{\noexpand\vl@drsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@drsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi @@ -1296,11 +1376,11 @@ \renewcommand*{\l@dcsnote}[1]{% \ifnumberedpar@ \ifledRcol - \xright@appenditem{\noexpand\vl@dcsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@dcsnote{#1}}% \to\inserts@listR \global\advance\insert@countR \@ne \else - \xright@appenditem{\noexpand\vl@dcsnote{{\l@d@nums}{\@tag}{#1}}}% + \xright@appenditem{\noexpand\vl@dcsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi @@ -1311,23 +1391,19 @@ \ifx\@templ@d\l@dcsnotetext \else \if@twocolumn \if@firstcolumn - \setl@dlp@rbox{}{}{\l@dcsnotetext}% + \setl@dlp@rbox{\l@dcsnotetext}% \else - \setl@drp@rbox{}{}{\l@dcsnotetext}% + \setl@drp@rbox{\l@dcsnotetext}% \fi \else \@l@dtempcntb=\sidenote@marginR \ifnum\@l@dtempcntb>\@ne - \ifl@dpaging - \advance\@l@dtempcntb by\@ne - \else - \advance\@l@dtempcntb by\page@num - \fi + \advance\@l@dtempcntb by\page@num \fi \ifodd\@l@dtempcntb - \setl@drp@rbox{}{}{\l@dcsnotetext}% + \setl@drp@rbox{\l@dcsnotetext}% \else - \setl@dlp@rbox{}{}{\l@dcsnotetext}% + \setl@dlp@rbox{\l@dcsnotetext}% \fi \fi \fi} @@ -1846,7 +1922,6 @@ \fi \fi} -\InputIfFileExists{ledparpatch.sty} \endinput %% diff --git a/Master/texmf-dist/tex/latex/ledmac/ledparpatch.sty b/Master/texmf-dist/tex/latex/ledmac/ledparpatch.sty deleted file mode 100644 index a6b626c281b..00000000000 --- a/Master/texmf-dist/tex/latex/ledmac/ledparpatch.sty +++ /dev/null @@ -1,470 +0,0 @@ -% ledparpatch.sty -% Copyright Peter Wilson 2004, 2005 -% herries dot press at earthlink dot net -% -% Patch(es) for ledpar -% -% -%\ProvidesFile{ledparpatch}[2005/01/11 v0.1 patches for ledpar v0.2] -%\ProvidesFile{ledparpatch}[2005/04/15 v0.2 patches for ledpar v0.2] -%\ProvidesFile{ledparpatch}[2005/08/22 v0.3 patches for ledpar v0.3b] -\ProvidesFile{ledparpatch}[2005/09/15 v0.4 patches for ledpar v0.3b] - -%%%%%%%%%%%%%%%%%%%%%%%%% v0.3 (& v0.4) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% sidenote extensions - -\renewcommand*{\l@drsnote}[1]{% - \ifnumberedpar@ - \ifledRcol - \xright@appenditem{\noexpand\vl@drsnote{#1}}% - \to\inserts@listR - \global\advance\insert@countR \@ne - \else - \xright@appenditem{\noexpand\vl@drsnote{#1}}% - \to\inserts@list - \global\advance\insert@count \@ne - \fi - \fi\ignorespaces} - -\renewcommand*{\l@dlsnote}[1]{% - \ifnumberedpar@ - \ifledRcol - \xright@appenditem{\noexpand\vl@dlsnote{#1}}% - \to\inserts@listR - \global\advance\insert@countR \@ne - \else - \xright@appenditem{\noexpand\vl@dlsnote{#1}}% - \to\inserts@list - \global\advance\insert@count \@ne - \fi - \fi\ignorespaces} - -\renewcommand*{\l@dcsnote}[1]{% - \ifnumberedpar@ - \ifledRcol - \xright@appenditem{\noexpand\vl@dcsnote{#1}}% - \to\inserts@listR - \global\advance\insert@countR \@ne - \else - \xright@appenditem{\noexpand\vl@dcsnote{#1}}% - \to\inserts@list - \global\advance\insert@count \@ne - \fi - \fi\ignorespaces} - -\renewcommand*{\affixside@noteR}{% - \gdef\@templ@d{}% - \ifx\@templ@d\l@dcsnotetext \else - \if@twocolumn - \if@firstcolumn - \setl@dlp@rbox{\l@dcsnotetext}% - \else - \setl@drp@rbox{\l@dcsnotetext}% - \fi - \else - \@l@dtempcntb=\sidenote@marginR - \ifnum\@l@dtempcntb>\@ne - \advance\@l@dtempcntb by\page@num - \fi - \ifodd\@l@dtempcntb - \setl@drp@rbox{\l@dcsnotetext}% - \else - \setl@dlp@rbox{\l@dcsnotetext}% - \fi - \fi - \fi} - -%%% startlock/endlock fixes - - -\newcount\@lockR -\newcount\sub@lockR - -\newcommand*{\do@lockonR}{% - \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ - \xright@appenditem{-1005}\to\actions@listR - \ifnum\sub@lockR=\z@ - \sub@lockR \@ne - \else - \ifnum\sub@lockR=\thr@@ - \sub@lockR \@ne - \fi - \fi - \else - \xright@appenditem{-1003}\to\actions@listR - \ifnum\@lockR=\z@ - \@lockR \@ne - \else - \ifnum\@lockR=\thr@@ - \@lockR \@ne - \fi - \fi - \fi} - -\renewcommand*{\do@lockon}{% - \ifx\next\lock@off - \global\let\lock@off=\skip@lockoff - \else - \ifledRcol - \do@lockonR - \else - \do@lockonL - \fi - \fi} - -\newcommand{\do@lockoffR}{% - \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ - \xright@appenditem{-1006}\to\actions@listR - \ifnum\sub@lockR=\tw@ - \sub@lockR \thr@@ - \else - \sub@lockR \z@ - \fi - \else - \xright@appenditem{-1004}\to\actions@listR - \ifnum\@lockR=\tw@ - \@lockR \thr@@ - \else - \@lockR \z@ - \fi - \fi} - -\renewcommand*{\do@lockoff}{% - \ifledRcol - \do@lockoffR - \else - \do@lockoffL - \fi} -\global\let\lock@off=\do@lockoff - -\newcommand*{\do@actions@fixedcodeR}{% - \ifcase\@l@dtempcnta% - \or% % 1001 - \global\sublines@true - \or% % 1002 - \global\sublines@false - \or% % 1003 - \global\@lockR=\@ne - \or% % 1004 - \ifnum\@lockR=\tw@ - \global\@lockR=\thr@@ - \else - \global\@lockR=\z@ - \fi - \or% % 1005 - \global\sub@lockR=\@ne - \or% % 1006 - \ifnum\sub@lockR=\tw@ - \global\sub@lockR=\thr@@ - \else - \global\sub@lockR=\z@ - \fi - \or% % 1007 - \l@dskipnumbertrue - \else - \led@warn@BadAction - \fi} - -\renewcommand*{\do@actionsR}{% - \global\let\do@actions@nextR=\relax - \@l@dtempcntb=\absline@numR - \ifnum\@l@dtempcntb<\next@actionlineR\else - \ifnum\next@actionR>-1001\relax - \global\page@numR=\next@actionR - \ifbypage@R - \global\line@numR \z@ \global\subline@numR \z@ - \fi - \else - \ifnum\next@actionR<-4999\relax % 9/05 added relax here - \@l@dtempcnta=-\next@actionR - \advance\@l@dtempcnta by -5001\relax - \ifsublines@ - \global\subline@numR=\@l@dtempcnta - \else - \global\line@numR=\@l@dtempcnta - \fi - \else - \@l@dtempcnta=-\next@actionR - \advance\@l@dtempcnta by -1000\relax - \do@actions@fixedcodeR - \fi - \fi - \ifx\actionlines@listR\empty - \gdef\next@actionlineR{1000000}% - \else - \gl@p\actionlines@listR\to\next@actionlineR - \gl@p\actions@listR\to\next@actionR - \global\let\do@actions@nextR=\do@actionsR - \fi - \fi - \do@actions@nextR} - - -\newcommand{\@l@regR}{% - \ifx\l@dchset@num\relax \else - \advance\absline@numR \@ne - \set@line@action - \let\l@dchset@num\relax - \advance\absline@numR \m@ne - \advance\line@numR \m@ne% % do we need this? - \fi - \advance\absline@numR \@ne - \ifx\next@page@numR\relax \else - \page@action - \let\next@page@numR\relax - \fi - \ifx\sub@change\relax \else - \ifnum\sub@change>\z@ - \sublines@true - \else - \sublines@false - \fi - \sub@action - \let\sub@change\relax - \fi - \ifcase\@lockR - \or - \@lockR \tw@ - \or\or - \@lockR \z@ - \fi - \ifcase\sub@lockR - \or - \sub@lockR \tw@ - \or\or - \sub@lockR \z@ - \fi - \ifsublines@ - \ifnum\sub@lockR<\tw@ - \advance\subline@numR \@ne - \fi - \else - \ifnum\@lockR<\tw@ - \advance\line@numR \@ne \subline@numR \z@ - \fi - \fi} - -\renewcommand*{\@l}[2]{% - \fix@page{#1}% - \ifledRcol - \@l@regR - \else - \@l@reg - \fi} - -\renewcommand*{\beginnumberingR}{% - \ifnumberingR - \led@err@NumberingStarted - \endnumberingR - \fi - \global\l@dnumpstartsR \z@ - \global\pst@rtedRfalse - \global\numberingRtrue - \global\advance\section@numR \@ne - \global\absline@numR \z@ - \global\line@numR \z@ - \global\@lockR \z@ - \global\sub@lockR \z@ - \global\sublines@false - \global\let\next@page@numR\relax - \global\let\sub@change\relax - \message{Section \the\section@numR R }% - \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% - \l@dend@stuff} - -\renewcommand*{\getline@numR}{% - \global\advance\absline@numR \@ne - \do@actionsR - \do@ballastR - \ifsublines@ - \ifnum\sub@lockR<\tw@ - \global\advance\subline@numR \@ne - \fi - \else - \ifnum\@lockR<\tw@ - \global\advance\line@numR \@ne - \global\subline@numR \z@ - \fi - \fi} - - -\newcommand*{\ch@cksub@l@ckR}{% - \ifcase\sub@lockR - \or - \ifnum\sublock@disp=\@ne - \@l@dtempcntb \z@ \@l@dtempcnta \@ne - \fi - \or - \ifnum\sublock@disp=\tw@ - \else - \@l@dtempcntb \z@ \@l@dtempcnta \@ne - \fi - \or - \ifnum\sublock@disp=\z@ - \@l@dtempcntb \z@ \@l@dtempcnta \@ne - \fi - \fi} - -\newcommand*{\ch@ck@l@ckR}{% - \ifcase\@lockR - \or - \ifnum\lock@disp=\@ne - \@l@dtempcntb \z@ \@l@dtempcnta \@ne - \fi - \or - \ifnum\lock@disp=\tw@ - \else - \@l@dtempcntb \z@ \@l@dtempcnta \@ne - \fi - \or - \ifnum\lock@disp=\z@ - \@l@dtempcntb \z@ \@l@dtempcnta \@ne - \fi - \fi} - -\newcommand*{\f@x@l@cksR}{% - \ifcase\@lockR - \or - \global\@lockR \tw@ - \or \or - \global\@lockR \z@ - \fi - \ifcase\sub@lockR - \or - \global\sub@lockR \tw@ - \or \or - \global\sub@lockR \z@ - \fi} - - -%% #1 = subline@numR -%% #2 = c@firstsublinenumR -%% #3 = c@sublinenumincrementR -%%%%%% v0.4 put \relax after each argument; e.g., by #3 -> by #3\relax -\providecommand*{\l@dcalcnum}[3]{% - \ifnum #1 > #2\relax - \@l@dtempcnta = #1\relax - \advance\@l@dtempcnta by -#2\relax - \divide\@l@dtempcnta by #3\relax - \multiply\@l@dtempcnta by #3\relax - \advance\@l@dtempcnta by #2\relax - \else - \@l@dtempcnta=#2\relax - \fi} - -\renewcommand*{\affixline@numR}{% -\ifl@dskipnumber - \global\l@dskipnumberfalse -\else - \ifsublines@ - \@l@dtempcntb=\subline@numR - \l@dcalcnum{\subline@numR}{\c@firstsublinenumR}{\c@sublinenumincrementR}% - \ch@cksub@lockR - \else - \@l@dtempcntb=\line@numR - \ifx\linenumberlist\empty - \l@dcalcnum{\line@numR}{\c@firstlinenumR}{\c@linenumincrementR}% - \else - \@l@dtempcnta=\line@numR - \edef\rem@inder{,\linenumberlist,\number\line@numR,}% - \edef\sc@n@list{\def\noexpand\sc@n@list - ####1,\number\@l@dtempcnta,####2|{\def\noexpand\rem@inder{####2}}}% - \sc@n@list\expandafter\sc@n@list\rem@inder|% - \ifx\rem@inder\empty\advance\@l@dtempcnta\@ne\fi - \fi - \ch@ck@l@ckR - \fi - \ifnum\@l@dtempcnta=\@l@dtempcntb - \if@twocolumn - \if@firstcolumn - \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% - \else - \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% - \fi - \else - \@l@dtempcntb=\line@marginR - \ifnum\@l@dtempcntb>\@ne - \advance\@l@dtempcntb by\page@numR - \fi - \ifodd\@l@dtempcntb - \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% - \else - \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% - \fi - \fi - \fi - \f@x@l@cksR -\fi} - - - - - -%%%%%%%%%%%%%%%%%%%%%%%%% v0.2 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -\renewcommand*{\do@lineL}{% - \advance\countLline \@ne - \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL}% - {\vbadness=10000 - \splittopskip=\z@ - \do@lineLhook - \l@demptyd@ta - \global\setbox\one@line=\vsplit\namebox{l@dLcolrawbox\the\l@dpscL} - to\baselineskip}% - \unvbox\one@line \global\setbox\one@line=\lastbox - \getline@num - \setbox\l@dleftbox - \hb@xt@ \Lcolwidth{% - \affixline@num - \l@dld@ta - \add@inserts - \affixside@note - \l@dlsn@te - {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% - \l@drsn@te - }}% - \add@penaltiesL - \global\advance\@donereallinesL\@ne - \global\advance\@donetotallinesL\@ne -\else - \setbox\l@dleftbox \hb@xt@ \Lcolwidth{\hspace*{\Lcolwidth}}% - \global\advance\@donetotallinesL\@ne -\fi} - -\renewcommand*{\do@lineR}{% - \advance\countRline \@ne - \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR}% - {\vbadness=10000 - \splittopskip=\z@ - \do@lineRhook - \l@demptyd@ta - \global\setbox\one@lineR=\vsplit\namebox{l@dRcolrawbox\the\l@dpscR} - to\baselineskip}% - \unvbox\one@lineR \global\setbox\one@lineR=\lastbox - \getline@numR - \setbox\l@drightbox - \hb@xt@ \Rcolwidth{% - \affixline@numR - \l@dld@ta - \add@insertsR - \affixside@noteR - \l@dlsn@te - {\ledllfill\hb@xt@ \wd\one@lineR{\new@lineR\l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta% - \l@drsn@te - }}% - \add@penaltiesR - \global\advance\@donereallinesR\@ne - \global\advance\@donetotallinesR\@ne -\else - \setbox\l@drightbox \hb@xt@ \Rcolwidth{\hspace*{\Rcolwidth}} - \global\advance\@donetotallinesR\@ne -\fi} - -\endinput - -%%%%%%%%%%%%%%%%%%%% v0.1 %%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%% v0.1 stuff now in ledpar.sty itself - diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpatch.sty b/Master/texmf-dist/tex/latex/ledmac/ledpatch.sty deleted file mode 100644 index d80586e7505..00000000000 --- a/Master/texmf-dist/tex/latex/ledmac/ledpatch.sty +++ /dev/null @@ -1,316 +0,0 @@ -% ledpatch.sty -% Copyright Peter Wilson 2004, 2005 -% herries dot press at earthlink dot net -% -% Patch(es) for ledmac -% -% -%%%%\ProvidesFile{ledpatch}[2004/12/18 v0.1 patches for ledmac v0.6] -%\ProvidesFile{ledpatch}[2005/01/11 v0.2 patches for ledmac v0.6] -%\ProvidesFile{ledpatch}[2005/03/24 v0.3 patches for ledmac v0.7] -%\ProvidesFile{ledpatch}[2005/04/15 v0.3a patches for ledmac v0.7] -%\ProvidesFile{ledpatch}[2005/06/02 v0.4 patches for ledmac v0.7] -\ProvidesFile{ledpatch}[2005/08/22 v0.5 patches for ledmac v0.7] - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%% v0.5 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% There was a missing \else in \l@dcheckcols just before the -%%% error message. The symptom was reported by Tobias Verbeke. - -\renewcommand*{\l@dcheckcols}{% - \ifnum\l@dcolcount=1\relax - \else - \ifnum\l@dampcount=1\relax - \else - \ifnum\l@dcolcount=\l@dampcount\relax - \else - \l@d@err@UnequalColumns - \fi - \fi - \l@dampcount=\l@dcolcount - \fi} - -%%% \startlock and \endlock did not work properly in the middle -%%% of a line. Problem reported by Stefano Cracolic -%%% Letting S stand for \startlock and E for \endlock and t for regular -%%% text, numbering is per the following examples: -%%% -%%% 1 Sttttt 1 Sttttt 1 Sttttt 1 Sttttt -%%% tttttt tttttt tttttt tttttt -%%% 2 ttEStt 2 ttttES tttttE tttttt -%%% tttttt tttttt 2 Sttttt 2 EStttt -%%% tttttt tttttt tttttt tttttt -%%% ttEttt ttEttt ttEttt ttEttt -%%% 3 tttttt 3 tttttt 3 tttttt 3 tttttt -%%% 4 tttStt 4 tttttS 4 tttStt 4 ttSEtt -%%% tttttt tttttt tttttt 5 tttttt -%%% tttttt tttttt tttttt 6 tttttt -%%% ttEttt Ettttt tttttE 7 tttttt -%%% 5 tttttt 5 tttttt 5 tttttt 8 tttttt - -\renewcommand*{\do@lockon}{% - \ifx\next\lock@off - \global\let\lock@off=\skip@lockoff - \else - \do@lockonL - \fi} - -\newcommand*{\do@lockonL}{% - \xright@appenditem{\the\absline@num}\to\actionlines@list - \ifsublines@ - \xright@appenditem{-1005}\to\actions@list -%% \ifcase\sub@lock -%% \sub@lock \@ne -%% \else -%% \sub@lock \z@ -%% \fi - \ifnum\sub@lock=\z@ - \sub@lock \@ne - \else - \ifnum\sub@lock=\thr@@ - \sub@lock \@ne - \fi - \fi - \else - \xright@appenditem{-1003}\to\actions@list -%% \ifcase\@lock -%% \@lock \@ne -%% \else -%% \@lock \z@ -%% \fi - \ifnum\@lock=\z@ - \@lock \@ne - \else - \ifnum\@lock=\thr@@ - \@lock \@ne - \fi - \fi - \fi} - -\newcommand*{\do@lockoffL}{% - \xright@appenditem{\the\absline@num}\to\actionlines@list - \ifsublines@ - \xright@appenditem{-1006}\to\actions@list - \ifnum\sub@lock=\tw@ - \sub@lock \thr@@ - \else - \sub@lock \z@ - \fi - \else - \xright@appenditem{-1004}\to\actions@list - \ifnum\@lock=\tw@ - \@lock \thr@@ - \else - \@lock \z@ - \fi - \fi} -\renewcommand*{\do@lockoff}{\do@lockoffL} -\global\let\lock@off=\do@lockoff - -\renewcommand*{\do@actions@fixedcode}{% - \ifcase\@l@dtempcnta - \or% % 1001 - \global\sublines@true - \or% % 1002 - \global\sublines@false - \or% % 1003 -%% \ifcase\@lock -%% \global\@lock=\@ne -%% \else -%% \global\@lock=\z@ -%% \fi - \global\@lock=\@ne - \or% % 1004 - \ifnum\@lock=\tw@ - \global\@lock=\thr@@ - \else - \global\@lock=\z@ - \fi - \or% % 1005 -5% \ifcase\sub@lock -%% \global\sub@lock=\@ne -%% \else -%% \global\sub@lock=\z@ -%% \fi - \global\sub@lock=\@ne - \or% % 1006 - \ifnum\sub@lock=\tw@ - \global\sub@lock=\thr@@ - \else - \global\sub@lock=\z@ - \fi - \or% % 1007 - \l@dskipnumbertrue - \else - \led@warn@BadAction - \fi} - - - -%%% Reworked the sidenotes code. -%%% Sidenotes are normally aligned on their bottom lines, -%%% i.e, multiline notes extend upwards. To align notes on -%%% their top lines (multiline notes extend downwards): -%%% \rightnoteupfalse and/or \leftnoteupfalse. The default -%%% is, of course, \rightnoteuptrue and \leftnoteuptrue. - -\newif\ifrightnoteup - \rightnoteuptrue - -\renewcommand*{\l@drsnote}[1]{% - \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@drsnote{#1}}% - \to\inserts@list - \global\advance\insert@count \@ne - \fi\ignorespaces} - -\renewcommand*{\vl@drsnote}[1]{\setl@drp@rbox{#1}} - -\renewcommand*{\setl@drp@rbox}[1]{% - {\parindent\z@\hsize=\ledrsnotewidth\ledrsnotefontsetup - \global\setbox\l@drp@rbox - \ifrightnoteup - =\vbox to\z@{\vss#1}% - \else - =\vbox to0.7\baselineskip{\strut#1\vss}% - \fi}} - -\newif\ifleftnoteup - \leftnoteuptrue - -\renewcommand*{\l@dlsnote}[1]{% - \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@dlsnote{#1}}% - \to\inserts@list - \global\advance\insert@count \@ne - \fi\ignorespaces} - -\renewcommand*{\vl@dlsnote}[1]{\setl@dlp@rbox{#1}} - -\renewcommand*{\setl@dlp@rbox}[1]{% - {\parindent\z@\hsize=\ledlsnotewidth\ledlsnotefontsetup - \global\setbox\l@dlp@rbox - \ifleftnoteup - =\vbox to\z@{\vss #1}% - \else - =\vbox to 0.70\baselineskip{\strut#1\vss}% - \fi}} - -\renewcommand*{\l@dcsnote}[1]{% - \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@dcsnote{#1}}% - \to\inserts@list - \global\advance\insert@count \@ne - \fi\ignorespaces} - -\renewcommand*{\vl@dcsnote}[1]{\gdef\l@dcsnotetext{#1}} - -\renewcommand*{\affixside@note}{% - \gdef\@templ@d{}% - \ifx\@templ@d\l@dcsnotetext \else - \if@twocolumn - \if@firstcolumn - \setl@dlp@rbox{\l@dcsnotetext}% - \else - \setl@drp@rbox{\l@dcsnotetext}% - \fi - \else - \@l@dtempcntb=\sidenote@margin - \ifnum\@l@dtempcntb>\@ne - \advance\@l@dtempcntb by\page@num - \fi - \ifodd\@l@dtempcntb - \setl@drp@rbox{\l@dcsnotetext}% - \else - \setl@dlp@rbox{\l@dcsnotetext}% - \fi - \fi - \fi} - - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%% v0.4 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%%% The instructions on page 26 in the manual regarding creating -%%% a new familiar footnote series are incorrect. Instead follow -%%% how the provided series are defined, that is, for example: -%%% \makeatletter -%%% \newcommand{\footnoteD}[1]{% -%%% \stepcounter{footnoteD}% -%%% \protected@xdef\@thefnmarkD{\thefootnoteD}% -%%% \@footnotemarkD -%%% \vfootnoteD{D}{#1}\m@mmf@prepare} -%%% -%%% \newcounter{footnoteD} -%%% \renewcommand{\thefootnoteD}{\arabic{footnoteD}} -%%% \newinsert\footinsD -%%% -%%% \newcommand{\mpfootnoteD}[1]{% -%%% \stepcounter{footnoteD}% -%%% \protected@xdef\@thefnmarkD{\thefootnoteD}% -%%% \@footnotemarkD -%%% \mpvfootnoteD{D}{#1}\m@mmf@prepare} -%%% \newinsert\mpfootinsD -%%% -%%% \footnormalX{D} -%%% \addfootinsX{D} -%%% \makeatother -%%% - -%%% Change \addfootinsX to correct screwups in defining new familar -%%% series footnotes. Problem initially noted by Dirk Schlimm -%%% (dschlimm@gmail.com) in private email, 2005/05/31 - -\renewcommand*{\addfootinsX}[1]{% - \footnormalX{#1}% - \g@addto@macro{\doxtrafeeti}{% - \setbox\@outputbox \vbox{% - \unvbox\@outputbox - \ifvoid\@nameuse{footins#1}\else - \@nameuse{footstart#1}{#1}\@nameuse{footgroup#1}{#1}\fi}}% - \g@addto@macro{\doreinxtrafeeti}{% - \ifvoid\@nameuse{footins#1}\else - \insert\@nameuse{footins#1}{\unvbox\@nameuse{footins#1}}\fi}% -%%% \g@addto@macro{\l@dfambeginmini}{% -%%% \expandafter\let\csname footnote#1\endcsname=\@nameuse{mpfootnote#1}}% - \g@addto@macro{\l@dfambeginmini}{% - \expandafter\expandafter\expandafter\let\expandafter\expandafter - \csname footnote#1\endcsname \csname mpfootnote#1\endcsname}% -%%% \g@addto@macro{\l@dfamendmini}{% -%%% \ifvoid\@nameuse{mpfootins#1}\else\@nameuse{mpfootgroup#1{#1}}}% - \g@addto@macro{\l@dfamendmini}{% - \ifvoid\@nameuse{mpfootins#1}\else\@nameuse{mpfootgroup#1}{#1}\fi}% -} - - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%% v0.3a %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% Slight efficiency improvement (particularly for ledpar) - -\newcommand*{\l@dunhbox@line}[1]{\unhbox #1} - -\renewcommand*{\do@line}{% - {\vbadness=10000 - \splittopskip=\z@ - \do@linehook -\l@demptyd@ta - \global\setbox\one@line=\vsplit\raw@text to\baselineskip}% - \unvbox\one@line \global\setbox\one@line=\lastbox - \getline@num - \affixline@num - \hb@xt@ \linewidth{\l@dld@ta\add@inserts\affixside@note - \l@dlsn@te -%%%% {\ledllfill\hb@xt@ \wd\one@line{\new@line\unhbox\one@line}\ledrlfill\l@drd@ta% - {\ledllfill\hb@xt@ \wd\one@line{\new@line\l@dunhbox@line{\one@line}}\ledrlfill\l@drd@ta% - \l@drsn@te - }} - \add@penalties} - - -\endinput - -%%%%%%%%%%% earlier patches now in ledmac.sty itself - |