Skip to content

GitLab

Commit 5dd52e7a authored by Michelle Rodzis's avatar Michelle Rodzis Committed by mrodzis
Browse files

Add 3.26.14 sketches

parent 169fe5f5
Hide whitespace changes
Inline Side-by-side
modules/fontane/tei2teisimple.xqm
View file @ 5dd52e7a
......@@ -426,7 +426,8 @@ declare function fontaneSimple:transform($nodes as node()*) as node()* {
}
else if($node/parent::tei:zone[@type = "illustration"]) then
element {QName("http://www.tei-c.org/ns/1.0", $node/name())}{
$node/@*
$node/@*,
fontaneSimple:transform($nodes/node())
}
else
()
......
modules/fontane/teisimple-test.xql
View file @ 5dd52e7a
......@@ -96,10 +96,10 @@ declare
%test:assertEquals("<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a2""/><seg xmlns=""http://www.tei-c.org/ns/1.0"" type=""caption"" rendition=""margin-left:6.1cm; margin-top:0.8cm""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>Dach</seg></ab>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""illustration"" ulx=""1.4"" uly=""5.6"" lrx=""8.3"" lry=""15.5""><milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""illustration""/><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a2""><figDesc xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300034065"">Gebäudeaufriss</ref>; Jagdschloss Stern.</figDesc></figure></zone>")
%test:assertEquals("<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a2""/></ab>")
%test:assertEquals("<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a2""><figDesc xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300034065"">Gebäudeaufriss</ref>; Jagdschloss Stern.</figDesc></figure></ab>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0""><zone xmlns=""http://www.tei-c.org/ns/1.0"" uly=""11.3"" lrx=""8.6"" lry=""11.8"" ><line xmlns=""http://www.tei-c.org/ns/1.0"" style=""margin-left:1.2cm""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>Eimer in dieſer Form</line></zone><zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""illustration"" ulx=""9.0"" uly=""11.0"" lrx=""10.6"" lry=""11.8""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a2""><figDesc xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300124063"">Technische Illustration</ref></figDesc></figure></zone></zone>")
%test:assertEquals("<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>", "Eimer in dieser Form", "<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a2""/></ab>")
%test:assertEquals("<handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>", "Eimer in dieser Form", "<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a2""><figDesc xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300124063"">Technische Illustration</ref></figDesc></figure></ab>")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""list"" subtype=""legend""><line xmlns=""http://www.tei-c.org/ns/1.0"" style=""margin-left:1.4cm"" type=""item""><seg xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#C04_4v_3""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>A. Kloſterkirche.</ref></seg></line><zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""item""><line xmlns=""http://www.tei-c.org/ns/1.0"" style=""margin-left:1.4cm""><seg xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#C04_4v_2 #C04_4v_4"">B. und C. Moderniſirte Kloſter-</ref></seg></line></zone></zone>")
%test:assertEquals("<list xmlns=""http://www.tei-c.org/ns/1.0"" subtype=""legend""><item xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#C04_4v_3""><handShift xmlns=""http://www.tei-c.org/ns/1.0"" new=""#Fontane""/>A. Klosterkirche.</ref></item><item xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""#C04_4v_2 #C04_4v_4"">B. und C. Modernisirte Kloster</ref></item></list>")
......@@ -115,7 +115,7 @@ declare
%test:assertEmpty
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""illustration""><milestone xmlns=""http://www.tei-c.org/ns/1.0"" unit=""illustration""/><zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""illustration"" ulx=""0.8"" uly=""0.0"" lrx=""5.9"" lry=""7.6""><figure xml:id=""a4"" xmlns=""http://www.tei-c.org/ns/1.0""><figDesc xmlns=""http://www.tei-c.org/ns/1.0"" copyOf=""#C08_16r_a""/></figure></zone><zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""illustration"" ulx=""6.9"" uly=""1.1"" lrx=""8.5"" lry=""3.8""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a5""><figDesc xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C08_16r_a""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300015566"">Umgebungsplan</ref> Venedig mit Markusplatz, San Giorgio Maggiore und La Giudecca</figDesc></figure></zone></zone>")
%test:assertEquals("<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""composed-sketch""><ab rendition=""margin-left:0.8cm; margin-top:0.0cm"" xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a4""/></ab><ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch"" rendition=""margin-left:6.9cm; margin-top:1.1cm""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a5""/></ab></ab>")
%test:assertEquals("<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""composed-sketch""><ab rendition=""margin-left:0.8cm; margin-top:0.0cm"" xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a4""><figDesc xmlns=""http://www.tei-c.org/ns/1.0"" copyOf=""#C08_16r_a""/></figure></ab><ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch"" rendition=""margin-left:6.9cm; margin-top:1.1cm""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a5""><figDesc xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""C08_16r_a""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300015566"">Umgebungsplan</ref> Venedig mit Markusplatz, San Giorgio Maggiore und La Giudecca</figDesc></figure></ab></ab>")
function teisimple-test:analyze-sketches($node as element(*)) {
fontaneSimple:transform($node)
......@@ -1150,6 +1150,18 @@ declare
fontaneSimple:transform($node)
};
(: all other entities between 3.26.6 and 3.26.14 only differ in their prefix :)
(: 3.26.14 Sketches :)
declare
%test:name("Sketches")
%test:args("<zone xmlns=""http://www.tei-c.org/ns/1.0"" type=""illustration"" ulx=""0.0"" uly=""2.4"" lrx=""9.4"" lry=""16.7""><figure xml:id=""a19""><figDesc xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300034158"">Grundriss</ref> von <rs xmlns=""http://www.tei-c.org/ns/1.0"" type=""indirect"" ref=""plc:Schloss_Cunersdorf"">Schloss Cunersdorf</rs></figDesc></figure></zone>")
%test:assertEquals("<ab xmlns=""http://www.tei-c.org/ns/1.0"" type=""sketch""><figure xmlns=""http://www.tei-c.org/ns/1.0"" xml:id=""a19""><figDesc xmlns=""http://www.tei-c.org/ns/1.0""><ref xmlns=""http://www.tei-c.org/ns/1.0"" target=""http://vocab.getty.edu/aat/300034158"">Grundriss</ref> von <rs xmlns=""http://www.tei-c.org/ns/1.0"" type=""indirect"" ref=""plc:Schloss_Cunersdorf"">Schloss Cunersdorf</rs></figDesc></figure></ab>")
function teisimple-test:analyze-entity-sketches($node as element(*)) {
fontaneSimple:transform($node)
};
(: SECTIONS :)
declare
......
modules/fontane/teisimplehelpers.xqm
View file @ 5dd52e7a
......@@ -164,10 +164,11 @@ declare function simpleHelpers:has-valid-text($node as node()) as xs:boolean {
declare function simpleHelpers:is-valid-text($node as text()) as xs:boolean {
let $current-hand := $node/preceding::tei:handShift[@new][1]/@new
return
if(simpleHelpers:is-hand-contemporary($current-hand)
if((simpleHelpers:is-hand-contemporary($current-hand)
or ($node[ancestor::tei:surface[@type = "label"]]
and matches($current-hand, "Friedrich_Fontane"))
or $node/ancestor::*[@type = "edited_text"]
or $node/ancestor::tei:figDesc)
and not(normalize-space($node) = "")) then
true()
else
......
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