1 files changed, 96 insertions, 17 deletions

diff --git a/ekdosis.el b/ekdosis.el
index 69c14d1..291e022 100644
--- a/ekdosis.el
+++ b/ekdosis.el
@@ -2,24 +2,26 @@
 ;; This file is part of the `ekdosis' package
 
 ;; ekdosis -- TEI xml compliant critical editions
-;; Copyright (C) 2020--2021  Robert Alessi
+;; Copyright (C) 2020, 2021, 2022, 2023 Robert Alessi
+;; <alessi@robertalessi.net>
 
-;; Please send error reports and suggestions for improvements to Robert
-;; Alessi <alessi@robertalessi.net>
+;; Permission to use, copy, modify, and distribute this software for
+;; any purpose with or without fee is hereby granted, provided that
+;; the above copyright notice and this permission notice appear in all
+;; copies.
 
-;; This program is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
+;; THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+;; WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+;; WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+;; AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
+;; CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+;; OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+;; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
+;; Please send error reports and suggestions for improvements to Robert
+;; Alessi <alessi@robertalessi.net>
 
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see
-;; <http://www.gnu.org/licenses/>.
 
 (defvar LaTeX-ekdosis-preamble-options
   '(("parnotes" ("true" "false" "roman"))
@@ -90,9 +92,13 @@
     ("postwit")
     ("sep")
     ("type")
+    ("ilabel")
+    ("delim")
+    ("nodelim")
     ("num")
     ("nonum")
     ("nolem" ("true" "false"))
+    ("Nolem")
     ("nosep" ("true" "false")))
   "Local options for lem macro")
 
@@ -154,6 +160,8 @@
     ("familysep")
     ("initialrule")
     ("noinitialrule")
+    ("maxentries")
+    ("nomaxentries")
     ("keyparopts")
     ("appheight")
     ("fitalgorithm" ("fontsize" "hybrid" "areasize" "squeeze")))
@@ -200,6 +208,8 @@
     ("modulonum")
     ("margin" ("right" "left" "inner" "outer"))
     ("numbers" ("elided" "full"))
+    ("maxlines")
+    ("nomaxlines")
     ("vlineation" ("page" "document"))
     ("vmodulo")
     ("vnumbrokenlines" ("true" "false"))
@@ -232,6 +242,20 @@
     ("lineation" ("page" "document")))
   "Local options for alignment env.")
 
+(defvar LaTeX-ekdosis-footnotes-key-val-options
+  '(("arrangement" ("column" "page" "merge"))
+    ("reset")
+    ("paragraph" ("true" "false"))
+    ("type")
+    ("textfnmark")
+    ("appfnmark"))
+  "Local options for footnotes combined in a single paragraph.")
+
+(defvar LaTeX-ekdosis-footnote-options
+  '(("type")
+    ("mark"))
+  "Local options for footnote macro.")
+
 (defvar LaTeX-ekdosis-ekdverse-key-val-options
   '(("width")
     ("type"))
@@ -244,8 +268,17 @@
 (TeX-add-style-hook
  "ekdosis"
  (lambda ()
+   ;; Do not append an empty group to the following macros:
+   (setq TeX-insert-braces-alist (append TeX-insert-braces-alist
+                                         '(("modulolinenumbers" . nil)
+                                           ("vmodulolinenumbers" . nil)
+                                           ("resetlinenumber" . nil)
+                                           ("resetvlinenumber" . nil))))
    ;; Folding features:
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("{1}" ("App"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
                 '("{1}" ("app"))
                 t)
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
@@ -258,16 +291,25 @@
                 '("[n]" ("note"))
                 t)
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("[n]" ("note*"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
                 '("[l]" ("linelabel"))
                 t)
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("[l]" ("ilabel"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
                 '("{{1}}" ("surplus"))
                 t)
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
                 '("<{1}>" ("supplied"))
                 t)
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
-                '("{1}" ("sic"))
+                '("†{1}†" ("sic"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("†{1}" ("sic*"))
                 t)
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
                 '("[g]" ("gap"))
@@ -284,9 +326,25 @@
    (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
                 '("[t]" ("teidirect"))
                 t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("[t]" ("teidirectE"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("[ml]" ("localmaxlines"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("[ml]" ("addtomaxlines"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("[h]" ("localappheight"))
+                t)
+   (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list)
+                '("[h]" ("addtoappheight"))
+                t)
    ;; This package relies on lualatex, so check for it:
    (TeX-check-engine-add-engines 'luatex)
    (TeX-add-symbols
+    '("eKd" 0)
     '("ekdsetup" (TeX-arg-key-val LaTeX-ekdosis-ekdsetup-options))
     '("DeclareWitness" "xml:id" "rendition" "description"
       [ LaTeX-ekdosis-long-key-val LaTeX-ekdosis-declarewitness-options ]
@@ -307,6 +365,10 @@
       0)
     '("linelabel" "label"
       0)
+    '("ilabel" "indexed label"
+      0)
+    '("App" [ TeX-arg-key-val LaTeX-ekdosis-app-options ]
+      2)
     '("app" [ TeX-arg-key-val LaTeX-ekdosis-app-options ]
       t)
     '("lem" [ LaTeX-ekdosis-long-key-val LaTeX-ekdosis-lem-options ]
@@ -352,11 +414,19 @@
     '("SetDefaultApparatus" "apparatus name" 0)
     '("DeclareApparatus" "apparatus name"
       [ TeX-arg-key-val LaTeX-ekdosis-declareapparatus-options ] 0)
+    '("footnote" [ TeX-arg-key-val LaTeX-ekdosis-footnote-options ]
+      t)
     '("indentpattern" "pattern" 0)
     '("vin" 0)
+    '("SetFootnotes"
+      (TeX-arg-key-val LaTeX-ekdosis-footnotes-key-val-options))
     '("SetLineation" (TeX-arg-key-val LaTeX-ekdosis-setlineation-options))
     '("innerlinenumbers" 0)
     '("outerlinenumbers" 0)
+    '("setmaxlines" "number" 0)
+    '("localmaxlines" "number" 0)
+    '("addtomaxlines" "number" 0)
+    '("nomaxlines" 0)
     '("modulolinenumbers" [ "number" ] )
     '("vmodulolinenumbers" [ "number" ] )
     '("resetlinenumber" [ "number" ] )
@@ -367,19 +437,27 @@
     '("MkBodyDivs" "div1" "div2" "div3" "div4" "div5" "div6" 0)
     '("ekddiv" (LaTeX-ekdosis-long-key-val LaTeX-ekdosis-ekddiv-options))
     '("FormatDiv" "number" "code before" "code after" 0)
+    '("ekdpage" 0)
     '("ekdmark" 0)
     '("endmark" 0)
     '("ekdprintmark"
       (TeX-arg-eval completing-read
                     (TeX-argument-prompt nil nil "selector")
                     '("HEL" "HEC" "HER" "HOL" "HOC" "HOR"
-                      "FEL" "FEC" "FER" "FOL" "FOC" "FOR"))
+                      "FEL" "FEC" "FER" "FOL" "FOC" "FOR"
+                      "HL" "HC" "HR" "FL" "FC" "FR"))
       "signpost" 0 )
-    '("ekdnohfmark" 0)
+    '("ekdEOprint" "even page" "odd page" 0)
+    '("setpairedpagenum" "page number" 0)
+    '("setpairedpage" 0)
+    '("resetpagenumber" 0)
+    '("ekdnohfmarks" 0)
     '("ekdresethfmarks" 0)
     '("ekdpb" [ "page number" ] "line number" 0)
     '("ekdpb*")
     '("addentries" [ "layer" ] "number" 0)
+    '("localappheight" "dimension" 0)
+    '("addtoappheight" "dimension" 0)
     '("SetTEIFilename" "base name" 0)
     '("SetTEIxmlExport" (TeX-arg-key-val
                          LaTeX-ekdosis-setteixmlexport-options))
@@ -388,6 +466,7 @@
     '("EnvtoTEI*" "env name" "TEI element" [ "TEI attributes" ] 0)
     '("TeXtoTEIPat" "TeX pattern" "TEI pattern" 0)
     '("teidirect" [ "xml attributes" ] "xml element" "code" 0)
+    '("teidirectE" [ "xml attributes" ] "xml element" 0)
     '("AddxmlBibResource" "basename or name.xml" 0)
     )
  (LaTeX-add-environments