From 7d4715de80b369bbcfc1e31eac289dd3b3f8b454 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Fri, 21 Feb 2020 16:37:08 +0100 Subject: replaced \DeclareNew... with \Declare...; added non-breaking space after line numbers. --- ekdosis.dtx | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ekdosis.dtx b/ekdosis.dtx index 28b25a3..fb405b1 100644 --- a/ekdosis.dtx +++ b/ekdosis.dtx @@ -379,7 +379,7 @@ Running "make install" installs the files in the local TeX tree. /witness/msName/.new value = {}, /witness/origDate/.new value = {} } -\NewDocumentCommand{\DeclareNewWitness}{m m m O{}}{% +\NewDocumentCommand{\DeclareWitness}{m m m O{}}{% \bgroup \options{/witness,#4} \letoption{/witness/settlement}\settlement@value @@ -398,25 +398,25 @@ Running "make install" installs the files in the local TeX tree. \luastringO{\origDate@value})} \egroup } -\@onlypreamble\DeclareNewWitness -\NewDocumentCommand{\DeclareNewHand}{m m m +O{}}{ +\@onlypreamble\DeclareWitness +\NewDocumentCommand{\DeclareHand}{m m m +O{}}{ \luadirect{ekdosis.newhand(\luastringN{#1}, \luastringN{#2}, \luastringN{#3}, \luastringN{#4})} } -\@onlypreamble\DeclareNewHand -\NewDocumentCommand{\DeclareNewScholar}{m m}{ +\@onlypreamble\DeclareHand +\NewDocumentCommand{\DeclareScholar}{m m}{ \luadirect{ekdosis.newscholar(\luastringN{#1}, \luastringN{#2})} } -\@onlypreamble\DeclareNewScholar -\NewDocumentCommand{\DeclareNewShorthand}{m m m}{ +\@onlypreamble\DeclareScholar +\NewDocumentCommand{\DeclareShorthand}{m m m}{ \luadirect{ekdosis.newshorthand(\luastringN{#1}, \luastringN{#2}, \luastringN{#3})} } -\@onlypreamble\DeclareNewShorthand +\@onlypreamble\DeclareShorthand \NewDocumentCommand{\getsiglum}{m}{% \luadirect{tex.sprint(ekdosis.getsiglum(\luastringN{#1}))}% } @@ -734,6 +734,7 @@ Running "make install" installs the files in the local TeX tree. \fi% }% }% +\protected\def\nbsp{\nobreak\space} \define@cmdkeys[ekd]{lemrdg}[ekdlr@]{wit, alt, pre, post, prewit, postwit} \define@cmdkey[ekd]{lem}[ekdl@]{sep}{} @@ -763,7 +764,7 @@ Running "make install" installs the files in the local TeX tree. \else% \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% \fi% - \current@ref{} }%\hskip .25em}% + \current@ref\nbsp}%\hskip .25em}% \else% \ifbool{al@rlmode}{% \edef\lem@app{% @@ -774,7 +775,7 @@ Running "make install" installs the files in the local TeX tree. \else% \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% \fi% - \current@ref{} %\hskip .25em + \current@ref\nbsp%\hskip .25em \ifdefined\ekdlr@alt% \ifdefined\ekdlr@post% \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi @@ -805,7 +806,7 @@ Running "make install" installs the files in the local TeX tree. \else% \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% \fi% - \current@ref{} %\hskip .25em + \current@ref\nbsp%\hskip .25em \ifdefined\ekdlr@alt% \ifdefined\ekdlr@pre% \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi @@ -951,7 +952,7 @@ Running "make install" installs the files in the local TeX tree. \else% \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% \fi% - \current@ref@arg{\ekdn@labelb}{\ekdn@labele} %\hskip .25em + \current@ref@arg{\ekdn@labelb}{\ekdn@labele}\nbsp%\hskip .25em \ifdefined\ekdn@lem% {\textdir TRT\unexpanded\expandafter{\ekdn@lem}}% \unexpanded\expandafter{\ekdn@sep}\else\fi% @@ -964,7 +965,7 @@ Running "make install" installs the files in the local TeX tree. \else% \ifsubsq@unit\unexpanded\expandafter{\ekd@unit@delim}\fi% \fi% - \current@ref@arg{\ekdn@labelb}{\ekdn@labele} %\hskip .25em + \current@ref@arg{\ekdn@labelb}{\ekdn@labele}\nbsp%\hskip .25em \ifdefined\ekdn@lem \ltx@ifpackageloaded{babel}% {\noexpand\selectlanguage{\languagename}% -- cgit v1.2.3