\Set...Apparatus commands needed more expansion control

1 files changed, 42 insertions, 32 deletions

diff --git a/ekdosis.dtx b/ekdosis.dtx
index 9f34630..5cb1dac 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -61,7 +61,7 @@ along with this program.  If not, see
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{ekdosis}
 %<*package>
-    [2021/11/23 v1.5-dev Typesetting TEI xml-compliant critical editions]
+    [2021/12/09 v1.5-dev Typesetting TEI xml-compliant critical editions]
 %</package>
 %<*driver>
 \begin{filecontents}[noheader,overwrite]{bibdata.xml}
@@ -563,14 +563,11 @@ along with this program.  If not, see
 \defaultfontfeatures{Renderer=Harfbuzz}
 \usepackage[latin.classic,greek.ancient,american]{babel}
 \babelfont{rm}{Old Standard}
-\babelfont{sf}{NewCMSans10-Book}
-\babelfont{tt}{NewCMMono10-Book}
-\babelfont[greek]{rm}[
-      Script=Greek,
-      RawFeature={+ss05;+ss06}
-      ]{Old Standard}
-\babelfont[greek]{sf}[Script=Greek]{NewCMSans10-Book}
-\babelfont[greek]{tt}[Script=Greek]{NewCMMono10-Book}
+\babelfont{sf}{NewComputerModernSans10}
+\babelfont{tt}{NewComputerModernMono10}
+\babelfont[greek]{rm}[Script=Greek,
+               RawFeature={+ss05;+ss06}]
+               {Old Standard}
 \newfontfamily{\junicode}{Junicode}[
                 Ligatures=TeX,
                 RawFeature={+hist}]
@@ -716,6 +713,8 @@ along with this program.  If not, see
 \metaset[sep]{draft}{ -- }
 \metasetlang{en-US}
 \metaset{title}{ἔκδοσις}
+\metaset[print]{title}{\href{http://www.ekdosis.org}{\eKd}\hfill
+  ἔκδοσις\hfill\phantom{\eKd}}
 \metaset{date}{\filedate}
 \metaset{draft}{\fileversion}
 \metaset{subject}{TEI xml-compliant critical editions}
@@ -755,6 +754,7 @@ along with this program.  If not, see
 \metawritepdfpreamble
 \metawritepdfcontact
 \metawritepdfrights
+\usepackage{abstract}
 \usepackage{multicol}
 \setlength\IndexMin{100pt}
 \usepackage{tocloft}
@@ -900,19 +900,19 @@ along with this program.  If not, see
 % \changes{v1.0}{2020/08/14}{Documentation complete}
 %
 % \begin{abstract}
-%   \pkg{ekdosis} is a Lua\LaTeX{} package designed for
-%   multilingual critical editions. It can be used to typeset texts
-%   and different layers of critical notes in any direction accepted
-%   by Lua\TeX. Texts can be arranged in running paragraphs or on
-%   facing pages, in any number of columns which in turn can be
-%   synchronized or not. In addition to printed texts,
-%   \pkg{ekdosis} can convert \texttt{.tex} source files so as to
-%   produce \texttt{TEI xml}-compliant critical
-%   editions. Database-driven encoding under \LaTeX{} then allows
-%   extraction of texts entered segment by segment according to
-%   various criteria: main edited text, variant readings, translations
-%   or annotated borrowings between texts. It is published under the
-%   terms of the GNU General Public License (GPL) version 3.
+%   \pkg{ekdosis} is a Lua\LaTeX{} package designed for multilingual
+%   critical editions. It can be used to typeset texts and different
+%   layers of critical notes in any direction accepted by
+%   Lua\TeX. Texts can be arranged in running paragraphs or on facing
+%   pages, in any number of columns which in turn can be synchronized
+%   or not. In addition to printed texts, \pkg{ekdosis} can convert
+%   \texttt{.tex} source files so as to produce \texttt{TEI
+%   xml}-compliant critical editions. Database-driven encoding under
+%   \LaTeX{} then allows extraction of texts entered segment by
+%   segment according to various criteria: main edited text, variant
+%   readings, translations or annotated borrowings between texts. It
+%   is published under the terms of the GNU General Public License
+%   (GPL) version 3.
 % \end{abstract}
 %
 % \section*{License and Disclaimer}
@@ -7754,6 +7754,16 @@ Sample text with a \textcolor{red}{word} in red.
   \luadirect{ekdosis.closestream()}
 }
 %    \end{macrocode}
