diff --git a/css/eupt.interactive.css b/css/eupt.interactive.css index f902c5b108c1d8819aaf4527cb51fb4a876443e1..a7d6979cc0adb0bb404a70db2c9e4e50bd99dcdc 100644 --- a/css/eupt.interactive.css +++ b/css/eupt.interactive.css @@ -44,10 +44,10 @@ philology notes > note[type]:focus::before(90) { content: oxy_popup( edit, '@type', - values, "con, lx, gr, rek", - labels, "Inhalt, Lexik, Grammatik, Rekonstruktion", + values, "con, lx, gr, poet, rek", + labels, "Inhalt, Lexik, Grammatik, Poetologie, Rekonstruktion", fontInherit, true, - selectionMode, single + selectionMode, multiple ) ": "; } \ No newline at end of file diff --git a/schema/edxml.rng b/schema/edxml.rng index a769b09582c03b007f4844ec8bb6e76d584260ee..9fd72a43ef04f71b855f59afdebd9aa2fc2a8e1f 100644 --- a/schema/edxml.rng +++ b/schema/edxml.rng @@ -511,10 +511,7 @@ </attribute> </optional> <interleave> - <!-- MFZ, 2024-04-05: Eigentlich könnten wir ja alles außer elem.hi, elem.p, elem.quote, elem.ugarit und elem.meta.bibl aus dieser Liste rausnehmen, oder?! --> - <zeroOrMore> - <ref name="model.transcriptional"/> - </zeroOrMore> + <!-- MFZ, 2024-04-05: Eigentlich könnten wir ja alles außer elem.hi, elem.p, elem.quote, elem.transcription, elem.textblock und elem.meta.bibl aus dieser Liste rausnehmen, oder?! --> <zeroOrMore> <ref name="elem.ana"/> </zeroOrMore> @@ -524,17 +521,14 @@ <zeroOrMore> <ref name="elem.p"/> </zeroOrMore> - <zeroOrMore> - <ref name="elem.phr"/> - </zeroOrMore> <zeroOrMore> <ref name="elem.quote"/> </zeroOrMore> <zeroOrMore> - <ref name="elem.ugarit"/> + <ref name="elem.textBlockTransliteration"/> </zeroOrMore> <zeroOrMore> - <ref name="elem.w"/> + <ref name="elem.textBlockVocalisation"/> </zeroOrMore> <zeroOrMore> <ref name="elem.meta.bibl"/> @@ -660,7 +654,10 @@ <ref name="elem.quote"/> </zeroOrMore> <zeroOrMore> - <ref name="elem.ugarit"/> + <ref name="elem.textBlockTransliteration"/> + </zeroOrMore> + <zeroOrMore> + <ref name="elem.textBlockVocalisation"/> </zeroOrMore> <zeroOrMore> <ref name="elem.w"/> @@ -878,6 +875,38 @@ </element> </define> + <define name="elem.textBlockTransliteration"> + <element name="textBlockTransliteration"> + <zeroOrMore> + <!-- Wie definiere ich, dass man entweder n-Anzahl von column oder von elem.line oder von model.line.inline oder von model.line.globals verwenden darf? --> + <element name="column"> + <!-- Das hier als eigenes Element definieren?! --> + <ref name="model.include"/> + <attribute name="n"/> + <interleave> + <oneOrMore> + <ref name="elem.line"/> + </oneOrMore> + <zeroOrMore> + <ref name="elem.metamark"/> + </zeroOrMore> + </interleave> + </element> + <ref name="elem.line"/> + <ref name="model.line.inline"/> + <ref name="model.line.globals"/> + </zeroOrMore> + </element> + </define> + + <define name="elem.textBlockVocalisation"> + <element name="textBlockVocalisation"> + <zeroOrMore> + <ref name="model.philological.translit"/> + </zeroOrMore> + </element> + </define> + <define name="elem.title"> <element name="title"> <text/> @@ -910,32 +939,6 @@ </element> </define> - <define name="elem.ugarit"> - <element name="ugarit"> - <interleave> - <zeroOrMore> - <ref name="model.transcriptional"/> - </zeroOrMore> - <zeroOrMore> - <ref name="elem.hi"/> - </zeroOrMore> - <zeroOrMore> - <ref name="elem.lb"/> - </zeroOrMore> - <zeroOrMore> - <ref name="elem.phr"/> - </zeroOrMore> - <zeroOrMore> - <ref name="elem.w"/> - </zeroOrMore> - <zeroOrMore> - <ref name="elem.meta.bibl"/> - </zeroOrMore> - <text/> - </interleave> - </element> - </define> - <define name="elem.unit"> <element name="unit"> <ref name="attr.xml.id"/>