diff options
author | Robert Alessi <alessi@robertalessi.net> | 2024-05-25 10:42:13 +0200 |
---|---|---|
committer | Robert Alessi <alessi@robertalessi.net> | 2024-05-25 10:42:13 +0200 |
commit | 4216653b8eec8568b2ee6b5d50fba88a25637346 (patch) | |
tree | 7741c7fdfd8b69b0a9ea815d6751088641200791 | |
parent | 1fa15ddbce63933461baf5bad2ce97a28ee2bd53 (diff) | |
download | ekdosis-master.tar.gz |
fixed order of appearance of wit-source-resp in RL mode (and also prewit-wit-postwit in both modes)HEADmaster
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | about.html | 2 | ||||
-rw-r--r-- | ekdosis.dtx | 172 | ||||
-rw-r--r-- | ekdosis.el | 2 | ||||
-rw-r--r-- | ekdosis.ins | 2 |
6 files changed, 119 insertions, 63 deletions
@@ -1,7 +1,7 @@ | |||
1 | ekdosis -- Typesetting TEI xml-Compliant Critical Editions | 1 | ekdosis -- Typesetting TEI xml-Compliant Critical Editions |
2 | ---------------------------------------------------------- | 2 | ---------------------------------------------------------- |
3 | 3 | ||
4 | Copyright (c) 2020, 2021, 2022, 2023 Robert Alessi | 4 | Copyright (c) 2020, 2021, 2022, 2023, 2024 Robert Alessi |
5 | <alessi@robertalessi.net> | 5 | <alessi@robertalessi.net> |
6 | 6 | ||
7 | Permission to use, copy, modify, and distribute this software for any | 7 | Permission to use, copy, modify, and distribute this software for any |
@@ -22,7 +22,7 @@ License and Disclamer | |||
22 | ===================== | 22 | ===================== |
23 | ekdosis – Typesetting TEI xml-Compliant Critical Editions | 23 | ekdosis – Typesetting TEI xml-Compliant Critical Editions |
24 | 24 | ||
25 | Copyright ⓒ 2020, 2021, 2022, 2023 Robert Alessi | 25 | Copyright ⓒ 2020, 2021, 2022, 2023, 2024 Robert Alessi |
26 | <alessi@robertalessi.net> | 26 | <alessi@robertalessi.net> |
27 | 27 | ||
28 | Permission to use, copy, modify, and distribute this software for any | 28 | Permission to use, copy, modify, and distribute this software for any |
@@ -12,7 +12,7 @@ text, variant readings, translations or annotated borrowings between | |||
12 | texts. It is published under the terms of the OpenBSD license.</p> | 12 | texts. It is published under the terms of the OpenBSD license.</p> |
13 | <h1 id="license-and-disclamer">License and Disclamer</h1> | 13 | <h1 id="license-and-disclamer">License and Disclamer</h1> |
14 | <p>ekdosis – Typesetting TEI xml-Compliant Critical Editions</p> | 14 | <p>ekdosis – Typesetting TEI xml-Compliant Critical Editions</p> |
15 | <p>Copyright ⓒ 2020, 2021, 2022, 2023 Robert Alessi <a | 15 | <p>Copyright ⓒ 2020, 2021, 2022, 2023, 2024 Robert Alessi <a |
16 | href="mailto:alessi@robertalessi.net" | 16 | href="mailto:alessi@robertalessi.net" |
17 | class="email">alessi@robertalessi.net</a></p> | 17 | class="email">alessi@robertalessi.net</a></p> |
18 | <p>Permission to use, copy, modify, and distribute this software for any | 18 | <p>Permission to use, copy, modify, and distribute this software for any |
diff --git a/ekdosis.dtx b/ekdosis.dtx index d558e13..0f6917b 100644 --- a/ekdosis.dtx +++ b/ekdosis.dtx | |||
@@ -1,7 +1,7 @@ | |||
1 | % \iffalse meta-comment | 1 | % \iffalse meta-comment |
2 | % | 2 | % |
3 | % ekdosis -- Typesetting TEI xml-compliant critical editions | 3 | % ekdosis -- Typesetting TEI xml-compliant critical editions |
4 | % Copyright (c) 2020, 2021, 2022, 2023 Robert Alessi | 4 | % Copyright (c) 2020, 2021, 2022, 2023, 2024 Robert Alessi |
5 | % <alessi@robertalessi.net> | 5 | % <alessi@robertalessi.net> |
6 | % | 6 | % |
7 | % Permission to use, copy, modify, and distribute this software for any | 7 | % Permission to use, copy, modify, and distribute this software for any |
@@ -27,7 +27,7 @@ | |||
27 | This file is part of the `ekdosis' package | 27 | This file is part of the `ekdosis' package |
28 | 28 | ||
29 | ekdosis -- Typesetting TEI xml-compliant critical editions | 29 | ekdosis -- Typesetting TEI xml-compliant critical editions |
30 | Copyright (c) 2020, 2021, 2022, 2023 Robert Alessi | 30 | Copyright (c) 2020, 2021, 2022, 2023, 2024 Robert Alessi |
31 | <alessi@robertalessi.net> | 31 | <alessi@robertalessi.net> |
32 | 32 | ||
33 | Permission to use, copy, modify, and distribute this software for any | 33 | Permission to use, copy, modify, and distribute this software for any |
@@ -59,7 +59,7 @@ Alessi <alessi@robertalessi.net> | |||
59 | %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] | 59 | %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] |
60 | %<package>\ProvidesPackage{ekdosis} | 60 | %<package>\ProvidesPackage{ekdosis} |
61 | %<*package> | 61 | %<*package> |
62 | [2023/07/29 v1.5-dev Typesetting TEI xml-compliant critical editions] | 62 | [2024/05/25 v1.5-dev Typesetting TEI xml-compliant critical editions] |
63 | %</package> | 63 | %</package> |
64 | %<*driver> | 64 | %<*driver> |
65 | \begin{filecontents}[noheader,overwrite]{bibdata.xml} | 65 | \begin{filecontents}[noheader,overwrite]{bibdata.xml} |
@@ -860,7 +860,7 @@ Alessi <alessi@robertalessi.net> | |||
860 | Para ver una copia de esta licencia, siga el vínculo: | 860 | Para ver una copia de esta licencia, siga el vínculo: |
861 | \metapick[#1]{licenseurl}.} | 861 | \metapick[#1]{licenseurl}.} |
862 | \metaset{copyrightowner}{\metapick[#1]{author}} | 862 | \metaset{copyrightowner}{\metapick[#1]{author}} |
863 | \metaset{copyrightdate}{2020, 2021, 2022, 2023} | 863 | \metaset{copyrightdate}{2020, 2021, 2022, 2023, 2024} |
864 | \metaset{licensemessage}{Permission to use, copy, modify, and | 864 | \metaset{licensemessage}{Permission to use, copy, modify, and |
865 | distribute this software for any purpose with or without fee is | 865 | distribute this software for any purpose with or without fee is |
866 | hereby granted, provided that the above copyright notice and this | 866 | hereby granted, provided that the above copyright notice and this |
@@ -1063,7 +1063,7 @@ Alessi <alessi@robertalessi.net> | |||
1063 | ekdosis -- Typesetting TEI xml-Compliant Critical Editions | 1063 | ekdosis -- Typesetting TEI xml-Compliant Critical Editions |
1064 | ---------------------------------------------------------- | 1064 | ---------------------------------------------------------- |
1065 | 1065 | ||
1066 | Copyright (c) 2020, 2021, 2022, 2023 Robert Alessi | 1066 | Copyright (c) 2020, 2021, 2022, 2023, 2024 Robert Alessi |
1067 | <alessi@robertalessi.net> | 1067 | <alessi@robertalessi.net> |
1068 | 1068 | ||
1069 | Permission to use, copy, modify, and distribute this software for any | 1069 | Permission to use, copy, modify, and distribute this software for any |
@@ -8519,7 +8519,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
8519 | % \end{macrocode} | 8519 | % \end{macrocode} |
8520 | % \paragraph{\textsf{ekdosis} Symbol} | 8520 | % \paragraph{\textsf{ekdosis} Symbol} |
8521 | % \begin{macro}{\eKd} | 8521 | % \begin{macro}{\eKd} |
8522 | % \changes{v1.5}{2023/07/29}{Prints \textsf{ekdosis} indentifying | 8522 | % \changes{v1.5}{2024/05/25}{Prints \textsf{ekdosis} indentifying |
8523 | % symbol} As of v1.5, \pkg{ekdosis} has its own identifying | 8523 | % symbol} As of v1.5, \pkg{ekdosis} has its own identifying |
8524 | % symbol. It is produced by \cs{eKd} and best printed with the Old | 8524 | % symbol. It is produced by \cs{eKd} and best printed with the Old |
8525 | % Standard Greek font. | 8525 | % Standard Greek font. |
@@ -8782,7 +8782,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
8782 | % \begin{macro}{\teidirectE} | 8782 | % \begin{macro}{\teidirectE} |
8783 | % \changes{v1.3}{2021/08/18}{direct insertion of elements in the | 8783 | % \changes{v1.3}{2021/08/18}{direct insertion of elements in the |
8784 | % \texttt{TEI xml} file} | 8784 | % \texttt{TEI xml} file} |
8785 | % \changes{v1.5}{2023/07/29}{direct insertion of empty elements in the | 8785 | % \changes{v1.5}{2024/05/25}{direct insertion of empty elements in the |
8786 | % \texttt{TEI xml} file} | 8786 | % \texttt{TEI xml} file} |
8787 | % \cs{teidirect}\oarg{xml attributes}\marg{xml element}\marg{code} | 8787 | % \cs{teidirect}\oarg{xml attributes}\marg{xml element}\marg{code} |
8788 | % does nothing in \LaTeX. It is only used to insert elements in the | 8788 | % does nothing in \LaTeX. It is only used to insert elements in the |
@@ -8797,7 +8797,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
8797 | % \end{macro} | 8797 | % \end{macro} |
8798 | % \end{macro} | 8798 | % \end{macro} |
8799 | % \begin{macro}{\getTEIxmlid} | 8799 | % \begin{macro}{\getTEIxmlid} |
8800 | % \changes{v1.5}{2023/07/29}{returns \texttt{TEI xml:ids} from a | 8800 | % \changes{v1.5}{2024/05/25}{returns \texttt{TEI xml:ids} from a |
8801 | % csv-list of ids} This command returns from a csv-list of unique | 8801 | % csv-list of ids} This command returns from a csv-list of unique |
8802 | % identifiers declared in commands such as \cs{DeclareWitness} and the | 8802 | % identifiers declared in commands such as \cs{DeclareWitness} and the |
8803 | % like a space-separated list of their corresponding |xml:id|s, each | 8803 | % like a space-separated list of their corresponding |xml:id|s, each |
@@ -9273,7 +9273,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
9273 | \newlength{\ekd@app@localheight} | 9273 | \newlength{\ekd@app@localheight} |
9274 | % \end{macrocode} | 9274 | % \end{macrocode} |
9275 | % \begin{macro}{\localappheight} | 9275 | % \begin{macro}{\localappheight} |
9276 | % \changes{v1.5}{2023/07/29}{changes the height of the apparatus | 9276 | % \changes{v1.5}{2024/05/25}{changes the height of the apparatus |
9277 | % criticus} | 9277 | % criticus} |
9278 | % \cs{localappheight}\marg{dimen} can be used to change locally the | 9278 | % \cs{localappheight}\marg{dimen} can be used to change locally the |
9279 | % length of \cs{ekd@app@height} set by the |appheight| option of | 9279 | % length of \cs{ekd@app@height} set by the |appheight| option of |
@@ -9292,7 +9292,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
9292 | % \end{macrocode} | 9292 | % \end{macrocode} |
9293 | % \end{macro} | 9293 | % \end{macro} |
9294 | % \begin{macro}{\addtoappheight} | 9294 | % \begin{macro}{\addtoappheight} |
9295 | % \changes{v1.5}{2023/07/29}{increases or decreases the height of the | 9295 | % \changes{v1.5}{2024/05/25}{increases or decreases the height of the |
9296 | % apparatus criticus} | 9296 | % apparatus criticus} |
9297 | % As the name suggests, in contrast to \cs{localappheight}, | 9297 | % As the name suggests, in contrast to \cs{localappheight}, |
9298 | % \cs{addtoappheight}\marg{dimen} is used to increase or decrease | 9298 | % \cs{addtoappheight}\marg{dimen} is used to increase or decrease |
@@ -9579,7 +9579,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
9579 | % The following commands are provided to set and control the maximum | 9579 | % The following commands are provided to set and control the maximum |
9580 | % number of lines printed on each page. | 9580 | % number of lines printed on each page. |
9581 | % \begin{macro}{\setmaxlines} | 9581 | % \begin{macro}{\setmaxlines} |
9582 | % \changes{v1.5}{2023/07/29}{limits the number of lines per page} | 9582 | % \changes{v1.5}{2024/05/25}{limits the number of lines per page} |
9583 | % \cs{setmaxlines}\marg{n}, where \meta{n} is a positive integer | 9583 | % \cs{setmaxlines}\marg{n}, where \meta{n} is a positive integer |
9584 | % $\geq 1$, can be used either in the preamble or at any point of the | 9584 | % $\geq 1$, can be used either in the preamble or at any point of the |
9585 | % document to set the maximum number of lines to be printed on each | 9585 | % document to set the maximum number of lines to be printed on each |
@@ -9590,7 +9590,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
9590 | % \end{macrocode} | 9590 | % \end{macrocode} |
9591 | % \end{macro} | 9591 | % \end{macro} |
9592 | % \begin{macro}{\localmaxlines} | 9592 | % \begin{macro}{\localmaxlines} |
9593 | % \changes{v1.5}{2023/07/29}{changes the maximum number of lines | 9593 | % \changes{v1.5}{2024/05/25}{changes the maximum number of lines |
9594 | % locally} | 9594 | % locally} |
9595 | % Once a maximum number of lines per page has been set, | 9595 | % Once a maximum number of lines per page has been set, |
9596 | % \cs{localmaxlines}\marg{n} can be used to adjust this number on a | 9596 | % \cs{localmaxlines}\marg{n} can be used to adjust this number on a |
@@ -9603,7 +9603,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
9603 | % \end{macrocode} | 9603 | % \end{macrocode} |
9604 | % \end{macro} | 9604 | % \end{macro} |
9605 | % \begin{macro}{\addtomaxlines} | 9605 | % \begin{macro}{\addtomaxlines} |
9606 | % \changes{v1.5}{2023/07/29}{adds or subtracts lines from a given page} | 9606 | % \changes{v1.5}{2024/05/25}{adds or subtracts lines from a given page} |
9607 | % Unlike \cs{localmaxlines}, \cs{addtomaxlines}\meta{n} takes as | 9607 | % Unlike \cs{localmaxlines}, \cs{addtomaxlines}\meta{n} takes as |
9608 | % argument the number of lines one wishes to add or substract from the | 9608 | % argument the number of lines one wishes to add or substract from the |
9609 | % number that has been set by \cs{setmaxlines}. As a result, \meta{n} | 9609 | % number that has been set by \cs{setmaxlines}. As a result, \meta{n} |
@@ -9616,7 +9616,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
9616 | % \end{macrocode} | 9616 | % \end{macrocode} |
9617 | % \end{macro} | 9617 | % \end{macro} |
9618 | % \begin{macro}{\nomaxlines} | 9618 | % \begin{macro}{\nomaxlines} |
9619 | % \changes{v1.5}{2023/07/29}{unsets \cs{setmaxlines}} | 9619 | % \changes{v1.5}{2024/05/25}{unsets \cs{setmaxlines}} |
9620 | % \cs{nomaxlines} unsets any limit previously set by \cs{setmaxlines}. | 9620 | % \cs{nomaxlines} unsets any limit previously set by \cs{setmaxlines}. |
9621 | % \begin{macrocode} | 9621 | % \begin{macrocode} |
9622 | \def\nomaxlines{\luadirect{tex.sprint(ekdosis.resetlocalmaxlines())}} | 9622 | \def\nomaxlines{\luadirect{tex.sprint(ekdosis.resetlocalmaxlines())}} |
@@ -9680,7 +9680,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
9680 | % \end{macrocode} | 9680 | % \end{macrocode} |
9681 | % \end{macro} | 9681 | % \end{macro} |
9682 | % \begin{macro}{\App} | 9682 | % \begin{macro}{\App} |
9683 | % \changes{v1.5}{2023/07/29}{To be used conjointly with | 9683 | % \changes{v1.5}{2024/05/25}{To be used conjointly with |
9684 | % \texttt{ekdosis.el}} | 9684 | % \texttt{ekdosis.el}} |
9685 | % In contrast to \cs{app}, \cs{App} takes two mandatory arguments and | 9685 | % In contrast to \cs{app}, \cs{App} takes two mandatory arguments and |
9686 | % accepts one optional argument like so: | 9686 | % accepts one optional argument like so: |
@@ -10157,7 +10157,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
10157 | \unless\ifekdl@nonum\current@ref\fi | 10157 | \unless\ifekdl@nonum\current@ref\fi |
10158 | \relax | 10158 | \relax |
10159 | }%\hskip .25em}% | 10159 | }%\hskip .25em}% |
10160 | \else% | 10160 | \else |
10161 | \ifbool{al@rlmode}{% | 10161 | \ifbool{al@rlmode}{% |
10162 | \edef\lem@app{% | 10162 | \edef\lem@app{% |
10163 | % \hskip .75em | 10163 | % \hskip .75em |
@@ -10174,30 +10174,58 @@ Sample text with a \textcolor{red}{word} in red. | |||
10174 | \ifekdl@forcedelim\unexpanded\expandafter{\ekd@unit@delim}\fi | 10174 | \ifekdl@forcedelim\unexpanded\expandafter{\ekd@unit@delim}\fi |
10175 | \fi | 10175 | \fi |
10176 | \fi | 10176 | \fi |
10177 | \fi% | 10177 | \fi |
10178 | \unless\ifekdl@nonum\current@ref\fi%\hskip .25em | 10178 | \unless\ifekdl@nonum\current@ref\fi%\hskip .25em |
10179 | \ifdefined\ekdlr@alt% | 10179 | \ifdefined\ekdlr@alt% |
10180 | \ifdefined\ekdlr@post% | 10180 | \ifrtl@app |
10181 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | 10181 | \ifdefined\ekdlr@post% |
10182 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10182 | {\textdir TRT\unexpanded\expandafter{\ekd@lemmastyle}% | 10183 | {\textdir TRT\unexpanded\expandafter{\ekd@lemmastyle}% |
10183 | \unexpanded\expandafter{\ekdlr@alt}}% | 10184 | \unexpanded\expandafter{\ekdlr@alt}}% |
10184 | \ifdefined\ekdlr@pre% | 10185 | \ifdefined\ekdlr@pre% |
10185 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | 10186 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi |
10187 | \else | ||
10188 | \ifdefined\ekdlr@pre% | ||
10189 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | ||
10190 | {\textdir TRT\unexpanded\expandafter{\ekd@lemmastyle}% | ||
10191 | \unexpanded\expandafter{\ekdlr@alt}}% | ||
10192 | \ifdefined\ekdlr@post% | ||
10193 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10194 | \fi | ||
10186 | \else | 10195 | \else |
10187 | \ifdefined\ekdlr@post% | 10196 | \ifrtl@app |
10188 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | 10197 | \ifdefined\ekdlr@post% |
10198 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10189 | {\textdir TRT\unexpanded\expandafter{\ekd@lemmastyle}% | 10199 | {\textdir TRT\unexpanded\expandafter{\ekd@lemmastyle}% |
10190 | \unexpanded{#2}}% | 10200 | \unexpanded{#2}}% |
10191 | \ifdefined\ekdlr@pre% | 10201 | \ifdefined\ekdlr@pre% |
10192 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | 10202 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi |
10203 | \else | ||
10204 | \ifdefined\ekdlr@pre% | ||
10205 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | ||
10206 | {\textdir TRT\unexpanded\expandafter{\ekd@lemmastyle}% | ||
10207 | \unexpanded{#2}}% | ||
10208 | \ifdefined\ekdlr@post% | ||
10209 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10210 | \fi | ||
10211 | \fi | ||
10212 | \ifrtl@app | ||
10213 | \ifdefined\ekdlr@postwit% | ||
10214 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | ||
10215 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | ||
10216 | \ifdefined\ekdlr@prewit% | ||
10217 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | ||
10218 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10219 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10220 | \else | ||
10221 | \ifdefined\ekdlr@prewit% | ||
10222 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | ||
10223 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | ||
10224 | \ifdefined\ekdlr@postwit% | ||
10225 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | ||
10226 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10227 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10193 | \fi | 10228 | \fi |
10194 | \ifdefined\ekdlr@postwit% | ||
10195 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | ||
10196 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10197 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10198 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | ||
10199 | \ifdefined\ekdlr@prewit% | ||
10200 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | ||
10201 | \ifekdl@nosep\else\unexpanded\expandafter{\ekdl@sep}\fi | 10229 | \ifekdl@nosep\else\unexpanded\expandafter{\ekdl@sep}\fi |
10202 | }% | 10230 | }% |
10203 | }% | 10231 | }% |
@@ -10244,10 +10272,10 @@ Sample text with a \textcolor{red}{word} in red. | |||
10244 | \ifdefined\ekdlr@prewit% | 10272 | \ifdefined\ekdlr@prewit% |
10245 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | 10273 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi |
10246 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | 10274 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi |
10247 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10248 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10249 | \ifdefined\ekdlr@postwit% | 10275 | \ifdefined\ekdlr@postwit% |
10250 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | 10276 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi |
10277 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10278 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10251 | \ifekdl@nosep\else\unexpanded\expandafter{\ekdl@sep}\fi | 10279 | \ifekdl@nosep\else\unexpanded\expandafter{\ekdl@sep}\fi |
10252 | }% | 10280 | }% |
10253 | }% | 10281 | }% |
@@ -10294,27 +10322,55 @@ Sample text with a \textcolor{red}{word} in red. | |||
10294 | \unless\ifekdr@nosubsep\unexpanded\expandafter{\ekdr@subsep}\fi | 10322 | \unless\ifekdr@nosubsep\unexpanded\expandafter{\ekdr@subsep}\fi |
10295 | \fi | 10323 | \fi |
10296 | \ifdefined\ekdlr@alt% | 10324 | \ifdefined\ekdlr@alt% |
10297 | \ifdefined\ekdlr@post% | 10325 | \ifrtl@app |
10298 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | 10326 | \ifdefined\ekdlr@post% |
10327 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10299 | {\textdir TRT\unexpanded\expandafter{\ekd@readingstyle}% | 10328 | {\textdir TRT\unexpanded\expandafter{\ekd@readingstyle}% |
10300 | \unexpanded\expandafter{\ekdlr@alt}}% | 10329 | \unexpanded\expandafter{\ekdlr@alt}}% |
10301 | \ifdefined\ekdlr@pre% | 10330 | \ifdefined\ekdlr@pre% |
10302 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | 10331 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi |
10332 | \else | ||
10333 | \ifdefined\ekdlr@pre% | ||
10334 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | ||
10335 | {\textdir TRT\unexpanded\expandafter{\ekd@readingstyle}% | ||
10336 | \unexpanded\expandafter{\ekdlr@alt}}% | ||
10337 | \ifdefined\ekdlr@post% | ||
10338 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10339 | \fi | ||
10303 | \else | 10340 | \else |
10304 | \ifdefined\ekdlr@post% | 10341 | \ifrtl@app |
10305 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | 10342 | \ifdefined\ekdlr@post% |
10343 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10306 | {\textdir TRT\unexpanded\expandafter{\ekd@readingstyle}% | 10344 | {\textdir TRT\unexpanded\expandafter{\ekd@readingstyle}% |
10307 | \unexpanded{#2}}% | 10345 | \unexpanded{#2}}% |
10308 | \ifdefined\ekdlr@pre% | 10346 | \ifdefined\ekdlr@pre% |
10309 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | 10347 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi |
10348 | \else | ||
10349 | \ifdefined\ekdlr@pre% | ||
10350 | \space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi | ||
10351 | {\textdir TRT\unexpanded\expandafter{\ekd@readingstyle}% | ||
10352 | \unexpanded{#2}}% | ||
10353 | \ifdefined\ekdlr@post% | ||
10354 | \space\unexpanded\expandafter{\ekdlr@post}\space\else\fi | ||
10355 | \fi | ||
10356 | \fi | ||
10357 | \ifrtl@app | ||
10358 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10359 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10360 | \ifdefined\ekdlr@postwit% | ||
10361 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | ||
10362 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | ||
10363 | \ifdefined\ekdlr@prewit% | ||
10364 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | ||
10365 | \else | ||
10366 | \ifdefined\ekdlr@prewit% | ||
10367 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | ||
10368 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | ||
10369 | \ifdefined\ekdlr@postwit% | ||
10370 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | ||
10371 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10372 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10310 | \fi | 10373 | \fi |
10311 | \ifdefined\ekdlr@postwit% | ||
10312 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | ||
10313 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10314 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10315 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | ||
10316 | \ifdefined\ekdlr@prewit% | ||
10317 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | ||
10318 | }% | 10374 | }% |
10319 | }% | 10375 | }% |
10320 | {% | 10376 | {% |
@@ -10346,10 +10402,10 @@ Sample text with a \textcolor{red}{word} in red. | |||
10346 | \ifdefined\ekdlr@prewit% | 10402 | \ifdefined\ekdlr@prewit% |
10347 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi | 10403 | \space\unexpanded\expandafter{\ekdlr@prewit}\space\else\fi |
10348 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi | 10404 | \ifdefined\ekdlr@wit\space\getsiglum{\ekdlr@wit}\else\fi |
10349 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10350 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10351 | \ifdefined\ekdlr@postwit% | 10405 | \ifdefined\ekdlr@postwit% |
10352 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi | 10406 | \space\unexpanded\expandafter{\ekdlr@postwit}\else\fi |
10407 | \ifdefined\ekdlr@source\space\getsiglum{\ekdlr@source}\else\fi | ||
10408 | \ifdefined\ekdlr@resp\space\getsiglum{\ekdlr@resp}\else\fi | ||
10353 | }% | 10409 | }% |
10354 | }% | 10410 | }% |
10355 | \ifekd@mapps | 10411 | \ifekd@mapps |
@@ -10609,7 +10665,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
10609 | } | 10665 | } |
10610 | % \end{macrocode} | 10666 | % \end{macrocode} |
10611 | % \begin{macro}{\SetFootnotes} | 10667 | % \begin{macro}{\SetFootnotes} |
10612 | % \changes{v1.5}{2023/07/29}{footnotes combined into a single | 10668 | % \changes{v1.5}{2024/05/25}{footnotes combined into a single |
10613 | % paragraph} \cs{SetFootnotes}\marg{options} can be used in the | 10669 | % paragraph} \cs{SetFootnotes}\marg{options} can be used in the |
10614 | % preamble or at any point of the document. |layout=paragraph| | 10670 | % preamble or at any point of the document. |layout=paragraph| |
10615 | % instructs \pkg{ekdosis} to combine all footnotes into a single | 10671 | % instructs \pkg{ekdosis} to combine all footnotes into a single |
@@ -10840,7 +10896,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
10840 | % \end{macro} | 10896 | % \end{macro} |
10841 | % \paragraph{Lacunae} | 10897 | % \paragraph{Lacunae} |
10842 | % \begin{macro}{\ilabel} | 10898 | % \begin{macro}{\ilabel} |
10843 | % \changes{v1.5}{2023/07/29}{recalls and sets the ending label of | 10899 | % \changes{v1.5}{2024/05/25}{recalls and sets the ending label of |
10844 | % lemmas used to mark lacunae in witnesses} When \cs{lem} has been | 10900 | % lemmas used to mark lacunae in witnesses} When \cs{lem} has been |
10845 | % used with the optional argument |ilabel=<label>|, | 10901 | % used with the optional argument |ilabel=<label>|, |
10846 | % \cs{ilabel}\marg{label} must be used to mark the point where the | 10902 | % \cs{ilabel}\marg{label} must be used to mark the point where the |
@@ -11175,7 +11231,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
11175 | % \end{macrocode} | 11231 | % \end{macrocode} |
11176 | % \end{macro} | 11232 | % \end{macro} |
11177 | % \begin{macro}{\ekdEOprint} | 11233 | % \begin{macro}{\ekdEOprint} |
11178 | % \changes{v1.5}{2023/07/29}{Sets headers and footers on | 11234 | % \changes{v1.5}{2024/05/25}{Sets headers and footers on |
11179 | % \enquote{paired} facing pages} | 11235 | % \enquote{paired} facing pages} |
11180 | % To set headers and footers on \enquote{paired} facing pages, | 11236 | % To set headers and footers on \enquote{paired} facing pages, |
11181 | % \cs{ekdEOprint} accepts two mandatory, self-evident arguments, like | 11237 | % \cs{ekdEOprint} accepts two mandatory, self-evident arguments, like |
@@ -11215,7 +11271,7 @@ Sample text with a \textcolor{red}{word} in red. | |||
11215 | % counter to set the value of the page numbers. This counter should be | 11271 | % counter to set the value of the page numbers. This counter should be |
11216 | % incremented every two pages. | 11272 | % incremented every two pages. |
11217 | % \begin{counter}{pairedpage} | 11273 | % \begin{counter}{pairedpage} |
11218 | % \changes{v1.5}{2023/07/29}{A counter incremented every two pages} | 11274 | % \changes{v1.5}{2024/05/25}{A counter incremented every two pages} |
11219 | % |pairedpage| is first set as a global counter:--- | 11275 | % |pairedpage| is first set as a global counter:--- |
11220 | % \begin{macrocode} | 11276 | % \begin{macrocode} |
11221 | \newcounter{pairedpage} | 11277 | \newcounter{pairedpage} |
@@ -11223,19 +11279,19 @@ Sample text with a \textcolor{red}{word} in red. | |||
11223 | % \end{macrocode} | 11279 | % \end{macrocode} |
11224 | % \end{counter} | 11280 | % \end{counter} |
11225 | % \begin{macro}{\setpairedpagenum} | 11281 | % \begin{macro}{\setpairedpagenum} |
11226 | % \changes{v1.5}{2023/07/29}{sets the same page number on paired | 11282 | % \changes{v1.5}{2024/05/25}{sets the same page number on paired |
11227 | % pages} \cs{setpairedpagenum}\marg{number} is used just ahead of | 11283 | % pages} \cs{setpairedpagenum}\marg{number} is used just ahead of |
11228 | % the alignment environment to set the number of the first left-hand | 11284 | % the alignment environment to set the number of the first left-hand |
11229 | % paired page. | 11285 | % paired page. |
11230 | % \begin{macro}{\setpairedpage} | 11286 | % \begin{macro}{\setpairedpage} |
11231 | % \changes{v1.5}{2023/07/29}{sets the page number of the first paired | 11287 | % \changes{v1.5}{2024/05/25}{sets the page number of the first paired |
11232 | % page} \cs{setpairedpage} is an argument-less command meant to be | 11288 | % page} \cs{setpairedpage} is an argument-less command meant to be |
11233 | % issued in commands used to set headers or footers before | 11289 | % issued in commands used to set headers or footers before |
11234 | % \cs{thepage}. This command has the counter |pairedpage| | 11290 | % \cs{thepage}. This command has the counter |pairedpage| |
11235 | % incremented on right-hand pages only, and sets |page| $\leftarrow$ | 11291 | % incremented on right-hand pages only, and sets |page| $\leftarrow$ |
11236 | % |pairedpage| on every page. | 11292 | % |pairedpage| on every page. |
11237 | % \begin{macro}{\resetpagenumber} | 11293 | % \begin{macro}{\resetpagenumber} |
11238 | % \changes{v1.5}{2023/07/29}{resets normal running page numbers} | 11294 | % \changes{v1.5}{2024/05/25}{resets normal running page numbers} |
11239 | % \cs{resetpagenumber} must be used right out of \enquote{mirrored} | 11295 | % \cs{resetpagenumber} must be used right out of \enquote{mirrored} |
11240 | % paired pages alignment environments. This argument-less command | 11296 | % paired pages alignment environments. This argument-less command |
11241 | % corrects any numbering error on the page following the edition | 11297 | % corrects any numbering error on the page following the edition |
@@ -2,7 +2,7 @@ | |||
2 | ;; This file is part of the `ekdosis' package | 2 | ;; This file is part of the `ekdosis' package |
3 | 3 | ||
4 | ;; ekdosis -- TEI xml compliant critical editions | 4 | ;; ekdosis -- TEI xml compliant critical editions |
5 | ;; Copyright (C) 2020, 2021, 2022, 2023 Robert Alessi | 5 | ;; Copyright (C) 2020, 2021, 2022, 2023, 2024 Robert Alessi |
6 | ;; <alessi@robertalessi.net> | 6 | ;; <alessi@robertalessi.net> |
7 | 7 | ||
8 | ;; Permission to use, copy, modify, and distribute this software for | 8 | ;; Permission to use, copy, modify, and distribute this software for |
diff --git a/ekdosis.ins b/ekdosis.ins index dcbcadd..1435605 100644 --- a/ekdosis.ins +++ b/ekdosis.ins | |||
@@ -12,7 +12,7 @@ License:| Released under the OpenBSD license | |||
12 | This file is part of the `ekdosis' package | 12 | This file is part of the `ekdosis' package |
13 | 13 | ||
14 | ekdosis -- Typesetting TEI xml compliant critical editions | 14 | ekdosis -- Typesetting TEI xml compliant critical editions |
15 | Copyright (C) 2020, 2021, 2022, 2023 Robert Alessi | 15 | Copyright (C) 2020, 2021, 2022, 2023, 2024 Robert Alessi |
16 | <alessi@robertalessi.net> | 16 | <alessi@robertalessi.net> |
17 | 17 | ||
18 | Permission to use, copy, modify, and distribute this software for any | 18 | Permission to use, copy, modify, and distribute this software for any |