diff options
-rw-r--r-- | ekdosis.dtx | 32 | ||||
-rw-r--r-- | ekdosis.el | 3 |
2 files changed, 30 insertions, 5 deletions
diff --git a/ekdosis.dtx b/ekdosis.dtx index 1983e56..5b5fed9 100644 --- a/ekdosis.dtx +++ b/ekdosis.dtx | |||
@@ -7172,7 +7172,8 @@ Sample text with a \textcolor{red}{word} in red. | |||
7172 | store collection = \collection@value, | 7172 | store collection = \collection@value, |
7173 | store idno = \idno@value, | 7173 | store idno = \idno@value, |
7174 | store msName = \msName@value, | 7174 | store msName = \msName@value, |
7175 | store origDate = \origDate@value | 7175 | store origDate = \origDate@value, |
7176 | store locus = \locus@value | ||
7176 | } | 7177 | } |
7177 | % \end{macrocode} | 7178 | % \end{macrocode} |
7178 | % \begin{macro}{\DeclareWitness} \cs{DeclareWitness} is a | 7179 | % \begin{macro}{\DeclareWitness} \cs{DeclareWitness} is a |
@@ -7195,7 +7196,8 @@ Sample text with a \textcolor{red}{word} in red. | |||
7195 | \luastringO{\collection@value}, | 7196 | \luastringO{\collection@value}, |
7196 | \luastringO{\idno@value}, | 7197 | \luastringO{\idno@value}, |
7197 | \luastringO{\msName@value}, | 7198 | \luastringO{\msName@value}, |
7198 | \luastringO{\origDate@value})} | 7199 | \luastringO{\origDate@value}, |
7200 | \luastringO{\locus@value})} | ||
7199 | \egroup | 7201 | \egroup |
7200 | } | 7202 | } |
7201 | \@onlypreamble\DeclareWitness | 7203 | \@onlypreamble\DeclareWitness |
@@ -9261,7 +9263,8 @@ function ekdosis.newwitness(id, | |||
9261 | Collection, | 9263 | Collection, |
9262 | Idno, | 9264 | Idno, |
9263 | MsName, | 9265 | MsName, |
9264 | OrigDate) | 9266 | OrigDate, |
9267 | Locus) | ||
9265 | if xmlidfound(id) | 9268 | if xmlidfound(id) |
9266 | then | 9269 | then |
9267 | tex.print("\\unexpanded{\\PackageWarning{ekdosis}{\"" | 9270 | tex.print("\\unexpanded{\\PackageWarning{ekdosis}{\"" |
@@ -9297,6 +9300,10 @@ function ekdosis.newwitness(id, | |||
9297 | listWit[indexwit].history = {} | 9300 | listWit[indexwit].history = {} |
9298 | listWit[indexwit].history.origin = {origDate = OrigDate} | 9301 | listWit[indexwit].history.origin = {origDate = OrigDate} |
9299 | end | 9302 | end |
9303 | if Locus ~= "" then | ||
9304 | listWit[indexwit].msContents = {} | ||
9305 | listWit[indexwit].msContents.msItem = {locus = Locus} | ||
9306 | end | ||
9300 | end | 9307 | end |
9301 | return true | 9308 | return true |
9302 | end | 9309 | end |
@@ -10477,7 +10484,14 @@ function ekdosis.openteistream() | |||
10477 | end | 10484 | end |
10478 | f:write("</handDesc>", "\n") | 10485 | f:write("</handDesc>", "\n") |
10479 | f:write("</physDesc>", "\n") | 10486 | f:write("</physDesc>", "\n") |
10480 | else end | 10487 | else end |
10488 | if listWit[i].msContents ~= nil then | ||
10489 | f:write("<msContents>", "\n") | ||
10490 | f:write("<msItem>", "\n") | ||
10491 | f:write("<locus>", textotei(listWit[i].msContents.msItem.locus), "</locus>", "\n") | ||
10492 | f:write("</msItem>", "\n") | ||
10493 | f:write("</msContents>", "\n") | ||
10494 | end | ||
10481 | if listWit[i].history ~= nil then | 10495 | if listWit[i].history ~= nil then |
10482 | f:write("<history>", "\n") | 10496 | f:write("<history>", "\n") |
10483 | f:write("<origin>", "\n") | 10497 | f:write("<origin>", "\n") |
@@ -10618,7 +10632,15 @@ function ekdosis.basic_cs(msid) | |||
10618 | else | 10632 | else |
10619 | date = "" | 10633 | date = "" |
10620 | end | 10634 | end |
10621 | return siglum.."&"..name.."&"..date | 10635 | if listWit[indexwit].msContents ~= nil |
10636 | and | ||
10637 | listWit[indexwit].msContents.msItem ~= nil | ||
10638 | then | ||
10639 | locus = listWit[indexwit].msContents.msItem.locus | ||
10640 | else | ||
10641 | locus = "" | ||
10642 | end | ||
10643 | return siglum.."&"..name.."\\space "..locus.."&"..date | ||
10622 | end | 10644 | end |
10623 | -- end basic TeX Conspectus siglorum | 10645 | -- end basic TeX Conspectus siglorum |
10624 | 10646 | ||
@@ -120,6 +120,9 @@ | |||
120 | (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list) | 120 | (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list) |
121 | '("[l]" ("linelabel")) | 121 | '("[l]" ("linelabel")) |
122 | t) | 122 | t) |
123 | (add-to-list (make-local-variable 'LaTeX-fold-macro-spec-list) | ||
124 | '("{{1}}" ("surplus")) | ||
125 | t) | ||
123 | ;; This package relies on lualatex, so check for it: | 126 | ;; This package relies on lualatex, so check for it: |
124 | (TeX-check-engine-add-engines 'luatex) | 127 | (TeX-check-engine-add-engines 'luatex) |
125 | (TeX-add-symbols | 128 | (TeX-add-symbols |