diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/eledmac/eledpar.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/eledmac/eledpar.sty | 161 |
1 files changed, 124 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty index 862422b411c..63ee57c58e7 100644 --- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty +++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledpar}[2014/08/31 v1.8.3 eledmac extension for parallel texts]% +\ProvidesPackage{eledpar}[2014/09/16 v1.9.0 eledmac extension for parallel texts]% \newif\ifshiftedpstarts \let\shiftedversestrue\shiftedpstartstrue @@ -31,7 +31,8 @@ \DeclareOption{shiftedverses}{\shiftedpstartstrue} \DeclareOption{shiftedpstarts}{\shiftedpstartstrue} \DeclareOption{parledgroup}{\parledgrouptrue} -\ProcessOptions +\DeclareOption{widthliketwocolumns}{\widthliketwocolumnstrue}% +\ProcessOptions% \l@dpairingfalse \newif\ifl@dpaging \l@dpagingfalse @@ -134,7 +135,8 @@ \led@mess@SectionContinued{\the\section@numR R}% \line@list@stuffR{\jobname.\extensionchars\the\section@numR R}% \l@dend@stuff - \initnumbering@sectcmd + \begingroup% + \initnumbering@sectcountR% \else \led@err@numberingShouldHaveStarted \endnumberingR @@ -752,9 +754,14 @@ \l@dpairingtrue \l@dpagingfalse \initnumbering@sectcmd + \at@begin@pairs% }{% \l@dpairingfalse } + +\newcommand{\AtBeginPairs}[1]{\xdef\at@begin@pairs{#1}}% +\def\at@begin@pairs{}% + \newenvironment{pages}{% \let\oldchapter\chapter \let\chapter\chapterinpages @@ -1005,6 +1012,7 @@ \l@dlsn@te %space kept for backward compatibility {\ledllfill\hb@xt@ \wd\one@line{\do@insidelineLhook\inserthangingsymbolL\new@lineL\l@dunhbox@line{\one@line}}\correcthangingL\ledrlfill\l@drd@ta% \l@drsn@te}} + \def\print@eledsectionL{% \add@inserts\affixside@note% \addtocounter{pstartL}{-1}% @@ -1025,6 +1033,12 @@ \fi% \vskip\eledsection@correcting@skip% } + +\newcommand*{\dolineLhook}[1]{\gdef\do@lineLhook{#1}}% +\newcommand*{\dolineRhook}[1]{\gdef\do@lineRhook{#1}}% +\newcommand*{\doinsidelineLhook}[1]{\gdef\do@insidelineLhook{#1}}% +\newcommand*{\doinsidelineRhook}[1]{\gdef\do@insidelineRhook{#1}}% + \newcommand*{\do@lineLhook}{} \newcommand*{\do@lineRhook}{} \newcommand*{\do@insidelineLhook}{} @@ -1748,10 +1762,46 @@ \ifledRcol \gdef\theledlanguageR{#2}% \else \gdef\theledlanguageL{#2}% \fi}% - \let\l@duselanguage\xpg@set@language% + \let\l@duselanguage\select@language% \gdef\theledlanguageL{\xpg@main@language}% \gdef\theledlanguageR{\xpg@main@language}% }} +\newif\if@pstarts +\newcommand*{\check@pstarts}{% + \@pstartsfalse + \ifnum\l@dnumpstartsL>\l@dpscL + \@pstartstrue + \else + \ifnum\l@dnumpstartsR>\l@dpscR + \@pstartstrue + \fi + \fi +} + +\newif\ifaraw@text + \araw@textfalse +\newcommand*{\checkraw@text}{% + \araw@textfalse + \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL} + \araw@texttrue + \else + \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR} + \araw@texttrue + \fi + \fi +} + +\newcommand*{\@writelinesinparL}{% + \edef\next{% + \write\linenum@out{\string\@pend[\the\@donereallinesL]}}% + \next + \global\@donereallinesL \z@} +\newcommand*{\@writelinesinparR}{% + \edef\next{% + \write\linenum@outR{\string\@pendR[\the\@donereallinesR]}}% + \next + \global\@donereallinesR \z@} + \newsavebox{\@eledsectionL}% \newsavebox{\@eledsectionR}% \newcommand*{\Columns}{% @@ -1889,41 +1939,78 @@ \newlength{\aftercolumnseparator}% \setlength{\aftercolumnseparator}{-2pt}% -\newif\if@pstarts -\newcommand*{\check@pstarts}{% - \@pstartsfalse - \ifnum\l@dnumpstartsL>\l@dpscL - \@pstartstrue - \else - \ifnum\l@dnumpstartsR>\l@dpscR - \@pstartstrue - \fi - \fi -} -\newif\ifaraw@text - \araw@textfalse -\newcommand*{\checkraw@text}{% - \araw@textfalse - \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL} - \araw@texttrue - \else - \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR} - \araw@texttrue - \fi - \fi -} +\newcommand{\setwidthliketwocolumns@L}{% + \newdimen\temp% + \temp=\hsize% + \hsize=\Lcolwidth% + \advance\hsize\Rcolwidth% + \advance\temp-\hsize% + \multiply\temp by 2% + \divide\temp by 3% + \advance\hsize\temp% +}% -\newcommand*{\@writelinesinparL}{% - \edef\next{% - \write\linenum@out{\string\@pend[\the\@donereallinesL]}}% - \next - \global\@donereallinesL \z@} -\newcommand*{\@writelinesinparR}{% - \edef\next{% - \write\linenum@outR{\string\@pendR[\the\@donereallinesR]}}% - \next - \global\@donereallinesR \z@} +\newcommand{\setpositionliketwocolumns@L}{% + \renewcommand{\ledrlfill}{\hfill}% +}% + +\newcommand{\setnotespositionliketwocolumns@L}{% +}% + +\newcommand{\setwidthliketwocolumns@C}{% + \newdimen\temp% + \temp=\hsize% + \hsize=\Lcolwidth% + \advance\hsize\Rcolwidth% + \advance\temp-\hsize% + \divide\temp by 2% + \advance\hsize\temp% +}% + +\newcommand{\setpositionliketwocolumns@C}{% + \doinsidelinehook{\hfill}% + \renewcommand{\ledrlfill}{\hfill}% +}% + +\newcommand{\setnotespositionliketwocolumns@C}{% + \newdimen\temp% + \newdimen\tempa% + \temp=\hsize% + \tempa=\Lcolwidth% + \advance\tempa\Rcolwidth% + \advance\temp-\tempa% + \divide\temp by 2% + \leftskip=\temp% + \rightskip=-\temp% +}% + +\newcommand{\setwidthliketwocolumns@R}{% + \newdimen\temp% + \temp=\hsize% + \hsize=\Lcolwidth% + \advance\hsize\Rcolwidth% + \advance\temp-\hsize% + \multiply\temp by 2% + \divide\temp by 3% + \advance\hsize\temp% +}% + +\newcommand{\setpositionliketwocolumns@R}{% + \doinsidelinehook{\hfill}% +}% + +\newcommand{\setnotespositionliketwocolumns@R}{% + \newdimen\temp% + \newdimen\tempa% + \temp=\hsize% + \tempa=\Lcolwidth% + \advance\tempa\Rcolwidth% + \advance\temp-\tempa% + \divide\temp by 2% + \leftskip=\temp% + \rightskip=-\temp% +}% \newcount\numpagelinesL \newcount\numpagelinesR |