From fde1eee531f211fb7707a4c0452a52db353eff3e Mon Sep 17 00:00:00 2001
From: Robert Alessi <alessi@robertalessi.net>
Date: Sun, 30 May 2021 21:46:16 +0200
Subject: [6f3b36f] needed more work: fixed

---
 ekdosis.dtx | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/ekdosis.dtx b/ekdosis.dtx
index 85b7af7..9f50ec5 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/05/28 v1.3-dev Typesetting TEI xml-compliant critical editions]
+    [2021/05/30 v1.3-dev Typesetting TEI xml-compliant critical editions]
 %</package>
 %<*driver>
 \begin{filecontents}[noheader,overwrite]{bibdata.xml}
@@ -5610,16 +5610,16 @@ subtype="arabtex">'inna 'abI kAna mina
 % \phts\label{ref:xmlid} As a general rule, the |xml:id| global
 % attribute must be unique for the element that bears the
 % attribute. Furthermore, it must begin with a letter or an underscore
-% and contain no characters other than letters of the Latin alphabet
-% either upper or lower case from |a| to |z|, digits, hyphens,
-% underscores and full stops. \pkg{ekdosis} issues a warning when it
-% finds that any \meta{unique id} of \meta{unique label} expected in
-% the first argument of \cs{DeclareWitness}, \cs{DeclareHand},
-% \cs{DeclareSource} or \cs{DeclareScholar} is not unique or breaks
-% the rules just described, but does not prevent the |.tex| source
-% file from compiling. Instead, it prints the string |<??>| in place
-% of the expected formatted siglum so that the error in the |.tex|
-% source file can be easily spotted and corrected.
+% and contain no characters other than letters of the Latin
+% alphabet\--- from |a| to |z|, either upper or lower case\---digits,
+% hyphens, underscores and full stops. \pkg{ekdosis} issues a warning
+% when it finds that any \meta{unique id} of \meta{unique label}
+% expected in the first argument of \cs{DeclareWitness},
+% \cs{DeclareHand}, \cs{DeclareSource} or \cs{DeclareScholar} is not
+% unique or breaks the rules just described, but does not prevent the
+% |.tex| source file from compiling. Instead, it prints the string
+% |<??>| in place of the expected formatted siglum so that the error
+% in the |.tex| source file can be easily spotted and corrected.
 %
 % \danger As the \meta{unique id} declared with \cs{DeclareShorthand}
 % is not to be exported in the \texttt{TEI xml} output file,
@@ -7509,7 +7509,7 @@ Sample text with a \textcolor{red}{word} in red.
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\teidirect}
-% \changes{v1.3}{2021/05/28}{direct insertion of elements in the
+% \changes{v1.3}{2021/05/30}{direct insertion of elements in the
 % \texttt{TEI xml} file}
 % \cs{teidirect}\oarg{xml attributes}\marg{xml element}\marg{code}
 % does nothing in \LaTeX. Its only use is to insert elements in the
@@ -7868,7 +7868,7 @@ Sample text with a \textcolor{red}{word} in red.
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\SetApparatusNoteLanguage}
-% \changes{v1.3}{2021/05/28}{defines an alternate language to be
+% \changes{v1.3}{2021/05/30}{defines an alternate language to be
 % applied in note apparatus entries}
 % \cs{SetApparatusNoteLang}\marg{languagename} can be used when
 % it is needed to apply in entries introduced by the \cs{note} command
@@ -7952,7 +7952,7 @@ Sample text with a \textcolor{red}{word} in red.
 % apparatus criticus, a conditional is first defined.
 %    \begin{macrocode}
 \if@pkg@float
-\trivfloat{ekdapparatus}
+ \trivfloat{ekdapparatus}
 \fi
 \newif\ifekd@inside@app
 \def\add@@apparatus{%
@@ -9750,7 +9750,7 @@ local cmdtotags = {
    {a="textsc", b="hi", c=" rend=\"smallcaps\""},
    {a="textsf", b="hi", c=" rend=\"sf\""},
    {a="arbup", b="hi", c=" rend=\"sup\""},
-   {a="txarb", b="s", c=" xml:lang=\"arb\""},
+   {a="txarb", b="foreign", c=" xml:lang=\"arb\""},
    {a="arb", b="span",
     c=" xml:lang=\"ar-Latn\" type=\"transliterated\" subtype=\"arabtex\""}
 }
@@ -10585,7 +10585,7 @@ end
 
 local function close_ekddivs_in_between(str)
    local maxdepth = 1
-   for i in string.gmatch(str, "<div.-depth=\"(%d)\".->", "%1")
+   for i in string.gmatch(str, "<div.-[Dd]epth=\"(%d)\".->", "%1")
    do
       if tonumber(i) > tonumber(maxdepth)
       then
@@ -10610,9 +10610,9 @@ local function close_ekddivs_in_between(str)
 			      do
 				 closedivs = closedivs.."</div>"
 				 firstdivindex = firstdivindex - 1
+				 bdivii = string.gsub(bdivii, "depth", "Depth")
 			      end
 			   end
-			   bdivii = string.gsub(bdivii, "depth", "Depth")
 			   return string.format("%s%s%s%s%s%s%s%s",
 						bdivi, ndivi, edivi, between,
 						closedivs, bdivii, ndivii, edivii)
-- 
cgit v1.2.3