From ebb694371ef5f20e33f9889268ae32ecb789c93a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 12 Aug 2011 23:08:47 +0000 Subject: ledmac (14jul11) git-svn-id: svn://tug.org/texlive/trunk@23519 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ledmac/ledmac.sty | 10 +++++----- Master/texmf-dist/tex/latex/ledmac/ledpar.sty | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/ledmac') diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty index 605bca64d9b..be073f70fc9 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty @@ -656,7 +656,7 @@ \long\def\critext#1#2/{\leavevmode \begingroup \no@expands - \xdef\@tag{#1}% + \xdef\@tag{\protect#1}% \set@line \global\insert@count=0 \ignorespaces #2\relax @@ -672,7 +672,7 @@ \newcommand{\edtext}[2]{\leavevmode \begingroup \no@expands - \xdef\@tag{#1}% + \xdef\@tag{\protect#1}% \set@line \global\insert@count=0 \ignorespaces #2\relax @@ -698,7 +698,7 @@ \newcommand*{\edfont@info}{\f@encoding/\f@family/\f@series/\f@shape} -\newcommand*{\lemma}[1]{\xdef\@tag{#1}\ignorespaces} +\newcommand*{\lemma}[1]{\xdef\@tag{\protect#1}\ignorespaces} \newcommand*{\linenum}[1]{% \xdef\@tempa{#1|||||||\noexpand\\\l@d@nums}% \global\let\l@d@nums=\empty @@ -1737,8 +1737,8 @@ \newwrite\l@d@end \newif\ifl@dend@ -\newcommand{\l@dend@open}[1]{\l@dend@true\immediate\openout\l@d@end=#1\relax} -\newcommand{\l@dend@close}{\l@dend@false\immediate\closeout\l@d@end} +\newcommand{\l@dend@open}[1]{\global\l@dend@true\immediate\openout\l@d@end=#1\relax} +\newcommand{\l@dend@close}{\global\l@dend@false\immediate\closeout\l@d@end} \newcommand{\l@dend@stuff}{% \ifl@dend@\relax\else diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty index ec4d89de2e1..b5dd870e773 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty @@ -6,7 +6,7 @@ %% %% ledpar.dtx (with options: `code') %% -%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net +%% Author: Author: Peter Wilson Maïeul Rouquette maieul at maieul dot net (Herries Press) herries dot press at earthlink dot net %% Copyright 2004, 2005 Peter R. Wilson %% %% This work may be distributed and/or modified under the @@ -23,8 +23,9 @@ %% This work consists of the files listed in the README file. %% + \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledpar}[2005/04/08 v0.3b ledmac extension for parallel texts] +\ProvidesPackage{ledpar}[2011/06/16 v0.3c ledmac extension for parallel texts] \l@dpairingfalse \newif\ifl@dpaging @@ -1479,7 +1480,8 @@ \gdef\theledlanguageR{} \AtBeginDocument{% - \@ifundefined{bbl@main@language}{% + \@ifundefined{xpg@main@language}{% + \@ifundefined{bbl@main@language}{% \l@dusedbabelfalse \renewcommand*{\selectlanguage}[1]{}}{% \l@dusedbabeltrue @@ -1495,6 +1497,15 @@ \l@doldselectlanguage{#1}} \gdef\theledlanguageL{\bbl@main@language}% \gdef\theledlanguageR{\bbl@main@language}% + }% + } + { \apptocmd{\xpg@set@language}{% + \ifledRcol \gdef\theledlanguageR{#1}% + \else \gdef\theledlanguageL{#1}% + \fi}% + \let\l@duselanguage\xpg@set@language + \gdef\theledlanguageL{\xpg@main@language}% + \gdef\theledlanguageR{\xpg@main@language}% }} \newcommand*{\Columns}{% \ifnum\l@dnumpstartsL=\l@dnumpstartsR\else -- cgit v1.2.3