summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-10-04 23:07:56 +0000
committerKarl Berry <karl@freefriends.org>2011-10-04 23:07:56 +0000
commit517d814fc2151f1a207e0fff3705de6384552f86 (patch)
tree5f4fca431c7002bd3a0a588a37ae95a6d0dcfc76 /Master/texmf-dist/tex/latex/ledmac
parentfee12533281613d6c84ae9bbd720dc24e5a54928 (diff)
ledmac (4oct11)
git-svn-id: svn://tug.org/texlive/trunk@24192 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ledmac')
-rw-r--r--Master/texmf-dist/tex/latex/ledmac/ledmac.sty38
-rw-r--r--Master/texmf-dist/tex/latex/ledmac/ledpar.sty32
2 files changed, 54 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
index c9858377d35..dcd5a7301a3 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}[2011/09/16 v0.11 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2011/10/02 v0.12.1 LaTeX port of EDMAC]
\newif\ifledfinal
\DeclareOption{final}{\ledfinaltrue}
@@ -131,7 +131,8 @@
\newif\ifpst@rtedL
\pst@rtedLfalse
\newcount\l@dnumpstartsL
-
+\newif\ifledRcol
+\newif\ifnumberingR
\newcommand*{\beginnumbering}{%
\ifnumbering
\led@err@NumberingStarted
@@ -142,7 +143,9 @@
\initnumbering@reg
\message{Section \the\section@num }%
\line@list@stuff{\jobname.\extensionchars\the\section@num}%
- \l@dend@stuff}
+ \l@dend@stuff
+ \setcounter{pstart}{1}
+}
\newcommand*{\initnumbering@reg}{%
\global\pst@rtedLfalse
\global\l@dnumpstartsL \z@
@@ -174,8 +177,8 @@
\fi
\else
\led@err@NumberingNotStarted
- \fi}
-
+ \fi
+ \autoparfalse}
\newcommand{\pausenumbering}{%
\endnumbering\global\numberingtrue}
\newcommand*{\resumenumbering}{%
@@ -729,6 +732,11 @@
\newcount\num@lines
\newbox\one@line
\newcount\par@line
+
+\newcounter{pstart}
+\renewcommand{\thepstart}{{\bf\@arabic\c@pstart}. }
+\newif\ifnumberpstart
+\numberpstartfalse
\newcommand*{\pstart}{
\managehangingsymbol
\if@nobreak
@@ -748,7 +756,7 @@
\list@clear{\inserts@list}%
\global\let\next@insert=\empty
\begingroup\normal@pars
- \global\setbox\raw@text=\vbox\bgroup
+ \global\setbox\raw@text=\vbox\bgroup\ifautopar\else\ifnumberpstart\ifinstanza\else\thepstart\fi\fi\fi
\numberedpar@true}
\newcommand*{\pend}{\ifnumbering \else
\led@err@PendNotNumbered
@@ -756,6 +764,9 @@
\ifnumberedpar@ \else
\led@err@PendNoPstart
\fi
+\ifnumberpstart
+\addtocounter{pstart}{1}
+\fi
\l@dzeropenalties
\endgraf\global\num@lines=\prevgraf\egroup
\global\par@line=0
@@ -772,13 +783,24 @@
\displaywidowpenalty \z@ \interlinepenalty \z@ \predisplaypenalty \z@
\postdisplaypenalty \z@ \widowpenalty \z@}
-\newcommand*{\autopar}{\ifnumbering \else
+\newif\ifautopar
+\autoparfalse
+\newcommand*{\autopar}{
+ \ifledRcol
+ \ifnumberingR \else
+ \led@err@AutoparNotNumbered
+ \beginnumberingR
+ \fi
+ \else
+ \ifnumbering \else
\led@err@AutoparNotNumbered
\beginnumbering
+ \fi
\fi
+ \autopartrue
\everypar={\setbox0=\lastbox
\endgraf \vskip-\parskip
- \pstart \noindent \kern\wd0
+ \pstart \noindent \kern\wd0 \ifnumberpstart\ifinstanza\else\thepstart\fi\fi
\let\par=\pend}%
\ignorespaces}
\newcommand*{\normal@pars}{\everypar={}\let\par\endgraf}
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
index 68b27b70d4b..8c84333c46e 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledpar}[2011/09/16 v0.8 ledmac extension for parallel texts]
+\ProvidesPackage{ledpar}[2011/10/02 v0.9.1 ledmac extension for parallel texts]
\newif\ifshiftedverses
\shiftedversesfalse
@@ -33,7 +33,6 @@
\l@dpairingfalse
\newif\ifl@dpaging
\l@dpagingfalse
-\newif\ifledRcol
\ledRcolfalse
\newdimen\Lcolwidth
\Lcolwidth=0.45\textwidth
@@ -52,7 +51,6 @@
\ledmac@error{The right page has ended on a left page}{\@ehc}}
\newcount\section@numR
\section@numR=\z@
-\newif\ifnumberingR
\pst@rtedLfalse
\newif\ifpst@rtedR
\pst@rtedRfalse
@@ -88,7 +86,9 @@
\global\let\sub@change\relax
\message{Section \the\section@numR R }%
\line@list@stuffR{\jobname.\extensionchars\the\section@numR R}%
- \l@dend@stuff}
+ \l@dend@stuff
+ \setcounter{pstartR}{1}
+}
\def\endnumberingR{%
\ifnumberingR
@@ -731,7 +731,9 @@
\newenvironment{Leftside}{%
\ledRcolfalse
+ \let\beginnumbering\beginnumbering\setcounter{pstartL}{1}
\let\pstart\pstartL
+ \let\thepstart\thepstartL
\let\pend\pendL
\let\memorydump\memorydumpL
\Leftsidehook
@@ -748,6 +750,7 @@
\let\pausenumbering\pausenumberingR
\let\resumenumbering\resumenumberingR
\let\memorydump\memorydumpR
+ \let\thepstart\thepstartR
\let\pstart\pstartR
\let\pend\pendR
\let\lineation\lineationR
@@ -760,6 +763,12 @@
\newcount\num@linesR
\newbox\one@lineR
\newcount\par@lineR
+
+\newcounter{pstartL}
+\renewcommand{\thepstartL}{{\bf\@arabic\c@pstartL}. }
+\newcounter{pstartR}
+\renewcommand{\thepstartR}{{\bf\@arabic\c@pstartR}. }
+
\newcommand*{\pstartL}{
\if@nobreak
\let\@oldnobreak\@nobreaktrue
@@ -786,7 +795,7 @@
\led@err@TooManyPstarts
\global\l@dnumpstartsL=\l@dc@maxchunks
\fi
- \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup%
+ \global\setnamebox{l@dLcolrawbox\the\l@dnumpstartsL}=\vbox\bgroup\ifautopar\else\ifnumberpstart\thepstartL\fi\fi%
\hsize=\Lcolwidth
\numberedpar@true}
\newcommand*{\pstartR}{
@@ -815,7 +824,7 @@
\led@err@TooManyPstarts
\global\l@dnumpstartsR=\l@dc@maxchunks
\fi
- \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup%
+ \global\setnamebox{l@dRcolrawbox\the\l@dnumpstartsR}=\vbox\bgroup\ifautopar\else\ifnumberpstart\thepstartR\fi\fi%
\hsize=\Rcolwidth
\numberedpar@true}
\newcommand*{\pendL}{\ifnumbering \else
@@ -829,7 +838,10 @@
\global\par@line=0
\endgroup
\ignorespaces
- \@oldnobreak}
+ \@oldnobreak
+\ifnumberpstart
+\addtocounter{pstartL}{1}
+\fi}
\newcommand*{\pendR}{\ifnumberingR \else
\led@err@PendNotNumbered
@@ -842,7 +854,11 @@
\global\par@lineR=0
\endgroup
\ignorespaces
- \@oldnobreak}
+ \@oldnobreak
+\ifnumberpstart
+\addtocounter{pstartR}{1}
+\fi
+}
\newbox\l@dleftbox
\newbox\l@drightbox