From 800d650236d4b0f5adadc09f10dbbfde772a77dc Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 20 Apr 2020 21:10:59 +0000 Subject: reledmac (20apr20) git-svn-id: svn://tug.org/texlive/trunk@54813 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 143 ++++++++++++++-------- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 18 ++- 2 files changed, 105 insertions(+), 56 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 79d0a91f970..6b24bb9eb83 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}[2020/03/08 v2.32.5 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/04/19 v2.32.6 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -1546,6 +1546,7 @@ \let\edtext=\dummy@edtext \let\edindex\dummy@edindex% \l@dtabnoexpands + \l@noexpands@edgl% \let\linenumannotation=\@gobble% \morenoexpands} \let\morenoexpands=\relax @@ -7454,85 +7455,127 @@ }% \AtBeginDocument{% \@ifpackageloaded{glossaries}{% + \gdef\edglsomo{}% + \listgadd{\edglsomo}{gls}% + \listgadd{\edglsomo}{Gls}% + \listgadd{\edglsomo}{GLS}% + \listgadd{\edglsomo}{glspl}% + \listgadd{\edglsomo}{Glspl}% + \listgadd{\edglsomo}{GLSpl}% + \listgadd{\edglsomo}{glstext}% + \listgadd{\edglsomo}{Glstext}% + \listgadd{\edglsomo}{GLStext}% + \listgadd{\edglsomo}{Glsfirst}% + \listgadd{\edglsomo}{GLSfirst}% + \listgadd{\edglsomo}{glsplural}% + \listgadd{\edglsomo}{Glsplural}% + \listgadd{\edglsomo}{GLSplural}% + \listgadd{\edglsomo}{glsfirstplural}% + \listgadd{\edglsomo}{Glsfirstplural}% + \listgadd{\edglsomo}{GLSfirstplural}% + \listgadd{\edglsomo}{glsname}% + \listgadd{\edglsomo}{Glsname}% + \listgadd{\edglsomo}{GLSname}% + \listgadd{\edglsomo}{glssymbol}% + \listgadd{\edglsomo}{Glssymbol}% + \listgadd{\edglsomo}{GLSsymbol}% + \listgadd{\edglsomo}{glsdesc}% + \listgadd{\edglsomo}{Glsdesc}% + \listgadd{\edglsomo}{GLSdesc}% + \listgadd{\edglsomo}{glsuseri}% + \listgadd{\edglsomo}{Glsuseri}% + \listgadd{\edglsomo}{GLSuseri}% + \listgadd{\edglsomo}{glsuserii}% + \listgadd{\edglsomo}{Glsuserii}% + \listgadd{\edglsomo}{GLSuserii}% + \listgadd{\edglsomo}{glsuseriii}% + \listgadd{\edglsomo}{Glsuseriii}% + \listgadd{\edglsomo}{GLSuseriii}% + \listgadd{\edglsomo}{glsuseriv}% + \listgadd{\edglsomo}{Glsuseriv}% + \listgadd{\edglsomo}{GLSuseriv}% + \listgadd{\edglsomo}{glsuserv}% + \listgadd{\edglsomo}{Glsuserv}% + \listgadd{\edglsomo}{GLSuserv}% + \listgadd{\edglsomo}{glsuservi}% + \listgadd{\edglsomo}{Glsuservi}% + \listgadd{\edglsomo}{GLSuservi}% \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{% \doedindexlabel% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{% \doedindexlabel% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% }% }% - \docsvlist{% - gls,% - Gls,% - GLS,% - glspl,% - Glspl,% - GLSpl,% - glstext,% - Glstext,% - GLStext,% - Glsfirst,% - GLSfirst,% - glsplural% - Glsplural,% - GLSplural,% - glsfirstplural,% - Glsfirstplural,% - GLSfirstplural,% - glsname,% - Glsname,% - GLSname,% - glssymbol,% - Glssymbol,% - GLSsymbol,% - glsdesc,% - Glsdesc,% - GLSdesc,% - glsuseri,% - Glsuseri,% - GLSuseri,% - glsuserii,% - Glsuserii,% - GLSuserii,% - glsuseriii,% - Glsuseriii,% - GLSuseriii,% - glsuseriv,% - Glsuseriv,% - GLSuseriv,% - glsuserv,% - Glsuserv,% - GLSuserv,% - glsuservi,% - Glsuservi,% - GLSuservi% - }% + \dolistloop{\edglsomo}% + \gdef\edglsomm{}% + \listgadd\edglsomm{glsdisp}% + \listgadd\edglsomm{glslink}% \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% \doedindexlabel% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{% \doedindexlabel% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% }% }% - \docsvlist{glsdisp,glslink}% + \dolistloop{\edglsomm}% + \gdef\edglsom{}% + \listgadd\edglsom{glsadd}% \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{% \doedindexlabel% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% \csname#1\endcsname[counter=pageline,##1]{##2}% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{% \doedindexlabel% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% \csname#1\endcsname*[counter=pageline,##1]{##2}% }% }% - \docsvlist{glsadd}% - }{}% + \dolistloop{\edglsom}% + \def\l@noexpands@edgl{}% + \renewcommand\do[1]{% + \xappto\l@noexpands@edgl{% + \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}% + }% + }% + \dolistloop{\edglsomo}% + \renewcommand\do[1]{% + \xappto\l@noexpands@edgl{% + \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}% + }% + }% + \dolistloop{\edglsomm}% + \renewcommand\do[1]{% + \xappto\l@noexpands@edgl{% + \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}% + }% + }% + \dolistloop{\edglsom}% + }{\let\l@noexpands@edgl\relax}% }% \def\@hangingsymbol{} \newcommand*{\sethangingsymbol}[1]{% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 1b947c1305f..a678fd22a7d 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2020/03/08 v2.23.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/04/19 v2.23.1 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -82,6 +82,11 @@ \newcommand*{\led@err@TooManyPstarts}{% \reledpar@error{Too many \string\pstart\space without printing. Some text will be lost}{\@ehc}} +\newcommand{\led@err@polyglossiaTooOld}{% + \reledpar@error{You use the polyglosia package.% + \MessageBreak However, reledpar requires version 2020/04/08 v1.49 or later of the polyglossia package.% + \MessageBreak Please update your reledpar version}{\@ehc}% +}% \newcommand*{\led@err@BadLeftRightPstarts}[2]{% \reledpar@error{The numbers of left (#1) and right (#2) \string\pstart s do not match}{\@ehc}} @@ -2244,17 +2249,18 @@ \gdef\theledlanguageR{\bbl@main@language}% }% } - { \let\old@otherlanguage\otherlanguage% + {% + \@ifpackagelater{polyglossia}{2020/04/08}{}{\led@err@polyglossiaTooOld}% + \let\old@otherlanguage\otherlanguage% \renewcommand{\otherlanguage}[2][]{% - \ifdefined\xpg@set@group@aux% - \xpg@set@group@aux% - \fi% + \xpg@set@group@aux% \selectlanguage[#1]{#2}% \ifledRcol \gdef\theledlanguageR{#2}% \else \gdef\theledlanguageL{#2}% \fi}% \renewcommand{\l@duselanguage}[1]{% - \csuse{no\languagename @numbers}\select@language{#1}% + \csuse{no\languagename @numbers}% + \@select@language{#1}% }% \gdef\theledlanguageL{\xpg@main@language}% \gdef\theledlanguageR{\xpg@main@language}% -- cgit v1.2.3