aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ekdosis.dtx41
1 files changed, 22 insertions, 19 deletions
diff --git a/ekdosis.dtx b/ekdosis.dtx
index 0840527..00862b8 100644
--- a/ekdosis.dtx
+++ b/ekdosis.dtx
@@ -388,8 +388,9 @@ idno={}, msName={}, origDate={}][3]{%
388 |\luastringN|{\commandkey{msName}}, 388 |\luastringN|{\commandkey{msName}},
389 |\luastringN|{\commandkey{origDate}})} 389 |\luastringN|{\commandkey{origDate}})}
390} 390}
391\NewDocumentCommand{\DeclareNewWitness}{m m O{} +O{}}{% 391\NewDocumentCommand{\DeclareNewWitness}{m m m o}{%
392 \declare@new@witness[#3]{#1}{#2}{#4} 392 \IfNoValueTF{#4}{\declare@new@witness{#1}{#2}{#3}}
393 {\declare@new@witness[#4]{#1}{#2}{#3}}
393} 394}
394\@onlypreamble\DeclareNewWitness 395\@onlypreamble\DeclareNewWitness
395\NewDocumentCommand{\DeclareNewHand}{m m m +O{}}{ 396\NewDocumentCommand{\DeclareNewHand}{m m m +O{}}{
@@ -723,13 +724,13 @@ function ekdosis.newwitness(id,
723 table.sort(idsRend, function(a ,b) return(#a.xmlid > #b.xmlid) end) 724 table.sort(idsRend, function(a ,b) return(#a.xmlid > #b.xmlid) end)
724 table.insert(listWit, {xmlid = id, 725 table.insert(listWit, {xmlid = id,
725 abbr = siglum, 726 abbr = siglum,
727 detailsDesc = description,
726 msIdentifier = { 728 msIdentifier = {
727 settlement = Settlement, 729 settlement = Settlement,
728 repository = Repository, 730 repository = Repository,
729 idno = Idno, 731 idno = Idno,
730 msName = MsName 732 msName = MsName}
731 }, 733 })
732 detailsDesc = description})
733 local indexwit = getindex(id, listWit) 734 local indexwit = getindex(id, listWit)
734 if OrigDate ~= "" then 735 if OrigDate ~= "" then
735 listWit[indexwit].history = {} 736 listWit[indexwit].history = {}
@@ -844,8 +845,8 @@ local cmdtotags = {
844 {a="textsc", b="hi", c=" rend=\"smallcaps\""}, 845 {a="textsc", b="hi", c=" rend=\"smallcaps\""},
845 {a="textsf", b="hi", c=" rend=\"sf\""}, 846 {a="textsf", b="hi", c=" rend=\"sf\""},
846 {a="arbup", b="hi", c=" rend=\"sup\""}, 847 {a="arbup", b="hi", c=" rend=\"sup\""},
847 {a="txarb", b="foreign", c=" xml:lang=\"arb\""}, 848 {a="txarb", b="s", c=" xml:lang=\"arb\""},
848 {a="arb", b="foreign", c=" xml:lang=\"arb-Latn\" type=\"arabtex\""} 849 {a="arb", b="s", c=" xml:lang=\"arb-Latn\" type=\"transliterated\" subtype=\"arabtex\""}
849} 850}
850 851
851function ekdosis.newcmdtotag(cmd, tag, attr) 852function ekdosis.newcmdtotag(cmd, tag, attr)
@@ -955,6 +956,7 @@ function ekdosis.openteistream()
955 for i = 1,#listWit do 956 for i = 1,#listWit do
956 f:write('<witness xml:id=\"', listWit[i].xmlid, "\">", "\n") 957 f:write('<witness xml:id=\"', listWit[i].xmlid, "\">", "\n")
957 f:write('<abbr type="siglum">', ekdosis.textotei(listWit[i].abbr), "</abbr>", "\n") 958 f:write('<abbr type="siglum">', ekdosis.textotei(listWit[i].abbr), "</abbr>", "\n")
959 f:write(ekdosis.textotei(listWit[i].detailsDesc), "\n")
958 f:write("<msDesc>", "\n") 960 f:write("<msDesc>", "\n")
959 if listWit[i].msIdentifier.settlement == "" 961 if listWit[i].msIdentifier.settlement == ""
960 and listWit[i].msIdentifier.repository == "" 962 and listWit[i].msIdentifier.repository == ""
@@ -1007,9 +1009,9 @@ function ekdosis.openteistream()
1007 f:write("</origin>", "\n") 1009 f:write("</origin>", "\n")
1008 f:write("</history>", "\n") 1010 f:write("</history>", "\n")
1009 end 1011 end
1010 if listWit[i].detailsDesc == "" then else 1012 -- if listWit[i].detailsDesc == "" then else
1011 f:write("<p>", ekdosis.textotei(listWit[i].detailsDesc), "</p>", "\n") 1013 -- f:write("<p>", ekdosis.textotei(listWit[i].detailsDesc), "</p>", "\n")
1012 end 1014 -- end
1013 f:write("</msDesc>", "\n") 1015 f:write("</msDesc>", "\n")
1014 f:write("</witness>", "\n") 1016 f:write("</witness>", "\n")
1015 end 1017 end
@@ -1073,15 +1075,16 @@ end
1073function ekdosis.basic_cs(msid) 1075function ekdosis.basic_cs(msid)
1074 local indexwit = getindex(msid, listWit) 1076 local indexwit = getindex(msid, listWit)
1075 siglum = listWit[indexwit].abbr 1077 siglum = listWit[indexwit].abbr
1076 if listWit[indexwit].detailsDesc == "" 1078 -- if listWit[indexwit].detailsDesc == ""
1077 then 1079 -- then
1078 name = listWit[indexwit].msIdentifier.msName 1080 -- name = listWit[indexwit].msIdentifier.msName
1079 else 1081 -- else
1080 name = listWit[indexwit].msIdentifier.msName 1082 -- name = listWit[indexwit].msIdentifier.msName
1081 .."\\thinspace\\newline\\bgroup\\footnotesize{}".. 1083 -- .."\\thinspace\\newline\\bgroup\\footnotesize{}"..
1082 listWit[indexwit].detailsDesc 1084 -- listWit[indexwit].detailsDesc
1083 .."\\egroup{}" 1085 -- .."\\egroup{}"
1084 end 1086 -- end
1087 name = listWit[indexwit].detailsDesc
1085 if listWit[indexwit].history ~= nil 1088 if listWit[indexwit].history ~= nil
1086 and 1089 and
1087 listWit[indexwit].history.origin ~= nil 1090 listWit[indexwit].history.origin ~= nil