+% \paragraph{\textsf{ekdosis} Symbol}
+% \begin{macro}{\eKd}
+% \changes{v1.5}{2021/12/09}{Prints \textsf{ekdosis} indentifying
+% symbol} As of v1.5, \pkg{ekdosis} has its own indentifying
+% symbol. It is produced by \cs{eKd} and best printed with the Old
+% Standard Greek font.
+%    \begin{macrocode}
+\def\eKd{ε\kern -.4em\raise 1.15ex\hbox{κ}\kern -.105emδ}
+%    \end{macrocode}
+% \end{macro}
 % \paragraph{Setup}
 % \begin{macro}{\ekdsetup}
 % \changes{v1.3}{2021/08/18}{new command for global options}
@@ -8279,15 +8289,15 @@ Sample text with a \textcolor{red}{word} in red.
 % point of the document.  The keys to be used follow:---
 %    \begin{macrocode}
 \newif\ifrtl@app
-\edef\ekdsep{] }
-\edef\ekdsubsep{}
+\def\ekdsep{] }
+\def\ekdsubsep{}
 \ekvdefinekeys{default@app}{
   choice direction = {LR = \rtl@appfalse,
     RL = \rtl@apptrue},
   unknown-choice direction = \PackageError{ekdosis}{unknown
     direction=#1}{`direction' must be either `LR' or `RL'.},
-  code sep = \edef\ekdsep{#1},
-  code subsep = \edef\ekdsubsep{#1},
+  code sep = \def\ekdsep{#1},
+  code subsep = \def\ekdsubsep{#1},
   store bhook = \ekd@begin@apparatus,
   initial bhook = {},
   store ehook = \ekd@end@apparatus,
@@ -8330,7 +8340,7 @@ Sample text with a \textcolor{red}{word} in red.
 % between lemma texts and variant readings, which is by default
 % a closing square bracket followed by a space (\verb*+] +):---
 %    \begin{macrocode}
-\NewDocumentCommand{\SetSeparator}{m}{\edef\ekdsep{#1}}
+\NewDocumentCommand{\SetSeparator}{m}{\def\ekdsep{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\SetSubseparator}
@@ -8339,7 +8349,7 @@ Sample text with a \textcolor{red}{word} in red.
 % \enquote{subseparator} between variant readings. By default,
 % no subseparator is set:---
 %    \begin{macrocode}
-\NewDocumentCommand{\SetSubseparator}{m}{\edef\ekdsubsep{#1}}
+\NewDocumentCommand{\SetSubseparator}{m}{\def\ekdsubsep{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\SetBeginApparatus}
@@ -8347,7 +8357,7 @@ Sample text with a \textcolor{red}{word} in red.
 %   characters at the beginning of the apparatus block. By default,
 %   nothing is appended:---
 %    \begin{macrocode}
-\NewDocumentCommand{\SetBeginApparatus}{m}{\edef\ekd@begin@apparatus{#1}}
+\NewDocumentCommand{\SetBeginApparatus}{m}{\def\ekd@begin@apparatus{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\SetEndApparatus}
@@ -8356,7 +8366,7 @@ Sample text with a \textcolor{red}{word} in red.
 % as it is customary in some editions. By default, nothing is
 % appended:---
 %    \begin{macrocode}
-\NewDocumentCommand{\SetEndApparatus}{m}{\edef\ekd@end@apparatus{#1}}
+\NewDocumentCommand{\SetEndApparatus}{m}{\def\ekd@end@apparatus{#1}}
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\SetUnitDelimiter}
@@ -12259,12 +12269,12 @@ function ekdosis.appout()
                end
                if apparatuses[n].sep ~= ""
                then
-                  table.insert(output, "\\edef\\ekdsep{" .. apparatuses[n].sep .. "}")
+                  table.insert(output, "\\def\\ekdsep{" .. apparatuses[n].sep .. "}")
                else
                end
                if apparatuses[n].subsep ~= ""
                then
-                  table.insert(output, "\\edef\\ekdsubsep{" .. apparatuses[n].subsep .. "}")
+                  table.insert(output, "\\def\\ekdsubsep{" .. apparatuses[n].subsep .. "}")
                end
                if apparatuses[n].bhook ~= ""
                then