diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | ekdosis.dtx | 29 | ||||
-rw-r--r-- | ekdosis.ins | 12 |
3 files changed, 29 insertions, 14 deletions
@@ -17,7 +17,7 @@ sty: clean | |||
17 | $(CMP) $(NAME).ins | 17 | $(CMP) $(NAME).ins |
18 | 18 | ||
19 | $(NAME).pdf: $(NAME).dtx | 19 | $(NAME).pdf: $(NAME).dtx |
20 | $(CMP) --shell-escape -recorder -interaction=batchmode $(NAME)-ex.tex >/dev/null | 20 | # $(CMP) --shell-escape -recorder -interaction=batchmode $(NAME)-ex.tex >/dev/null |
21 | $(CMP) --shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null | 21 | $(CMP) --shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null |
22 | biber $(NAME) | 22 | biber $(NAME) |
23 | if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi | 23 | if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi |
diff --git a/ekdosis.dtx b/ekdosis.dtx index f0dc576..a96a2a8 100644 --- a/ekdosis.dtx +++ b/ekdosis.dtx | |||
@@ -430,7 +430,10 @@ along with this program. If not, see | |||
430 | % Right brace \} Tilde \~} | 430 | % Right brace \} Tilde \~} |
431 | % | 431 | % |
432 | % \GetFileInfo{\jobname.dtx} | 432 | % \GetFileInfo{\jobname.dtx} |
433 | % \DoNotIndex{\newcommand,\newenvironment} | 433 | % \DoNotIndex{\newcommand,\newenvironment,\begin,\begingroup} |
434 | % \DoNotIndex{\bgroup,\def,\edef,\egroup,\else,\expandafter} | ||
435 | % \DoNotIndex{\fi,\ifdefined,\luadirect,\luastring,\luastringN} | ||
436 | % \DoNotIndex{\luastringO,\NewDocumentCommand,\space,\unexpanded} | ||
434 | % | 437 | % |
435 | % \pdfbookmark[1]{\metaterm{title}}{title} | 438 | % \pdfbookmark[1]{\metaterm{title}}{title} |
436 | % \begin{tcolorbox}[ | 439 | % \begin{tcolorbox}[ |
@@ -796,7 +799,7 @@ along with this program. If not, see | |||
796 | % to do this.} | 799 | % to do this.} |
797 | % | 800 | % |
798 | % As an example, the following line loads \pkg{ekdosis} and instructs | 801 | % As an example, the following line loads \pkg{ekdosis} and instructs |
799 | % it to output a \texttt{TEI xml} file (in addition of the PDF one) | 802 | % it to output a \texttt{TEI xml} file (in addition to the PDF one) |
800 | % and to use \pkg{parnotes} to format with Roman numerals the footnotes | 803 | % and to use \pkg{parnotes} to format with Roman numerals the footnotes |
801 | % that are inserted in the apparatus criticus:--- | 804 | % that are inserted in the apparatus criticus:--- |
802 | % \iffalse | 805 | % \iffalse |
@@ -1253,7 +1256,7 @@ yesterday. | |||
1253 | \lem[wit=A,nolem]{met} | 1256 | \lem[wit=A,nolem]{met} |
1254 | \rdg[wit=B, alt={\emph{post} met \emph{add.} there}]{met | 1257 | \rdg[wit=B, alt={\emph{post} met \emph{add.} there}]{met |
1255 | there} | 1258 | there} |
1256 | \note*{Ms. B provides other additions of this kind.}}. | 1259 | \note*{Ms. \getsiglum{B} provides other additions of this kind.}}. |
1257 | \end{ekdosis} | 1260 | \end{ekdosis} |
1258 | \end{minted} | 1261 | \end{minted} |
1259 | % \iffalse | 1262 | % \iffalse |
@@ -1282,7 +1285,7 @@ yesterday. | |||
1282 | % \lem[wit=pjA,nolem]{met} | 1285 | % \lem[wit=pjA,nolem]{met} |
1283 | % \rdg[wit=pjB, alt={\emph{post} met \emph{add.} there}]{met | 1286 | % \rdg[wit=pjB, alt={\emph{post} met \emph{add.} there}]{met |
1284 | % there} | 1287 | % there} |
1285 | % \note*{Ms. B provides other additions of this kind.}}. | 1288 | % \note*{Ms. \getsiglum{pjB} provides other additions of this kind.}}. |
1286 | % \end{specimen} | 1289 | % \end{specimen} |
1287 | % \flushpage | 1290 | % \flushpage |
1288 | % \end{alignment} | 1291 | % \end{alignment} |
@@ -1333,8 +1336,9 @@ yesterday. | |||
1333 | <app> | 1336 | <app> |
1334 | <lem wit="#A">met</lem> | 1337 | <lem wit="#A">met</lem> |
1335 | <rdg wit="#B">met there</rdg> | 1338 | <rdg wit="#B">met there</rdg> |
1336 | <note>Ms. B provides some further additions of this | 1339 | <note>Ms. |
1337 | kind.</note> | 1340 | <ref target="#B">B</ref>provides other additions of |
1341 | this kind.</note> | ||
1338 | </app>.</p> | 1342 | </app>.</p> |
1339 | \end{minted} | 1343 | \end{minted} |
1340 | % \iffalse | 1344 | % \iffalse |
@@ -3659,9 +3663,18 @@ local function cmdtotei(str) | |||
3659 | str = string.gsub(str, "\\(linelabel)%s?(%b{})", | 3663 | str = string.gsub(str, "\\(linelabel)%s?(%b{})", |
3660 | function(cmd, body) | 3664 | function(cmd, body) |
3661 | body = string.sub(body, 2, -2) | 3665 | body = string.sub(body, 2, -2) |
3662 | body = cmdtotei(body) | 3666 | -- body = cmdtotei(body) |
3663 | return string.format("<anchor xml:id=\"%s\"/>", body) | 3667 | return string.format("<anchor xml:id=\"%s\"/>", body) |
3664 | end) | 3668 | end) |
3669 | str = string.gsub(str, "\\(getsiglum)%s?(%b{})", | ||
3670 | function(cmd, body) | ||
3671 | body = string.sub(body, 2, -2) | ||
3672 | teisiglum = ekdosis.getsiglum(body, "tei") | ||
3673 | printsiglum = ekdosis.getsiglum(body) | ||
3674 | -- body = cmdtotei(body) | ||
3675 | return string.format("<ref target=\"%s\">%s</ref>", | ||
3676 | teisiglum, printsiglum) | ||
3677 | end) | ||
3665 | str = string.gsub(str, "\\(%a+)%s?%*?(%b[])(%b{})", | 3678 | str = string.gsub(str, "\\(%a+)%s?%*?(%b[])(%b{})", |
3666 | function(cmd, opt, body) | 3679 | function(cmd, opt, body) |
3667 | body = string.sub(body, 2, -2) | 3680 | body = string.sub(body, 2, -2) |
@@ -4775,6 +4788,7 @@ end | |||
4775 | % \iffalse | 4788 | % \iffalse |
4776 | %<*examples> | 4789 | %<*examples> |
4777 | % \fi | 4790 | % \fi |
4791 | % \begin{comment} | ||
4778 | % \begin{minted}{latex} | 4792 | % \begin{minted}{latex} |
4779 | \documentclass[12pt]{article} | 4793 | \documentclass[12pt]{article} |
4780 | \usepackage{fontspec} | 4794 | \usepackage{fontspec} |
@@ -4803,6 +4817,7 @@ end | |||
4803 | 4817 | ||
4804 | \end{document} | 4818 | \end{document} |
4805 | % \end{minted} | 4819 | % \end{minted} |
4820 | % \end{comment} | ||
4806 | % \iffalse | 4821 | % \iffalse |
4807 | %</examples> | 4822 | %</examples> |
4808 | % \fi | 4823 | % \fi |
diff --git a/ekdosis.ins b/ekdosis.ins index b724b43..4085554 100644 --- a/ekdosis.ins +++ b/ekdosis.ins | |||
@@ -52,12 +52,12 @@ Running "make install" installs the files in the local TeX tree. | |||
52 | } | 52 | } |
53 | } | 53 | } |
54 | \egroup | 54 | \egroup |
55 | \usedir{doc/lualatex/ekdosis} | 55 | % \usedir{doc/lualatex/ekdosis} |
56 | \generate{ | 56 | % \generate{ |
57 | \file{ekdosis-ex.tex}{ | 57 | % \file{ekdosis-ex.tex}{ |
58 | \from{\jobname.dtx}{examples} | 58 | % \from{\jobname.dtx}{examples} |
59 | } | 59 | % } |
60 | } | 60 | % } |
61 | \usedir{doc/lualatex/ekdosis} | 61 | \usedir{doc/lualatex/ekdosis} |
62 | \generate{ | 62 | \generate{ |
63 | \file{README.txt}{\from{\jobname.dtx}{readme}} | 63 | \file{README.txt}{\from{\jobname.dtx}{readme}} |