Skip to content
Snippets Groups Projects
Commit 387ceb45 authored by Max-Ferdinand Zeterberg's avatar Max-Ferdinand Zeterberg
Browse files

Merge branch 'master' into '8-certainty-fur-mehr-elemente' 

# Conflicts:
#   schema/edxml.rng
parents 65e4a51a 2e515d55
No related branches found
No related tags found
1 merge request!17Resolve "Certainty für mehr Elemente"
Hide whitespace changes
Inline Side-by-side
css/eupt.interactive.css
+ 3
− 3
View file @ 387ceb45
......@@ -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
samples/2024-04-09.c_KTU_1.14_II.include.xml 0 → 100644
+ 2681
− 0
View file @ 387ceb45
Source diff could not be displayed: it is too large. Options to address this: view the blob.
scenarios/xslt/edxml2html/css/styles.css
+ 35
− 28
View file @ 387ceb45
......@@ -7,7 +7,9 @@
--theme-color: #266d4d;
--theme-color-light: #adbac7;
--theme-color-light-bg: rgba(173, 186, 199, 0.185);
--theme-color-compl: #a63a6b;
--tech-font: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
--mono-font: monospace;
}
......@@ -30,7 +32,7 @@
/*----------------------------------{ FACSIMILE }--------------------------------*/
.facsimile,
.section {
margin: 3em 4em;
margin: 0em 0em;
}
......@@ -241,7 +243,6 @@ hr.metamark-line.doubleLine {
/*----------------------------------{ ITEMS }--------------------------------*/
.item {
display: inline-block;
vertical-align: top;
}
......@@ -305,12 +306,12 @@ div:has(> .philology.section) {
overflow: hidden;
}
.note {
.bibl, .note {
display: block;
position: relative;
}
.note .notetext {
.bibl .bibl-long, .note .notetext {
&::-webkit-scrollbar {
display: none; /* Safari and Chrome */
}
......@@ -333,7 +334,7 @@ div:has(> .philology.section) {
z-index: 1;
}
.note:hover .notetext {
.bibl:hover .bibl-long, .note:hover .notetext {
visibility: visible;
}
......@@ -346,20 +347,26 @@ div:has(> .philology.section) {
/*::::::::::::::::::::::::::::::::::{ TEI: Transcriptional }::::::::::::::::::::::::::::::::*/
.g[data-cert="uncertain"]:after {
content: "?";
font-size: small;
vertical-align: super;
:has(> .conti)::before,
:has(> .conti)::after,
.g[data-cert="uncertain"]::after,
.tei::before,
.tei::after {
color: var(--theme-color-compl);
}
.surface .tei::before,
.surface .tei::after {
color: brown;
.body:hover, .seg:hover {
.g[data-cert="uncertain"]::after,
.tei::before,
.tei::after {
color: white;
}
}
.seg:hover .tei::before,
.seg:hover .tei::after {
color: white;
.g[data-cert="uncertain"]::after {
content: "?";
font-size: small;
vertical-align: super;
}
.tei.add::before { content: "("; }
......@@ -375,30 +382,30 @@ corr::after { content: ">"; } */
display: none;
} */
.tei.damage::before { content: "["; }
.tei.damage::after { content: "]"; }
.damage::before { content: "["; }
.damage::after { content: "]"; }
.tei.damage[data-degree=low]::before {
.damage[data-degree=low]::before {
content: "⸢";
}
.tei.damage[data-degree=low]::after {
.damage[data-degree=low]::after {
content: "⸣";
}
.tei.damage[data-degree=medium]::before {
.damage[data-degree=medium]::before {
content: "[";
}
.tei.damage[data-degree=medium]::after {
.damage[data-degree=medium]::after {
content: "]";
}
.tei.del::before { content: "[["; }
.tei.del::after { content: "]]"; }
.del::before { content: "[["; }
.del::after { content: "]]"; }
.tei.supplied::before { content: "<"; }
.tei.supplied::after { content: ">"; }
.supplied::before { content: "<"; }
.supplied::after { content: ">"; }
.tei.surplus::before { content: "{"; }
.tei.surplus::after { content: "}"; }
\ No newline at end of file
.surplus::before { content: "{"; }
.surplus::after { content: "}"; }
\ No newline at end of file
scenarios/xslt/edxml2html/libs/html-philology.lib.xsl
+ 4
− 4
View file @ 387ceb45
......@@ -35,7 +35,7 @@
<xsl:variable name="id" select="if(@xml:id) then (@xml:id) else ('facs_'||generate-id(.))"/>
<xsl:variable name="corresp" select="if(@corresp) then (tokenize(@corresp, ' ')) else (false())"/>
<div class="unit" id="{$id}" data-corresp="{$corresp}">
<div class="container unit-container">
<div class="unit-container">
<!--<div class="anchor-container">
<a class="anchor" href="#{$id}">
<span class="unit-label">Kolon</span>
......@@ -105,13 +105,13 @@
<xsl:template match="philology//translation">
<div class="translation section-tab container">
<div class="translation section-tab">
<xsl:apply-templates select="@*|node()"/>
</div>
</xsl:template>
<xsl:template match="philology//translation" mode="table">
<td class="translation section-tab container">
<td class="translation section-tab">
<xsl:apply-templates select="@*|node()"/>
</td>
</xsl:template>
......@@ -141,7 +141,7 @@
<xsl:template match="philology//phr">
<xsl:variable name="id" select="if(@xml:id) then (@xml:id) else ('facs_'||generate-id(.))"/>
<xsl:variable name="corresp" select="if(@corresp) then (tokenize(@corresp, ' ')) else (false())"/>
<span class="phr container" id="{$id}">
<span class="phr" id="{$id}">
<xsl:apply-templates/>
</span>
</xsl:template>
......
schema/edxml.rng
+ 165
− 56
View file @ 387ceb45
......@@ -226,7 +226,23 @@
</element>
</define>
<define name="elem.column">
<element name="column">
<ref name="model.include"/>
<attribute name="n"/>
<interleave>
<oneOrMore>
<ref name="elem.line"/>
</oneOrMore>
<zeroOrMore>
<ref name="elem.note"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.metamark"/>
</zeroOrMore>
</interleave>
</element>
</define>
<define name="elem.div">
<element name="div">
......@@ -515,39 +531,29 @@
<optional>
<attribute name="type">
<list>
<choice>
<value>con</value>
<a:documentation>Inhalt</a:documentation>
<value>gr</value>
<a:documentation>Grammatik</a:documentation>
<value>lx</value>
<a:documentation>Lexik</a:documentation>
<value>rek</value>
<a:documentation>Rekonstruktion</a:documentation>
<value>str</value>
<a:documentation>Struktur</a:documentation>
</choice>
<oneOrMore>
<choice>
<value>con</value>
<a:documentation>Inhalt</a:documentation>
<value>gr</value>
<a:documentation>Grammatik</a:documentation>
<value>lx</value>
<a:documentation>Lexik</a:documentation>
<value>poet</value>
<a:documentation>Poetologie</a:documentation>
<value>rek</value>
<a:documentation>Rekonstruktion</a:documentation>
</choice>
</oneOrMore>
</list>
</attribute>
</optional>
<interleave>
<zeroOrMore>
<ref name="elem.hi"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.w"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.phr"/>
</zeroOrMore>
<choice>
<zeroOrMore>
<ref name="model.transcriptional"/>
<ref name="elem.p"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.meta.bibl"/>
</zeroOrMore>
<text/>
</interleave>
<ref name="model.pContentLike"></ref>
</choice>
<sch:pattern>
<sch:rule
context="edxml:note[not(ancestor::edxml:structure[@type='poetological'] or ancestor::edxml:surface)]">
......@@ -555,6 +561,11 @@
angebunden (sprich: Sie bezieht sich auf Nichts)!</sch:assert>
</sch:rule>
</sch:pattern>
<sch:pattern>
<sch:rule context="edxml:note">
<sch:report test="./ancestor::edxml:note" role="error">Note-Elemente dürfen nicht in Note-Elementen platziert werden (auch nicht als descendants)!</sch:report>
</sch:rule>
</sch:pattern>
</element>
</define>
......@@ -568,18 +579,7 @@
<define name="elem.p">
<element name="p">
<interleave>
<zeroOrMore>
<ref name="elem.ref"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.meta.bibl"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.hi"/>
</zeroOrMore>
<text/>
</interleave>
<ref name="model.pContentLike"></ref>
</element>
</define>
......@@ -695,6 +695,87 @@
</element>
</define>
<define name="elem.quote">
<element name="quote">
<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.quote"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.textBlock"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.w"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.meta.bibl"/>
</zeroOrMore>
<text/>
</interleave>
</element>
</define>
<define name="elem.relations">
<element name="relations">
<element name="head">
<text/>
</element>
<zeroOrMore>
<ref name="elem.relation"/>
</zeroOrMore>
</element>
</define>
<define name="elem.relation">
<element name="relation">
<attribute name="type"/>
<attribute name="source">
<data type="anyURI"/>
<sch:pattern>
<sch:rule context="edxml:relation/@source">
<sch:let name="id" value="substring-after(., '#')"/>
<sch:assert test="//*[@xml:id = $id]" role="error">(ID '<sch:value-of
select="$id"/>' gibt's nicht!): Die ID in @<sch:name/> gibt es in
diesem Dokument nicht!</sch:assert>
</sch:rule>
</sch:pattern>
</attribute>
<attribute name="target">
<data type="anyURI"/>
<sch:pattern>
<sch:rule context="edxml:relation/@target">
<sch:let name="id" value="substring-after(., '#')"/>
<sch:assert test="//*[@xml:id = $id]" role="error">(ID '<sch:value-of
select="$id"/>' gibt's nicht!): Die ID in @<sch:name/> gibt es in
diesem Dokument nicht!</sch:assert>
</sch:rule>
</sch:pattern>
</attribute>
<text/>
</element>
</define>
<define name="elem.ref">
<element name="ref">
<attribute name="target"/>
<text/>
</element>
</define>
<define name="elem.rendition">
<element name="rendition">
<ref name="attr.xml.id"/>
......@@ -806,21 +887,7 @@
<attribute name="n"/>
</optional>
<oneOrMore>
<element name="column">
<ref name="model.include"/>
<attribute name="n"/>
<interleave>
<oneOrMore>
<ref name="elem.line"/>
</oneOrMore>
<zeroOrMore>
<ref name="elem.note"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.metamark"/>
</zeroOrMore>
</interleave>
</element>
<ref name="elem.column"/>
</oneOrMore>
<optional>
<ref name="elem.notes"/>
......@@ -851,6 +918,24 @@
</element>
</define>
<define name="elem.textBlock">
<element name="textBlock">
<choice>
<group>
<choice>
<oneOrMore><ref name="elem.column"/></oneOrMore>
<oneOrMore><ref name="elem.line"/></oneOrMore>
<oneOrMore><ref name="model.line.inline"/></oneOrMore>
</choice>
</group>
<group>
<oneOrMore><ref name="model.philological.translit"/></oneOrMore>
</group>
</choice>
</element>
</define>
<define name="elem.title">
<element name="title">
<text/>
......@@ -1192,6 +1277,30 @@
<ref name="elem.note"/>
</choice>
</define>
<define name="model.pContentLike">
<interleave>
<zeroOrMore>
<ref name="elem.ana"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.hi"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.quote"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.ref"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.textBlock"/>
</zeroOrMore>
<zeroOrMore>
<ref name="elem.meta.bibl"/>
</zeroOrMore>
<text/>
</interleave>
</define>
<define name="model.philology">
<choice>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment