Skip to content

GitLab

Commit 8af5a770 authored by MRodz's avatar MRodz Committed by mrodzis
Browse files

Extend first draft for 3.8.2.4. lists and add first draft for 3.8.2.5 table of contents

parent 692fea49
Hide whitespace changes
Inline Side-by-side
modules/fontane/teisimpleprint/tei2teisimple.xqm
View file @ 8af5a770
......@@ -217,6 +217,7 @@ declare function fontaneSimple:transform($nodes as node()*) as node()* {
else if($node/@type = "item" and not($node/@xml:id)) then
element tei:item {
$node/@rend,
fontaneSimple:transform($node/node())
}
......@@ -286,7 +287,6 @@ declare function fontaneSimple:transform($nodes as node()*) as node()* {
else if($node/@type = "said") then
if($node/@next) then
(: let $corresp := console:log($node/following::*[matches($node/@next, @xml:id)]):)
let $next := replace($node/@next, "#", "")
let $corresp := $node/following::*[@xml:id = $next]
return
......@@ -452,8 +452,8 @@ declare function fontaneSimple:transform($nodes as node()*) as node()* {
fontaneSimple:make-head($node)
else if($node/@type = "list" or $node/@type = "item") then
element {QName("http://www.tei-c.org/ns/1.0", $node/@type)}{
$node/(@* except (@type, @ulx, @uly, @lrx, @lry, @rotate)),
element {QName("http://www.tei-c.org/ns/1.0", $node/@type)} {
$node/(@xml:id, @rend, @rendition, @subtype, @prev, @next),
fontaneSimple:transform($node/node())
}
......@@ -481,7 +481,7 @@ declare function fontaneSimple:transform($nodes as node()*) as node()* {
else if($node/@type = "toc") then
element tei:list {
attribute type {"toc"},
$node/(@type, @subtype),
fontaneSimple:transform($node/node())
}
......@@ -820,4 +820,19 @@ element(tei:milestone) {
element tei:milestone {
attribute unit {"end-lg"}
}
};
declare function fontaneSimple:has-pb-inbetween($node as node(),
$corresp as node()*) as xs:boolean {
if($node/following::tei:surface[. << $corresp]) then
true()
else
false()
};
declare function fontaneSimple:separates-corresp-nodes($node as element(tei:surface))
as xs:boolean {
some $prev in $node/preceding::*[@next]
satisfies contains($prev/@next, $node/descendant::*/@xml:id)
or contains($prev/@next, $node/following::*/@xml:id)
};
\ No newline at end of file
modules/fontane/teisimpleprint/tests/teisimple-test.xql
View file @ 8af5a770
......@@ -226,6 +226,15 @@ declare
%test:name("Lists")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""list"" rend=""indent""><line xmlns=""http://www.tei-c.org/ns/1.0"" type=""item"">Ludwig der Springer,</line><line xmlns=""http://www.tei-c.org/ns/1.0"" type=""item"">Ludwig der Eiſerne,</line></zone>")
%test:assertEquals("<list xmlns=""http://www.tei-c.org/ns/1.0"" rend=""indent""><item xmlns=""http://www.tei-c.org/ns/1.0"">Ludwig der Springer,</item><item xmlns=""http://www.tei-c.org/ns/1.0"">Ludwig der Eiserne,</item></list>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0""><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""37v""><zone xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C08_37v_1"" next=""#C08_38r_1"" type=""list"" rend=""indent""><zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""item""><line xmlns=""http://www.tei-c.org/ns/1.0"">1. Mantegna:</line></zone></zone></surface><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""38r""><zone xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C08_38r_1"" prev=""#C08_37v_1"" type=""list"" rend=""indent""><zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""item""><line xmlns=""http://www.tei-c.org/ns/1.0"">4. Guercino:</line> </zone></zone></surface></zone>")
%test:assertEquals("<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""37v""/>", "<list xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C08_37v_1"" rend=""indent"" next=""#C08_38r_1""><item xmlns=""http://www.tei-c.org/ns/1.0""><milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""line""/>1. Mantegna:</item></list>", "<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""38r""/>", "<list xmlns=""http://www.tei-c.org/ns/1.0"" prev=""#C08_37v_1"" rend=""indent"" xml:id=""C08_38r_1""><item xmlns=""http://www.tei-c.org/ns/1.0""><milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""line""/>4. Guercino:</item></list>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0""><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""19r""><zone xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C06_19r_1"" next=""#C06_20r_1"" type=""list""><line xmlns=""http://www.tei-c.org/ns/1.0"" type=""item"" rend=""indent"">c. Das Grumbach⸗Beil</line><zone xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C06_19r_2"" next=""#C06_20r_2"" type=""item""><line xmlns=""http://www.tei-c.org/ns/1.0"" rend=""indent"">d. Das 101 Richtſchwert;</line></zone></zone></surface><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""19v""/><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""20r""><zone xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C06_20r_1"" prev=""#C06_19r_1"" type=""list""><zone xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C06_20r_2"" prev=""C06_19r_2"" type=""item""><line xmlns=""http://www.tei-c.org/ns/1.0"">Theils weil Raum und</line></zone></zone></surface></zone>")
%test:assertEquals("<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""19r""/>", "<list xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C06_19r_1"" next=""#C06_20r_1""><item xmlns=""http://www.tei-c.org/ns/1.0"" rend=""indent"">c. Das Grumbach⸗Beil</item><item xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C06_19r_2"" next=""#C06_20r_2""><milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""line"" rend=""indent""/>d. Das 101 Richtschwert;</item></list>", "<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""19v""/>", "<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""20r""/>", "<list xmlns=""http://www.tei-c.org/ns/1.0"" prev=""#C06_19r_1"" xml:id=""C06_20r_1""><item xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C06_20r_2"" prev=""C06_19r_2""><milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""line""/>Theils weil Raum und</item></list>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""toc"" subtype=""Fontane""><line xmlns=""http://www.tei-c.org/ns/1.0"" type=""item""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#xpath(//surface[@n='13r'])"">Groſsbeeren</ref></line><line xmlns=""http://www.tei-c.org/ns/1.0"" type=""item""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#xpath(//surface[@n='25r'])"">Blankenfelde</ref></line></zone>")
%test:assertEquals("<list xmlns=""http://www.tei-c.org/ns/1.0"" type=""toc"" subtype=""Fontane""><item xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#xpath(//surface[@n='13r'])"">Grossbeeren</ref></item><item xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#xpath(//surface[@n='25r'])"">Blankenfelde</ref></item></list>")
function teisimple-test:analyze-lists($node as element(*)) {
fontaneSimple:transform($node)
......@@ -292,8 +301,11 @@ declare
%test:args("<surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""1r"" facs=""http://textgridrep.org/textgrid:164h2""/>")
%test:assertEquals("<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""1r""/>")
%test:args("<line xmlns=""http://www.tei-c.org/ns/1.0""><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""1r"" facs=""http://textgridrep.org/textgrid:164h2""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>Test</surface></line>")
%test:assertEquals("<milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""line""/>", "<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""1r""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""""/>", "Test")
%test:args("<line xmlns=""http://www.tei-c.org/ns/1.0""><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""1r"" facs=""http://textgridrep.org/textgrid:164h2""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>Test</surface></line>")
%test:assertEquals("<milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""line""/>", "<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""1r""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""""/>", "Test")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0""><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""52r"" facs=""http://textgridrep.org/textgrid:164j2""><graphic xmlns=""http://www.tei-c.org/ns/1.0"" n=""C07_053"" url=""http://textgridrep.org/textgrid:164j2"" mimeType=""image/jpeg""/><zone><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Archivar2""/><line xmlns=""http://www.tei-c.org/ns/1.0""><fw xmlns=""http://www.tei-c.org/ns/1.0"" type=""pageNum"">[<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Archivar1""/>49<handShift new=""#Archivar2"" xmlns=""http://www.tei-c.org/ns/1.0""/>]</fw></line><line xmlns=""http://www.tei-c.org/ns/1.0""><fw xmlns=""http://www.tei-c.org/ns/1.0"" type=""pageNum"">52</fw></line><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/></zone></surface><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""52v"" facs=""http://textgridrep.org/textgrid:164js""><graphic xmlns=""http://www.tei-c.org/ns/1.0"" n=""C07_054"" url=""http://textgridrep.org/textgrid:164js"" mimeType=""image/jpeg""/></surface><surface xmlns=""http://www.tei-c.org/ns/1.0"" n=""53r"" facs=""http://textgridrep.org/textgrid:164js"" type=""fragment"" attachment=""cut""><graphic xmlns=""http://www.tei-c.org/ns/1.0"" n=""C07_054"" url=""http://textgridrep.org/textgrid:164js"" mimeType=""image/jpeg""/><zone xmlns=""http://www.tei-c.org/ns/1.0""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Archivar2""/><line xmlns=""http://www.tei-c.org/ns/1.0""><fw xmlns=""http://www.tei-c.org/ns/1.0"" type=""pageNum"">53</fw></line><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/></zone></surface></zone>")
%test:assertEquals("<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""52r""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Archivar2"" script="""" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""""/>", "<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""52v""/>", "<pb xmlns=""http://www.tei-c.org/ns/1.0"" n=""53r""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Archivar2"" script="""" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""""/>")
function teisimple-test:analyze-pages($node as element(*)) {
fontaneSimple:transform($node)
};
......@@ -1271,6 +1283,9 @@ declare
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" medium=""pencil""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" script=""clear""/></zone>")
%test:assertEquals("<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" medium="""" script=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""pencil""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script=""clear"" medium=""""/>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" medium=""pencil""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" script=""clear""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" medium=""pencil""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" script=""clear""/></zone>")
%test:assertEquals("<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""pencil""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script=""clear"" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd"" script="""" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd"" script="""" medium=""pencil""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd"" script=""clear"" medium=""""/>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" medium=""pencil""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" script=""clear""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" medium=""pencil""/><handShift xmlns=""http://www.tei-c.org/ns/1.0"" script=""clear""/></zone>")
%test:assertEquals("<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script="""" medium=""pencil""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane"" script=""clear"" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd"" script="""" medium=""""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd"" script="""" medium=""pencil""/>", "<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fremd"" script=""clear"" medium=""""/>")
......
resources/xml/tei-simple-pre.xml
View file @ 8af5a770
......@@ -540,7 +540,7 @@
</date>.</tei:seg>
</tei:seg>
</tei:seg>
<tei:list type="toc">
<tei:list type="toc" subtype="Fontane">
<item rend="align(center)">
<tei:milestone unit="line"/>
<tei:seg rendition="letter-spacing:0.2cm; font-size:large">(<rs type="direct" ref="plc:Thueringen">
......@@ -1401,11 +1401,11 @@
<rs type="direct" ref="psn:Lannes">Lannes<tei:handShift xmlns:tei="http://www.tei-c.org/ns/1.0" script="Latf" new="#Fontane" medium=""/>
</rs> hat den Hauptangriff<tei:milestone xmlns:tei="http://www.tei-c.org/ns/1.0" unit="line"/>im Centrum; die beiden andern<tei:milestone xmlns:tei="http://www.tei-c.org/ns/1.0" unit="line"/>Corps souteniren<list>
<tei:handShift xmlns:tei="http://www.tei-c.org/ns/1.0" script="Latn" new="#Fontane" medium=""/>
<tei:item xmlns:tei="http://www.tei-c.org/ns/1.0">
<tei:item xmlns:tei="http://www.tei-c.org/ns/1.0" rend="indent">
<rs type="direct" ref="psn:Hohenlohe">Hohenlohe<tei:handShift script="Latf" new="#Fontane" medium=""/>
</rs> in Front vor <rs type="direct" ref="plc:Vierzehnheiligen">14 Heiligen</rs>.</tei:item>
<tei:handShift xmlns:tei="http://www.tei-c.org/ns/1.0" script="Latn" new="#Fontane" medium=""/>
<tei:item xmlns:tei="http://www.tei-c.org/ns/1.0">
<tei:item xmlns:tei="http://www.tei-c.org/ns/1.0" rend="indent">
<rs type="direct" ref="psn:Ruechel">Rüchel</rs>
<tei:handShift script="Latf" new="#Fontane" medium=""/> von <rs type="direct" ref="plc:Weimar">Weimar</rs> nach <rs type="direct" ref="plc:Kapellendorf">Kapellendorf</rs>.</tei:item>
<item>
......
Markdown is supported
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