Merge branch 'bugfix/#110-et' into 'develop'

Consider elements when tidying HTML version of ET

Closes #110

See merge request !47

modules/fontane/edited-text/simple2xhtml.xqm

@@ -20,7 +20,7 @@ declare function simple2xhtml:main($nodes as node()*, $uri as xs:string) {
     let $tidy := element xhtml:div {simple2xhtml:tidy($xhtml)}
     let $store := xmldb:store($config:data-root || "/print/xhtml/", $uri || ".html", $tidy)
     return
-        $xhtml
+        $tidy
 };
 
 (:~
@@ -679,5 +679,8 @@ declare function simple2xhtml:tidy($nodes as node()*) as node()* {
                 => replace(" :", ":") }
 
         default return
-            simple2xhtml:tidy($node/node())
+            element {QName("http://www.w3.org/1999/xhtml", $node/name())} {
+                $node/@*,
+                simple2xhtml:tidy($node/node())
+            }
 };