Merge branch 'bugfix/#111-sorting' into 'develop'

Fix bug in highlighted zone

Closes #111

See merge request !48

modules/fontane/edited-text/tei2teisimple.xqm

@@ -347,13 +347,7 @@ $log as xs:string) as node()* {
                     fontaneSimple:transform($node/node(), $uri, $log)
                 }
 
-            else if($node/@type = "integration") then
-                element tei:seg {
-                    $node/@*,
-                    fontaneSimple:transform($node/node(), $uri, $log)
-                }
-
-            else if($node/@type = "editorial-label") then
+            else if($node/@type = ("integration", "editorial-label")) then
                 element tei:seg {
                     $node/@*,
                     fontaneSimple:transform($node/node(), $uri, $log)
@@ -497,6 +491,9 @@ $log as xs:string) as node()* {
                     fontaneSimple:transform($node/node(), $uri, $log)
                 else
                     element tei:hi {
+                        $node/@xml:id,
+                        $node/@prev,
+                        $node/@next,
                         attribute type {"vertical-mark"},
                         fontaneSimple:transform($node/node(), $uri, $log)
                     }
@@ -834,6 +831,9 @@ $log as xs:string) as node()* {
         case element(tei:unclear) return
             fontaneSimple:copy-element($node, $uri, $log)
 
+        case element(tei:div) return
+            fontaneSimple:copy-element($node, $uri, $log)
+
         default return
             fontaneSimple:transform($node/node(), $uri, $log)
 };

modules/fontane/edited-text/tidysimple.xqm

@@ -36,7 +36,7 @@ declare function tidySimple:main($tei as node()*, $uri as xs:string) {
         => tidySimple:sort-out-invalid-hands()
         => tidySimple:split-headings()
         => tidySimple:summarize()
-        => tidySimple:summarize-hi()
+(:        => tidySimple:summarize-hi():)
     let $header :=
         tidySimple:get-Fontanes-sources($tei//tei:teiHeader[parent::tei:TEI])
         => tidySimple:get-references-in-abstract()
@@ -478,9 +478,9 @@ declare function tidySimple:summarize($nodes as node()*) as node()* {
                     or normalize-space(.) = ""]) then
                     ()
                 else
-                    tidySimple:summarize-entries($node)
+                    tidySimple:copy-element($node, "summarize")
             else
-                tidySimple:summarize-entries($node)
+                tidySimple:copy-element($node, "summarize")
 
         case element(tei:rs) return
             tidySimple:summarize-entries($node)
@@ -497,6 +497,7 @@ declare function tidySimple:summarize($nodes as node()*) as node()* {
         case element(tei:seg) return
             tidySimple:summarize-entries($node)
 
+
         default return
             tidySimple:copy-element($node, "summarize")
 };