From 8efd7e02ed22171f56f29c99d6c802642b9bb9b6 Mon Sep 17 00:00:00 2001
From: Dennis Friedl <DennisFriedl@paderborn.com>
Date: Wed, 31 May 2023 16:38:50 +0200
Subject: [PATCH 001/103] Update search.xql

* an Contributing Guidelines angepasst
---
 add/data/xql/search.xql | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 6f2fb4a2b..1d360134e 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -1,31 +1,21 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository. 
 :)
 
-import module namespace kwic="http://exist-db.org/xquery/kwic";
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+
+import module namespace kwic="http://exist-db.org/xquery/kwic";
+import module namespace request="http://exist-db.org/xquery/request";
+import module namespace transform="http://exist-db.org/xquery/transform";
+
+import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(:declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";:)
+declare option output:method "xhtml";
+declare option output:media-type "text/html";
 
 declare variable $lang := request:get-parameter('lang', '');
 

From 9251f51c7863fcecd093f59afc3ce2c5e44407a9 Mon Sep 17 00:00:00 2001
From: Dennis Friedl <DennisFriedl@paderborn.com>
Date: Wed, 31 May 2023 17:13:40 +0200
Subject: [PATCH 002/103] Update getZone.xql

* Adjusted to the Contributing Guidelines
---
 add/data/xql/getZone.xql | 44 ++++++++++++++--------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/add/data/xql/getZone.xql b/add/data/xql/getZone.xql
index 738b17430..bf75f0fbb 100644
--- a/add/data/xql/getZone.xql
+++ b/add/data/xql/getZone.xql
@@ -1,21 +1,6 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository. 
 :)
 
 (:~
@@ -24,14 +9,15 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization"; 
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
-
-declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
+import module namespace request = "http://exist-db.org/xquery/request";
+import module namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+declare option output:method "json";
+declare option output:media-type "application/json";
 
 let $uri := request:get-parameter('uri', '')
 let $zoneId := request:get-parameter('zoneId', '')
@@ -40,12 +26,12 @@ let $mei := doc($uri)/root()
 let $zone := $mei/id($zoneId)
 
 return (
-    concat('{',
-        'zoneId: "', $zone/string(@xml:id), '", ',
-        'pageId: "', $zone/../string(@xml:id), '", ',
-        'ulx: "', $zone/string(@ulx), '", ',
-        'uly: "', $zone/string(@uly), '", ',
-        'lrx: "', $zone/string(@lrx), '", ',
-        'lry: "', $zone/string(@lry), '"',
-    '}')
+    map {
+        'zoneId': $zone/string(@xml:id),
+        'pageId': $zone/../string(@xml:id),
+        'ulx': $zone/string(@ulx),
+        'uly': $zone/string(@uly),
+        'lrx': $zone/string(@lrx),
+        'lry': $zone/string(@lry)
+        }
 )
\ No newline at end of file

From e15cfbea9142b38d9c0e510d6dd9e6a943ec9683 Mon Sep 17 00:00:00 2001
From: Dennis Friedl <DennisFriedl@paderborn.com>
Date: Wed, 31 May 2023 17:25:00 +0200
Subject: [PATCH 003/103] Update getXml.xql

Adjusted to the Contributing Guidelines
---
 add/data/xql/getXml.xql | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/add/data/xql/getXml.xql b/add/data/xql/getXml.xql
index ade41e67d..74ebc9816 100644
--- a/add/data/xql/getXml.xql
+++ b/add/data/xql/getXml.xql
@@ -1,31 +1,20 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository. 
+:)
 
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-  ID: $Id: getXml.xql 1219 2012-01-20 08:33:28Z daniel $
-:)
+import module namespace request = "http://exist-db.org/xquery/request";
 
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-
-declare option exist:serialize "method=xml media-type=text/xml omit-xml-declaration=no indent=yes";
+declare option output:method "xml";
+declare option output:media-type "text/xml";
+declare option output:omit-xml-declaration "no";
+declare option output:indent "yes";
 
 let $uri := request:get-parameter('uri', '')
 let $internalId := request:get-parameter('internalId', '')

From 3adb97abd9d098ccdeb33d4b73ce9445d869ba03 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Wed, 8 Nov 2023 15:56:15 +0100
Subject: [PATCH 004/103] fix syntax: getReducedDocument.xql

* add missing parenthesis
---
 add/data/xql/getReducedDocument.xql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 68b83029f..4cb5c1d5c 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -59,5 +59,5 @@ let $xsl := if($xslInstruction)then(doc($xslInstruction))else('../xslt/teiBody2H
 let $params := (<param name="base" value="{concat($base, '/../xslt/')}"/>,<param name="idPrefix" value="{$idPrefix}"/>) 
 
 return
-    if($xslInstruction)then(transform:transform($doc/root(), $xsl, <parameters>{$params}</parameters>)
+    if($xslInstruction)then(transform:transform($doc/root(), $xsl, <parameters>{$params}</parameters>))
     else(transform:transform($doc/root(), $xsl, <parameters>{$params}<param name="graphicsPrefix" value="{$imagePrefix}"/></parameters>))

From 2ba2451ebec61f767e73fac201eec4034ef8c067 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Wed, 8 Nov 2023 16:03:17 +0100
Subject: [PATCH 005/103] fix position of variable declarations

---
 add/data/xql/getReducedDocument.xql | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 4cb5c1d5c..19ba9e68a 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -28,6 +28,12 @@ declare namespace request="http://exist-db.org/xquery/request";
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 (:declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";:)
 
+declare variable $edition := request:get-parameter('edition', '');
+declare variable $imageserver :=  eutil:getPreference('image_server', $edition);
+declare variable $imagePrefix := if($imageserver = 'leaflet')
+	then(eutil:getPreference('leaflet_prefix', $edition))
+	else(eutil:getPreference('image_prefix', $edition));
+
 let $uri := request:get-parameter('uri', '')
 let $selectionId := request:get-parameter('selectionId', '')
 let $subtreeRoot := request:get-parameter('subtreeRoot', '')
@@ -47,12 +53,6 @@ let $xslInstruction := for $i in serialize($xslInstruction, ())
                         then(substring-before(substring-after($i, 'href="'), '"'))
                         else()
                         
-declare variable $edition := request:get-parameter('edition', '');
-declare variable $imageserver :=  eutil:getPreference('image_server', $edition);
-declare variable $imagePrefix := if($imageserver = 'leaflet')
-	then(eutil:getPreference('leaflet_prefix', $edition))
-	else(eutil:getPreference('image_prefix', $edition));
-                        
 (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
 let $xsl := if($xslInstruction)then(doc($xslInstruction))else('../xslt/teiBody2HTML.xsl')
 

From 000492468dace9d98152490ef3185de3e8f5c31c Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Wed, 8 Nov 2023 16:03:57 +0100
Subject: [PATCH 006/103] format and indent xql-files

---
 add/data/xql/checkTextGridLogin.xql        |   6 +-
 add/data/xql/edirom_printPreview.xql       | 183 ++--
 add/data/xql/getAnnotation.xql             | 458 ++++++----
 add/data/xql/getAnnotationInfos.xql        |  66 +-
 add/data/xql/getAnnotationMeta.xql         | 102 ++-
 add/data/xql/getAnnotationOpenAllUris.xql  |  85 +-
 add/data/xql/getAnnotationParticipants.xql |  13 +-
 add/data/xql/getAnnotationPreviews.xql     |  74 +-
 add/data/xql/getAnnotationText.xql         |  20 +-
 add/data/xql/getAnnotations.xql            |  38 +-
 add/data/xql/getAnnotationsInRendering.xql |  47 +-
 add/data/xql/getAnnotationsInText.xql      |  58 +-
 add/data/xql/getAnnotationsOnPage.xql      | 150 ++--
 add/data/xql/getAudioPlayer.xql            | 539 +++++++-----
 add/data/xql/getChapters.xql               | 179 ++--
 add/data/xql/getConcordances.xql           |  79 +-
 add/data/xql/getEdition.xql                |   5 +-
 add/data/xql/getEditionURI.xql             |  10 +-
 add/data/xql/getExtendedStaff.xql          | 112 ++-
 add/data/xql/getHeader.xql                 |  61 +-
 add/data/xql/getHelp.xql                   |  20 +-
 add/data/xql/getInternalIdType.xql         |  74 +-
 add/data/xql/getLanguageFile.xql           |  37 +-
 add/data/xql/getMeasure.xql                |  36 +-
 add/data/xql/getMeasurePage.xql            |  74 +-
 add/data/xql/getMeasures.xql               | 151 ++--
 add/data/xql/getMeasuresOnPage.xql         |  46 +-
 add/data/xql/getMovements.xql              |  33 +-
 add/data/xql/getMovementsFirstPage.xql     |  21 +-
 add/data/xql/getMusicInMdiv.xql            |  23 +-
 add/data/xql/getNavigatorConfig.xql        | 151 ++--
 add/data/xql/getOverlayOnPage.xql          |  25 +-
 add/data/xql/getOverlays.xql               |  33 +-
 add/data/xql/getPages.xql                  |  77 +-
 add/data/xql/getParts.xql                  |  29 +-
 add/data/xql/getPreferences.xql            |  35 +-
 add/data/xql/getReducedDocument.xql        |  56 +-
 add/data/xql/getRendering.xql              |  52 +-
 add/data/xql/getSummary.xql                | 967 ++++++++++++---------
 add/data/xql/getText.xql                   | 134 ++-
 add/data/xql/getWorkID.xql                 |  12 +-
 add/data/xql/getWorks.xql                  |  19 +-
 add/data/xql/getXml.xql                    |  14 +-
 add/data/xql/getZone.xql                   |  25 +-
 add/data/xql/getiFrameURL.xql              |  13 +-
 add/data/xql/loginToTextGrid.xql           |  20 +-
 add/data/xql/search.xql                    | 267 ++++--
 47 files changed, 2837 insertions(+), 1892 deletions(-)

diff --git a/add/data/xql/checkTextGridLogin.xql b/add/data/xql/checkTextGridLogin.xql
index 3d154e3f5..8a0ce0a00 100644
--- a/add/data/xql/checkTextGridLogin.xql
+++ b/add/data/xql/checkTextGridLogin.xql
@@ -1,12 +1,12 @@
 xquery version "3.0";
 
-declare namespace html="http://www.w3.org/1999/xhtml";
-declare namespace h="http://exist-db.org/xquery/httpclient";
+declare namespace html = "http://www.w3.org/1999/xhtml";
+declare namespace h = "http://exist-db.org/xquery/httpclient";
 
 let $sessionId := request:get-parameter('sessionId', '')
 
 let $test := httpclient:head(xs:anyURI('http://textgridlab.org/1.0/tgcrud/rest/textgrid:208dw/data?sessionId=' || $sessionId),
-                    false(), ())
+false(), ())
 
 let $status := $test/root()/httpclient:response/string(@statusCode)
 let $status := response:set-status-code(xs:int($status))
diff --git a/add/data/xql/edirom_printPreview.xql b/add/data/xql/edirom_printPreview.xql
index 6762ed4c7..fa91cd391 100644
--- a/add/data/xql/edirom_printPreview.xql
+++ b/add/data/xql/edirom_printPreview.xql
@@ -1,14 +1,14 @@
 xquery version "1.0";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace xslfo="http://exist-db.org/xquery/xslfo";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace xslfo = "http://exist-db.org/xquery/xslfo";
 
-declare namespace fo="http://www.w3.org/1999/XSL/Format";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
+declare namespace fo = "http://www.w3.org/1999/XSL/Format";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace eof = "http://www.edirom.de/xquery/ediromOnlineFunctions";
 declare namespace xhtml = "http://www.w3.org/1999/xhtml";
 
@@ -17,98 +17,143 @@ declare option exist:serialize "method=html media-type=text/html omit-xml-declar
 (: VARIABLES ========================================================= :)
 
 declare variable $lang := 'en';
-declare variable $base := concat('file:', replace(system:get-module-load-path(),'\\','/'), '/../xslt/');
+declare variable $base := concat('file:', replace(system:get-module-load-path(), '\\', '/'), '/../xslt/');
 
 declare variable $edition := request:get-parameter('edition', '');
-declare variable $imageserver :=  eutil:getPreference('image_server', $edition);
-declare variable $facsBasePath := if($imageserver = 'leaflet')
-	then(eutil:getPreference('leaflet_prefix', $edition))
-	else(eutil:getPreference('image_prefix', $edition));
+declare variable $imageserver := eutil:getPreference('image_server', $edition);
+declare variable $facsBasePath := if ($imageserver = 'leaflet')
+then
+    (eutil:getPreference('leaflet_prefix', $edition))
+else
+    (eutil:getPreference('image_prefix', $edition));
 
 (:declare variable $facsBasePath := eutil:getPreference('image_prefix', request:get-parameter('edition', ''));:)
 declare variable $printResolution := 150;
-declare variable $facsAreaWidth := 6.5;(: in inch :)
+declare variable $facsAreaWidth := 6.5; (: in inch :)
 declare variable $facsMetaHeight := 30;
 
-declare variable $uri := request:get-parameter('uri','');
-declare variable $type := request:get-parameter('type','');
+declare variable $uri := request:get-parameter('uri', '');
+declare variable $type := request:get-parameter('type', '');
 declare variable $doc := doc($uri)/root();
-declare variable $langFile := if(doc-available(concat($base, '../xslt/i18n/', $lang, '.xml')))
-                              then(doc(concat($base, '../xslt/i18n/', $lang, '.xml')))
-                              else(concat($base, '../xslt/i18n/', $lang, '.xml'));
-
-declare variable $facsItems := $doc//mei:surface/mei:graphic[@type='facsimile'];
-declare variable $pageFormat := if($doc//mei:facsimile or $doc//tei:facsimile)
-                                then if((sum(for $h in $facsItems/@height return $h) div count($facsItems)) gt (sum(for $h in $facsItems/@width return $h) div count($facsItems)))
-                                     then 'A4'
-                                     else 'A4ls'
-                                else();
-
-declare variable $pageMaster := doc(concat($base,'edirom_fo_layoutMasterSet.xml'))//fo:*[@master-name = $pageFormat];
+declare variable $langFile := if (doc-available(concat($base, '../xslt/i18n/', $lang, '.xml')))
+then
+    (doc(concat($base, '../xslt/i18n/', $lang, '.xml')))
+else
+    (concat($base, '../xslt/i18n/', $lang, '.xml'));
+
+declare variable $facsItems := $doc//mei:surface/mei:graphic[@type = 'facsimile'];
+declare variable $pageFormat := if ($doc//mei:facsimile or $doc//tei:facsimile)
+then
+    if ((sum(for $h in $facsItems/@height
+    return
+        $h) div count($facsItems)) gt (sum(for $h in $facsItems/@width
+    return
+        $h) div count($facsItems)))
+    then
+        'A4'
+    else
+        'A4ls'
+else
+    ();
+
+declare variable $pageMaster := doc(concat($base, 'edirom_fo_layoutMasterSet.xml'))//fo:*[@master-name = $pageFormat];
 declare variable $ediromOnlineRoot := request:get-context-path();
 
 (: FUNCTIONS ========================================================= :)
 
-declare function eof:getLabel($key as xs:string){
-    if($langFile/id($key) and not($langFile/id($key)/text() eq ''))
-    then($langFile/id($key)/text())
-    else($key)
+declare function eof:getLabel($key as xs:string) {
+    if ($langFile/id($key) and not($langFile/id($key)/text() eq ''))
+    then
+        ($langFile/id($key)/text())
+    else
+        ($key)
 };
 
-declare function eof:getFacsImgParas($areaWidth){
-    concat('&amp;dw=',floor($printResolution*$areaWidth), '&amp;mo=scale')
+declare function eof:getFacsImgParas($areaWidth) {
+    concat('&amp;dw=', floor($printResolution * $areaWidth), '&amp;mo=scale')
 };
 
-declare function eof:getPageRegionBodyWidth(){
-    if($pageMaster/fo:region-body/@margin)
-    then(concat(number(substring-before($pageMaster/@page-width, 'mm'))
-               -number(substring-before($pageMaster/fo:region-body/@margin, 'mm'))*2, 'mm'))
-    else(concat(number(substring-before($pageMaster/@page-width, 'mm'))
-               -sum(for $a in $pageMaster/fo:region-body/@margin-left | $pageMaster/fo:region-body/@margin-right
-                    return number(substring-before($a, 'mm'))),'mm'))
+declare function eof:getPageRegionBodyWidth() {
+    if ($pageMaster/fo:region-body/@margin)
+    then
+        (concat(number(substring-before($pageMaster/@page-width, 'mm'))
+        - number(substring-before($pageMaster/fo:region-body/@margin, 'mm')) * 2, 'mm'))
+    else
+        (concat(number(substring-before($pageMaster/@page-width, 'mm'))
+        - sum(for $a in $pageMaster/fo:region-body/@margin-left | $pageMaster/fo:region-body/@margin-right
+        return
+            number(substring-before($a, 'mm'))), 'mm'))
 };
 
-declare function eof:getPageRegionBodyHeight(){
-    if($pageMaster/fo:region-body/@margin)
-    then(concat(number(substring-before($pageMaster/@page-height, 'mm'))
-               -number(substring-before($pageMaster/fo:region-body/@margin, 'mm'))*2, 'mm'))
-    else(concat(number(substring-before($pageMaster/@page-height, 'mm'))
-               -sum(for $a in $pageMaster/fo:region-body/@margin-top | $pageMaster/fo:region-body/@margin-bottom
-                    return number(substring-before($a, 'mm')))
-               -$facsMetaHeight,'mm'))
+declare function eof:getPageRegionBodyHeight() {
+    if ($pageMaster/fo:region-body/@margin)
+    then
+        (concat(number(substring-before($pageMaster/@page-height, 'mm'))
+        - number(substring-before($pageMaster/fo:region-body/@margin, 'mm')) * 2, 'mm'))
+    else
+        (concat(number(substring-before($pageMaster/@page-height, 'mm'))
+        - sum(for $a in $pageMaster/fo:region-body/@margin-top | $pageMaster/fo:region-body/@margin-bottom
+        return
+            number(substring-before($a, 'mm')))
+        - $facsMetaHeight, 'mm'))
 };
 
-declare function eof:insertAttributeSet_h1(){
+declare function eof:insertAttributeSet_h1() {
     attribute font-weight {'bold'}
 };
 
 (: OUTPUT ========================================================= :)
 
-let $xsl_source := concat($base,'edirom_source2Print.xsl')
-let $xsl_text := concat($base,'edirom_text2Print.xsl')
-let $paras  := <parameters>
-                 <param name="base" value="{$base}"/>
-                 <param name="uri" value="{$uri}"/>
-                 <param name="ediromOnlineRoot" value="{$ediromOnlineRoot}"/>
-                 <param name="pageFormat" value="{$pageFormat}"/>
-                 <param name="facsAreaWidth" value="{$facsAreaWidth}"/>
-                 <param name="printResolution" value="{$printResolution}"/>
-                 <param name="facsImgParas" value="{eof:getFacsImgParas($facsAreaWidth)}"/>
-                 <param name="facsBasePath" value="{$facsBasePath}"/>
-               </parameters>
+let $xsl_source := concat($base, 'edirom_source2Print.xsl')
+let $xsl_text := concat($base, 'edirom_text2Print.xsl')
+let $paras := <parameters>
+    <param
+        name="base"
+        value="{$base}"/>
+    <param
+        name="uri"
+        value="{$uri}"/>
+    <param
+        name="ediromOnlineRoot"
+        value="{$ediromOnlineRoot}"/>
+    <param
+        name="pageFormat"
+        value="{$pageFormat}"/>
+    <param
+        name="facsAreaWidth"
+        value="{$facsAreaWidth}"/>
+    <param
+        name="printResolution"
+        value="{$printResolution}"/>
+    <param
+        name="facsImgParas"
+        value="{eof:getFacsImgParas($facsAreaWidth)}"/>
+    <param
+        name="facsBasePath"
+        value="{$facsBasePath}"/>
+</parameters>
 
 let $width := eof:getPageRegionBodyWidth()
 let $height := eof:getPageRegionBodyHeight()
 
 let $type := request:get-parameter('type', '')
-let $docUri := if(contains($uri, '#')) then(substring-before($uri, '#')) else($uri)
+let $docUri := if (contains($uri, '#')) then
+    (substring-before($uri, '#'))
+else
+    ($uri)
 let $doc := doc($docUri)
 
 return
-    if($type = 'work')
-    then('work')
-    else if($type = 'source')
-    then transform:transform($doc, $xsl_source, $paras)
-    else if($type = 'text')
-    then transform:transform($doc, $xsl_text, $paras)
-    else('last else')
+    if ($type = 'work')
+    then
+        ('work')
+    else
+        if ($type = 'source')
+        then
+            transform:transform($doc, $xsl_source, $paras)
+        else
+            if ($type = 'text')
+            then
+                transform:transform($doc, $xsl_text, $paras)
+            else
+                ('last else')
diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 993fb6b5b..c43af1b4d 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -26,16 +26,16 @@ xquery version "3.1";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-import module namespace source="http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
-import module namespace annotation="http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace exist="http://exist.sourceforge.net/NS/exist";
-declare namespace edirom_image="http://www.edirom.de/ns/image";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace exist = "http://exist.sourceforge.net/NS/exist";
+declare namespace edirom_image = "http://www.edirom.de/ns/image";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "xhtml";
@@ -43,10 +43,12 @@ declare option output:media-type "text/html";
 
 declare variable $imageWidth := 600;
 declare variable $edition := request:get-parameter('edition', '');
-declare variable $imageserver :=  eutil:getPreference('image_server', $edition);
-declare variable $imageBasePath := if($imageserver = 'leaflet')
-	then(eutil:getPreference('leaflet_prefix', $edition))
-	else(eutil:getPreference('image_prefix', $edition));
+declare variable $imageserver := eutil:getPreference('image_server', $edition);
+declare variable $imageBasePath := if ($imageserver = 'leaflet')
+then
+    (eutil:getPreference('leaflet_prefix', $edition))
+else
+    (eutil:getPreference('image_prefix', $edition));
 
 declare variable $lang := request:get-parameter('lang', '');
 
@@ -59,14 +61,17 @@ declare variable $lang := request:get-parameter('lang', '');
     @return The zone element
 :)
 declare function local:getZone($elem as element()) as element()? {
-    if($elem/@facs)
-    then(
+    if ($elem/@facs)
+    then
+        (
         let $zoneId := replace($elem/@facs, '^#', '')
-        return $elem/root()/id($zoneId)
-    )
-    else(
+        return
+            $elem/root()/id($zoneId)
+        )
+    else
+        (
         $elem
-    )
+        )
 };
 
 (:~
@@ -79,21 +84,25 @@ declare function local:getZone($elem as element()) as element()? {
 declare function local:getPriority($annot as node()) {
     
     let $uri := $annot/mei:ptr[@type eq 'priority']/string(@target)
-    let $doc := if(starts-with($uri,'#'))
-                then(
-                    $annot/root()
-                )
-                else(
-                    doc(substring-before($uri,'#'))
-                )
-    let $locID := substring-after($uri,'#')
+    let $doc := if (starts-with($uri, '#'))
+    then
+        (
+        $annot/root()
+        )
+    else
+        (
+        doc(substring-before($uri, '#'))
+        )
+    let $locID := substring-after($uri, '#')
     
     let $elem := $doc/id($locID)
     
     return
-        if($elem/mei:name)
-        then(normalize-space(eutil:getLocalizedName($elem, $lang)))
-        else($locID)
+        if ($elem/mei:name)
+        then
+            (normalize-space(eutil:getLocalizedName($elem, $lang)))
+        else
+            ($locID)
 };
 
 (:~
@@ -105,23 +114,28 @@ declare function local:getPriority($annot as node()) {
 :)
 declare function local:getCategories($annot as node()) {
     
-    let $uris := tokenize($annot/mei:ptr[@type eq 'categories']/string(@target),' ')
-    
-    let $string := for $uri in $uris 
-                   let $doc := if(starts-with($uri,'#'))
-                               then(
-                                   $annot/root()
-                               )
-                               else(
-                                   doc(substring-before($uri,'#'))
-                               )
-                   let $locID := substring-after($uri,'#')
-                   let $elem := $doc/id($locID)
-                   return
-                       if($elem/mei:name)
-                       then(eutil:getLocalizedName($elem, $lang))
-                       else($locID)
-    return $string
+    let $uris := tokenize($annot/mei:ptr[@type eq 'categories']/string(@target), ' ')
+    
+    let $string := for $uri in $uris
+    let $doc := if (starts-with($uri, '#'))
+    then
+        (
+        $annot/root()
+        )
+    else
+        (
+        doc(substring-before($uri, '#'))
+        )
+    let $locID := substring-after($uri, '#')
+    let $elem := $doc/id($locID)
+    return
+        if ($elem/mei:name)
+        then
+            (eutil:getLocalizedName($elem, $lang))
+        else
+            ($locID)
+    return
+        $string
 };
 
 
@@ -177,12 +191,14 @@ declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as
     
     let $cut_path := substring-before($imagePath, '.')
     
-    let $im_path := if($imageserver = 'digilib')
-    	then(concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $height, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit'))
-    	else(   	   		
-    		concat($basePath, $cut_path, '/0-0-0.jpg'))    
+    let $im_path := if ($imageserver = 'digilib')
+    then
+        (concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $height, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit'))
+    else
+        (
+        concat($basePath, $cut_path, '/0-0-0.jpg'))
     return
-		$im_path
+        $im_path
 
 };
 
@@ -196,26 +212,44 @@ declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as
     @return Returns $i if it's square is higher or equals $num.
 :)
 declare function local:getLowestSquareBase($i as xs:integer, $num as xs:integer) {
-    if($i*$i lt $num)
-    then(local:getLowestSquareBase($i+1,$num))
-    else($i)
+    if ($i * $i lt $num)
+    then
+        (local:getLowestSquareBase($i + 1, $num))
+    else
+        ($i)
 };
 
 declare function local:getItemLabel($elem as element()) {
     let $name := local-name($elem)
-    return (
-        if($name = 'measure')
-        then(if ($lang = 'de') then (concat('Takt ',$elem/@n)) else (concat('Bar ',$elem/@n)))
-        else(),
+    return
+        (
+        if ($name = 'measure')
+        then
+            (if ($lang = 'de') then
+                (concat('Takt ', $elem/@n))
+            else
+                (concat('Bar ', $elem/@n)))
+        else
+            (),
         
-        if($name = 'staff')
-        then(if ($lang = 'de') then (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr,', Takt ',$elem/ancestor::mei:measure/@n)) else(concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr,', Bar ',$elem/ancestor::mei:measure/@n)))
-        else(),
+        if ($name = 'staff')
+        then
+            (if ($lang = 'de') then
+                (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr, ', Takt ', $elem/ancestor::mei:measure/@n))
+            else
+                (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr, ', Bar ', $elem/ancestor::mei:measure/@n)))
+        else
+            (),
         
-        if($name = 'zone')
-        then(if ($lang = 'de') then (concat('Ausschnitt (S. ',$elem/parent::mei:surface/@n,')')) else (concat('Detail (p. ',$elem/parent::mei:surface/@n,')')))
-        else()
-    )    
+        if ($name = 'zone')
+        then
+            (if ($lang = 'de') then
+                (concat('Ausschnitt (S. ', $elem/parent::mei:surface/@n, ')'))
+            else
+                (concat('Detail (p. ', $elem/parent::mei:surface/@n, ')')))
+        else
+            ()
+        )
 };
 
 
@@ -228,60 +262,90 @@ declare function local:calculatePreviewsForTip($participants as xs:string*) {
     let $areaWidth := 204
     let $areaHeight := 254
     
-    let $elems := for $pUri in $participants 
-                  return doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
+    let $elems := for $pUri in $participants
+    return
+        doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
     let $zones := for $elem in $elems
-                  return local:getZone($elem)
-                  
-    let $tall := some $zone in $zones satisfies (number($zone/@lry) - number($zone/@uly) gt 2*(number($zone/@lrx) - number($zone/@ulx)))
-    let $wide := some $zone in $zones satisfies (2*(number($zone/@lry) - number($zone/@uly)) lt number($zone/@lrx) - number($zone/@ulx))
-    
-    let $w := if($tall and not($wide))
-              then(round(10000 div count($zones)) div 100)
-              else(
-                  if($wide and not($tall))
-                  then(100)
-                  else(round(10000 div local:getLowestSquareBase(1,count($zones))) div 100)
-              )
-              
-    let $h := if($tall and not($wide))
-              then(100)
-              else(
-                  if($wide and not($tall))
-                  then(round(10000 div count($zones)) div 100)
-                  else(round(10000 div local:getLowestSquareBase(1,count($zones))) div 100)
-              )      
+    return
+        local:getZone($elem)
+    
+    let $tall := some $zone in $zones
+        satisfies (number($zone/@lry) - number($zone/@uly) gt 2 * (number($zone/@lrx) - number($zone/@ulx)))
+    let $wide := some $zone in $zones
+        satisfies (2 * (number($zone/@lry) - number($zone/@uly)) lt number($zone/@lrx) - number($zone/@ulx))
+    
+    let $w := if ($tall and not($wide))
+    then
+        (round(10000 div count($zones)) div 100)
+    else
+        (
+        if ($wide and not($tall))
+        then
+            (100)
+        else
+            (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
+        )
+    
+    let $h := if ($tall and not($wide))
+    then
+        (100)
+    else
+        (
+        if ($wide and not($tall))
+        then
+            (round(10000 div count($zones)) div 100)
+        else
+            (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
+        )
     
     let $width := floor($areaWidth * $w div 100)
     let $height := floor($areaHeight * $h div 100)
     
     for $zone in $zones
-    let $e := $elems[substring(@facs,2) = $zone/@xml:id][1]
-    let $e := if($e)then($e)else($zone)
-    
-    let $test := if($imageserver  = 'digilib')
-    	then(
-    	<div class="previewItem" style="width: {$width - (round(100 div $w))}px; height: {$height - round(100 div $h)}px;">
-            <div class="imgBox">
-                <img src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}" class="previewImg" />
+    let $e := $elems[substring(@facs, 2) = $zone/@xml:id][1]
+    let $e := if ($e) then
+        ($e)
+    else
+        ($zone)
+    
+    let $test := if ($imageserver = 'digilib')
+    then
+        (
+        <div
+            class="previewItem"
+            style="width: {$width - (round(100 div $w))}px; height: {$height - round(100 div $h)}px;">
+            <div
+                class="imgBox">
+                <img
+                    src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}"
+                    class="previewImg"/>
             </div>
-            <div class="label">{local:getItemLabel($e)}</div>
+            <div
+                class="label">{local:getItemLabel($e)}</div>
         </div>
-    	)
-    	else(
-    	<div class="previewItem" style="width: {256}px; height: {256}px;">
-            <div class="imgBox">
-                <img src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}" class="previewImg" />
+        )
+    else
+        (
+        <div
+            class="previewItem"
+            style="width: {256}px; height: {256}px;">
+            <div
+                class="imgBox">
+                <img
+                    src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}"
+                    class="previewImg"/>
             </div>
-            <div class="label">{local:getItemLabel($e)}</div>
+            <div
+                class="label">{local:getItemLabel($e)}</div>
         </div>
-    	)
-    	
-    	return $test
+        )
+    
+    return
+        $test
 };
 
 let $uri := request:get-parameter('uri', '')
-let $target := request:get-parameter('target','')
+let $target := request:get-parameter('target', '')
 let $docUri := substring-before($uri, '#')
 let $internalId := substring-after($uri, '#')
 let $doc := doc($docUri)
@@ -291,61 +355,105 @@ let $participants := annotation:getParticipants($annot)
 
 let $priority := local:getPriority($annot)
 let $priorityLabel := if ($lang = 'de')
-                        then('Priorität')
-                        else('Priority')
+then
+    ('Priorität')
+else
+    ('Priority')
 
 let $categories := local:getCategories($annot)
 let $categoriesLabel := if ($lang = 'de')
-                        then (if(count($categories) gt 1)then('Kategorien')else('Kategorie'))
-                        else(if(count($categories) gt 1)then('Categories')else('Category'))
+then
+    (if (count($categories) gt 1) then
+        ('Kategorien')
+    else
+        ('Kategorie'))
+else
+    (if (count($categories) gt 1) then
+        ('Categories')
+    else
+        ('Category'))
 
 let $sources := eutil:getDocumentsLabelsAsArray($participants, $edition)
 let $sourcesLabel := if ($lang = 'de')
-                        then (if(count($sources) gt 1)then('Quellen')else('Quelle'))
-                        else(if(count($sources) gt 1)then('Sources')else('Source'))
+then
+    (if (count($sources) gt 1) then
+        ('Quellen')
+    else
+        ('Quelle'))
+else
+    (if (count($sources) gt 1) then
+        ('Sources')
+    else
+        ('Source'))
 
 let $sigla := source:getSiglaAsArray($participants)
 let $siglaLabel := if ($lang = 'de')
-                        then (if(count($sigla) gt 1)then('Siglen')else('Siglum'))
-                        else(if(count($sigla) gt 1)then('Sources')else('Source'))
-                        
+then
+    (if (count($sigla) gt 1) then
+        ('Siglen')
+    else
+        ('Siglum'))
+else
+    (if (count($sigla) gt 1) then
+        ('Sources')
+    else
+        ('Source'))
+
 let $annotIDlabel := if ($lang = 'de')
-                            then ('Anm.-ID')
-                            else ('Annot.-ID')
+then
+    ('Anm.-ID')
+else
+    ('Annot.-ID')
 
 return
-    if($target eq 'view')
-    then(
-    
-        <div class="annotView">
-            <div class="metaBox">
-                <div class="property priority">
-                    <div class="key">{$priorityLabel}</div>
-                    <div class="value">{$priority}</div>
+    if ($target eq 'view')
+    then
+        (
+        
+        <div
+            class="annotView">
+            <div
+                class="metaBox">
+                <div
+                    class="property priority">
+                    <div
+                        class="key">{$priorityLabel}</div>
+                    <div
+                        class="value">{$priority}</div>
                 </div>
-                <div class="property categories">
-                    <div class="key">{$categoriesLabel}</div>
-                    <div class="value">{string-join($categories, ', ')}</div>
+                <div
+                    class="property categories">
+                    <div
+                        class="key">{$categoriesLabel}</div>
+                    <div
+                        class="value">{string-join($categories, ', ')}</div>
                 </div>
                 <!--<div class="property sourceLabel">
                     <div class="key">{$sourcesLabel}</div>
                     <div class="value">{string-join($sources, ', ')}</div>
                 </div>-->
-                <div class="property sourceSiglums">
-                    <div class="key">{$siglaLabel}</div>
-                    <div class="value">{string-join($sigla, ', ')}</div>
+                <div
+                    class="property sourceSiglums">
+                    <div
+                        class="key">{$siglaLabel}</div>
+                    <div
+                        class="value">{string-join($sigla, ', ')}</div>
                 </div>
-                <div class="property annotID">
-                    <div class="key">{$annotIDlabel}</div>
-                    <div class="value">{$internalId}</div>
+                <div
+                    class="property annotID">
+                    <div
+                        class="key">{$annotIDlabel}</div>
+                    <div
+                        class="value">{$internalId}</div>
                 </div>
             </div>
-            <div class="contentBox">
+            <div
+                class="contentBox">
                 <h1>{eutil:getLocalizedName($annot, $lang)}</h1>
-                {annotation:getContent($annot,'', $edition)} 
+                {annotation:getContent($annot, '', $edition)}
             </div>
-           
-            	<!-- <div class="previewArea">
+            
+            <!-- <div class="previewArea">
                 {
                 
                  if($imageserver = 'digilib') then ( 
@@ -378,49 +486,67 @@ return
      
                 }
             </div>-->
-            
+        
         </div>
-    )
-    else(
-        <div class="annotTip">
-            <div class="metaBox">
-                <div class="property priority">
-                    <div class="key">{$priorityLabel}</div>
-                    <div class="value">{$priority}</div>
+        )
+    else
+        (
+        <div
+            class="annotTip">
+            <div
+                class="metaBox">
+                <div
+                    class="property priority">
+                    <div
+                        class="key">{$priorityLabel}</div>
+                    <div
+                        class="value">{$priority}</div>
                 </div>
-                <div class="property categories">
-                    <div class="key">{$categoriesLabel}</div>
-                    <div class="value">{string-join($categories, ', ')}</div>
+                <div
+                    class="property categories">
+                    <div
+                        class="key">{$categoriesLabel}</div>
+                    <div
+                        class="value">{string-join($categories, ', ')}</div>
                 </div>
                 <!--<div class="property sourceLabel">
                     <div class="key">{$sourcesLabel}</div>
                     <div class="value">{string-join($sources, ', ')}</div>
                 </div>-->
-                <div class="property sourceSiglums">
-                    <div class="key">{$siglaLabel}</div>
-                    <div class="value">{string-join($sigla, ', ')}</div>
+                <div
+                    class="property sourceSiglums">
+                    <div
+                        class="key">{$siglaLabel}</div>
+                    <div
+                        class="value">{string-join($sigla, ', ')}</div>
                 </div>
-                <div class="property annotID">
-                    <div class="key">{$annotIDlabel}</div>
-                    <div class="value">{$internalId}</div>
+                <div
+                    class="property annotID">
+                    <div
+                        class="key">{$annotIDlabel}</div>
+                    <div
+                        class="value">{$internalId}</div>
                 </div>
             </div>
-            <div class="contentBox">
+            <div
+                class="contentBox">
                 {
-                    if($annot/mei:annot)
-                    then(
+                    if ($annot/mei:annot)
+                    then
+                        (
                         for $a in $annot/mei:annot
                         return
                             (<h1>{eutil:getLocalizedTitle($annot, $lang)}</h1>,
-                            annotation:getContent($a,'', $edition))
-                    )
-                    else(
+                            annotation:getContent($a, '', $edition))
+                        )
+                    else
+                        (
                         (<h1>{eutil:getLocalizedTitle($annot, $lang)}</h1>,
-                        annotation:getContent($annot,'', $edition))
-                    )
+                        annotation:getContent($annot, '', $edition))
+                        )
                 }
             </div>
-           <!-- <div class="previewArea">
+            <!-- <div class="previewArea">
                 {
                     local:calculatePreviewsForTip(tokenize($annot/string(@plist),' '))
                     
@@ -428,4 +554,4 @@ return
             </div>-->
         </div>
         
-    )
\ No newline at end of file
+        )
\ No newline at end of file
diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index 4b5775baf..8e5513f5f 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -21,29 +21,29 @@ declare variable $edition_path := eutil:getPreference('edition_path', $edition);
  : Returns distinct list of catagories
  :)
 declare function local:getDistinctCategories($annots as element()*) as xs:string* {
-  
-  let $oldCats := distinct-values($annots/mei:ptr[@type = "categories"]/replace(@target, '#', ''))
-  let $newCats := distinct-values(for $annot in $annots
-  return
-    tokenize(replace(normalize-space($annot/@class), '#', ''), ' '))[contains(., 'annotation.category')]
-  
-  return
-    distinct-values(($oldCats, $newCats)[string-length() gt 0])
+    
+    let $oldCats := distinct-values($annots/mei:ptr[@type = "categories"]/replace(@target, '#', ''))
+    let $newCats := distinct-values(for $annot in $annots
+    return
+        tokenize(replace(normalize-space($annot/@class), '#', ''), ' '))[contains(., 'annotation.category')]
+    
+    return
+        distinct-values(($oldCats, $newCats)[string-length() gt 0])
 };
 
 (:~
  : Returns distinct list of annotation priorities
  :)
 declare function local:getDistinctPriorities($annots as element()*) as xs:string* {
-  
-  distinct-values(
-  for $annot in $annots
-  let $oldLink := $annot/mei:ptr[@type = "priority"]/replace(@target, '#', '')
-  let $classes := tokenize(replace(normalize-space($annot/@class), '#', ''), ' ')
-  let $newLink := $classes[starts-with(., 'ediromAnnotPrio')]
-  return
-    distinct-values(($oldLink, $newLink))[string-length(.) gt 0]
-  )
+    
+    distinct-values(
+    for $annot in $annots
+    let $oldLink := $annot/mei:ptr[@type = "priority"]/replace(@target, '#', '')
+    let $classes := tokenize(replace(normalize-space($annot/@class), '#', ''), ' ')
+    let $newLink := $classes[starts-with(., 'ediromAnnotPrio')]
+    return
+        distinct-values(($oldLink, $newLink))[string-length(.) gt 0]
+    )
 };
 
 let $mei := doc($uri)/root()
@@ -52,34 +52,34 @@ let $categories :=
 for $category in local:getDistinctCategories($annots)
 let $categoryElement := (collection($edition_path)/id($category)[mei:label or mei:name])[1]
 let $name := annotation:category_getName($categoryElement, eutil:getLanguage($edition))
-  order by $name
+    order by $name
 return
-  map {
-    'id': $category,
-    'name': $name
-  }
+    map {
+        'id': $category,
+        'name': $name
+    }
 
 let $prios :=
 for $priority in local:getDistinctPriorities($annots)
 let $name := annotation:getPriorityLabel((collection($edition_path)//id($priority)[mei:label or mei:name])[1])
-  order by $name
+    order by $name
 return
-  map {
-    'id': $priority,
-    'name': $name
-  }
+    map {
+        'id': $priority,
+        'name': $name
+    }
 
 let $map :=
 map {
-  'categories': array {$categories},
-  'priorities': array {$prios},
-  'count': count($annots)
+    'categories': array {$categories},
+    'priorities': array {$prios},
+    'count': count($annots)
 }
 
 return
-  $map
-  
-  (:
+    $map
+    
+    (:
 
 return concat('{categories: [',
         string-join(
diff --git a/add/data/xql/getAnnotationMeta.xql b/add/data/xql/getAnnotationMeta.xql
index d181fe603..5f7911245 100644
--- a/add/data/xql/getAnnotationMeta.xql
+++ b/add/data/xql/getAnnotationMeta.xql
@@ -25,16 +25,16 @@ xquery version "3.0";
     
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
-import module namespace annotation="http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
-import module namespace source="http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
+import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace exist="http://exist.sourceforge.net/NS/exist";
-declare namespace edirom_image="http://www.edirom.de/ns/image";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace exist = "http://exist.sourceforge.net/NS/exist";
+declare namespace edirom_image = "http://www.edirom.de/ns/image";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "xhtml";
@@ -51,52 +51,80 @@ let $annot := $doc/id($internalId)
 let $participants := annotation:getParticipants($annot)
 
 let $priority := annotation:getPriorityLabel($annot)
-let $priorityLabel := switch($priority)
-                      case "" return ()
-                      default return eutil:getLanguageString('view.window.AnnotationView_Priority', ())
+let $priorityLabel := switch ($priority)
+    case ""
+        return
+            ()
+    default return
+        eutil:getLanguageString('view.window.AnnotationView_Priority', ())
 
 let $categories := annotation:getCategoriesAsArray($annot)
-let $categoriesLabel := switch(count($categories))
-                        case 0 return ()
-                        case 1 return eutil:getLanguageString('view.window.AnnotationView_Category', ())
-                        default return eutil:getLanguageString('view.window.AnnotationView_Categories', ())
+let $categoriesLabel := switch (count($categories))
+    case 0
+        return
+            ()
+    case 1
+        return
+            eutil:getLanguageString('view.window.AnnotationView_Category', ())
+    default return
+        eutil:getLanguageString('view.window.AnnotationView_Categories', ())
 
 let $sources := eutil:getDocumentsLabelsAsArray($participants, $edition)
 let $sourcesLabel := if (count($sources) gt 1)
-                        then (eutil:getLanguageString('view.window.AnnotationView_Sources', ()))
-                        else (eutil:getLanguageString('view.window.AnnotationView_Source', ()))
+then
+    (eutil:getLanguageString('view.window.AnnotationView_Sources', ()))
+else
+    (eutil:getLanguageString('view.window.AnnotationView_Source', ()))
 
 let $sigla := source:getSiglaAsArray($participants)
-let $siglaLabel := switch(count($sigla))
-                    case 0 return ()
-                    case 1 return eutil:getLanguageString('view.window.AnnotationView_Source', ())(:TODO check for lang key:)
-                    default return eutil:getLanguageString('view.window.AnnotationView_Sources', ())
+let $siglaLabel := switch (count($sigla))
+    case 0
+        return
+            ()
+    case 1
+        return
+            eutil:getLanguageString('view.window.AnnotationView_Source', ()) (:TODO check for lang key:)
+    default return
+        eutil:getLanguageString('view.window.AnnotationView_Sources', ())
 let $annotIDlabel := eutil:getLanguageString('view.window.AnnotationView_AnnotationID', ())
 
 return
-
-    <div class="annotView">
-        <div class="metaBox">
-            <div class="property priority">
-                <div class="key">{$priorityLabel}</div>
-                <div class="value">{$priority}</div>
+    
+    <div
+        class="annotView">
+        <div
+            class="metaBox">
+            <div
+                class="property priority">
+                <div
+                    class="key">{$priorityLabel}</div>
+                <div
+                    class="value">{$priority}</div>
             </div>
-            <div class="property categories">
-                <div class="key">{$categoriesLabel}</div>
-                <div class="value">{string-join($categories, ', ')}</div>
+            <div
+                class="property categories">
+                <div
+                    class="key">{$categoriesLabel}</div>
+                <div
+                    class="value">{string-join($categories, ', ')}</div>
             </div>
             <!--<div class="property sourceLabel">
                 <div class="key">{$sourcesLabel}</div>
                 <div class="value">{string-join($sources, ', ')}</div>
             </div>-->
-            <div class="property sourceSiglums">
-                <div class="key">{$siglaLabel}</div>
-                <div class="value">{string-join($sigla, ', ')}</div>
+            <div
+                class="property sourceSiglums">
+                <div
+                    class="key">{$siglaLabel}</div>
+                <div
+                    class="value">{string-join($sigla, ', ')}</div>
             </div>
-            <div class="property annotID">
-                <div class="key">{$annotIDlabel}</div>
-                <div class="value">{$internalId}</div>
+            <div
+                class="property annotID">
+                <div
+                    class="key">{$annotIDlabel}</div>
+                <div
+                    class="value">{$internalId}</div>
             </div>
         </div>
     </div>
-    
\ No newline at end of file
diff --git a/add/data/xql/getAnnotationOpenAllUris.xql b/add/data/xql/getAnnotationOpenAllUris.xql
index 328727ee6..8c67b8d69 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -18,10 +18,10 @@ xquery version "3.0";
   along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
 :)
 
-import module namespace source="http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
-import module namespace teitext="http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
+import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
+import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
 
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "text";
@@ -30,34 +30,45 @@ declare option output:media-type "text/html";
 declare function local:getParticipants($annot as element()) as xs:string* {
     
     let $participants := tokenize($annot/string(@plist), ' ')
-    let $docs := distinct-values(for $p in $participants return substring-before($p, '#'))
+    let $docs := distinct-values(for $p in $participants
+    return
+        substring-before($p, '#'))
     return
         for $doc in $docs
         return
             
-            if(source:isSource($doc))
-            then(local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
-            
-            else if(teitext:isText($doc))
-            then(string-join($participants[starts-with(., $doc)], $doc), ' ')
+            if (source:isSource($doc))
+            then
+                (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
             
-            else()
+            else
+                if (teitext:isText($doc))
+                then
+                    (string-join($participants[starts-with(., $doc)], $doc), ' ')
+                
+                else
+                    ()
 };
 
 declare function local:getSourceParticipants($participants as xs:string*, $doc as xs:string) as xs:string* {
     let $elems := for $p in $participants
-                    let $id := substring-after($p, '#')
-                    let $elem := doc($doc)/id($id)
-                    order by count($elem/preceding::*)
-                    return $elem
-
+    let $id := substring-after($p, '#')
+    let $elem := doc($doc)/id($id)
+        order by count($elem/preceding::*)
+    return
+        $elem
+    
     return
         string-join(
-            (for $elem in $elems[local-name() != 'measure']
-            return concat($doc, '#', $elem/@xml:id)
-            ,
-            if(count($elems[local-name() = 'measure']) gt 0)then(local:groupSourceParticipants($elems[local-name() = 'measure'], $doc))else()
-            )
+        (for $elem in $elems[local-name() != 'measure']
+        return
+            concat($doc, '#', $elem/@xml:id)
+        ,
+        if (count($elems[local-name() = 'measure']) gt 0) then
+            (local:groupSourceParticipants($elems[local-name() = 'measure'], $doc))
+        else
+            ()
+        )
         , ' ')
 };
 
@@ -67,24 +78,32 @@ declare function local:groupSourceParticipants($elems as node()*, $doc as xs:str
         for $startId in distinct-values($startIds)
         let $elem := $elems/id($startId)
         let $measureCount := count(index-of($startIds, $startId)) - 1
-        let $tstamp2 := if($measureCount gt 0)
-                        then(concat('?tstamp2=', $measureCount, 'm+0'))
-                        else('')
+        let $tstamp2 := if ($measureCount gt 0)
+        then
+            (concat('?tstamp2=', $measureCount, 'm+0'))
+        else
+            ('')
         let $isInPart := exists(doc($doc)/id($startId)/ancestor::mei:part)
         return
             if ($isInPart)
-            then concat($doc, '#measure_', $elem/ancestor::mei:mdiv/@xml:id, '_', $elem/@n, $tstamp2)
-            else concat($doc, '#', $startId, $tstamp2)
+            then
+                concat($doc, '#measure_', $elem/ancestor::mei:mdiv/@xml:id, '_', $elem/@n, $tstamp2)
+            else
+                concat($doc, '#', $startId, $tstamp2)
 };
 
 declare function local:getStartIdsOfRange($elems as node()*, $pos as xs:integer, $id as xs:string) as xs:string* {
-    if($elems[$pos])
-    then(
-        if(count($elems[$pos - 1]/preceding::mei:measure) = count($elems[$pos]/preceding::mei:measure) - 1)
-        then(($id, local:getStartIdsOfRange($elems, $pos + 1, $id)))
-        else(($elems[$pos]/string(@xml:id), local:getStartIdsOfRange($elems, $pos + 1, $elems[$pos]/string(@xml:id))))
-    )
-    else()
+    if ($elems[$pos])
+    then
+        (
+        if (count($elems[$pos - 1]/preceding::mei:measure) = count($elems[$pos]/preceding::mei:measure) - 1)
+        then
+            (($id, local:getStartIdsOfRange($elems, $pos + 1, $id)))
+        else
+            (($elems[$pos]/string(@xml:id), local:getStartIdsOfRange($elems, $pos + 1, $elems[$pos]/string(@xml:id))))
+        )
+    else
+        ()
 };
 
 let $uri := request:get-parameter('uri', '')
@@ -93,5 +112,5 @@ let $doc := doc($uri)
 let $annot := $doc/id($annotId)
 
 return
-    string-join(local:getParticipants($annot),'
+    string-join(local:getParticipants($annot), '
     ')
\ No newline at end of file
diff --git a/add/data/xql/getAnnotationParticipants.xql b/add/data/xql/getAnnotationParticipants.xql
index e3fc191fc..f780eee3d 100644
--- a/add/data/xql/getAnnotationParticipants.xql
+++ b/add/data/xql/getAnnotationParticipants.xql
@@ -24,7 +24,7 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "text";
@@ -43,9 +43,10 @@ let $map := map {
 }
 
 let $options :=
-    map {
-        'method': 'json',
-        'media-type': 'text/plain'
-    }
+map {
+    'method': 'json',
+    'media-type': 'text/plain'
+}
 
-return serialize($map, $options)
+return
+    serialize($map, $options)
diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 577b3e3ea..49b87da3e 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -33,7 +33,7 @@ else
     (eutil:getPreference('image_prefix', $edition));
 
 declare function local:getParticipants($annot as element()) as map(*)* {
-
+    
     let $participants := tokenize($annot/string(@plist), ' ')
     let $docs := distinct-values(for $p in $participants
     return
@@ -45,18 +45,18 @@ declare function local:getParticipants($annot as element()) as map(*)* {
             if (source:isSource($doc))
             then
                 (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
-
+            
             else
                 if (teitext:isText($doc))
                 then
                     (local:getTextParticipants($participants[starts-with(., $doc)], $doc))
-
+                
                 else
                     ()
 };
 
 declare function local:getTextParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-
+    
     for $participant in $participants
     let $id := substring-after($participant, '#')
     let $hiddenData := concat('uri:', $doc, '__$$__participantId:', $id)
@@ -100,14 +100,14 @@ declare function local:getTextNotePrecedingContent($elem as element()) as xs:str
 };
 
 declare function local:getSourceParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-
+    
     let $combs := local:groupParticipants($participants, $doc)
-
+    
     return
-
+        
         for $comb in distinct-values($combs)
         let $partIndices := tokenize($comb, '-')
-
+        
         let $elems :=
         for $p in distinct-values($partIndices)
         let $relevant.participant := $participants[starts-with(., $doc)][number($p)]
@@ -118,16 +118,16 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             order by count($elem/preceding::*)
         return
             $elem
-
+            
             where count($elems) gt 0
-
+        
         let $zones := for $elem in $elems
         return
             local:getZone($elem)
-
+        
         let $type := local:getType($zones)
         let $label := local:getItemLabel($elems)
-
+        
         let $mdiv := '' (: TODO if($elem/ancestor-or-self::mei:mdiv) then($elem/ancestor-or-self::mei:mdiv/@label) else(''):)
         let $page := if ($zones[1]/parent::mei:surface/@label != '') then
             ($zones[1]/parent::mei:surface/string(@label))
@@ -135,20 +135,20 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             ($zones[1]/parent::mei:surface/string(@n))
         let $sourceLabel := source:getLabel($doc, $edition)
         let $siglum := ($elems[1]/root()//mei:*[@type eq 'siglum'])[1]/text()
-
+        
         let $part := string-join(distinct-values(for $e in $elems
         return
             $e/ancestor::mei:part/string(@label)), '-')
-
+        
         let $graphic := $zones[1]/../mei:graphic[@type = 'facsimile']
         let $imgWidth := number($graphic/@width)
         let $imgHeight := number($graphic/@height)
-
+        
         let $digilibBaseParams := local:getImageAreaPath($imageBasePath, $graphic)
         let $rect := local:getBoundingZone($zones)
-
+        
         let $digilibSizeParams := local:getImageAreaParams($rect, $imgWidth, $imgHeight)
-
+        
         let $hiddenData := map {
             'width': number($rect/@lrx) - number($rect/@ulx),
             'height': number($rect/@lry) - number($rect/@uly),
@@ -157,9 +157,9 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             'origH': $imgHeight,
             'origW': $imgWidth
         }
-
+        
         let $linkUri := concat('xmldb:exist://', document-uri($graphic/root()), '#', local:getSourceLinkTarget($elems, $zones))
-
+        
         return
             map {
                 'type': $type,
@@ -198,20 +198,20 @@ declare function local:getSourceLinkTarget($elems as node()*, $zones as node()*)
 };
 
 declare function local:groupParticipants($participants as xs:string*, $doc as xs:string) as xs:string* {
-
+    
     let $elems := for $p in $participants
     let $id := substring-after($p, '#')
     return
         doc($doc)/id($id)
-
+    
     let $zones := for $elem in $elems
     return
         local:getZone($elem)
-
+    
     let $combs := for $p at $i in $participants
     return
         local:getCombinations($elems, $zones, $i, count($zones))
-
+    
     return
         reverse(
         for $comb at $i in reverse($combs)
@@ -232,7 +232,7 @@ declare function local:groupParticipants($participants as xs:string*, $doc as xs
 };
 
 declare function local:getCombinations($elems as element()*, $zones as element()*, $i as xs:int, $total as xs:int) as xs:string {
-
+    
     let $currentZone := $zones[$i]
     let $currentElem := $elems[$i]
     return
@@ -257,7 +257,7 @@ declare function local:getCombinations($elems as element()*, $zones as element()
 };
 
 declare function local:compareZones($zone1 as element(), $zone2 as element()) as xs:boolean {
-
+    
     let $samePage := deep-equal($zone1/.., $zone2/..)
     let $overlapping := not(number($zone1/@ulx) gt number($zone2/@lrx) or number($zone1/@lrx) lt number($zone2/@ulx) or number($zone1/@uly) gt number($zone2/@lry) or number($zone1/@lry) lt number($zone2/@uly))
     return
@@ -267,7 +267,7 @@ declare function local:compareZones($zone1 as element(), $zone2 as element()) as
 declare function local:getElement($uri as xs:string) as element()? {
     let $doc := substring-before($uri, '#')
     let $id := substring-after($uri, '#')
-
+    
     return
         doc($doc)/id($id)
 };
@@ -314,17 +314,17 @@ declare function local:getBoundingZone($zones as element()*) as element() {
 
 :)
 declare function local:getImageAreaPath($basePath as xs:string, $graphic as element()?) as xs:string {
-
+    
     let $imagePath := string($graphic/@target)
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
     let $isAbsolute := starts-with($imagePath, 'http')
-
+    
     let $fields := if ($imageserver = 'leaflet') then
         (substring-before($imagePath, '.'))
     else
         ()
-
+    
     return
         if ($isAbsolute)
         then
@@ -355,17 +355,17 @@ declare function local:getImageAreaPath($basePath as xs:string, $graphic as elem
 :)
 declare function local:getImageAreaParams($zone as element()?, $imgWidth as xs:int, $imgHeight as xs:int) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-
+    
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-
+    
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-
+    
     return
         concat('&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit')
 };
@@ -406,9 +406,9 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                     if (count($items) gt 1)
                     then
                         (
-
+                        
                         let $measureNs := distinct-values($items/ancestor::mei:measure/@n)
-
+                        
                         let $label := if ($lang = 'de')
                         then
                             (if (count($measureNs) gt 1) then
@@ -420,11 +420,11 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                                 (concat('Bars ', $measureNs[1], '-', $measureNs[last()]))
                             else
                                 (concat('Bar ', $measureNs[1])))
-
+                        
                         return
-
+                            
                             concat($label, ' (', string-join($items/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ', '), ')')
-
+                        
                         )
                     else
                         (concat('Takt ', $items[1]/ancestor::mei:measure/@n, ' (', $items[1]/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ')'))
diff --git a/add/data/xql/getAnnotationText.xql b/add/data/xql/getAnnotationText.xql
index 2a7235350..24b42197b 100644
--- a/add/data/xql/getAnnotationText.xql
+++ b/add/data/xql/getAnnotationText.xql
@@ -25,14 +25,14 @@ xquery version "1.0";
     
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
-import module namespace annotation="http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace edirom_image="http://www.edirom.de/ns/image";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace edirom_image = "http://www.edirom.de/ns/image";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "xhtml";
@@ -50,9 +50,11 @@ let $annot := $doc/id($internalId)
 
 return
     
-    <div class="annotView">
-        <div class="contentBox">
+    <div
+        class="annotView">
+        <div
+            class="contentBox">
             <h1>{eutil:getLocalizedName($annot, $lang)}</h1>
-            {annotation:getContent($annot, '', $edition)} 
+            {annotation:getContent($annot, '', $edition)}
         </div>
     </div>
\ No newline at end of file
diff --git a/add/data/xql/getAnnotations.xql b/add/data/xql/getAnnotations.xql
index 99a73d40b..57730e9c7 100644
--- a/add/data/xql/getAnnotations.xql
+++ b/add/data/xql/getAnnotations.xql
@@ -26,11 +26,11 @@ xquery version "3.1";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-import module namespace annotation="http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
+import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "text";
@@ -38,18 +38,22 @@ declare option output:media-type "text/plain";
 
 let $edition := request:get-parameter('edition', '')
 let $uri := request:get-parameter('uri', '')
-let $uri := if(contains($uri, '#')) then(substring-before($uri, '#')) else($uri)
-
-let $map := 
-    map {
-        'success': true(),
-        'total': count(doc($uri)//mei:annot[@type = 'editorialComment']),
-        'annotations': array { annotation:annotationsToJSON($uri, $edition)}
-    }
+let $uri := if (contains($uri, '#')) then
+    (substring-before($uri, '#'))
+else
+    ($uri)
+
+let $map :=
+map {
+    'success': true(),
+    'total': count(doc($uri)//mei:annot[@type = 'editorialComment']),
+    'annotations': array {annotation:annotationsToJSON($uri, $edition)}
+}
 let $options :=
-    map {
-        'method': 'json',
-        'media-type': 'text/plain'
-    }
-    
-return serialize($map, $options)
\ No newline at end of file
+map {
+    'method': 'json',
+    'media-type': 'text/plain'
+}
+
+return
+    serialize($map, $options)
\ No newline at end of file
diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index 78d744e85..4016c3607 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -28,36 +28,36 @@ xquery version "3.0";
 
 import module namespace functx = "http://www.functx.com";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace request = "http://exist-db.org/xquery/request";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:getAnnotations($edition as xs:string, $edition_path as xs:string, $uri as xs:string, $elemIds as xs:string*) as xs:string* {
     
     for $measureId in $elemIds
-	let $uriPlusId := concat($uri, '#', $measureId)
-	let $annots := collection($edition_path)//mei:annot/@plist[tokenize(string(.), '\s+') = $uriPlusId]/..
-	return 
+    let $uriPlusId := concat($uri, '#', $measureId)
+    let $annots := collection($edition_path)//mei:annot/@plist[tokenize(string(.), '\s+') = $uriPlusId]/..
+    return
         for $annotation in $annots
-    	let $id := $annotation/string(@xml:id)
-    	let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
-    	let $prio := $annotation/mei:ptr[@type="priority"]/replace(@target, '#', '')
-    	let $cat := $annotation/mei:ptr[@type="categories"]/replace(@target, '#', '')
-    	return
-    		concat('
+        let $id := $annotation/string(@xml:id)
+        let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
+        let $prio := $annotation/mei:ptr[@type = "priority"]/replace(@target, '#', '')
+        let $cat := $annotation/mei:ptr[@type = "categories"]/replace(@target, '#', '')
+        return
+            concat('
            	{',
-               	'"id": "', $id, '", ',
-               	'"measureId": "', $measureId, '", ',
-               	'"fn": "loadLink(\"', $uri, '\")", ',
-               	'"uri": "', $uri, '", ',
-               	'"priority": "', $prio, '", ',
-               	'"categories": "', $cat, '"',
-           	'}')
+            '"id": "', $id, '", ',
+            '"measureId": "', $measureId, '", ',
+            '"fn": "loadLink(\"', $uri, '\")", ',
+            '"uri": "', $uri, '", ',
+            '"priority": "', $prio, '", ',
+            '"categories": "', $cat, '"',
+            '}')
 };
 
 
@@ -68,8 +68,9 @@ let $measureIds := request:get-parameter('measureIds', '')
 let $edition_path := eutil:getPreference('edition_path', $edition)
 let $annots := local:getAnnotations($edition, $edition_path, $uri, tokenize($measureIds, ','))
 
-return (
+return
+    (
     concat('[',
-	    string-join($annots, ','),
+    string-join($annots, ','),
     ']')
-)
+    )
diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index d57ed2704..b387a9f82 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -26,12 +26,12 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace ft="http://exist-db.org/xquery/lucene";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace ft = "http://exist-db.org/xquery/lucene";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
@@ -42,35 +42,37 @@ declare option exist:serialize "method=text media-type=text/plain omit-xml-decla
     @returns A sequence of annotation elements
 :)
 declare function local:findAnnotations($uri as xs:string) as element()* {
-
+    
     (: TODO: check if annotations hold URIs or IDRefs :)
-	collection('/db/contents')//mei:annot[matches(@plist, $uri)]
+    collection('/db/contents')//mei:annot[matches(@plist, $uri)]
 };
 
 
 declare function local:getAnnotations($uriSharp as xs:string, $annotations as element()*) as xs:string* {
     for $annotation in $annotations
-	let $id := $annotation/string(@xml:id)
-	let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
-	let $prio := $annotation/mei:ptr[@type="priority"]/replace(@target, '#', '')
-	let $cat := $annotation/mei:ptr[@type="categories"]/replace(@target, '#', '')
-	let $plist := for $p in tokenize($annotation/@plist, '\s+')
-					return 
-					   if(starts-with($p, $uriSharp))
-					   then(concat('{id:"', $id, '__', substring-after($p, $uriSharp),'"}'))
-					   else()
-	let $plist := string-join($plist, ',')				   
-	return
-		concat('
+    let $id := $annotation/string(@xml:id)
+    let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
+    let $prio := $annotation/mei:ptr[@type = "priority"]/replace(@target, '#', '')
+    let $cat := $annotation/mei:ptr[@type = "categories"]/replace(@target, '#', '')
+    let $plist := for $p in tokenize($annotation/@plist, '\s+')
+    return
+        if (starts-with($p, $uriSharp))
+        then
+            (concat('{id:"', $id, '__', substring-after($p, $uriSharp), '"}'))
+        else
+            ()
+    let $plist := string-join($plist, ',')
+    return
+        concat('
        	{',
-           	'id: "', $id, '", ',
-           	'plist: [', $plist, '], ',
-           	'svgList: [], ',
-           	'fn: "loadLink(\"', $uri, '\")", ',
-           	'uri: "', $uri, '", ',
-           	'priority: "', $prio, '", ',
-           	'categories: "', $cat, '"',
-       	'}')
+        'id: "', $id, '", ',
+        'plist: [', $plist, '], ',
+        'svgList: [], ',
+        'fn: "loadLink(\"', $uri, '\")", ',
+        'uri: "', $uri, '", ',
+        'priority: "', $prio, '", ',
+        'categories: "', $cat, '"',
+        '}')
 };
 
 let $uri := request:get-parameter('uri', '')
@@ -79,5 +81,5 @@ let $annotations := local:findAnnotations($uri)
 
 return
     concat('[',
-	    string-join(local:getAnnotations($uriSharp, $annotations), ','),
+    string-join(local:getAnnotations($uriSharp, $annotations), ','),
     ']')
diff --git a/add/data/xql/getAnnotationsOnPage.xql b/add/data/xql/getAnnotationsOnPage.xql
index 0dbba5837..6cb1373f9 100644
--- a/add/data/xql/getAnnotationsOnPage.xql
+++ b/add/data/xql/getAnnotationsOnPage.xql
@@ -29,15 +29,15 @@ xquery version "3.1";
 
 import module namespace functx = "http://www.functx.com";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
-declare namespace svg="http://www.w3.org/2000/svg";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
+declare namespace svg = "http://www.w3.org/2000/svg";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace ft="http://exist-db.org/xquery/lucene";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace ft = "http://exist-db.org/xquery/lucene";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "json";
@@ -53,33 +53,37 @@ declare option output:media-type "application/json";
 
 declare function local:getAnnotations($sourceUriSharp as xs:string, $surfaceId as xs:string, $annotations as element()*, $elems as element()*) as map(*)* {
     for $annotation in $annotations
-	let $id := $annotation/string(@xml:id)
-	let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
-	let $classes := tokenize(replace(normalize-space($annotation/@class),'#',''),' ')
-	let $prio := $annotation/mei:ptr[@type="priority"]/replace(@target, '#', '') || $classes[starts-with(.,'ediromAnnotPrio')]
-	let $cat := $annotation/mei:ptr[@type="categories"]/replace(@target, '#', '') || string-join($classes[contains(.,'annotation.category.')],' ')
-	let $plist.raw := 
-        for $p in tokenize(normalize-space($annotation/@plist), ' ')
-        let $p.noSharp := replace($p,'#','')
-        return 
-            if(starts-with($p, $sourceUriSharp)) 
-            then(substring-after($p, $sourceUriSharp)) 
-            else if($elems/@xml:id[. = $p.noSharp] or $elems/@id[. = $p.noSharp])
-            then($p.noSharp)
-            else()
+    let $id := $annotation/string(@xml:id)
+    let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
+    let $classes := tokenize(replace(normalize-space($annotation/@class), '#', ''), ' ')
+    let $prio := $annotation/mei:ptr[@type = "priority"]/replace(@target, '#', '') || $classes[starts-with(., 'ediromAnnotPrio')]
+    let $cat := $annotation/mei:ptr[@type = "categories"]/replace(@target, '#', '') || string-join($classes[contains(., 'annotation.category.')], ' ')
+    let $plist.raw :=
+    for $p in tokenize(normalize-space($annotation/@plist), ' ')
+    let $p.noSharp := replace($p, '#', '')
+    return
+        if (starts-with($p, $sourceUriSharp))
+        then
+            (substring-after($p, $sourceUriSharp))
+        else
+            if ($elems/@xml:id[. = $p.noSharp] or $elems/@id[. = $p.noSharp])
+            then
+                ($p.noSharp)
+            else
+                ()
     let $svgList := local:getAnnotSVGs($id, $plist.raw, $elems)
     let $plist := local:getParticipants($id, $plist.raw, $elems)
-	return
-	   map {
-	       'id': $id,
-	       'plist': array { $plist },
-	       'svgList': array { $svgList },
-	       'fn': 'loadLink("' || $uri || '")',
-	       'uri': $uri,
-	       'priority': $prio,
-	       'categories': $cat
-	   }
-	
+    return
+        map {
+            'id': $id,
+            'plist': array {$plist},
+            'svgList': array {$svgList},
+            'fn': 'loadLink("' || $uri || '")',
+            'uri': $uri,
+            'priority': $prio,
+            'categories': $cat
+        }
+
 };
 
 (:~
@@ -91,22 +95,22 @@ declare function local:getAnnotations($sourceUriSharp as xs:string, $surfaceId a
  : @returns A sequence of mei:annot elements
  :)
 declare function local:findAnnotations($edition as xs:string, $uri as xs:string, $elemIds as xs:string*) as element()* {
-
+    
     (: TODO: search in other documents and in other collections :)
     (: TODO: check if annotations hold URIs or IDRefs :)
-	functx:distinct-deep(
-		for $id in $elemIds
-		let $uriPlusId := concat($uri, '#', $id)
-		let $hashId := '#' || $id
-		let $annots := collection(eutil:getPreference('edition_path', $edition))//mei:annot
-		return 
-		    (: 
+    functx:distinct-deep(
+    for $id in $elemIds
+    let $uriPlusId := concat($uri, '#', $id)
+    let $hashId := '#' || $id
+    let $annots := collection(eutil:getPreference('edition_path', $edition))//mei:annot
+    return
+        (: 
                 The first predicate with `contains` is just a rough estimate to narrow down the result set.
                 It uses the index and is fast while the second (exact) predicate is generally too slow
             :)
-		    $annots[contains(@plist, $uriPlusId)][$uriPlusId = tokenize(@plist, '\s')] |  
-		    $annots[contains(@plist, $hashId)][$hashId = tokenize(@plist, '\s')]
-	)
+        $annots[contains(@plist, $uriPlusId)][$uriPlusId = tokenize(@plist, '\s')] |
+        $annots[contains(@plist, $hashId)][$hashId = tokenize(@plist, '\s')]
+    )
 };
 
 (:~
@@ -118,19 +122,20 @@ declare function local:findAnnotations($edition as xs:string, $uri as xs:string,
     @returns A JSON representation of the perticipants
 :)
 declare function local:getParticipants($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
-
+    
     let $participants := $elems[@xml:id = $plist]
     return
         for $p in $participants
         let $coord := local:getCoordinates($p)
-		return map {
-            'id': 'annotation__' || string($p/@xml:id),
-            'type': string($p/@type),
-            'ulx': $coord[1],
-            'uly': $coord[2],
-            'lrx': $coord[3],
-            'lry': $coord[4]
-		}
+        return
+            map {
+                'id': 'annotation__' || string($p/@xml:id),
+                'type': string($p/@type),
+                'ulx': $coord[1],
+                'uly': $coord[2],
+                'lrx': $coord[3],
+                'lry': $coord[4]
+            }
 };
 
 (:~
@@ -142,16 +147,17 @@ declare function local:getParticipants($annoId as xs:string, $plist as xs:string
     @returns A JSON representation of the perticipants
 :)
 declare function local:getAnnotSVGs($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
-
+    
     let $participants := $elems[@id = $plist]
     return
-    
+        
         for $svg in $participants
         let $id := $svg/@id
-        return map {
-            'id': $annoId || '__' || $id,
-            'svg': $svg
-        }
+        return
+            map {
+                'id': $annoId || '__' || $id,
+                'svg': $svg
+            }
 };
 
 (:~
@@ -161,10 +167,17 @@ declare function local:getAnnotSVGs($annoId as xs:string, $plist as xs:string*,
  : @returns A sequence with coordinates (ulx, uly, lrx, lry)
 :)
 declare function local:getCoordinates($participant as element()) as xs:integer+ {
-    let $zone := if(name($participant) = 'measure' or name($participant) = 'staff') then($participant/root()/id(substring($participant/@facs, 2))) else($participant)
-    return if($zone/@ulx) then(
-        (number($zone/@ulx), number($zone/@uly), number($zone/@lrx), number($zone/@lry))
-    )else ((-1, -1, -1, -1))
+    let $zone := if (name($participant) = 'measure' or name($participant) = 'staff') then
+        ($participant/root()/id(substring($participant/@facs, 2)))
+    else
+        ($participant)
+    return
+        if ($zone/@ulx) then
+            (
+            (number($zone/@ulx), number($zone/@uly), number($zone/@lrx), number($zone/@lry))
+            )
+        else
+            ((-1, -1, -1, -1))
 };
 
 let $edition := request:get-parameter('edition', '')
@@ -176,11 +189,12 @@ let $surfaceId := request:get-parameter('pageId', '')
 let $surface := $mei/id($surfaceId)
 let $zones := $surface//mei:zone
 
-let $measureLike := 
-    for $id in $zones[@type = 'measure' or @type = 'staff']/string(@xml:id)
-	let $ref := concat('#', $id)
-	return $mei//*[$ref = tokenize(@facs,'\s')]
-	
+let $measureLike :=
+for $id in $zones[@type = 'measure' or @type = 'staff']/string(@xml:id)
+let $ref := concat('#', $id)
+return
+    $mei//*[$ref = tokenize(@facs, '\s')]
+
 let $svgLike := $surface//svg:svg
 
 let $targetLike := $zones | $measureLike | $svgLike
@@ -190,4 +204,4 @@ let $annotations := local:findAnnotations($edition, $sourceUri, $targetLikeIds)
 let $annots := local:getAnnotations($sourceUriSharp, $surfaceId, $annotations, $targetLike)
 
 return
-    array { $annots }
+    array {$annots}
diff --git a/add/data/xql/getAudioPlayer.xql b/add/data/xql/getAudioPlayer.xql
index ef6eb5eef..05754f338 100644
--- a/add/data/xql/getAudioPlayer.xql
+++ b/add/data/xql/getAudioPlayer.xql
@@ -18,247 +18,342 @@ xquery version "3.0";
   along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
 let $uri := request:get-parameter('uri', '')
-let $docUri := if(contains($uri, '#')) then(substring-before($uri, '#')) else($uri)
+let $docUri := if (contains($uri, '#')) then
+    (substring-before($uri, '#'))
+else
+    ($uri)
 let $doc := eutil:getDoc($docUri)
-let $artist := $doc//mei:titleStmt/mei:respStmt/mei:persName[@role='artist']
+let $artist := $doc//mei:titleStmt/mei:respStmt/mei:persName[@role = 'artist']
 let $album := $doc//mei:meiHead/mei:fileDesc/mei:sourceDesc/mei:source[1]/mei:titleStmt/mei:title[1]/text()
-let $albumCover := $doc//mei:graphic[@type='cover']/string(@target)
+let $albumCover := $doc//mei:graphic[@type = 'cover']/string(@target)
 let $records := for $rec in $doc//mei:recording
-                let $recSource := $doc//mei:source[@xml:id = substring-after($rec/@decls, '#')]
-                let $recTitle := $recSource/mei:titleStmt/mei:title
-                let $avFile := $rec/mei:avFile[1]/string(@target)
-                return
-                    '{
+let $recSource := $doc//mei:source[@xml:id = substring-after($rec/@decls, '#')]
+let $recTitle := $recSource/mei:titleStmt/mei:title
+let $avFile := $rec/mei:avFile[1]/string(@target)
+return
+    '{
     					"name": "' || replace($recTitle, '"', '\\"') || '"
     					,"artist": "' || replace($artist, '"', '\\"') || '"
     					,"album": "' || replace($album, '"', '\\"') || '"
     					,"url": "' || $avFile || '"
     					,"live": false' ||
-    					',"cover_art_url": "' || $albumCover || '"' || '
+    ',"cover_art_url": "' || $albumCover || '"' || '
 				    }'
 
 let $audioConfig := '{
 			"songs": [' ||
-				string-join($records, ', ')
-			|| '],
+string-join($records, ', ')
+|| '],
 			"default_album_art": "../../resources/img/no-cover.png"
 		}'
 
 return
-<html>
-    <head>
-        <meta charset="UTF-8"/>
-        <title></title>
-        
-        <!-- **Amplitude.js** -->
-        <script type="text/javascript" src="../../resources/js/amplitude.min.js"></script>
-        <script type="text/javascript" src="../../resources/js/jquery-2.1.4.min.js"></script>
-        
-        <link rel="stylesheet" href="../../resources/css/audio-player.css"/>
-    </head>
-    <body>
-		<!-- Start Top Header -->
-		<div id="top-header" class="hidden-on-collapse">
-			<div id="top-header-toggle" class="small-player-toggle-contract"></div>
-
-			<div class="now-playing-title" amplitude-song-info="name"></div>
-			<div class="album-information"><span amplitude-song-info="artist"></span> - <span amplitude-song-info="album"></span></div>
-		</div>
-		<!-- End Top Header -->
-
-		<!-- Start Large Album Art -->
-		<div id="top-large-album" class="hidden-on-collapse">
-			<img id="large-album-art" amplitude-song-info="cover"/>
-		</div>
-		<!-- End Large Album Art -->
-
-		<!-- Begin Small Player -->
-		<div id="small-player">
-			<!-- Begin Small Player Left -->
-			<div id="small-player-left" class="hidden-on-expanded">
-				
-			</div>
-			<!-- End Small Player Left -->
-
-			<!-- Begin Small Player Album Art -->
-			<img id="small-player-album-art" class="hidden-on-expanded" amplitude-song-info="cover"/>
-			<!-- End Small Player Album Art -->
-
-			<!-- Begin Small Player Middle -->
-			<div id="small-player-middle" class="hidden-on-expanded">	
-				<div id="small-player-middle-top">
-					<!-- Begin Controls Container -->
-					<div id="small-player-middle-controls">
-						<div class="amplitude-prev" id="middle-top-previous"></div>
-						<div class="amplitude-play-pause amplitude-paused" amplitude-main-play-pause="true" id="middle-top-play-pause"></div>
-						<div class="amplitude-next" id="middle-top-next"></div>
-					</div>
-					<!-- End Controls Container -->
-
-					<!-- Begin Meta Container -->
-					<div id="small-player-middle-meta">
-						<div class="now-playing-title" amplitude-song-info="name"></div>
-						<div class="album-information"><span amplitude-song-info="artist"></span> - <span amplitude-song-info="album"></span></div>
-					</div>
-					<!-- End Meta Container -->
-				</div>
-				
-				<div id="small-player-middle-bottom">
-					<div class="amplitude-song-time-visualization" amplitude-single-song-time-visualization="true" id="song-time-visualization"></div>
-				</div>
-			</div>
-			<!-- End Small Player Middle -->
-
-			<!-- Begin Small Player Right -->
-			<div id="small-player-right" class="hidden-on-expanded">
-				<div id="toggle-playlist" class="playlist-toggle"></div>
-				<span class="current-time">
-					<span class="amplitude-current-minutes" amplitude-single-current-minutes="true">0</span>:<span class="amplitude-current-seconds" amplitude-single-current-seconds="true">00</span>
-				</span>
-			</div>
-			<!-- End Small Player Right -->
-
-			<!-- Begin Small Player Full Bottom -->
-			<div id="small-player-full-bottom" class="hidden-on-collapse">
-				<div id="toggle-playlist-full" class="playlist-toggle"></div>
-				<div id="small-player-full-bottom-controls">
-					<div class="amplitude-prev" id="middle-bottom-previous"></div>
-					<div class="amplitude-play-pause amplitude-paused" amplitude-main-play-pause="true" id="small-player-bottom-play-pause"></div>
-					<div class="amplitude-next" id="middle-top-next"></div>
-				</div>
-				<div id="small-player-full-bottom-info">
-					<span class="current-time">
-						<span class="amplitude-current-minutes" amplitude-single-current-minutes="true">0</span>:<span class="amplitude-current-seconds" amplitude-single-current-seconds="true">00</span>
-					</span>
-					
-					<div class="amplitude-song-time-visualization" amplitude-single-song-time-visualization="true" id="song-time-visualization-large"></div>
-					
-					<span class="time-duration">
-						<span class="amplitude-duration-minutes" amplitude-single-duration-minutes="true">0</span>:<span class="amplitude-duration-seconds" amplitude-single-duration-seconds="true">00</span>
-					</span>
-				</div>
-			</div>
-			<!-- End Small Player Full Bottom -->
-		</div>
-		<!-- End Small Player -->
-
-		<!-- Begin Playlist -->
-		<div id="small-player-playlist" style="height:auto;max-height:590px;margin-bottom:18px;">
-			<div class="information">
-				{$artist} – {$album}
-				<hr/>
-			</div>
-			{
-			for $rec at $i in $doc//mei:recording
-                let $recSource := $doc//mei:source[@xml:id = substring-after($rec/@decls, '#')]
-                let $recTitle := $recSource/mei:titleStmt/mei:title/text()
-                let $avFile := '../../../exist/apps/contents/audioData/' || $rec/mei:avFile[2]/string(@target)
-                return
+    <html>
+        <head>
+            <meta
+                charset="UTF-8"/>
+            <title></title>
+            
+            <!-- **Amplitude.js** -->
+            <script
+                type="text/javascript"
+                src="../../resources/js/amplitude.min.js"></script>
+            <script
+                type="text/javascript"
+                src="../../resources/js/jquery-2.1.4.min.js"></script>
+            
+            <link
+                rel="stylesheet"
+                href="../../resources/css/audio-player.css"/>
+        </head>
+        <body>
+            <!-- Start Top Header -->
+            <div
+                id="top-header"
+                class="hidden-on-collapse">
+                <div
+                    id="top-header-toggle"
+                    class="small-player-toggle-contract"></div>
                 
-                    <div class="amplitude-song-container amplitude-play-pause playlist-item" amplitude-song-index="{$i - 1}">
-				        <div class="playlist-meta">
-					       <div class="now-playing-title">{$recTitle}</div>
-					       <div class="album-information">{$artist} – {$album}</div>
-				        </div>
-				        <div style="clear: both;"></div>
-			         </div>
-		    }
-		</div>	
-		<!-- End Playlist -->
-	</body>
-    <script type="text/javascript">
-		Amplitude.init({$audioConfig});
-		
-		var expanded = false;
-		var playlistEpxanded = true;
-		/*
-			jQuery Visual Helpers
-		*/
-		$('#small-player').hover(function(){{
-			$('#small-player-middle-controls').show();
-			$('#small-player-middle-meta').hide();
-		}}, function(){{
-			$('#small-player-middle-controls').hide();
-			$('#small-player-middle-meta').show();
-
-		}});
-
-		$('#top-large-album').hover(function(){{
-			$('#top-header').show();
-			$('#small-player').show();
-		}}, function(){{
-			if( !$('#top-header').is(':hover')) {{
-			 if(!$('#small-player').is(':hover') ){{
-				$('#top-header').fadeOut(1000);
-				$('#small-player').fadeOut(1000);
-		      }}
-			}}
-		}});
-
-		$('#top-header').hover(function(){{
-			$('#top-header').show();
-			$('#small-player').show();
-		}}, function(){{
-
-		}});
-
-		/*
-			Toggles Album Art
-		*/
-		$('#small-player-toggle').click(function(){{
-			$('.hidden-on-collapse').show();
-			$('.hidden-on-expanded').hide();
-			/*
-				Is expanded
-			*/
-			expanded = true;
-
-			$('#small-player').css('border-top-left-radius', '0px');
-			$('#small-player').css('border-top-right-radius', '0px');
-		}});
-
-		$('#top-header-toggle').click(function(){{
-			$('.hidden-on-collapse').hide();
-			$('.hidden-on-expanded').show();
-			/*
-				Is collapsed
-			*/
-			expanded = false;
-
-			$('#small-player').css('border-top-left-radius', '5px');
-			$('#small-player').css('border-top-right-radius', '5px');
-		}});
-
-		$('.playlist-toggle').click(function(){{
-			if( playlistEpxanded ){{
-				$('#small-player-playlist').hide();
-
-				$('#small-player').css('border-bottom-left-radius', '5px');
-				$('#small-player').css('border-bottom-right-radius', '5px');
-
-				$('#large-album-art').css('border-bottom-left-radius', '5px');
-				$('#large-album-art').css('border-bottom-right-radius', '5px');
-
-				playlistEpxanded = false;
-			}}else{{
-				$('#small-player-playlist').show();
-
-				$('#small-player').css('border-bottom-left-radius', '0px');
-				$('#small-player').css('border-bottom-right-radius', '0px');
-
-				$('#large-album-art').css('border-bottom-left-radius', '0px');
-				$('#large-album-art').css('border-bottom-right-radius', '0px');
-
-				playlistEpxanded = true;
-			}}
-		}});
-	</script>
-</html>
+                <div
+                    class="now-playing-title"
+                    amplitude-song-info="name"></div>
+                <div
+                    class="album-information"><span
+                        amplitude-song-info="artist"></span> - <span
+                        amplitude-song-info="album"></span></div>
+            </div>
+            <!-- End Top Header -->
+            
+            <!-- Start Large Album Art -->
+            <div
+                id="top-large-album"
+                class="hidden-on-collapse">
+                <img
+                    id="large-album-art"
+                    amplitude-song-info="cover"/>
+            </div>
+            <!-- End Large Album Art -->
+            
+            <!-- Begin Small Player -->
+            <div
+                id="small-player">
+                <!-- Begin Small Player Left -->
+                <div
+                    id="small-player-left"
+                    class="hidden-on-expanded">
+                
+                </div>
+                <!-- End Small Player Left -->
+                
+                <!-- Begin Small Player Album Art -->
+                <img
+                    id="small-player-album-art"
+                    class="hidden-on-expanded"
+                    amplitude-song-info="cover"/>
+                <!-- End Small Player Album Art -->
+                
+                <!-- Begin Small Player Middle -->
+                <div
+                    id="small-player-middle"
+                    class="hidden-on-expanded">
+                    <div
+                        id="small-player-middle-top">
+                        <!-- Begin Controls Container -->
+                        <div
+                            id="small-player-middle-controls">
+                            <div
+                                class="amplitude-prev"
+                                id="middle-top-previous"></div>
+                            <div
+                                class="amplitude-play-pause amplitude-paused"
+                                amplitude-main-play-pause="true"
+                                id="middle-top-play-pause"></div>
+                            <div
+                                class="amplitude-next"
+                                id="middle-top-next"></div>
+                        </div>
+                        <!-- End Controls Container -->
+                        
+                        <!-- Begin Meta Container -->
+                        <div
+                            id="small-player-middle-meta">
+                            <div
+                                class="now-playing-title"
+                                amplitude-song-info="name"></div>
+                            <div
+                                class="album-information"><span
+                                    amplitude-song-info="artist"></span> - <span
+                                    amplitude-song-info="album"></span></div>
+                        </div>
+                        <!-- End Meta Container -->
+                    </div>
+                    
+                    <div
+                        id="small-player-middle-bottom">
+                        <div
+                            class="amplitude-song-time-visualization"
+                            amplitude-single-song-time-visualization="true"
+                            id="song-time-visualization"></div>
+                    </div>
+                </div>
+                <!-- End Small Player Middle -->
+                
+                <!-- Begin Small Player Right -->
+                <div
+                    id="small-player-right"
+                    class="hidden-on-expanded">
+                    <div
+                        id="toggle-playlist"
+                        class="playlist-toggle"></div>
+                    <span
+                        class="current-time">
+                        <span
+                            class="amplitude-current-minutes"
+                            amplitude-single-current-minutes="true">0</span>:<span
+                            class="amplitude-current-seconds"
+                            amplitude-single-current-seconds="true">00</span>
+                    </span>
+                </div>
+                <!-- End Small Player Right -->
+                
+                <!-- Begin Small Player Full Bottom -->
+                <div
+                    id="small-player-full-bottom"
+                    class="hidden-on-collapse">
+                    <div
+                        id="toggle-playlist-full"
+                        class="playlist-toggle"></div>
+                    <div
+                        id="small-player-full-bottom-controls">
+                        <div
+                            class="amplitude-prev"
+                            id="middle-bottom-previous"></div>
+                        <div
+                            class="amplitude-play-pause amplitude-paused"
+                            amplitude-main-play-pause="true"
+                            id="small-player-bottom-play-pause"></div>
+                        <div
+                            class="amplitude-next"
+                            id="middle-top-next"></div>
+                    </div>
+                    <div
+                        id="small-player-full-bottom-info">
+                        <span
+                            class="current-time">
+                            <span
+                                class="amplitude-current-minutes"
+                                amplitude-single-current-minutes="true">0</span>:<span
+                                class="amplitude-current-seconds"
+                                amplitude-single-current-seconds="true">00</span>
+                        </span>
+                        
+                        <div
+                            class="amplitude-song-time-visualization"
+                            amplitude-single-song-time-visualization="true"
+                            id="song-time-visualization-large"></div>
+                        
+                        <span
+                            class="time-duration">
+                            <span
+                                class="amplitude-duration-minutes"
+                                amplitude-single-duration-minutes="true">0</span>:<span
+                                class="amplitude-duration-seconds"
+                                amplitude-single-duration-seconds="true">00</span>
+                        </span>
+                    </div>
+                </div>
+                <!-- End Small Player Full Bottom -->
+            </div>
+            <!-- End Small Player -->
+            
+            <!-- Begin Playlist -->
+            <div
+                id="small-player-playlist"
+                style="height:auto;max-height:590px;margin-bottom:18px;">
+                <div
+                    class="information">
+                    {$artist} – {$album}
+                    <hr/>
+                </div>
+                {
+                    for $rec at $i in $doc//mei:recording
+                    let $recSource := $doc//mei:source[@xml:id = substring-after($rec/@decls, '#')]
+                    let $recTitle := $recSource/mei:titleStmt/mei:title/text()
+                    let $avFile := '../../../exist/apps/contents/audioData/' || $rec/mei:avFile[2]/string(@target)
+                    return
+                        
+                        <div
+                            class="amplitude-song-container amplitude-play-pause playlist-item"
+                            amplitude-song-index="{$i - 1}">
+                            <div
+                                class="playlist-meta">
+                                <div
+                                    class="now-playing-title">{$recTitle}</div>
+                                <div
+                                    class="album-information">{$artist} – {$album}</div>
+                            </div>
+                            <div
+                                style="clear: both;"></div>
+                        </div>
+                }
+            </div>
+            <!-- End Playlist -->
+        </body>
+        <script
+            type="text/javascript">
+            Amplitude.init({$audioConfig});
+            
+            var expanded = false;
+            var playlistEpxanded = true;
+            /*
+            jQuery Visual Helpers
+            */
+            $('#small-player').hover(function(){{
+            $('#small-player-middle-controls').show();
+            $('#small-player-middle-meta').hide();
+            }}, function(){{
+            $('#small-player-middle-controls').hide();
+            $('#small-player-middle-meta').show();
+            
+            }});
+            
+            $('#top-large-album').hover(function(){{
+            $('#top-header').show();
+            $('#small-player').show();
+            }}, function(){{
+            if( !$('#top-header').is(':hover')) {{
+            if(!$('#small-player').is(':hover') ){{
+            $('#top-header').fadeOut(1000);
+            $('#small-player').fadeOut(1000);
+            }}
+            }}
+            }});
+            
+            $('#top-header').hover(function(){{
+            $('#top-header').show();
+            $('#small-player').show();
+            }}, function(){{
+            
+            }});
+            
+            /*
+            Toggles Album Art
+            */
+            $('#small-player-toggle').click(function(){{
+            $('.hidden-on-collapse').show();
+            $('.hidden-on-expanded').hide();
+            /*
+            Is expanded
+            */
+            expanded = true;
+            
+            $('#small-player').css('border-top-left-radius', '0px');
+            $('#small-player').css('border-top-right-radius', '0px');
+            }});
+            
+            $('#top-header-toggle').click(function(){{
+            $('.hidden-on-collapse').hide();
+            $('.hidden-on-expanded').show();
+            /*
+            Is collapsed
+            */
+            expanded = false;
+            
+            $('#small-player').css('border-top-left-radius', '5px');
+            $('#small-player').css('border-top-right-radius', '5px');
+            }});
+            
+            $('.playlist-toggle').click(function(){{
+            if( playlistEpxanded ){{
+            $('#small-player-playlist').hide();
+            
+            $('#small-player').css('border-bottom-left-radius', '5px');
+            $('#small-player').css('border-bottom-right-radius', '5px');
+            
+            $('#large-album-art').css('border-bottom-left-radius', '5px');
+            $('#large-album-art').css('border-bottom-right-radius', '5px');
+            
+            playlistEpxanded = false;
+            }}else{{
+            $('#small-player-playlist').show();
+            
+            $('#small-player').css('border-bottom-left-radius', '0px');
+            $('#small-player').css('border-bottom-right-radius', '0px');
+            
+            $('#large-album-art').css('border-bottom-left-radius', '0px');
+            $('#large-album-art').css('border-bottom-right-radius', '0px');
+            
+            playlistEpxanded = true;
+            }}
+            }});
+        </script>
+    </html>
diff --git a/add/data/xql/getChapters.xql b/add/data/xql/getChapters.xql
index 5fd15933d..88cf9c9d9 100644
--- a/add/data/xql/getChapters.xql
+++ b/add/data/xql/getChapters.xql
@@ -20,88 +20,135 @@ xquery version "3.0";
   ID: $Id: getChapters.xql 1460 2012-10-15 15:58:35Z niko $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:changeFormat($n) as xs:string {
-    if($n = '1')
-    then('I')
-    else if($n = '2')
-    then('II')
-    else if($n = '3')
-    then('III')
-    else if($n = '4')
-    then('IV')
-    else if($n = '5')
-    then('V')
-    else if($n = '6')
-    then('VI')
-    else if($n = '7')
-    then('VII')
-    else if($n = '8')
-    then('VIII')
-    else if($n = '9')
-    then('IX')
-    else ($n)
+    if ($n = '1')
+    then
+        ('I')
+    else
+        if ($n = '2')
+        then
+            ('II')
+        else
+            if ($n = '3')
+            then
+                ('III')
+            else
+                if ($n = '4')
+                then
+                    ('IV')
+                else
+                    if ($n = '5')
+                    then
+                        ('V')
+                    else
+                        if ($n = '6')
+                        then
+                            ('VI')
+                        else
+                            if ($n = '7')
+                            then
+                                ('VII')
+                            else
+                                if ($n = '8')
+                                then
+                                    ('VIII')
+                                else
+                                    if ($n = '9')
+                                    then
+                                        ('IX')
+                                    else
+                                        ($n)
 };
 
 let $uri := request:get-parameter('uri', '')
 let $mode := request:get-parameter('mode', '')
 let $tei := eutil:getDoc($uri)/root()
 
-let $ret := for $elem in $tei//tei:div[@type='chapter'] | $tei//tei:div1 | $tei//tei:milestone[@unit='number'] | $tei//tei:div[@type='act']
-            let $pageId := if($mode = 'pageMode')then(substring-after($elem/preceding::tei:pb[1]/@facs, '#'))else('-1')
+let $ret := for $elem in $tei//tei:div[@type = 'chapter'] | $tei//tei:div1 | $tei//tei:milestone[@unit = 'number'] | $tei//tei:div[@type = 'act']
+let $pageId := if ($mode = 'pageMode') then
+    (substring-after($elem/preceding::tei:pb[1]/@facs, '#'))
+else
+    ('-1')
+return
+    if (($elem/local-name() = 'div' and $elem[@type = 'chapter']) or $elem/local-name() = 'div1')
+    then
+        (
+        let $chapter := $elem
+        let $n := if ($chapter/@n) then
+            (concat($chapter/@n, ': '))
+        else
+            ('')
+        let $label := if ($chapter/tei:head) then
+            ($chapter/tei:head)
+        else
+            ($chapter/text())
+        let $label := if (string-length($label) > 30) then
+            (concat(substring($label, 1, 30), '…'))
+        else
+            ($label)
+        return
+            concat('{',
+            'id: "', $chapter/string(@xml:id), '", ',
+            'name: "', concat($n, $label), '", ',
+            'pageId: "', $pageId, '"',
+            '}')
+        )
+    else
+        if ($elem/local-name() = 'milestone' and $elem[@unit = 'number'])
+        then
+            (
+            let $numbers := $elem
+            let $n := concat('No. ', $numbers/@n)
+                order by $numbers/number(replace(@n, '\D', '')),
+                    $numbers/@n
             return
-                if(($elem/local-name() = 'div' and $elem[@type='chapter']) or $elem/local-name() = 'div1')
-                then(
-                    let $chapter := $elem
-                    let $n := if($chapter/@n)then(concat($chapter/@n, ': '))else('')
-                    let $label := if($chapter/tei:head)then($chapter/tei:head)else($chapter/text())
-                    let $label := if(string-length($label) > 30)then(concat(substring($label, 1, 30), '…'))else($label)
+                concat('{',
+                'id: "', $numbers/string(@xml:id), '", ',
+                'name: "', $n, '", ',
+                'pageId: "', $pageId, '"',
+                '}')
+            )
+        else
+            if ($elem/local-name() = 'div' and $elem[@type = 'act'])
+            then
+                (
+                let $act := $elem
+                let $label := local:changeFormat($act/@n)
+                return
+                    for $scene in $act//tei:div[@type = 'scene']
+                    let $label := $label || ' - ' || string-join(for $t in $scene/tei:head//text()
                     return
-                        concat('{',
-                            'id: "', $chapter/string(@xml:id), '", ',
-                            'name: "', concat($n, $label), '", ',
-                            'pageId: "', $pageId, '"',
-                        '}')
-                )
-                else if($elem/local-name() = 'milestone' and $elem[@unit='number'])
-                then(
-                    let $numbers := $elem
-                    let $n := concat('No. ', $numbers/@n)
-                    order by $numbers/number(replace(@n, '\D', '')), $numbers/@n
+                        if (matches($t, '\w')) then
+                            ($t)
+                        else
+                            (), '')
+                    let $label := if (string-length($label) > 40) then
+                        (concat(substring($label, 1, 40), '…'))
+                    else
+                        ($label)
+                    let $pageId := if ($mode = 'pageMode') then
+                        (substring-after($scene/preceding::tei:pb[1]/@facs, '#'))
+                    else
+                        ('-1')
                     return
                         concat('{',
-                            'id: "', $numbers/string(@xml:id), '", ',
-                            'name: "', $n, '", ',
-                            'pageId: "', $pageId, '"',
+                        '"id": "', $scene/string(@xml:id), '", ',
+                        '"name": "', $label, '", ',
+                        'pageId: "', $pageId, '"',
                         '}')
                 )
-                else if($elem/local-name() = 'div' and $elem[@type='act'])
-                then(
-                    let $act := $elem
-                    let $label := local:changeFormat($act/@n)                                        
-                    return
-                        for $scene in $act//tei:div[@type='scene']
-                        let $label := $label || ' - ' || string-join(for $t in $scene/tei:head//text()
-                                                        return
-                                                            if(matches($t, '\w'))then($t)else(), '')
-                        let $label := if(string-length($label) > 40)then(concat(substring($label, 1, 40), '…'))else($label)
-                        let $pageId := if($mode = 'pageMode')then(substring-after($scene/preceding::tei:pb[1]/@facs, '#'))else('-1')
-                        return
-                            concat('{',
-                                '"id": "', $scene/string(@xml:id), '", ',
-                                '"name": "', $label, '", ',
-                                'pageId: "', $pageId, '"',
-                            '}')
-                )
-                else()
+            else
+                ()
 
-return concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+return
+    concat('[', string-join($ret, ','), ']')
\ No newline at end of file
diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index c3f26fffe..e2bf1697f 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -20,56 +20,60 @@ xquery version "1.0";
   ID: $Id: getConcordances.xql 1219 2012-01-20 08:33:28Z daniel $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace edirom="http://www.edirom.de/ns/1.3";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace edirom = "http://www.edirom.de/ns/1.3";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare variable $lang := request:get-parameter('lang', '');
 
 declare function local:getGroups($parent) {
-    if($parent/edirom:groups)
-    then(
+    if ($parent/edirom:groups)
+    then
+        (
         concat('{', 'label: "', eutil:getLocalizedName($parent/edirom:groups, $lang), '", groups: [', local:getSingleGroups($parent/edirom:groups), ']}')
-    )
-    else(string('null'))
+        )
+    else
+        (string('null'))
 };
 
 declare function local:getSingleGroups($parent) {
     string-join(
-        for $group in $parent/edirom:group
-        return
-                concat('
+    for $group in $parent/edirom:group
+    return
+        concat('
                 {',
-                    'name: "', eutil:getLocalizedName($group, $lang), '", ',
-                    'connections: ', local:getConnections($group),
-                '}')
+        'name: "', eutil:getLocalizedName($group, $lang), '", ',
+        'connections: ', local:getConnections($group),
+        '}')
     , ',')
 };
 
 declare function local:getConnections($parent) {
-    if($parent/edirom:connections)
-    then(
+    if ($parent/edirom:connections)
+    then
+        (
         concat('{', 'label: "', eutil:getLocalizedName($parent/edirom:connections, $lang), '", connections: [', local:getSingleConnections($parent/edirom:connections), ']}')
-    )
-    else(string('null'))
+        )
+    else
+        (string('null'))
 };
 
 declare function local:getSingleConnections($parent) {
     string-join(
-        for $connection in $parent/edirom:connection
-        return
-                concat('
+    for $connection in $parent/edirom:connection
+    return
+        concat('
                 {',
-                    'name: "', $connection/string(@name), '", ',
-                    'plist: "', $connection/@plist, '"',
-                '}')
+        'name: "', $connection/string(@name), '", ',
+        'plist: "', $connection/@plist, '"',
+        '}')
     , ',')
 };
 
@@ -79,19 +83,20 @@ let $workId := request:get-parameter('workId', '')
 let $work := $mei/id($workId)
 let $concordances := $work//edirom:concordance
 
-return (
+return
+    (
     concat('[',
-
+    
     string-join(
-        for $concordance in $concordances
-        return
-                concat('
+    for $concordance in $concordances
+    return
+        concat('
                 {',
-                    'name: "', eutil:getLocalizedName($concordance, $lang), '", ',
-                    'groups: ', local:getGroups($concordance), ', ',
-                    'connections: ', local:getConnections($concordance),
-                '}')
+        'name: "', eutil:getLocalizedName($concordance, $lang), '", ',
+        'groups: ', local:getGroups($concordance), ', ',
+        'connections: ', local:getConnections($concordance),
+        '}')
     , ','),
-
+    
     ']')
-)
+    )
diff --git a/add/data/xql/getEdition.xql b/add/data/xql/getEdition.xql
index 77bddc6b4..1ab2eee76 100644
--- a/add/data/xql/getEdition.xql
+++ b/add/data/xql/getEdition.xql
@@ -26,9 +26,10 @@ xquery version "1.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 let $uri := request:get-parameter('id', '')
-return edition:toJSON($uri)
\ No newline at end of file
+return
+    edition:toJSON($uri)
\ No newline at end of file
diff --git a/add/data/xql/getEditionURI.xql b/add/data/xql/getEditionURI.xql
index 22256a695..10ca59704 100644
--- a/add/data/xql/getEditionURI.xql
+++ b/add/data/xql/getEditionURI.xql
@@ -24,12 +24,14 @@ xquery version "3.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 let $uri := request:get-parameter('uri', '')
 return
-    if(doc-available($uri))
-    then($uri)
-    else(edition:findEdition($uri))
\ No newline at end of file
+    if (doc-available($uri))
+    then
+        ($uri)
+    else
+        (edition:findEdition($uri))
\ No newline at end of file
diff --git a/add/data/xql/getExtendedStaff.xql b/add/data/xql/getExtendedStaff.xql
index 05f0674f3..19dfa2813 100644
--- a/add/data/xql/getExtendedStaff.xql
+++ b/add/data/xql/getExtendedStaff.xql
@@ -1,12 +1,12 @@
 xquery version "3.0";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
-declare namespace system="http://exist-db.org/xquery/system";
-declare namespace transform="http://exist-db.org/xquery/transform";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace system = "http://exist-db.org/xquery/system";
+declare namespace transform = "http://exist-db.org/xquery/transform";
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
@@ -20,39 +20,69 @@ let $basePath := eutil:get-app-base-url()
 let $mei := doc($uri)/root()
 let $mdivId := $mei//mei:mdiv[1]/data(@xml:id)
 return
-<html>
-    <head>
-        <title>Verovio</title>
-        <script src="https://www.verovio.org/javascript/latest/verovio-toolkit.js"></script>
-        <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
-        <script src="//code.iconify.design/1/1.0.6/iconify.min.js"></script>
-        <script src="{$basePath}/resources/js/he.js"></script>
-
-        <script src="{$basePath}/resources/js/tipped/tipped.js"></script>
-        <link rel="stylesheet" type="text/css" href="{$basePath}/resources/css/tipped/tipped.css"/>
-        
-        <link rel="stylesheet" type="text/css" href="{$basePath}/resources/css/verovio-view.css"/>
-        
-    </head>
-	<body>
-        <div id="output"></div>
-        <div id="toolbar" class="noselect">
-            <span class="button" onclick="prevPage()">
-                <span class="iconify" data-icon="mdi-chevron-left" style="font-size: 1.3em;"></span>
-            </span>
-            <span id="page">1</span> / <span id="pageCount">1</span>
-            <span class="button" onclick="nextPage()">
-                <span class="iconify" data-icon="mdi-chevron-right" style="font-size: 1.3em;"></span>
-            </span>
-        </div>
-        <div class='lds-roller'><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
+    <html>
+        <head>
+            <title>Verovio</title>
+            <script
+                src="https://www.verovio.org/javascript/latest/verovio-toolkit.js"></script>
+            <script
+                src="https://code.jquery.com/jquery-3.5.1.min.js"
+                integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
+                crossorigin="anonymous"></script>
+            <script
+                src="//code.iconify.design/1/1.0.6/iconify.min.js"></script>
+            <script
+                src="{$basePath}/resources/js/he.js"></script>
+            
+            <script
+                src="{$basePath}/resources/js/tipped/tipped.js"></script>
+            <link
+                rel="stylesheet"
+                type="text/css"
+                href="{$basePath}/resources/css/tipped/tipped.css"/>
+            
+            <link
+                rel="stylesheet"
+                type="text/css"
+                href="{$basePath}/resources/css/verovio-view.css"/>
         
-        <script>
-            var uri = "{$uri}";
-            var edition = "{$edition}";
-            var movementId = "{$mdivId}";
-            var appBasePath = "{$basePath}";
-        </script>
-        <script src="{$basePath}/resources/js/verovio-view.js"></script>
-    </body>
-</html>
+        </head>
+        <body>
+            <div
+                id="output"></div>
+            <div
+                id="toolbar"
+                class="noselect">
+                <span
+                    class="button"
+                    onclick="prevPage()">
+                    <span
+                        class="iconify"
+                        data-icon="mdi-chevron-left"
+                        style="font-size: 1.3em;"></span>
+                </span>
+                <span
+                    id="page">1</span> / <span
+                    id="pageCount">1</span>
+                <span
+                    class="button"
+                    onclick="nextPage()">
+                    <span
+                        class="iconify"
+                        data-icon="mdi-chevron-right"
+                        style="font-size: 1.3em;"></span>
+                </span>
+            </div>
+            <div
+                class='lds-roller'><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
+            
+            <script>
+                var uri = "{$uri}";
+                var edition = "{$edition}";
+                var movementId = "{$mdivId}";
+                var appBasePath = "{$basePath}";
+            </script>
+            <script
+                src="{$basePath}/resources/js/verovio-view.js"></script>
+        </body>
+    </html>
diff --git a/add/data/xql/getHeader.xql b/add/data/xql/getHeader.xql
index 397ea6215..9efc2e440 100644
--- a/add/data/xql/getHeader.xql
+++ b/add/data/xql/getHeader.xql
@@ -20,32 +20,59 @@ xquery version "1.0";
   ID: $Id: getHeader.xql 1455 2012-10-11 10:42:55Z daniel $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
-declare namespace system="http://exist-db.org/xquery/system";
-declare namespace transform="http://exist-db.org/xquery/transform";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace system = "http://exist-db.org/xquery/system";
+declare namespace transform = "http://exist-db.org/xquery/transform";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
 let $uri := request:get-parameter('uri', '')
 let $type := request:get-parameter('type', '')
-let $docUri := if(contains($uri, '#')) then(substring-before($uri, '#')) else($uri)
+let $docUri := if (contains($uri, '#')) then
+    (substring-before($uri, '#'))
+else
+    ($uri)
 let $doc := eutil:getDoc($docUri)
 let $lang := request:get-parameter('lang', 'de')
 
 let $base := concat(replace(system:get-module-load-path(), 'embedded-eXist-server', ''), '/../xslt/') (: TODO: Prüfen, wie wir an dem replace vorbei kommen:)
 
 return
-    if($type = 'work')
-    then(transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param name="base" value="{$base}"/><param name="lang" value="{$lang}"/></parameters>))
-    else if($type = 'source')
-    then(transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param name="base" value="{$base}"/><param name="lang" value="{$lang}"/></parameters>))
-    else if($type = 'recording')
-    then(transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param name="base" value="{$base}"/><param name="lang" value="{$lang}"/></parameters>))
-    else if($type = 'text')
-    then(transform:transform($doc, concat($base, 'teiHeader2HTML.xsl'),<parameters><param name="base" value="{$base}"/><param name="lang" value="{$lang}"/></parameters>))
-    else()
\ No newline at end of file
+    if ($type = 'work')
+    then
+        (transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param
+                name="base"
+                value="{$base}"/><param
+                name="lang"
+                value="{$lang}"/></parameters>))
+    else
+        if ($type = 'source')
+        then
+            (transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param
+                    name="base"
+                    value="{$base}"/><param
+                    name="lang"
+                    value="{$lang}"/></parameters>))
+        else
+            if ($type = 'recording')
+            then
+                (transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param
+                        name="base"
+                        value="{$base}"/><param
+                        name="lang"
+                        value="{$lang}"/></parameters>))
+            else
+                if ($type = 'text')
+                then
+                    (transform:transform($doc, concat($base, 'teiHeader2HTML.xsl'), <parameters><param
+                            name="base"
+                            value="{$base}"/><param
+                            name="lang"
+                            value="{$lang}"/></parameters>))
+                else
+                    ()
\ No newline at end of file
diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
index 09dc6cbf0..0a3be7416 100644
--- a/add/data/xql/getHelp.xql
+++ b/add/data/xql/getHelp.xql
@@ -29,10 +29,24 @@ let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '')
 let $doc := doc(concat('../../help/help_', $lang, '.xml'))
 
 let $xsl := doc('../xslt/edirom_langReplacement.xsl')
-let $doc := transform:transform($doc, $xsl, <parameters><param name="base" value="{concat($base, '/../xslt/')}"/><param name="lang" value="{$lang}"/></parameters>)
+let $doc := transform:transform($doc, $xsl, <parameters><param
+        name="base"
+        value="{concat($base, '/../xslt/')}"/><param
+        name="lang"
+        value="{$lang}"/></parameters>)
 
 let $xsl := doc('../xslt/teiBody2HTML.xsl')
-let $doc := transform:transform($doc, $xsl, <parameters><param name="base" value="{concat($base, '/../xslt/')}"/><param name="lang" value="{$lang}"/><param name="tocDepth" value="1"/><param name="graphicsPrefix" value="help/"/></parameters>)
+let $doc := transform:transform($doc, $xsl, <parameters><param
+        name="base"
+        value="{concat($base, '/../xslt/')}"/><param
+        name="lang"
+        value="{$lang}"/><param
+        name="tocDepth"
+        value="1"/><param
+        name="graphicsPrefix"
+        value="help/"/></parameters>)
 
 return
-    transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param name="idPrefix" value="{$idPrefix}"/></parameters>)
\ No newline at end of file
+    transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param
+            name="idPrefix"
+            value="{$idPrefix}"/></parameters>)
\ No newline at end of file
diff --git a/add/data/xql/getInternalIdType.xql b/add/data/xql/getInternalIdType.xql
index 43cd7314b..e3312e50f 100644
--- a/add/data/xql/getInternalIdType.xql
+++ b/add/data/xql/getInternalIdType.xql
@@ -20,44 +20,62 @@ xquery version "1.0";
   ID: $Id: getInternalIdType.xql 1289 2012-03-26 13:11:43Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 
 import module namespace functx = "http://www.functx.com";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 let $uri := request:get-parameter('uri', '')
-let $docUri := if(contains($uri, '#')) then(substring-before($uri, '#')) else($uri)
-let $internalId := if(contains($uri, '#')) then(substring-after($uri, '#')) else()
-let $internalId := if(contains($internalId, '?')) then(substring-before($internalId, '?')) else($internalId)
+let $docUri := if (contains($uri, '#')) then
+    (substring-before($uri, '#'))
+else
+    ($uri)
+let $internalId := if (contains($uri, '#')) then
+    (substring-after($uri, '#'))
+else
+    ()
+let $internalId := if (contains($internalId, '?')) then
+    (substring-before($internalId, '?'))
+else
+    ($internalId)
 
 let $doc := doc($docUri)
 let $internal := $doc/id($internalId)
 
 (: Specific handling of virtual measure IDs for parts in OPERA project :)
-let $internal := if(exists($internal))then($internal)else(
-                        if(starts-with($internalId, 'measure_') and $doc//mei:parts)
-                        then(
-                            let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
-                            let $measureN := functx:substring-after-last($internalId, '_')
-                            return
-                                (
-                                    if (
-                                        $doc/id($mdivId)//mei:measure/@label
-                                    )
-                                    then (
-                                        $doc/id($mdivId)//mei:measure[@label eq $measureN][1]
-                                    )
-                                    else (
-                                        $doc/id($mdivId)//mei:measure[@n eq $measureN][1]
-                                    )
-                                )
-                        )
-                        else($internal)
-                    )
+let $internal := if (exists($internal)) then
+    ($internal)
+else
+    (
+    if (starts-with($internalId, 'measure_') and $doc//mei:parts)
+    then
+        (
+        let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
+        let $measureN := functx:substring-after-last($internalId, '_')
+        return
+            (
+            if (
+            $doc/id($mdivId)//mei:measure/@label
+            )
+            then
+                (
+                $doc/id($mdivId)//mei:measure[@label eq $measureN][1]
+                )
+            else
+                (
+                $doc/id($mdivId)//mei:measure[@n eq $measureN][1]
+                )
+            )
+        )
+    else
+        ($internal)
+    )
 
 return
-    if(exists($internal))
-    then(local-name($internal))
-    else('unknown')
+    if (exists($internal))
+    then
+        (local-name($internal))
+    else
+        ('unknown')
diff --git a/add/data/xql/getLanguageFile.xql b/add/data/xql/getLanguageFile.xql
index 714338f79..1da32f4e7 100644
--- a/add/data/xql/getLanguageFile.xql
+++ b/add/data/xql/getLanguageFile.xql
@@ -26,9 +26,9 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace request = "http://exist-db.org/xquery/request";
 
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
@@ -43,24 +43,25 @@ let $file := doc(concat('../locale/edirom-lang-', $lang, '.xml'))
 let $projectFile := doc(edition:getLanguageFileURI($edition, $lang))
 
 return
-    if($mode = 'json')
-    then(
+    if ($mode = 'json')
+    then
+        (
         concat('{',
         'lang: "', $file/langFile/lang/text(), '",',
         'version: "', $file/langFile/version/text(), '",',
-        'keys: {', 
-            string-join((
-                for $entry in $file//entry
-                return
-                    concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-
-                ,
-                for $entry in $projectFile//entry
-                return
-                    concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-            ), ','),
+        'keys: {',
+        string-join((
+        for $entry in $file//entry
+        return
+            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
+        
+        ,
+        for $entry in $projectFile//entry
+        return
+            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
+        ), ','),
         '}',
         '}')
-    )
-    else($file)
-    
\ No newline at end of file
+        )
+    else
+        ($file)
diff --git a/add/data/xql/getMeasure.xql b/add/data/xql/getMeasure.xql
index 99e592b6f..f3fe68543 100644
--- a/add/data/xql/getMeasure.xql
+++ b/add/data/xql/getMeasure.xql
@@ -20,11 +20,11 @@ xquery version "1.0";
   ID: $Id: getMeasurePage.xql 1254 2012-02-01 14:07:25Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 import module namespace functx = "http://www.functx.com";
 
@@ -32,22 +32,30 @@ declare option exist:serialize "method=text media-type=text/plain omit-xml-decla
 
 let $id := request:get-parameter('id', '')
 let $measureId := request:get-parameter('measureId', '')
-let $measureCount := if(contains($measureId, 'tstamp2='))then(number(substring-before(substring-after($measureId, 'tstamp2='), 'm')) + 1)else(1)
-let $measureId := if(contains($measureId, '?'))then(substring-before($measureId, '?'))else($measureId)
+let $measureCount := if (contains($measureId, 'tstamp2=')) then
+    (number(substring-before(substring-after($measureId, 'tstamp2='), 'm')) + 1)
+else
+    (1)
+let $measureId := if (contains($measureId, '?')) then
+    (substring-before($measureId, '?'))
+else
+    ($measureId)
 
 let $mei := doc($id)/root()
 let $movementId := $mei/id($measureId)/ancestor::mei:mdiv[1]/@xml:id
 
 (: Specific handling of virtual measure IDs for parts in OPERA project :)
-let $movementId := if(starts-with($measureId, 'measure_') and $mei//mei:parts)
-                   then(
-                        functx:substring-before-last(substring-after($measureId, 'measure_'), '_')
-                    )
-                    else($movementId)
+let $movementId := if (starts-with($measureId, 'measure_') and $mei//mei:parts)
+then
+    (
+    functx:substring-before-last(substring-after($measureId, 'measure_'), '_')
+    )
+else
+    ($movementId)
 
 return
     concat('{',
-        'measureId:"', $measureId, '",',
-        'movementId:"', $movementId, '",',
-        'measureCount:"', $measureCount, '"',
+    'measureId:"', $measureId, '",',
+    'movementId:"', $movementId, '",',
+    'measureCount:"', $measureCount, '"',
     '}')
\ No newline at end of file
diff --git a/add/data/xql/getMeasurePage.xql b/add/data/xql/getMeasurePage.xql
index a20ce63ce..5ee226754 100644
--- a/add/data/xql/getMeasurePage.xql
+++ b/add/data/xql/getMeasurePage.xql
@@ -20,22 +20,24 @@ xquery version "1.0";
   ID: $Id: getMeasurePage.xql 1254 2012-02-01 14:07:25Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:findMeasure($mei, $movementId, $measureIdName) {
     let $m := $mei/id($measureIdName)
     return
-        if($m)
-        then($m)
-        else(
+        if ($m)
+        then
+            ($m)
+        else
+            (
             ($mei/id($movementId)//mei:measure[@n eq $measureIdName])[1]
-        )
+            )
 };
 
 declare function local:getMeasure($mei, $measure, $movementId) as xs:string {
@@ -44,22 +46,22 @@ declare function local:getMeasure($mei, $measure, $movementId) as xs:string {
     let $zoneId := substring-after($measure/string(@facs), '#')
     let $zone := $mei/id($zoneId)
     let $surface := $zone/parent::mei:surface
-    let $graphic := $surface/mei:graphic[@type='facsimile']
+    let $graphic := $surface/mei:graphic[@type = 'facsimile']
     
     return
-    
+        
         concat('{',
-            'measureId:"', $measureId, '",',
-            'zoneId:"', $zoneId, '",',
-            'pageId:"', $surface/string(@xml:id), '", ',
-            'movementId:"', $movementId, '",',
-            'path: "', $graphic/string(@target), '", ',
-            'width: "', $graphic/string(@width), '", ',
-            'height: "', $graphic/string(@height), '", ',
-            'ulx: "', $zone/string(@ulx), '", ',
-            'uly: "', $zone/string(@uly), '", ',
-            'lrx: "', $zone/string(@lrx), '", ',
-            'lry: "', $zone/string(@lry), '"',
+        'measureId:"', $measureId, '",',
+        'zoneId:"', $zoneId, '",',
+        'pageId:"', $surface/string(@xml:id), '", ',
+        'movementId:"', $movementId, '",',
+        'path: "', $graphic/string(@target), '", ',
+        'width: "', $graphic/string(@width), '", ',
+        'height: "', $graphic/string(@height), '", ',
+        'ulx: "', $zone/string(@ulx), '", ',
+        'uly: "', $zone/string(@uly), '", ',
+        'lrx: "', $zone/string(@lrx), '", ',
+        'lry: "', $zone/string(@lry), '"',
         '}')
 };
 
@@ -72,19 +74,27 @@ let $mei := doc($id)/root()
 
 let $measure := local:findMeasure($mei, $movementId, $measureIdName)
 let $extraMeasures := for $i in (2 to xs:integer($measureCount))
-                      let $m := $measure/following-sibling::mei:measure[$i - 1] (: TODO: following-sibling könnte problematisch sein, da so section-Grenzen nicht überwunden werden :)
-                      return
-                        if($m)then($m)else() 
-
-(: Extra measure parts :)                         
+let $m := $measure/following-sibling::mei:measure[$i - 1] (: TODO: following-sibling könnte problematisch sein, da so section-Grenzen nicht überwunden werden :)
+return
+    if ($m) then
+        ($m)
+    else
+        ()
+        
+        (: Extra measure parts :)
 let $extraMeasuresParts := for $exm in $measure | $extraMeasures
-                        return $exm/following-sibling::mei:measure[(exists(@label) and @label = $exm/@label) or (not(exists(@label)) and @n = $exm/@n)]
+return
+    $exm/following-sibling::mei:measure[(exists(@label) and @label = $exm/@label) or (not(exists(@label)) and @n = $exm/@n)]
 
 return
     concat('[',
-        string-join((
-            local:getMeasure($mei, $measure, $movementId), 
-            for $m in $extraMeasures return local:getMeasure($mei, $m, $movementId),
-            for $m in $extraMeasuresParts return local:getMeasure($mei, $m, $movementId)
-        ), ','),
+    string-join((
+    local:getMeasure($mei, $measure, $movementId),
+    for $m in $extraMeasures
+    return
+        local:getMeasure($mei, $m, $movementId),
+    for $m in $extraMeasuresParts
+    return
+        local:getMeasure($mei, $m, $movementId)
+    ), ','),
     ']')
\ No newline at end of file
diff --git a/add/data/xql/getMeasures.xql b/add/data/xql/getMeasures.xql
index ce0af33b3..fb8b88a03 100644
--- a/add/data/xql/getMeasures.xql
+++ b/add/data/xql/getMeasures.xql
@@ -19,98 +19,110 @@ xquery version "3.1";
 
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-import module namespace functx="http://www.functx.com";
+import module namespace functx = "http://www.functx.com";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "/db/apps/Edirom-Online/data/xqm/util.xqm";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:string* {
     
-    if($mei//mei:parts)
-    then(
+    if ($mei//mei:parts)
+    then
+        (
         let $mdiv := $mei/id($mdivID)
         let $measureNs := if ($mdiv//mei:measure/@label)
-                            then (
-                                let $labels := $mdiv//mei:measure/@label/string()
-                                for $label in $labels
-                                let $labelsAnalyzed := if (contains($label, '–'))
-                                                        then ((:substring-before($label, '–'):)
-                                                            let $first := substring-before($label, '–')
-                                                            let $last := substring-after($label, '–')
-                                                            let $steps := xs:integer(number($last) - number($first) + number(1))
-                                                            for $i in 1 to $steps
-                                                            return
-                                                                string(number($first) + $i - 1)
-                                                        )
-                                                        else ($label)
-                                return
-                                    $labelsAnalyzed
-                            )
-                            else ($mdiv//mei:measure/@n)
+        then
+            (
+            let $labels := $mdiv//mei:measure/@label/string()
+            for $label in $labels
+            let $labelsAnalyzed := if (contains($label, '–'))
+            then
+                ((:substring-before($label, '–'):)
+                let $first := substring-before($label, '–')
+                let $last := substring-after($label, '–')
+                let $steps := xs:integer(number($last) - number($first) + number(1))
+                for $i in 1 to $steps
+                return
+                    string(number($first) + $i - 1)
+                )
+            else
+                ($label)
+            return
+                $labelsAnalyzed
+            )
+        else
+            ($mdiv//mei:measure/@n)
         let $measureNsDistinct := distinct-values(eutil:sort-as-numeric-alpha($measureNs))
         return
             for $measureN in $measureNsDistinct
             let $measureNNumber := number($measureN)
             let $measures := if ($mdiv//mei:measure/@label)
-                                then ($mdiv//mei:measure[.//mei:multiRest][number(substring-before(@label, '–')) <= $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(substring-before(@label, '–')))])
-                                else ($mdiv//mei:measure[.//mei:multiRest][number(@n) lt $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(@n))])
+            then
+                ($mdiv//mei:measure[.//mei:multiRest][number(substring-before(@label, '–')) <= $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(substring-before(@label, '–')))])
+            else
+                ($mdiv//mei:measure[.//mei:multiRest][number(@n) lt $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(@n))])
             let $measures := for $part in $mdiv//mei:part
-                                let $partMeasures := if($part//mei:measure/@label)
-                                                     then($part//mei:measure[@label = $measureN][1])
-                                                     else($part//mei:measure[@n = $measureN][1])
-                                for $measure in $partMeasures | $measures[ancestor::mei:part = $part]
-                                    let $voiceRef := $part//mei:staffDef/@decls
-                                    return
-                                        concat('{id:"', $measure/@xml:id, '",
+            let $partMeasures := if ($part//mei:measure/@label)
+            then
+                ($part//mei:measure[@label = $measureN][1])
+            else
+                ($part//mei:measure[@n = $measureN][1])
+            for $measure in $partMeasures | $measures[ancestor::mei:part = $part]
+            let $voiceRef := $part//mei:staffDef/@decls
+            return
+                concat('{id:"', $measure/@xml:id, '",
                                         voice: "', $voiceRef,
-                                        '", partLabel: "', eutil:getPartLabel($measure, 'measure'),
-                                        '"}')
+                '", partLabel: "', eutil:getPartLabel($measure, 'measure'),
+                '"}')
             return
                 concat('{',
-                    'id: "measure_', $mdiv/@xml:id, '_', $measureN, '", ',
-                    'measures: [', string-join($measures, ','), '], ',
-                    'mdivs: ["', $mdiv/@xml:id, '"], ', (: TODO :)
-                    'name: "', $measureN, '"',
+                'id: "measure_', $mdiv/@xml:id, '_', $measureN, '", ',
+                'measures: [', string-join($measures, ','), '], ',
+                'mdivs: ["', $mdiv/@xml:id, '"], ', (: TODO :)
+                'name: "', $measureN, '"',
                 '}')
-    )
-    
-    else(
-    
-        if($mei/id($mdivID)//mei:measure[@label])
-        then(
-             for $measureN in $mei/id($mdivID)//mei:measure/@label
-                let $measures := $mei/id($mdivID)//mei:measure[@label = $measureN]
-                let $measure := $measures[1]
-                (:let $measureLabel := if(exists($measure/@label) and not(contains($measure/@label,'/'))) then($measure/@label) else($measure/@n):)
-                return
-                    concat('{',
-                        'id: "', $measure/@xml:id, '", ',
-                        'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
-                        'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
-                        'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
-                    '}')
         )
-        else(
     
+    else
+        (
+        
+        if ($mei/id($mdivID)//mei:measure[@label])
+        then
+            (
+            for $measureN in $mei/id($mdivID)//mei:measure/@label
+            let $measures := $mei/id($mdivID)//mei:measure[@label = $measureN]
+            let $measure := $measures[1]
+            (:let $measureLabel := if(exists($measure/@label) and not(contains($measure/@label,'/'))) then($measure/@label) else($measure/@n):)
+            return
+                concat('{',
+                'id: "', $measure/@xml:id, '", ',
+                'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
+                'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
+                'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
+                '}')
+            )
+        else
+            (
+            
             for $measureN in $mei/id($mdivID)//mei:measure/data(@n)
-                let $measures := $mei/id($mdivID)//mei:measure[@n = $measureN]
-                let $measure := $measures[1]
-                (:let $measureLabel := if(exists($measure/@label) and not(contains($measure/@label,'/'))) then($measure/@label) else($measure/@n):)
-                return
-                    concat('{',
-                        'id: "', $measure/@xml:id, '", ',
-                        'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
-                        'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
-                        'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
-                    '}')
+            let $measures := $mei/id($mdivID)//mei:measure[@n = $measureN]
+            let $measure := $measures[1]
+            (:let $measureLabel := if(exists($measure/@label) and not(contains($measure/@label,'/'))) then($measure/@label) else($measure/@n):)
+            return
+                concat('{',
+                'id: "', $measure/@xml:id, '", ',
+                'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
+                'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
+                'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
+                '}')
+            )
         )
-    )
 };
 
 let $uri := request:get-parameter('uri', '')
@@ -119,4 +131,5 @@ let $mei := doc($uri)/root()
 
 let $ret := local:getMeasures($mei, $mdivID)
 
-return concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+return
+    concat('[', string-join($ret, ','), ']')
\ No newline at end of file
diff --git a/add/data/xql/getMeasuresOnPage.xql b/add/data/xql/getMeasuresOnPage.xql
index 4be580089..985dffb07 100644
--- a/add/data/xql/getMeasuresOnPage.xql
+++ b/add/data/xql/getMeasuresOnPage.xql
@@ -26,11 +26,11 @@ xquery version "3.1";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
-declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "json";
 declare option output:media-type "application/json";
@@ -43,8 +43,8 @@ declare option output:media-type "application/json";
     @returns A list of json objects with measure information
 :)
 declare function local:getMeasures($mei as node(), $surface as node()) as map(*)* {
-
-    for $zone in $surface/mei:zone[@type='measure']
+    
+    for $zone in $surface/mei:zone[@type = 'measure']
     let $zoneRef := concat('#', $zone/@xml:id)
     (: 
         The first predicate with `contains` is just a rough estimate to narrow down the result set.
@@ -53,10 +53,15 @@ declare function local:getMeasures($mei as node(), $surface as node()) as map(*)
     let $measures := $mei//mei:measure[contains(@facs, $zoneRef)][$zoneRef = tokenize(@facs, '\s+')]
     return
         for $measure in $measures
-        let $measureLabel := if ($measure/@label) then ($measure/string(@label)) else ($measure/string(@n))
-        let $measureLabel := if($measure//mei:multiRest)
-                             then ($measureLabel || '–' || number($measureLabel) + number($measure//mei:multiRest/@num) - 1)
-                             else ($measureLabel)
+        let $measureLabel := if ($measure/@label) then
+            ($measure/string(@label))
+        else
+            ($measure/string(@n))
+        let $measureLabel := if ($measure//mei:multiRest)
+        then
+            ($measureLabel || '–' || number($measureLabel) + number($measure//mei:multiRest/@num) - 1)
+        else
+            ($measureLabel)
         return
             map {
                 'zoneId': $zone/string(@xml:id),
@@ -72,11 +77,15 @@ declare function local:getMeasures($mei as node(), $surface as node()) as map(*)
 };
 
 declare function local:getMRest($measure) {
-    if($measure//mei:mRest)
-    then(string('1'))
-    else if($measure//mei:multiRest)
-    then($measure//mei:multiRest/string(@num))
-    else(string('0'))
+    if ($measure//mei:mRest)
+    then
+        (string('1'))
+    else
+        if ($measure//mei:multiRest)
+        then
+            ($measure//mei:multiRest/string(@num))
+        else
+            (string('0'))
 };
 
 let $uri := request:get-parameter('uri', '')
@@ -85,9 +94,10 @@ let $surfaceId := request:get-parameter('pageId', '')
 let $mei := doc($uri)/root()
 let $surface := $mei/id($surfaceId)
 
-return (
+return
+    (
     array {
         (: TODO: überlegen, wie die Staff-spezifischen Ausschnitte angezeigt werden sollen :)
         local:getMeasures($mei, $surface)
     }
-)
\ No newline at end of file
+    )
\ No newline at end of file
diff --git a/add/data/xql/getMovements.xql b/add/data/xql/getMovements.xql
index f361c74d0..ff6490e35 100644
--- a/add/data/xql/getMovements.xql
+++ b/add/data/xql/getMovements.xql
@@ -20,11 +20,11 @@ xquery version "3.1";
   ID: $Id: getMovements.xql 1219 2012-01-20 08:33:28Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "text";
@@ -34,17 +34,18 @@ let $uri := request:get-parameter('uri', '')
 let $mei := doc($uri)/root()
 
 let $ret := for $movement in $mei//mei:mdiv
-            return
-                map {
-                    'id': $movement/string(@xml:id),
-                    'name': $movement/string(@label)
-                }
-
-let $array := array { $ret }
-let $options :=
+return
     map {
-        'method': 'json',
-        'media-type': 'text/plain'
+        'id': $movement/string(@xml:id),
+        'name': $movement/string(@label)
     }
-    
-return serialize($array, $options)
\ No newline at end of file
+
+let $array := array {$ret}
+let $options :=
+map {
+    'method': 'json',
+    'media-type': 'text/plain'
+}
+
+return
+    serialize($array, $options)
\ No newline at end of file
diff --git a/add/data/xql/getMovementsFirstPage.xql b/add/data/xql/getMovementsFirstPage.xql
index 388e48d64..68faa335a 100644
--- a/add/data/xql/getMovementsFirstPage.xql
+++ b/add/data/xql/getMovementsFirstPage.xql
@@ -20,11 +20,11 @@ xquery version "1.0";
   ID: $Id: getMovementsFirstPage.xql 1261 2012-02-28 15:50:45Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
@@ -34,8 +34,11 @@ let $movementId := request:get-parameter('movementId', '')
 let $mei := doc($uri)/root()
 
 let $zoneId := ($mei/id($movementId)//mei:measure)[1]/string(@facs)
-let $zoneId := if(starts-with($zoneId, '#'))
-                then(substring($zoneId, 2))
-                else($zoneId)
-
-return $mei/id($zoneId)/parent::mei:surface/string(@xml:id)
\ No newline at end of file
+let $zoneId := if (starts-with($zoneId, '#'))
+then
+    (substring($zoneId, 2))
+else
+    ($zoneId)
+
+return
+    $mei/id($zoneId)/parent::mei:surface/string(@xml:id)
\ No newline at end of file
diff --git a/add/data/xql/getMusicInMdiv.xql b/add/data/xql/getMusicInMdiv.xql
index d120f8b2b..0b675c7a1 100644
--- a/add/data/xql/getMusicInMdiv.xql
+++ b/add/data/xql/getMusicInMdiv.xql
@@ -1,23 +1,28 @@
 xquery version "3.0";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace system="http://exist-db.org/xquery/system";
-declare namespace transform="http://exist-db.org/xquery/transform";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace system = "http://exist-db.org/xquery/system";
+declare namespace transform = "http://exist-db.org/xquery/transform";
 
 let $uri := request:get-parameter('uri', '')
 let $movementId := request:get-parameter('movementId', '')
 let $mei := doc($uri)/root()
-let $mdiv := if($movementId eq '')
-             then($mei//mei:mdiv[1])
-             else($mei/id($movementId))
-             
+let $mdiv := if ($movementId eq '')
+then
+    ($mei//mei:mdiv[1])
+else
+    ($mei/id($movementId))
+
 let $base := concat(replace(system:get-module-load-path(), 'embedded-eXist-server', ''), '/../xslt/')
 let $data := transform:transform($mdiv, concat($base, 'edirom_prepareAnnotsForRendering.xsl'), <parameters/>)
 
 
 return
-    <mei xmlns="http://www.music-encoding.org/ns/mei" xmlns:xlink="http://www.w3.org/1999/xlink" meiversion="4.0.0">
+    <mei
+        xmlns="http://www.music-encoding.org/ns/mei"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        meiversion="4.0.0">
         {$mei//mei:meiHead}
         <music>
             <facsimile/>
diff --git a/add/data/xql/getNavigatorConfig.xql b/add/data/xql/getNavigatorConfig.xql
index 1cfbcd69d..e370087c8 100644
--- a/add/data/xql/getNavigatorConfig.xql
+++ b/add/data/xql/getNavigatorConfig.xql
@@ -20,91 +20,140 @@ xquery version "1.0";
   ID: $Id: getNavigatorConfig.xql 1279 2012-03-19 13:16:43Z daniel $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace edirom="http://www.edirom.de/ns/1.3";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace edirom = "http://www.edirom.de/ns/1.3";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
 declare variable $lang := request:get-parameter('lang', '');
 
 declare function local:getCategory($category, $depth) {
-
-    <div class="navigatorCategory{if($depth = 1)then()else($depth)}" id="{$category/@xml:id}">
-        <div class="navigatorCategoryTitle{if($depth = 1)then()else($depth)}">
+    
+    <div
+        class="navigatorCategory{
+                if ($depth = 1) then
+                    ()
+                else
+                    ($depth)
+            }"
+        id="{$category/@xml:id}">
+        <div
+            class="navigatorCategoryTitle{
+                    if ($depth = 1) then
+                        ()
+                    else
+                        ($depth)
+                }">
             {
-                if($depth = 1)
-                then(eutil:getLocalizedName($category, $lang))
-                else(
-                    <span id="{$category/@xml:id}-title" onclick="if(Ext.get('{$category/@xml:id}-title').hasCls('folded')) {{Ext.get('{$category/@xml:id}-title').removeCls('folded');Ext.get(Ext.get('{$category/@xml:id}-title').query('.fa')[0]).removeCls('fa-caret-right').addCls('fa-caret-down');Ext.get('{$category/@xml:id}-items').removeCls('hidden');}}else{{Ext.get('{$category/@xml:id}-title').addCls('folded');Ext.get(Ext.get('{$category/@xml:id}-title').query('.fa')[0]).removeCls('fa-caret-down').addCls('fa-caret-right');Ext.get('{$category/@xml:id}-items').addCls('hidden');}}" class="folded">{eutil:getLocalizedName($category, $lang)}<i class="fa fa-caret-right fa-fw"></i></span>
-                )
-            }            
+                if ($depth = 1)
+                then
+                    (eutil:getLocalizedName($category, $lang))
+                else
+                    (
+                    <span
+                        id="{$category/@xml:id}-title"
+                        onclick="if(Ext.get('{$category/@xml:id}-title').hasCls('folded')) {{Ext.get('{$category/@xml:id}-title').removeCls('folded');Ext.get(Ext.get('{$category/@xml:id}-title').query('.fa')[0]).removeCls('fa-caret-right').addCls('fa-caret-down');Ext.get('{$category/@xml:id}-items').removeCls('hidden');}}else{{Ext.get('{$category/@xml:id}-title').addCls('folded');Ext.get(Ext.get('{$category/@xml:id}-title').query('.fa')[0]).removeCls('fa-caret-down').addCls('fa-caret-right');Ext.get('{$category/@xml:id}-items').addCls('hidden');}}"
+                        class="folded">{eutil:getLocalizedName($category, $lang)}<i
+                            class="fa fa-caret-right fa-fw"></i></span>
+                    )
+            }
         </div>
-            <div id="{$category/@xml:id}-items" class="{if($depth = 1)then()else('hidden')}">
+        <div
+            id="{$category/@xml:id}-items"
+            class="{
+                    if ($depth = 1) then
+                        ()
+                    else
+                        ('hidden')
+                }">
             {
                 for $elem in $category/edirom:navigatorItem | $category/edirom:navigatorCategory
                 return
-                    if(local-name($elem) eq 'navigatorItem')
-                    then(
+                    if (local-name($elem) eq 'navigatorItem')
+                    then
+                        (
                         local:getItem($elem, $depth)
-                    )
-                    else if(local-name($elem) eq 'navigatorSeparator')
-                    then(
-                        local:getSeparator()
-                    )
-                    else if(local-name($elem) eq 'navigatorCategory')
-                    then(
-                        local:getCategory($elem, $depth + 1)
-                    )
-                    else()
+                        )
+                    else
+                        if (local-name($elem) eq 'navigatorSeparator')
+                        then
+                            (
+                            local:getSeparator()
+                            )
+                        else
+                            if (local-name($elem) eq 'navigatorCategory')
+                            then
+                                (
+                                local:getCategory($elem, $depth + 1)
+                                )
+                            else
+                                ()
             }
-            </div>
+        </div>
     </div>
 };
 
 declare function local:getItem($item, $depth) {
-
+    
     let $target := $item/replace(@targets, '\[.*\]', '')
     let $cfg := concat('{', replace(substring-before($item/substring-after(@targets, '['), ']'), '=', ':'), '}')
-    let $target := if(starts-with($target, 'javascript:'))
-                    then(replace($target, 'javascript:', ''))
-                    else(concat("loadLink('", $target, "', ", $cfg, ")"))
+    let $target := if (starts-with($target, 'javascript:'))
+    then
+        (replace($target, 'javascript:', ''))
+    else
+        (concat("loadLink('", $target, "', ", $cfg, ")"))
     return
-
-    <div class="navigatorItem{if($depth lt 2)then()else($depth)}" id="{$item/@xml:id}" onclick="{$target}">
-        {eutil:getLocalizedName($item, $lang)}
-    </div>
+        
+        <div
+            class="navigatorItem{
+                    if ($depth lt 2) then
+                        ()
+                    else
+                        ($depth)
+                }"
+            id="{$item/@xml:id}"
+            onclick="{$target}">
+            {eutil:getLocalizedName($item, $lang)}
+        </div>
 };
 
 declare function local:getSeparator() {
-
-    <div class="navigatorSeparator"></div>
+    
+    <div
+        class="navigatorSeparator"></div>
 };
 
 declare function local:getDefinition($navConfig) {
-let $elems := $navConfig/*
+    let $elems := $navConfig/*
     
     for $elem in $elems
     
     return
         
-        if(local-name($elem) eq 'navigatorItem')
-        then(
+        if (local-name($elem) eq 'navigatorItem')
+        then
+            (
             local:getItem($elem, 1)
-        )
-        else if(local-name($elem) eq 'navigatorSeparator')
-        then(
-            local:getSeparator()
-        )
-        else if(local-name($elem) eq 'navigatorCategory')
-        then(
-            local:getCategory($elem, 1)
-        )
-        else()
+            )
+        else
+            if (local-name($elem) eq 'navigatorSeparator')
+            then
+                (
+                local:getSeparator()
+                )
+            else
+                if (local-name($elem) eq 'navigatorCategory')
+                then
+                    (
+                    local:getCategory($elem, 1)
+                    )
+                else
+                    ()
 };
 
 let $editionId := request:get-parameter('editionId', '')
diff --git a/add/data/xql/getOverlayOnPage.xql b/add/data/xql/getOverlayOnPage.xql
index 1fe2ce2bb..dbacbd0ac 100644
--- a/add/data/xql/getOverlayOnPage.xql
+++ b/add/data/xql/getOverlayOnPage.xql
@@ -26,9 +26,9 @@ xquery version "3.1";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace svg="http://www.w3.org/2000/svg";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace svg = "http://www.w3.org/2000/svg";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "text";
@@ -46,18 +46,19 @@ let $surface := $mei/id($surfaceId)
 let $svg := $surface/svg:svg[@id = $plist]
 
 let $overlay :=
-    map {
-        'id': string($svg/@id),
-        'svg': $svg
-    }
+map {
+    'id': string($svg/@id),
+    'svg': $svg
+}
 
 let $options :=
-    map {
-        'method': 'json',
-        'media-type': 'text/plain'
-    }
+map {
+    'method': 'json',
+    'media-type': 'text/plain'
+}
 
-return serialize($overlay, $options)
+return
+    serialize($overlay, $options)
 
 
 
diff --git a/add/data/xql/getOverlays.xql b/add/data/xql/getOverlays.xql
index 504fdf31d..fc610426a 100644
--- a/add/data/xql/getOverlays.xql
+++ b/add/data/xql/getOverlays.xql
@@ -20,11 +20,11 @@ xquery version "3.1";
   ID: $Id: getOverlays.xql 1273 2012-03-09 16:27:21Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "text";
@@ -34,17 +34,18 @@ let $uri := request:get-parameter('uri', '')
 let $mei := doc($uri)/root()
 
 let $ret := for $overlay in $mei//mei:annot[@type = 'overlay']
-            return
-                map {
-                    'id': $overlay/string(@xml:id),
-                    'name': string($overlay/mei:title)
-                }
-
-let $array := array { $ret }
-let $options :=
+return
     map {
-        'method': 'json',
-        'media-type': 'text/plain'
+        'id': $overlay/string(@xml:id),
+        'name': string($overlay/mei:title)
     }
-    
-return serialize($array, $options)
\ No newline at end of file
+
+let $array := array {$ret}
+let $options :=
+map {
+    'method': 'json',
+    'media-type': 'text/plain'
+}
+
+return
+    serialize($array, $options)
\ No newline at end of file
diff --git a/add/data/xql/getPages.xql b/add/data/xql/getPages.xql
index 099cc41db..67c9b8b5d 100644
--- a/add/data/xql/getPages.xql
+++ b/add/data/xql/getPages.xql
@@ -20,15 +20,15 @@ xquery version "3.1";
   ID: $Id: getPages.xql 1268 2012-03-02 09:46:28Z johannes $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace img="http://www.edirom.de/ns/image";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+declare namespace img = "http://www.edirom.de/ns/image";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
-declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
@@ -37,36 +37,39 @@ let $uri := request:get-parameter('uri', '')
 let $mei := eutil:getDoc($uri)/root()
 
 let $ret := for $surface in $mei//mei:surface
-            (:let $image := doc($surface/mei:graphic[@type='facsimile']/string(@target))/img:image:)
-            let $graphic := $surface/mei:graphic[@type='facsimile']
-            return
-                map {
-                    'id': $surface/string(@xml:id),
-                    'path': $graphic/string(@target),
-                    'name': $surface/string(@n),
-                    'width': $graphic/string(@width),
-                    'height': $graphic/string(@height)
-                }
-                
-let $ret := if(count($ret) = 0)
-            then(
-                for $surface in $mei//tei:surface
-                let $graphic := $surface/tei:graphic[1]
-                return
-                    map {
-                        'id': $surface/string(@xml:id),
-                        'path': $graphic/string(@url),
-                        'name': $surface/string(@n),
-                        'width': replace($graphic/string(@width), 'px', ''),
-                        'height': replace($graphic/string(@height), 'px', '')
-                    }
-            )
-            else($ret)
-
-let $options :=
+(:let $image := doc($surface/mei:graphic[@type='facsimile']/string(@target))/img:image:)
+let $graphic := $surface/mei:graphic[@type = 'facsimile']
+return
     map {
-        'method': 'json',
-        'media-type': 'text/plain'
+        'id': $surface/string(@xml:id),
+        'path': $graphic/string(@target),
+        'name': $surface/string(@n),
+        'width': $graphic/string(@width),
+        'height': $graphic/string(@height)
     }
 
-return serialize($ret, $options)
+let $ret := if (count($ret) = 0)
+then
+    (
+    for $surface in $mei//tei:surface
+    let $graphic := $surface/tei:graphic[1]
+    return
+        map {
+            'id': $surface/string(@xml:id),
+            'path': $graphic/string(@url),
+            'name': $surface/string(@n),
+            'width': replace($graphic/string(@width), 'px', ''),
+            'height': replace($graphic/string(@height), 'px', '')
+        }
+    )
+else
+    ($ret)
+
+let $options :=
+map {
+    'method': 'json',
+    'media-type': 'text/plain'
+}
+
+return
+    serialize($ret, $options)
diff --git a/add/data/xql/getParts.xql b/add/data/xql/getParts.xql
index 4b041881f..569697e00 100644
--- a/add/data/xql/getParts.xql
+++ b/add/data/xql/getParts.xql
@@ -19,11 +19,11 @@ xquery version "3.1";
 
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
@@ -31,13 +31,14 @@ let $uri := request:get-parameter('uri', '')
 let $mei := doc($uri)/root()
 
 let $ret := for $part in ($mei//mei:instrumentation/mei:instrVoice | $mei//mei:perfMedium//mei:perfRes)
-                let $hasNoAttrSameas := not(exists($part/@sameas))
-                return
-                    concat(
-                            '{label: "', eutil:getPartLabel($part, 'perfRes'),
-                            '", id:"', $part/@xml:id,
-                            '", selectedByDefault:', $hasNoAttrSameas,
-                            ', selected:', $hasNoAttrSameas, '}'
-                          )
-
-return concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+let $hasNoAttrSameas := not(exists($part/@sameas))
+return
+    concat(
+    '{label: "', eutil:getPartLabel($part, 'perfRes'),
+    '", id:"', $part/@xml:id,
+    '", selectedByDefault:', $hasNoAttrSameas,
+    ', selected:', $hasNoAttrSameas, '}'
+    )
+
+return
+    concat('[', string-join($ret, ','), ']')
\ No newline at end of file
diff --git a/add/data/xql/getPreferences.xql b/add/data/xql/getPreferences.xql
index e9bdce13c..98c71258d 100644
--- a/add/data/xql/getPreferences.xql
+++ b/add/data/xql/getPreferences.xql
@@ -26,9 +26,9 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace request = "http://exist-db.org/xquery/request";
 
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
@@ -42,20 +42,21 @@ let $file := doc('../prefs/edirom-prefs.xml')
 let $projectFile := doc(edition:getPreferencesURI($edition))
 
 return
-    if($mode = 'json')
-    then(
+    if ($mode = 'json')
+    then
+        (
         concat('{',
-            string-join((
-                for $entry in $file//entry
-                return
-                    concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-
-                ,
-                for $entry in $projectFile//entry
-                return
-                    concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-            ), ','),
+        string-join((
+        for $entry in $file//entry
+        return
+            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
+        
+        ,
+        for $entry in $projectFile//entry
+        return
+            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
+        ), ','),
         '}')
-    )
-    else($file)
-    
\ No newline at end of file
+        )
+    else
+        ($file)
diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 19ba9e68a..6a603f757 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -20,19 +20,21 @@ xquery version "1.0";
   ID: $Id: getReducedDocument.xql 1328 2012-05-16 14:59:35Z daniel $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace request = "http://exist-db.org/xquery/request";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 (:declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";:)
 
 declare variable $edition := request:get-parameter('edition', '');
-declare variable $imageserver :=  eutil:getPreference('image_server', $edition);
-declare variable $imagePrefix := if($imageserver = 'leaflet')
-	then(eutil:getPreference('leaflet_prefix', $edition))
-	else(eutil:getPreference('image_prefix', $edition));
+declare variable $imageserver := eutil:getPreference('image_server', $edition);
+declare variable $imagePrefix := if ($imageserver = 'leaflet')
+then
+    (eutil:getPreference('leaflet_prefix', $edition))
+else
+    (eutil:getPreference('image_prefix', $edition));
 
 let $uri := request:get-parameter('uri', '')
 let $selectionId := request:get-parameter('selectionId', '')
@@ -43,21 +45,39 @@ let $base := concat('file:', system:get-module-load-path())
 
 let $doc := doc($uri)/root()
 let $xsl := '../xslt/reduceToSelection.xsl'
-let $doc := transform:transform($doc, $xsl, <parameters><param name="selectionId" value="{$selectionId}"/><param name="subtreeRoot" value="{$subtreeRoot}"/></parameters>)
+let $doc := transform:transform($doc, $xsl, <parameters><param
+        name="selectionId"
+        value="{$selectionId}"/><param
+        name="subtreeRoot"
+        value="{$subtreeRoot}"/></parameters>)
 let $doc := $doc/root()
 
 let $xslInstruction := $doc//processing-instruction(xml-stylesheet)
 let $xslInstruction := for $i in serialize($xslInstruction, ())
-                        return
-                        if(matches($i, 'type="text/xsl"'))
-                        then(substring-before(substring-after($i, 'href="'), '"'))
-                        else()
-                        
-(:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
-let $xsl := if($xslInstruction)then(doc($xslInstruction))else('../xslt/teiBody2HTML.xsl')
+return
+    if (matches($i, 'type="text/xsl"'))
+    then
+        (substring-before(substring-after($i, 'href="'), '"'))
+    else
+        ()
+        
+        (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
+let $xsl := if ($xslInstruction) then
+    (doc($xslInstruction))
+else
+    ('../xslt/teiBody2HTML.xsl')
 
-let $params := (<param name="base" value="{concat($base, '/../xslt/')}"/>,<param name="idPrefix" value="{$idPrefix}"/>) 
+let $params := (<param
+    name="base"
+    value="{concat($base, '/../xslt/')}"/>,
+<param
+    name="idPrefix"
+    value="{$idPrefix}"/>)
 
 return
-    if($xslInstruction)then(transform:transform($doc/root(), $xsl, <parameters>{$params}</parameters>))
-    else(transform:transform($doc/root(), $xsl, <parameters>{$params}<param name="graphicsPrefix" value="{$imagePrefix}"/></parameters>))
+    if ($xslInstruction) then
+        (transform:transform($doc/root(), $xsl, <parameters>{$params}</parameters>))
+    else
+        (transform:transform($doc/root(), $xsl, <parameters>{$params}<param
+                name="graphicsPrefix"
+                value="{$imagePrefix}"/></parameters>))
diff --git a/add/data/xql/getRendering.xql b/add/data/xql/getRendering.xql
index 83d688395..3c97ef151 100644
--- a/add/data/xql/getRendering.xql
+++ b/add/data/xql/getRendering.xql
@@ -20,12 +20,12 @@ xquery version "1.0";
   ID: $Id: getRendering.xql 1334 2012-06-14 12:40:33Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
-declare namespace system="http://exist-db.org/xquery/system";
-declare namespace transform="http://exist-db.org/xquery/transform";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace system = "http://exist-db.org/xquery/system";
+declare namespace transform = "http://exist-db.org/xquery/transform";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
@@ -39,7 +39,10 @@ let $firstMeasure := request:get-parameter('firstMeasure', '')
 let $lastMeasure := request:get-parameter('lastMeasure', '')
 
 
-let $docUri := if(contains($uri, '#')) then(substring-before($uri, '#')) else($uri)
+let $docUri := if (contains($uri, '#')) then
+    (substring-before($uri, '#'))
+else
+    ($uri)
 let $doc := doc($docUri)
 
 return
@@ -50,17 +53,31 @@ return
     let $mdiv2show := $movementId
     let $outputStep := 'svg'
     
-   
+    
     
     let $svg := transform:transform($doc, concat($base, 'mei2svg.xsl'), <parameters>
-            <param name="outputStep" value="{$outputStep}"/>
-            <param name="basePath" value="{$base}"/>
-            <param name="mdiv2show" value="{$mdiv2show}"/>
-            <param name="stripStaves" value="{$stripStaves}"/>
-            <param name="showStaff" value="{$showStaff}"/>
-            <param name="firstMeasure" value="{$firstMeasure}"/>
-            <param name="lastMeasure" value="{$lastMeasure}"/>
-        </parameters>)
+        <param
+            name="outputStep"
+            value="{$outputStep}"/>
+        <param
+            name="basePath"
+            value="{$base}"/>
+        <param
+            name="mdiv2show"
+            value="{$mdiv2show}"/>
+        <param
+            name="stripStaves"
+            value="{$stripStaves}"/>
+        <param
+            name="showStaff"
+            value="{$showStaff}"/>
+        <param
+            name="firstMeasure"
+            value="{$firstMeasure}"/>
+        <param
+            name="lastMeasure"
+            value="{$lastMeasure}"/>
+    </parameters>)
     (:let $svg := transform:transform($svg, concat($base, 'svgCleaner.xsl'),<parameters/>):)
     
     (:let $mdiv := transform:transform($doc, concat($base, 'reduceToMdiv.xsl'), <parameters><param name="mdiv2show" value="{$mdiv2show}"/></parameters>)
@@ -74,6 +91,5 @@ return
     
     
     return
-            
-        $svg            
-       
\ No newline at end of file
+        
+        $svg
diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 540fb74fe..86c0e9dfa 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -20,14 +20,14 @@ xquery version "3.0";
   ID: $Id: getSummary.xql 1455 2012-10-11 10:42:55Z daniel $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace edirom_image="http://www.edirom.de/ns/image";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+declare namespace edirom_image = "http://www.edirom.de/ns/image";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
@@ -35,453 +35,624 @@ declare variable $imageWidth := 400;
 
 declare function local:generateRespSentence($names) {
     string-join(
-        for $name in $names
-        return
-            if(matches($name, '(s|z)$'))
-            then(concat($name, "'"))
-            else(concat($name, 's'))
-     , ' und ')
+    for $name in $names
+    return
+        if (matches($name, '(s|z)$'))
+        then
+            (concat($name, "'"))
+        else
+            (concat($name, 's'))
+    , ' und ')
 };
 
 declare function local:getSourceSummary($doc, $facsBasePath, $server) {
-    let $work := doc($doc//mei:relation[@rel='isEmbodimentOf'][1]/substring-before(@target, '#'))
+    let $work := doc($doc//mei:relation[@rel = 'isEmbodimentOf'][1]/substring-before(@target, '#'))
     let $title := $work//mei:work/mei:titleStmt/mei:title[1]/text()
     let $resp := local:generateRespSentence($work//mei:work/mei:titleStmt/mei:respStmt/*[local-name() != 'resp']/text())
-    let $expression := $work/id($doc//mei:relation[@rel='isEmbodimentOf'][1]/substring-after(@target, '#'))/string(@label)
+    let $expression := $work/id($doc//mei:relation[@rel = 'isEmbodimentOf'][1]/substring-after(@target, '#'))/string(@label)
     return
-
-    <div class="summaryViewSource">
-        <h1>
-            {
-                if($doc//mei:source/mei:titleStmt/mei:title[@type eq 'main'])
-                then($doc//mei:source/mei:titleStmt/mei:title[@type eq 'main'][1]//text())
-                else($doc//mei:source/mei:titleStmt/mei:title[1]//text())
-            }
-            {
-                if($doc//mei:source//mei:identifier[@type eq 'siglum'])
-                then(concat(' ', $doc//mei:source//mei:identifier[@type eq 'siglum'][1]//text()))
-                else()
-            }
-        </h1>
         
-        <div class="metaData">
-            
-            <div class="work metaRow">
-                Zur Fassung "{$expression}" von {$resp} "{$title}".
-            </div>
-            
-            {
-                for $name in $doc//mei:source/mei:titleStmt/mei:respStmt/mei:*[local-name() eq 'persName' or local-name() eq 'name']
-                return
-                    <div class="resp metaRow">
-                        <div class="key">
-                        {
-                            if($name/@role)
-                            then($name/string(@role))
-                            else(string('Responsible'))
-                        }
-                        </div>
-                        <div class="value">{$name/text()}</div>
-                    </div>
-                    
-            }
-            
-            {
-                for $date in $doc//mei:source/mei:pubStmt/mei:date | $doc//mei:source/mei:history/mei:creation/mei:date[1]
-                return
-                    <div class="dating metaRow">
-                        <div class="key">Dating</div>
-                        <div class="value">{local:getDateValue($date)}</div>
-                    </div>
-                    
-            }
+        <div
+            class="summaryViewSource">
+            <h1>
+                {
+                    if ($doc//mei:source/mei:titleStmt/mei:title[@type eq 'main'])
+                    then
+                        ($doc//mei:source/mei:titleStmt/mei:title[@type eq 'main'][1]//text())
+                    else
+                        ($doc//mei:source/mei:titleStmt/mei:title[1]//text())
+                }
+                {
+                    if ($doc//mei:source//mei:identifier[@type eq 'siglum'])
+                    then
+                        (concat(' ', $doc//mei:source//mei:identifier[@type eq 'siglum'][1]//text()))
+                    else
+                        ()
+                }
+            </h1>
             
-            {
-                (: probably a Manuscript… :)
-                if(count($doc//mei:source/mei:itemList/mei:item) eq 1)
-                then(
-                    for $item in $doc//mei:source/mei:itemList/mei:item
+            <div
+                class="metaData">
+                
+                <div
+                    class="work metaRow">
+                    Zur Fassung "{$expression}" von {$resp} "{$title}".
+                </div>
+                
+                {
+                    for $name in $doc//mei:source/mei:titleStmt/mei:respStmt/mei:*[local-name() eq 'persName' or local-name() eq 'name']
                     return
-                        if($item/mei:physDesc/mei:repository)
-                        then(
-                            <div class="library metaRow">
-                                <div class="key">Repository</div>
-                                <div class="value">
+                        <div
+                            class="resp metaRow">
+                            <div
+                                class="key">
                                 {
-                                    $item/mei:physDesc/mei:repository[1]/text(),
-                                    if($item/mei:physDesc/mei:physLoc)
-                                    then(
-                                        <br/>,$item/mei:physDesc/mei:physLoc[1]/text()
-                                    )
-                                    else()
+                                    if ($name/@role)
+                                    then
+                                        ($name/string(@role))
+                                    else
+                                        (string('Responsible'))
                                 }
-                                </div>
                             </div>
+                            <div
+                                class="value">{$name/text()}</div>
+                        </div>
+                
+                }
+                
+                {
+                    for $date in $doc//mei:source/mei:pubStmt/mei:date | $doc//mei:source/mei:history/mei:creation/mei:date[1]
+                    return
+                        <div
+                            class="dating metaRow">
+                            <div
+                                class="key">Dating</div>
+                            <div
+                                class="value">{local:getDateValue($date)}</div>
+                        </div>
+                
+                }
+                
+                {
+                    (: probably a Manuscript… :)
+                    if (count($doc//mei:source/mei:itemList/mei:item) eq 1)
+                    then
+                        (
+                        for $item in $doc//mei:source/mei:itemList/mei:item
+                        return
+                            if ($item/mei:physDesc/mei:repository)
+                            then
+                                (
+                                <div
+                                    class="library metaRow">
+                                    <div
+                                        class="key">Repository</div>
+                                    <div
+                                        class="value">
+                                        {
+                                            $item/mei:physDesc/mei:repository[1]/text(),
+                                            if ($item/mei:physDesc/mei:physLoc)
+                                            then
+                                                (
+                                                <br/>, $item/mei:physDesc/mei:physLoc[1]/text()
+                                                )
+                                            else
+                                                ()
+                                        }
+                                    </div>
+                                </div>
+                                )
+                            else
+                                ()
                         )
-                        else()
-                )
-                else()
-            }
-
-            {
-                if($doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'])
-                then(
-                    <div class="publisher metaRow">
-                        <div class="key">Publisher</div>
-                        <div class="value">{$doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'][1]/text()}</div>
-                    </div>
-                )
-                else()
-            }
+                    else
+                        ()
+                }
+                
+                {
+                    if ($doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'])
+                    then
+                        (
+                        <div
+                            class="publisher metaRow">
+                            <div
+                                class="key">Publisher</div>
+                            <div
+                                class="value">{$doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'][1]/text()}</div>
+                        </div>
+                        )
+                    else
+                        ()
+                }
+                
+                {
+                    if ($doc//mei:source/mei:physDesc/mei:plateNum)
+                    then
+                        (
+                        <div
+                            class="plateNum metaRow">
+                            <div
+                                class="key">Plate number</div>
+                            <div
+                                class="value">{$doc//mei:source/mei:physDesc/mei:plateNum[1]/text()}</div>
+                        </div>
+                        )
+                    else
+                        ()
+                }
+            
+            </div>
             
             {
-                if($doc//mei:source/mei:physDesc/mei:plateNum)
-                then(
-                    <div class="plateNum metaRow">
-                    <div class="key">Plate number</div>
-                    <div class="value">{$doc//mei:source/mei:physDesc/mei:plateNum[1]/text()}</div>
-                </div>
-                )
-                else()
+                if ($doc//mei:source//mei:titlePage/@facs)
+                then
+                    (
+                    if ($server = 'digilib') then
+                        (
+                        <div
+                            class="titlePage">
+                            <img
+                                src="{local:getImagePath($facsBasePath, $doc//mei:source//mei:titlePage[1]/@facs, $imageWidth)}"/>
+                        </div>
+                        )
+                    else
+                        ()
+                    )
+                else
+                    if ($doc//mei:facsimile/mei:surface/mei:graphic)
+                    then
+                        (
+                        if ($server = 'digilib') then
+                            (
+                            <div
+                                class="titlePage">
+                                <img
+                                    src="{local:getImagePath($facsBasePath, $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target, $imageWidth)}"/>
+                            </div>
+                            )
+                        else
+                            ()
+                        )
+                    else
+                        if ($doc//mei:source//mei:titlePage)
+                        then
+                            (
+                            <div
+                                class="titlePage">
+                                (: TODO: transformieren :)
+                                {$doc//mei:source//mei:titlePage[1]/text()}
+                            </div>
+                            )
+                        else
+                            ()
             }
-
         </div>
-
-        {
-            if($doc//mei:source//mei:titlePage/@facs)
-            then(
-            	if($server = 'digilib') then (           	
-        		<div class="titlePage">
-                    <img src="{local:getImagePath($facsBasePath, $doc//mei:source//mei:titlePage[1]/@facs, $imageWidth)}"/>
-                </div>
-            	)
-                else()
-            )
-            else if($doc//mei:facsimile/mei:surface/mei:graphic)
-            then(
-            if($server = 'digilib') then ( 
-            	<div class="titlePage">
-                    <img src="{local:getImagePath($facsBasePath, $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target, $imageWidth)}"/>
-                </div>
-            	)
-                else()
-            )
-            else if($doc//mei:source//mei:titlePage)
-            then(
-                <div class="titlePage">
-                    (: TODO: transformieren :)
-                    {$doc//mei:source//mei:titlePage[1]/text()}
-                </div>
-            )
-            else()
-        }
-    </div>
 };
 
 declare function local:getImagePath($basePath, $uri, $width) {
-    if(starts-with($uri, 'xmldb:exist'))
-    then(
+    if (starts-with($uri, 'xmldb:exist'))
+    then
+        (
         let $imagePath := doc($uri)/edirom_image:image/@file
         return
             concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;mo=fit')
-    )
-    else(
+        )
+    else
+        (
         concat($basePath, $uri, '?dw=', $width, '&amp;amp;mo=fit')
-    )
+        )
 };
 
 declare function local:getDateValue($date) {
     
-    if($date/@reg)
-    then($date/string(@reg)) (: TODO: prettify date :)
-    
-    else if($date/@startdate and $date/@enddate)
-    then(concat('From ', $date/@startdate, ' until ', $date/@enddate))
-    
-    else if($date/@notbefore and $date/@notafter)
-    then(concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
+    if ($date/@reg)
+    then
+        ($date/string(@reg)) (: TODO: prettify date :)
     
-    else if($date/@startdate and $date/@notafter)
-    then(concat('From ', $date/@startdate, ', not after ', $date/@notafter))
+    else
+        if ($date/@startdate and $date/@enddate)
+        then
+            (concat('From ', $date/@startdate, ' until ', $date/@enddate))
         
-    else if($date/@notbefore and $date/@enddate)
-    then(concat('Not before ', $date/@notbefore, ', until ', $date/@enddate))
-    
-    else if($date/@startdate)
-    then(concat('From ', $date/@startdate))
-    
-    else if($date/@enddate)
-    then(concat('Until ', $date/@enddate))
-    
-    else if($date/@notbefore)
-    then(concat('Not before ', $date/@notbefore))
-    
-    else if($date/@notafter)
-    then(concat('Not after ', $date/@notafter))
-    
-    else if(local-name($date) eq 'date')
-    then($date/text())
-    
-    else(string(""))
+        else
+            if ($date/@notbefore and $date/@notafter)
+            then
+                (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
+            
+            else
+                if ($date/@startdate and $date/@notafter)
+                then
+                    (concat('From ', $date/@startdate, ', not after ', $date/@notafter))
+                
+                else
+                    if ($date/@notbefore and $date/@enddate)
+                    then
+                        (concat('Not before ', $date/@notbefore, ', until ', $date/@enddate))
+                    
+                    else
+                        if ($date/@startdate)
+                        then
+                            (concat('From ', $date/@startdate))
+                        
+                        else
+                            if ($date/@enddate)
+                            then
+                                (concat('Until ', $date/@enddate))
+                            
+                            else
+                                if ($date/@notbefore)
+                                then
+                                    (concat('Not before ', $date/@notbefore))
+                                
+                                else
+                                    if ($date/@notafter)
+                                    then
+                                        (concat('Not after ', $date/@notafter))
+                                    
+                                    else
+                                        if (local-name($date) eq 'date')
+                                        then
+                                            ($date/text())
+                                        
+                                        else
+                                            (string(""))
 };
 
 declare function local:getTeiDateValue($date) {
     
-    if($date/@when)
-    then($date/string(@when)) (: TODO: prettify date :)
-    
-    else if($date/@from and $date/@to)
-    then(concat('From ', $date/@from, ' to ', $date/@to))
-    
-    else if($date/@notBefore and $date/@notAfter)
-    then(concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
+    if ($date/@when)
+    then
+        ($date/string(@when)) (: TODO: prettify date :)
     
-    else if($date/@from and $date/@notAfter)
-    then(concat('From ', $date/@from, ', not after ', $date/@notAfter))
+    else
+        if ($date/@from and $date/@to)
+        then
+            (concat('From ', $date/@from, ' to ', $date/@to))
         
-    else if($date/@notBefore and $date/@to)
-    then(concat('Not before ', $date/@notBefore, ', to ', $date/@to))
-    
-    else if($date/@from)
-    then(concat('From ', $date/@from))
-    
-    else if($date/@to)
-    then(concat('Until ', $date/@to))
-    
-    else if($date/@notBefore)
-    then(concat('Not before ', $date/@notBefore))
-    
-    else if($date/@notAfter)
-    then(concat('Not after ', $date/@notAfter))
-    
-    else if(local-name($date) eq 'date')
-    then($date/text())
-    
-    else(string(""))
+        else
+            if ($date/@notBefore and $date/@notAfter)
+            then
+                (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
+            
+            else
+                if ($date/@from and $date/@notAfter)
+                then
+                    (concat('From ', $date/@from, ', not after ', $date/@notAfter))
+                
+                else
+                    if ($date/@notBefore and $date/@to)
+                    then
+                        (concat('Not before ', $date/@notBefore, ', to ', $date/@to))
+                    
+                    else
+                        if ($date/@from)
+                        then
+                            (concat('From ', $date/@from))
+                        
+                        else
+                            if ($date/@to)
+                            then
+                                (concat('Until ', $date/@to))
+                            
+                            else
+                                if ($date/@notBefore)
+                                then
+                                    (concat('Not before ', $date/@notBefore))
+                                
+                                else
+                                    if ($date/@notAfter)
+                                    then
+                                        (concat('Not after ', $date/@notAfter))
+                                    
+                                    else
+                                        if (local-name($date) eq 'date')
+                                        then
+                                            ($date/text())
+                                        
+                                        else
+                                            (string(""))
 };
 
 declare function local:getWorkSummary($doc, $docUri) {
-    <div class="summaryViewWork">
-        <div class="titleBox">
+    <div
+        class="summaryViewWork">
+        <div
+            class="titleBox">
             
-            <div class="resps">
-            {
-                for $resp in $doc//mei:work/mei:titleStmt/mei:respStmt/mei:*[not(local-name() eq 'resp') and @role]
-                return (
-                    <div class="label">{concat(upper-case(substring($resp/@role,1,1)),substring($resp/@role,2))}</div>,
-                    <div class="name">{$resp/text()}</div>
-                )
-            }
+            <div
+                class="resps">
+                {
+                    for $resp in $doc//mei:work/mei:titleStmt/mei:respStmt/mei:*[not(local-name() eq 'resp') and @role]
+                    return
+                        (
+                        <div
+                            class="label">{concat(upper-case(substring($resp/@role, 1, 1)), substring($resp/@role, 2))}</div>,
+                        <div
+                            class="name">{$resp/text()}</div>
+                        )
+                }
             </div>
             
             <h1>
-            {
-                if($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'])
-                then($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'][1]//text())
-                else($doc//mei:work/mei:titleStmt/mei:title[1]//text())
-            }
+                {
+                    if ($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'])
+                    then
+                        ($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'][1]//text())
+                    else
+                        ($doc//mei:work/mei:titleStmt/mei:title[1]//text())
+                }
             </h1>
             
-            <div class="identifiers">
+            <div
+                class="identifiers">
+                {
+                    for $ident in $doc//mei:work/mei:identifier
+                    return
+                        <div
+                            class="identifier">
+                            <div
+                                class="label">{concat(upper-case(substring($ident/@type, 1, 1)), substring($ident/@type, 2))}</div>
+                            <div
+                                class="value">{$ident/text()}</div>
+                        </div>
+                }
+            </div>
+        
+        </div>
+        
+        <div
+            class="expressions">
             {
-                for $ident in $doc//mei:work/mei:identifier
-                return 
-                    <div class="identifier">
-                        <div class="label">{concat(upper-case(substring($ident/@type,1,1)),substring($ident/@type,2))}</div>
-                        <div class="value">{$ident/text()}</div>
-                    </div>
+                for $expression in $doc//mei:work/mei:expressionList/mei:expression
+                let $label := $expression/string(@label)
+                let $target := concat($docUri, '#', $expression/@xml:id)
+                let $manifestations := for $source in //mei:relation[@target = $target and @rel = 'isEmbodimentOf']/root()
+                return
+                    <div
+                        class="manifestation">{$source//mei:source/mei:titleStmt/mei:title[1]/text()}</div>
+                return
+                    <div
+                        class="expression"><h1>{$label}</h1><div
+                            class="manifestations">{$manifestations}</div></div>
             }
-            </div>
-            
-        </div>    
-    
-        <div class="expressions">
-        {
-            for $expression in $doc//mei:work/mei:expressionList/mei:expression
-            let $label := $expression/string(@label)
-            let $target := concat($docUri, '#', $expression/@xml:id)
-            let $manifestations := for $source in //mei:relation[@target = $target and @rel = 'isEmbodimentOf']/root()
-                                    return
-                                        <div class="manifestation">{$source//mei:source/mei:titleStmt/mei:title[1]/text()}</div>
-            return
-                <div class="expression"><h1>{$label}</h1><div class="manifestations">{$manifestations}</div></div>
-        }
         </div>
     </div>
 };
 
-declare function local:getTextSummary($doc, $facsBasePath){
-(:title resp repository/bibl dating:)
+declare function local:getTextSummary($doc, $facsBasePath) {
+    (:title resp repository/bibl dating:)
     let $title := $doc//tei:titleStmt/tei:title[1]/text()
     return
-     <div class="summaryViewText">
-        <h1>
-            {
-                if(false()(:$doc//tei:titleStmt/tei:title[@level eq 'a' or @level eq 'm']:)) (: TODO: Prüfen, warum die Abfrage nicht mehr klappt:)
-                then(string-join($doc//tei:titleStmt/tei:title[@level eq 'a' or @level eq 'm']//text(), '. '))
-                else($title)
-            }
-        </h1>
-        
-        <div class="metaData">
-        {
-            if($doc//tei:titleStmt/tei:title[@level eq 's'])
-            then(
-                <div class="series metaRow">
-                    <div class="key">Reihe</div>
-                    <div class="value">                       
-                        {$doc//tei:titleStmt/tei:title[@level eq 's']//text()}
-                   </div>
-                </div>
-            )
-            else()
-        }
-        
-        {
-            if($doc//tei:titleStmt/tei:editor)
-            then(
-                <div class="editor metaRow">
-                    <div class="key">{if(count($doc//tei:titleStmt/tei:editor) gt 1)then('Herausgeber')else('Herausgeber')}</div>(:TODO: get keyValue:)
-                    <div class="value">                       
-                        {$doc//tei:titleStmt/tei:title[@level eq 's']//text()}
-                   </div>
-                </div>
-            )
-            else()
-        }
-         
-        {
-            for $respStmt in $doc//tei:editionStmt/tei:respStmt
-            return
-                <div class="resp metaRow">
-                    <div class="key">
-                    {
-                        if($respStmt/tei:resp != '')
-                        then($respStmt/data(tei:resp))
-                        else(string('Responsible'))
-                    }
-                    </div>
-                    <div class="value">
-                    {
-                        for $name at $i in $respStmt/tei:*[local-name() eq 'persName' or local-name() eq 'name' or local-name() eq 'orgName']
-                        let $numNames := count($respStmt/tei:*[local-name() eq 'persName' or local-name() eq 'name' or local-name() eq 'orgName'])
-                        return
-                            if($i < $numNames)
-                            then($name, ', ')
-                            else($name)
-                    }
-                    </div>
-                </div>
+        <div
+            class="summaryViewText">
+            <h1>
+                {
+                    if (false() (:$doc//tei:titleStmt/tei:title[@level eq 'a' or @level eq 'm']:)) (: TODO: Prüfen, warum die Abfrage nicht mehr klappt:)
+                    then
+                        (string-join($doc//tei:titleStmt/tei:title[@level eq 'a' or @level eq 'm']//text(), '. '))
+                    else
+                        ($title)
+                }
+            </h1>
+            
+            <div
+                class="metaData">
+                {
+                    if ($doc//tei:titleStmt/tei:title[@level eq 's'])
+                    then
+                        (
+                        <div
+                            class="series metaRow">
+                            <div
+                                class="key">Reihe</div>
+                            <div
+                                class="value">
+                                {$doc//tei:titleStmt/tei:title[@level eq 's']//text()}
+                            </div>
+                        </div>
+                        )
+                    else
+                        ()
+                }
                 
-        }
-        
-        {
-            for $date in $doc//tei:publicationStmt/tei:date
-            return
-                <div class="dating metaRow">
-                    <div class="key">Dating</div>
-                    <div class="value">{local:getTeiDateValue($date)}</div>
-                </div>
+                {
+                    if ($doc//tei:titleStmt/tei:editor)
+                    then
+                        (
+                        <div
+                            class="editor metaRow">
+                            <div
+                                class="key">{
+                                    if (count($doc//tei:titleStmt/tei:editor) gt 1) then
+                                        ('Herausgeber')
+                                    else
+                                        ('Herausgeber')
+                                }</div>(:TODO: get keyValue:)
+                            <div
+                                class="value">
+                                {$doc//tei:titleStmt/tei:title[@level eq 's']//text()}
+                            </div>
+                        </div>
+                        )
+                    else
+                        ()
+                }
                 
-        }
-        
-        {
-            if($doc//tei:sourceDesc/tei:msDesc//tei:repository)
-            then(
-                        <div class="library metaRow">
-                            <div class="key">Repository</div>
-                            <div class="value">
-                            {
-                                $doc//tei:sourceDesc/tei:msDesc//tei:repository/text()
-                            }
+                {
+                    for $respStmt in $doc//tei:editionStmt/tei:respStmt
+                    return
+                        <div
+                            class="resp metaRow">
+                            <div
+                                class="key">
+                                {
+                                    if ($respStmt/tei:resp != '')
+                                    then
+                                        ($respStmt/data(tei:resp))
+                                    else
+                                        (string('Responsible'))
+                                }
+                            </div>
+                            <div
+                                class="value">
+                                {
+                                    for $name at $i in $respStmt/tei:*[local-name() eq 'persName' or local-name() eq 'name' or local-name() eq 'orgName']
+                                    let $numNames := count($respStmt/tei:*[local-name() eq 'persName' or local-name() eq 'name' or local-name() eq 'orgName'])
+                                    return
+                                        if ($i < $numNames)
+                                        then
+                                            ($name, ', ')
+                                        else
+                                            ($name)
+                                }
                             </div>
                         </div>
-            )
-            else(),
-            if($doc//tei:sourceDesc/tei:msDesc//tei:idno)
-            then(
-                        <div class="library metaRow">
-                            <div class="key">Signatur</div>
-                            <div class="value">
-                            {
-                                $doc//tei:sourceDesc/tei:msDesc//tei:idno/text()
-                            }
+                
+                }
+                
+                {
+                    for $date in $doc//tei:publicationStmt/tei:date
+                    return
+                        <div
+                            class="dating metaRow">
+                            <div
+                                class="key">Dating</div>
+                            <div
+                                class="value">{local:getTeiDateValue($date)}</div>
+                        </div>
+                
+                }
+                
+                {
+                    if ($doc//tei:sourceDesc/tei:msDesc//tei:repository)
+                    then
+                        (
+                        <div
+                            class="library metaRow">
+                            <div
+                                class="key">Repository</div>
+                            <div
+                                class="value">
+                                {
+                                    $doc//tei:sourceDesc/tei:msDesc//tei:repository/text()
+                                }
                             </div>
                         </div>
-            )
-            else()
-        }
-
-        {
-            if($doc//tei:publicationStmt/tei:publisher)
-            then(
-                <div class="publisher metaRow">
-                    <div class="key">Publisher</div>
-                    <div class="value">{$doc//tei:publicationStmt/tei:publisher[1]/text()}</div>
-                </div>
-            )
-            else()
-        }
-        </div>
+                        )
+                    else
+                        (),
+                    if ($doc//tei:sourceDesc/tei:msDesc//tei:idno)
+                    then
+                        (
+                        <div
+                            class="library metaRow">
+                            <div
+                                class="key">Signatur</div>
+                            <div
+                                class="value">
+                                {
+                                    $doc//tei:sourceDesc/tei:msDesc//tei:idno/text()
+                                }
+                            </div>
+                        </div>
+                        )
+                    else
+                        ()
+                }
+                
+                {
+                    if ($doc//tei:publicationStmt/tei:publisher)
+                    then
+                        (
+                        <div
+                            class="publisher metaRow">
+                            <div
+                                class="key">Publisher</div>
+                            <div
+                                class="value">{$doc//tei:publicationStmt/tei:publisher[1]/text()}</div>
+                        </div>
+                        )
+                    else
+                        ()
+                }
+            </div>
+            
+            { (:TODO: facsimile auswerten:)
+                if ($doc//tei:titlePage)
+                then
+                    (
+                    <div
+                        class="titlePage">
+                        { (: TODO: transformieren :)$doc//tei:text//tei:titlePage/text()}
+                    </div>
+                    )
+                else
+                    ()
+            }
         
-        {(:TODO: facsimile auswerten:)
-            if($doc//tei:titlePage)
-            then(
-                <div class="titlePage">
-                    {(: TODO: transformieren :)$doc//tei:text//tei:titlePage/text()}
-                </div>
-            )
-            else()
-        }
-
-    </div>
+        </div>
 };
 
 declare function local:getImagePath($server, $edition) {
-	(:let $server :=  eutil:getPreference('image_server', request:get-parameter('edition', '')) :)
-	
-	 let $i_path := if($server = 'leaflet')
-             then (eutil:getPreference('leaflet_prefix', $edition))
-            else(eutil:getPreference('image_prefix', $edition))
-                            
-     return $i_path
-     
+    (:let $server :=  eutil:getPreference('image_server', request:get-parameter('edition', '')) :)
+    
+    let $i_path := if ($server = 'leaflet')
+    then
+        (eutil:getPreference('leaflet_prefix', $edition))
+    else
+        (eutil:getPreference('image_prefix', $edition))
+    
+    return
+        $i_path
+
 };
 
 declare function local:getImagePathLeaflet($doc) {
-  if($doc//mei:source//mei:titlePage/@facs)
-            then(
-            	let $tile_path := $doc//mei:source//mei:titlePage[1]/@facs
-            	return $tile_path
-            )
-            else if($doc//mei:facsimile/mei:surface/mei:graphic)
-            then(
-            	let $tile_path := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target
-            	let $width := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@width
-            	let $height := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@height
-            	return concat($tile_path, '§', $width, '§', $height)
+    if ($doc//mei:source//mei:titlePage/@facs)
+    then
+        (
+        let $tile_path := $doc//mei:source//mei:titlePage[1]/@facs
+        return
+            $tile_path
+        )
+    else
+        if ($doc//mei:facsimile/mei:surface/mei:graphic)
+        then
+            (
+            let $tile_path := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target
+            let $width := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@width
+            let $height := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@height
+            return
+                concat($tile_path, '§', $width, '§', $height)
             
             )
-            else() 
+        else
+            ()
 };
 
-declare function local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri){
-	let $test := <div>
-	<div>{
-		if($type = 'work')then(local:getWorkSummary($doc, $docUri))
-		else(local:getSourceSummary($doc, $imagePrefix, $server))
-}</div>
-	<p>{$imagePath}</p></div>
-	return $test
+declare function local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri) {
+    let $test := <div>
+        <div>{
+                if ($type = 'work') then
+                    (local:getWorkSummary($doc, $docUri))
+                else
+                    (local:getSourceSummary($doc, $imagePrefix, $server))
+            }</div>
+        <p>{$imagePath}</p></div>
+    return
+        $test
 };
 
 
 let $uri := request:get-parameter('uri', '')
 let $type := request:get-parameter('type', '')
-let $docUri := if(contains($uri, '#')) then(substring-before($uri, '#')) else($uri)
+let $docUri := if (contains($uri, '#')) then
+    (substring-before($uri, '#'))
+else
+    ($uri)
 let $doc := eutil:getDoc($docUri)
 let $edition := request:get-parameter('edition', '')
-let $server :=  eutil:getPreference('image_server', $edition) 
+let $server := eutil:getPreference('image_server', $edition)
 let $imagePrefix := local:getImagePath($server, $edition)
 (:eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
 let $imagePath := local:getImagePathLeaflet($doc)
@@ -489,19 +660,29 @@ let $imagePath := local:getImagePathLeaflet($doc)
 (:local:getImagePathLeaflet($imagePrefix, $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target):)
 
 return
-    if($type = 'work')
-    then(
-		if($server = 'leaflet')
-    		then(local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
-    		else(local:getWorkSummary($doc, $docUri))
-
-	)
-    else if($type = 'source')
-    then(
-    	if($server = 'leaflet')
-    	then(local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
-    	else(local:getSourceSummary($doc, $imagePrefix, $server))
-    )
-    else if($type = 'text')
-    then(local:getTextSummary($doc, $imagePrefix))
-    else()
+    if ($type = 'work')
+    then
+        (
+        if ($server = 'leaflet')
+        then
+            (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
+        else
+            (local:getWorkSummary($doc, $docUri))
+        
+        )
+    else
+        if ($type = 'source')
+        then
+            (
+            if ($server = 'leaflet')
+            then
+                (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
+            else
+                (local:getSourceSummary($doc, $imagePrefix, $server))
+            )
+        else
+            if ($type = 'text')
+            then
+                (local:getTextSummary($doc, $imagePrefix))
+            else
+                ()
diff --git a/add/data/xql/getText.xql b/add/data/xql/getText.xql
index 781b5d382..e1868ae70 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -19,12 +19,12 @@ xquery version "3.0";
 
   ID: $Id: getText.xql 1456 2012-10-11 12:50:05Z niko $
 :)
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace xhtml="http://www.w3.org/1999/xhtml";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+declare namespace xhtml = "http://www.w3.org/1999/xhtml";
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 (:declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";:)
@@ -39,58 +39,106 @@ let $contextPath := request:get-context-path()
 
 let $xslInstruction := $doc//processing-instruction(xml-stylesheet)
 let $xslInstruction := for $i in fn:serialize($xslInstruction, ())
-                        return
-                        if(matches($i, 'type="text/xsl"'))
-                        then(substring-before(substring-after($i, 'href="'), '"'))
-                        else()
-
-
-let $doc := if($term eq '')then($doc)else($doc//tei:text[ft:query(., $term)]/ancestor::tei:TEI)
-let $doc := if($term eq '')then($doc)else(util:expand($doc))
-
-let $doc := if($page eq '')then($doc)else(
+return
+    if (matches($i, 'type="text/xsl"'))
+    then
+        (substring-before(substring-after($i, 'href="'), '"'))
+    else
+        ()
+
+
+let $doc := if ($term eq '') then
+    ($doc)
+else
+    ($doc//tei:text[ft:query(., $term)]/ancestor::tei:TEI)
+let $doc := if ($term eq '') then
+    ($doc)
+else
+    (util:expand($doc))
+
+let $doc := if ($page eq '') then
+    ($doc)
+else
+    (
     let $pb1 := $doc//tei:pb[@facs eq '#' || $page]/@n
     let $pb2 := ($doc//tei:pb[@facs eq '#' || $page]/following::tei:pb)[1]/@n
     return
-        transform:transform($doc, doc('../xslt/reduceToPage.xsl'), <parameters><param name="pb1" value="{$pb1}"/><param name="pb2" value="{$pb2}"/></parameters>)
-)
+        transform:transform($doc, doc('../xslt/reduceToPage.xsl'), <parameters><param
+                name="pb1"
+                value="{$pb1}"/><param
+                name="pb2"
+                value="{$pb2}"/></parameters>)
+    )
 
 let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '') (:TODO:)
 
 let $edition := request:get-parameter('edition', '')
-let $imageserver :=  eutil:getPreference('image_server', $edition)
-let $imagePrefix := if($imageserver = 'leaflet')
-	then(eutil:getPreference('leaflet_prefix', $edition))
-	else(eutil:getPreference('image_prefix', $edition))
-
-(:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
+let $imageserver := eutil:getPreference('image_server', $edition)
+let $imagePrefix := if ($imageserver = 'leaflet')
+then
+    (eutil:getPreference('leaflet_prefix', $edition))
+else
+    (eutil:getPreference('image_prefix', $edition))
+    
+    (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
 
-let $xsl := if($xslInstruction)then($xslInstruction)else('../xslt/teiBody2HTML.xsl')
+let $xsl := if ($xslInstruction) then
+    ($xslInstruction)
+else
+    ('../xslt/teiBody2HTML.xsl')
 
 let $params := (
-                (: parameters for Edirom-Online :)
-                <param name="lang" value="{eutil:getLanguage($edition)}"/>,
-                <param name="docUri" value="{$uri}"/>,
-                <param name="contextPath" value="{$contextPath}"/>,
-                (: parameters for the TEI Stypesheets :)
-                <param name="autoHead" value="'false'"/>,
-                <param name="autoToc" value="'false'"/>,
-                <param name="base" value="{concat($base, '/../xslt/')}"/>,
-                <param name="footnoteBackLink" value="true"/>,
-                <param name="graphicsPrefix" value="{$imagePrefix}"/>,(:TODO frm XSLT <param name="graphicsPrefix"/>:)
-                <param name="numberHeadings" value="'false'"/>,
-                <param name="pageLayout" value="'CSS'"/>
-                )
-    
-let $doc := if($xslInstruction)then(transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
-    else(transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
+(: parameters for Edirom-Online :)
+<param
+    name="lang"
+    value="{eutil:getLanguage($edition)}"/>,
+<param
+    name="docUri"
+    value="{$uri}"/>,
+<param
+    name="contextPath"
+    value="{$contextPath}"/>,
+(: parameters for the TEI Stypesheets :)
+<param
+    name="autoHead"
+    value="'false'"/>,
+<param
+    name="autoToc"
+    value="'false'"/>,
+<param
+    name="base"
+    value="{concat($base, '/../xslt/')}"/>,
+<param
+    name="footnoteBackLink"
+    value="true"/>,
+<param
+    name="graphicsPrefix"
+    value="{$imagePrefix}"/>, (:TODO frm XSLT <param name="graphicsPrefix"/>:)
+<param
+    name="numberHeadings"
+    value="'false'"/>,
+<param
+    name="pageLayout"
+    value="'CSS'"/>
+)
+
+let $doc := if ($xslInstruction) then
+    (transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
+else
+    (transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
 
-let $doc := transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param name="idPrefix" value="{$idPrefix}"/></parameters>)
+let $doc := transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param
+        name="idPrefix"
+        value="{$idPrefix}"/></parameters>)
 
 let $body := $doc//xhtml:body
 
 return
     element div {
-        for $attribute in $body/@* return $attribute,
-        for $node in $body/node() return $node
+        for $attribute in $body/@*
+        return
+            $attribute,
+        for $node in $body/node()
+        return
+            $node
     }
diff --git a/add/data/xql/getWorkID.xql b/add/data/xql/getWorkID.xql
index 91e1ac27a..1e45f3697 100644
--- a/add/data/xql/getWorkID.xql
+++ b/add/data/xql/getWorkID.xql
@@ -24,15 +24,17 @@ xquery version "3.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-import module namespace work="http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
+import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
-declare namespace edirom="http://www.edirom.de/ns/1.3";
+declare namespace edirom = "http://www.edirom.de/ns/1.3";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 let $uri := request:get-parameter('uri', '')
 let $workId := request:get-parameter('workId', '')
 return
-    if(doc($uri)//edirom:work[@xml:id = $workId])
-    then($workId)
-    else(work:findWorkID($uri))
\ No newline at end of file
+    if (doc($uri)//edirom:work[@xml:id = $workId])
+    then
+        ($workId)
+    else
+        (work:findWorkID($uri))
\ No newline at end of file
diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index ddb322166..71cfae2c4 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -26,10 +26,10 @@ xquery version "1.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
-import module namespace work="http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace request = "http://exist-db.org/xquery/request";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
@@ -38,10 +38,11 @@ let $workUris := edition:getWorkUris($uri)
 
 return
     concat('[',
-	    string-join(
-	       
-	       for $workUri in $workUris
-	       return work:toJSON($workUri, $uri)
-	       
-	    , ','),
+    string-join(
+    
+    for $workUri in $workUris
+    return
+        work:toJSON($workUri, $uri)
+    
+    , ','),
     ']')
\ No newline at end of file
diff --git a/add/data/xql/getXml.xql b/add/data/xql/getXml.xql
index ade41e67d..5a12d4c5b 100644
--- a/add/data/xql/getXml.xql
+++ b/add/data/xql/getXml.xql
@@ -20,10 +20,10 @@ xquery version "1.0";
   ID: $Id: getXml.xql 1219 2012-01-20 08:33:28Z daniel $
 :)
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 
 declare option exist:serialize "method=xml media-type=text/xml omit-xml-declaration=no indent=yes";
 
@@ -33,6 +33,8 @@ let $doc := eutil:getDoc($uri)/root()
 let $internal := $doc/id($internalId)
 
 return
-    if(exists($internal))
-    then($internal)
-    else($doc)
\ No newline at end of file
+    if (exists($internal))
+    then
+        ($internal)
+    else
+        ($doc)
\ No newline at end of file
diff --git a/add/data/xql/getZone.xql b/add/data/xql/getZone.xql
index 738b17430..8ea3222f7 100644
--- a/add/data/xql/getZone.xql
+++ b/add/data/xql/getZone.xql
@@ -24,11 +24,11 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
@@ -39,13 +39,14 @@ let $zoneId := request:get-parameter('zoneId', '')
 let $mei := doc($uri)/root()
 let $zone := $mei/id($zoneId)
 
-return (
+return
+    (
     concat('{',
-        'zoneId: "', $zone/string(@xml:id), '", ',
-        'pageId: "', $zone/../string(@xml:id), '", ',
-        'ulx: "', $zone/string(@ulx), '", ',
-        'uly: "', $zone/string(@uly), '", ',
-        'lrx: "', $zone/string(@lrx), '", ',
-        'lry: "', $zone/string(@lry), '"',
+    'zoneId: "', $zone/string(@xml:id), '", ',
+    'pageId: "', $zone/../string(@xml:id), '", ',
+    'ulx: "', $zone/string(@ulx), '", ',
+    'uly: "', $zone/string(@uly), '", ',
+    'lrx: "', $zone/string(@lrx), '", ',
+    'lry: "', $zone/string(@lry), '"',
     '}')
-)
\ No newline at end of file
+    )
\ No newline at end of file
diff --git a/add/data/xql/getiFrameURL.xql b/add/data/xql/getiFrameURL.xql
index 561adf53c..2e3ba1a28 100644
--- a/add/data/xql/getiFrameURL.xql
+++ b/add/data/xql/getiFrameURL.xql
@@ -20,15 +20,16 @@ xquery version "3.0";
   ID: $Id: getiFrameURL.xql 1455 2012-10-11 10:42:55Z daniel $
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace xmldb="http://exist-db.org/xquery/xmldb";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 let $uri := request:get-parameter('uri', '')
 let $uri := replace($uri, 'xmldb:exist:///db/', concat(request:get-scheme(), '://', request:get-server-name(), ':', request:get-server-port(), '/'))
 return
-    if(contains(request:get-url(), '/exist/'))
-    then(replace($uri, '/apps', '/exist/apps'))
-    else($uri)
-    
\ No newline at end of file
+    if (contains(request:get-url(), '/exist/'))
+    then
+        (replace($uri, '/apps', '/exist/apps'))
+    else
+        ($uri)
diff --git a/add/data/xql/loginToTextGrid.xql b/add/data/xql/loginToTextGrid.xql
index 7752d34d9..25d43d83f 100644
--- a/add/data/xql/loginToTextGrid.xql
+++ b/add/data/xql/loginToTextGrid.xql
@@ -1,24 +1,26 @@
 xquery version "3.0";
 
-declare namespace html="http://www.w3.org/1999/xhtml";
+declare namespace html = "http://www.w3.org/1999/xhtml";
 
 let $loginname := request:get-parameter('loginname', '')
 let $password := request:get-parameter('password', '')
 let $authZinstance := request:get-parameter('authZinstance', 'textgrid-ws3.sub.uni-goettingen.de')
 
 let $login := httpclient:get(xs:anyURI('https://textgridlab.org/1.0/WebAuthN/TextGrid-WebAuth.php?authZinstance=' || $authZinstance || '&amp;loginname=' || $loginname || '&amp;password=' || $password),
-                    false(), ())
+false(), ())
 
 return
-    if($login//html:meta[@name='remote_principal'])
-    then(
-        let $userName := $login//html:meta[@name='remote_principal']/string(@content)
-        let $sessionId := $login//html:meta[@name='rbac_sessionid']/string(@content)
+    if ($login//html:meta[@name = 'remote_principal'])
+    then
+        (
+        let $userName := $login//html:meta[@name = 'remote_principal']/string(@content)
+        let $sessionId := $login//html:meta[@name = 'rbac_sessionid']/string(@content)
         let $cookie := response:set-cookie('edirom_online_textgrid_username', $userName, (), false(), '.freischuetz-digital.de', '/')
         let $cookie := response:set-cookie('edirom_online_textgrid_sessionId', $sessionId, (), false(), '.freischuetz-digital.de', '/')
         return
             '{success: true, msg: "Login successful", user: "' || $userName || '"}'
-    )
-    else(
+        )
+    else
+        (
         '{success: false, msg: "Login failed"}'
-    )
\ No newline at end of file
+        )
\ No newline at end of file
diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 6f2fb4a2b..1014b4493 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -18,123 +18,206 @@ xquery version "3.0";
   along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
 :)
 
-import module namespace kwic="http://exist-db.org/xquery/kwic";
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace kwic = "http://exist-db.org/xquery/kwic";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
-declare namespace request="http://exist-db.org/xquery/request";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 
 (:declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";:)
 
 declare variable $lang := request:get-parameter('lang', '');
 
 declare function local:filter($node as node(), $mode as xs:string) as xs:string? {
-  if ($mode eq 'before') then 
-      concat($node, ' ')
-  else 
-      concat(' ', $node)
+    if ($mode eq 'before') then
+        concat($node, ' ')
+    else
+        concat(' ', $node)
 };
 
 declare function local:getPath($node as node()) as xs:string {
     let $localName := local-name($node)
-    let $parentPath := if($node/..)then(local:getPath($node/..))else('')
+    let $parentPath := if ($node/..) then
+        (local:getPath($node/..))
+    else
+        ('')
     return
-    concat($parentPath, '/', $localName, '[', count($node/preceding-sibling::*[local-name(.) eq $localName]) + 1, ']')
+        concat($parentPath, '/', $localName, '[', count($node/preceding-sibling::*[local-name(.) eq $localName]) + 1, ']')
 };
 
 let $term := request:get-parameter('term', '')
 
-let $trans :=   <xsl:stylesheet  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-                    <!--<xsl:output encoding="UTF-8" media-type="text/xhmtl" method="xhtml" omit-xml-declaration="yes" indent="yes"/>-->
-                    <xsl:template match="/">
-                        <xsl:apply-templates/>
-                    </xsl:template>
-                    <xsl:template match="a">
-                        <xsl:variable name="elem" select="."/>
-                        <span class="hit" onclick="{{$elem/string(@href)}}">
-                            <xsl:apply-templates/>
-                        </span>
-                    </xsl:template>
-                    <xsl:template match="element() | @*">
-                        <xsl:copy>
-                            <xsl:apply-templates select="@* | node()"/>
-                        </xsl:copy>
-                    </xsl:template>
-                </xsl:stylesheet>
+let $trans := <xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    version="2.0">
+    <!--<xsl:output encoding="UTF-8" media-type="text/xhmtl" method="xhtml" omit-xml-declaration="yes" indent="yes"/>-->
+    <xsl:template
+        match="/">
+        <xsl:apply-templates/>
+    </xsl:template>
+    <xsl:template
+        match="a">
+        <xsl:variable
+            name="elem"
+            select="."/>
+        <span
+            class="hit"
+            onclick="{{$elem/string(@href)}}">
+            <xsl:apply-templates/>
+        </span>
+    </xsl:template>
+    <xsl:template
+        match="element() | @*">
+        <xsl:copy>
+            <xsl:apply-templates
+                select="@* | node()"/>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>
 
-let $return := 
-    <div class="searchResult">{
-    
-    let $search := 
-        if(string-length($term) gt 0)
-        then(
+let $return :=
+<div
+    class="searchResult">{
+        
+        let $search :=
+        if (string-length($term) gt 0)
+        then
+            (
             collection('/db')//tei:text[ft:query(., $term)]/ancestor::tei:TEI
             | collection('/db')//tei:title[ft:query(., $term)]/ancestor::tei:TEI
             | collection('/db')//mei:mei[ft:query(., $term)]
             | collection('/db')//mei:title[ft:query(., $term)]/ancestor::mei:mei
             | collection('/db')//mei:annot[ft:query(., $term)][@type eq 'editorialComment']
             | collection('/db')//mei:annot[contains(@xml:id, $term)]
-        )
-        else()
-    
-    return (
-        
-        if(count($search) gt 0)
-        then( if ($lang = 'de')
-                then(<div class="searchResultOverview">Die Suche ergab Treffer in <span class="num">{count($search)}</span> Objekten:</div>)
-                else (<div class="searchResultOverview">Hits in <span class="num">{count($search)}</span> objects:</div>)
-        )
-        else( if ($lang = 'de')
-                then(<div class="searchResultOverview">Die Suche ergab keine Treffer.</div>)
-                else(<div class="searchResultOverview">No match found.</div>)
-        )
-        ,
-    
-    for $hit in $search
+            )
+        else
+            ()
         
-    let $expanded := kwic:expand($hit)
-    let $hitCount := count($expanded//*[./exist:match])
-    let $doc := $hit/root()
-    let $uri := document-uri($doc)
-    let $title := (: Annotation :)
-              if(local-name($hit) eq 'annot')
-              then(eutil:getLocalizedTitle($hit, $lang))
-              (: Work :)
-              else if(exists($doc//mei:mei) and exists($doc//mei:work))
-              then(eutil:getLocalizedTitle($doc//mei:work/mei:titleStmt, $lang))
-              (: Source / Score :)
-              else if(exists($doc//mei:mei) and exists($doc//mei:source))
-              then(eutil:getLocalizedTitle($doc//mei:source/mei:titleStmt, $lang))
-              (: Text :)
-              else if(exists($doc/tei:TEI))
-              then(eutil:getLocalizedTitle($doc//tei:titleStmt, $lang))
-              else(string('unknown'))
-    order by ft:score($hit) descending
-    return
-        <div class="searchResultDoc">
-            <div class="doc"><span class="resultTitle" onclick="loadLink('xmldb:exist://{$uri}{if(local-name($hit) eq 'annot')then(concat('#', $hit/@xml:id))else()}?term={replace($term, '"', '\\"')}');">{$title}</span><span class="resultCount">{
-            if ($lang = 'de')
-            then(concat('(', $hitCount, ' Treffer', ')'))
-            else(concat('(', $hitCount, ' hit', if($hitCount gt 1)then('s')else(''), ')'))
-            }</span></div>
-        {(
-            for $match at $i in $expanded//*[./exist:match]
-            let $path := local:getPath($match)
-            let $internalId := if(local-name($hit) eq 'annot')then($hit/@xml:id)else if($match/@xml:id)then($match/@xml:id)else()
-            return
-                <div class="hitP" style="{if($i gt 3)then('display:none;')else('')}">{
-                kwic:get-summary($match, ($match/exist:match)[1], <config width="100" link="loadLink('xmldb:exist://{$uri}{if($internalId)then(concat('#', $internalId))else()}?path={$path}&amp;term={replace($term, '"', '\\"')}');" />,
-                    util:function(xs:QName("local:filter"), 2))
-               }</div>
+        return
+            (
+            
+            if (count($search) gt 0)
+            then
+                (if ($lang = 'de')
+                then
+                    (<div
+                        class="searchResultOverview">Die Suche ergab Treffer in <span
+                            class="num">{count($search)}</span> Objekten:</div>)
+                else
+                    (<div
+                        class="searchResultOverview">Hits in <span
+                            class="num">{count($search)}</span> objects:</div>)
+                )
+            else
+                (if ($lang = 'de')
+                then
+                    (<div
+                        class="searchResultOverview">Die Suche ergab keine Treffer.</div>)
+                else
+                    (<div
+                        class="searchResultOverview">No match found.</div>)
+                )
             ,
-            if($hitCount gt 3)
-            then(<div class="showMore" onclick="$(this).parent().find('div').show(); $(this).hide();">{if ($lang = 'de') then ('Alle Treffer zeigen') else ('show all hits')}</div>)
-            else()
-        )}</div>
-        )
+            
+            for $hit in $search
+            
+            let $expanded := kwic:expand($hit)
+            let $hitCount := count($expanded//*[./exist:match])
+            let $doc := $hit/root()
+            let $uri := document-uri($doc)
+            let $title := (: Annotation :)
+            if (local-name($hit) eq 'annot')
+            then
+                (eutil:getLocalizedTitle($hit, $lang))
+                (: Work :)
+            else
+                if (exists($doc//mei:mei) and exists($doc//mei:work))
+                then
+                    (eutil:getLocalizedTitle($doc//mei:work/mei:titleStmt, $lang))
+                    (: Source / Score :)
+                else
+                    if (exists($doc//mei:mei) and exists($doc//mei:source))
+                    then
+                        (eutil:getLocalizedTitle($doc//mei:source/mei:titleStmt, $lang))
+                        (: Text :)
+                    else
+                        if (exists($doc/tei:TEI))
+                        then
+                            (eutil:getLocalizedTitle($doc//tei:titleStmt, $lang))
+                        else
+                            (string('unknown'))
+                order by ft:score($hit) descending
+            return
+                <div
+                    class="searchResultDoc">
+                    <div
+                        class="doc"><span
+                            class="resultTitle"
+                            onclick="loadLink('xmldb:exist://{$uri}{
+                                    if (local-name($hit) eq 'annot') then
+                                        (concat('#', $hit/@xml:id))
+                                    else
+                                        ()
+                                }?term={replace($term, '"', '\\"')}');">{$title}</span><span
+                            class="resultCount">{
+                                if ($lang = 'de')
+                                then
+                                    (concat('(', $hitCount, ' Treffer', ')'))
+                                else
+                                    (concat('(', $hitCount, ' hit', if ($hitCount gt 1) then
+                                        ('s')
+                                    else
+                                        (''), ')'))
+                            }</span></div>
+                    {
+                        (
+                        for $match at $i in $expanded//*[./exist:match]
+                        let $path := local:getPath($match)
+                        let $internalId := if (local-name($hit) eq 'annot') then
+                            ($hit/@xml:id)
+                        else
+                            if ($match/@xml:id) then
+                                ($match/@xml:id)
+                            else
+                                ()
+                        return
+                            <div
+                                class="hitP"
+                                style="{
+                                        if ($i gt 3) then
+                                            ('display:none;')
+                                        else
+                                            ('')
+                                    }">{
+                                    kwic:get-summary($match, ($match/exist:match)[1], <config
+                                        width="100"
+                                        link="loadLink('xmldb:exist://{$uri}{
+                                                if ($internalId) then
+                                                    (concat('#', $internalId))
+                                                else
+                                                    ()
+                                            }?path={$path}&amp;term={replace($term, '"', '\\"')}');"/>,
+                                    util:function(xs:QName("local:filter"), 2))
+                                }</div>
+                        ,
+                        if ($hitCount gt 3)
+                        then
+                            (<div
+                                class="showMore"
+                                onclick="$(this).parent().find('div').show(); $(this).hide();">{
+                                    if ($lang = 'de') then
+                                        ('Alle Treffer zeigen')
+                                    else
+                                        ('show all hits')
+                                }</div>)
+                        else
+                            ()
+                        )
+                    }</div>
+            )
     }
-    </div>
-    
+</div>
+
 return
     transform:transform($return, $trans, ())
\ No newline at end of file

From ee5ead64a44a8b6adc33c3e4e77afd394b02cb9e Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Wed, 8 Nov 2023 22:31:19 +0100
Subject: [PATCH 007/103] add POSIX compliant file ending newline

---
 add/data/xql/checkTextGridLogin.xql        |   2 +-
 add/data/xql/getAnnotation.xql             | 100 +++++++++----------
 add/data/xql/getAnnotationInfos.xql        |  14 +--
 add/data/xql/getAnnotationMeta.xql         |   4 +-
 add/data/xql/getAnnotationOpenAllUris.xql  |  12 +--
 add/data/xql/getAnnotationParticipants.xql |   2 +-
 add/data/xql/getAnnotationPreviews.xql     |  74 +++++++-------
 add/data/xql/getAnnotationText.xql         |   6 +-
 add/data/xql/getAnnotations.xql            |   2 +-
 add/data/xql/getAnnotationsInRendering.xql |   4 +-
 add/data/xql/getAnnotationsInText.xql      |   6 +-
 add/data/xql/getAnnotationsOnPage.xql      |  22 ++---
 add/data/xql/getAudioPlayer.xql            |  64 ++++++-------
 add/data/xql/getChapters.xql               |   2 +-
 add/data/xql/getConcordances.xql           |   4 +-
 add/data/xql/getEdition.xql                |   2 +-
 add/data/xql/getEditionURI.xql             |   2 +-
 add/data/xql/getExtendedStaff.xql          |   8 +-
 add/data/xql/getHeader.xql                 |   2 +-
 add/data/xql/getHelp.xql                   |   2 +-
 add/data/xql/getLanguageFile.xql           |   4 +-
 add/data/xql/getLinkTarget.xql             |  68 ++++++-------
 add/data/xql/getMeasure.xql                |   2 +-
 add/data/xql/getMeasurePage.xql            |  10 +-
 add/data/xql/getMeasures.xql               |  10 +-
 add/data/xql/getMeasuresOnPage.xql         |  10 +-
 add/data/xql/getMovements.xql              |   2 +-
 add/data/xql/getMovementsFirstPage.xql     |   2 +-
 add/data/xql/getMusicInMdiv.xql            |   2 +-
 add/data/xql/getNavigatorConfig.xql        |  16 ++--
 add/data/xql/getOverlayOnPage.xql          |   5 +-
 add/data/xql/getOverlays.xql               |   2 +-
 add/data/xql/getParts.xql                  |   2 +-
 add/data/xql/getPreferences.xql            |   4 +-
 add/data/xql/getReducedDocument.xql        |   2 +-
 add/data/xql/getRendering.xql              |  20 ++--
 add/data/xql/getSummary.xql                | 106 ++++++++++-----------
 add/data/xql/getText.xql                   |   2 +-
 add/data/xql/getWorkID.xql                 |   2 +-
 add/data/xql/getWorks.xql                  |   6 +-
 add/data/xql/getXml.xql                    |   2 +-
 add/data/xql/getZone.xql                   |   4 +-
 add/data/xql/getiFrameURL.xql              |   1 +
 add/data/xql/loginToTextGrid.xql           |   2 +-
 add/data/xql/search.xql                    |  12 +--
 45 files changed, 315 insertions(+), 317 deletions(-)

diff --git a/add/data/xql/checkTextGridLogin.xql b/add/data/xql/checkTextGridLogin.xql
index 8a0ce0a00..69cf329cf 100644
--- a/add/data/xql/checkTextGridLogin.xql
+++ b/add/data/xql/checkTextGridLogin.xql
@@ -12,4 +12,4 @@ let $status := $test/root()/httpclient:response/string(@statusCode)
 let $status := response:set-status-code(xs:int($status))
 
 return
-    $status
\ No newline at end of file
+    $status
diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index c43af1b4d..7b76088e8 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -22,7 +22,7 @@ xquery version "3.1";
 
 (:~
     Returns the HTML for a specific annotation for an AnnotationView.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -55,9 +55,9 @@ declare variable $lang := request:get-parameter('lang', '');
 (: TODO: in Modul auslagern :)
 (:~
     Gets the zone holding the graphical representation of an element
-    
+
     @param $elem The element for which the graphical representation shall be found
-    
+
     @return The zone element
 :)
 declare function local:getZone($elem as element()) as element()? {
@@ -76,13 +76,13 @@ declare function local:getZone($elem as element()) as element()? {
 
 (:~
     This function gets the label of a given Annotation Priority
-    
+
     @param $annot the annot with a priority to look for
-    
+
     @return the label for the Priority, or, if this fails, $uri
 :)
 declare function local:getPriority($annot as node()) {
-    
+
     let $uri := $annot/mei:ptr[@type eq 'priority']/string(@target)
     let $doc := if (starts-with($uri, '#'))
     then
@@ -94,9 +94,9 @@ declare function local:getPriority($annot as node()) {
         doc(substring-before($uri, '#'))
         )
     let $locID := substring-after($uri, '#')
-    
+
     let $elem := $doc/id($locID)
-    
+
     return
         if ($elem/mei:name)
         then
@@ -107,15 +107,15 @@ declare function local:getPriority($annot as node()) {
 
 (:~
     This function gets a string representing all Annotation categories
-    
+
     @param $annot the annot with categories to look for
-    
+
     @return the string of annotation labels, or, if one of them fails, the respecitve $uri
 :)
 declare function local:getCategories($annot as node()) {
-    
+
     let $uris := tokenize($annot/mei:ptr[@type eq 'categories']/string(@target), ' ')
-    
+
     let $string := for $uri in $uris
     let $doc := if (starts-with($uri, '#'))
     then
@@ -143,30 +143,30 @@ declare function local:getCategories($annot as node()) {
 (:~
     This function generates an image path for a specific zone on an image.
     Based on a path prefix and a width.
-    
+
     @param $basePath The base path prefix for the image databse
     @param $zone The zone with coordiantes on the image
     @param $width The width the image should be loaded with
-    
+
     @return A URL pointing to an image based as xs:string
 :)
 declare function local:getImageAreaPath($basePath as xs:string, $zone as element()?, $width as xs:integer) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-    
+
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-    
+
     let $imagePath := $graphic/@target
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
-    
+
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-    
+
     return
         concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $width, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit')
 };
@@ -174,23 +174,23 @@ declare function local:getImageAreaPath($basePath as xs:string, $zone as element
 (: for tips :)
 declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as element()?, $width as xs:integer, $height as xs:integer) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-    
+
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-    
+
     let $imagePath := $graphic/@target
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
-    
+
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-    
+
     let $cut_path := substring-before($imagePath, '.')
-    
+
     let $im_path := if ($imageserver = 'digilib')
     then
         (concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $height, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit'))
@@ -205,10 +205,10 @@ declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as
 (:
     This function recursively determines the lowest number which's square is higher than
     a given number.
-    
+
     @param $i The integer that's increased with every recursive call.
     @param $num The integer that's tested.
-    
+
     @return Returns $i if it's square is higher or equals $num.
 :)
 declare function local:getLowestSquareBase($i as xs:integer, $num as xs:integer) {
@@ -231,7 +231,7 @@ declare function local:getItemLabel($elem as element()) {
                 (concat('Bar ', $elem/@n)))
         else
             (),
-        
+
         if ($name = 'staff')
         then
             (if ($lang = 'de') then
@@ -240,7 +240,7 @@ declare function local:getItemLabel($elem as element()) {
                 (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr, ', Bar ', $elem/ancestor::mei:measure/@n)))
         else
             (),
-        
+
         if ($name = 'zone')
         then
             (if ($lang = 'de') then
@@ -258,22 +258,22 @@ declare function local:getItemLabel($elem as element()) {
 
 :)
 declare function local:calculatePreviewsForTip($participants as xs:string*) {
-    
+
     let $areaWidth := 204
     let $areaHeight := 254
-    
+
     let $elems := for $pUri in $participants
     return
         doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
     let $zones := for $elem in $elems
     return
         local:getZone($elem)
-    
+
     let $tall := some $zone in $zones
         satisfies (number($zone/@lry) - number($zone/@uly) gt 2 * (number($zone/@lrx) - number($zone/@ulx)))
     let $wide := some $zone in $zones
         satisfies (2 * (number($zone/@lry) - number($zone/@uly)) lt number($zone/@lrx) - number($zone/@ulx))
-    
+
     let $w := if ($tall and not($wide))
     then
         (round(10000 div count($zones)) div 100)
@@ -285,7 +285,7 @@ declare function local:calculatePreviewsForTip($participants as xs:string*) {
         else
             (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
         )
-    
+
     let $h := if ($tall and not($wide))
     then
         (100)
@@ -297,17 +297,17 @@ declare function local:calculatePreviewsForTip($participants as xs:string*) {
         else
             (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
         )
-    
+
     let $width := floor($areaWidth * $w div 100)
     let $height := floor($areaHeight * $h div 100)
-    
+
     for $zone in $zones
     let $e := $elems[substring(@facs, 2) = $zone/@xml:id][1]
     let $e := if ($e) then
         ($e)
     else
         ($zone)
-    
+
     let $test := if ($imageserver = 'digilib')
     then
         (
@@ -339,7 +339,7 @@ declare function local:calculatePreviewsForTip($participants as xs:string*) {
                 class="label">{local:getItemLabel($e)}</div>
         </div>
         )
-    
+
     return
         $test
 };
@@ -409,7 +409,7 @@ return
     if ($target eq 'view')
     then
         (
-        
+
         <div
             class="annotView">
             <div
@@ -452,41 +452,41 @@ return
                 <h1>{eutil:getLocalizedName($annot, $lang)}</h1>
                 {annotation:getContent($annot, '', $edition)}
             </div>
-            
+
             <!-- <div class="previewArea">
                 {
-                
-                 if($imageserver = 'digilib') then ( 
+
+                 if($imageserver = 'digilib') then (
                     for $pUri in tokenize($annot/string(@plist), ' ')
                     let $elem := doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
-                    let $zone := local:getZone($elem)                              	
+                    let $zone := local:getZone($elem)
         				return
                         <div class="previewItem">
-                            <div class="imgBox">                          
+                            <div class="imgBox">
                                 <img src="{local:getImageAreaPath($imageBasePath, $zone, $imageWidth)}" class="previewImg" onclick="loadLink('{$pUri}')" />
                                 <input type="hidden" class="previewImgData" value="{concat('{width:', number($zone/@lrx) - number($zone/@ulx), ', height:', number($zone/@lry) - number($zone/@uly), '}')}"/>
                             </div>
                             <div class="label">{if ($lang = 'de') then (concat('Takt ', $elem/@n)) else (concat('Bar ', $elem/@n))}</div>
                         </div>
-            		
+
                   )
             	else(
                 	for $pUri in tokenize($annot/string(@plist), ' ')
                     let $elem := doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
-                    let $zone := local:getZone($elem)  
+                    let $zone := local:getZone($elem)
                 	return
     				<div class="previewItem">
-                            <div class="imgBox">                          
+                            <div class="imgBox">
                                 <img src="{local:getImageAreaPath($imageBasePath, $zone, $imageWidth)}" class="previewImg" onclick="loadLink('{$pUri}')" />
                                 <input type="hidden" class="previewImgData" value="{concat('{width:', number($zone/@lrx) - number($zone/@ulx), ', height:', number($zone/@lry) - number($zone/@uly), '}')}"/>
                             </div>
                             <div class="label">{concat('Takt ', $elem/@n)}</div>
                         </div>
     				)
-     
+
                 }
             </div>-->
-        
+
         </div>
         )
     else
@@ -549,9 +549,9 @@ return
             <!-- <div class="previewArea">
                 {
                     local:calculatePreviewsForTip(tokenize($annot/string(@plist),' '))
-                    
+
                 }
             </div>-->
         </div>
-        
-        )
\ No newline at end of file
+
+        )
diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index 8e5513f5f..4a890e0fa 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -1,6 +1,6 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository. 
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -21,12 +21,12 @@ declare variable $edition_path := eutil:getPreference('edition_path', $edition);
  : Returns distinct list of catagories
  :)
 declare function local:getDistinctCategories($annots as element()*) as xs:string* {
-    
+
     let $oldCats := distinct-values($annots/mei:ptr[@type = "categories"]/replace(@target, '#', ''))
     let $newCats := distinct-values(for $annot in $annots
     return
         tokenize(replace(normalize-space($annot/@class), '#', ''), ' '))[contains(., 'annotation.category')]
-    
+
     return
         distinct-values(($oldCats, $newCats)[string-length() gt 0])
 };
@@ -35,7 +35,7 @@ declare function local:getDistinctCategories($annots as element()*) as xs:string
  : Returns distinct list of annotation priorities
  :)
 declare function local:getDistinctPriorities($annots as element()*) as xs:string* {
-    
+
     distinct-values(
     for $annot in $annots
     let $oldLink := $annot/mei:ptr[@type = "priority"]/replace(@target, '#', '')
@@ -78,7 +78,7 @@ map {
 
 return
     $map
-    
+
     (:
 
 return concat('{categories: [',
@@ -99,5 +99,5 @@ return concat('{categories: [',
                 concat('{id:"', $priority, '",name:"', $name,'"}')
         , ','),
         ']}')
-        
-        :)
\ No newline at end of file
+
+        :)
diff --git a/add/data/xql/getAnnotationMeta.xql b/add/data/xql/getAnnotationMeta.xql
index 5f7911245..30e3acc15 100644
--- a/add/data/xql/getAnnotationMeta.xql
+++ b/add/data/xql/getAnnotationMeta.xql
@@ -22,7 +22,7 @@ xquery version "3.0";
 
 (:~
     Returns the HTML for a specific annotation for an AnnotationView.
-    
+
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
@@ -89,7 +89,7 @@ let $siglaLabel := switch (count($sigla))
 let $annotIDlabel := eutil:getLanguageString('view.window.AnnotationView_AnnotationID', ())
 
 return
-    
+
     <div
         class="annotView">
         <div
diff --git a/add/data/xql/getAnnotationOpenAllUris.xql b/add/data/xql/getAnnotationOpenAllUris.xql
index 8c67b8d69..ce209637a 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -28,7 +28,7 @@ declare option output:method "text";
 declare option output:media-type "text/html";
 
 declare function local:getParticipants($annot as element()) as xs:string* {
-    
+
     let $participants := tokenize($annot/string(@plist), ' ')
     let $docs := distinct-values(for $p in $participants
     return
@@ -36,16 +36,16 @@ declare function local:getParticipants($annot as element()) as xs:string* {
     return
         for $doc in $docs
         return
-            
+
             if (source:isSource($doc))
             then
                 (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
-            
+
             else
                 if (teitext:isText($doc))
                 then
                     (string-join($participants[starts-with(., $doc)], $doc), ' ')
-                
+
                 else
                     ()
 };
@@ -57,7 +57,7 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
         order by count($elem/preceding::*)
     return
         $elem
-    
+
     return
         string-join(
         (for $elem in $elems[local-name() != 'measure']
@@ -113,4 +113,4 @@ let $annot := $doc/id($annotId)
 
 return
     string-join(local:getParticipants($annot), '
-    ')
\ No newline at end of file
+    ')
diff --git a/add/data/xql/getAnnotationParticipants.xql b/add/data/xql/getAnnotationParticipants.xql
index f780eee3d..ec7c1dd04 100644
--- a/add/data/xql/getAnnotationParticipants.xql
+++ b/add/data/xql/getAnnotationParticipants.xql
@@ -20,7 +20,7 @@ xquery version "1.0";
 
 (:~
     Returns a list of participants of a specific annotation.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 49b87da3e..577b3e3ea 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -33,7 +33,7 @@ else
     (eutil:getPreference('image_prefix', $edition));
 
 declare function local:getParticipants($annot as element()) as map(*)* {
-    
+
     let $participants := tokenize($annot/string(@plist), ' ')
     let $docs := distinct-values(for $p in $participants
     return
@@ -45,18 +45,18 @@ declare function local:getParticipants($annot as element()) as map(*)* {
             if (source:isSource($doc))
             then
                 (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
-            
+
             else
                 if (teitext:isText($doc))
                 then
                     (local:getTextParticipants($participants[starts-with(., $doc)], $doc))
-                
+
                 else
                     ()
 };
 
 declare function local:getTextParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-    
+
     for $participant in $participants
     let $id := substring-after($participant, '#')
     let $hiddenData := concat('uri:', $doc, '__$$__participantId:', $id)
@@ -100,14 +100,14 @@ declare function local:getTextNotePrecedingContent($elem as element()) as xs:str
 };
 
 declare function local:getSourceParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-    
+
     let $combs := local:groupParticipants($participants, $doc)
-    
+
     return
-        
+
         for $comb in distinct-values($combs)
         let $partIndices := tokenize($comb, '-')
-        
+
         let $elems :=
         for $p in distinct-values($partIndices)
         let $relevant.participant := $participants[starts-with(., $doc)][number($p)]
@@ -118,16 +118,16 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             order by count($elem/preceding::*)
         return
             $elem
-            
+
             where count($elems) gt 0
-        
+
         let $zones := for $elem in $elems
         return
             local:getZone($elem)
-        
+
         let $type := local:getType($zones)
         let $label := local:getItemLabel($elems)
-        
+
         let $mdiv := '' (: TODO if($elem/ancestor-or-self::mei:mdiv) then($elem/ancestor-or-self::mei:mdiv/@label) else(''):)
         let $page := if ($zones[1]/parent::mei:surface/@label != '') then
             ($zones[1]/parent::mei:surface/string(@label))
@@ -135,20 +135,20 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             ($zones[1]/parent::mei:surface/string(@n))
         let $sourceLabel := source:getLabel($doc, $edition)
         let $siglum := ($elems[1]/root()//mei:*[@type eq 'siglum'])[1]/text()
-        
+
         let $part := string-join(distinct-values(for $e in $elems
         return
             $e/ancestor::mei:part/string(@label)), '-')
-        
+
         let $graphic := $zones[1]/../mei:graphic[@type = 'facsimile']
         let $imgWidth := number($graphic/@width)
         let $imgHeight := number($graphic/@height)
-        
+
         let $digilibBaseParams := local:getImageAreaPath($imageBasePath, $graphic)
         let $rect := local:getBoundingZone($zones)
-        
+
         let $digilibSizeParams := local:getImageAreaParams($rect, $imgWidth, $imgHeight)
-        
+
         let $hiddenData := map {
             'width': number($rect/@lrx) - number($rect/@ulx),
             'height': number($rect/@lry) - number($rect/@uly),
@@ -157,9 +157,9 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             'origH': $imgHeight,
             'origW': $imgWidth
         }
-        
+
         let $linkUri := concat('xmldb:exist://', document-uri($graphic/root()), '#', local:getSourceLinkTarget($elems, $zones))
-        
+
         return
             map {
                 'type': $type,
@@ -198,20 +198,20 @@ declare function local:getSourceLinkTarget($elems as node()*, $zones as node()*)
 };
 
 declare function local:groupParticipants($participants as xs:string*, $doc as xs:string) as xs:string* {
-    
+
     let $elems := for $p in $participants
     let $id := substring-after($p, '#')
     return
         doc($doc)/id($id)
-    
+
     let $zones := for $elem in $elems
     return
         local:getZone($elem)
-    
+
     let $combs := for $p at $i in $participants
     return
         local:getCombinations($elems, $zones, $i, count($zones))
-    
+
     return
         reverse(
         for $comb at $i in reverse($combs)
@@ -232,7 +232,7 @@ declare function local:groupParticipants($participants as xs:string*, $doc as xs
 };
 
 declare function local:getCombinations($elems as element()*, $zones as element()*, $i as xs:int, $total as xs:int) as xs:string {
-    
+
     let $currentZone := $zones[$i]
     let $currentElem := $elems[$i]
     return
@@ -257,7 +257,7 @@ declare function local:getCombinations($elems as element()*, $zones as element()
 };
 
 declare function local:compareZones($zone1 as element(), $zone2 as element()) as xs:boolean {
-    
+
     let $samePage := deep-equal($zone1/.., $zone2/..)
     let $overlapping := not(number($zone1/@ulx) gt number($zone2/@lrx) or number($zone1/@lrx) lt number($zone2/@ulx) or number($zone1/@uly) gt number($zone2/@lry) or number($zone1/@lry) lt number($zone2/@uly))
     return
@@ -267,7 +267,7 @@ declare function local:compareZones($zone1 as element(), $zone2 as element()) as
 declare function local:getElement($uri as xs:string) as element()? {
     let $doc := substring-before($uri, '#')
     let $id := substring-after($uri, '#')
-    
+
     return
         doc($doc)/id($id)
 };
@@ -314,17 +314,17 @@ declare function local:getBoundingZone($zones as element()*) as element() {
 
 :)
 declare function local:getImageAreaPath($basePath as xs:string, $graphic as element()?) as xs:string {
-    
+
     let $imagePath := string($graphic/@target)
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
     let $isAbsolute := starts-with($imagePath, 'http')
-    
+
     let $fields := if ($imageserver = 'leaflet') then
         (substring-before($imagePath, '.'))
     else
         ()
-    
+
     return
         if ($isAbsolute)
         then
@@ -355,17 +355,17 @@ declare function local:getImageAreaPath($basePath as xs:string, $graphic as elem
 :)
 declare function local:getImageAreaParams($zone as element()?, $imgWidth as xs:int, $imgHeight as xs:int) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-    
+
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-    
+
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-    
+
     return
         concat('&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit')
 };
@@ -406,9 +406,9 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                     if (count($items) gt 1)
                     then
                         (
-                        
+
                         let $measureNs := distinct-values($items/ancestor::mei:measure/@n)
-                        
+
                         let $label := if ($lang = 'de')
                         then
                             (if (count($measureNs) gt 1) then
@@ -420,11 +420,11 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                                 (concat('Bars ', $measureNs[1], '-', $measureNs[last()]))
                             else
                                 (concat('Bar ', $measureNs[1])))
-                        
+
                         return
-                            
+
                             concat($label, ' (', string-join($items/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ', '), ')')
-                        
+
                         )
                     else
                         (concat('Takt ', $items[1]/ancestor::mei:measure/@n, ' (', $items[1]/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ')'))
diff --git a/add/data/xql/getAnnotationText.xql b/add/data/xql/getAnnotationText.xql
index 24b42197b..8f3876e1a 100644
--- a/add/data/xql/getAnnotationText.xql
+++ b/add/data/xql/getAnnotationText.xql
@@ -22,7 +22,7 @@ xquery version "1.0";
 
 (:~
     Returns the HTML for the textual content of a specific annotation for an AnnotationView.
-    
+
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
@@ -49,7 +49,7 @@ let $doc := doc($docUri)
 let $annot := $doc/id($internalId)
 
 return
-    
+
     <div
         class="annotView">
         <div
@@ -57,4 +57,4 @@ return
             <h1>{eutil:getLocalizedName($annot, $lang)}</h1>
             {annotation:getContent($annot, '', $edition)}
         </div>
-    </div>
\ No newline at end of file
+    </div>
diff --git a/add/data/xql/getAnnotations.xql b/add/data/xql/getAnnotations.xql
index 57730e9c7..c351d9c4a 100644
--- a/add/data/xql/getAnnotations.xql
+++ b/add/data/xql/getAnnotations.xql
@@ -56,4 +56,4 @@ map {
 }
 
 return
-    serialize($map, $options)
\ No newline at end of file
+    serialize($map, $options)
diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index 4016c3607..6007eaeb1 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -22,7 +22,7 @@ xquery version "3.0";
 
 (:~
     Returns a JSON sequence with all anotations on a specific page.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -38,7 +38,7 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:getAnnotations($edition as xs:string, $edition_path as xs:string, $uri as xs:string, $elemIds as xs:string*) as xs:string* {
-    
+
     for $measureId in $elemIds
     let $uriPlusId := concat($uri, '#', $measureId)
     let $annots := collection($edition_path)//mei:annot/@plist[tokenize(string(.), '\s+') = $uriPlusId]/..
diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index b387a9f82..646df92c1 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -22,7 +22,7 @@ xquery version "1.0";
 
 (:~
     Returns a JSON sequence with all anotations in a specific text.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -37,12 +37,12 @@ declare option exist:serialize "method=text media-type=text/plain omit-xml-decla
 
 (:~
     Finds all annotations in all works.
-    
+
     @param $elems The elements to check (most likely measures and zones)
     @returns A sequence of annotation elements
 :)
 declare function local:findAnnotations($uri as xs:string) as element()* {
-    
+
     (: TODO: check if annotations hold URIs or IDRefs :)
     collection('/db/contents')//mei:annot[matches(@plist, $uri)]
 };
diff --git a/add/data/xql/getAnnotationsOnPage.xql b/add/data/xql/getAnnotationsOnPage.xql
index 6cb1373f9..617e0b83b 100644
--- a/add/data/xql/getAnnotationsOnPage.xql
+++ b/add/data/xql/getAnnotationsOnPage.xql
@@ -22,7 +22,7 @@ xquery version "3.1";
 
 (:~
  :  Returns a JSON sequence with all anotations on a specific page.
- :  
+ :
  :  @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
  :  @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
  :)
@@ -44,7 +44,7 @@ declare option output:method "json";
 declare option output:media-type "application/json";
 
 (: Returns a JSON array of annotations
- : 
+ :
  : @param sourceUriSharp the xmldb-uri of a mei-source with a trailing #
  : @param surfaceId the xml:id of a mei:surface element
  : @param annotations the mei:annotation elements to consider
@@ -88,14 +88,14 @@ declare function local:getAnnotations($sourceUriSharp as xs:string, $surfaceId a
 
 (:~
  : Returns all annotations in all works of a edirom-edition containing references to a list of IDs from one source
- :  
+ :
  : @param $edition The xmldb-uri to the edirom-edition file
  : @param $uri The xmldb-uri to the source-file
  : @param $elemIds The element-IDs to check (most likely measures and zones)
  : @returns A sequence of mei:annot elements
  :)
 declare function local:findAnnotations($edition as xs:string, $uri as xs:string, $elemIds as xs:string*) as element()* {
-    
+
     (: TODO: search in other documents and in other collections :)
     (: TODO: check if annotations hold URIs or IDRefs :)
     functx:distinct-deep(
@@ -104,7 +104,7 @@ declare function local:findAnnotations($edition as xs:string, $uri as xs:string,
     let $hashId := '#' || $id
     let $annots := collection(eutil:getPreference('edition_path', $edition))//mei:annot
     return
-        (: 
+        (:
                 The first predicate with `contains` is just a rough estimate to narrow down the result set.
                 It uses the index and is fast while the second (exact) predicate is generally too slow
             :)
@@ -115,14 +115,14 @@ declare function local:findAnnotations($edition as xs:string, $uri as xs:string,
 
 (:~
     Returns a JSON representation of all participants of an annotation
-    
+
     @param $annotId The id of the annotation to process
     @param $plist The list of participants referenced by the annotation
     @param $elem A sequence of elements which could be relevant
     @returns A JSON representation of the perticipants
 :)
 declare function local:getParticipants($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
-    
+
     let $participants := $elems[@xml:id = $plist]
     return
         for $p in $participants
@@ -140,17 +140,17 @@ declare function local:getParticipants($annoId as xs:string, $plist as xs:string
 
 (:~
     Returns a JSON representation of all participants of an annotation
-    
+
     @param $annotId The id of the annotation to process
     @param $plist The list of participants referenced by the annotation
     @param $elem A sequence of elements which could be relevant
     @returns A JSON representation of the perticipants
 :)
 declare function local:getAnnotSVGs($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
-    
+
     let $participants := $elems[@id = $plist]
     return
-        
+
         for $svg in $participants
         let $id := $svg/@id
         return
@@ -162,7 +162,7 @@ declare function local:getAnnotSVGs($annoId as xs:string, $plist as xs:string*,
 
 (:~
  : Reads the coordinates of an element
- : 
+ :
  : @param $participant The element to process
  : @returns A sequence with coordinates (ulx, uly, lrx, lry)
 :)
diff --git a/add/data/xql/getAudioPlayer.xql b/add/data/xql/getAudioPlayer.xql
index 05754f338..87793aab6 100644
--- a/add/data/xql/getAudioPlayer.xql
+++ b/add/data/xql/getAudioPlayer.xql
@@ -61,7 +61,7 @@ return
             <meta
                 charset="UTF-8"/>
             <title></title>
-            
+
             <!-- **Amplitude.js** -->
             <script
                 type="text/javascript"
@@ -69,7 +69,7 @@ return
             <script
                 type="text/javascript"
                 src="../../resources/js/jquery-2.1.4.min.js"></script>
-            
+
             <link
                 rel="stylesheet"
                 href="../../resources/css/audio-player.css"/>
@@ -82,7 +82,7 @@ return
                 <div
                     id="top-header-toggle"
                     class="small-player-toggle-contract"></div>
-                
+
                 <div
                     class="now-playing-title"
                     amplitude-song-info="name"></div>
@@ -92,7 +92,7 @@ return
                         amplitude-song-info="album"></span></div>
             </div>
             <!-- End Top Header -->
-            
+
             <!-- Start Large Album Art -->
             <div
                 id="top-large-album"
@@ -102,7 +102,7 @@ return
                     amplitude-song-info="cover"/>
             </div>
             <!-- End Large Album Art -->
-            
+
             <!-- Begin Small Player -->
             <div
                 id="small-player">
@@ -110,17 +110,17 @@ return
                 <div
                     id="small-player-left"
                     class="hidden-on-expanded">
-                
+
                 </div>
                 <!-- End Small Player Left -->
-                
+
                 <!-- Begin Small Player Album Art -->
                 <img
                     id="small-player-album-art"
                     class="hidden-on-expanded"
                     amplitude-song-info="cover"/>
                 <!-- End Small Player Album Art -->
-                
+
                 <!-- Begin Small Player Middle -->
                 <div
                     id="small-player-middle"
@@ -142,7 +142,7 @@ return
                                 id="middle-top-next"></div>
                         </div>
                         <!-- End Controls Container -->
-                        
+
                         <!-- Begin Meta Container -->
                         <div
                             id="small-player-middle-meta">
@@ -156,7 +156,7 @@ return
                         </div>
                         <!-- End Meta Container -->
                     </div>
-                    
+
                     <div
                         id="small-player-middle-bottom">
                         <div
@@ -166,7 +166,7 @@ return
                     </div>
                 </div>
                 <!-- End Small Player Middle -->
-                
+
                 <!-- Begin Small Player Right -->
                 <div
                     id="small-player-right"
@@ -184,7 +184,7 @@ return
                     </span>
                 </div>
                 <!-- End Small Player Right -->
-                
+
                 <!-- Begin Small Player Full Bottom -->
                 <div
                     id="small-player-full-bottom"
@@ -215,12 +215,12 @@ return
                                 class="amplitude-current-seconds"
                                 amplitude-single-current-seconds="true">00</span>
                         </span>
-                        
+
                         <div
                             class="amplitude-song-time-visualization"
                             amplitude-single-song-time-visualization="true"
                             id="song-time-visualization-large"></div>
-                        
+
                         <span
                             class="time-duration">
                             <span
@@ -234,7 +234,7 @@ return
                 <!-- End Small Player Full Bottom -->
             </div>
             <!-- End Small Player -->
-            
+
             <!-- Begin Playlist -->
             <div
                 id="small-player-playlist"
@@ -250,7 +250,7 @@ return
                     let $recTitle := $recSource/mei:titleStmt/mei:title/text()
                     let $avFile := '../../../exist/apps/contents/audioData/' || $rec/mei:avFile[2]/string(@target)
                     return
-                        
+
                         <div
                             class="amplitude-song-container amplitude-play-pause playlist-item"
                             amplitude-song-index="{$i - 1}">
@@ -271,7 +271,7 @@ return
         <script
             type="text/javascript">
             Amplitude.init({$audioConfig});
-            
+
             var expanded = false;
             var playlistEpxanded = true;
             /*
@@ -283,9 +283,9 @@ return
             }}, function(){{
             $('#small-player-middle-controls').hide();
             $('#small-player-middle-meta').show();
-            
+
             }});
-            
+
             $('#top-large-album').hover(function(){{
             $('#top-header').show();
             $('#small-player').show();
@@ -297,14 +297,14 @@ return
             }}
             }}
             }});
-            
+
             $('#top-header').hover(function(){{
             $('#top-header').show();
             $('#small-player').show();
             }}, function(){{
-            
+
             }});
-            
+
             /*
             Toggles Album Art
             */
@@ -315,11 +315,11 @@ return
             Is expanded
             */
             expanded = true;
-            
+
             $('#small-player').css('border-top-left-radius', '0px');
             $('#small-player').css('border-top-right-radius', '0px');
             }});
-            
+
             $('#top-header-toggle').click(function(){{
             $('.hidden-on-collapse').hide();
             $('.hidden-on-expanded').show();
@@ -327,31 +327,31 @@ return
             Is collapsed
             */
             expanded = false;
-            
+
             $('#small-player').css('border-top-left-radius', '5px');
             $('#small-player').css('border-top-right-radius', '5px');
             }});
-            
+
             $('.playlist-toggle').click(function(){{
             if( playlistEpxanded ){{
             $('#small-player-playlist').hide();
-            
+
             $('#small-player').css('border-bottom-left-radius', '5px');
             $('#small-player').css('border-bottom-right-radius', '5px');
-            
+
             $('#large-album-art').css('border-bottom-left-radius', '5px');
             $('#large-album-art').css('border-bottom-right-radius', '5px');
-            
+
             playlistEpxanded = false;
             }}else{{
             $('#small-player-playlist').show();
-            
+
             $('#small-player').css('border-bottom-left-radius', '0px');
             $('#small-player').css('border-bottom-right-radius', '0px');
-            
+
             $('#large-album-art').css('border-bottom-left-radius', '0px');
             $('#large-album-art').css('border-bottom-right-radius', '0px');
-            
+
             playlistEpxanded = true;
             }}
             }});
diff --git a/add/data/xql/getChapters.xql b/add/data/xql/getChapters.xql
index 88cf9c9d9..4f47e9a4e 100644
--- a/add/data/xql/getChapters.xql
+++ b/add/data/xql/getChapters.xql
@@ -151,4 +151,4 @@ return
                 ()
 
 return
-    concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+    concat('[', string-join($ret, ','), ']')
diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index e2bf1697f..d89c91919 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -86,7 +86,7 @@ let $concordances := $work//edirom:concordance
 return
     (
     concat('[',
-    
+
     string-join(
     for $concordance in $concordances
     return
@@ -97,6 +97,6 @@ return
         'connections: ', local:getConnections($concordance),
         '}')
     , ','),
-    
+
     ']')
     )
diff --git a/add/data/xql/getEdition.xql b/add/data/xql/getEdition.xql
index 1ab2eee76..5d54a70b3 100644
--- a/add/data/xql/getEdition.xql
+++ b/add/data/xql/getEdition.xql
@@ -32,4 +32,4 @@ declare option exist:serialize "method=text media-type=text/plain omit-xml-decla
 
 let $uri := request:get-parameter('id', '')
 return
-    edition:toJSON($uri)
\ No newline at end of file
+    edition:toJSON($uri)
diff --git a/add/data/xql/getEditionURI.xql b/add/data/xql/getEditionURI.xql
index 10ca59704..1f7597c58 100644
--- a/add/data/xql/getEditionURI.xql
+++ b/add/data/xql/getEditionURI.xql
@@ -34,4 +34,4 @@ return
     then
         ($uri)
     else
-        (edition:findEdition($uri))
\ No newline at end of file
+        (edition:findEdition($uri))
diff --git a/add/data/xql/getExtendedStaff.xql b/add/data/xql/getExtendedStaff.xql
index 19dfa2813..d7f106712 100644
--- a/add/data/xql/getExtendedStaff.xql
+++ b/add/data/xql/getExtendedStaff.xql
@@ -33,19 +33,19 @@ return
                 src="//code.iconify.design/1/1.0.6/iconify.min.js"></script>
             <script
                 src="{$basePath}/resources/js/he.js"></script>
-            
+
             <script
                 src="{$basePath}/resources/js/tipped/tipped.js"></script>
             <link
                 rel="stylesheet"
                 type="text/css"
                 href="{$basePath}/resources/css/tipped/tipped.css"/>
-            
+
             <link
                 rel="stylesheet"
                 type="text/css"
                 href="{$basePath}/resources/css/verovio-view.css"/>
-        
+
         </head>
         <body>
             <div
@@ -75,7 +75,7 @@ return
             </div>
             <div
                 class='lds-roller'><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
-            
+
             <script>
                 var uri = "{$uri}";
                 var edition = "{$edition}";
diff --git a/add/data/xql/getHeader.xql b/add/data/xql/getHeader.xql
index 9efc2e440..6e61ad42c 100644
--- a/add/data/xql/getHeader.xql
+++ b/add/data/xql/getHeader.xql
@@ -75,4 +75,4 @@ return
                             name="lang"
                             value="{$lang}"/></parameters>))
                 else
-                    ()
\ No newline at end of file
+                    ()
diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
index 0a3be7416..420249972 100644
--- a/add/data/xql/getHelp.xql
+++ b/add/data/xql/getHelp.xql
@@ -49,4 +49,4 @@ let $doc := transform:transform($doc, $xsl, <parameters><param
 return
     transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param
             name="idPrefix"
-            value="{$idPrefix}"/></parameters>)
\ No newline at end of file
+            value="{$idPrefix}"/></parameters>)
diff --git a/add/data/xql/getLanguageFile.xql b/add/data/xql/getLanguageFile.xql
index 1da32f4e7..d12a49d9f 100644
--- a/add/data/xql/getLanguageFile.xql
+++ b/add/data/xql/getLanguageFile.xql
@@ -22,7 +22,7 @@ xquery version "1.0";
 
 (:~
     Returns a language file as JSON or XML.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -54,7 +54,7 @@ return
         for $entry in $file//entry
         return
             concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-        
+
         ,
         for $entry in $projectFile//entry
         return
diff --git a/add/data/xql/getLinkTarget.xql b/add/data/xql/getLinkTarget.xql
index 86dcbca9a..3466ff60d 100644
--- a/add/data/xql/getLinkTarget.xql
+++ b/add/data/xql/getLinkTarget.xql
@@ -1,6 +1,6 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository. 
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 declare namespace html = "http://www.w3.org/1999/xhtml";
@@ -35,7 +35,7 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
         else
             $docUri
     }
-    
+
     (: optionally set label for some views:)
     let $labeled.map :=
     if ($type = 'mei_textView')
@@ -47,7 +47,7 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
             (map:put($baseMap, 'label', 'XML Quellenbeschreibung'))
         else
             ($baseMap)
-            
+
             (: whether to set the view as default view:)
     let $defaultViewed.map :=
     if ($type = ('mei_sourceView',
@@ -61,72 +61,72 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
         (map:put($labeled.map, 'defaultView', true()))
     else
         ($labeled.map)
-        
-        
+
+
         (: xpath check whether any given view is supported :)
     let $hasView :=
     if ($type = 'desc_summaryView')
     then
         (true())
-    
+
     else
         if ($type = 'desc_headerView')
         then
             (exists($doc//mei:meiHead or $doc//tei:teiHeader))
-        
+
         else
             if ($type = 'mei_textView')
             then
                 (exists($doc//mei:annot[@type = 'descLink']))
-            
+
             else
                 if ($type = 'mei_sourceView')
                 then
                     (exists($doc//mei:facsimile//mei:graphic[@type = 'facsimile']))
-                
+
                 else
                     if ($type = 'mei_audioView')
                     then
                         (exists($doc//mei:recording))
-                    
+
                     else
                         if ($type = 'mei_verovioView')
                         then
                             (exists($doc//mei:body//mei:measure) and exists($doc//mei:body//mei:note))
-                        
+
                         else
                             if ($type = 'tei_textView')
                             then
                                 (exists($doc//tei:body[matches(.//text(), '[^\s]+')]))
-                            
+
                             else
                                 if ($type = 'tei_facsimileView')
                                 then
                                     (exists($doc//tei:facsimile//tei:graphic))
-                                
+
                                 else
                                     if ($type = 'tei_textFacsimileSplitView')
                                     then
                                         (exists($doc//tei:facsimile//tei:graphic) and exists($doc//tei:pb[@facs]))
-                                    
+
                                     else
                                         if ($type = 'mei_annotationView')
                                         then
                                             (exists($doc//mei:annot[@type = 'editorialComment']))
-                                        
+
                                         else
                                             if ($type = 'xml_xmlView')
                                             then
                                                 (true())
-                                            
+
                                             else
                                                 if ($type = 'desc_xmlView')
                                                 then
                                                     (exists($doc//mei:annot[@type = 'descLink']))
-                                                
+
                                                 else
                                                     (false())
-    
+
     return
         if ($hasView)
         then
@@ -139,7 +139,7 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
  : Returns the views for an edirom object
  :)
 declare function local:getViews($type as xs:string, $docUri as xs:string, $doc as node()+) as map(*)* {
-    
+
     let $views := (
     (:'desc_summaryView',:)
     (:'desc_headerView',:)
@@ -154,12 +154,12 @@ declare function local:getViews($type as xs:string, $docUri as xs:string, $doc a
     'xml_xmlView',
     'desc_xmlView'
     )
-    
+
     let $maps :=
     for $view in $views
     return
         local:getView($view, $docUri, $doc)
-    
+
     return
         $maps
 };
@@ -176,13 +176,13 @@ declare function local:getWindowTitle($doc as node()+, $type as xs:string) as xs
         if (exists($doc/root()/mei:work))
         then
             (eutil:getLocalizedTitle($doc/root()/mei:work, $lang))
-            
+
             (: Recording :)
         else
             if (exists($doc//mei:mei) and exists($doc//mei:recording))
             then
                 (eutil:getLocalizedTitle($doc//mei:fileDesc/mei:titleStmt[1], $lang))
-                
+
                 (: Source / Score :)
             else
                 if ($type = 'source' and exists($doc//mei:manifestation/mei:titleStmt))
@@ -196,25 +196,25 @@ declare function local:getWindowTitle($doc as node()+, $type as xs:string) as xs
                         (string-join((eutil:getLocalizedTitle(($doc//mei:source)[1]/mei:titleStmt[1], $lang),
                         ($doc//mei:source)[1]//mei:identifier[lower-case(@type) = 'shelfmark'][1]), ' | ')
                         => normalize-space())
-                        
+
                         (: MEI fallback if no title is found :)
                     else
                         if (exists($doc//mei:mei) and exists(($doc//mei:titleStmt)[1]))
                         then
                             (eutil:getLocalizedTitle(($doc//mei:titleStmt)[1], $lang))
-                            
+
                             (: Text :)
                         else
                             if (exists($doc/tei:TEI))
                             then
                                 (eutil:getLocalizedTitle($doc//tei:fileDesc/tei:titleStmt[1], $lang))
-                                
+
                                 (: HTML :)
                             else
                                 if ($type = 'html')
                                 then
                                     ($doc//head/data(title))
-                                
+
                                 else
                                     (string('unknown'))
 };
@@ -277,7 +277,7 @@ else
     if (starts-with($internalId, 'measure_') and $doc//mei:parts)
     then
         (
-        
+
         let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
         let $measureN := functx:substring-after-last($internalId, '_')
         return
@@ -291,36 +291,36 @@ let $type := (: Work :)
 if (exists($doc//mei:mei) and exists($doc//mei:work) and not(exists($doc//mei:perfMedium)))
 then
     (string('work'))
-    
+
     (: Recording :)
 else
     if (exists($doc//mei:mei) and exists($doc//mei:recording))
     then
         (string('recording'))
-        
+
         (: Source / Score :)
     else
         if (source:isSource($docUri))
         then
             (string('source'))
-            
+
             (: Text :)
         else
             if (exists($doc/tei:TEI))
             then
                 (string('text'))
-                
+
                 (: HTML :)
             else
                 if (exists($doc/html) or exists($doc/html:html))
                 then
                     (string('html'))
-                
+
                 else
                     if (contains($docUri, '.html'))
                     then
                         (string('html'))
-                    
+
                     else
                         (string('unknown'))
 
diff --git a/add/data/xql/getMeasure.xql b/add/data/xql/getMeasure.xql
index f3fe68543..ff948cd6a 100644
--- a/add/data/xql/getMeasure.xql
+++ b/add/data/xql/getMeasure.xql
@@ -58,4 +58,4 @@ return
     'measureId:"', $measureId, '",',
     'movementId:"', $movementId, '",',
     'measureCount:"', $measureCount, '"',
-    '}')
\ No newline at end of file
+    '}')
diff --git a/add/data/xql/getMeasurePage.xql b/add/data/xql/getMeasurePage.xql
index 5ee226754..414fc42bd 100644
--- a/add/data/xql/getMeasurePage.xql
+++ b/add/data/xql/getMeasurePage.xql
@@ -41,15 +41,15 @@ declare function local:findMeasure($mei, $movementId, $measureIdName) {
 };
 
 declare function local:getMeasure($mei, $measure, $movementId) as xs:string {
-    
+
     let $measureId := $measure/string(@xml:id)
     let $zoneId := substring-after($measure/string(@facs), '#')
     let $zone := $mei/id($zoneId)
     let $surface := $zone/parent::mei:surface
     let $graphic := $surface/mei:graphic[@type = 'facsimile']
-    
+
     return
-        
+
         concat('{',
         'measureId:"', $measureId, '",',
         'zoneId:"', $zoneId, '",',
@@ -80,7 +80,7 @@ return
         ($m)
     else
         ()
-        
+
         (: Extra measure parts :)
 let $extraMeasuresParts := for $exm in $measure | $extraMeasures
 return
@@ -97,4 +97,4 @@ return
     return
         local:getMeasure($mei, $m, $movementId)
     ), ','),
-    ']')
\ No newline at end of file
+    ']')
diff --git a/add/data/xql/getMeasures.xql b/add/data/xql/getMeasures.xql
index fb8b88a03..395a3027c 100644
--- a/add/data/xql/getMeasures.xql
+++ b/add/data/xql/getMeasures.xql
@@ -31,7 +31,7 @@ import module namespace eutil = "http://www.edirom.de/xquery/util" at "/db/apps/
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:string* {
-    
+
     if ($mei//mei:parts)
     then
         (
@@ -88,10 +88,10 @@ declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:s
                 'name: "', $measureN, '"',
                 '}')
         )
-    
+
     else
         (
-        
+
         if ($mei/id($mdivID)//mei:measure[@label])
         then
             (
@@ -109,7 +109,7 @@ declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:s
             )
         else
             (
-            
+
             for $measureN in $mei/id($mdivID)//mei:measure/data(@n)
             let $measures := $mei/id($mdivID)//mei:measure[@n = $measureN]
             let $measure := $measures[1]
@@ -132,4 +132,4 @@ let $mei := doc($uri)/root()
 let $ret := local:getMeasures($mei, $mdivID)
 
 return
-    concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+    concat('[', string-join($ret, ','), ']')
diff --git a/add/data/xql/getMeasuresOnPage.xql b/add/data/xql/getMeasuresOnPage.xql
index 985dffb07..e79e80f1a 100644
--- a/add/data/xql/getMeasuresOnPage.xql
+++ b/add/data/xql/getMeasuresOnPage.xql
@@ -22,7 +22,7 @@ xquery version "3.1";
 
 (:~
     Returns a JSON sequence with all measures on a specific page.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -37,16 +37,16 @@ declare option output:media-type "application/json";
 
 (:~
     Finds all measures on a page.
-    
+
     @param $mei The sourcefile
     @param $surface The surface to look at
     @returns A list of json objects with measure information
 :)
 declare function local:getMeasures($mei as node(), $surface as node()) as map(*)* {
-    
+
     for $zone in $surface/mei:zone[@type = 'measure']
     let $zoneRef := concat('#', $zone/@xml:id)
-    (: 
+    (:
         The first predicate with `contains` is just a rough estimate to narrow down the result set.
         It uses the index and is fast while the second (exact) predicate is generally too slow
     :)
@@ -100,4 +100,4 @@ return
         (: TODO: überlegen, wie die Staff-spezifischen Ausschnitte angezeigt werden sollen :)
         local:getMeasures($mei, $surface)
     }
-    )
\ No newline at end of file
+    )
diff --git a/add/data/xql/getMovements.xql b/add/data/xql/getMovements.xql
index ff6490e35..da9dffd95 100644
--- a/add/data/xql/getMovements.xql
+++ b/add/data/xql/getMovements.xql
@@ -48,4 +48,4 @@ map {
 }
 
 return
-    serialize($array, $options)
\ No newline at end of file
+    serialize($array, $options)
diff --git a/add/data/xql/getMovementsFirstPage.xql b/add/data/xql/getMovementsFirstPage.xql
index 68faa335a..86a1e3041 100644
--- a/add/data/xql/getMovementsFirstPage.xql
+++ b/add/data/xql/getMovementsFirstPage.xql
@@ -41,4 +41,4 @@ else
     ($zoneId)
 
 return
-    $mei/id($zoneId)/parent::mei:surface/string(@xml:id)
\ No newline at end of file
+    $mei/id($zoneId)/parent::mei:surface/string(@xml:id)
diff --git a/add/data/xql/getMusicInMdiv.xql b/add/data/xql/getMusicInMdiv.xql
index 0b675c7a1..b13564590 100644
--- a/add/data/xql/getMusicInMdiv.xql
+++ b/add/data/xql/getMusicInMdiv.xql
@@ -30,4 +30,4 @@ return
                 {$data}
             </body>
         </music>
-    </mei>
\ No newline at end of file
+    </mei>
diff --git a/add/data/xql/getNavigatorConfig.xql b/add/data/xql/getNavigatorConfig.xql
index e370087c8..df476ba6b 100644
--- a/add/data/xql/getNavigatorConfig.xql
+++ b/add/data/xql/getNavigatorConfig.xql
@@ -33,7 +33,7 @@ declare option exist:serialize "method=xhtml media-type=text/html omit-xml-decla
 declare variable $lang := request:get-parameter('lang', '');
 
 declare function local:getCategory($category, $depth) {
-    
+
     <div
         class="navigatorCategory{
                 if ($depth = 1) then
@@ -99,7 +99,7 @@ declare function local:getCategory($category, $depth) {
 };
 
 declare function local:getItem($item, $depth) {
-    
+
     let $target := $item/replace(@targets, '\[.*\]', '')
     let $cfg := concat('{', replace(substring-before($item/substring-after(@targets, '['), ']'), '=', ':'), '}')
     let $target := if (starts-with($target, 'javascript:'))
@@ -108,7 +108,7 @@ declare function local:getItem($item, $depth) {
     else
         (concat("loadLink('", $target, "', ", $cfg, ")"))
     return
-        
+
         <div
             class="navigatorItem{
                     if ($depth lt 2) then
@@ -123,18 +123,18 @@ declare function local:getItem($item, $depth) {
 };
 
 declare function local:getSeparator() {
-    
+
     <div
         class="navigatorSeparator"></div>
 };
 
 declare function local:getDefinition($navConfig) {
     let $elems := $navConfig/*
-    
+
     for $elem in $elems
-    
+
     return
-        
+
         if (local-name($elem) eq 'navigatorItem')
         then
             (
@@ -163,4 +163,4 @@ let $work := $edition/id($workId)
 let $navConfig := $work/edirom:navigatorDefinition
 
 return
-    local:getDefinition($navConfig)
\ No newline at end of file
+    local:getDefinition($navConfig)
diff --git a/add/data/xql/getOverlayOnPage.xql b/add/data/xql/getOverlayOnPage.xql
index dbacbd0ac..829317166 100644
--- a/add/data/xql/getOverlayOnPage.xql
+++ b/add/data/xql/getOverlayOnPage.xql
@@ -22,7 +22,7 @@ xquery version "3.1";
 
 (:~
     Returns an SVG element.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -59,6 +59,3 @@ map {
 
 return
     serialize($overlay, $options)
-
-
-
diff --git a/add/data/xql/getOverlays.xql b/add/data/xql/getOverlays.xql
index fc610426a..ae4883b5b 100644
--- a/add/data/xql/getOverlays.xql
+++ b/add/data/xql/getOverlays.xql
@@ -48,4 +48,4 @@ map {
 }
 
 return
-    serialize($array, $options)
\ No newline at end of file
+    serialize($array, $options)
diff --git a/add/data/xql/getParts.xql b/add/data/xql/getParts.xql
index 569697e00..ecb763de4 100644
--- a/add/data/xql/getParts.xql
+++ b/add/data/xql/getParts.xql
@@ -41,4 +41,4 @@ return
     )
 
 return
-    concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+    concat('[', string-join($ret, ','), ']')
diff --git a/add/data/xql/getPreferences.xql b/add/data/xql/getPreferences.xql
index 98c71258d..34fcf6a77 100644
--- a/add/data/xql/getPreferences.xql
+++ b/add/data/xql/getPreferences.xql
@@ -22,7 +22,7 @@ xquery version "1.0";
 
 (:~
     Returns preferences as JSON or XML.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -50,7 +50,7 @@ return
         for $entry in $file//entry
         return
             concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-        
+
         ,
         for $entry in $projectFile//entry
         return
diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 6a603f757..5b14616f6 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -60,7 +60,7 @@ return
         (substring-before(substring-after($i, 'href="'), '"'))
     else
         ()
-        
+
         (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
 let $xsl := if ($xslInstruction) then
     (doc($xslInstruction))
diff --git a/add/data/xql/getRendering.xql b/add/data/xql/getRendering.xql
index 3c97ef151..b1e07b138 100644
--- a/add/data/xql/getRendering.xql
+++ b/add/data/xql/getRendering.xql
@@ -46,15 +46,15 @@ else
 let $doc := doc($docUri)
 
 return
-    
+
     let $base := concat('file:', system:get-module-load-path(), '/../xslt/svgRend3/')
     (:let $base := concat('xmldb:exist:///','db/functions/svgRend/'):)
-    
+
     let $mdiv2show := $movementId
     let $outputStep := 'svg'
-    
-    
-    
+
+
+
     let $svg := transform:transform($doc, concat($base, 'mei2svg.xsl'), <parameters>
         <param
             name="outputStep"
@@ -79,17 +79,17 @@ return
             value="{$lastMeasure}"/>
     </parameters>)
     (:let $svg := transform:transform($svg, concat($base, 'svgCleaner.xsl'),<parameters/>):)
-    
+
     (:let $mdiv := transform:transform($doc, concat($base, 'reduceToMdiv.xsl'), <parameters><param name="mdiv2show" value="{$mdiv2show}"/></parameters>)
-    
+
     let $addedIDs := transform:transform($mdiv, concat($base, 'preprocessor/add-ids.xsl'), <parameters/>)
     let $canonicalized := transform:transform($addedIDs, concat($base, 'preprocessor/canonicalize.xsl'), <parameters/>)
     let $addedDurs := transform:transform($canonicalized, concat($base, 'preprocessor/addDurations.xsl'), <parameters/>)
     let $synced := transform:transform($addedDurs, concat($base, 'preprocessor/addSynchronicity.xsl'), <parameters/>)
     let $musx := transform:transform($synced, concat($base, 'mei2musx/mei2musx.xsl'), <parameters/>)
     let $svg := transform:transform($musx, concat($base, 'musx2svg/musx2svg.xsl'), <parameters/>):)
-    
-    
+
+
     return
-        
+
         $svg
diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 86c0e9dfa..665c585f4 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -51,7 +51,7 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
     let $resp := local:generateRespSentence($work//mei:work/mei:titleStmt/mei:respStmt/*[local-name() != 'resp']/text())
     let $expression := $work/id($doc//mei:relation[@rel = 'isEmbodimentOf'][1]/substring-after(@target, '#'))/string(@label)
     return
-        
+
         <div
             class="summaryViewSource">
             <h1>
@@ -70,15 +70,15 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                         ()
                 }
             </h1>
-            
+
             <div
                 class="metaData">
-                
+
                 <div
                     class="work metaRow">
                     Zur Fassung "{$expression}" von {$resp} "{$title}".
                 </div>
-                
+
                 {
                     for $name in $doc//mei:source/mei:titleStmt/mei:respStmt/mei:*[local-name() eq 'persName' or local-name() eq 'name']
                     return
@@ -97,9 +97,9 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                             <div
                                 class="value">{$name/text()}</div>
                         </div>
-                
+
                 }
-                
+
                 {
                     for $date in $doc//mei:source/mei:pubStmt/mei:date | $doc//mei:source/mei:history/mei:creation/mei:date[1]
                     return
@@ -110,9 +110,9 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                             <div
                                 class="value">{local:getDateValue($date)}</div>
                         </div>
-                
+
                 }
-                
+
                 {
                     (: probably a Manuscript… :)
                     if (count($doc//mei:source/mei:itemList/mei:item) eq 1)
@@ -148,7 +148,7 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                     else
                         ()
                 }
-                
+
                 {
                     if ($doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'])
                     then
@@ -164,7 +164,7 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                     else
                         ()
                 }
-                
+
                 {
                     if ($doc//mei:source/mei:physDesc/mei:plateNum)
                     then
@@ -180,9 +180,9 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                     else
                         ()
                 }
-            
+
             </div>
-            
+
             {
                 if ($doc//mei:source//mei:titlePage/@facs)
                 then
@@ -244,111 +244,111 @@ declare function local:getImagePath($basePath, $uri, $width) {
 };
 
 declare function local:getDateValue($date) {
-    
+
     if ($date/@reg)
     then
         ($date/string(@reg)) (: TODO: prettify date :)
-    
+
     else
         if ($date/@startdate and $date/@enddate)
         then
             (concat('From ', $date/@startdate, ' until ', $date/@enddate))
-        
+
         else
             if ($date/@notbefore and $date/@notafter)
             then
                 (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
-            
+
             else
                 if ($date/@startdate and $date/@notafter)
                 then
                     (concat('From ', $date/@startdate, ', not after ', $date/@notafter))
-                
+
                 else
                     if ($date/@notbefore and $date/@enddate)
                     then
                         (concat('Not before ', $date/@notbefore, ', until ', $date/@enddate))
-                    
+
                     else
                         if ($date/@startdate)
                         then
                             (concat('From ', $date/@startdate))
-                        
+
                         else
                             if ($date/@enddate)
                             then
                                 (concat('Until ', $date/@enddate))
-                            
+
                             else
                                 if ($date/@notbefore)
                                 then
                                     (concat('Not before ', $date/@notbefore))
-                                
+
                                 else
                                     if ($date/@notafter)
                                     then
                                         (concat('Not after ', $date/@notafter))
-                                    
+
                                     else
                                         if (local-name($date) eq 'date')
                                         then
                                             ($date/text())
-                                        
+
                                         else
                                             (string(""))
 };
 
 declare function local:getTeiDateValue($date) {
-    
+
     if ($date/@when)
     then
         ($date/string(@when)) (: TODO: prettify date :)
-    
+
     else
         if ($date/@from and $date/@to)
         then
             (concat('From ', $date/@from, ' to ', $date/@to))
-        
+
         else
             if ($date/@notBefore and $date/@notAfter)
             then
                 (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
-            
+
             else
                 if ($date/@from and $date/@notAfter)
                 then
                     (concat('From ', $date/@from, ', not after ', $date/@notAfter))
-                
+
                 else
                     if ($date/@notBefore and $date/@to)
                     then
                         (concat('Not before ', $date/@notBefore, ', to ', $date/@to))
-                    
+
                     else
                         if ($date/@from)
                         then
                             (concat('From ', $date/@from))
-                        
+
                         else
                             if ($date/@to)
                             then
                                 (concat('Until ', $date/@to))
-                            
+
                             else
                                 if ($date/@notBefore)
                                 then
                                     (concat('Not before ', $date/@notBefore))
-                                
+
                                 else
                                     if ($date/@notAfter)
                                     then
                                         (concat('Not after ', $date/@notAfter))
-                                    
+
                                     else
                                         if (local-name($date) eq 'date')
                                         then
                                             ($date/text())
-                                        
+
                                         else
                                             (string(""))
 };
@@ -358,7 +358,7 @@ declare function local:getWorkSummary($doc, $docUri) {
         class="summaryViewWork">
         <div
             class="titleBox">
-            
+
             <div
                 class="resps">
                 {
@@ -372,7 +372,7 @@ declare function local:getWorkSummary($doc, $docUri) {
                         )
                 }
             </div>
-            
+
             <h1>
                 {
                     if ($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'])
@@ -382,7 +382,7 @@ declare function local:getWorkSummary($doc, $docUri) {
                         ($doc//mei:work/mei:titleStmt/mei:title[1]//text())
                 }
             </h1>
-            
+
             <div
                 class="identifiers">
                 {
@@ -397,9 +397,9 @@ declare function local:getWorkSummary($doc, $docUri) {
                         </div>
                 }
             </div>
-        
+
         </div>
-        
+
         <div
             class="expressions">
             {
@@ -434,7 +434,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                         ($title)
                 }
             </h1>
-            
+
             <div
                 class="metaData">
                 {
@@ -454,7 +454,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                     else
                         ()
                 }
-                
+
                 {
                     if ($doc//tei:titleStmt/tei:editor)
                     then
@@ -477,7 +477,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                     else
                         ()
                 }
-                
+
                 {
                     for $respStmt in $doc//tei:editionStmt/tei:respStmt
                     return
@@ -507,9 +507,9 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                                 }
                             </div>
                         </div>
-                
+
                 }
-                
+
                 {
                     for $date in $doc//tei:publicationStmt/tei:date
                     return
@@ -520,9 +520,9 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                             <div
                                 class="value">{local:getTeiDateValue($date)}</div>
                         </div>
-                
+
                 }
-                
+
                 {
                     if ($doc//tei:sourceDesc/tei:msDesc//tei:repository)
                     then
@@ -559,7 +559,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                     else
                         ()
                 }
-                
+
                 {
                     if ($doc//tei:publicationStmt/tei:publisher)
                     then
@@ -576,7 +576,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                         ()
                 }
             </div>
-            
+
             { (:TODO: facsimile auswerten:)
                 if ($doc//tei:titlePage)
                 then
@@ -589,19 +589,19 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                 else
                     ()
             }
-        
+
         </div>
 };
 
 declare function local:getImagePath($server, $edition) {
     (:let $server :=  eutil:getPreference('image_server', request:get-parameter('edition', '')) :)
-    
+
     let $i_path := if ($server = 'leaflet')
     then
         (eutil:getPreference('leaflet_prefix', $edition))
     else
         (eutil:getPreference('image_prefix', $edition))
-    
+
     return
         $i_path
 
@@ -624,7 +624,7 @@ declare function local:getImagePathLeaflet($doc) {
             let $height := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@height
             return
                 concat($tile_path, '§', $width, '§', $height)
-            
+
             )
         else
             ()
@@ -668,7 +668,7 @@ return
             (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
         else
             (local:getWorkSummary($doc, $docUri))
-        
+
         )
     else
         if ($type = 'source')
diff --git a/add/data/xql/getText.xql b/add/data/xql/getText.xql
index e1868ae70..789386ce3 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -79,7 +79,7 @@ then
     (eutil:getPreference('leaflet_prefix', $edition))
 else
     (eutil:getPreference('image_prefix', $edition))
-    
+
     (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
 
 let $xsl := if ($xslInstruction) then
diff --git a/add/data/xql/getWorkID.xql b/add/data/xql/getWorkID.xql
index 1e45f3697..44b786926 100644
--- a/add/data/xql/getWorkID.xql
+++ b/add/data/xql/getWorkID.xql
@@ -37,4 +37,4 @@ return
     then
         ($workId)
     else
-        (work:findWorkID($uri))
\ No newline at end of file
+        (work:findWorkID($uri))
diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index 71cfae2c4..640bd571d 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -39,10 +39,10 @@ let $workUris := edition:getWorkUris($uri)
 return
     concat('[',
     string-join(
-    
+
     for $workUri in $workUris
     return
         work:toJSON($workUri, $uri)
-    
+
     , ','),
-    ']')
\ No newline at end of file
+    ']')
diff --git a/add/data/xql/getXml.xql b/add/data/xql/getXml.xql
index 5a12d4c5b..ac95964e8 100644
--- a/add/data/xql/getXml.xql
+++ b/add/data/xql/getXml.xql
@@ -37,4 +37,4 @@ return
     then
         ($internal)
     else
-        ($doc)
\ No newline at end of file
+        ($doc)
diff --git a/add/data/xql/getZone.xql b/add/data/xql/getZone.xql
index 8ea3222f7..72c2d9084 100644
--- a/add/data/xql/getZone.xql
+++ b/add/data/xql/getZone.xql
@@ -20,7 +20,7 @@ xquery version "1.0";
 
 (:~
     Returns a JSON representation of a zone.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
@@ -49,4 +49,4 @@ return
     'lrx: "', $zone/string(@lrx), '", ',
     'lry: "', $zone/string(@lry), '"',
     '}')
-    )
\ No newline at end of file
+    )
diff --git a/add/data/xql/getiFrameURL.xql b/add/data/xql/getiFrameURL.xql
index 2e3ba1a28..151980fe5 100644
--- a/add/data/xql/getiFrameURL.xql
+++ b/add/data/xql/getiFrameURL.xql
@@ -33,3 +33,4 @@ return
         (replace($uri, '/apps', '/exist/apps'))
     else
         ($uri)
+
diff --git a/add/data/xql/loginToTextGrid.xql b/add/data/xql/loginToTextGrid.xql
index 25d43d83f..de6f363ce 100644
--- a/add/data/xql/loginToTextGrid.xql
+++ b/add/data/xql/loginToTextGrid.xql
@@ -23,4 +23,4 @@ return
     else
         (
         '{success: false, msg: "Login failed"}'
-        )
\ No newline at end of file
+        )
diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 1014b4493..0288fac18 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -79,7 +79,7 @@ let $trans := <xsl:stylesheet
 let $return :=
 <div
     class="searchResult">{
-        
+
         let $search :=
         if (string-length($term) gt 0)
         then
@@ -93,10 +93,10 @@ let $return :=
             )
         else
             ()
-        
+
         return
             (
-            
+
             if (count($search) gt 0)
             then
                 (if ($lang = 'de')
@@ -119,9 +119,9 @@ let $return :=
                         class="searchResultOverview">No match found.</div>)
                 )
             ,
-            
+
             for $hit in $search
-            
+
             let $expanded := kwic:expand($hit)
             let $hitCount := count($expanded//*[./exist:match])
             let $doc := $hit/root()
@@ -220,4 +220,4 @@ let $return :=
 </div>
 
 return
-    transform:transform($return, $trans, ())
\ No newline at end of file
+    transform:transform($return, $trans, ())

From ad46d6acfa6554662ebaae89b130e9f4bf55dd21 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Wed, 8 Nov 2023 23:22:35 +0100
Subject: [PATCH 008/103] format and indent

---
 add/data/xql/getAnnotation.xql             |  58 +++++------
 add/data/xql/getAnnotationInfos.xql        |   8 +-
 add/data/xql/getAnnotationMeta.xql         |   2 +-
 add/data/xql/getAnnotationOpenAllUris.xql  |  10 +-
 add/data/xql/getAnnotationPreviews.xql     |  74 +++++++-------
 add/data/xql/getAnnotationText.xql         |   2 +-
 add/data/xql/getAnnotationsInRendering.xql |   2 +-
 add/data/xql/getAnnotationsInText.xql      |   2 +-
 add/data/xql/getAnnotationsOnPage.xql      |   8 +-
 add/data/xql/getAudioPlayer.xql            |  64 ++++++-------
 add/data/xql/getConcordances.xql           |   4 +-
 add/data/xql/getExtendedStaff.xql          |   8 +-
 add/data/xql/getLanguageFile.xql           |   2 +-
 add/data/xql/getLinkTarget.xql             |  66 ++++++-------
 add/data/xql/getMeasurePage.xql            |   8 +-
 add/data/xql/getMeasures.xql               |   8 +-
 add/data/xql/getMeasuresOnPage.xql         |   2 +-
 add/data/xql/getNavigatorConfig.xql        |  14 +--
 add/data/xql/getPreferences.xql            |   2 +-
 add/data/xql/getReducedDocument.xql        |   2 +-
 add/data/xql/getRendering.xql              |  18 ++--
 add/data/xql/getSummary.xql                | 106 ++++++++++-----------
 add/data/xql/getText.xql                   |   2 +-
 add/data/xql/getWorks.xql                  |   4 +-
 add/data/xql/search.xql                    |  10 +-
 25 files changed, 243 insertions(+), 243 deletions(-)

diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 7b76088e8..3f16301f3 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -82,7 +82,7 @@ declare function local:getZone($elem as element()) as element()? {
     @return the label for the Priority, or, if this fails, $uri
 :)
 declare function local:getPriority($annot as node()) {
-
+    
     let $uri := $annot/mei:ptr[@type eq 'priority']/string(@target)
     let $doc := if (starts-with($uri, '#'))
     then
@@ -94,9 +94,9 @@ declare function local:getPriority($annot as node()) {
         doc(substring-before($uri, '#'))
         )
     let $locID := substring-after($uri, '#')
-
+    
     let $elem := $doc/id($locID)
-
+    
     return
         if ($elem/mei:name)
         then
@@ -113,9 +113,9 @@ declare function local:getPriority($annot as node()) {
     @return the string of annotation labels, or, if one of them fails, the respecitve $uri
 :)
 declare function local:getCategories($annot as node()) {
-
+    
     let $uris := tokenize($annot/mei:ptr[@type eq 'categories']/string(@target), ' ')
-
+    
     let $string := for $uri in $uris
     let $doc := if (starts-with($uri, '#'))
     then
@@ -152,21 +152,21 @@ declare function local:getCategories($annot as node()) {
 :)
 declare function local:getImageAreaPath($basePath as xs:string, $zone as element()?, $width as xs:integer) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-
+    
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-
+    
     let $imagePath := $graphic/@target
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
-
+    
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-
+    
     return
         concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $width, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit')
 };
@@ -174,23 +174,23 @@ declare function local:getImageAreaPath($basePath as xs:string, $zone as element
 (: for tips :)
 declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as element()?, $width as xs:integer, $height as xs:integer) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-
+    
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-
+    
     let $imagePath := $graphic/@target
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
-
+    
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-
+    
     let $cut_path := substring-before($imagePath, '.')
-
+    
     let $im_path := if ($imageserver = 'digilib')
     then
         (concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $height, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit'))
@@ -231,7 +231,7 @@ declare function local:getItemLabel($elem as element()) {
                 (concat('Bar ', $elem/@n)))
         else
             (),
-
+        
         if ($name = 'staff')
         then
             (if ($lang = 'de') then
@@ -240,7 +240,7 @@ declare function local:getItemLabel($elem as element()) {
                 (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr, ', Bar ', $elem/ancestor::mei:measure/@n)))
         else
             (),
-
+        
         if ($name = 'zone')
         then
             (if ($lang = 'de') then
@@ -258,22 +258,22 @@ declare function local:getItemLabel($elem as element()) {
 
 :)
 declare function local:calculatePreviewsForTip($participants as xs:string*) {
-
+    
     let $areaWidth := 204
     let $areaHeight := 254
-
+    
     let $elems := for $pUri in $participants
     return
         doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
     let $zones := for $elem in $elems
     return
         local:getZone($elem)
-
+    
     let $tall := some $zone in $zones
         satisfies (number($zone/@lry) - number($zone/@uly) gt 2 * (number($zone/@lrx) - number($zone/@ulx)))
     let $wide := some $zone in $zones
         satisfies (2 * (number($zone/@lry) - number($zone/@uly)) lt number($zone/@lrx) - number($zone/@ulx))
-
+    
     let $w := if ($tall and not($wide))
     then
         (round(10000 div count($zones)) div 100)
@@ -285,7 +285,7 @@ declare function local:calculatePreviewsForTip($participants as xs:string*) {
         else
             (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
         )
-
+    
     let $h := if ($tall and not($wide))
     then
         (100)
@@ -297,17 +297,17 @@ declare function local:calculatePreviewsForTip($participants as xs:string*) {
         else
             (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
         )
-
+    
     let $width := floor($areaWidth * $w div 100)
     let $height := floor($areaHeight * $h div 100)
-
+    
     for $zone in $zones
     let $e := $elems[substring(@facs, 2) = $zone/@xml:id][1]
     let $e := if ($e) then
         ($e)
     else
         ($zone)
-
+    
     let $test := if ($imageserver = 'digilib')
     then
         (
@@ -339,7 +339,7 @@ declare function local:calculatePreviewsForTip($participants as xs:string*) {
                 class="label">{local:getItemLabel($e)}</div>
         </div>
         )
-
+    
     return
         $test
 };
@@ -409,7 +409,7 @@ return
     if ($target eq 'view')
     then
         (
-
+        
         <div
             class="annotView">
             <div
@@ -452,7 +452,7 @@ return
                 <h1>{eutil:getLocalizedName($annot, $lang)}</h1>
                 {annotation:getContent($annot, '', $edition)}
             </div>
-
+            
             <!-- <div class="previewArea">
                 {
 
@@ -486,7 +486,7 @@ return
 
                 }
             </div>-->
-
+        
         </div>
         )
     else
@@ -553,5 +553,5 @@ return
                 }
             </div>-->
         </div>
-
+        
         )
diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index 4a890e0fa..f92d13d07 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -21,12 +21,12 @@ declare variable $edition_path := eutil:getPreference('edition_path', $edition);
  : Returns distinct list of catagories
  :)
 declare function local:getDistinctCategories($annots as element()*) as xs:string* {
-
+    
     let $oldCats := distinct-values($annots/mei:ptr[@type = "categories"]/replace(@target, '#', ''))
     let $newCats := distinct-values(for $annot in $annots
     return
         tokenize(replace(normalize-space($annot/@class), '#', ''), ' '))[contains(., 'annotation.category')]
-
+    
     return
         distinct-values(($oldCats, $newCats)[string-length() gt 0])
 };
@@ -35,7 +35,7 @@ declare function local:getDistinctCategories($annots as element()*) as xs:string
  : Returns distinct list of annotation priorities
  :)
 declare function local:getDistinctPriorities($annots as element()*) as xs:string* {
-
+    
     distinct-values(
     for $annot in $annots
     let $oldLink := $annot/mei:ptr[@type = "priority"]/replace(@target, '#', '')
@@ -78,7 +78,7 @@ map {
 
 return
     $map
-
+    
     (:
 
 return concat('{categories: [',
diff --git a/add/data/xql/getAnnotationMeta.xql b/add/data/xql/getAnnotationMeta.xql
index 30e3acc15..92bcdf2be 100644
--- a/add/data/xql/getAnnotationMeta.xql
+++ b/add/data/xql/getAnnotationMeta.xql
@@ -89,7 +89,7 @@ let $siglaLabel := switch (count($sigla))
 let $annotIDlabel := eutil:getLanguageString('view.window.AnnotationView_AnnotationID', ())
 
 return
-
+    
     <div
         class="annotView">
         <div
diff --git a/add/data/xql/getAnnotationOpenAllUris.xql b/add/data/xql/getAnnotationOpenAllUris.xql
index ce209637a..fcee917d9 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -28,7 +28,7 @@ declare option output:method "text";
 declare option output:media-type "text/html";
 
 declare function local:getParticipants($annot as element()) as xs:string* {
-
+    
     let $participants := tokenize($annot/string(@plist), ' ')
     let $docs := distinct-values(for $p in $participants
     return
@@ -36,16 +36,16 @@ declare function local:getParticipants($annot as element()) as xs:string* {
     return
         for $doc in $docs
         return
-
+            
             if (source:isSource($doc))
             then
                 (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
-
+            
             else
                 if (teitext:isText($doc))
                 then
                     (string-join($participants[starts-with(., $doc)], $doc), ' ')
-
+                
                 else
                     ()
 };
@@ -57,7 +57,7 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
         order by count($elem/preceding::*)
     return
         $elem
-
+    
     return
         string-join(
         (for $elem in $elems[local-name() != 'measure']
diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 577b3e3ea..49b87da3e 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -33,7 +33,7 @@ else
     (eutil:getPreference('image_prefix', $edition));
 
 declare function local:getParticipants($annot as element()) as map(*)* {
-
+    
     let $participants := tokenize($annot/string(@plist), ' ')
     let $docs := distinct-values(for $p in $participants
     return
@@ -45,18 +45,18 @@ declare function local:getParticipants($annot as element()) as map(*)* {
             if (source:isSource($doc))
             then
                 (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
-
+            
             else
                 if (teitext:isText($doc))
                 then
                     (local:getTextParticipants($participants[starts-with(., $doc)], $doc))
-
+                
                 else
                     ()
 };
 
 declare function local:getTextParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-
+    
     for $participant in $participants
     let $id := substring-after($participant, '#')
     let $hiddenData := concat('uri:', $doc, '__$$__participantId:', $id)
@@ -100,14 +100,14 @@ declare function local:getTextNotePrecedingContent($elem as element()) as xs:str
 };
 
 declare function local:getSourceParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-
+    
     let $combs := local:groupParticipants($participants, $doc)
-
+    
     return
-
+        
         for $comb in distinct-values($combs)
         let $partIndices := tokenize($comb, '-')
-
+        
         let $elems :=
         for $p in distinct-values($partIndices)
         let $relevant.participant := $participants[starts-with(., $doc)][number($p)]
@@ -118,16 +118,16 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             order by count($elem/preceding::*)
         return
             $elem
-
+            
             where count($elems) gt 0
-
+        
         let $zones := for $elem in $elems
         return
             local:getZone($elem)
-
+        
         let $type := local:getType($zones)
         let $label := local:getItemLabel($elems)
-
+        
         let $mdiv := '' (: TODO if($elem/ancestor-or-self::mei:mdiv) then($elem/ancestor-or-self::mei:mdiv/@label) else(''):)
         let $page := if ($zones[1]/parent::mei:surface/@label != '') then
             ($zones[1]/parent::mei:surface/string(@label))
@@ -135,20 +135,20 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             ($zones[1]/parent::mei:surface/string(@n))
         let $sourceLabel := source:getLabel($doc, $edition)
         let $siglum := ($elems[1]/root()//mei:*[@type eq 'siglum'])[1]/text()
-
+        
         let $part := string-join(distinct-values(for $e in $elems
         return
             $e/ancestor::mei:part/string(@label)), '-')
-
+        
         let $graphic := $zones[1]/../mei:graphic[@type = 'facsimile']
         let $imgWidth := number($graphic/@width)
         let $imgHeight := number($graphic/@height)
-
+        
         let $digilibBaseParams := local:getImageAreaPath($imageBasePath, $graphic)
         let $rect := local:getBoundingZone($zones)
-
+        
         let $digilibSizeParams := local:getImageAreaParams($rect, $imgWidth, $imgHeight)
-
+        
         let $hiddenData := map {
             'width': number($rect/@lrx) - number($rect/@ulx),
             'height': number($rect/@lry) - number($rect/@uly),
@@ -157,9 +157,9 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             'origH': $imgHeight,
             'origW': $imgWidth
         }
-
+        
         let $linkUri := concat('xmldb:exist://', document-uri($graphic/root()), '#', local:getSourceLinkTarget($elems, $zones))
-
+        
         return
             map {
                 'type': $type,
@@ -198,20 +198,20 @@ declare function local:getSourceLinkTarget($elems as node()*, $zones as node()*)
 };
 
 declare function local:groupParticipants($participants as xs:string*, $doc as xs:string) as xs:string* {
-
+    
     let $elems := for $p in $participants
     let $id := substring-after($p, '#')
     return
         doc($doc)/id($id)
-
+    
     let $zones := for $elem in $elems
     return
         local:getZone($elem)
-
+    
     let $combs := for $p at $i in $participants
     return
         local:getCombinations($elems, $zones, $i, count($zones))
-
+    
     return
         reverse(
         for $comb at $i in reverse($combs)
@@ -232,7 +232,7 @@ declare function local:groupParticipants($participants as xs:string*, $doc as xs
 };
 
 declare function local:getCombinations($elems as element()*, $zones as element()*, $i as xs:int, $total as xs:int) as xs:string {
-
+    
     let $currentZone := $zones[$i]
     let $currentElem := $elems[$i]
     return
@@ -257,7 +257,7 @@ declare function local:getCombinations($elems as element()*, $zones as element()
 };
 
 declare function local:compareZones($zone1 as element(), $zone2 as element()) as xs:boolean {
-
+    
     let $samePage := deep-equal($zone1/.., $zone2/..)
     let $overlapping := not(number($zone1/@ulx) gt number($zone2/@lrx) or number($zone1/@lrx) lt number($zone2/@ulx) or number($zone1/@uly) gt number($zone2/@lry) or number($zone1/@lry) lt number($zone2/@uly))
     return
@@ -267,7 +267,7 @@ declare function local:compareZones($zone1 as element(), $zone2 as element()) as
 declare function local:getElement($uri as xs:string) as element()? {
     let $doc := substring-before($uri, '#')
     let $id := substring-after($uri, '#')
-
+    
     return
         doc($doc)/id($id)
 };
@@ -314,17 +314,17 @@ declare function local:getBoundingZone($zones as element()*) as element() {
 
 :)
 declare function local:getImageAreaPath($basePath as xs:string, $graphic as element()?) as xs:string {
-
+    
     let $imagePath := string($graphic/@target)
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
     let $isAbsolute := starts-with($imagePath, 'http')
-
+    
     let $fields := if ($imageserver = 'leaflet') then
         (substring-before($imagePath, '.'))
     else
         ()
-
+    
     return
         if ($isAbsolute)
         then
@@ -355,17 +355,17 @@ declare function local:getImageAreaPath($basePath as xs:string, $graphic as elem
 :)
 declare function local:getImageAreaParams($zone as element()?, $imgWidth as xs:int, $imgHeight as xs:int) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-
+    
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-
+    
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-
+    
     return
         concat('&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit')
 };
@@ -406,9 +406,9 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                     if (count($items) gt 1)
                     then
                         (
-
+                        
                         let $measureNs := distinct-values($items/ancestor::mei:measure/@n)
-
+                        
                         let $label := if ($lang = 'de')
                         then
                             (if (count($measureNs) gt 1) then
@@ -420,11 +420,11 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                                 (concat('Bars ', $measureNs[1], '-', $measureNs[last()]))
                             else
                                 (concat('Bar ', $measureNs[1])))
-
+                        
                         return
-
+                            
                             concat($label, ' (', string-join($items/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ', '), ')')
-
+                        
                         )
                     else
                         (concat('Takt ', $items[1]/ancestor::mei:measure/@n, ' (', $items[1]/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ')'))
diff --git a/add/data/xql/getAnnotationText.xql b/add/data/xql/getAnnotationText.xql
index 8f3876e1a..7724426f0 100644
--- a/add/data/xql/getAnnotationText.xql
+++ b/add/data/xql/getAnnotationText.xql
@@ -49,7 +49,7 @@ let $doc := doc($docUri)
 let $annot := $doc/id($internalId)
 
 return
-
+    
     <div
         class="annotView">
         <div
diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index 6007eaeb1..4b8c693a6 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -38,7 +38,7 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:getAnnotations($edition as xs:string, $edition_path as xs:string, $uri as xs:string, $elemIds as xs:string*) as xs:string* {
-
+    
     for $measureId in $elemIds
     let $uriPlusId := concat($uri, '#', $measureId)
     let $annots := collection($edition_path)//mei:annot/@plist[tokenize(string(.), '\s+') = $uriPlusId]/..
diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index 646df92c1..7f8d5fb2e 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -42,7 +42,7 @@ declare option exist:serialize "method=text media-type=text/plain omit-xml-decla
     @returns A sequence of annotation elements
 :)
 declare function local:findAnnotations($uri as xs:string) as element()* {
-
+    
     (: TODO: check if annotations hold URIs or IDRefs :)
     collection('/db/contents')//mei:annot[matches(@plist, $uri)]
 };
diff --git a/add/data/xql/getAnnotationsOnPage.xql b/add/data/xql/getAnnotationsOnPage.xql
index 617e0b83b..a44138060 100644
--- a/add/data/xql/getAnnotationsOnPage.xql
+++ b/add/data/xql/getAnnotationsOnPage.xql
@@ -95,7 +95,7 @@ declare function local:getAnnotations($sourceUriSharp as xs:string, $surfaceId a
  : @returns A sequence of mei:annot elements
  :)
 declare function local:findAnnotations($edition as xs:string, $uri as xs:string, $elemIds as xs:string*) as element()* {
-
+    
     (: TODO: search in other documents and in other collections :)
     (: TODO: check if annotations hold URIs or IDRefs :)
     functx:distinct-deep(
@@ -122,7 +122,7 @@ declare function local:findAnnotations($edition as xs:string, $uri as xs:string,
     @returns A JSON representation of the perticipants
 :)
 declare function local:getParticipants($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
-
+    
     let $participants := $elems[@xml:id = $plist]
     return
         for $p in $participants
@@ -147,10 +147,10 @@ declare function local:getParticipants($annoId as xs:string, $plist as xs:string
     @returns A JSON representation of the perticipants
 :)
 declare function local:getAnnotSVGs($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
-
+    
     let $participants := $elems[@id = $plist]
     return
-
+        
         for $svg in $participants
         let $id := $svg/@id
         return
diff --git a/add/data/xql/getAudioPlayer.xql b/add/data/xql/getAudioPlayer.xql
index 87793aab6..05754f338 100644
--- a/add/data/xql/getAudioPlayer.xql
+++ b/add/data/xql/getAudioPlayer.xql
@@ -61,7 +61,7 @@ return
             <meta
                 charset="UTF-8"/>
             <title></title>
-
+            
             <!-- **Amplitude.js** -->
             <script
                 type="text/javascript"
@@ -69,7 +69,7 @@ return
             <script
                 type="text/javascript"
                 src="../../resources/js/jquery-2.1.4.min.js"></script>
-
+            
             <link
                 rel="stylesheet"
                 href="../../resources/css/audio-player.css"/>
@@ -82,7 +82,7 @@ return
                 <div
                     id="top-header-toggle"
                     class="small-player-toggle-contract"></div>
-
+                
                 <div
                     class="now-playing-title"
                     amplitude-song-info="name"></div>
@@ -92,7 +92,7 @@ return
                         amplitude-song-info="album"></span></div>
             </div>
             <!-- End Top Header -->
-
+            
             <!-- Start Large Album Art -->
             <div
                 id="top-large-album"
@@ -102,7 +102,7 @@ return
                     amplitude-song-info="cover"/>
             </div>
             <!-- End Large Album Art -->
-
+            
             <!-- Begin Small Player -->
             <div
                 id="small-player">
@@ -110,17 +110,17 @@ return
                 <div
                     id="small-player-left"
                     class="hidden-on-expanded">
-
+                
                 </div>
                 <!-- End Small Player Left -->
-
+                
                 <!-- Begin Small Player Album Art -->
                 <img
                     id="small-player-album-art"
                     class="hidden-on-expanded"
                     amplitude-song-info="cover"/>
                 <!-- End Small Player Album Art -->
-
+                
                 <!-- Begin Small Player Middle -->
                 <div
                     id="small-player-middle"
@@ -142,7 +142,7 @@ return
                                 id="middle-top-next"></div>
                         </div>
                         <!-- End Controls Container -->
-
+                        
                         <!-- Begin Meta Container -->
                         <div
                             id="small-player-middle-meta">
@@ -156,7 +156,7 @@ return
                         </div>
                         <!-- End Meta Container -->
                     </div>
-
+                    
                     <div
                         id="small-player-middle-bottom">
                         <div
@@ -166,7 +166,7 @@ return
                     </div>
                 </div>
                 <!-- End Small Player Middle -->
-
+                
                 <!-- Begin Small Player Right -->
                 <div
                     id="small-player-right"
@@ -184,7 +184,7 @@ return
                     </span>
                 </div>
                 <!-- End Small Player Right -->
-
+                
                 <!-- Begin Small Player Full Bottom -->
                 <div
                     id="small-player-full-bottom"
@@ -215,12 +215,12 @@ return
                                 class="amplitude-current-seconds"
                                 amplitude-single-current-seconds="true">00</span>
                         </span>
-
+                        
                         <div
                             class="amplitude-song-time-visualization"
                             amplitude-single-song-time-visualization="true"
                             id="song-time-visualization-large"></div>
-
+                        
                         <span
                             class="time-duration">
                             <span
@@ -234,7 +234,7 @@ return
                 <!-- End Small Player Full Bottom -->
             </div>
             <!-- End Small Player -->
-
+            
             <!-- Begin Playlist -->
             <div
                 id="small-player-playlist"
@@ -250,7 +250,7 @@ return
                     let $recTitle := $recSource/mei:titleStmt/mei:title/text()
                     let $avFile := '../../../exist/apps/contents/audioData/' || $rec/mei:avFile[2]/string(@target)
                     return
-
+                        
                         <div
                             class="amplitude-song-container amplitude-play-pause playlist-item"
                             amplitude-song-index="{$i - 1}">
@@ -271,7 +271,7 @@ return
         <script
             type="text/javascript">
             Amplitude.init({$audioConfig});
-
+            
             var expanded = false;
             var playlistEpxanded = true;
             /*
@@ -283,9 +283,9 @@ return
             }}, function(){{
             $('#small-player-middle-controls').hide();
             $('#small-player-middle-meta').show();
-
+            
             }});
-
+            
             $('#top-large-album').hover(function(){{
             $('#top-header').show();
             $('#small-player').show();
@@ -297,14 +297,14 @@ return
             }}
             }}
             }});
-
+            
             $('#top-header').hover(function(){{
             $('#top-header').show();
             $('#small-player').show();
             }}, function(){{
-
+            
             }});
-
+            
             /*
             Toggles Album Art
             */
@@ -315,11 +315,11 @@ return
             Is expanded
             */
             expanded = true;
-
+            
             $('#small-player').css('border-top-left-radius', '0px');
             $('#small-player').css('border-top-right-radius', '0px');
             }});
-
+            
             $('#top-header-toggle').click(function(){{
             $('.hidden-on-collapse').hide();
             $('.hidden-on-expanded').show();
@@ -327,31 +327,31 @@ return
             Is collapsed
             */
             expanded = false;
-
+            
             $('#small-player').css('border-top-left-radius', '5px');
             $('#small-player').css('border-top-right-radius', '5px');
             }});
-
+            
             $('.playlist-toggle').click(function(){{
             if( playlistEpxanded ){{
             $('#small-player-playlist').hide();
-
+            
             $('#small-player').css('border-bottom-left-radius', '5px');
             $('#small-player').css('border-bottom-right-radius', '5px');
-
+            
             $('#large-album-art').css('border-bottom-left-radius', '5px');
             $('#large-album-art').css('border-bottom-right-radius', '5px');
-
+            
             playlistEpxanded = false;
             }}else{{
             $('#small-player-playlist').show();
-
+            
             $('#small-player').css('border-bottom-left-radius', '0px');
             $('#small-player').css('border-bottom-right-radius', '0px');
-
+            
             $('#large-album-art').css('border-bottom-left-radius', '0px');
             $('#large-album-art').css('border-bottom-right-radius', '0px');
-
+            
             playlistEpxanded = true;
             }}
             }});
diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index d89c91919..e2bf1697f 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -86,7 +86,7 @@ let $concordances := $work//edirom:concordance
 return
     (
     concat('[',
-
+    
     string-join(
     for $concordance in $concordances
     return
@@ -97,6 +97,6 @@ return
         'connections: ', local:getConnections($concordance),
         '}')
     , ','),
-
+    
     ']')
     )
diff --git a/add/data/xql/getExtendedStaff.xql b/add/data/xql/getExtendedStaff.xql
index d7f106712..19dfa2813 100644
--- a/add/data/xql/getExtendedStaff.xql
+++ b/add/data/xql/getExtendedStaff.xql
@@ -33,19 +33,19 @@ return
                 src="//code.iconify.design/1/1.0.6/iconify.min.js"></script>
             <script
                 src="{$basePath}/resources/js/he.js"></script>
-
+            
             <script
                 src="{$basePath}/resources/js/tipped/tipped.js"></script>
             <link
                 rel="stylesheet"
                 type="text/css"
                 href="{$basePath}/resources/css/tipped/tipped.css"/>
-
+            
             <link
                 rel="stylesheet"
                 type="text/css"
                 href="{$basePath}/resources/css/verovio-view.css"/>
-
+        
         </head>
         <body>
             <div
@@ -75,7 +75,7 @@ return
             </div>
             <div
                 class='lds-roller'><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
-
+            
             <script>
                 var uri = "{$uri}";
                 var edition = "{$edition}";
diff --git a/add/data/xql/getLanguageFile.xql b/add/data/xql/getLanguageFile.xql
index d12a49d9f..0f2702a28 100644
--- a/add/data/xql/getLanguageFile.xql
+++ b/add/data/xql/getLanguageFile.xql
@@ -54,7 +54,7 @@ return
         for $entry in $file//entry
         return
             concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-
+        
         ,
         for $entry in $projectFile//entry
         return
diff --git a/add/data/xql/getLinkTarget.xql b/add/data/xql/getLinkTarget.xql
index 3466ff60d..ed8e100d3 100644
--- a/add/data/xql/getLinkTarget.xql
+++ b/add/data/xql/getLinkTarget.xql
@@ -35,7 +35,7 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
         else
             $docUri
     }
-
+    
     (: optionally set label for some views:)
     let $labeled.map :=
     if ($type = 'mei_textView')
@@ -47,7 +47,7 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
             (map:put($baseMap, 'label', 'XML Quellenbeschreibung'))
         else
             ($baseMap)
-
+            
             (: whether to set the view as default view:)
     let $defaultViewed.map :=
     if ($type = ('mei_sourceView',
@@ -61,72 +61,72 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
         (map:put($labeled.map, 'defaultView', true()))
     else
         ($labeled.map)
-
-
+        
+        
         (: xpath check whether any given view is supported :)
     let $hasView :=
     if ($type = 'desc_summaryView')
     then
         (true())
-
+    
     else
         if ($type = 'desc_headerView')
         then
             (exists($doc//mei:meiHead or $doc//tei:teiHeader))
-
+        
         else
             if ($type = 'mei_textView')
             then
                 (exists($doc//mei:annot[@type = 'descLink']))
-
+            
             else
                 if ($type = 'mei_sourceView')
                 then
                     (exists($doc//mei:facsimile//mei:graphic[@type = 'facsimile']))
-
+                
                 else
                     if ($type = 'mei_audioView')
                     then
                         (exists($doc//mei:recording))
-
+                    
                     else
                         if ($type = 'mei_verovioView')
                         then
                             (exists($doc//mei:body//mei:measure) and exists($doc//mei:body//mei:note))
-
+                        
                         else
                             if ($type = 'tei_textView')
                             then
                                 (exists($doc//tei:body[matches(.//text(), '[^\s]+')]))
-
+                            
                             else
                                 if ($type = 'tei_facsimileView')
                                 then
                                     (exists($doc//tei:facsimile//tei:graphic))
-
+                                
                                 else
                                     if ($type = 'tei_textFacsimileSplitView')
                                     then
                                         (exists($doc//tei:facsimile//tei:graphic) and exists($doc//tei:pb[@facs]))
-
+                                    
                                     else
                                         if ($type = 'mei_annotationView')
                                         then
                                             (exists($doc//mei:annot[@type = 'editorialComment']))
-
+                                        
                                         else
                                             if ($type = 'xml_xmlView')
                                             then
                                                 (true())
-
+                                            
                                             else
                                                 if ($type = 'desc_xmlView')
                                                 then
                                                     (exists($doc//mei:annot[@type = 'descLink']))
-
+                                                
                                                 else
                                                     (false())
-
+    
     return
         if ($hasView)
         then
@@ -139,7 +139,7 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
  : Returns the views for an edirom object
  :)
 declare function local:getViews($type as xs:string, $docUri as xs:string, $doc as node()+) as map(*)* {
-
+    
     let $views := (
     (:'desc_summaryView',:)
     (:'desc_headerView',:)
@@ -154,12 +154,12 @@ declare function local:getViews($type as xs:string, $docUri as xs:string, $doc a
     'xml_xmlView',
     'desc_xmlView'
     )
-
+    
     let $maps :=
     for $view in $views
     return
         local:getView($view, $docUri, $doc)
-
+    
     return
         $maps
 };
@@ -176,13 +176,13 @@ declare function local:getWindowTitle($doc as node()+, $type as xs:string) as xs
         if (exists($doc/root()/mei:work))
         then
             (eutil:getLocalizedTitle($doc/root()/mei:work, $lang))
-
+            
             (: Recording :)
         else
             if (exists($doc//mei:mei) and exists($doc//mei:recording))
             then
                 (eutil:getLocalizedTitle($doc//mei:fileDesc/mei:titleStmt[1], $lang))
-
+                
                 (: Source / Score :)
             else
                 if ($type = 'source' and exists($doc//mei:manifestation/mei:titleStmt))
@@ -196,25 +196,25 @@ declare function local:getWindowTitle($doc as node()+, $type as xs:string) as xs
                         (string-join((eutil:getLocalizedTitle(($doc//mei:source)[1]/mei:titleStmt[1], $lang),
                         ($doc//mei:source)[1]//mei:identifier[lower-case(@type) = 'shelfmark'][1]), ' | ')
                         => normalize-space())
-
+                        
                         (: MEI fallback if no title is found :)
                     else
                         if (exists($doc//mei:mei) and exists(($doc//mei:titleStmt)[1]))
                         then
                             (eutil:getLocalizedTitle(($doc//mei:titleStmt)[1], $lang))
-
+                            
                             (: Text :)
                         else
                             if (exists($doc/tei:TEI))
                             then
                                 (eutil:getLocalizedTitle($doc//tei:fileDesc/tei:titleStmt[1], $lang))
-
+                                
                                 (: HTML :)
                             else
                                 if ($type = 'html')
                                 then
                                     ($doc//head/data(title))
-
+                                
                                 else
                                     (string('unknown'))
 };
@@ -277,7 +277,7 @@ else
     if (starts-with($internalId, 'measure_') and $doc//mei:parts)
     then
         (
-
+        
         let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
         let $measureN := functx:substring-after-last($internalId, '_')
         return
@@ -291,36 +291,36 @@ let $type := (: Work :)
 if (exists($doc//mei:mei) and exists($doc//mei:work) and not(exists($doc//mei:perfMedium)))
 then
     (string('work'))
-
+    
     (: Recording :)
 else
     if (exists($doc//mei:mei) and exists($doc//mei:recording))
     then
         (string('recording'))
-
+        
         (: Source / Score :)
     else
         if (source:isSource($docUri))
         then
             (string('source'))
-
+            
             (: Text :)
         else
             if (exists($doc/tei:TEI))
             then
                 (string('text'))
-
+                
                 (: HTML :)
             else
                 if (exists($doc/html) or exists($doc/html:html))
                 then
                     (string('html'))
-
+                
                 else
                     if (contains($docUri, '.html'))
                     then
                         (string('html'))
-
+                    
                     else
                         (string('unknown'))
 
diff --git a/add/data/xql/getMeasurePage.xql b/add/data/xql/getMeasurePage.xql
index 414fc42bd..03150ddf5 100644
--- a/add/data/xql/getMeasurePage.xql
+++ b/add/data/xql/getMeasurePage.xql
@@ -41,15 +41,15 @@ declare function local:findMeasure($mei, $movementId, $measureIdName) {
 };
 
 declare function local:getMeasure($mei, $measure, $movementId) as xs:string {
-
+    
     let $measureId := $measure/string(@xml:id)
     let $zoneId := substring-after($measure/string(@facs), '#')
     let $zone := $mei/id($zoneId)
     let $surface := $zone/parent::mei:surface
     let $graphic := $surface/mei:graphic[@type = 'facsimile']
-
+    
     return
-
+        
         concat('{',
         'measureId:"', $measureId, '",',
         'zoneId:"', $zoneId, '",',
@@ -80,7 +80,7 @@ return
         ($m)
     else
         ()
-
+        
         (: Extra measure parts :)
 let $extraMeasuresParts := for $exm in $measure | $extraMeasures
 return
diff --git a/add/data/xql/getMeasures.xql b/add/data/xql/getMeasures.xql
index 395a3027c..4ade90095 100644
--- a/add/data/xql/getMeasures.xql
+++ b/add/data/xql/getMeasures.xql
@@ -31,7 +31,7 @@ import module namespace eutil = "http://www.edirom.de/xquery/util" at "/db/apps/
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:string* {
-
+    
     if ($mei//mei:parts)
     then
         (
@@ -88,10 +88,10 @@ declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:s
                 'name: "', $measureN, '"',
                 '}')
         )
-
+    
     else
         (
-
+        
         if ($mei/id($mdivID)//mei:measure[@label])
         then
             (
@@ -109,7 +109,7 @@ declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:s
             )
         else
             (
-
+            
             for $measureN in $mei/id($mdivID)//mei:measure/data(@n)
             let $measures := $mei/id($mdivID)//mei:measure[@n = $measureN]
             let $measure := $measures[1]
diff --git a/add/data/xql/getMeasuresOnPage.xql b/add/data/xql/getMeasuresOnPage.xql
index e79e80f1a..df3e35887 100644
--- a/add/data/xql/getMeasuresOnPage.xql
+++ b/add/data/xql/getMeasuresOnPage.xql
@@ -43,7 +43,7 @@ declare option output:media-type "application/json";
     @returns A list of json objects with measure information
 :)
 declare function local:getMeasures($mei as node(), $surface as node()) as map(*)* {
-
+    
     for $zone in $surface/mei:zone[@type = 'measure']
     let $zoneRef := concat('#', $zone/@xml:id)
     (:
diff --git a/add/data/xql/getNavigatorConfig.xql b/add/data/xql/getNavigatorConfig.xql
index df476ba6b..3bc6bf1a5 100644
--- a/add/data/xql/getNavigatorConfig.xql
+++ b/add/data/xql/getNavigatorConfig.xql
@@ -33,7 +33,7 @@ declare option exist:serialize "method=xhtml media-type=text/html omit-xml-decla
 declare variable $lang := request:get-parameter('lang', '');
 
 declare function local:getCategory($category, $depth) {
-
+    
     <div
         class="navigatorCategory{
                 if ($depth = 1) then
@@ -99,7 +99,7 @@ declare function local:getCategory($category, $depth) {
 };
 
 declare function local:getItem($item, $depth) {
-
+    
     let $target := $item/replace(@targets, '\[.*\]', '')
     let $cfg := concat('{', replace(substring-before($item/substring-after(@targets, '['), ']'), '=', ':'), '}')
     let $target := if (starts-with($target, 'javascript:'))
@@ -108,7 +108,7 @@ declare function local:getItem($item, $depth) {
     else
         (concat("loadLink('", $target, "', ", $cfg, ")"))
     return
-
+        
         <div
             class="navigatorItem{
                     if ($depth lt 2) then
@@ -123,18 +123,18 @@ declare function local:getItem($item, $depth) {
 };
 
 declare function local:getSeparator() {
-
+    
     <div
         class="navigatorSeparator"></div>
 };
 
 declare function local:getDefinition($navConfig) {
     let $elems := $navConfig/*
-
+    
     for $elem in $elems
-
+    
     return
-
+        
         if (local-name($elem) eq 'navigatorItem')
         then
             (
diff --git a/add/data/xql/getPreferences.xql b/add/data/xql/getPreferences.xql
index 34fcf6a77..20549b677 100644
--- a/add/data/xql/getPreferences.xql
+++ b/add/data/xql/getPreferences.xql
@@ -50,7 +50,7 @@ return
         for $entry in $file//entry
         return
             concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-
+        
         ,
         for $entry in $projectFile//entry
         return
diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 5b14616f6..6a603f757 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -60,7 +60,7 @@ return
         (substring-before(substring-after($i, 'href="'), '"'))
     else
         ()
-
+        
         (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
 let $xsl := if ($xslInstruction) then
     (doc($xslInstruction))
diff --git a/add/data/xql/getRendering.xql b/add/data/xql/getRendering.xql
index b1e07b138..82de48245 100644
--- a/add/data/xql/getRendering.xql
+++ b/add/data/xql/getRendering.xql
@@ -46,15 +46,15 @@ else
 let $doc := doc($docUri)
 
 return
-
+    
     let $base := concat('file:', system:get-module-load-path(), '/../xslt/svgRend3/')
     (:let $base := concat('xmldb:exist:///','db/functions/svgRend/'):)
-
+    
     let $mdiv2show := $movementId
     let $outputStep := 'svg'
-
-
-
+    
+    
+    
     let $svg := transform:transform($doc, concat($base, 'mei2svg.xsl'), <parameters>
         <param
             name="outputStep"
@@ -79,7 +79,7 @@ return
             value="{$lastMeasure}"/>
     </parameters>)
     (:let $svg := transform:transform($svg, concat($base, 'svgCleaner.xsl'),<parameters/>):)
-
+    
     (:let $mdiv := transform:transform($doc, concat($base, 'reduceToMdiv.xsl'), <parameters><param name="mdiv2show" value="{$mdiv2show}"/></parameters>)
 
     let $addedIDs := transform:transform($mdiv, concat($base, 'preprocessor/add-ids.xsl'), <parameters/>)
@@ -88,8 +88,8 @@ return
     let $synced := transform:transform($addedDurs, concat($base, 'preprocessor/addSynchronicity.xsl'), <parameters/>)
     let $musx := transform:transform($synced, concat($base, 'mei2musx/mei2musx.xsl'), <parameters/>)
     let $svg := transform:transform($musx, concat($base, 'musx2svg/musx2svg.xsl'), <parameters/>):)
-
-
+    
+    
     return
-
+        
         $svg
diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 665c585f4..86c0e9dfa 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -51,7 +51,7 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
     let $resp := local:generateRespSentence($work//mei:work/mei:titleStmt/mei:respStmt/*[local-name() != 'resp']/text())
     let $expression := $work/id($doc//mei:relation[@rel = 'isEmbodimentOf'][1]/substring-after(@target, '#'))/string(@label)
     return
-
+        
         <div
             class="summaryViewSource">
             <h1>
@@ -70,15 +70,15 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                         ()
                 }
             </h1>
-
+            
             <div
                 class="metaData">
-
+                
                 <div
                     class="work metaRow">
                     Zur Fassung "{$expression}" von {$resp} "{$title}".
                 </div>
-
+                
                 {
                     for $name in $doc//mei:source/mei:titleStmt/mei:respStmt/mei:*[local-name() eq 'persName' or local-name() eq 'name']
                     return
@@ -97,9 +97,9 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                             <div
                                 class="value">{$name/text()}</div>
                         </div>
-
+                
                 }
-
+                
                 {
                     for $date in $doc//mei:source/mei:pubStmt/mei:date | $doc//mei:source/mei:history/mei:creation/mei:date[1]
                     return
@@ -110,9 +110,9 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                             <div
                                 class="value">{local:getDateValue($date)}</div>
                         </div>
-
+                
                 }
-
+                
                 {
                     (: probably a Manuscript… :)
                     if (count($doc//mei:source/mei:itemList/mei:item) eq 1)
@@ -148,7 +148,7 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                     else
                         ()
                 }
-
+                
                 {
                     if ($doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'])
                     then
@@ -164,7 +164,7 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                     else
                         ()
                 }
-
+                
                 {
                     if ($doc//mei:source/mei:physDesc/mei:plateNum)
                     then
@@ -180,9 +180,9 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
                     else
                         ()
                 }
-
+            
             </div>
-
+            
             {
                 if ($doc//mei:source//mei:titlePage/@facs)
                 then
@@ -244,111 +244,111 @@ declare function local:getImagePath($basePath, $uri, $width) {
 };
 
 declare function local:getDateValue($date) {
-
+    
     if ($date/@reg)
     then
         ($date/string(@reg)) (: TODO: prettify date :)
-
+    
     else
         if ($date/@startdate and $date/@enddate)
         then
             (concat('From ', $date/@startdate, ' until ', $date/@enddate))
-
+        
         else
             if ($date/@notbefore and $date/@notafter)
             then
                 (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
-
+            
             else
                 if ($date/@startdate and $date/@notafter)
                 then
                     (concat('From ', $date/@startdate, ', not after ', $date/@notafter))
-
+                
                 else
                     if ($date/@notbefore and $date/@enddate)
                     then
                         (concat('Not before ', $date/@notbefore, ', until ', $date/@enddate))
-
+                    
                     else
                         if ($date/@startdate)
                         then
                             (concat('From ', $date/@startdate))
-
+                        
                         else
                             if ($date/@enddate)
                             then
                                 (concat('Until ', $date/@enddate))
-
+                            
                             else
                                 if ($date/@notbefore)
                                 then
                                     (concat('Not before ', $date/@notbefore))
-
+                                
                                 else
                                     if ($date/@notafter)
                                     then
                                         (concat('Not after ', $date/@notafter))
-
+                                    
                                     else
                                         if (local-name($date) eq 'date')
                                         then
                                             ($date/text())
-
+                                        
                                         else
                                             (string(""))
 };
 
 declare function local:getTeiDateValue($date) {
-
+    
     if ($date/@when)
     then
         ($date/string(@when)) (: TODO: prettify date :)
-
+    
     else
         if ($date/@from and $date/@to)
         then
             (concat('From ', $date/@from, ' to ', $date/@to))
-
+        
         else
             if ($date/@notBefore and $date/@notAfter)
             then
                 (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
-
+            
             else
                 if ($date/@from and $date/@notAfter)
                 then
                     (concat('From ', $date/@from, ', not after ', $date/@notAfter))
-
+                
                 else
                     if ($date/@notBefore and $date/@to)
                     then
                         (concat('Not before ', $date/@notBefore, ', to ', $date/@to))
-
+                    
                     else
                         if ($date/@from)
                         then
                             (concat('From ', $date/@from))
-
+                        
                         else
                             if ($date/@to)
                             then
                                 (concat('Until ', $date/@to))
-
+                            
                             else
                                 if ($date/@notBefore)
                                 then
                                     (concat('Not before ', $date/@notBefore))
-
+                                
                                 else
                                     if ($date/@notAfter)
                                     then
                                         (concat('Not after ', $date/@notAfter))
-
+                                    
                                     else
                                         if (local-name($date) eq 'date')
                                         then
                                             ($date/text())
-
+                                        
                                         else
                                             (string(""))
 };
@@ -358,7 +358,7 @@ declare function local:getWorkSummary($doc, $docUri) {
         class="summaryViewWork">
         <div
             class="titleBox">
-
+            
             <div
                 class="resps">
                 {
@@ -372,7 +372,7 @@ declare function local:getWorkSummary($doc, $docUri) {
                         )
                 }
             </div>
-
+            
             <h1>
                 {
                     if ($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'])
@@ -382,7 +382,7 @@ declare function local:getWorkSummary($doc, $docUri) {
                         ($doc//mei:work/mei:titleStmt/mei:title[1]//text())
                 }
             </h1>
-
+            
             <div
                 class="identifiers">
                 {
@@ -397,9 +397,9 @@ declare function local:getWorkSummary($doc, $docUri) {
                         </div>
                 }
             </div>
-
+        
         </div>
-
+        
         <div
             class="expressions">
             {
@@ -434,7 +434,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                         ($title)
                 }
             </h1>
-
+            
             <div
                 class="metaData">
                 {
@@ -454,7 +454,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                     else
                         ()
                 }
-
+                
                 {
                     if ($doc//tei:titleStmt/tei:editor)
                     then
@@ -477,7 +477,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                     else
                         ()
                 }
-
+                
                 {
                     for $respStmt in $doc//tei:editionStmt/tei:respStmt
                     return
@@ -507,9 +507,9 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                                 }
                             </div>
                         </div>
-
+                
                 }
-
+                
                 {
                     for $date in $doc//tei:publicationStmt/tei:date
                     return
@@ -520,9 +520,9 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                             <div
                                 class="value">{local:getTeiDateValue($date)}</div>
                         </div>
-
+                
                 }
-
+                
                 {
                     if ($doc//tei:sourceDesc/tei:msDesc//tei:repository)
                     then
@@ -559,7 +559,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                     else
                         ()
                 }
-
+                
                 {
                     if ($doc//tei:publicationStmt/tei:publisher)
                     then
@@ -576,7 +576,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                         ()
                 }
             </div>
-
+            
             { (:TODO: facsimile auswerten:)
                 if ($doc//tei:titlePage)
                 then
@@ -589,19 +589,19 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                 else
                     ()
             }
-
+        
         </div>
 };
 
 declare function local:getImagePath($server, $edition) {
     (:let $server :=  eutil:getPreference('image_server', request:get-parameter('edition', '')) :)
-
+    
     let $i_path := if ($server = 'leaflet')
     then
         (eutil:getPreference('leaflet_prefix', $edition))
     else
         (eutil:getPreference('image_prefix', $edition))
-
+    
     return
         $i_path
 
@@ -624,7 +624,7 @@ declare function local:getImagePathLeaflet($doc) {
             let $height := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@height
             return
                 concat($tile_path, '§', $width, '§', $height)
-
+            
             )
         else
             ()
@@ -668,7 +668,7 @@ return
             (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
         else
             (local:getWorkSummary($doc, $docUri))
-
+        
         )
     else
         if ($type = 'source')
diff --git a/add/data/xql/getText.xql b/add/data/xql/getText.xql
index 789386ce3..e1868ae70 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -79,7 +79,7 @@ then
     (eutil:getPreference('leaflet_prefix', $edition))
 else
     (eutil:getPreference('image_prefix', $edition))
-
+    
     (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
 
 let $xsl := if ($xslInstruction) then
diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index 640bd571d..0824c30c1 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -39,10 +39,10 @@ let $workUris := edition:getWorkUris($uri)
 return
     concat('[',
     string-join(
-
+    
     for $workUri in $workUris
     return
         work:toJSON($workUri, $uri)
-
+    
     , ','),
     ']')
diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 0288fac18..0c9f9e707 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -79,7 +79,7 @@ let $trans := <xsl:stylesheet
 let $return :=
 <div
     class="searchResult">{
-
+        
         let $search :=
         if (string-length($term) gt 0)
         then
@@ -93,10 +93,10 @@ let $return :=
             )
         else
             ()
-
+        
         return
             (
-
+            
             if (count($search) gt 0)
             then
                 (if ($lang = 'de')
@@ -119,9 +119,9 @@ let $return :=
                         class="searchResultOverview">No match found.</div>)
                 )
             ,
-
+            
             for $hit in $search
-
+            
             let $expanded := kwic:expand($hit)
             let $hitCount := count($expanded//*[./exist:match])
             let $doc := $hit/root()

From 373296dd29be2ae7adacc58881796644da67e2ad Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 9 Nov 2023 09:03:28 +0100
Subject: [PATCH 009/103] Update checkTextGridLogin.xql

---
 add/data/xql/checkTextGridLogin.xql | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/add/data/xql/checkTextGridLogin.xql b/add/data/xql/checkTextGridLogin.xql
index 69cf329cf..fd9604888 100644
--- a/add/data/xql/checkTextGridLogin.xql
+++ b/add/data/xql/checkTextGridLogin.xql
@@ -1,15 +1,16 @@
-xquery version "3.0";
+xquery version "3.1";
 
-declare namespace html = "http://www.w3.org/1999/xhtml";
-declare namespace h = "http://exist-db.org/xquery/httpclient";
+(:
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
-let $sessionId := request:get-parameter('sessionId', '')
+import module namespace httpclient = "http://exist-db.org/xquery/httpclient";
 
-let $test := httpclient:head(xs:anyURI('http://textgridlab.org/1.0/tgcrud/rest/textgrid:208dw/data?sessionId=' || $sessionId),
-false(), ())
+declare namespace html = "http://www.w3.org/1999/xhtml";
 
+let $sessionId := request:get-parameter('sessionId', '')
+let $test := httpclient:head(xs:anyURI('http://textgridlab.org/1.0/tgcrud/rest/textgrid:208dw/data?sessionId=' || $sessionId), false(), ())
 let $status := $test/root()/httpclient:response/string(@statusCode)
 let $status := response:set-status-code(xs:int($status))
-
 return
     $status

From 2090f8eb7790d7863100a225f8ae2684ec7ac734 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 9 Nov 2023 10:08:23 +0100
Subject: [PATCH 010/103] Update edirom_printPreview.xql

---
 add/data/xql/edirom_printPreview.xql | 36 +++++++++++-----------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/add/data/xql/edirom_printPreview.xql b/add/data/xql/edirom_printPreview.xql
index fa91cd391..e68401474 100644
--- a/add/data/xql/edirom_printPreview.xql
+++ b/add/data/xql/edirom_printPreview.xql
@@ -1,24 +1,24 @@
-xquery version "1.0";
+xquery version "3.1";
 
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
-import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+(:
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace xslfo = "http://exist-db.org/xquery/xslfo";
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
+declare namespace eof = "http://www.edirom.de/xquery/ediromOnlineFunctions";
 declare namespace fo = "http://www.w3.org/1999/XSL/Format";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
-declare namespace eof = "http://www.edirom.de/xquery/ediromOnlineFunctions";
 declare namespace xhtml = "http://www.w3.org/1999/xhtml";
+declare namespace xslfo = "http://exist-db.org/xquery/xslfo";
 
 declare option exist:serialize "method=html media-type=text/html omit-xml-declaration=yes indent=yes";
 
-(: VARIABLES ========================================================= :)
-
 declare variable $lang := 'en';
 declare variable $base := concat('file:', replace(system:get-module-load-path(), '\\', '/'), '/../xslt/');
-
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
 declare variable $facsBasePath := if ($imageserver = 'leaflet')
@@ -27,11 +27,9 @@ then
 else
     (eutil:getPreference('image_prefix', $edition));
 
-(:declare variable $facsBasePath := eutil:getPreference('image_prefix', request:get-parameter('edition', ''));:)
 declare variable $printResolution := 150;
 declare variable $facsAreaWidth := 6.5; (: in inch :)
 declare variable $facsMetaHeight := 30;
-
 declare variable $uri := request:get-parameter('uri', '');
 declare variable $type := request:get-parameter('type', '');
 declare variable $doc := doc($uri)/root();
@@ -46,7 +44,8 @@ declare variable $pageFormat := if ($doc//mei:facsimile or $doc//tei:facsimile)
 then
     if ((sum(for $h in $facsItems/@height
     return
-        $h) div count($facsItems)) gt (sum(for $h in $facsItems/@width
+        $h) div count($facsItems))
+    gt (sum(for $h in $facsItems/@width
     return
         $h) div count($facsItems)))
     then
@@ -59,8 +58,6 @@ else
 declare variable $pageMaster := doc(concat($base, 'edirom_fo_layoutMasterSet.xml'))//fo:*[@master-name = $pageFormat];
 declare variable $ediromOnlineRoot := request:get-context-path();
 
-(: FUNCTIONS ========================================================= :)
-
 declare function eof:getLabel($key as xs:string) {
     if ($langFile/id($key) and not($langFile/id($key)/text() eq ''))
     then
@@ -102,8 +99,6 @@ declare function eof:insertAttributeSet_h1() {
     attribute font-weight {'bold'}
 };
 
-(: OUTPUT ========================================================= :)
-
 let $xsl_source := concat($base, 'edirom_source2Print.xsl')
 let $xsl_text := concat($base, 'edirom_text2Print.xsl')
 let $paras := <parameters>
@@ -144,16 +139,13 @@ else
 let $doc := doc($docUri)
 
 return
-    if ($type = 'work')
-    then
+    if ($type = 'work') then
         ('work')
     else
-        if ($type = 'source')
-        then
+        if ($type = 'source') then
             transform:transform($doc, $xsl_source, $paras)
         else
-            if ($type = 'text')
-            then
+            if ($type = 'text') then
                 transform:transform($doc, $xsl_text, $paras)
             else
                 ('last else')

From 8a1157ea92ea382b2d682b24b016eea40f050b2f Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 9 Nov 2023 10:11:07 +0100
Subject: [PATCH 011/103] Update getAnnotation.xql

---
 add/data/xql/getAnnotation.xql | 42 ++++++++--------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 3f16301f3..580fead39 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -1,45 +1,23 @@
 xquery version "3.1";
-(:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getAnnotation.xql 1455 2012-10-11 10:42:55Z daniel $
-:)
 
-(:~
-    Returns the HTML for a specific annotation for an AnnotationView.
-
-    @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-:)
+(:
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
-import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace exist = "http://exist.sourceforge.net/NS/exist";
 declare namespace edirom_image = "http://www.edirom.de/ns/image";
-declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace exist = "http://exist.sourceforge.net/NS/exist";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-declare option output:method "xhtml";
 declare option output:media-type "text/html";
+declare option output:method "xhtml";
 
 declare variable $imageWidth := 600;
 declare variable $edition := request:get-parameter('edition', '');

From 5958a20c27a5a89a9297cf0a5fb31561c3ab55b3 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 9 Nov 2023 10:40:51 +0100
Subject: [PATCH 012/103] Update getAnnotation.xql

---
 add/data/xql/getAnnotation.xql | 80 ++++++++++++++++------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 580fead39..0c9eb0e3e 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -20,8 +20,11 @@ declare option output:media-type "text/html";
 declare option output:method "xhtml";
 
 declare variable $imageWidth := 600;
+
 declare variable $edition := request:get-parameter('edition', '');
+
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
+
 declare variable $imageBasePath := if ($imageserver = 'leaflet')
 then
     (eutil:getPreference('leaflet_prefix', $edition))
@@ -32,12 +35,11 @@ declare variable $lang := request:get-parameter('lang', '');
 
 (: TODO: in Modul auslagern :)
 (:~
-    Gets the zone holding the graphical representation of an element
-
-    @param $elem The element for which the graphical representation shall be found
-
-    @return The zone element
-:)
+ :  Gets the zone holding the graphical representation of an element
+ :
+ :  @param $elem The element for which the graphical representation shall be found
+ :  @return The zone element
+ :)
 declare function local:getZone($elem as element()) as element()? {
     if ($elem/@facs)
     then
@@ -53,12 +55,11 @@ declare function local:getZone($elem as element()) as element()? {
 };
 
 (:~
-    This function gets the label of a given Annotation Priority
-
-    @param $annot the annot with a priority to look for
-
-    @return the label for the Priority, or, if this fails, $uri
-:)
+ :  This function gets the label of a given Annotation Priority
+ :
+ :  @param $annot the annot with a priority to look for
+ :  @return the label for the Priority, or, if this fails, $uri
+ :)
 declare function local:getPriority($annot as node()) {
     
     let $uri := $annot/mei:ptr[@type eq 'priority']/string(@target)
@@ -84,12 +85,11 @@ declare function local:getPriority($annot as node()) {
 };
 
 (:~
-    This function gets a string representing all Annotation categories
-
-    @param $annot the annot with categories to look for
-
-    @return the string of annotation labels, or, if one of them fails, the respecitve $uri
-:)
+ :  This function gets a string representing all Annotation categories
+ :
+ :  @param $annot the annot with categories to look for
+ :  @return the string of annotation labels, or, if one of them fails, the respecitve $uri
+ :)
 declare function local:getCategories($annot as node()) {
     
     let $uris := tokenize($annot/mei:ptr[@type eq 'categories']/string(@target), ' ')
@@ -116,18 +116,16 @@ declare function local:getCategories($annot as node()) {
         $string
 };
 
-
 (: TODO: in Modul auslagern :)
 (:~
-    This function generates an image path for a specific zone on an image.
-    Based on a path prefix and a width.
-
-    @param $basePath The base path prefix for the image databse
-    @param $zone The zone with coordiantes on the image
-    @param $width The width the image should be loaded with
-
-    @return A URL pointing to an image based as xs:string
-:)
+ :  This function generates an image path for a specific zone on an image.
+ :  Based on a path prefix and a width.
+ :
+ :  @param $basePath The base path prefix for the image databse
+ :  @param $zone The zone with coordiantes on the image
+ :  @param $width The width the image should be loaded with
+ :  @return A URL pointing to an image based as xs:string
+ :)
 declare function local:getImageAreaPath($basePath as xs:string, $zone as element()?, $width as xs:integer) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
     
@@ -180,15 +178,14 @@ declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as
 
 };
 
-(:
-    This function recursively determines the lowest number which's square is higher than
-    a given number.
-
-    @param $i The integer that's increased with every recursive call.
-    @param $num The integer that's tested.
-
-    @return Returns $i if it's square is higher or equals $num.
-:)
+(:~
+ :  This function recursively determines the lowest number which's square is higher than
+ :  a given number.
+ :
+ :  @param $i The integer that's increased with every recursive call.
+ :  @param $num The integer that's tested.
+ :  @return Returns $i if it's square is higher or equals $num.
+ :)
 declare function local:getLowestSquareBase($i as xs:integer, $num as xs:integer) {
     if ($i * $i lt $num)
     then
@@ -230,11 +227,10 @@ declare function local:getItemLabel($elem as element()) {
         )
 };
 
-
-(:
-    This function…
-
-:)
+(:~
+ :   This function…
+ :
+ :)
 declare function local:calculatePreviewsForTip($participants as xs:string*) {
     
     let $areaWidth := 204

From 9031dc7ee147613d7deb27b1d5260aa1275695e6 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 9 Nov 2023 10:44:14 +0100
Subject: [PATCH 013/103] Update getAnnotationInfos.xql

---
 add/data/xql/getAnnotationInfos.xql | 30 ++++-------------------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index f92d13d07..7fbc0c5da 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -1,15 +1,16 @@
 xquery version "3.1";
+
 (:
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace request = "http://exist-db.org/xquery/request";
 
-import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
-
 declare option output:method "json";
 declare option output:media-type "application/json";
 
@@ -78,26 +79,3 @@ map {
 
 return
     $map
-    
-    (:
-
-return concat('{categories: [',
-        string-join(
-            for $category in local:getDistinctCategories($annots)
-            let $categoryElement := (collection($edition_path)/id($category))[1]
-            let $name := annotation:category_getName($categoryElement, eutil:getLanguage($edition))
-            order by $name
-            return
-                concat('{id:"', $category, '",name:"', $name,'"}')
-        , ','),
-        '], priorities: [',
-        string-join(
-            for $priority in local:getDistinctPriorities($annots)
-            let $name := eutil:getLocalizedName((collection($edition_path)//id($priority))[1], $lang)
-            order by $name
-            return
-                concat('{id:"', $priority, '",name:"', $name,'"}')
-        , ','),
-        ']}')
-
-        :)

From 006f9c6ce1868b7c553fd2469a84daa6059f2966 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 11 Jan 2024 22:59:16 +0100
Subject: [PATCH 014/103] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 101 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 82 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 80e39c2f8..ec7318e50 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,50 +9,113 @@
 1. Use whitespaces, not tabs to indent code
 2. Close file with a newline character
 
+# XQuery Styleguide
 
-# XQuery
+For formatting of XQuery files we generally rely on the basic configuration of Synchrosoft’s oXygen XML software family and its “Format & Indent” function.
 
 ## xqDoc
 
-We use [xqDoc](https://xqdoc.org) for documenting the XQueries in this repository. Please refer to the section [xqDoc Comments](https://xqdoc.org/xqdoc_comments_doc.html) of the xyDoc-website for details on formatting the documentation comment blocks.
+We use [xqDoc](https://xqdoc.org) for documenting the XQueries in this repository. Please refer to the section [xqDoc Comments](https://xqdoc.org/xqdoc_comments_doc.html) of the xqDoc-website for details on formatting the documentation comment blocks.
 
 * XQuery modules must have a library module xqDoc comment preceding the module declaration.
 * Function declarations must have a library module xqDoc function comment preceding the function.
 
 ## XQuery document structure
 
-### XQuery version
+### XQuery version declaration
 
 ```xquery
 xquery version 3.1;
 ```
 
-### License Statement
+### Beginning comments
+
+For now, the beginning comments should only include the following:
 
 ```xquery
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
+
+ ```
+The beginning comments and the structuring comments (see below) of the prolog are separated by a blank line.
+
+### Prolog
+
+1. The parts of the prolog, are introduced by a comment followed by a new line.
+2. The below form of the comments and the order of the parts is prescriptive.
+3. Each part of the prolog ends with a blank line.
+
+```xquery
+(: IMPORTS ========================================================= :)
+
+```
+
+Sort imports by type:
+1. All `import module namespace` statements registered with eXist-db
+2. All `import module namespace` statements of custom modules that are not registered with eXist-db. Always use relative URIs for unregistered `import module namespace` statements.
+3. Separate groups with a blank line.
+4. In the groups sort alphabetically by prefix.
+
+```xquery
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+```
+
+All `declare namespace` statements, sorted alphabetically by prefix.
+
+```xquery
+(: OPTION DECLARATIONS ============================================= :)
+
+```
+All `declare option` statements.
+
+```xquery
+(: VARIABLE DECLARATIONS =========================================== :)
+
 ```
 
-### File Header
+1. Use `declare variable` statements for all required external parameters
+2. All global variable declarations, i.e. `declare variable` statements.
+3. Separate these two groups with a blank line.
+4. In the groups, sort alphabetically.
 
-1. `declare namespace` statements
-   * sort alphabetically by prefix
-2. `import module namespace` statements of registered modules
-   * sort alphabetically by prefix
-3. `import module namespace` statements of custom modules
-   * sort alphabetically by prefix
-   * Always use relative URIs for `import module namespace` statements that import for modules not registered with eXist-db.
+```xquery
+(: FUNCTION DECLARATIONS =========================================== :)
 
-### Declare variables
+```
 
-* Use `declare variable` statements for all required external parameters
+1. All `declare function` statements.
+2. All function declarations have to be preceded by an xqDoc comment.
+3. The xqDoc comment and function declaration belonging together are not separated by blank lines – not even one ;-)
+4. The comment-function-groups are separated by blank lines.
 
-### Function declarations
+A prototypical example:
+
+```xquery
+(: FUNCTION DECLARATIONS =========================================== :)
+
+(:~
+ :
+ :)
+declare function eg:addComment($comment as xs:string, $function as function())
+as xs:string
+{
+   …
+}
+
+(:~
+ :)
+declare function eg:addComment($comment as xs:string, $function as function())
+as xs:string
+{
+   …
+}
+```
 
-* functions have to be preceded by an xqDoc comment
 
 ### XQuery body
 
-* Strings: escape with U+00027 APOSTROPHE: `'`
\ No newline at end of file
+* Strings: escape with U+00027 APOSTROPHE: `'`
+
+

From c21120452ffffe2deb9b0c5339e098daf36c0d0f Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 11 Jan 2024 23:14:40 +0100
Subject: [PATCH 015/103] Update getAnnotationMeta.xql

---
 add/data/xql/getAnnotationMeta.xql | 37 +++++++++++-------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/add/data/xql/getAnnotationMeta.xql b/add/data/xql/getAnnotationMeta.xql
index 92bcdf2be..d6734553a 100644
--- a/add/data/xql/getAnnotationMeta.xql
+++ b/add/data/xql/getAnnotationMeta.xql
@@ -1,23 +1,7 @@
-xquery version "3.0";
-(:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+xquery version "3.1";
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getAnnotationMeta.xql 1324 2012-05-15 13:59:35Z daniel $
+(:
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -25,18 +9,25 @@ xquery version "3.0";
 
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
+
+(: IMPORTS ========================================================= :)
+
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
-import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace exist = "http://exist.sourceforge.net/NS/exist";
 declare namespace edirom_image = "http://www.edirom.de/ns/image";
+declare namespace exist = "http://exist.sourceforge.net/NS/exist";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option output:method "xhtml";
 declare option output:media-type "text/html";
 

From b2965edc120a68c006400a85f5d6e00ba23b2091 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 11 Jan 2024 23:22:51 +0100
Subject: [PATCH 016/103] add structuring comments

---
 add/data/xql/checkTextGridLogin.xql  | 4 ++++
 add/data/xql/edirom_printPreview.xql | 8 ++++++++
 add/data/xql/getAnnotation.xql       | 8 ++++++++
 add/data/xql/getAnnotationInfos.xql  | 8 ++++++++
 4 files changed, 28 insertions(+)

diff --git a/add/data/xql/checkTextGridLogin.xql b/add/data/xql/checkTextGridLogin.xql
index fd9604888..814504527 100644
--- a/add/data/xql/checkTextGridLogin.xql
+++ b/add/data/xql/checkTextGridLogin.xql
@@ -4,8 +4,12 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace httpclient = "http://exist-db.org/xquery/httpclient";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace html = "http://www.w3.org/1999/xhtml";
 
 let $sessionId := request:get-parameter('sessionId', '')
diff --git a/add/data/xql/edirom_printPreview.xql b/add/data/xql/edirom_printPreview.xql
index e68401474..ddef337e8 100644
--- a/add/data/xql/edirom_printPreview.xql
+++ b/add/data/xql/edirom_printPreview.xql
@@ -4,9 +4,13 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace eof = "http://www.edirom.de/xquery/ediromOnlineFunctions";
 declare namespace fo = "http://www.w3.org/1999/XSL/Format";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -15,8 +19,12 @@ declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xhtml = "http://www.w3.org/1999/xhtml";
 declare namespace xslfo = "http://exist-db.org/xquery/xslfo";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=html media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $lang := 'en';
 declare variable $base := concat('file:', replace(system:get-module-load-path(), '\\', '/'), '/../xslt/');
 declare variable $edition := request:get-parameter('edition', '');
diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 0c9eb0e3e..2ecfd414f 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -4,11 +4,15 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace edirom_image = "http://www.edirom.de/ns/image";
 declare namespace exist = "http://exist.sourceforge.net/NS/exist";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -16,9 +20,13 @@ declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option output:media-type "text/html";
 declare option output:method "xhtml";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $imageWidth := 600;
 
 declare variable $edition := request:get-parameter('edition', '');
diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index 7fbc0c5da..1ea5ac879 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -4,16 +4,24 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace request = "http://exist-db.org/xquery/request";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option output:method "json";
 declare option output:media-type "application/json";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $uri := request:get-parameter('uri', '');
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $edition_path := eutil:getPreference('edition_path', $edition);

From 161003f08d0463f099da59336e2eaef96f2c21ce Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 11 Jan 2024 23:25:42 +0100
Subject: [PATCH 017/103] update Copyright comment

---
 add/data/xql/getAnnotationInfos.xql       |  5 ++---
 add/data/xql/getAnnotationMeta.xql        |  4 ++--
 add/data/xql/getAnnotationOpenAllUris.xql | 20 +++-----------------
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index 1ea5ac879..79230d7aa 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -1,8 +1,7 @@
 xquery version "3.1";
-
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ========================================================= :)
 
diff --git a/add/data/xql/getAnnotationMeta.xql b/add/data/xql/getAnnotationMeta.xql
index d6734553a..35acb05fa 100644
--- a/add/data/xql/getAnnotationMeta.xql
+++ b/add/data/xql/getAnnotationMeta.xql
@@ -1,8 +1,8 @@
 xquery version "3.1";
 
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns the HTML for a specific annotation for an AnnotationView.
diff --git a/add/data/xql/getAnnotationOpenAllUris.xql b/add/data/xql/getAnnotationOpenAllUris.xql
index fcee917d9..987372b30 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -1,22 +1,8 @@
 xquery version "3.0";
-(:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
 
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-:)
+(:
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";

From a2ba68e9fe5ce7e40647e35cc21c49d6f78def46 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 11 Jan 2024 23:45:36 +0100
Subject: [PATCH 018/103] add structuring comments

---
 add/data/xql/edirom_printPreview.xql      | 2 ++
 add/data/xql/getAnnotation.xql            | 2 ++
 add/data/xql/getAnnotationOpenAllUris.xql | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/add/data/xql/edirom_printPreview.xql b/add/data/xql/edirom_printPreview.xql
index ddef337e8..16c044788 100644
--- a/add/data/xql/edirom_printPreview.xql
+++ b/add/data/xql/edirom_printPreview.xql
@@ -74,6 +74,8 @@ declare function eof:getLabel($key as xs:string) {
         ($key)
 };
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function eof:getFacsImgParas($areaWidth) {
     concat('&amp;dw=', floor($printResolution * $areaWidth), '&amp;mo=scale')
 };
diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 2ecfd414f..d29cb36d0 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -41,6 +41,8 @@ else
 
 declare variable $lang := request:get-parameter('lang', '');
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 (: TODO: in Modul auslagern :)
 (:~
  :  Gets the zone holding the graphical representation of an element
diff --git a/add/data/xql/getAnnotationOpenAllUris.xql b/add/data/xql/getAnnotationOpenAllUris.xql
index 987372b30..452fefcc8 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -4,12 +4,18 @@ xquery version "3.0";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option output:method "text";
 declare option output:media-type "text/html";
 

From f8638778673d392659f15efd4d03983ff32fce1b Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Tue, 16 Jan 2024 17:14:14 +0100
Subject: [PATCH 019/103] Update getAnnotationOpenAllUris.xql

---
 add/data/xql/getAnnotationOpenAllUris.xql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add/data/xql/getAnnotationOpenAllUris.xql b/add/data/xql/getAnnotationOpenAllUris.xql
index 452fefcc8..128809412 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -1,4 +1,4 @@
-xquery version "3.0";
+xquery version "3.1";
 
 (:
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.

From 1a4be3636f703fc6117da744c66bca87ef2d7570 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Tue, 16 Jan 2024 17:18:02 +0100
Subject: [PATCH 020/103] Update getAnnotationParticipants.xql

---
 add/data/xql/getAnnotationParticipants.xql | 26 +++++++---------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/add/data/xql/getAnnotationParticipants.xql b/add/data/xql/getAnnotationParticipants.xql
index ec7c1dd04..ca065ddca 100644
--- a/add/data/xql/getAnnotationParticipants.xql
+++ b/add/data/xql/getAnnotationParticipants.xql
@@ -1,22 +1,8 @@
-xquery version "1.0";
+xquery version "3.1";
+
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-:)
+ : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns a list of participants of a specific annotation.
@@ -24,9 +10,13 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option output:method "text";
 declare option output:media-type "text/html";
 

From 6223f3a0e0304ac012fd91aa4a63d47bd2e0dc4d Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 1 Feb 2024 23:31:28 +0100
Subject: [PATCH 021/103] Update getAnnotationPreviews.xql

add structural comments for XQuery head
---
 add/data/xql/getAnnotationPreviews.xql | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 49b87da3e..18359912a 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -10,18 +10,25 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
 :)
 
+(: IMPORTS ========================================================= :)
+
+import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
+import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
-import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $lang := request:get-parameter('lang', '');
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);

From ad14a72d366ca308983a3d5f51cf5ba2624cb4c5 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 1 Feb 2024 23:33:16 +0100
Subject: [PATCH 022/103] format and indent

---
 add/data/xql/getAnnotationPreviews.xql | 29 ++++++++++++--------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 18359912a..5c0a719c9 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -33,8 +33,7 @@ declare variable $lang := request:get-parameter('lang', '');
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
 declare variable $uri := request:get-parameter('uri', '');
-declare variable $imageBasePath := if ($imageserver = 'leaflet')
-then
+declare variable $imageBasePath := if ($imageserver = 'leaflet') then
     (eutil:getPreference('leaflet_prefix', $edition))
 else
     (eutil:getPreference('image_prefix', $edition));
@@ -42,24 +41,22 @@ else
 declare function local:getParticipants($annot as element()) as map(*)* {
     
     let $participants := tokenize($annot/string(@plist), ' ')
-    let $docs := distinct-values(for $p in $participants
-    return
-        substring-before($p, '#'))
+    
+    (: get distinct document uris referenced in @plist :)
+    let $docs := distinct-values(
+        for $p in $participants
+        return substring-before($p, '#')
+    )
+    
     return
         for $doc in $docs
-            order by $doc
+        order by $doc
         return
-            if (source:isSource($doc))
-            then
+            if (source:isSource($doc)) then
                 (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
-            
-            else
-                if (teitext:isText($doc))
-                then
-                    (local:getTextParticipants($participants[starts-with(., $doc)], $doc))
-                
-                else
-                    ()
+            else if (teitext:isText($doc)) then
+                (local:getTextParticipants($participants[starts-with(., $doc)], $doc))
+            else ()
 };
 
 declare function local:getTextParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {

From f1107b668faf73dba4a86b9119a6ed9dacd28172 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 01:10:38 +0100
Subject: [PATCH 023/103] Update getAnnotationPreviews.xql

format and indent
---
 add/data/xql/getAnnotationPreviews.xql | 223 ++++++++++++-------------
 1 file changed, 103 insertions(+), 120 deletions(-)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 5c0a719c9..9e9c29276 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -203,35 +203,33 @@ declare function local:getSourceLinkTarget($elems as node()*, $zones as node()*)
 
 declare function local:groupParticipants($participants as xs:string*, $doc as xs:string) as xs:string* {
     
-    let $elems := for $p in $participants
-    let $id := substring-after($p, '#')
-    return
-        doc($doc)/id($id)
+    let $elems :=
+        for $p in $participants
+        let $id := substring-after($p, '#')
+        return doc($doc)/id($id)
     
-    let $zones := for $elem in $elems
-    return
-        local:getZone($elem)
+    let $zones :=
+        for $elem in $elems
+        return local:getZone($elem)
     
-    let $combs := for $p at $i in $participants
-    return
-        local:getCombinations($elems, $zones, $i, count($zones))
+    let $combs :=
+        for $p at $i in $participants
+        return local:getCombinations($elems, $zones, $i, count($zones))
     
     return
         reverse(
-        for $comb at $i in reverse($combs)
-        let $contained := for $n in (1 to count($combs) - $i)
-        return
-            if (contains($combs[$n], $comb))
-            then
-                (1)
-            else
-                (0)
-        return
-            if (exists(index-of($contained, 1)))
-            then
-                ()
-            else
-                ($comb)
+            for $comb at $i in reverse($combs)
+            let $contained := for $n in (1 to count($combs) - $i)
+                return
+                    if (contains($combs[$n], $comb)) then
+                        (1)
+                    else
+                        (0)
+            return
+                if (exists(index-of($contained, 1))) then
+                    ()
+                else
+                    ($comb)
         )
 };
 
@@ -239,31 +237,33 @@ declare function local:getCombinations($elems as element()*, $zones as element()
     
     let $currentZone := $zones[$i]
     let $currentElem := $elems[$i]
+    
     return
-        if (local-name($currentElem) eq 'measure' or local-name($currentElem) eq 'staff')
-        then
-            (
+        if (local-name($currentElem) eq 'measure' or local-name($currentElem) eq 'staff') then (
             string-join((
-            string($i),
-            for $n in ($i + 1 to $total)
-            return
-                if ((local-name($elems[$n]) eq 'measure' or local-name($elems[$n]) eq 'staff') and local:compareZones($currentZone, $zones[$n]))
-                then
-                    (local:getCombinations($elems, $zones, $n, $total))
-                else
-                    ()
-            ), '-')
-            )
-        else
-            (
+                string($i),
+                for $n in ($i + 1 to $total)
+                return
+                    if ((local-name($elems[$n]) eq 'measure' or local-name($elems[$n]) eq 'staff') and local:compareZones($currentZone, $zones[$n])) then
+                        (local:getCombinations($elems, $zones, $n, $total))
+                    else
+                        ()
+                ), '-')
+        ) else (
             string($i)
-            )
+        )
 };
 
 declare function local:compareZones($zone1 as element(), $zone2 as element()) as xs:boolean {
     
     let $samePage := deep-equal($zone1/.., $zone2/..)
-    let $overlapping := not(number($zone1/@ulx) gt number($zone2/@lrx) or number($zone1/@lrx) lt number($zone2/@ulx) or number($zone1/@uly) gt number($zone2/@lry) or number($zone1/@lry) lt number($zone2/@uly))
+    let $overlapping := not(
+        number($zone1/@ulx) gt number($zone2/@lrx) or
+        number($zone1/@lrx) lt number($zone2/@ulx) or
+        number($zone1/@uly) gt number($zone2/@lry) or
+        number($zone1/@lry) lt number($zone2/@uly)
+    )
+    
     return
         $samePage and $overlapping
 };
@@ -285,17 +285,13 @@ declare function local:getElement($uri as xs:string) as element()? {
     @return The zone element
 :)
 declare function local:getZone($elem as element()) as element()? {
-    if ($elem/@facs)
-    then
-        (
+    if ($elem/@facs) then (
         let $zoneId := replace($elem/@facs, '^#', '')
         return
             $elem/root()/id($zoneId)
-        )
+    )
     else
-        (
         $elem
-        )
 };
 
 (:~
@@ -324,25 +320,23 @@ declare function local:getImageAreaPath($basePath as xs:string, $graphic as elem
     let $imgHeight := number($graphic/@height)
     let $isAbsolute := starts-with($imagePath, 'http')
     
-    let $fields := if ($imageserver = 'leaflet') then
-        (substring-before($imagePath, '.'))
-    else
-        ()
+    let $fields :=
+        if ($imageserver = 'leaflet') then
+            (substring-before($imagePath, '.'))
+        else
+            ()
     
     return
-        if ($isAbsolute)
-        then
+        if ($isAbsolute) then
             $imagePath
         else
             switch ($imageserver)
                 case 'leaflet'
-                    return
-                        concat($basePath, $fields)
+                    return concat($basePath, $fields)
                 case 'openseadragon'
-                    return
-                        concat($basePath, translate($imagePath, '/', '!'))
-                default return
-                    concat($basePath, $imagePath, '?')
+                    return concat($basePath, translate($imagePath, '/', '!'))
+                default
+                    return concat($basePath, $imagePath, '?')
 
 };
 
@@ -376,76 +370,65 @@ declare function local:getImageAreaParams($zone as element()?, $imgWidth as xs:i
 
 declare function local:getItemLabel($elems as element()*) as xs:string {
     let $language := eutil:getLanguage($edition)
+    
     return
-        string-join(
-        for $type in distinct-values(for $elem in $elems
-        return
-            local-name($elem))
-        let $items := for $elem in $elems
-        return
-            if (local-name($elem) eq $type) then
-                ($elem)
-            else
-                ()
-        let $itemLabelMultiRestSensitive := if ($items[1]//mei:multiRest)
-        then
-            ($items[1]/@n || '–' || number($items[1]/@n) + number($items[1]//mei:multiRest/@num) - 1)
-        else
-            ($items[1]/@n)
-        return
-            if (local-name($items[1]) eq 'measure')
-            then
-                (
-                if (count($items) gt 1)
-                then
-                    (eutil:getLanguageString('Bars_from_to', ($items[1]/@n, $items[last()]/@n), $language))
+        string-join((
+            for $type in distinct-values(
+                for $elem in $elems
+                return local-name($elem))
+            
+            let $items :=
+                for $elem in $elems
+                return
+                    if (local-name($elem) eq $type) then
+                        $elem
+                    else
+                        ()
+            
+            let $itemLabelMultiRestSensitive :=
+                if ($items[1]//mei:multiRest) then
+                    ($items[1]/@n || '–' || number($items[1]/@n) + number($items[1]//mei:multiRest/@num) - 1)
                 else
-                    (eutil:getLanguageString('Bar_n', $itemLabelMultiRestSensitive, $language))
-                )
-            else
-                if (local-name($items[1]) eq 'staff')
-                (: TODO: $itemLabelMultiRestSensitive also for staffs? :)
-                then
-                    (
-                    if (count($items) gt 1)
-                    then
-                        (
-                        
+                    $items[1]/@n
+            
+            return
+                if (local-name($items[1]) eq 'measure') then (
+                    if (count($items) gt 1) then
+                        (eutil:getLanguageString('Bars_from_to', ($items[1]/@n, $items[last()]/@n), $language))
+                    else
+                        (eutil:getLanguageString('Bar_n', $itemLabelMultiRestSensitive, $language))
+                ) else if (local-name($items[1]) eq 'staff') then (: TODO: $itemLabelMultiRestSensitive also for staffs? :) (
+                    if (count($items) gt 1) then (
                         let $measureNs := distinct-values($items/ancestor::mei:measure/@n)
                         
-                        let $label := if ($lang = 'de')
-                        then
-                            (if (count($measureNs) gt 1) then
-                                (concat('Takte ', $measureNs[1], '-', $measureNs[last()]))
-                            else
-                                (concat('Takt ', $measureNs[1])))
-                        else
-                            (if (count($measureNs) gt 1) then
-                                (concat('Bars ', $measureNs[1], '-', $measureNs[last()]))
-                            else
-                                (concat('Bar ', $measureNs[1])))
+                        let $label :=
+                            if ($lang = 'de') then(
+                                if (count($measureNs) gt 1) then
+                                    (concat('Takte ', $measureNs[1], '-', $measureNs[last()]))
+                                else (
+                                    concat('Takt ', $measureNs[1])
+                                )
+                            ) else (
+                                if (count($measureNs) gt 1) then (
+                                    concat('Bars ', $measureNs[1], '-', $measureNs[last()])
+                                ) else (
+                                    concat('Bar ', $measureNs[1])
+                                )
+                            )
                         
                         return
-                            
                             concat($label, ' (', string-join($items/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ', '), ')')
-                        
-                        )
-                    else
+                    ) else
                         (concat('Takt ', $items[1]/ancestor::mei:measure/@n, ' (', $items[1]/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ')'))
+                
+                ) else if (local-name($items[1]) eq 'zone') then (
+                    if (count($items) gt 1) then (
+                        (:Dieser Fall sollte nicht vorkommen, da freie zones nicht zusammengefasst werden dürfen:)
+                    ) else (
+                        concat('Ausschnitt (S. ', $items[1]/parent::mei:surface/@n, ')')
                     )
-                else
-                    if (local-name($items[1]) eq 'zone')
-                    then
-                        (
-                        if (count($items) gt 1)
-                        then
-                            ((:Dieser Fall sollte nicht vorkommen, da freie zones nicht zusammengefasst werden dürfen:) )
-                        else
-                            (concat('Ausschnitt (S. ', $items[1]/parent::mei:surface/@n, ')'))
-                        )
-                    else
-                        ()
-        , ' ')
+                ) else ()
+        ), ' ')
 
 };
 

From c4860445ae9140ac90efe69ac95bab4b122cd7ee Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 01:10:49 +0100
Subject: [PATCH 024/103] Update getAnnotationPreviews.xql

add some documentation
---
 add/data/xql/getAnnotationPreviews.xql | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 9e9c29276..dc65eb6e5 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -53,6 +53,7 @@ declare function local:getParticipants($annot as element()) as map(*)* {
         order by $doc
         return
             if (source:isSource($doc)) then
+                (: filter participants starting with matching doc uri and call getSourceParticipants :)
                 (local:getSourceParticipants($participants[starts-with(., $doc)], $doc))
             else if (teitext:isText($doc)) then
                 (local:getTextParticipants($participants[starts-with(., $doc)], $doc))
@@ -102,9 +103,15 @@ declare function local:getTextNotePrecedingContent($elem as element()) as xs:str
         else
             (local:getTextNotePrecedingContent($preceding))
 };
-
+(:~
+ : This function returns a map with details of annotation participants from a specific music source
+ :
+ : @param $participants a prefiltered sequence of annotation URIs pointing to $doc
+ : @param $doc a URI pointing to the MEI document
+ :)
 declare function local:getSourceParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
     
+    (: group participants :)
     let $combs := local:groupParticipants($participants, $doc)
     
     return

From 9faeada088a4dea4be932cedbd4a243aee3f3385 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 01:16:49 +0100
Subject: [PATCH 025/103] Update getAnnotations.xql

---
 add/data/xql/getAnnotations.xql | 52 +++++++++++++--------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/add/data/xql/getAnnotations.xql b/add/data/xql/getAnnotations.xql
index c351d9c4a..e5bc415ee 100644
--- a/add/data/xql/getAnnotations.xql
+++ b/add/data/xql/getAnnotations.xql
@@ -1,23 +1,6 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getAnnotations.xql 1324 2012-05-15 13:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -26,34 +9,41 @@ xquery version "3.1";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option output:method "text";
 declare option output:media-type "text/plain";
 
 let $edition := request:get-parameter('edition', '')
 let $uri := request:get-parameter('uri', '')
-let $uri := if (contains($uri, '#')) then
-    (substring-before($uri, '#'))
-else
-    ($uri)
+
+let $uri :=
+    if (contains($uri, '#')) then
+        (substring-before($uri, '#'))
+    else
+        ($uri)
 
 let $map :=
-map {
-    'success': true(),
-    'total': count(doc($uri)//mei:annot[@type = 'editorialComment']),
-    'annotations': array {annotation:annotationsToJSON($uri, $edition)}
-}
+    map {
+        'success': true(),
+        'total': count(doc($uri)//mei:annot[@type = 'editorialComment']),
+        'annotations': array {annotation:annotationsToJSON($uri, $edition)}
+    }
 let $options :=
-map {
-    'method': 'json',
-    'media-type': 'text/plain'
-}
+    map {
+        'method': 'json',
+        'media-type': 'text/plain'
+    }
 
 return
     serialize($map, $options)

From 22053e5014643b2f2725b111b22f1eb6dae96dcd Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 01:23:58 +0100
Subject: [PATCH 026/103] Update getAnnotationsInRendering.xql

---
 add/data/xql/getAnnotationsInRendering.xql | 59 +++++++++-------------
 1 file changed, 24 insertions(+), 35 deletions(-)

diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index 4b8c693a6..e3a6aa5d0 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -1,23 +1,6 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getAnnotationsOnPage.xql 1457 2012-10-12 08:05:03Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -26,15 +9,19 @@ xquery version "3.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-import module namespace functx = "http://www.functx.com";
+(: IMPORTS ========================================================= :)
 
+import module namespace functx = "http://www.functx.com";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace request = "http://exist-db.org/xquery/request";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 declare function local:getAnnotations($edition as xs:string, $edition_path as xs:string, $uri as xs:string, $elemIds as xs:string*) as xs:string* {
@@ -42,35 +29,37 @@ declare function local:getAnnotations($edition as xs:string, $edition_path as xs
     for $measureId in $elemIds
     let $uriPlusId := concat($uri, '#', $measureId)
     let $annots := collection($edition_path)//mei:annot/@plist[tokenize(string(.), '\s+') = $uriPlusId]/..
+    
     return
         for $annotation in $annots
         let $id := $annotation/string(@xml:id)
         let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
         let $prio := $annotation/mei:ptr[@type = "priority"]/replace(@target, '#', '')
         let $cat := $annotation/mei:ptr[@type = "categories"]/replace(@target, '#', '')
-        return
+        
+        return (:TODO map instead of concat :)
             concat('
-           	{',
-            '"id": "', $id, '", ',
-            '"measureId": "', $measureId, '", ',
-            '"fn": "loadLink(\"', $uri, '\")", ',
-            '"uri": "', $uri, '", ',
-            '"priority": "', $prio, '", ',
-            '"categories": "', $cat, '"',
-            '}')
+                {',
+                '"id": "', $id, '", ',
+                '"measureId": "', $measureId, '", ',
+                '"fn": "loadLink(\"', $uri, '\")", ',
+                '"uri": "', $uri, '", ',
+                '"priority": "', $prio, '", ',
+                '"categories": "', $cat, '"',
+                '}'
+            )
 };
 
 
 let $edition := request:get-parameter('edition', '')
 let $uri := request:get-parameter('uri', '')
 let $measureIds := request:get-parameter('measureIds', '')
-
 let $edition_path := eutil:getPreference('edition_path', $edition)
 let $annots := local:getAnnotations($edition, $edition_path, $uri, tokenize($measureIds, ','))
 
 return
-    (
-    concat('[',
-    string-join($annots, ','),
-    ']')
+    concat(
+        '[',
+        string-join($annots, ','),
+        ']'
     )

From 63a844de8310adac97a2211cf34784dad58e6fd2 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 01:29:12 +0100
Subject: [PATCH 027/103] Update getAnnotationsInText.xql

---
 add/data/xql/getAnnotationsInText.xql | 74 +++++++++++----------------
 1 file changed, 31 insertions(+), 43 deletions(-)

diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index 7f8d5fb2e..020d5e671 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -1,23 +1,6 @@
 xquery version "1.0";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getAnnotationsInText.xql 1279 2012-03-19 13:16:43Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -26,13 +9,16 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace xlink = "http://www.w3.org/1999/xlink";
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace ft = "http://exist-db.org/xquery/lucene";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
 (:~
@@ -47,39 +33,41 @@ declare function local:findAnnotations($uri as xs:string) as element()* {
     collection('/db/contents')//mei:annot[matches(@plist, $uri)]
 };
 
-
 declare function local:getAnnotations($uriSharp as xs:string, $annotations as element()*) as xs:string* {
     for $annotation in $annotations
     let $id := $annotation/string(@xml:id)
     let $uri := concat('xmldb:exist://', document-uri($annotation/root()), '#', $id)
     let $prio := $annotation/mei:ptr[@type = "priority"]/replace(@target, '#', '')
     let $cat := $annotation/mei:ptr[@type = "categories"]/replace(@target, '#', '')
-    let $plist := for $p in tokenize($annotation/@plist, '\s+')
-    return
-        if (starts-with($p, $uriSharp))
-        then
-            (concat('{id:"', $id, '__', substring-after($p, $uriSharp), '"}'))
-        else
-            ()
+    let $plist :=
+        for $p in tokenize($annotation/@plist, '\s+')
+        return
+            if (starts-with($p, $uriSharp)) then
+                (concat('{id:"', $id, '__', substring-after($p, $uriSharp), '"}'))
+            else
+                ()
     let $plist := string-join($plist, ',')
-    return
+    return (: TODO map instead of concat :)
         concat('
-       	{',
-        'id: "', $id, '", ',
-        'plist: [', $plist, '], ',
-        'svgList: [], ',
-        'fn: "loadLink(\"', $uri, '\")", ',
-        'uri: "', $uri, '", ',
-        'priority: "', $prio, '", ',
-        'categories: "', $cat, '"',
-        '}')
+           	{',
+            'id: "', $id, '", ',
+            'plist: [', $plist, '], ',
+            'svgList: [], ',
+            'fn: "loadLink(\"', $uri, '\")", ',
+            'uri: "', $uri, '", ',
+            'priority: "', $prio, '", ',
+            'categories: "', $cat, '"',
+            '}'
+        )
 };
 
 let $uri := request:get-parameter('uri', '')
 let $uriSharp := concat($uri, '#')
 let $annotations := local:findAnnotations($uri)
 
-return
-    concat('[',
-    string-join(local:getAnnotations($uriSharp, $annotations), ','),
-    ']')
+return (: TODO map instead of concat :)
+    concat(
+        '[',
+        string-join(local:getAnnotations($uriSharp, $annotations), ','),
+        ']'
+    )

From e84433b82827f60a26faab05d73d872bb208b7e0 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 08:53:25 +0100
Subject: [PATCH 028/103] Update getAnnotationsOnPage.xql

---
 add/data/xql/getAnnotationsOnPage.xql | 134 +++++++++++++-------------
 1 file changed, 65 insertions(+), 69 deletions(-)

diff --git a/add/data/xql/getAnnotationsOnPage.xql b/add/data/xql/getAnnotationsOnPage.xql
index a44138060..81c73201e 100644
--- a/add/data/xql/getAnnotationsOnPage.xql
+++ b/add/data/xql/getAnnotationsOnPage.xql
@@ -1,23 +1,6 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getAnnotationsOnPage.xql 1457 2012-10-12 08:05:03Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -27,30 +10,36 @@ xquery version "3.1";
  :  @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
  :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace functx = "http://www.functx.com";
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace xlink = "http://www.w3.org/1999/xlink";
-declare namespace svg = "http://www.w3.org/2000/svg";
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace ft = "http://exist-db.org/xquery/lucene";
-declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace svg = "http://www.w3.org/2000/svg";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
-(: Returns a JSON array of annotations
+(:~
+ : Returns a JSON array of annotations
+ :
+ : @param $sourceUriSharp the xmldb-uri of a mei-source with a trailing #
+ : @param $surfaceId the xml:id of a mei:surface element
+ : @param $annotations the mei:annotation elements to consider
  :
- : @param sourceUriSharp the xmldb-uri of a mei-source with a trailing #
- : @param surfaceId the xml:id of a mei:surface element
- : @param annotations the mei:annotation elements to consider
  : @returns a JSON array of annotations
  :)
-
 declare function local:getAnnotations($sourceUriSharp as xs:string, $surfaceId as xs:string, $annotations as element()*, $elems as element()*) as map(*)* {
     for $annotation in $annotations
     let $id := $annotation/string(@xml:id)
@@ -59,20 +48,19 @@ declare function local:getAnnotations($sourceUriSharp as xs:string, $surfaceId a
     let $prio := $annotation/mei:ptr[@type = "priority"]/replace(@target, '#', '') || $classes[starts-with(., 'ediromAnnotPrio')]
     let $cat := $annotation/mei:ptr[@type = "categories"]/replace(@target, '#', '') || string-join($classes[contains(., 'annotation.category.')], ' ')
     let $plist.raw :=
-    for $p in tokenize(normalize-space($annotation/@plist), ' ')
-    let $p.noSharp := replace($p, '#', '')
-    return
-        if (starts-with($p, $sourceUriSharp))
-        then
-            (substring-after($p, $sourceUriSharp))
-        else
-            if ($elems/@xml:id[. = $p.noSharp] or $elems/@id[. = $p.noSharp])
-            then
-                ($p.noSharp)
+        for $p in tokenize(normalize-space($annotation/@plist), ' ')
+        let $p.noSharp := replace($p, '#', '')
+        return
+            if (starts-with($p, $sourceUriSharp)) then
+                (substring-after($p, $sourceUriSharp))
             else
-                ()
+                if ($elems/@xml:id[. = $p.noSharp] or $elems/@id[. = $p.noSharp]) then
+                    ($p.noSharp)
+                else
+                    ()
     let $svgList := local:getAnnotSVGs($id, $plist.raw, $elems)
     let $plist := local:getParticipants($id, $plist.raw, $elems)
+    
     return
         map {
             'id': $id,
@@ -83,7 +71,6 @@ declare function local:getAnnotations($sourceUriSharp as xs:string, $surfaceId a
             'priority': $prio,
             'categories': $cat
         }
-
 };
 
 (:~
@@ -103,24 +90,26 @@ declare function local:findAnnotations($edition as xs:string, $uri as xs:string,
     let $uriPlusId := concat($uri, '#', $id)
     let $hashId := '#' || $id
     let $annots := collection(eutil:getPreference('edition_path', $edition))//mei:annot
+    
     return
         (:
-                The first predicate with `contains` is just a rough estimate to narrow down the result set.
-                It uses the index and is fast while the second (exact) predicate is generally too slow
-            :)
+         : The first predicate with `contains` is just a rough estimate to narrow down the result set.
+         : It uses the index and is fast while the second (exact) predicate is generally too slow
+         :)
         $annots[contains(@plist, $uriPlusId)][$uriPlusId = tokenize(@plist, '\s')] |
         $annots[contains(@plist, $hashId)][$hashId = tokenize(@plist, '\s')]
     )
 };
 
 (:~
-    Returns a JSON representation of all participants of an annotation
-
-    @param $annotId The id of the annotation to process
-    @param $plist The list of participants referenced by the annotation
-    @param $elem A sequence of elements which could be relevant
-    @returns A JSON representation of the perticipants
-:)
+ : Returns a JSON representation of all participants of an annotation
+ :
+ : @param $annotId The id of the annotation to process
+ : @param $plist The list of participants referenced by the annotation
+ : @param $elem A sequence of elements which could be relevant
+ :
+ : @returns A JSON representation of the perticipants
+ :)
 declare function local:getParticipants($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
     
     let $participants := $elems[@xml:id = $plist]
@@ -139,18 +128,19 @@ declare function local:getParticipants($annoId as xs:string, $plist as xs:string
 };
 
 (:~
-    Returns a JSON representation of all participants of an annotation
-
-    @param $annotId The id of the annotation to process
-    @param $plist The list of participants referenced by the annotation
-    @param $elem A sequence of elements which could be relevant
-    @returns A JSON representation of the perticipants
-:)
+ : Returns a JSON representation of all participants of an annotation
+ :
+ : @param $annotId The id of the annotation to process
+ : @param $plist The list of participants referenced by the annotation
+ : @param $elem A sequence of elements which could be relevant
+ :
+ : @returns A JSON representation of the perticipants
+ :)
 declare function local:getAnnotSVGs($annoId as xs:string, $plist as xs:string*, $elems as element()*) as map(*)* {
     
     let $participants := $elems[@id = $plist]
+    
     return
-        
         for $svg in $participants
         let $id := $svg/@id
         return
@@ -161,23 +151,29 @@ declare function local:getAnnotSVGs($annoId as xs:string, $plist as xs:string*,
 };
 
 (:~
- : Reads the coordinates of an element
+ : Reads the coordinates of an element referenced from an mei:annot/@plist
+ : If the element name is 'measure' or 'staff' theses will be fetched from
+ : a zone referenced with the @facs attribute
+ : If the zone does not have an @ulx attribute or if there is no zone being referenced
+ : the function will return -1 as avalue for all coordinates
  :
  : @param $participant The element to process
+ :
  : @returns A sequence with coordinates (ulx, uly, lrx, lry)
+ : @error A fallback sequence wit -1 as all values: (-1, -1, -1, -1)
 :)
 declare function local:getCoordinates($participant as element()) as xs:integer+ {
-    let $zone := if (name($participant) = 'measure' or name($participant) = 'staff') then
-        ($participant/root()/id(substring($participant/@facs, 2)))
-    else
+
+    let $zone :=
+        if (name($participant) = 'measure' or name($participant) = 'staff') then
+            ($participant/root()/id(substring($participant/@facs, 2)))
+        else
         ($participant)
     return
         if ($zone/@ulx) then
-            (
             (number($zone/@ulx), number($zone/@uly), number($zone/@lrx), number($zone/@lry))
-            )
         else
-            ((-1, -1, -1, -1))
+            (-1, -1, -1, -1)
 };
 
 let $edition := request:get-parameter('edition', '')
@@ -190,10 +186,10 @@ let $surface := $mei/id($surfaceId)
 let $zones := $surface//mei:zone
 
 let $measureLike :=
-for $id in $zones[@type = 'measure' or @type = 'staff']/string(@xml:id)
-let $ref := concat('#', $id)
-return
-    $mei//*[$ref = tokenize(@facs, '\s')]
+    for $id in $zones[@type = 'measure' or @type = 'staff']/string(@xml:id)
+    let $ref := concat('#', $id)
+    return
+        $mei//*[$ref = tokenize(@facs, '\s')]
 
 let $svgLike := $surface//svg:svg
 

From 662dc5214480278fef554a8558fa2436c2cb244d Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:28:27 +0100
Subject: [PATCH 029/103] Update getAnnotationText.xql

---
 add/data/xql/getAnnotationText.xql | 44 ++++++++++++------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/add/data/xql/getAnnotationText.xql b/add/data/xql/getAnnotationText.xql
index 7724426f0..3a9e545ba 100644
--- a/add/data/xql/getAnnotationText.xql
+++ b/add/data/xql/getAnnotationText.xql
@@ -1,23 +1,6 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getAnnotationText.xql 1324 2012-05-15 13:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -25,21 +8,30 @@ xquery version "1.0";
 
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
+
+(: IMPORTS ========================================================= :)
+
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace edirom_image = "http://www.edirom.de/ns/image";
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace edirom_image = "http://www.edirom.de/ns/image";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "xhtml";
 declare option output:media-type "text/html";
 
+(: VARIABLE DECLARATIONS =================================================== :)
+
 declare variable $lang := request:get-parameter('lang', '');
 
+(: QUERY BODY ============================================================== :)
 
 let $edition := request:get-parameter('edition', '')
 let $uri := request:get-parameter('uri', '')
@@ -50,10 +42,8 @@ let $annot := $doc/id($internalId)
 
 return
     
-    <div
-        class="annotView">
-        <div
-            class="contentBox">
+    <div class="annotView">
+        <div class="contentBox">
             <h1>{eutil:getLocalizedName($annot, $lang)}</h1>
             {annotation:getContent($annot, '', $edition)}
         </div>

From 535346c455dbfd5120c149f8c9bc1c800cdeb7da Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:28:29 +0100
Subject: [PATCH 030/103] Update getAudioPlayer.xql

---
 add/data/xql/getAudioPlayer.xql | 74 ++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/add/data/xql/getAudioPlayer.xql b/add/data/xql/getAudioPlayer.xql
index 05754f338..c97a58352 100644
--- a/add/data/xql/getAudioPlayer.xql
+++ b/add/data/xql/getAudioPlayer.xql
@@ -1,59 +1,55 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2015 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
-let $docUri := if (contains($uri, '#')) then
-    (substring-before($uri, '#'))
-else
-    ($uri)
+let $docUri :=
+    if (contains($uri, '#')) then
+        (substring-before($uri, '#'))
+    else
+        ($uri)
 let $doc := eutil:getDoc($docUri)
 let $artist := $doc//mei:titleStmt/mei:respStmt/mei:persName[@role = 'artist']
 let $album := $doc//mei:meiHead/mei:fileDesc/mei:sourceDesc/mei:source[1]/mei:titleStmt/mei:title[1]/text()
 let $albumCover := $doc//mei:graphic[@type = 'cover']/string(@target)
-let $records := for $rec in $doc//mei:recording
-let $recSource := $doc//mei:source[@xml:id = substring-after($rec/@decls, '#')]
-let $recTitle := $recSource/mei:titleStmt/mei:title
-let $avFile := $rec/mei:avFile[1]/string(@target)
-return
+let $records :=
+    for $rec in $doc//mei:recording
+    let $recSource := $doc//mei:source[@xml:id = substring-after($rec/@decls, '#')]
+    let $recTitle := $recSource/mei:titleStmt/mei:title
+    let $avFile := $rec/mei:avFile[1]/string(@target)
+    return
+    (:TODO map instead of concatenation :)
     '{
-    					"name": "' || replace($recTitle, '"', '\\"') || '"
-    					,"artist": "' || replace($artist, '"', '\\"') || '"
-    					,"album": "' || replace($album, '"', '\\"') || '"
-    					,"url": "' || $avFile || '"
-    					,"live": false' ||
-    ',"cover_art_url": "' || $albumCover || '"' || '
-				    }'
+        "name": "' || replace($recTitle, '"', '\\"') || '"
+        ,"artist": "' || replace($artist, '"', '\\"') || '"
+        ,"album": "' || replace($album, '"', '\\"') || '"
+        ,"url": "' || $avFile || '"
+        ,"live": false' ||
+        ',"cover_art_url": "' || $albumCover || '"' || '
+    }'
 
 let $audioConfig := '{
-			"songs": [' ||
-string-join($records, ', ')
-|| '],
-			"default_album_art": "../../resources/img/no-cover.png"
-		}'
+    "songs": [' ||
+        string-join($records, ', ')
+    || '],
+    "default_album_art": "../../resources/img/no-cover.png"
+}'
 
 return
     <html>

From 612c0c63b282960d1d8c5c6e6572692b45dba2c6 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:28:35 +0100
Subject: [PATCH 031/103] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ec7318e50..bbae373f1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -74,7 +74,11 @@ All `declare option` statements.
 (: VARIABLE DECLARATIONS =========================================== :)
 
 ```
+or
+```xquery
+(: VARIABLE DECLARATIONS =================================================== :)
 
+```
 1. Use `declare variable` statements for all required external parameters
 2. All global variable declarations, i.e. `declare variable` statements.
 3. Separate these two groups with a blank line.
@@ -113,9 +117,22 @@ as xs:string
 }
 ```
 
+### Query body
+
+The Query body start after a structuring comment as follows:
+
+```xquery
+(: QUERY BODY ============================================================== :)
+
+```
+
+#### Strings
+
+Note: this is derived from the current usage in Edirom-Online code
 
-### XQuery body
+* escape with U+00027 APOSTROPHE: `'`
 
-* Strings: escape with U+00027 APOSTROPHE: `'`
+### Literal results
 
+TODO: how should literal result be indented, especially when they are long, e.g., as in the case of [getAudioPlayer.xql](add/data/xql/getAudioPlayer.xql).
 

From f69f710bdb32c452f6c6137b22d4a415c117a1aa Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:42:54 +0100
Subject: [PATCH 032/103] Update getChapters.xql

---
 add/data/xql/getChapters.xql | 193 +++++++++++++++--------------------
 1 file changed, 83 insertions(+), 110 deletions(-)

diff --git a/add/data/xql/getChapters.xql b/add/data/xql/getChapters.xql
index 4f47e9a4e..ba04e7b21 100644
--- a/add/data/xql/getChapters.xql
+++ b/add/data/xql/getChapters.xql
@@ -1,154 +1,127 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getChapters.xql 1460 2012-10-15 15:58:35Z niko $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function local:changeFormat($n) as xs:string {
-    if ($n = '1')
-    then
+(:TODO replace with fn:format-integer:)
+    if ($n = '1') then
         ('I')
+    else if ($n = '2') then
+        ('II')
+    else if ($n = '3') then
+        ('III')
+    else if ($n = '4') then
+        ('IV')
+    else if ($n = '5') then
+        ('V')
+    else if ($n = '6') then
+        ('VI')
+    else if ($n = '7') then
+        ('VII')
+    else if ($n = '8') then
+        ('VIII')
+    else if ($n = '9') then
+        ('IX')
     else
-        if ($n = '2')
-        then
-            ('II')
-        else
-            if ($n = '3')
-            then
-                ('III')
-            else
-                if ($n = '4')
-                then
-                    ('IV')
-                else
-                    if ($n = '5')
-                    then
-                        ('V')
-                    else
-                        if ($n = '6')
-                        then
-                            ('VI')
-                        else
-                            if ($n = '7')
-                            then
-                                ('VII')
-                            else
-                                if ($n = '8')
-                                then
-                                    ('VIII')
-                                else
-                                    if ($n = '9')
-                                    then
-                                        ('IX')
-                                    else
-                                        ($n)
+        ($n)
 };
 
 let $uri := request:get-parameter('uri', '')
 let $mode := request:get-parameter('mode', '')
 let $tei := eutil:getDoc($uri)/root()
 
-let $ret := for $elem in $tei//tei:div[@type = 'chapter'] | $tei//tei:div1 | $tei//tei:milestone[@unit = 'number'] | $tei//tei:div[@type = 'act']
-let $pageId := if ($mode = 'pageMode') then
-    (substring-after($elem/preceding::tei:pb[1]/@facs, '#'))
-else
-    ('-1')
-return
-    if (($elem/local-name() = 'div' and $elem[@type = 'chapter']) or $elem/local-name() = 'div1')
-    then
-        (
-        let $chapter := $elem
-        let $n := if ($chapter/@n) then
-            (concat($chapter/@n, ': '))
+let $ret :=
+    for $elem in $tei//tei:div[@type = 'chapter'] |
+        $tei//tei:div1 | $tei//tei:milestone[@unit = 'number'] |
+        $tei//tei:div[@type = 'act']
+    let $pageId :=
+        if ($mode = 'pageMode') then
+            (substring-after($elem/preceding::tei:pb[1]/@facs, '#'))
         else
-            ('')
-        let $label := if ($chapter/tei:head) then
-            ($chapter/tei:head)
-        else
-            ($chapter/text())
-        let $label := if (string-length($label) > 30) then
-            (concat(substring($label, 1, 30), '…'))
-        else
-            ($label)
-        return
-            concat('{',
-            'id: "', $chapter/string(@xml:id), '", ',
-            'name: "', concat($n, $label), '", ',
-            'pageId: "', $pageId, '"',
-            '}')
-        )
-    else
-        if ($elem/local-name() = 'milestone' and $elem[@unit = 'number'])
-        then
-            (
+            ('-1')
+    return
+        if (($elem/local-name() = 'div' and $elem[@type = 'chapter']) or $elem/local-name() = 'div1') then (
+            let $chapter := $elem
+            let $n :=
+                if ($chapter/@n) then
+                    (concat($chapter/@n, ': '))
+                else
+                    ('')
+                let $label := if ($chapter/tei:head) then
+                    ($chapter/tei:head)
+                else
+                    ($chapter/text())
+            let $label :=
+                if (string-length($label) > 30) then
+                    (concat(substring($label, 1, 30), '…'))
+                else
+                    ($label)
+            return
+                (:TODO map instead of concat :)
+                concat('{',
+                    'id: "', $chapter/string(@xml:id), '", ',
+                    'name: "', concat($n, $label), '", ',
+                    'pageId: "', $pageId, '"',
+                '}')
+        ) else if ($elem/local-name() = 'milestone' and $elem[@unit = 'number']) then (
             let $numbers := $elem
             let $n := concat('No. ', $numbers/@n)
-                order by $numbers/number(replace(@n, '\D', '')),
-                    $numbers/@n
+            order by $numbers/number(replace(@n, '\D', '')), $numbers/@n
             return
+                (:TODO map instead of concat :)
                 concat('{',
-                'id: "', $numbers/string(@xml:id), '", ',
-                'name: "', $n, '", ',
-                'pageId: "', $pageId, '"',
+                    'id: "', $numbers/string(@xml:id), '", ',
+                    'name: "', $n, '", ',
+                    'pageId: "', $pageId, '"',
                 '}')
-            )
-        else
-            if ($elem/local-name() = 'div' and $elem[@type = 'act'])
-            then
-                (
-                let $act := $elem
-                let $label := local:changeFormat($act/@n)
-                return
-                    for $scene in $act//tei:div[@type = 'scene']
-                    let $label := $label || ' - ' || string-join(for $t in $scene/tei:head//text()
+        ) else if ($elem/local-name() = 'div' and $elem[@type = 'act']) then (
+            let $act := $elem
+            let $label := local:changeFormat($act/@n)
+            return
+                for $scene in $act//tei:div[@type = 'scene']
+                let $label := $label || ' - ' || string-join(
+                    for $t in $scene/tei:head//text()
                     return
                         if (matches($t, '\w')) then
                             ($t)
                         else
                             (), '')
-                    let $label := if (string-length($label) > 40) then
+                let $label :=
+                    if (string-length($label) > 40) then
                         (concat(substring($label, 1, 40), '…'))
                     else
                         ($label)
-                    let $pageId := if ($mode = 'pageMode') then
+                let $pageId :=
+                    if ($mode = 'pageMode') then
                         (substring-after($scene/preceding::tei:pb[1]/@facs, '#'))
                     else
                         ('-1')
-                    return
-                        concat('{',
+                return
+                    concat('{',
                         '"id": "', $scene/string(@xml:id), '", ',
                         '"name": "', $label, '", ',
                         'pageId: "', $pageId, '"',
-                        '}')
-                )
-            else
-                ()
+                    '}')
+        ) else
+            ()
 
 return
     concat('[', string-join($ret, ','), ']')

From 1713294470387df7e1034ddc73ad5ccd2f3034d3 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:49:01 +0100
Subject: [PATCH 033/103] Update getConcordances.xql

---
 add/data/xql/getConcordances.xql | 112 ++++++++++++++-----------------
 1 file changed, 52 insertions(+), 60 deletions(-)

diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index e2bf1697f..fc209995f 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -1,79 +1,73 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getConcordances.xql 1219 2012-01-20 08:33:28Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace edirom = "http://www.edirom.de/ns/1.3";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $lang := request:get-parameter('lang', '');
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function local:getGroups($parent) {
-    if ($parent/edirom:groups)
-    then
-        (
-        concat('{', 'label: "', eutil:getLocalizedName($parent/edirom:groups, $lang), '", groups: [', local:getSingleGroups($parent/edirom:groups), ']}')
+    if ($parent/edirom:groups) then (
+        concat('
+            {', 'label: "', eutil:getLocalizedName($parent/edirom:groups, $lang),
+            '", groups: [', local:getSingleGroups($parent/edirom:groups), ']}'
         )
-    else
+    ) else
         (string('null'))
 };
 
 declare function local:getSingleGroups($parent) {
     string-join(
-    for $group in $parent/edirom:group
-    return
-        concat('
+        for $group in $parent/edirom:group
+        return
+            concat('
                 {',
-        'name: "', eutil:getLocalizedName($group, $lang), '", ',
-        'connections: ', local:getConnections($group),
-        '}')
+                    'name: "', eutil:getLocalizedName($group, $lang), '", ',
+                    'connections: ', local:getConnections($group),
+                '}')
     , ',')
 };
 
 declare function local:getConnections($parent) {
-    if ($parent/edirom:connections)
-    then
-        (
-        concat('{', 'label: "', eutil:getLocalizedName($parent/edirom:connections, $lang), '", connections: [', local:getSingleConnections($parent/edirom:connections), ']}')
+    if ($parent/edirom:connections) then (
+        concat(
+            '{',
+                'label: "', eutil:getLocalizedName($parent/edirom:connections, $lang), '",
+                connections: [', local:getSingleConnections($parent/edirom:connections),
+            ']}'
         )
-    else
+    ) else
         (string('null'))
 };
 
 declare function local:getSingleConnections($parent) {
     string-join(
-    for $connection in $parent/edirom:connection
-    return
-        concat('
+        for $connection in $parent/edirom:connection
+        return
+            concat('
                 {',
-        'name: "', $connection/string(@name), '", ',
-        'plist: "', $connection/@plist, '"',
-        '}')
+                    'name: "', $connection/string(@name), '", ',
+                    'plist: "', $connection/@plist, '"',
+                '}')
     , ',')
 };
 
@@ -83,20 +77,18 @@ let $workId := request:get-parameter('workId', '')
 let $work := $mei/id($workId)
 let $concordances := $work//edirom:concordance
 
-return
-    (
-    concat('[',
-    
-    string-join(
-    for $concordance in $concordances
-    return
-        concat('
-                {',
-        'name: "', eutil:getLocalizedName($concordance, $lang), '", ',
-        'groups: ', local:getGroups($concordance), ', ',
-        'connections: ', local:getConnections($concordance),
-        '}')
-    , ','),
-    
+return (
+    concat(
+        '[',
+        string-join(
+            for $concordance in $concordances
+            return
+                concat('
+                    {',
+                        'name: "', eutil:getLocalizedName($concordance, $lang), '", ',
+                        'groups: ', local:getGroups($concordance), ', ',
+                        'connections: ', local:getConnections($concordance),
+                    '}')
+        , ','),
     ']')
-    )
+)

From 4bb96b3e615756cd39de19237e5fa77ae7180a0b Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:52:16 +0100
Subject: [PATCH 034/103] Update getConcordances.xql

---
 add/data/xql/getConcordances.xql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index fc209995f..a687342b8 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -71,6 +71,8 @@ declare function local:getSingleConnections($parent) {
     , ',')
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $id := request:get-parameter('id', '')
 let $mei := doc($id)/root()
 let $workId := request:get-parameter('workId', '')

From 7276be62ff434cb9b3146a6641c08fac27ac6a17 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:52:26 +0100
Subject: [PATCH 035/103] Update getEdition.xql

---
 add/data/xql/getEdition.xql | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/add/data/xql/getEdition.xql b/add/data/xql/getEdition.xql
index 5d54a70b3..6851fce4f 100644
--- a/add/data/xql/getEdition.xql
+++ b/add/data/xql/getEdition.xql
@@ -1,23 +1,6 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getEdition.xql 1324 2012-05-15 13:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -26,10 +9,17 @@ xquery version "1.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('id', '')
 return
+    (:TODO use map an serialization options :)
     edition:toJSON($uri)

From 434607a6b32587761b3834b0e5b15e8adc657894 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:54:02 +0100
Subject: [PATCH 036/103] Update getEditionURI.xql

---
 add/data/xql/getEditionURI.xql | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/add/data/xql/getEditionURI.xql b/add/data/xql/getEditionURI.xql
index 1f7597c58..2b001670b 100644
--- a/add/data/xql/getEditionURI.xql
+++ b/add/data/xql/getEditionURI.xql
@@ -1,21 +1,6 @@
 xquery version "3.0";
 (:
-  Edirom Online
-  Copyright (C) 2014 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -24,14 +9,19 @@ xquery version "3.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 return
-    if (doc-available($uri))
-    then
+    if (doc-available($uri)) then
         ($uri)
     else
         (edition:findEdition($uri))

From d73e8c5b30da75275d64dce32639f269a14c1d93 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 09:56:40 +0100
Subject: [PATCH 037/103] Update getExtendedStaff.xql

---
 add/data/xql/getExtendedStaff.xql | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/add/data/xql/getExtendedStaff.xql b/add/data/xql/getExtendedStaff.xql
index 19dfa2813..c438f5aa2 100644
--- a/add/data/xql/getExtendedStaff.xql
+++ b/add/data/xql/getExtendedStaff.xql
@@ -1,22 +1,32 @@
-xquery version "3.0";
+xquery version "3.1";
 
-declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
+(:
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
 
-declare namespace tei = "http://www.tei-c.org/ns/1.0";
-declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+(: IMPORTS ========================================================= :)
+
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace system = "http://exist-db.org/xquery/system";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace transform = "http://exist-db.org/xquery/transform";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $edition := request:get-parameter('edition', '')
 let $basePath := eutil:get-app-base-url()
 
-
 let $mei := doc($uri)/root()
 let $mdivId := $mei//mei:mdiv[1]/data(@xml:id)
 return

From 2229284a7774573585cdc02e87ff010c44b7cb0b Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 10:20:09 +0100
Subject: [PATCH 038/103] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bbae373f1..4543c164d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -136,3 +136,9 @@ Note: this is derived from the current usage in Edirom-Online code
 
 TODO: how should literal result be indented, especially when they are long, e.g., as in the case of [getAudioPlayer.xql](add/data/xql/getAudioPlayer.xql).
 
+### let statements
+
+Short variable definitions should be in a single line
+
+```xquery
+let $lang := 'de'

From 12fd00be3d5c3f51fb8c5a65b41cd26f1912b817 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 10:25:37 +0100
Subject: [PATCH 039/103] Update getHeader.xql

---
 add/data/xql/getHeader.xql | 105 +++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 58 deletions(-)

diff --git a/add/data/xql/getHeader.xql b/add/data/xql/getHeader.xql
index 6e61ad42c..f5a8b16ef 100644
--- a/add/data/xql/getHeader.xql
+++ b/add/data/xql/getHeader.xql
@@ -1,78 +1,67 @@
 xquery version "1.0";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getHeader.xql 1455 2012-10-11 10:42:55Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace tei = "http://www.tei-c.org/ns/1.0";
-declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace system = "http://exist-db.org/xquery/system";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace transform = "http://exist-db.org/xquery/transform";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $type := request:get-parameter('type', '')
-let $docUri := if (contains($uri, '#')) then
-    (substring-before($uri, '#'))
-else
-    ($uri)
+let $docUri :=
+    if (contains($uri, '#')) then
+        (substring-before($uri, '#'))
+    else
+        ($uri)
 let $doc := eutil:getDoc($docUri)
 let $lang := request:get-parameter('lang', 'de')
 
 let $base := concat(replace(system:get-module-load-path(), 'embedded-eXist-server', ''), '/../xslt/') (: TODO: Prüfen, wie wir an dem replace vorbei kommen:)
 
 return
-    if ($type = 'work')
-    then
-        (transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param
-                name="base"
-                value="{$base}"/><param
-                name="lang"
-                value="{$lang}"/></parameters>))
-    else
-        if ($type = 'source')
-        then
-            (transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param
-                    name="base"
-                    value="{$base}"/><param
-                    name="lang"
-                    value="{$lang}"/></parameters>))
-        else
-            if ($type = 'recording')
-            then
-                (transform:transform($doc, concat($base, 'meiHead2HTML.xsl'), <parameters><param
-                        name="base"
-                        value="{$base}"/><param
-                        name="lang"
-                        value="{$lang}"/></parameters>))
-            else
-                if ($type = 'text')
-                then
-                    (transform:transform($doc, concat($base, 'teiHeader2HTML.xsl'), <parameters><param
-                            name="base"
-                            value="{$base}"/><param
-                            name="lang"
-                            value="{$lang}"/></parameters>))
-                else
-                    ()
+    if ($type = 'work') then (
+        transform:transform($doc, concat($base, 'meiHead2HTML.xsl'),
+            <parameters>
+                <param name="base" value="{$base}"/>
+                <param name="lang" value="{$lang}"/>
+            </parameters>
+        )
+    ) else if ($type = 'source') then (
+        transform:transform($doc, concat($base, 'meiHead2HTML.xsl'),
+            <parameters>
+                <param name="base" value="{$base}"/>
+                <param name="lang" value="{$lang}"/>
+            </parameters>
+        )
+    ) else if ($type = 'recording') then (
+        transform:transform($doc, concat($base, 'meiHead2HTML.xsl'),
+            <parameters>
+                <param name="base" value="{$base}"/>
+                <param name="lang" value="{$lang}"/>
+            </parameters>
+        )
+    ) else if ($type = 'text') then (
+        transform:transform($doc, concat($base, 'teiHeader2HTML.xsl'),
+            <parameters>
+                <param name="base" value="{$base}"/>
+                <param name="lang" value="{$lang}"/>
+            </parameters>
+        )
+    ) else
+        ()

From 7d18339fe9b0ca042911d9ef5deee3041c06871a Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 10:26:00 +0100
Subject: [PATCH 040/103] Update getHeader.xql

---
 add/data/xql/getHeader.xql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add/data/xql/getHeader.xql b/add/data/xql/getHeader.xql
index f5a8b16ef..3ea3ccaca 100644
--- a/add/data/xql/getHeader.xql
+++ b/add/data/xql/getHeader.xql
@@ -1,4 +1,4 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)

From 3ea9303ddf9989a897529c03337119324c0753ff Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 10:29:54 +0100
Subject: [PATCH 041/103] Update getHelp.xql

---
 add/data/xql/getHelp.xql | 63 ++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
index 420249972..dd9eaefe9 100644
--- a/add/data/xql/getHelp.xql
+++ b/add/data/xql/getHelp.xql
@@ -1,26 +1,14 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $lang := request:get-parameter('lang', 'en')
 let $idPrefix := request:get-parameter('idPrefix', '')
 
@@ -29,24 +17,29 @@ let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '')
 let $doc := doc(concat('../../help/help_', $lang, '.xml'))
 
 let $xsl := doc('../xslt/edirom_langReplacement.xsl')
-let $doc := transform:transform($doc, $xsl, <parameters><param
-        name="base"
-        value="{concat($base, '/../xslt/')}"/><param
-        name="lang"
-        value="{$lang}"/></parameters>)
+let $doc := 
+    transform:transform($doc, $xsl,
+        <parameters>
+            <param name="base" value="{concat($base, '/../xslt/')}"/>
+            <param name="lang" value="{$lang}"/>
+        </parameters>
+    )
 
 let $xsl := doc('../xslt/teiBody2HTML.xsl')
-let $doc := transform:transform($doc, $xsl, <parameters><param
-        name="base"
-        value="{concat($base, '/../xslt/')}"/><param
-        name="lang"
-        value="{$lang}"/><param
-        name="tocDepth"
-        value="1"/><param
-        name="graphicsPrefix"
-        value="help/"/></parameters>)
+let $doc :=
+    transform:transform($doc, $xsl,
+        <parameters>
+            <param name="base" value="{concat($base, '/../xslt/')}"/>
+            <param name="lang" value="{$lang}"/>
+            <param name="tocDepth" value="1"/>
+            <param name="graphicsPrefix" value="help/"/>
+        </parameters>
+    )
 
 return
-    transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param
-            name="idPrefix"
-            value="{$idPrefix}"/></parameters>)
+    transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'),
+        <parameters>
+            <param name="idPrefix" value="{$idPrefix}"/>
+        </parameters>
+    )
+

From 58617d790335f2736da54b4ad0ac879a7cdd60df Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 11:02:06 +0100
Subject: [PATCH 042/103] Update getiFrameURL.xql

---
 add/data/xql/getiFrameURL.xql | 45 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/add/data/xql/getiFrameURL.xql b/add/data/xql/getiFrameURL.xql
index 151980fe5..a9714066d 100644
--- a/add/data/xql/getiFrameURL.xql
+++ b/add/data/xql/getiFrameURL.xql
@@ -1,36 +1,35 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2016 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getiFrameURL.xql 1455 2012-10-11 10:42:55Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
-let $uri := replace($uri, 'xmldb:exist:///db/', concat(request:get-scheme(), '://', request:get-server-name(), ':', request:get-server-port(), '/'))
+let $uri :=
+    replace($uri,
+        'xmldb:exist:///db/',
+        concat(
+            request:get-scheme(),
+            '://',
+            request:get-server-name(),
+            ':',
+            request:get-server-port(),
+            '/'
+        )
+    )
+    
 return
-    if (contains(request:get-url(), '/exist/'))
-    then
+    if (contains(request:get-url(), '/exist/')) then
         (replace($uri, '/apps', '/exist/apps'))
     else
         ($uri)
-

From 2b15ac5ffbbeefb63272d844edd6dc338ecc942e Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 11:06:07 +0100
Subject: [PATCH 043/103] Update getInternalIdType.xql

---
 add/data/xql/getInternalIdType.xql | 99 ++++++++++++------------------
 1 file changed, 40 insertions(+), 59 deletions(-)

diff --git a/add/data/xql/getInternalIdType.xql b/add/data/xql/getInternalIdType.xql
index e3312e50f..1719ab8cf 100644
--- a/add/data/xql/getInternalIdType.xql
+++ b/add/data/xql/getInternalIdType.xql
@@ -1,81 +1,62 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
 
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+(: IMPORTS ========================================================= :)
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+import module namespace functx = "http://www.functx.com";
 
-  ID: $Id: getInternalIdType.xql 1289 2012-03-26 13:11:43Z daniel $
-:)
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 
-import module namespace functx = "http://www.functx.com";
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
-let $uri := request:get-parameter('uri', '')
-let $docUri := if (contains($uri, '#')) then
-    (substring-before($uri, '#'))
-else
-    ($uri)
-let $internalId := if (contains($uri, '#')) then
-    (substring-after($uri, '#'))
-else
-    ()
-let $internalId := if (contains($internalId, '?')) then
-    (substring-before($internalId, '?'))
-else
-    ($internalId)
+(: QUERY BODY ============================================================== :)
 
+let $uri := request:get-parameter('uri', '')
+let $docUri :=
+    if (contains($uri, '#')) then
+        (substring-before($uri, '#'))
+    else
+        ($uri)
+let $internalId :=
+    if (contains($uri, '#')) then
+        (substring-after($uri, '#'))
+    else
+        ()
+let $internalId :=
+    if (contains($internalId, '?')) then
+        (substring-before($internalId, '?'))
+    else
+        ($internalId)
 let $doc := doc($docUri)
 let $internal := $doc/id($internalId)
 
 (: Specific handling of virtual measure IDs for parts in OPERA project :)
-let $internal := if (exists($internal)) then
-    ($internal)
-else
-    (
-    if (starts-with($internalId, 'measure_') and $doc//mei:parts)
-    then
-        (
-        let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
-        let $measureN := functx:substring-after-last($internalId, '_')
-        return
-            (
-            if (
-            $doc/id($mdivId)//mei:measure/@label
-            )
-            then
-                (
-                $doc/id($mdivId)//mei:measure[@label eq $measureN][1]
-                )
-            else
-                (
-                $doc/id($mdivId)//mei:measure[@n eq $measureN][1]
-                )
-            )
-        )
-    else
+let $internal :=
+    if (exists($internal)) then
         ($internal)
+    else (
+        if (starts-with($internalId, 'measure_') and $doc//mei:parts) then (
+            let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
+            let $measureN := functx:substring-after-last($internalId, '_')
+            return (
+                if ($doc/id($mdivId)//mei:measure/@label) then
+                    $doc/id($mdivId)//mei:measure[@label eq $measureN][1]
+                else
+                    $doc/id($mdivId)//mei:measure[@n eq $measureN][1]
+            )
+        ) else
+            ($internal)
     )
 
 return
-    if (exists($internal))
-    then
+    if (exists($internal)) then
         (local-name($internal))
     else
         ('unknown')

From 64bac05ef3efdca72556a2a9abc207f48c090d16 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 11:10:20 +0100
Subject: [PATCH 044/103] Update getLanguageFile.xql

---
 add/data/xql/getLanguageFile.xql | 74 +++++++++++++-------------------
 1 file changed, 31 insertions(+), 43 deletions(-)

diff --git a/add/data/xql/getLanguageFile.xql b/add/data/xql/getLanguageFile.xql
index 0f2702a28..b52ff4528 100644
--- a/add/data/xql/getLanguageFile.xql
+++ b/add/data/xql/getLanguageFile.xql
@@ -1,37 +1,28 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getLanguageFile.xql 1455 2012-10-11 10:42:55Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
-    Returns a language file as JSON or XML.
+ : Returns a language file as JSON or XML.
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ :)
 
-    @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-:)
+(: IMPORTS ========================================================= :)
+
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 
-import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $lang := request:get-parameter('lang', '')
 let $mode := request:get-parameter('mode', '')
 let $edition := request:get-parameter('edition', '')
@@ -43,25 +34,22 @@ let $file := doc(concat('../locale/edirom-lang-', $lang, '.xml'))
 let $projectFile := doc(edition:getLanguageFileURI($edition, $lang))
 
 return
-    if ($mode = 'json')
-    then
-        (
-        concat('{',
-        'lang: "', $file/langFile/lang/text(), '",',
-        'version: "', $file/langFile/version/text(), '",',
-        'keys: {',
-        string-join((
-        for $entry in $file//entry
-        return
-            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-        
-        ,
-        for $entry in $projectFile//entry
-        return
-            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-        ), ','),
-        '}',
-        '}')
+    if ($mode = 'json') then (
+        concat(
+            '{',
+            'lang: "', $file/langFile/lang/text(), '",',
+            'version: "', $file/langFile/version/text(), '",',
+            'keys: {',
+                string-join((
+                    for $entry in $file//entry
+                    return
+                        concat('"', $entry/string(@key), '":"', $entry/string(@value), '"'),
+                    for $entry in $projectFile//entry
+                    return
+                        concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
+                ), ','),
+            '}',
+            '}'
         )
-    else
+    ) else
         ($file)

From 42f0c9ebb10af655dbadeee45aff34abaf031922 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Fri, 2 Feb 2024 11:30:28 +0100
Subject: [PATCH 045/103] Update getLinkTarget.xql

---
 add/data/xql/getLinkTarget.xql | 483 ++++++++++++++++-----------------
 1 file changed, 229 insertions(+), 254 deletions(-)

diff --git a/add/data/xql/getLinkTarget.xql b/add/data/xql/getLinkTarget.xql
index ed8e100d3..48822ed96 100644
--- a/add/data/xql/getLinkTarget.xql
+++ b/add/data/xql/getLinkTarget.xql
@@ -3,11 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-declare namespace html = "http://www.w3.org/1999/xhtml";
-declare namespace map = "http://www.w3.org/2005/xpath-functions/map";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
-declare namespace tei = "http://www.tei-c.org/ns/1.0";
+(: IMPORTS ========================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 import module namespace request = "http://exist-db.org/xquery/request";
@@ -18,118 +14,105 @@ import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm
 import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
 import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+declare namespace html = "http://www.w3.org/1999/xhtml";
+declare namespace map = "http://www.w3.org/2005/xpath-functions/map";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option output:method "json";
 declare option output:media-type "application/json";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $lang := request:get-parameter('lang', '');
 declare variable $uri := request:get-parameter('uri', '');
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 (:~
  : Returns a view for an edirom object
  :)
 declare function local:getView($type as xs:string, $docUri as xs:string, $doc as node()+) as map(*)? {
     let $baseMap := map {
         'type': substring-after($type, '_'),
-        'uri': if ($type = ('mei_textView', 'desc_xmlView')) then
-            string(($doc//mei:annot[@type = 'descLink'])[1]/@plist)
-        else
-            $docUri
+        'uri':if ($type = ('mei_textView', 'desc_xmlView')) then
+                string(($doc//mei:annot[@type = 'descLink'])[1]/@plist)
+              else
+                $docUri
     }
     
     (: optionally set label for some views:)
     let $labeled.map :=
-    if ($type = 'mei_textView')
-    then
-        (map:put($baseMap, 'label', 'Quellenbeschreibung'))
-    else
-        if ($type = 'desc_xmlView')
-        then
+        if ($type = 'mei_textView') then
+            (map:put($baseMap, 'label', 'Quellenbeschreibung'))
+        else if ($type = 'desc_xmlView') then
             (map:put($baseMap, 'label', 'XML Quellenbeschreibung'))
         else
             ($baseMap)
             
-            (: whether to set the view as default view:)
+    (: whether to set the view as default view:)
     let $defaultViewed.map :=
-    if ($type = ('mei_sourceView',
-    'mei_audioView',
-    'tei_textView',
-    'tei_facsimileView',
-    'tei_textFacsimileSplitView',
-    'mei_annotationView',
-    'mei_verovioView'))
-    then
-        (map:put($labeled.map, 'defaultView', true()))
-    else
-        ($labeled.map)
-        
+        if ($type = (
+                'mei_sourceView',
+                'mei_audioView',
+                'tei_textView',
+                'tei_facsimileView',
+                'tei_textFacsimileSplitView',
+                'mei_annotationView',
+                'mei_verovioView')
+        ) then
+            (map:put($labeled.map, 'defaultView', true()))
+        else
+            ($labeled.map)
         
-        (: xpath check whether any given view is supported :)
+    (: xpath check whether any given view is supported :)
     let $hasView :=
-    if ($type = 'desc_summaryView')
-    then
-        (true())
-    
-    else
-        if ($type = 'desc_headerView')
-        then
+        if ($type = 'desc_summaryView') then
+            (true())
+        
+        else if ($type = 'desc_headerView') then
             (exists($doc//mei:meiHead or $doc//tei:teiHeader))
         
-        else
-            if ($type = 'mei_textView')
-            then
-                (exists($doc//mei:annot[@type = 'descLink']))
+        else if ($type = 'mei_textView') then
+            (exists($doc//mei:annot[@type = 'descLink']))
+        
+        else if ($type = 'mei_sourceView') then
+            (exists($doc//mei:facsimile//mei:graphic[@type = 'facsimile']))
+        
+        else if ($type = 'mei_audioView') then
+            (exists($doc//mei:recording))
+        
+        else if ($type = 'mei_verovioView') then
+            (exists($doc//mei:body//mei:measure) and exists($doc//mei:body//mei:note))
+        
+        else if ($type = 'tei_textView') then
+            (exists($doc//tei:body[matches(.//text(), '[^\s]+')]))
+        
+        else if ($type = 'tei_facsimileView') then
+            (exists($doc//tei:facsimile//tei:graphic))
+        
+        else if ($type = 'tei_textFacsimileSplitView') then
+            (exists($doc//tei:facsimile//tei:graphic) and exists($doc//tei:pb[@facs]))
+        
+        else if ($type = 'mei_annotationView') then
+            (exists($doc//mei:annot[@type = 'editorialComment']))
+        
+        else if ($type = 'xml_xmlView') then
+            (true())
+        
+        else if ($type = 'desc_xmlView') then
+            (exists($doc//mei:annot[@type = 'descLink']))
             
-            else
-                if ($type = 'mei_sourceView')
-                then
-                    (exists($doc//mei:facsimile//mei:graphic[@type = 'facsimile']))
-                
-                else
-                    if ($type = 'mei_audioView')
-                    then
-                        (exists($doc//mei:recording))
-                    
-                    else
-                        if ($type = 'mei_verovioView')
-                        then
-                            (exists($doc//mei:body//mei:measure) and exists($doc//mei:body//mei:note))
-                        
-                        else
-                            if ($type = 'tei_textView')
-                            then
-                                (exists($doc//tei:body[matches(.//text(), '[^\s]+')]))
-                            
-                            else
-                                if ($type = 'tei_facsimileView')
-                                then
-                                    (exists($doc//tei:facsimile//tei:graphic))
-                                
-                                else
-                                    if ($type = 'tei_textFacsimileSplitView')
-                                    then
-                                        (exists($doc//tei:facsimile//tei:graphic) and exists($doc//tei:pb[@facs]))
-                                    
-                                    else
-                                        if ($type = 'mei_annotationView')
-                                        then
-                                            (exists($doc//mei:annot[@type = 'editorialComment']))
-                                        
-                                        else
-                                            if ($type = 'xml_xmlView')
-                                            then
-                                                (true())
-                                            
-                                            else
-                                                if ($type = 'desc_xmlView')
-                                                then
-                                                    (exists($doc//mei:annot[@type = 'descLink']))
-                                                
-                                                else
-                                                    (false())
+        else
+            (false())
     
     return
-        if ($hasView)
-        then
+        if ($hasView) then
             ($defaultViewed.map)
         else
             ()
@@ -141,24 +124,24 @@ declare function local:getView($type as xs:string, $docUri as xs:string, $doc as
 declare function local:getViews($type as xs:string, $docUri as xs:string, $doc as node()+) as map(*)* {
     
     let $views := (
-    (:'desc_summaryView',:)
-    (:'desc_headerView',:)
-    'mei_textView',
-    'mei_sourceView',
-    'mei_audioView',
-    'mei_verovioView',
-    'tei_textView',
-    'tei_facsimileView',
-    'tei_textFacsimileSplitView',
-    'mei_annotationView',
-    'xml_xmlView',
-    'desc_xmlView'
+        (:'desc_summaryView',:)
+        (:'desc_headerView',:)
+        'mei_textView',
+        'mei_sourceView',
+        'mei_audioView',
+        'mei_verovioView',
+        'tei_textView',
+        'tei_facsimileView',
+        'tei_textFacsimileSplitView',
+        'mei_annotationView',
+        'xml_xmlView',
+        'desc_xmlView'
     )
     
     let $maps :=
-    for $view in $views
-    return
-        local:getView($view, $docUri, $doc)
+        for $view in $views
+        return
+            local:getView($view, $docUri, $doc)
     
     return
         $maps
@@ -168,179 +151,171 @@ declare function local:getViews($type as xs:string, $docUri as xs:string, $doc a
  : Returns the window title for an edirom-object
  :)
 declare function local:getWindowTitle($doc as node()+, $type as xs:string) as xs:string {
+    
     (: Work :)
-    if (exists($doc//mei:mei) and exists($doc//mei:workDesc/mei:work) and not(exists($doc//mei:perfMedium)))
-    then
+    if (exists($doc//mei:mei) and exists($doc//mei:workDesc/mei:work) and not(exists($doc//mei:perfMedium))) then
         (eutil:getLocalizedTitle(($doc//mei:work)[1]/mei:titleStmt[1], $lang))
+    else if (exists($doc/root()/mei:work)) then
+        (eutil:getLocalizedTitle($doc/root()/mei:work, $lang))
+    
+    (: Recording :)
+    else if (exists($doc//mei:mei) and exists($doc//mei:recording)) then
+        (eutil:getLocalizedTitle($doc//mei:fileDesc/mei:titleStmt[1], $lang))
+    
+    (: Source / Score :)
+    else if ($type = 'source' and exists($doc//mei:manifestation/mei:titleStmt)) then
+        (string-join((eutil:getLocalizedTitle(($doc//mei:manifestation)[1]/mei:titleStmt[1], $lang),
+        ($doc//mei:manifestation)[1]//mei:identifier[lower-case(@type) = 'shelfmark'][1]), ' | ')
+        => normalize-space())
+    else if ($type = 'source' and exists($doc//mei:source/mei:titleStmt)) then
+        (string-join((eutil:getLocalizedTitle(($doc//mei:source)[1]/mei:titleStmt[1], $lang),
+        ($doc//mei:source)[1]//mei:identifier[lower-case(@type) = 'shelfmark'][1]), ' | ')
+        => normalize-space())
+    
+    (: MEI fallback if no title is found :)
+    else if (exists($doc//mei:mei) and exists(($doc//mei:titleStmt)[1])) then
+        (eutil:getLocalizedTitle(($doc//mei:titleStmt)[1], $lang))
+    
+    (: Text :)
+    else if (exists($doc/tei:TEI)) then
+        (eutil:getLocalizedTitle($doc//tei:fileDesc/tei:titleStmt[1], $lang))
+    
+    (: HTML :)
+    else if ($type = 'html') then
+        ($doc//head/data(title))
+    
     else
-        if (exists($doc/root()/mei:work))
-        then
-            (eutil:getLocalizedTitle($doc/root()/mei:work, $lang))
-            
-            (: Recording :)
-        else
-            if (exists($doc//mei:mei) and exists($doc//mei:recording))
-            then
-                (eutil:getLocalizedTitle($doc//mei:fileDesc/mei:titleStmt[1], $lang))
-                
-                (: Source / Score :)
-            else
-                if ($type = 'source' and exists($doc//mei:manifestation/mei:titleStmt))
-                then
-                    (string-join((eutil:getLocalizedTitle(($doc//mei:manifestation)[1]/mei:titleStmt[1], $lang),
-                    ($doc//mei:manifestation)[1]//mei:identifier[lower-case(@type) = 'shelfmark'][1]), ' | ')
-                    => normalize-space())
-                else
-                    if ($type = 'source' and exists($doc//mei:source/mei:titleStmt))
-                    then
-                        (string-join((eutil:getLocalizedTitle(($doc//mei:source)[1]/mei:titleStmt[1], $lang),
-                        ($doc//mei:source)[1]//mei:identifier[lower-case(@type) = 'shelfmark'][1]), ' | ')
-                        => normalize-space())
-                        
-                        (: MEI fallback if no title is found :)
-                    else
-                        if (exists($doc//mei:mei) and exists(($doc//mei:titleStmt)[1]))
-                        then
-                            (eutil:getLocalizedTitle(($doc//mei:titleStmt)[1], $lang))
-                            
-                            (: Text :)
-                        else
-                            if (exists($doc/tei:TEI))
-                            then
-                                (eutil:getLocalizedTitle($doc//tei:fileDesc/tei:titleStmt[1], $lang))
-                                
-                                (: HTML :)
-                            else
-                                if ($type = 'html')
-                                then
-                                    ($doc//head/data(title))
-                                
-                                else
-                                    (string('unknown'))
+        (string('unknown'))
 };
 
-let $uriParams := if (contains($uri, '?')) then
-    (substring-after($uri, '?'))
-else
-    ('')
-let $uri := if (contains($uri, '?')) then
-    (replace($uri, '[?&amp;](term|path)=[^&amp;]*', ''))
-else
-    ($uri)
-let $docUri := if (contains($uri, '#')) then
-    (substring-before($uri, '#'))
-else
-    ($uri)
-let $internalId := if (contains($uri, '#')) then
-    (substring-after($uri, '#'))
-else
-    ()
-let $internalIdParam := if (contains($internalId, '?')) then
-    (concat('?', substring-after($internalId, '?')))
-else
-    ('')
-let $internalId := if (contains($internalId, '?')) then
-    (substring-before($internalId, '?'))
-else
-    ($internalId)
-
-let $term := if (contains($uriParams, 'term=')) then
-    (substring-after($uriParams, 'term='))
-else
-    ()
-let $term := if (contains($term, '&amp;')) then
-    (substring-before($term, '&amp;'))
-else
-    ($term)
-
-let $path := if (contains($uriParams, 'path=')) then
-    (substring-after($uriParams, 'path='))
-else
-    ()
-let $path := if (contains($path, '&amp;')) then
-    (substring-before($path, '&amp;'))
-else
-    ($path)
+(: QUERY BODY ============================================================== :)
+
+let $uriParams :=
+    if (contains($uri, '?')) then
+        (substring-after($uri, '?'))
+    else
+        ('')
+
+let $uri :=
+    if (contains($uri, '?')) then
+        (replace($uri, '[?&amp;](term|path)=[^&amp;]*', ''))
+    else
+        ($uri)
+
+let $docUri :=
+    if (contains($uri, '#')) then
+        (substring-before($uri, '#'))
+    else
+        ($uri)
+
+let $internalId :=
+    if (contains($uri, '#')) then
+        (substring-after($uri, '#'))
+    else
+        ()
+
+let $internalIdParam :=
+    if (contains($internalId, '?')) then
+        (concat('?', substring-after($internalId, '?')))
+    else
+        ('')
+
+let $internalId :=
+    if (contains($internalId, '?')) then
+        (substring-before($internalId, '?'))
+    else
+        ($internalId)
+
+let $term :=
+    if (contains($uriParams, 'term=')) then
+        (substring-after($uriParams, 'term='))
+    else
+        ()
+
+let $term :=
+    if (contains($term, '&amp;')) then
+        (substring-before($term, '&amp;'))
+    else
+        ($term)
+
+let $path :=
+    if (contains($uriParams, 'path=')) then
+        (substring-after($uriParams, 'path='))
+    else
+        ()
+
+let $path :=
+    if (contains($path, '&amp;')) then
+        (substring-before($path, '&amp;'))
+    else
+        ($path)
 
 let $doc := eutil:getDoc($docUri)
+
 let $internal := $doc/id($internalId)
 
 let $edition := request:get-parameter('edition', '')
 
 (: Specific handling of virtual measure IDs for parts in OPERA project :)
 let $internal :=
-if (exists($internal))
-then
-    ($internal)
-else
-    (
-    if (starts-with($internalId, 'measure_') and $doc//mei:parts)
+    if (exists($internal))
     then
-        (
-        
-        let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
-        let $measureN := functx:substring-after-last($internalId, '_')
-        return
-            ($doc/id($mdivId)//mei:measure[@n eq $measureN])[1]
-        )
-    else
         ($internal)
+    else (
+        if (starts-with($internalId, 'measure_') and $doc//mei:parts)
+        then (
+            let $mdivId := functx:substring-before-last(substring-after($internalId, 'measure_'), '_')
+            let $measureN := functx:substring-after-last($internalId, '_')
+            return
+                ($doc/id($mdivId)//mei:measure[@n eq $measureN])[1]
+        ) else
+            ($internal)
     )
 
-let $type := (: Work :)
-if (exists($doc//mei:mei) and exists($doc//mei:work) and not(exists($doc//mei:perfMedium)))
-then
-    (string('work'))
+let $type :=
+    (: Work :)
+    if (exists($doc//mei:mei) and exists($doc//mei:work) and not(exists($doc//mei:perfMedium))) then
+        (string('work'))
     
     (: Recording :)
-else
-    if (exists($doc//mei:mei) and exists($doc//mei:recording))
-    then
+    else if (exists($doc//mei:mei) and exists($doc//mei:recording)) then
         (string('recording'))
-        
-        (: Source / Score :)
+    
+    (: Source / Score :)
+    else if (source:isSource($docUri)) then
+        (string('source'))
+    
+    (: Text :)
+    else if (exists($doc/tei:TEI)) then
+        (string('text'))
+    
+    (: HTML :)
+    else if (exists($doc/html) or exists($doc/html:html)) then
+        (string('html'))
+    
+    else if (contains($docUri, '.html')) then
+        (string('html'))
+    
     else
-        if (source:isSource($docUri))
-        then
-            (string('source'))
-            
-            (: Text :)
-        else
-            if (exists($doc/tei:TEI))
-            then
-                (string('text'))
-                
-                (: HTML :)
-            else
-                if (exists($doc/html) or exists($doc/html:html))
-                then
-                    (string('html'))
-                
-                else
-                    if (contains($docUri, '.html'))
-                    then
-                        (string('html'))
-                    
-                    else
-                        (string('unknown'))
-
-let $internalIdType := if (exists($internal))
-then
-    (local-name($internal))
-else
-    ('unknown')
+        (string('unknown'))
+
+let $internalIdType :=
+    if (exists($internal)) then
+        (local-name($internal))
+    else
+        ('unknown')
 
 let $map :=
-map {
-    'type': $type,
-    'title': local:getWindowTitle($doc, $type),
-    'doc': $docUri,
-    'views': array {local:getViews($type, $docUri, $doc)},
-    'internalId': $internalId || $internalIdParam,
-    'term': $term,
-    'path': $path,
-    'internalIdType': $internalIdType
-}
+    map {
+        'type': $type,
+        'title': local:getWindowTitle($doc, $type),
+        'doc': $docUri,
+        'views': array {local:getViews($type, $docUri, $doc)},
+        'internalId': $internalId || $internalIdParam,
+        'term': $term,
+        'path': $path,
+        'internalIdType': $internalIdType
+    }
 
 return
     $map

From 7a1c4b8dc12fac03e05e3f9219dc898b331487f4 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Sun, 4 Feb 2024 23:49:46 +0100
Subject: [PATCH 046/103] Update getMeasure.xql

---
 add/data/xql/getMeasure.xql | 70 ++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/add/data/xql/getMeasure.xql b/add/data/xql/getMeasure.xql
index ff948cd6a..3d0350025 100644
--- a/add/data/xql/getMeasure.xql
+++ b/add/data/xql/getMeasure.xql
@@ -1,59 +1,59 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
 
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+(: IMPORTS ========================================================= :)
 
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+import module namespace functx = "http://www.functx.com";
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-  ID: $Id: getMeasurePage.xql 1254 2012-02-01 14:07:25Z daniel $
-:)
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
 declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-import module namespace functx = "http://www.functx.com";
+(: OPTION DECLARATIONS ============================================= :)
+
+declare option output:method "text";
+declare option output:media-type "text/plain";
+declare option output:omit-xml-declaration "yes";
+
+(:TODO serialize to JSON :)
 
-declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
+(: QUERY BODY ============================================================== :)
 
 let $id := request:get-parameter('id', '')
 let $measureId := request:get-parameter('measureId', '')
-let $measureCount := if (contains($measureId, 'tstamp2=')) then
-    (number(substring-before(substring-after($measureId, 'tstamp2='), 'm')) + 1)
-else
-    (1)
-let $measureId := if (contains($measureId, '?')) then
-    (substring-before($measureId, '?'))
-else
-    ($measureId)
+
+let $measureCount :=
+    if (contains($measureId, 'tstamp2=')) then
+        (number(substring-before(substring-after($measureId, 'tstamp2='), 'm')) + 1)
+    else
+        (1)
+
+let $measureId :=
+    if (contains($measureId, '?')) then
+        (substring-before($measureId, '?'))
+    else
+        ($measureId)
 
 let $mei := doc($id)/root()
+
 let $movementId := $mei/id($measureId)/ancestor::mei:mdiv[1]/@xml:id
 
 (: Specific handling of virtual measure IDs for parts in OPERA project :)
-let $movementId := if (starts-with($measureId, 'measure_') and $mei//mei:parts)
-then
-    (
-    functx:substring-before-last(substring-after($measureId, 'measure_'), '_')
-    )
-else
-    ($movementId)
+let $movementId :=
+    if (starts-with($measureId, 'measure_') and $mei//mei:parts) then
+        (functx:substring-before-last(substring-after($measureId, 'measure_'), '_'))
+    else
+        ($movementId)
 
 return
+    (:TODO map and serialize to JSON instead of concat :)
     concat('{',
     'measureId:"', $measureId, '",',
     'movementId:"', $movementId, '",',

From 1ea13e33d111027a3ceb4ac0f0b61c0f65f90430 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:01:04 +0100
Subject: [PATCH 047/103] Update getMeasurePage.xql

---
 add/data/xql/getMeasurePage.xql | 112 +++++++++++++++-----------------
 1 file changed, 52 insertions(+), 60 deletions(-)

diff --git a/add/data/xql/getMeasurePage.xql b/add/data/xql/getMeasurePage.xql
index 03150ddf5..7593c3e14 100644
--- a/add/data/xql/getMeasurePage.xql
+++ b/add/data/xql/getMeasurePage.xql
@@ -1,43 +1,28 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getMeasurePage.xql 1254 2012-02-01 14:07:25Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function local:findMeasure($mei, $movementId, $measureIdName) {
     let $m := $mei/id($measureIdName)
     return
-        if ($m)
-        then
+        if ($m) then
             ($m)
         else
-            (
-            ($mei/id($movementId)//mei:measure[@n eq $measureIdName])[1]
-            )
+            (($mei/id($movementId)//mei:measure[@n eq $measureIdName])[1])
 };
 
 declare function local:getMeasure($mei, $measure, $movementId) as xs:string {
@@ -50,21 +35,25 @@ declare function local:getMeasure($mei, $measure, $movementId) as xs:string {
     
     return
         
-        concat('{',
-        'measureId:"', $measureId, '",',
-        'zoneId:"', $zoneId, '",',
-        'pageId:"', $surface/string(@xml:id), '", ',
-        'movementId:"', $movementId, '",',
-        'path: "', $graphic/string(@target), '", ',
-        'width: "', $graphic/string(@width), '", ',
-        'height: "', $graphic/string(@height), '", ',
-        'ulx: "', $zone/string(@ulx), '", ',
-        'uly: "', $zone/string(@uly), '", ',
-        'lrx: "', $zone/string(@lrx), '", ',
-        'lry: "', $zone/string(@lry), '"',
-        '}')
+        concat(
+            '{',
+                'measureId:"', $measureId, '",',
+                'zoneId:"', $zoneId, '",',
+                'pageId:"', $surface/string(@xml:id), '", ',
+                'movementId:"', $movementId, '",',
+                'path: "', $graphic/string(@target), '", ',
+                'width: "', $graphic/string(@width), '", ',
+                'height: "', $graphic/string(@height), '", ',
+                'ulx: "', $zone/string(@ulx), '", ',
+                'uly: "', $zone/string(@uly), '", ',
+                'lrx: "', $zone/string(@lrx), '", ',
+                'lry: "', $zone/string(@lry), '"',
+            '}'
+        )
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $id := request:get-parameter('id', '')
 let $measureIdName := request:get-parameter('measure', '')
 let $movementId := request:get-parameter('movementId', '')
@@ -73,28 +62,31 @@ let $measureCount := request:get-parameter('measureCount', '1')
 let $mei := doc($id)/root()
 
 let $measure := local:findMeasure($mei, $movementId, $measureIdName)
-let $extraMeasures := for $i in (2 to xs:integer($measureCount))
-let $m := $measure/following-sibling::mei:measure[$i - 1] (: TODO: following-sibling könnte problematisch sein, da so section-Grenzen nicht überwunden werden :)
-return
-    if ($m) then
-        ($m)
-    else
-        ()
+let $extraMeasures :=
+    for $i in (2 to xs:integer($measureCount))
+    let $m := $measure/following-sibling::mei:measure[$i - 1] (: TODO: following-sibling könnte problematisch sein, da so section-Grenzen nicht überwunden werden :)
+    return
+        if ($m) then
+            ($m)
+        else
+            ()
         
-        (: Extra measure parts :)
-let $extraMeasuresParts := for $exm in $measure | $extraMeasures
-return
-    $exm/following-sibling::mei:measure[(exists(@label) and @label = $exm/@label) or (not(exists(@label)) and @n = $exm/@n)]
+(: Extra measure parts :)
+let $extraMeasuresParts :=
+    for $exm in $measure | $extraMeasures
+    return
+        $exm/following-sibling::mei:measure[(exists(@label) and @label = $exm/@label) or (not(exists(@label)) and @n = $exm/@n)]
 
 return
-    concat('[',
-    string-join((
-    local:getMeasure($mei, $measure, $movementId),
-    for $m in $extraMeasures
-    return
-        local:getMeasure($mei, $m, $movementId),
-    for $m in $extraMeasuresParts
-    return
-        local:getMeasure($mei, $m, $movementId)
-    ), ','),
+    concat(
+        '[',
+            string-join((
+                local:getMeasure($mei, $measure, $movementId),
+                for $m in $extraMeasures
+                return
+                    local:getMeasure($mei, $m, $movementId),
+                for $m in $extraMeasuresParts
+                return
+                    local:getMeasure($mei, $m, $movementId)
+            ), ','),
     ']')

From 5504eb64c1a4b7f469ada6d4692249d901eddad0 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:17:51 +0100
Subject: [PATCH 048/103] Update getMeasures.xql

---
 add/data/xql/getMeasures.xql | 173 +++++++++++++++++------------------
 1 file changed, 82 insertions(+), 91 deletions(-)

diff --git a/add/data/xql/getMeasures.xql b/add/data/xql/getMeasures.xql
index 4ade90095..1203d5bbf 100644
--- a/add/data/xql/getMeasures.xql
+++ b/add/data/xql/getMeasures.xql
@@ -1,130 +1,121 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
 
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+(: IMPORTS ========================================================= :)
 
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+import module namespace functx = "http://www.functx.com";
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "/db/apps/Edirom-Online/data/xqm/util.xqm";
 
-:)
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-import module namespace functx = "http://www.functx.com";
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "/db/apps/Edirom-Online/data/xqm/util.xqm";
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:string* {
     
-    if ($mei//mei:parts)
-    then
-        (
+    if ($mei//mei:parts) then (
         let $mdiv := $mei/id($mdivID)
-        let $measureNs := if ($mdiv//mei:measure/@label)
-        then
-            (
-            let $labels := $mdiv//mei:measure/@label/string()
-            for $label in $labels
-            let $labelsAnalyzed := if (contains($label, '–'))
-            then
-                ((:substring-before($label, '–'):)
-                let $first := substring-before($label, '–')
-                let $last := substring-after($label, '–')
-                let $steps := xs:integer(number($last) - number($first) + number(1))
-                for $i in 1 to $steps
+        let $measureNs :=
+            if ($mdiv//mei:measure/@label) then (
+                let $labels := $mdiv//mei:measure/@label/string()
+                for $label in $labels
+                let $labelsAnalyzed :=
+                    if (contains($label, '–')) then (
+                        (:substring-before($label, '–'):)
+                        let $first := substring-before($label, '–')
+                        let $last := substring-after($label, '–')
+                        let $steps := xs:integer(number($last) - number($first) + number(1))
+                        for $i in 1 to $steps
+                        return
+                            string(number($first) + $i - 1)
+                    ) else
+                        ($label)
                 return
-                    string(number($first) + $i - 1)
-                )
-            else
-                ($label)
-            return
-                $labelsAnalyzed
-            )
-        else
-            ($mdiv//mei:measure/@n)
+                    $labelsAnalyzed
+            ) else
+                ($mdiv//mei:measure/@n)
+        
         let $measureNsDistinct := distinct-values(eutil:sort-as-numeric-alpha($measureNs))
+        
         return
             for $measureN in $measureNsDistinct
             let $measureNNumber := number($measureN)
-            let $measures := if ($mdiv//mei:measure/@label)
-            then
-                ($mdiv//mei:measure[.//mei:multiRest][number(substring-before(@label, '–')) <= $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(substring-before(@label, '–')))])
-            else
-                ($mdiv//mei:measure[.//mei:multiRest][number(@n) lt $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(@n))])
-            let $measures := for $part in $mdiv//mei:part
-            let $partMeasures := if ($part//mei:measure/@label)
-            then
-                ($part//mei:measure[@label = $measureN][1])
-            else
-                ($part//mei:measure[@n = $measureN][1])
-            for $measure in $partMeasures | $measures[ancestor::mei:part = $part]
-            let $voiceRef := $part//mei:staffDef/@decls
-            return
-                concat('{id:"', $measure/@xml:id, '",
-                                        voice: "', $voiceRef,
-                '", partLabel: "', eutil:getPartLabel($measure, 'measure'),
-                '"}')
+            let $measures :=
+                if ($mdiv//mei:measure/@label) then
+                    ($mdiv//mei:measure[.//mei:multiRest][number(substring-before(@label, '–')) <= $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(substring-before(@label, '–')))])
+                else
+                    ($mdiv//mei:measure[.//mei:multiRest][number(@n) lt $measureNNumber][.//mei:multiRest/number(@num) gt ($measureNNumber - number(@n))])
+            let $measures :=
+                for $part in $mdiv//mei:part
+                let $partMeasures :=
+                    if ($part//mei:measure/@label) then
+                        ($part//mei:measure[@label = $measureN][1])
+                    else
+                        ($part//mei:measure[@n = $measureN][1])
+                for $measure in $partMeasures | $measures[ancestor::mei:part = $part]
+                let $voiceRef := $part//mei:staffDef/@decls
+                return
+                    concat(
+                        '{id:"', $measure/@xml:id, '",
+                        voice: "', $voiceRef,
+                        '", partLabel: "', eutil:getPartLabel($measure, 'measure'),
+                        '"}'
+                    )
             return
-                concat('{',
-                'id: "measure_', $mdiv/@xml:id, '_', $measureN, '", ',
-                'measures: [', string-join($measures, ','), '], ',
-                'mdivs: ["', $mdiv/@xml:id, '"], ', (: TODO :)
-                'name: "', $measureN, '"',
-                '}')
-        )
-    
-    else
-        (
-        
-        if ($mei/id($mdivID)//mei:measure[@label])
-        then
-            (
+                concat(
+                    '{',
+                        'id: "measure_', $mdiv/@xml:id, '_', $measureN, '", ',
+                        'measures: [', string-join($measures, ','), '], ',
+                        'mdivs: ["', $mdiv/@xml:id, '"], ', (: TODO :)
+                        'name: "', $measureN, '"',
+                    '}'
+                )
+    ) else (
+        if ($mei/id($mdivID)//mei:measure[@label]) then (
             for $measureN in $mei/id($mdivID)//mei:measure/@label
             let $measures := $mei/id($mdivID)//mei:measure[@label = $measureN]
             let $measure := $measures[1]
             (:let $measureLabel := if(exists($measure/@label) and not(contains($measure/@label,'/'))) then($measure/@label) else($measure/@n):)
             return
-                concat('{',
-                'id: "', $measure/@xml:id, '", ',
-                'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
-                'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
-                'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
-                '}')
-            )
-        else
-            (
-            
+                concat(
+                    '{',
+                        'id: "', $measure/@xml:id, '", ',
+                        'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
+                        'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
+                        'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
+                    '}'
+                )
+        ) else (
             for $measureN in $mei/id($mdivID)//mei:measure/data(@n)
             let $measures := $mei/id($mdivID)//mei:measure[@n = $measureN]
             let $measure := $measures[1]
             (:let $measureLabel := if(exists($measure/@label) and not(contains($measure/@label,'/'))) then($measure/@label) else($measure/@n):)
             return
-                concat('{',
-                'id: "', $measure/@xml:id, '", ',
-                'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
-                'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
-                'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
-                '}')
-            )
+                concat(
+                    '{',
+                        'id: "', $measure/@xml:id, '", ',
+                        'measures: [{id:"', $measure/@xml:id, '", voice: "score"}], ',
+                        'mdivs: ["', $measure/ancestor::mei:mdiv[1]/@xml:id, '"], ', (: TODO :)
+                        'name: "', $measureN, '"', (: Hier Unterscheiden wg. Auftakt. :)
+                    '}'
+                )
         )
+    )
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $mdivID := request:get-parameter('mdiv', '')
 let $mei := doc($uri)/root()

From cc25dfede132db6ce8a872e2c4618b58bd9b1a28 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:21:06 +0100
Subject: [PATCH 049/103] Update getMeasuresOnPage.xql

---
 add/data/xql/getMeasuresOnPage.xql | 67 +++++++++++++-----------------
 1 file changed, 28 insertions(+), 39 deletions(-)

diff --git a/add/data/xql/getMeasuresOnPage.xql b/add/data/xql/getMeasuresOnPage.xql
index df3e35887..bea18ec5b 100644
--- a/add/data/xql/getMeasuresOnPage.xql
+++ b/add/data/xql/getMeasuresOnPage.xql
@@ -1,23 +1,6 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getMeasuresOnPage.xql 1273 2012-03-09 16:27:21Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -26,15 +9,21 @@ xquery version "3.1";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
-declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 (:~
     Finds all measures on a page.
 
@@ -53,15 +42,16 @@ declare function local:getMeasures($mei as node(), $surface as node()) as map(*)
     let $measures := $mei//mei:measure[contains(@facs, $zoneRef)][$zoneRef = tokenize(@facs, '\s+')]
     return
         for $measure in $measures
-        let $measureLabel := if ($measure/@label) then
-            ($measure/string(@label))
-        else
-            ($measure/string(@n))
-        let $measureLabel := if ($measure//mei:multiRest)
-        then
-            ($measureLabel || '–' || number($measureLabel) + number($measure//mei:multiRest/@num) - 1)
-        else
-            ($measureLabel)
+        let $measureLabel :=
+            if ($measure/@label) then
+                ($measure/string(@label))
+            else
+                ($measure/string(@n))
+        let $measureLabel :=
+            if ($measure//mei:multiRest) then
+                ($measureLabel || '–' || number($measureLabel) + number($measure//mei:multiRest/@num) - 1)
+            else
+                ($measureLabel)
         return
             map {
                 'zoneId': $zone/string(@xml:id),
@@ -77,27 +67,26 @@ declare function local:getMeasures($mei as node(), $surface as node()) as map(*)
 };
 
 declare function local:getMRest($measure) {
-    if ($measure//mei:mRest)
-    then
+    
+    if ($measure//mei:mRest) then
         (string('1'))
+    else if ($measure//mei:multiRest) then
+        ($measure//mei:multiRest/string(@num))
     else
-        if ($measure//mei:multiRest)
-        then
-            ($measure//mei:multiRest/string(@num))
-        else
-            (string('0'))
+        (string('0'))
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $surfaceId := request:get-parameter('pageId', '')
 
 let $mei := doc($uri)/root()
 let $surface := $mei/id($surfaceId)
 
-return
-    (
+return (
     array {
         (: TODO: überlegen, wie die Staff-spezifischen Ausschnitte angezeigt werden sollen :)
         local:getMeasures($mei, $surface)
     }
-    )
+)

From d3c3c5b2dcaad5a37c00abdf3971d187249edb4e Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:22:33 +0100
Subject: [PATCH 050/103] Update getMovements.xql

---
 add/data/xql/getMovements.xql | 52 ++++++++++++++---------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/add/data/xql/getMovements.xql b/add/data/xql/getMovements.xql
index da9dffd95..de1f2801a 100644
--- a/add/data/xql/getMovements.xql
+++ b/add/data/xql/getMovements.xql
@@ -1,51 +1,41 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getMovements.xql 1219 2012-01-20 08:33:28Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
-declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $mei := doc($uri)/root()
 
-let $ret := for $movement in $mei//mei:mdiv
-return
-    map {
-        'id': $movement/string(@xml:id),
-        'name': $movement/string(@label)
-    }
+let $ret :=
+    for $movement in $mei//mei:mdiv
+    return
+        map {
+            'id': $movement/string(@xml:id),
+            'name': $movement/string(@label)
+        }
 
 let $array := array {$ret}
+
 let $options :=
-map {
-    'method': 'json',
-    'media-type': 'text/plain'
-}
+    map {
+        'method': 'json',
+        'media-type': 'text/plain'
+    }
 
 return
     serialize($array, $options)

From eddb478f15997126e1533bd164ddd22f9fe1af1f Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:23:57 +0100
Subject: [PATCH 051/103] Update getMovementsFirstPage.xql

---
 add/data/xql/getMovementsFirstPage.xql | 41 ++++++++++----------------
 1 file changed, 15 insertions(+), 26 deletions(-)

diff --git a/add/data/xql/getMovementsFirstPage.xql b/add/data/xql/getMovementsFirstPage.xql
index 86a1e3041..9f6b9a314 100644
--- a/add/data/xql/getMovementsFirstPage.xql
+++ b/add/data/xql/getMovementsFirstPage.xql
@@ -1,44 +1,33 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getMovementsFirstPage.xql 1261 2012-02-28 15:50:45Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $movementId := request:get-parameter('movementId', '')
 
 let $mei := doc($uri)/root()
 
 let $zoneId := ($mei/id($movementId)//mei:measure)[1]/string(@facs)
-let $zoneId := if (starts-with($zoneId, '#'))
-then
-    (substring($zoneId, 2))
-else
-    ($zoneId)
+
+let $zoneId :=
+    if (starts-with($zoneId, '#')) then
+        (substring($zoneId, 2))
+    else
+        ($zoneId)
 
 return
     $mei/id($zoneId)/parent::mei:surface/string(@xml:id)

From 94d34deeb7c494d285378e9452aafb23a594e8fc Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:26:01 +0100
Subject: [PATCH 052/103] Update getMusicInMdiv.xql

---
 add/data/xql/getMusicInMdiv.xql | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/add/data/xql/getMusicInMdiv.xql b/add/data/xql/getMusicInMdiv.xql
index b13564590..c3d33d271 100644
--- a/add/data/xql/getMusicInMdiv.xql
+++ b/add/data/xql/getMusicInMdiv.xql
@@ -1,26 +1,33 @@
-xquery version "3.0";
+xquery version "3.1";
+(:
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace system = "http://exist-db.org/xquery/system";
 declare namespace transform = "http://exist-db.org/xquery/transform";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $movementId := request:get-parameter('movementId', '')
 let $mei := doc($uri)/root()
-let $mdiv := if ($movementId eq '')
-then
-    ($mei//mei:mdiv[1])
-else
-    ($mei/id($movementId))
+
+let $mdiv :=
+    if ($movementId eq '') then
+        ($mei//mei:mdiv[1])
+    else
+        ($mei/id($movementId))
 
 let $base := concat(replace(system:get-module-load-path(), 'embedded-eXist-server', ''), '/../xslt/')
 let $data := transform:transform($mdiv, concat($base, 'edirom_prepareAnnotsForRendering.xsl'), <parameters/>)
 
-
 return
-    <mei
-        xmlns="http://www.music-encoding.org/ns/mei"
+    (:TODO eventually dynamically use sources @meiversion? :)
+    <mei xmlns="http://www.music-encoding.org/ns/mei"
         xmlns:xlink="http://www.w3.org/1999/xlink"
         meiversion="4.0.0">
         {$mei//mei:meiHead}

From acd621141bf998f7da5cc62b6939e6076c5fd634 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:31:33 +0100
Subject: [PATCH 053/103] Update getNavigatorConfig.xql

---
 add/data/xql/getNavigatorConfig.xql | 107 ++++++++++------------------
 1 file changed, 38 insertions(+), 69 deletions(-)

diff --git a/add/data/xql/getNavigatorConfig.xql b/add/data/xql/getNavigatorConfig.xql
index 3bc6bf1a5..21c134e6b 100644
--- a/add/data/xql/getNavigatorConfig.xql
+++ b/add/data/xql/getNavigatorConfig.xql
@@ -1,37 +1,29 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getNavigatorConfig.xql 1279 2012-03-19 13:16:43Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace edirom = "http://www.edirom.de/ns/1.3";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $lang := request:get-parameter('lang', '');
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function local:getCategory($category, $depth) {
     
     <div
@@ -50,8 +42,7 @@ declare function local:getCategory($category, $depth) {
                         ($depth)
                 }">
             {
-                if ($depth = 1)
-                then
+                if ($depth = 1) then
                     (eutil:getLocalizedName($category, $lang))
                 else
                     (
@@ -74,25 +65,14 @@ declare function local:getCategory($category, $depth) {
             {
                 for $elem in $category/edirom:navigatorItem | $category/edirom:navigatorCategory
                 return
-                    if (local-name($elem) eq 'navigatorItem')
-                    then
-                        (
+                    if (local-name($elem) eq 'navigatorItem') then (
                         local:getItem($elem, $depth)
-                        )
-                    else
-                        if (local-name($elem) eq 'navigatorSeparator')
-                        then
-                            (
-                            local:getSeparator()
-                            )
-                        else
-                            if (local-name($elem) eq 'navigatorCategory')
-                            then
-                                (
-                                local:getCategory($elem, $depth + 1)
-                                )
-                            else
-                                ()
+                    ) else if (local-name($elem) eq 'navigatorSeparator') then (
+                        local:getSeparator()
+                    ) else if (local-name($elem) eq 'navigatorCategory') then (
+                        local:getCategory($elem, $depth + 1)
+                    ) else
+                        ()
             }
         </div>
     </div>
@@ -102,15 +82,14 @@ declare function local:getItem($item, $depth) {
     
     let $target := $item/replace(@targets, '\[.*\]', '')
     let $cfg := concat('{', replace(substring-before($item/substring-after(@targets, '['), ']'), '=', ':'), '}')
-    let $target := if (starts-with($target, 'javascript:'))
-    then
-        (replace($target, 'javascript:', ''))
-    else
-        (concat("loadLink('", $target, "', ", $cfg, ")"))
-    return
+    let $target :=
+        if (starts-with($target, 'javascript:')) then
+            (replace($target, 'javascript:', ''))
+        else
+            (concat("loadLink('", $target, "', ", $cfg, ")"))
+        return
         
-        <div
-            class="navigatorItem{
+        <div class="navigatorItem{
                     if ($depth lt 2) then
                         ()
                     else
@@ -124,8 +103,7 @@ declare function local:getItem($item, $depth) {
 
 declare function local:getSeparator() {
     
-    <div
-        class="navigatorSeparator"></div>
+    <div class="navigatorSeparator"></div>
 };
 
 declare function local:getDefinition($navConfig) {
@@ -135,27 +113,18 @@ declare function local:getDefinition($navConfig) {
     
     return
         
-        if (local-name($elem) eq 'navigatorItem')
-        then
-            (
+        if (local-name($elem) eq 'navigatorItem') then (
             local:getItem($elem, 1)
-            )
-        else
-            if (local-name($elem) eq 'navigatorSeparator')
-            then
-                (
-                local:getSeparator()
-                )
-            else
-                if (local-name($elem) eq 'navigatorCategory')
-                then
-                    (
-                    local:getCategory($elem, 1)
-                    )
-                else
-                    ()
+        ) else if (local-name($elem) eq 'navigatorSeparator') then (
+            local:getSeparator()
+        ) else if (local-name($elem) eq 'navigatorCategory') then (
+            local:getCategory($elem, 1)
+        ) else
+            ()
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $editionId := request:get-parameter('editionId', '')
 let $workId := request:get-parameter('workId', '')
 let $edition := doc($editionId)/root()

From 620faaf49932a0bc7cde9408e60c33baeefd63c5 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:32:41 +0100
Subject: [PATCH 054/103] Update getOverlayOnPage.xql

---
 add/data/xql/getOverlayOnPage.xql | 45 ++++++++++++-------------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/add/data/xql/getOverlayOnPage.xql b/add/data/xql/getOverlayOnPage.xql
index 829317166..7246cea77 100644
--- a/add/data/xql/getOverlayOnPage.xql
+++ b/add/data/xql/getOverlayOnPage.xql
@@ -1,23 +1,6 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getOverlayOnPage.xql 1273 2012-03-09 16:27:21Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -26,14 +9,20 @@ xquery version "3.1";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
-declare namespace svg = "http://www.w3.org/2000/svg";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace svg = "http://www.w3.org/2000/svg";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $mei := doc($uri)/root()
 let $surfaceId := request:get-parameter('pageId', '')
@@ -46,16 +35,16 @@ let $surface := $mei/id($surfaceId)
 let $svg := $surface/svg:svg[@id = $plist]
 
 let $overlay :=
-map {
-    'id': string($svg/@id),
-    'svg': $svg
-}
+    map {
+        'id': string($svg/@id),
+        'svg': $svg
+    }
 
 let $options :=
-map {
-    'method': 'json',
-    'media-type': 'text/plain'
-}
+    map {
+        'method': 'json',
+        'media-type': 'text/plain'
+    }
 
 return
     serialize($overlay, $options)

From 3f7af01085fc4d5ac269f403a84a3e4dd93cc9de Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:33:47 +0100
Subject: [PATCH 055/103] Update getOverlays.xql

---
 add/data/xql/getOverlays.xql | 52 +++++++++++++++---------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/add/data/xql/getOverlays.xql b/add/data/xql/getOverlays.xql
index ae4883b5b..a4f38b0d9 100644
--- a/add/data/xql/getOverlays.xql
+++ b/add/data/xql/getOverlays.xql
@@ -1,51 +1,41 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getOverlays.xql 1273 2012-03-09 16:27:21Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
-declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $mei := doc($uri)/root()
 
-let $ret := for $overlay in $mei//mei:annot[@type = 'overlay']
-return
-    map {
-        'id': $overlay/string(@xml:id),
-        'name': string($overlay/mei:title)
-    }
+let $ret :=
+    for $overlay in $mei//mei:annot[@type = 'overlay']
+    return
+        map {
+            'id': $overlay/string(@xml:id),
+            'name': string($overlay/mei:title)
+        }
 
 let $array := array {$ret}
+
 let $options :=
-map {
-    'method': 'json',
-    'media-type': 'text/plain'
-}
+    map {
+        'method': 'json',
+        'media-type': 'text/plain'
+    }
 
 return
     serialize($array, $options)

From 7a625506ae8c1cffe6a688d5078d9f28505d90f5 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:35:37 +0100
Subject: [PATCH 056/103] Update getPages.xql

---
 add/data/xql/getPages.xql | 85 +++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 48 deletions(-)

diff --git a/add/data/xql/getPages.xql b/add/data/xql/getPages.xql
index 67c9b8b5d..ad5d22247 100644
--- a/add/data/xql/getPages.xql
+++ b/add/data/xql/getPages.xql
@@ -1,75 +1,64 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getPages.xql 1268 2012-03-02 09:46:28Z johannes $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+declare namespace img = "http://www.edirom.de/ns/image";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
-declare namespace img = "http://www.edirom.de/ns/image";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
-declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $mei := eutil:getDoc($uri)/root()
 
-let $ret := for $surface in $mei//mei:surface
-(:let $image := doc($surface/mei:graphic[@type='facsimile']/string(@target))/img:image:)
-let $graphic := $surface/mei:graphic[@type = 'facsimile']
-return
-    map {
-        'id': $surface/string(@xml:id),
-        'path': $graphic/string(@target),
-        'name': $surface/string(@n),
-        'width': $graphic/string(@width),
-        'height': $graphic/string(@height)
-    }
-
-let $ret := if (count($ret) = 0)
-then
-    (
-    for $surface in $mei//tei:surface
-    let $graphic := $surface/tei:graphic[1]
+let $ret :=
+    for $surface in $mei//mei:surface
+    (:let $image := doc($surface/mei:graphic[@type='facsimile']/string(@target))/img:image:)
+    let $graphic := $surface/mei:graphic[@type = 'facsimile']
     return
         map {
             'id': $surface/string(@xml:id),
-            'path': $graphic/string(@url),
+            'path': $graphic/string(@target),
             'name': $surface/string(@n),
-            'width': replace($graphic/string(@width), 'px', ''),
-            'height': replace($graphic/string(@height), 'px', '')
+            'width': $graphic/string(@width),
+            'height': $graphic/string(@height)
         }
-    )
-else
+
+let $ret :=
+    if (count($ret) = 0) then (
+        for $surface in $mei//tei:surface
+        let $graphic := $surface/tei:graphic[1]
+        return
+            map {
+                'id': $surface/string(@xml:id),
+                'path': $graphic/string(@url),
+                'name': $surface/string(@n),
+                'width': replace($graphic/string(@width), 'px', ''),
+                'height': replace($graphic/string(@height), 'px', '')
+            }
+    ) else
     ($ret)
 
 let $options :=
-map {
-    'method': 'json',
-    'media-type': 'text/plain'
-}
+    map {
+        'method': 'json',
+        'media-type': 'text/plain'
+    }
 
 return
     serialize($ret, $options)

From c70f889bfa656787007f18063f631e47955eaa1b Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 00:36:51 +0100
Subject: [PATCH 057/103] Update getParts.xql

---
 add/data/xql/getParts.xql | 45 +++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/add/data/xql/getParts.xql b/add/data/xql/getParts.xql
index ecb763de4..715581124 100644
--- a/add/data/xql/getParts.xql
+++ b/add/data/xql/getParts.xql
@@ -1,44 +1,37 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
 
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
+(: IMPORTS ========================================================= :)
 
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-:)
-
-declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $mei := doc($uri)/root()
 
-let $ret := for $part in ($mei//mei:instrumentation/mei:instrVoice | $mei//mei:perfMedium//mei:perfRes)
-let $hasNoAttrSameas := not(exists($part/@sameas))
-return
-    concat(
-    '{label: "', eutil:getPartLabel($part, 'perfRes'),
-    '", id:"', $part/@xml:id,
-    '", selectedByDefault:', $hasNoAttrSameas,
-    ', selected:', $hasNoAttrSameas, '}'
-    )
+let $ret :=
+    for $part in ($mei//mei:instrumentation/mei:instrVoice | $mei//mei:perfMedium//mei:perfRes)
+    let $hasNoAttrSameas := not(exists($part/@sameas))
+    return
+        concat(
+            '{label: "', eutil:getPartLabel($part, 'perfRes'),
+            '", id:"', $part/@xml:id,
+            '", selectedByDefault:', $hasNoAttrSameas,
+            ', selected:', $hasNoAttrSameas, '}'
+        )
 
 return
     concat('[', string-join($ret, ','), ']')

From cd024980e5f2c45fe088c9e68fc7127067a21f00 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 08:11:18 +0100
Subject: [PATCH 058/103] Update getPreferences.xql

---
 add/data/xql/getPreferences.xql | 66 ++++++++++++++-------------------
 1 file changed, 27 insertions(+), 39 deletions(-)

diff --git a/add/data/xql/getPreferences.xql b/add/data/xql/getPreferences.xql
index 20549b677..4488ad117 100644
--- a/add/data/xql/getPreferences.xql
+++ b/add/data/xql/getPreferences.xql
@@ -1,37 +1,28 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getPreferences.xql 1455 2012-10-11 10:42:55Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
-    Returns preferences as JSON or XML.
+ : Returns preferences as JSON or XML.
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ :)
 
-    @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-:)
+(: IMPORTS ========================================================= :)
+
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 
-import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $mode := request:get-parameter('mode', '')
 let $edition := request:get-parameter('edition', '')
 
@@ -42,21 +33,18 @@ let $file := doc('../prefs/edirom-prefs.xml')
 let $projectFile := doc(edition:getPreferencesURI($edition))
 
 return
-    if ($mode = 'json')
-    then
-        (
-        concat('{',
-        string-join((
-        for $entry in $file//entry
-        return
-            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-        
-        ,
-        for $entry in $projectFile//entry
-        return
-            concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
-        ), ','),
-        '}')
+    if ($mode = 'json') then (
+        concat(
+            '{',
+                string-join((
+                    for $entry in $file//entry
+                    return
+                        concat('"', $entry/string(@key), '":"', $entry/string(@value), '"'),
+                    for $entry in $projectFile//entry
+                    return
+                        concat('"', $entry/string(@key), '":"', $entry/string(@value), '"')
+                ), ','),
+            '}'
         )
-    else
+    ) else
         ($file)

From cd5951ebf1b99226f9bd1988fe454007333f1a9a Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 08:15:40 +0100
Subject: [PATCH 059/103] Update getReducedDocument.xql

---
 add/data/xql/getReducedDocument.xql | 101 ++++++++++++++--------------
 1 file changed, 49 insertions(+), 52 deletions(-)

diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 6a603f757..3bb9986e1 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -1,40 +1,34 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getReducedDocument.xql 1328 2012-05-16 14:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: IMPORTS ========================================================= :)
+
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 (:declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";:)
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
-declare variable $imagePrefix := if ($imageserver = 'leaflet')
-then
-    (eutil:getPreference('leaflet_prefix', $edition))
-else
-    (eutil:getPreference('image_prefix', $edition));
+
+declare variable $imagePrefix :=
+    if ($imageserver = 'leaflet') then
+        (eutil:getPreference('leaflet_prefix', $edition))
+    else
+        (eutil:getPreference('image_prefix', $edition));
+
+(: QUERY BODY ============================================================== :)
 
 let $uri := request:get-parameter('uri', '')
 let $selectionId := request:get-parameter('selectionId', '')
@@ -45,39 +39,42 @@ let $base := concat('file:', system:get-module-load-path())
 
 let $doc := doc($uri)/root()
 let $xsl := '../xslt/reduceToSelection.xsl'
-let $doc := transform:transform($doc, $xsl, <parameters><param
-        name="selectionId"
-        value="{$selectionId}"/><param
-        name="subtreeRoot"
-        value="{$subtreeRoot}"/></parameters>)
+
+let $doc :=
+    transform:transform($doc, $xsl,
+        <parameters>
+            <param name="selectionId" value="{$selectionId}"/>
+            <param name="subtreeRoot" value="{$subtreeRoot}"/>
+        </parameters>
+    )
+
 let $doc := $doc/root()
 
 let $xslInstruction := $doc//processing-instruction(xml-stylesheet)
-let $xslInstruction := for $i in serialize($xslInstruction, ())
-return
-    if (matches($i, 'type="text/xsl"'))
-    then
-        (substring-before(substring-after($i, 'href="'), '"'))
-    else
+
+let $xslInstruction :=
+    for $i in serialize($xslInstruction, ())
+    return
+        if (matches($i, 'type="text/xsl"')) then
+            (substring-before(substring-after($i, 'href="'), '"'))
+        else
         ()
-        
-        (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
-let $xsl := if ($xslInstruction) then
-    (doc($xslInstruction))
-else
-    ('../xslt/teiBody2HTML.xsl')
-
-let $params := (<param
-    name="base"
-    value="{concat($base, '/../xslt/')}"/>,
-<param
-    name="idPrefix"
-    value="{$idPrefix}"/>)
+
+(:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
+
+let $xsl :=
+    if ($xslInstruction) then
+        (doc($xslInstruction))
+    else
+        ('../xslt/teiBody2HTML.xsl')
+
+let $params := (
+    <param name="base" value="{concat($base, '/../xslt/')}"/>,
+    <param name="idPrefix" value="{$idPrefix}"/>
+)
 
 return
     if ($xslInstruction) then
         (transform:transform($doc/root(), $xsl, <parameters>{$params}</parameters>))
     else
-        (transform:transform($doc/root(), $xsl, <parameters>{$params}<param
-                name="graphicsPrefix"
-                value="{$imagePrefix}"/></parameters>))
+        (transform:transform($doc/root(), $xsl, <parameters>{$params}<param name="graphicsPrefix" value="{$imagePrefix}"/></parameters>))

From b040e981664708a6bd0bd632528a15b8ecf9439c Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 09:00:18 +0100
Subject: [PATCH 060/103] Update getRendering.xql

---
 add/data/xql/getRendering.xql | 80 ++++++++++++-----------------------
 1 file changed, 27 insertions(+), 53 deletions(-)

diff --git a/add/data/xql/getRendering.xql b/add/data/xql/getRendering.xql
index 82de48245..d4d246366 100644
--- a/add/data/xql/getRendering.xql
+++ b/add/data/xql/getRendering.xql
@@ -1,35 +1,21 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getRendering.xql 1334 2012-06-14 12:40:33Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
-declare namespace mei = "http://www.music-encoding.org/ns/mei";
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
+declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace system = "http://exist-db.org/xquery/system";
 declare namespace transform = "http://exist-db.org/xquery/transform";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
+(: OPTION DECLARATIONS ============================================= :)
 
+declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: QUERY BODY ============================================================== :)
 
 let $uri := request:get-parameter('uri', '')
 let $movementId := request:get-parameter('movementId', '')
@@ -39,10 +25,12 @@ let $firstMeasure := request:get-parameter('firstMeasure', '')
 let $lastMeasure := request:get-parameter('lastMeasure', '')
 
 
-let $docUri := if (contains($uri, '#')) then
-    (substring-before($uri, '#'))
-else
-    ($uri)
+let $docUri :=
+    if (contains($uri, '#')) then
+        (substring-before($uri, '#'))
+    else
+        ($uri)
+
 let $doc := doc($docUri)
 
 return
@@ -53,31 +41,18 @@ return
     let $mdiv2show := $movementId
     let $outputStep := 'svg'
     
-    
-    
-    let $svg := transform:transform($doc, concat($base, 'mei2svg.xsl'), <parameters>
-        <param
-            name="outputStep"
-            value="{$outputStep}"/>
-        <param
-            name="basePath"
-            value="{$base}"/>
-        <param
-            name="mdiv2show"
-            value="{$mdiv2show}"/>
-        <param
-            name="stripStaves"
-            value="{$stripStaves}"/>
-        <param
-            name="showStaff"
-            value="{$showStaff}"/>
-        <param
-            name="firstMeasure"
-            value="{$firstMeasure}"/>
-        <param
-            name="lastMeasure"
-            value="{$lastMeasure}"/>
-    </parameters>)
+    let $svg := transform:transform($doc, concat($base, 'mei2svg.xsl'),
+        <parameters>
+            <param name="outputStep" value="{$outputStep}"/>
+            <param name="basePath" value="{$base}"/>
+            <param name="mdiv2show" value="{$mdiv2show}"/>
+            <param name="stripStaves" value="{$stripStaves}"/>
+            <param name="showStaff" value="{$showStaff}"/>
+            <param name="firstMeasure" value="{$firstMeasure}"/>
+            <param name="lastMeasure" value="{$lastMeasure}"/>
+        </parameters>
+    )
+
     (:let $svg := transform:transform($svg, concat($base, 'svgCleaner.xsl'),<parameters/>):)
     
     (:let $mdiv := transform:transform($doc, concat($base, 'reduceToMdiv.xsl'), <parameters><param name="mdiv2show" value="{$mdiv2show}"/></parameters>)
@@ -91,5 +66,4 @@ return
     
     
     return
-        
         $svg

From 5991f5cd70ad8e9e1fca44e8cbf1f6bed4472ff2 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 09:01:26 +0100
Subject: [PATCH 061/103] Update getSummary.xql

---
 add/data/xql/getSummary.xql | 395 +++++++++++++-----------------------
 1 file changed, 140 insertions(+), 255 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 86c0e9dfa..13b53ce72 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -1,48 +1,42 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getSummary.xql 1455 2012-10-11 10:42:55Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: IMPORTS ========================================================= :)
+
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+declare namespace edirom_image = "http://www.edirom.de/ns/image";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
-declare namespace edirom_image = "http://www.edirom.de/ns/image";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $imageWidth := 400;
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function local:generateRespSentence($names) {
     string-join(
-    for $name in $names
-    return
-        if (matches($name, '(s|z)$'))
-        then
-            (concat($name, "'"))
-        else
-            (concat($name, 's'))
-    , ' und ')
+        for $name in $names
+        return
+            if (matches($name, '(s|z)$'))
+            then
+                (concat($name, "'"))
+            else
+                (concat($name, 's'))
+        , ' und '
+    )
 };
 
 declare function local:getSourceSummary($doc, $facsBasePath, $server) {
@@ -50,310 +44,212 @@ declare function local:getSourceSummary($doc, $facsBasePath, $server) {
     let $title := $work//mei:work/mei:titleStmt/mei:title[1]/text()
     let $resp := local:generateRespSentence($work//mei:work/mei:titleStmt/mei:respStmt/*[local-name() != 'resp']/text())
     let $expression := $work/id($doc//mei:relation[@rel = 'isEmbodimentOf'][1]/substring-after(@target, '#'))/string(@label)
+    
     return
         
-        <div
-            class="summaryViewSource">
+        <div class="summaryViewSource">
             <h1>
                 {
-                    if ($doc//mei:source/mei:titleStmt/mei:title[@type eq 'main'])
-                    then
+                    if ($doc//mei:source/mei:titleStmt/mei:title[@type eq 'main']) then
                         ($doc//mei:source/mei:titleStmt/mei:title[@type eq 'main'][1]//text())
                     else
                         ($doc//mei:source/mei:titleStmt/mei:title[1]//text())
                 }
                 {
-                    if ($doc//mei:source//mei:identifier[@type eq 'siglum'])
-                    then
+                    if ($doc//mei:source//mei:identifier[@type eq 'siglum']) then
                         (concat(' ', $doc//mei:source//mei:identifier[@type eq 'siglum'][1]//text()))
                     else
                         ()
                 }
             </h1>
             
-            <div
-                class="metaData">
-                
-                <div
-                    class="work metaRow">
+            <div class="metaData">
+                <div class="work metaRow">
                     Zur Fassung "{$expression}" von {$resp} "{$title}".
                 </div>
-                
                 {
                     for $name in $doc//mei:source/mei:titleStmt/mei:respStmt/mei:*[local-name() eq 'persName' or local-name() eq 'name']
                     return
-                        <div
-                            class="resp metaRow">
-                            <div
-                                class="key">
+                        <div class="resp metaRow">
+                            <div class="key">
                                 {
-                                    if ($name/@role)
-                                    then
+                                    if ($name/@role) then
                                         ($name/string(@role))
                                     else
                                         (string('Responsible'))
                                 }
                             </div>
-                            <div
-                                class="value">{$name/text()}</div>
+                            <div class="value">{$name/text()}</div>
                         </div>
-                
                 }
                 
                 {
                     for $date in $doc//mei:source/mei:pubStmt/mei:date | $doc//mei:source/mei:history/mei:creation/mei:date[1]
                     return
-                        <div
-                            class="dating metaRow">
-                            <div
-                                class="key">Dating</div>
-                            <div
-                                class="value">{local:getDateValue($date)}</div>
+                        <div class="dating metaRow">
+                            <div class="key">Dating</div>
+                            <div class="value">{local:getDateValue($date)}</div>
                         </div>
                 
                 }
                 
                 {
                     (: probably a Manuscript… :)
-                    if (count($doc//mei:source/mei:itemList/mei:item) eq 1)
-                    then
-                        (
+                    if (count($doc//mei:source/mei:itemList/mei:item) eq 1) then (
                         for $item in $doc//mei:source/mei:itemList/mei:item
                         return
-                            if ($item/mei:physDesc/mei:repository)
-                            then
-                                (
-                                <div
-                                    class="library metaRow">
-                                    <div
-                                        class="key">Repository</div>
-                                    <div
-                                        class="value">
+                            if ($item/mei:physDesc/mei:repository) then (
+                                <div class="library metaRow">
+                                    <div class="key">Repository</div>
+                                    <div class="value">
                                         {
                                             $item/mei:physDesc/mei:repository[1]/text(),
-                                            if ($item/mei:physDesc/mei:physLoc)
-                                            then
-                                                (
+                                            if ($item/mei:physDesc/mei:physLoc) then (
                                                 <br/>, $item/mei:physDesc/mei:physLoc[1]/text()
-                                                )
-                                            else
+                                            ) else
                                                 ()
                                         }
                                     </div>
                                 </div>
-                                )
-                            else
+                            ) else
                                 ()
-                        )
-                    else
+                    ) else
                         ()
                 }
                 
                 {
-                    if ($doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'])
-                    then
-                        (
-                        <div
-                            class="publisher metaRow">
-                            <div
-                                class="key">Publisher</div>
-                            <div
-                                class="value">{$doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'][1]/text()}</div>
+                    if ($doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher']) then (
+                        <div class="publisher metaRow">
+                            <div class="key">Publisher</div>
+                            <div class="value">{$doc//mei:source/mei:pubStmt//mei:*[@role eq 'publisher'][1]/text()}</div>
                         </div>
-                        )
-                    else
+                    ) else
                         ()
                 }
                 
                 {
-                    if ($doc//mei:source/mei:physDesc/mei:plateNum)
-                    then
-                        (
-                        <div
-                            class="plateNum metaRow">
-                            <div
-                                class="key">Plate number</div>
-                            <div
-                                class="value">{$doc//mei:source/mei:physDesc/mei:plateNum[1]/text()}</div>
+                    if ($doc//mei:source/mei:physDesc/mei:plateNum) then (
+                        <div class="plateNum metaRow">
+                            <div class="key">Plate number</div>
+                            <div class="value">{$doc//mei:source/mei:physDesc/mei:plateNum[1]/text()}</div>
                         </div>
-                        )
-                    else
+                    ) else
                         ()
                 }
-            
             </div>
             
             {
-                if ($doc//mei:source//mei:titlePage/@facs)
-                then
-                    (
-                    if ($server = 'digilib') then
-                        (
-                        <div
-                            class="titlePage">
-                            <img
-                                src="{local:getImagePath($facsBasePath, $doc//mei:source//mei:titlePage[1]/@facs, $imageWidth)}"/>
+                if ($doc//mei:source//mei:titlePage/@facs) then (
+                    if ($server = 'digilib') then (
+                        <div class="titlePage">
+                            <img src="{local:getImagePath($facsBasePath, $doc//mei:source//mei:titlePage[1]/@facs, $imageWidth)}"/>
                         </div>
-                        )
-                    else
+                    ) else
                         ()
                     )
                 else
-                    if ($doc//mei:facsimile/mei:surface/mei:graphic)
-                    then
-                        (
-                        if ($server = 'digilib') then
-                            (
-                            <div
-                                class="titlePage">
-                                <img
-                                    src="{local:getImagePath($facsBasePath, $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target, $imageWidth)}"/>
+                    if ($doc//mei:facsimile/mei:surface/mei:graphic) then (
+                        if ($server = 'digilib') then (
+                            <div class="titlePage">
+                                <img src="{local:getImagePath($facsBasePath, $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target, $imageWidth)}"/>
                             </div>
-                            )
-                        else
+                        ) else
                             ()
-                        )
-                    else
-                        if ($doc//mei:source//mei:titlePage)
-                        then
-                            (
-                            <div
-                                class="titlePage">
+                    ) else if ($doc//mei:source//mei:titlePage) then (
+                            <div class="titlePage">
                                 (: TODO: transformieren :)
                                 {$doc//mei:source//mei:titlePage[1]/text()}
                             </div>
-                            )
-                        else
-                            ()
+                    ) else
+                        ()
             }
         </div>
 };
 
 declare function local:getImagePath($basePath, $uri, $width) {
-    if (starts-with($uri, 'xmldb:exist'))
-    then
-        (
+    if (starts-with($uri, 'xmldb:exist')) then (
         let $imagePath := doc($uri)/edirom_image:image/@file
         return
             concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;mo=fit')
-        )
-    else
-        (
+    ) else (
         concat($basePath, $uri, '?dw=', $width, '&amp;amp;mo=fit')
-        )
+    )
 };
 
 declare function local:getDateValue($date) {
     
-    if ($date/@reg)
-    then
+    if ($date/@reg) then
         ($date/string(@reg)) (: TODO: prettify date :)
     
+    else if ($date/@startdate and $date/@enddate) then
+        (concat('From ', $date/@startdate, ' until ', $date/@enddate))
+    
+    else if ($date/@notbefore and $date/@notafter) then
+        (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
+    
+    else if ($date/@startdate and $date/@notafter) then
+        (concat('From ', $date/@startdate, ', not after ', $date/@notafter))
+    
+    else if ($date/@notbefore and $date/@enddate) then
+        (concat('Not before ', $date/@notbefore, ', until ', $date/@enddate))
+    
+    else if ($date/@startdate) then
+        (concat('From ', $date/@startdate))
+    
+    else if ($date/@enddate) then
+        (concat('Until ', $date/@enddate))
+    
+    else if ($date/@notbefore) then
+        (concat('Not before ', $date/@notbefore))
+    
+    else if ($date/@notafter) then
+        (concat('Not after ', $date/@notafter))
+    
+    else if (local-name($date) eq 'date') then
+        ($date/text())
+    
     else
-        if ($date/@startdate and $date/@enddate)
-        then
-            (concat('From ', $date/@startdate, ' until ', $date/@enddate))
-        
-        else
-            if ($date/@notbefore and $date/@notafter)
-            then
-                (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
-            
-            else
-                if ($date/@startdate and $date/@notafter)
-                then
-                    (concat('From ', $date/@startdate, ', not after ', $date/@notafter))
-                
-                else
-                    if ($date/@notbefore and $date/@enddate)
-                    then
-                        (concat('Not before ', $date/@notbefore, ', until ', $date/@enddate))
-                    
-                    else
-                        if ($date/@startdate)
-                        then
-                            (concat('From ', $date/@startdate))
-                        
-                        else
-                            if ($date/@enddate)
-                            then
-                                (concat('Until ', $date/@enddate))
-                            
-                            else
-                                if ($date/@notbefore)
-                                then
-                                    (concat('Not before ', $date/@notbefore))
-                                
-                                else
-                                    if ($date/@notafter)
-                                    then
-                                        (concat('Not after ', $date/@notafter))
-                                    
-                                    else
-                                        if (local-name($date) eq 'date')
-                                        then
-                                            ($date/text())
-                                        
-                                        else
-                                            (string(""))
+        (string(""))
 };
 
 declare function local:getTeiDateValue($date) {
     
-    if ($date/@when)
-    then
+    if ($date/@when) then
         ($date/string(@when)) (: TODO: prettify date :)
     
+    else if ($date/@from and $date/@to) then
+        (concat('From ', $date/@from, ' to ', $date/@to))
+    
+    else if ($date/@notBefore and $date/@notAfter) then
+        (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
+    
+    else if ($date/@from and $date/@notAfter) then
+        (concat('From ', $date/@from, ', not after ', $date/@notAfter))
+    
+    else if ($date/@notBefore and $date/@to) then
+        (concat('Not before ', $date/@notBefore, ', to ', $date/@to))
+    
+    else if ($date/@from) then
+        (concat('From ', $date/@from))
+    
+    else if ($date/@to) then
+        (concat('Until ', $date/@to))
+    
+    else if ($date/@notBefore) then
+        (concat('Not before ', $date/@notBefore))
+    
+    else if ($date/@notAfter) then
+        (concat('Not after ', $date/@notAfter))
+    
+    else if (local-name($date) eq 'date') then
+        ($date/text())
+    
     else
-        if ($date/@from and $date/@to)
-        then
-            (concat('From ', $date/@from, ' to ', $date/@to))
-        
-        else
-            if ($date/@notBefore and $date/@notAfter)
-            then
-                (concat('Not before ', $date/@notbefore, ', not after ', $date/@notafter))
-            
-            else
-                if ($date/@from and $date/@notAfter)
-                then
-                    (concat('From ', $date/@from, ', not after ', $date/@notAfter))
-                
-                else
-                    if ($date/@notBefore and $date/@to)
-                    then
-                        (concat('Not before ', $date/@notBefore, ', to ', $date/@to))
-                    
-                    else
-                        if ($date/@from)
-                        then
-                            (concat('From ', $date/@from))
-                        
-                        else
-                            if ($date/@to)
-                            then
-                                (concat('Until ', $date/@to))
-                            
-                            else
-                                if ($date/@notBefore)
-                                then
-                                    (concat('Not before ', $date/@notBefore))
-                                
-                                else
-                                    if ($date/@notAfter)
-                                    then
-                                        (concat('Not after ', $date/@notAfter))
-                                    
-                                    else
-                                        if (local-name($date) eq 'date')
-                                        then
-                                            ($date/text())
-                                        
-                                        else
-                                            (string(""))
+        (string(""))
 };
 
 declare function local:getWorkSummary($doc, $docUri) {
+
     <div
         class="summaryViewWork">
         <div
@@ -660,29 +556,18 @@ let $imagePath := local:getImagePathLeaflet($doc)
 (:local:getImagePathLeaflet($imagePrefix, $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target):)
 
 return
-    if ($type = 'work')
-    then
-        (
-        if ($server = 'leaflet')
-        then
+    if ($type = 'work') then (
+        if ($server = 'leaflet') then
             (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
         else
             (local:getWorkSummary($doc, $docUri))
         
-        )
-    else
-        if ($type = 'source')
-        then
-            (
-            if ($server = 'leaflet')
-            then
+    ) else if ($type = 'source') then (
+            if ($server = 'leaflet') then
                 (local:getOutput($doc, $imagePrefix, $server, $imagePath, $type, $docUri))
             else
                 (local:getSourceSummary($doc, $imagePrefix, $server))
-            )
-        else
-            if ($type = 'text')
-            then
-                (local:getTextSummary($doc, $imagePrefix))
-            else
-                ()
+    ) else if ($type = 'text') then
+        (local:getTextSummary($doc, $imagePrefix))
+    else
+        ()

From 25b3e274e3898fb37db560d0f6c7d47439f8099f Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:30:25 +0100
Subject: [PATCH 062/103] Update getText.xql

---
 add/data/xql/getText.xql | 165 +++++++++++++++++----------------------
 1 file changed, 72 insertions(+), 93 deletions(-)

diff --git a/add/data/xql/getText.xql b/add/data/xql/getText.xql
index e1868ae70..fe2295ec7 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -1,34 +1,26 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
 
-  You should have received a copy of the GNU General Public License
-  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+(: IMPORTS ========================================================= :)
 
-  ID: $Id: getText.xql 1456 2012-10-11 12:50:05Z niko $
-:)
-import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xhtml = "http://www.w3.org/1999/xhtml";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 (:declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";:)
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $idPrefix := request:get-parameter('idPrefix', '')
 let $term := request:get-parameter('term', '')
@@ -38,98 +30,85 @@ let $doc := eutil:getDoc($uri)/root()
 let $contextPath := request:get-context-path()
 
 let $xslInstruction := $doc//processing-instruction(xml-stylesheet)
-let $xslInstruction := for $i in fn:serialize($xslInstruction, ())
-return
-    if (matches($i, 'type="text/xsl"'))
-    then
+let $xslInstruction :=
+    for $i in fn:serialize($xslInstruction, ())
+    return
+        if (matches($i, 'type="text/xsl"')) then
         (substring-before(substring-after($i, 'href="'), '"'))
     else
         ()
 
+let $doc :=
+    if ($term eq '') then
+        ($doc)
+    else
+        ($doc//tei:text[ft:query(., $term)]/ancestor::tei:TEI)
 
-let $doc := if ($term eq '') then
-    ($doc)
-else
-    ($doc//tei:text[ft:query(., $term)]/ancestor::tei:TEI)
-let $doc := if ($term eq '') then
-    ($doc)
-else
-    (util:expand($doc))
-
-let $doc := if ($page eq '') then
-    ($doc)
-else
-    (
-    let $pb1 := $doc//tei:pb[@facs eq '#' || $page]/@n
-    let $pb2 := ($doc//tei:pb[@facs eq '#' || $page]/following::tei:pb)[1]/@n
-    return
-        transform:transform($doc, doc('../xslt/reduceToPage.xsl'), <parameters><param
-                name="pb1"
-                value="{$pb1}"/><param
-                name="pb2"
-                value="{$pb2}"/></parameters>)
+let $doc :=
+    if ($term eq '') then
+        ($doc)
+    else
+        (util:expand($doc))
+
+let $doc :=
+    if ($page eq '') then
+        ($doc)
+    else (
+        let $pb1 := $doc//tei:pb[@facs eq '#' || $page]/@n
+        let $pb2 := ($doc//tei:pb[@facs eq '#' || $page]/following::tei:pb)[1]/@n
+        return
+            transform:transform($doc, doc('../xslt/reduceToPage.xsl'),
+                <parameters>
+                    <param name="pb1" value="{$pb1}"/>
+                    <param name="pb2" value="{$pb2}"/>
+                </parameters>
+            )
     )
 
 let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '') (:TODO:)
 
 let $edition := request:get-parameter('edition', '')
 let $imageserver := eutil:getPreference('image_server', $edition)
-let $imagePrefix := if ($imageserver = 'leaflet')
-then
+
+let $imagePrefix :=
+    if ($imageserver = 'leaflet') then
     (eutil:getPreference('leaflet_prefix', $edition))
-else
-    (eutil:getPreference('image_prefix', $edition))
-    
-    (:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
+    else
+        (eutil:getPreference('image_prefix', $edition))
 
-let $xsl := if ($xslInstruction) then
-    ($xslInstruction)
-else
-    ('../xslt/teiBody2HTML.xsl')
+let $xsl :=
+    if ($xslInstruction) then
+        ($xslInstruction)
+    else
+        ('../xslt/teiBody2HTML.xsl')
 
+(:TODO introduce injection-point for tei-stylesheet parameters :)
 let $params := (
-(: parameters for Edirom-Online :)
-<param
-    name="lang"
-    value="{eutil:getLanguage($edition)}"/>,
-<param
-    name="docUri"
-    value="{$uri}"/>,
-<param
-    name="contextPath"
-    value="{$contextPath}"/>,
-(: parameters for the TEI Stypesheets :)
-<param
-    name="autoHead"
-    value="'false'"/>,
-<param
-    name="autoToc"
-    value="'false'"/>,
-<param
-    name="base"
-    value="{concat($base, '/../xslt/')}"/>,
-<param
-    name="footnoteBackLink"
-    value="true"/>,
-<param
-    name="graphicsPrefix"
-    value="{$imagePrefix}"/>, (:TODO frm XSLT <param name="graphicsPrefix"/>:)
-<param
-    name="numberHeadings"
-    value="'false'"/>,
-<param
-    name="pageLayout"
-    value="'CSS'"/>
+    (: parameters for Edirom-Online :)
+    <param name="lang" value="{eutil:getLanguage($edition)}"/>,
+    <param name="docUri" value="{$uri}"/>,
+    <param name="contextPath" value="{$contextPath}"/>,
+    (: parameters for the TEI Stypesheets :)
+    <param name="autoHead" value="'false'"/>,
+    <param name="autoToc" value="'false'"/>,
+    <param name="base" value="{concat($base, '/../xslt/')}"/>,
+    <param name="footnoteBackLink" value="true"/>,
+    <param name="graphicsPrefix" value="{$imagePrefix}"/>, (:TODO frm XSLT <param name="graphicsPrefix"/>:)
+    <param name="numberHeadings" value="'false'"/>,
+    <param name="pageLayout" value="'CSS'"/>
 )
 
-let $doc := if ($xslInstruction) then
-    (transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
-else
-    (transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
+let $doc :=
+    if ($xslInstruction) then
+        (transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
+    else
+        (transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>))
 
-let $doc := transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param
-        name="idPrefix"
-        value="{$idPrefix}"/></parameters>)
+let $doc :=
+    transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'),
+        <parameters>
+            <param name="idPrefix" value="{$idPrefix}"/></parameters>
+    )
 
 let $body := $doc//xhtml:body
 

From bbbe6e92238a44e9b072f1231ecfe0e5fda479f5 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:31:29 +0100
Subject: [PATCH 063/103] Update getWorkID.xql

---
 add/data/xql/getWorkID.xql | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/add/data/xql/getWorkID.xql b/add/data/xql/getWorkID.xql
index 44b786926..40b093feb 100644
--- a/add/data/xql/getWorkID.xql
+++ b/add/data/xql/getWorkID.xql
@@ -1,21 +1,6 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2014 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -24,17 +9,24 @@ xquery version "3.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace edirom = "http://www.edirom.de/ns/1.3";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $workId := request:get-parameter('workId', '')
 return
-    if (doc($uri)//edirom:work[@xml:id = $workId])
-    then
+    if (doc($uri)//edirom:work[@xml:id = $workId]) then
         ($workId)
     else
         (work:findWorkID($uri))

From 96473b455c48edd88698c125a99ab769100ac885 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:32:48 +0100
Subject: [PATCH 064/103] Update getWorks.xql

---
 add/data/xql/getWorks.xql | 44 +++++++++++++++------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index 0824c30c1..8e0667666 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -1,23 +1,6 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getWorks.xql 1324 2012-05-15 13:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -26,23 +9,30 @@ xquery version "1.0";
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace request = "http://exist-db.org/xquery/request";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('editionId', '')
 let $workUris := edition:getWorkUris($uri)
 
 return
-    concat('[',
-    string-join(
-    
-    for $workUri in $workUris
-    return
-        work:toJSON($workUri, $uri)
-    
-    , ','),
+    concat(
+        '[',
+        string-join(
+            for $workUri in $workUris
+            return
+                work:toJSON($workUri, $uri)
+        , ','),
     ']')

From ac075d89c2479ec18b458f1312c5078668c8177d Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:33:20 +0100
Subject: [PATCH 065/103] Update getWorks.xql

---
 add/data/xql/getWorks.xql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index 8e0667666..811b09993 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -28,6 +28,7 @@ let $uri := request:get-parameter('editionId', '')
 let $workUris := edition:getWorkUris($uri)
 
 return
+(: JSON serialization of map instad of text serialization with concat :)
     concat(
         '[',
         string-join(

From 3fa48768bf7574017fe4e248410fa6744d47cb4e Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:34:05 +0100
Subject: [PATCH 066/103] Update getXml.xql

---
 add/data/xql/getXml.xql | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/add/data/xql/getXml.xql b/add/data/xql/getXml.xql
index ac95964e8..ee4b53b35 100644
--- a/add/data/xql/getXml.xql
+++ b/add/data/xql/getXml.xql
@@ -1,40 +1,30 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: getXml.xql 1219 2012-01-20 08:33:28Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 declare option exist:serialize "method=xml media-type=text/xml omit-xml-declaration=no indent=yes";
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $internalId := request:get-parameter('internalId', '')
 let $doc := eutil:getDoc($uri)/root()
 let $internal := $doc/id($internalId)
 
 return
-    if (exists($internal))
-    then
+    if (exists($internal)) then
         ($internal)
     else
         ($doc)

From ace57d0719c3a0430e0175cbd64d1a8b3cb17c04 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:35:08 +0100
Subject: [PATCH 067/103] Update getZone.xql

---
 add/data/xql/getZone.xql | 48 ++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/add/data/xql/getZone.xql b/add/data/xql/getZone.xql
index 72c2d9084..98ef84fb0 100644
--- a/add/data/xql/getZone.xql
+++ b/add/data/xql/getZone.xql
@@ -1,21 +1,6 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
@@ -24,14 +9,18 @@ xquery version "1.0";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request = "http://exist-db.org/xquery/request";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
+declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
-
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
+(: OPTION DECLARATIONS ============================================= :)
+
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
+(: QUERY BODY ============================================================== :)
 
 let $uri := request:get-parameter('uri', '')
 let $zoneId := request:get-parameter('zoneId', '')
@@ -39,14 +28,15 @@ let $zoneId := request:get-parameter('zoneId', '')
 let $mei := doc($uri)/root()
 let $zone := $mei/id($zoneId)
 
-return
-    (
-    concat('{',
-    'zoneId: "', $zone/string(@xml:id), '", ',
-    'pageId: "', $zone/../string(@xml:id), '", ',
-    'ulx: "', $zone/string(@ulx), '", ',
-    'uly: "', $zone/string(@uly), '", ',
-    'lrx: "', $zone/string(@lrx), '", ',
-    'lry: "', $zone/string(@lry), '"',
-    '}')
+return (
+    concat(
+        '{',
+        'zoneId: "', $zone/string(@xml:id), '", ',
+        'pageId: "', $zone/../string(@xml:id), '", ',
+        'ulx: "', $zone/string(@ulx), '", ',
+        'uly: "', $zone/string(@uly), '", ',
+        'lrx: "', $zone/string(@lrx), '", ',
+        'lry: "', $zone/string(@lry), '"',
+        '}'
     )
+)

From 0a47835df4f967011312a1ef92ff3da66d6865db Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:36:36 +0100
Subject: [PATCH 068/103] Update loginToTextGrid.xql

---
 add/data/xql/loginToTextGrid.xql | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/add/data/xql/loginToTextGrid.xql b/add/data/xql/loginToTextGrid.xql
index de6f363ce..8746cd573 100644
--- a/add/data/xql/loginToTextGrid.xql
+++ b/add/data/xql/loginToTextGrid.xql
@@ -1,7 +1,14 @@
-xquery version "3.0";
+xquery version "3.1";
+(:
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+:)
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
 declare namespace html = "http://www.w3.org/1999/xhtml";
 
+(: QUERY BODY ============================================================== :)
+
 let $loginname := request:get-parameter('loginname', '')
 let $password := request:get-parameter('password', '')
 let $authZinstance := request:get-parameter('authZinstance', 'textgrid-ws3.sub.uni-goettingen.de')
@@ -10,17 +17,14 @@ let $login := httpclient:get(xs:anyURI('https://textgridlab.org/1.0/WebAuthN/Tex
 false(), ())
 
 return
-    if ($login//html:meta[@name = 'remote_principal'])
-    then
-        (
+    if ($login//html:meta[@name = 'remote_principal']) then (
         let $userName := $login//html:meta[@name = 'remote_principal']/string(@content)
         let $sessionId := $login//html:meta[@name = 'rbac_sessionid']/string(@content)
         let $cookie := response:set-cookie('edirom_online_textgrid_username', $userName, (), false(), '.freischuetz-digital.de', '/')
         let $cookie := response:set-cookie('edirom_online_textgrid_sessionId', $sessionId, (), false(), '.freischuetz-digital.de', '/')
         return
             '{success: true, msg: "Login successful", user: "' || $userName || '"}'
-        )
-    else
-        (
+    
+    ) else (
         '{success: false, msg: "Login failed"}'
-        )
+    )

From 0f13066ff5451d98e14783c22b6fe87093e3fdda Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:45:25 +0100
Subject: [PATCH 069/103] Update search.xql

---
 add/data/xql/search.xql | 220 +++++++++++++++++-----------------------
 1 file changed, 91 insertions(+), 129 deletions(-)

diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 0c9f9e707..4495ea0ee 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -1,34 +1,30 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
+(: IMPORTS ========================================================= :)
+
 import module namespace kwic = "http://exist-db.org/xquery/kwic";
+
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace tei = "http://www.tei-c.org/ns/1.0";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace tei = "http://www.tei-c.org/ns/1.0";
+
+(: OPTION DECLARATIONS ============================================= :)
 
 (:declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";:)
 
+(: VARIABLE DECLARATIONS =========================================== :)
+
 declare variable $lang := request:get-parameter('lang', '');
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function local:filter($node as node(), $mode as xs:string) as xs:string? {
     if ($mode eq 'before') then
         concat($node, ' ')
@@ -38,131 +34,102 @@ declare function local:filter($node as node(), $mode as xs:string) as xs:string?
 
 declare function local:getPath($node as node()) as xs:string {
     let $localName := local-name($node)
-    let $parentPath := if ($node/..) then
-        (local:getPath($node/..))
-    else
-        ('')
+    let $parentPath :=
+        if ($node/..) then
+            (local:getPath($node/..))
+        else
+            ('')
     return
         concat($parentPath, '/', $localName, '[', count($node/preceding-sibling::*[local-name(.) eq $localName]) + 1, ']')
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $term := request:get-parameter('term', '')
 
-let $trans := <xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="2.0">
-    <!--<xsl:output encoding="UTF-8" media-type="text/xhmtl" method="xhtml" omit-xml-declaration="yes" indent="yes"/>-->
-    <xsl:template
-        match="/">
-        <xsl:apply-templates/>
-    </xsl:template>
-    <xsl:template
-        match="a">
-        <xsl:variable
-            name="elem"
-            select="."/>
-        <span
-            class="hit"
-            onclick="{{$elem/string(@href)}}">
+let $trans :=
+    <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+        <!--<xsl:output encoding="UTF-8" media-type="text/xhmtl" method="xhtml" omit-xml-declaration="yes" indent="yes"/>-->
+        <xsl:template
+            match="/">
             <xsl:apply-templates/>
-        </span>
-    </xsl:template>
-    <xsl:template
-        match="element() | @*">
-        <xsl:copy>
-            <xsl:apply-templates
-                select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>
+        </xsl:template>
+        <xsl:template match="a">
+            <xsl:variable name="elem" select="."/>
+            <span class="hit" onclick="{{$elem/string(@href)}}">
+                <xsl:apply-templates/>
+            </span>
+        </xsl:template>
+        <xsl:template match="element() | @*">
+            <xsl:copy>
+                <xsl:apply-templates select="@* | node()"/>
+            </xsl:copy>
+        </xsl:template>
+    </xsl:stylesheet>
 
 let $return :=
-<div
-    class="searchResult">{
+    <div class="searchResult">{
         
         let $search :=
-        if (string-length($term) gt 0)
-        then
-            (
-            collection('/db')//tei:text[ft:query(., $term)]/ancestor::tei:TEI
-            | collection('/db')//tei:title[ft:query(., $term)]/ancestor::tei:TEI
-            | collection('/db')//mei:mei[ft:query(., $term)]
-            | collection('/db')//mei:title[ft:query(., $term)]/ancestor::mei:mei
-            | collection('/db')//mei:annot[ft:query(., $term)][@type eq 'editorialComment']
-            | collection('/db')//mei:annot[contains(@xml:id, $term)]
-            )
-        else
-            ()
+            if (string-length($term) gt 0) then (
+                collection('/db')//tei:text[ft:query(., $term)]/ancestor::tei:TEI
+                | collection('/db')//tei:title[ft:query(., $term)]/ancestor::tei:TEI
+                | collection('/db')//mei:mei[ft:query(., $term)]
+                | collection('/db')//mei:title[ft:query(., $term)]/ancestor::mei:mei
+                | collection('/db')//mei:annot[ft:query(., $term)][@type eq 'editorialComment']
+                | collection('/db')//mei:annot[contains(@xml:id, $term)]
+            ) else
+                ()
         
-        return
-            (
+        return (
             
-            if (count($search) gt 0)
-            then
-                (if ($lang = 'de')
-                then
-                    (<div
-                        class="searchResultOverview">Die Suche ergab Treffer in <span
-                            class="num">{count($search)}</span> Objekten:</div>)
+            if (count($search) gt 0) then (
+                if ($lang = 'de') then
+                    (<div class="searchResultOverview">Die Suche ergab Treffer in <span class="num">{count($search)}</span> Objekten:</div>)
                 else
-                    (<div
-                        class="searchResultOverview">Hits in <span
-                            class="num">{count($search)}</span> objects:</div>)
-                )
-            else
-                (if ($lang = 'de')
-                then
-                    (<div
-                        class="searchResultOverview">Die Suche ergab keine Treffer.</div>)
+                    (<div class="searchResultOverview">Hits in <span class="num">{count($search)}</span> objects:</div>)
+            ) else (
+                if ($lang = 'de') then
+                    (<div class="searchResultOverview">Die Suche ergab keine Treffer.</div>)
                 else
-                    (<div
-                        class="searchResultOverview">No match found.</div>)
-                )
-            ,
+                    (<div class="searchResultOverview">No match found.</div>)
+            ),
             
             for $hit in $search
-            
             let $expanded := kwic:expand($hit)
             let $hitCount := count($expanded//*[./exist:match])
             let $doc := $hit/root()
             let $uri := document-uri($doc)
             let $title := (: Annotation :)
-            if (local-name($hit) eq 'annot')
-            then
-                (eutil:getLocalizedTitle($hit, $lang))
+                if (local-name($hit) eq 'annot') then
+                    (eutil:getLocalizedTitle($hit, $lang))
+                
                 (: Work :)
-            else
-                if (exists($doc//mei:mei) and exists($doc//mei:work))
-                then
+                else if (exists($doc//mei:mei) and exists($doc//mei:work)) then
                     (eutil:getLocalizedTitle($doc//mei:work/mei:titleStmt, $lang))
-                    (: Source / Score :)
+                
+                (: Source / Score :)
+                else if (exists($doc//mei:mei) and exists($doc//mei:source)) then
+                    (eutil:getLocalizedTitle($doc//mei:source/mei:titleStmt, $lang))
+                
+                (: Text :)
+                else if (exists($doc/tei:TEI)) then
+                    (eutil:getLocalizedTitle($doc//tei:titleStmt, $lang))
+                
                 else
-                    if (exists($doc//mei:mei) and exists($doc//mei:source))
-                    then
-                        (eutil:getLocalizedTitle($doc//mei:source/mei:titleStmt, $lang))
-                        (: Text :)
-                    else
-                        if (exists($doc/tei:TEI))
-                        then
-                            (eutil:getLocalizedTitle($doc//tei:titleStmt, $lang))
-                        else
-                            (string('unknown'))
-                order by ft:score($hit) descending
+                    (string('unknown'))
+            
+            order by ft:score($hit) descending
             return
-                <div
-                    class="searchResultDoc">
-                    <div
-                        class="doc"><span
-                            class="resultTitle"
-                            onclick="loadLink('xmldb:exist://{$uri}{
-                                    if (local-name($hit) eq 'annot') then
-                                        (concat('#', $hit/@xml:id))
-                                    else
-                                        ()
+                <div class="searchResultDoc">
+                    <div class="doc"><span class="resultTitle" onclick="loadLink('xmldb:exist://{$uri}{
+                            if (local-name($hit) eq 'annot') then
+                                (concat('#', $hit/@xml:id))
+                            else
+                                ()
                                 }?term={replace($term, '"', '\\"')}');">{$title}</span><span
                             class="resultCount">{
-                                if ($lang = 'de')
-                                then
+                                if ($lang = 'de') then
                                     (concat('(', $hitCount, ' Treffer', ')'))
                                 else
                                     (concat('(', $hitCount, ' hit', if ($hitCount gt 1) then
@@ -174,25 +141,23 @@ let $return :=
                         (
                         for $match at $i in $expanded//*[./exist:match]
                         let $path := local:getPath($match)
-                        let $internalId := if (local-name($hit) eq 'annot') then
-                            ($hit/@xml:id)
-                        else
-                            if ($match/@xml:id) then
+                        let $internalId :=
+                            if (local-name($hit) eq 'annot') then
+                                ($hit/@xml:id)
+                            else if ($match/@xml:id) then
                                 ($match/@xml:id)
                             else
                                 ()
+                        
                         return
-                            <div
-                                class="hitP"
+                            <div class="hitP"
                                 style="{
                                         if ($i gt 3) then
                                             ('display:none;')
                                         else
                                             ('')
                                     }">{
-                                    kwic:get-summary($match, ($match/exist:match)[1], <config
-                                        width="100"
-                                        link="loadLink('xmldb:exist://{$uri}{
+                                    kwic:get-summary($match, ($match/exist:match)[1], <config width="100" link="loadLink('xmldb:exist://{$uri}{
                                                 if ($internalId) then
                                                     (concat('#', $internalId))
                                                 else
@@ -201,11 +166,8 @@ let $return :=
                                     util:function(xs:QName("local:filter"), 2))
                                 }</div>
                         ,
-                        if ($hitCount gt 3)
-                        then
-                            (<div
-                                class="showMore"
-                                onclick="$(this).parent().find('div').show(); $(this).hide();">{
+                        if ($hitCount gt 3) then
+                            (<div class="showMore" onclick="$(this).parent().find('div').show(); $(this).hide();">{
                                     if ($lang = 'de') then
                                         ('Alle Treffer zeigen')
                                     else

From 13c84ae2016737781c75b44342cd28e854c121a1 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 12:55:37 +0100
Subject: [PATCH 070/103] Update annotation.xqm

---
 add/data/xqm/annotation.xqm | 178 ++++++++++++++++++++----------------
 1 file changed, 99 insertions(+), 79 deletions(-)

diff --git a/add/data/xqm/annotation.xqm b/add/data/xqm/annotation.xqm
index 7d70812f5..22734dcc8 100644
--- a/add/data/xqm/annotation.xqm
+++ b/add/data/xqm/annotation.xqm
@@ -1,58 +1,52 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: annotation.xqm 1455 2012-10-11 10:42:55Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-
 (:~
 : This module provides library functions for Annotations
 :
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 : @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
 :)
+
 module namespace annotation = "http://www.edirom.de/xquery/annotation";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: IMPORTS ========================================================= :)
+
 import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
 
-declare namespace request="http://exist-db.org/xquery/request";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare namespace request="http://exist-db.org/xquery/request";
 declare namespace system="http://exist-db.org/xquery/system";
 declare namespace transform="http://exist-db.org/xquery/transform";
 
+(: FUNCTION DECLARATIONS =========================================== :)
+
 declare function annotation:getLocalizedLabel($node) {
-  let $lang := request:get-parameter('lang', '')
-  let $nodeName := local-name($node)
+
+    let $lang := request:get-parameter('lang', '')
+    let $nodeName := local-name($node)
   
-  let $label :=
-    if($nodeName = 'category') (: new style, i.e. //category/label :)
-    then(
-        if ($node/mei:label[@xml:lang = $lang])
-        then $node/mei:label[@xml:lang = $lang]/text()
-        else $node/mei:label[1]/text()
-    )
-    else if($nodeName = 'term') (: old style, i.e. //term/name :)
-    then(eutil:getLocalizedName($node, $lang))
-    else($nodeName)
+    let $label :=
+        if($nodeName = 'category') then (
+            (: new style, i.e. //category/label :)
+            if ($node/mei:label[@xml:lang = $lang]) then
+                $node/mei:label[@xml:lang = $lang]/text()
+            else
+                $node/mei:label[1]/text()
+        
+        ) else if($nodeName = 'term') then(
+            (: old style, i.e. //term/name :)
+            eutil:getLocalizedName($node, $lang)
+        
+        ) else
+            ($nodeName)
   
-  return $label
+    return $label
 };
 
 (:~
@@ -62,6 +56,7 @@ declare function annotation:getLocalizedLabel($node) {
 : @return The JSON representation
 :)
 declare function annotation:annotationsToJSON($uri as xs:string, $edition as xs:string) as map(*)* {
+    
     let $doc := doc($uri)
     let $annos := $doc//mei:annot[@type = 'editorialComment']
     return
@@ -69,7 +64,6 @@ declare function annotation:annotationsToJSON($uri as xs:string, $edition as xs:
         return annotation:toJSON($anno, $edition)
 };
 
-
 (:~
 : Returns a JSON representation of an Annotation
 :
@@ -77,40 +71,53 @@ declare function annotation:annotationsToJSON($uri as xs:string, $edition as xs:
 : @return The JSON representation
 :)
 declare function annotation:toJSON($anno as element(), $edition as xs:string) as map(*) {
+    
     let $id := $anno/string(@xml:id)
     let $lang := request:get-parameter('lang', '')
     let $genericTitle := eutil:getLocalizedTitle($anno, $lang)
+    
     let $title :=
-        if(exists($genericTitle) and string-length($genericTitle) gt 0)
-        then($genericTitle)
-        else(annotation:generateTitle($anno))
+        if(exists($genericTitle) and string-length($genericTitle) gt 0) then
+            ($genericTitle)
+        else
+            (annotation:generateTitle($anno))
+    
     let $doc := $anno/root()
     let $prio := annotation:getPriorityLabel($anno)
     let $pList.raw := distinct-values(tokenize(normalize-space($anno/@plist), ' '))
-    let $pList := for $p in $pList.raw
-                    return if ( contains($p, '#'))
-                                then (substring-before($p, '#'))
-                                else $p
+    
+    let $pList :=
+        for $p in $pList.raw
+        return
+            if ( contains($p, '#')) then
+                (substring-before($p, '#'))
+            else
+                $p
+    
     let $sigla :=
         for $p in distinct-values($pList)
         let $pDoc :=
-            if(doc-available($p))
-            then(doc($p))
-            else(collection(eutil:getPreference('edition_path', $edition))//id($p)/root())
+            if(doc-available($p)) then
+                (doc($p))
+            else
+                (collection(eutil:getPreference('edition_path', $edition))//id($p)/root())
         return
-            if ($pDoc//mei:sourceDesc/mei:source/mei:identifier[@type = 'siglum'])
-            then ($pDoc//mei:sourceDesc/mei:source/mei:identifier[@type = 'siglum']/text())
-            else if ($pDoc//mei:manifestationList/mei:manifestation/mei:identifier[@type = 'siglum'])
-            then ($pDoc//mei:manifestationList/mei:manifestation/mei:identifier[@type = 'siglum']/text())
-            else ($pDoc//mei:title[@type = 'siglum']/text())
+            if ($pDoc//mei:sourceDesc/mei:source/mei:identifier[@type = 'siglum']) then
+                ($pDoc//mei:sourceDesc/mei:source/mei:identifier[@type = 'siglum']/text())
+            else if ($pDoc//mei:manifestationList/mei:manifestation/mei:identifier[@type = 'siglum']) then
+                ($pDoc//mei:manifestationList/mei:manifestation/mei:identifier[@type = 'siglum']/text())
+            else
+                ($pDoc//mei:title[@type = 'siglum']/text())
     
     let $classes := tokenize(replace(normalize-space($anno/@class),'#',''),' ')
     let $catURIs := distinct-values((tokenize(replace($anno/mei:ptr[@type = 'categories']/@target,'#',''),' '), $classes[contains(.,'annotation.category.')]))
     
-    let $cats := string-join(
-                    for $u in $catURIs
-                    return annotation:category_getName($doc/id($u), eutil:getLanguage($edition))
-                 , ', ')
+    let $cats :=
+        string-join(
+            for $u in $catURIs
+            return annotation:category_getName($doc/id($u), eutil:getLanguage($edition))
+         , ', ')
+     
     let $count := count($anno/preceding::mei:annot[@type = 'editorialComment']) + 1
     
     return
@@ -145,19 +152,29 @@ declare function annotation:generateTitle($anno as element()) {
 :)
 declare function annotation:getContent($anno as element(), $idPrefix as xs:string, $edition as xs:string?) {
 
-    
     (:let $xsltBase := concat('file:', system:get-module-load-path(), '/../xslt/'):)
     let $xsltBase := concat(replace(system:get-module-load-path(), 'embedded-eXist-server', ''), '/../xslt/') (: TODO: Prüfen, wie wir an dem replace vorbei kommen:)
     
     let $edition := request:get-parameter('edition', '')
-	let $imageserver :=  eutil:getPreference('image_server', $edition)
-	let $imageBasePath := if($imageserver = 'leaflet')
-		then(eutil:getPreference('leaflet_prefix', $edition))
-		else(eutil:getPreference('image_prefix', $edition))
+    let $imageserver :=  eutil:getPreference('image_server', $edition)
+    let $imageBasePath :=
+        if($imageserver = 'leaflet') then
+            (eutil:getPreference('leaflet_prefix', $edition))
+        else
+            (eutil:getPreference('image_prefix', $edition))
+    
     let $language := eutil:getLanguage($edition)
     
     let $p := $anno/mei:p[not(@xml:lang) or @xml:lang = $language]
-    let $html := transform:transform($p,concat($xsltBase,'meiP2html.xsl'),<parameters><param name="idPrefix" value="{$idPrefix}"/><param name="imagePrefix" value="{$imageBasePath}"/></parameters>)
+    
+    let $html :=
+        transform:transform($p,concat($xsltBase,'meiP2html.xsl'),
+            <parameters>
+                <param name="idPrefix" value="{$idPrefix}"/>
+                <param name="imagePrefix" value="{$imageBasePath}"/>
+            </parameters>
+        )
+    
     return
         $html
 };
@@ -185,20 +202,21 @@ declare function annotation:getPriority($anno as element()) as xs:string* {
     let $uri := $anno/mei:ptr[@type eq 'priority']/string(@target)
     let $lang := request:get-parameter('lang', '')
 
-    let $doc := if(starts-with($uri,'#'))
-                then($anno/root())
-                else(doc(substring-before($uri,'#')))
-                
+    let $doc :=
+        if(starts-with($uri,'#')) then
+            ($anno/root())
+        else
+            (doc(substring-before($uri,'#')))
+    
     let $locId := substring-after($uri,'#')
     
     let $elem := $doc/id($locId)
     
     return
-       
-        if(local-name($elem) eq 'term')
-        then(eutil:getLocalizedName($elem, $lang))
-        else($locId)
-   
+        if(local-name($elem) eq 'term') then
+            (eutil:getLocalizedName($elem, $lang))
+        else
+            ($locId)
 };
 
 declare function annotation:getPriorityLabel($anno) as xs:string* {
@@ -207,21 +225,23 @@ declare function annotation:getPriorityLabel($anno) as xs:string* {
     let $oldEdiromStyle := local-name($anno) = 'annot' and exists($anno/mei:ptr[@type eq 'priority'])
     
     return
-        if($isPrioElemAlready)
-        then(annotation:getLocalizedLabel($anno))
-        else if($oldEdiromStyle)
-        then(annotation:getPriority($anno))
-        else(
-            
+        if($isPrioElemAlready) then
+            (annotation:getLocalizedLabel($anno))
+        
+        else if($oldEdiromStyle) then
+            (annotation:getPriority($anno))
+        
+        else (
             let $classes := tokenize(normalize-space($anno/@class),' ')
             let $classBasedUri := $classes[starts-with(.,'#ediromAnnotPrio')]
             
             let $labels :=
                 for $uri in $classBasedUri
                 let $doc :=
-                    if(starts-with($uri,'#'))
-                    then($anno/root())
-                    else(doc(substring-before($uri,'#')))
+                    if(starts-with($uri,'#')) then
+                        ($anno/root())
+                    else
+                        (doc(substring-before($uri,'#')))
                 
                 let $prioElem := $doc/id(replace($uri,'#',''))
                 let $label := annotation:getLocalizedLabel($prioElem)

From 3689635d98b78a876aa6e5b242d22a39f8be8849 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:00:35 +0100
Subject: [PATCH 071/103] Update edition.xqm

---
 add/data/xqm/edition.xqm | 168 +++++++++++++++++++--------------------
 1 file changed, 81 insertions(+), 87 deletions(-)

diff --git a/add/data/xqm/edition.xqm b/add/data/xqm/edition.xqm
index 6c2bb17a5..292705cca 100644
--- a/add/data/xqm/edition.xqm
+++ b/add/data/xqm/edition.xqm
@@ -1,43 +1,32 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: edition.xqm 1334 2012-06-14 12:40:33Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-
 (:~
-: This module provides library functions for Editions
-:
-: @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-:)
+ : This module provides library functions for Editions
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ :)
 module namespace edition = "http://www.edirom.de/xquery/edition";
 
+(: IMPORTS ========================================================= :)
+
+import module namespace functx="http://www.functx.com";
+
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace edirom="http://www.edirom.de/ns/1.3";
 declare namespace xlink="http://www.w3.org/1999/xlink";
 
-import module namespace functx="http://www.functx.com";
+(: FUNCTION DECLARATIONS =========================================== :)
+
 (:~
-: Returns a JSON representation of an Edition
-:
-: @param $uri The URI of the Edition's document to process
-: @return The JSON representation
-:)
+ : Returns a JSON representation of an Edition
+ :
+ : @param $uri The URI of the Edition's document to process
+ : @return The JSON representation
+ :)
 declare function edition:toJSON($uri as xs:string) as xs:string {
     
     let $edition := doc($uri)/edirom:edition
@@ -51,10 +40,10 @@ declare function edition:toJSON($uri as xs:string) as xs:string {
 };
 
 (:~
-: Returns a list of URIs pointing to Editions
-:
-: @return The list of URIs
-:)
+ : Returns a list of URIs pointing to Editions
+ :
+ : @return The list of URIs
+ :)
 declare function edition:getUris() as xs:string* {
     
     for $edition in collection('/db/apps')//edirom:edition
@@ -62,50 +51,49 @@ declare function edition:getUris() as xs:string* {
 };
 
 (:~
-: Returns a list of URIs pointing to referenced Works
-:
-: @param $uri The URI of the Edition's document to process
-: @return The list of URIs
-:)
+ : Returns a list of URIs pointing to referenced Works
+ :
+ : @param $uri The URI of the Edition's document to process
+ : @return The list of URIs
+ :)
 declare function edition:getWorkUris($uri as xs:string) as xs:string* {
     
     doc($uri)//edirom:work/@xlink:href ! string(.)
 };
 
 (:~
-: Returns the URI for a specific language file
-:
-: @param $uri The URI of the Edition's document to process
-: @param $lang The language
-: @return The URI
-:)
+ : Returns the URI for a specific language file
+ :
+ : @param $uri The URI of the Edition's document to process
+ : @param $lang The language
+ : @return The URI
+ :)
 declare function edition:getLanguageFileURI($uri as xs:string, $lang as xs:string) as xs:string {
 
     let $doc := (
-        if(doc-available($uri))
-        then
+        if(doc-available($uri)) then
             doc($uri)
         else
             doc(edition:findEdition($uri))
     )
     return
-        if ($doc//edirom:language[@xml:lang eq $lang]/@xlink:href => string() != "")
-        then
+        if ($doc//edirom:language[@xml:lang eq $lang]/@xlink:href => string() != "") then
             $doc//edirom:language[@xml:lang eq $lang]/@xlink:href => string()
         else
             ""
 };
 
 (:~
-: Returns the URI for a specific language file
-:
-: @param $uri The URI of the Edition's document to process
-: @return the edition's languages as defined in the edition file sorted as
-: complete languages in document-order followed by incomplete langauges in document-order
-:)
+ : Returns the URI for a specific language file
+ :
+ : @param $uri The URI of the Edition's document to process
+ : @return the edition's languages as defined in the edition file sorted as
+ : complete languages in document-order followed by incomplete langauges in document-order
+ :)
 declare function edition:getLanguageCodesSorted($uri as xs:string) as xs:string {
     
     let $editionDoc := doc($uri)
+    
     let $languagesComplete := (
         for $lang in $editionDoc//edirom:language
         let $langCode := $lang/@xml:lang
@@ -114,6 +102,7 @@ declare function edition:getLanguageCodesSorted($uri as xs:string) as xs:string
         return
             $langCode
     )
+    
     let $languagesIncomplete := (
         for $lang in $editionDoc//edirom:language
         let $langCode := $lang/@xml:lang
@@ -122,38 +111,39 @@ declare function edition:getLanguageCodesSorted($uri as xs:string) as xs:string
         return
             $langCode
     )
+    
     return
         ($languagesComplete, $languagesIncomplete)
 };
 
 (:~
-: Returns the URI for the preferences file
-:
-: @param $uri The URI of the Edition's document to process
-: @return The URI of the preference file
-:)
+ : Returns the URI for the preferences file
+ :
+ : @param $uri The URI of the Edition's document to process
+ : @return The URI of the preference file
+ :)
 declare function edition:getPreferencesURI($uri as xs:string) as xs:string {
     
     doc($uri)//edirom:preferences/@xlink:href => string()
 };
 
 (:~
-: Returns the URI of the edition specified by the submitted $editionID parameter.
-: If $editionID is the empty string, returns the URI of the first edition found in '/db/apps'.
-: If the submitted $editionID already qualifies to read a document, return $editionID unaltered.
-:
-: @param $editionID The '@xml:id' of the edirom:edition document to process
-: @return The URI of the Edition file
-:)
+ : Returns the URI of the edition specified by the submitted $editionID parameter.
+ : If $editionID is the empty string, returns the URI of the first edition found in '/db/apps'.
+ : If the submitted $editionID already qualifies to read a document, return $editionID unaltered.
+ :
+ : @param $editionID The '@xml:id' of the edirom:edition document to process
+ : @return The URI of the Edition file
+ :)
 declare function edition:findEdition($editionID as xs:string?) as xs:string {
-    if(not($editionID) or $editionID eq '')
-    then(
+    
+    if(not($editionID) or $editionID eq '') then(
         let $edition := (collection('/db/apps')//edirom:edition)[1]
         return 'xmldb:exist://' || document-uri($edition/root())
-    )
-    else if(doc-available($editionID)) (:already a qualified URI :)
-        then
-            $editionID
+    
+    ) else if(doc-available($editionID)) (:already a qualified URI :) then
+        $editionID
+    
     else (
         let $edition := collection('/db/apps')//edirom:edition/id($editionID)
         return 'xmldb:exist://' || document-uri($edition/root())
@@ -161,27 +151,31 @@ declare function edition:findEdition($editionID as xs:string?) as xs:string {
 };
 
 (:~
-: Returns the name of the edition specified by $uri
-:
-: @param $uri The URI of the Edition's document to process
-: @return the text contents of edirom:edition/edirom:editionName
-:)
+ : Returns the name of the edition specified by $uri
+ :
+ : @param $uri The URI of the Edition's document to process
+ : @return the text contents of edirom:edition/edirom:editionName
+ :)
 declare function edition:getName($uri as xs:string) as xs:string {
-  doc($uri)/edirom:edition/edirom:editionName => fn:normalize-space()
+
+    doc($uri)/edirom:edition/edirom:editionName => fn:normalize-space()
+
 };
 
 (:~
-: Returns the frontend URI of the edition, e.g. if the edirom:edition file
-: submitted via $editionUri is xmldb:exist///db/apps/editionFolder/edition.xml
-: and the $contextPath is /exist the string returned woud be /exist/apps/editionFolder
-:
-: @param $editionUri The xmldb-collection-path of the edition
-: @param $contextPath the request:get-context-path() of the frontend
-:
-: @return xs:string
-:)
+ : Returns the frontend URI of the edition, e.g. if the edirom:edition file
+ : submitted via $editionUri is xmldb:exist///db/apps/editionFolder/edition.xml
+ : and the $contextPath is /exist the string returned woud be /exist/apps/editionFolder
+ :
+ : @param $editionUri The xmldb-collection-path of the edition
+ : @param $contextPath the request:get-context-path() of the frontend
+ :
+ : @return xs:string
+ :)
 declare function edition:getFrontendUri($editionUri as xs:string, $contextPath as xs:string) as xs:string {
+
     let $editionContext := functx:substring-before-last(substring-after($editionUri, 'xmldb:exist:///db/'), '/')
+
     return
         string-join(($contextPath, $editionContext), '/')
 };

From 12174794750c7cae3c36bac294ac22ce2cc5e543 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:01:47 +0100
Subject: [PATCH 072/103] Update annotation.xqm

---
 add/data/xqm/annotation.xqm | 104 ++++++++++++++++++------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/add/data/xqm/annotation.xqm b/add/data/xqm/annotation.xqm
index 22734dcc8..eb16542d3 100644
--- a/add/data/xqm/annotation.xqm
+++ b/add/data/xqm/annotation.xqm
@@ -4,11 +4,11 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 :)
 
 (:~
-: This module provides library functions for Annotations
-:
-: @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-: @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
-:)
+ : This module provides library functions for Annotations
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ : @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
+ :)
 
 module namespace annotation = "http://www.edirom.de/xquery/annotation";
 
@@ -50,11 +50,11 @@ declare function annotation:getLocalizedLabel($node) {
 };
 
 (:~
-: Returns a JSON representation of all Annotations of a document
-:
-: @param $uri The document to process
-: @return The JSON representation
-:)
+ : Returns a JSON representation of all Annotations of a document
+ :
+ : @param $uri The document to process
+ : @return The JSON representation
+ :)
 declare function annotation:annotationsToJSON($uri as xs:string, $edition as xs:string) as map(*)* {
     
     let $doc := doc($uri)
@@ -65,11 +65,11 @@ declare function annotation:annotationsToJSON($uri as xs:string, $edition as xs:
 };
 
 (:~
-: Returns a JSON representation of an Annotation
-:
-: @param $anno The Annotation to process
-: @return The JSON representation
-:)
+ : Returns a JSON representation of an Annotation
+ :
+ : @param $anno The Annotation to process
+ : @return The JSON representation
+ :)
 declare function annotation:toJSON($anno as element(), $edition as xs:string) as map(*) {
     
     let $id := $anno/string(@xml:id)
@@ -132,11 +132,11 @@ declare function annotation:toJSON($anno as element(), $edition as xs:string) as
 };
 
 (:~
-: Generates a title for annotation which have none
-:
-: @param $anno The Annotation to process
-: @return The string result
-:)
+ : Generates a title for annotation which have none
+ :
+ : @param $anno The Annotation to process
+ : @return The string result
+ :)
 declare function annotation:generateTitle($anno as element()) {
     let $mdiv.n := 'Satz ' || string(count($anno/ancestor::mei:mdiv/preceding-sibling::mei:mdiv) + 1)
     let $measure := 'Takt ' || $anno/ancestor::mei:measure/string(@n)
@@ -144,12 +144,12 @@ declare function annotation:generateTitle($anno as element()) {
 };
 
 (:~
-: Returns a HTML representation of an Annotation's content
-:
-: @param $anno The Annotation to process
-: @param $idPrefix A prefix for all ids (because of uniqueness in application)
-: @return The HTML representation
-:)
+ : Returns a HTML representation of an Annotation's content
+ :
+ : @param $anno The Annotation to process
+ : @param $idPrefix A prefix for all ids (because of uniqueness in application)
+ : @return The HTML representation
+ :)
 declare function annotation:getContent($anno as element(), $idPrefix as xs:string, $edition as xs:string?) {
 
     (:let $xsltBase := concat('file:', system:get-module-load-path(), '/../xslt/'):)
@@ -180,23 +180,23 @@ declare function annotation:getContent($anno as element(), $idPrefix as xs:strin
 };
 
 (:~
-: Returns a HTML representation of an Annotation's title
-:
-: @param $anno The Annotation to process
-: @param $idPrefix A prefix for all ids (because of uniqueness in application)
-: @return The HTML representation
-:)
+ : Returns a HTML representation of an Annotation's title
+ :
+ : @param $anno The Annotation to process
+ : @param $idPrefix A prefix for all ids (because of uniqueness in application)
+ : @return The HTML representation
+ :)
 declare function annotation:getTitle($anno as element(), $idPrefix as xs:string, $edition as xs:string?) {
 
     $anno/mei:title[not(@xml:lang) or @xml:lang = eutil:getLanguage($edition)]/text()
 };
 
 (:~
-: Returns an Annotation's priority
-:
-: @param $anno The Annotation to process
-: @return The priority
-:)
+ : Returns an Annotation's priority
+ :
+ : @param $anno The Annotation to process
+ : @return The priority
+ :)
 declare function annotation:getPriority($anno as element()) as xs:string* {
     
     let $uri := $anno/mei:ptr[@type eq 'priority']/string(@target)
@@ -263,11 +263,11 @@ declare function annotation:getCategories($anno as element()) as xs:string {
 };
 
 (:~
-: Returns an array of Annotation's categories
-:
-: @param $anno The Annotation to process
-: @return The categories (as comma separated string)
-:)
+ : Returns an array of Annotation's categories
+ :
+ : @param $anno The Annotation to process
+ : @return The categories (as comma separated string)
+ :)
 declare function annotation:getCategoriesAsArray($anno as element()) as xs:string* {
     
     let $doc := $anno/root()
@@ -297,11 +297,11 @@ declare function annotation:getCategoriesAsArray($anno as element()) as xs:strin
 };
 
 (:~
-: Returns a list of URIs addressed by an Annotation
-:
-: @param $anno The Annotation to process
-: @return The list
-:)
+ : Returns a list of URIs addressed by an Annotation
+ :
+ : @param $anno The Annotation to process
+ : @return The list
+ :)
 declare function annotation:getParticipants($anno as element()) as xs:string* {
     
     let $ps := tokenize($anno/@plist, ' ')
@@ -311,11 +311,11 @@ declare function annotation:getParticipants($anno as element()) as xs:string* {
 };
 
 (:~
-: Returns an annotation category's name
-:
-: @param $category The category to process
-: @return one name
-:)
+ : Returns an annotation category's name
+ :
+ : @param $category The category to process
+ : @return one name
+ :)
 declare function annotation:category_getName($category as element(), $language as xs:string) {
     annotation:getLocalizedLabel($category)
     (:let $names := $category/mei:name

From e98c50bf691687030f29aba2f266500039b413ca Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:08:56 +0100
Subject: [PATCH 073/103] Update source.xqm

---
 add/data/xqm/source.xqm | 158 ++++++++++++++++++++++------------------
 1 file changed, 88 insertions(+), 70 deletions(-)

diff --git a/add/data/xqm/source.xqm b/add/data/xqm/source.xqm
index 001ab77cb..cb60b201f 100644
--- a/add/data/xqm/source.xqm
+++ b/add/data/xqm/source.xqm
@@ -1,121 +1,139 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: source.xqm 1324 2012-05-15 13:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-
 (:~
-: This module provides library functions for Sources
-:
-: @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-: @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
-:)
+ : This module provides library functions for Sources
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ : @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
+ :)
 module namespace source = "http://www.edirom.de/xquery/source";
 
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+(: IMPORTS ========================================================= :)
 
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+declare namespace mei="http://www.music-encoding.org/ns/mei";
+
+(: FUNCTION DECLARATIONS =========================================== :)
+
 (:~
-: Returns whether a document is a source or not
-:
-: @param $uri The URI of the document
-: @return Is work or not
-:)
+ : Returns whether a document is a source or not
+ :
+ : @param $uri The URI of the document
+ : @return Is work or not
+ :)
 declare function source:isSource($uri as xs:string) as xs:boolean {
+    
     let $doc := eutil:getDoc($uri)
     let $meiVersionRegex := '(([4-9])|(\d+[0-9]))\.\d+\.\d+(-dev)?'
     return
-        (exists($doc//mei:mei) and exists($doc//mei:source)) (:mei2 and ?3 :)
+        (:mei2 and ?3 :)
+        (exists($doc//mei:mei) and exists($doc//mei:source))
         or
-        (matches($doc//mei:mei/@meiversion, $meiVersionRegex) and exists($doc//mei:manifestation[@singleton='true'])) (:mei4+ for manuscripts:)
+        (:mei4+ for manuscripts:)
+        (matches($doc//mei:mei/@meiversion, $meiVersionRegex) and exists($doc//mei:manifestation[@singleton='true']))
         or
-        (matches($doc//mei:mei/@meiversion, $meiVersionRegex) and exists($doc//mei:manifestation//mei:item)) (: mei4+ for prints :)
+        (: mei4+ for prints :)
+        (matches($doc//mei:mei/@meiversion, $meiVersionRegex) and exists($doc//mei:manifestation//mei:item)) 
 };
 
 (:~
-: Returns a comma separated list of source labels
-:
-: @param $sources The URIs of the Sources' documents to process
-: @return The labels
-:)
+ : Returns a comma separated list of source labels
+ :
+ : @param $sources The URIs of the Sources' documents to process
+ : @return The labels
+ :)
 declare function source:getLabels($sources as xs:string*, $edition as xs:string) as xs:string {
+    
     string-join(
         for $source in $sources return source:getLabel($source, $edition)
     , ', ')
+    
 };
 
 (:~
-: Returns a source's label
-:
-: @param $source The URIs of the Source's document to process
-: @return The label
-:)
+ : Returns a source's label
+ :
+ : @param $source The URIs of the Source's document to process
+ : @return The label
+ :)
 declare function source:getLabel($source as xs:string, $edition as xs:string) as xs:string {
+    
     let $sourceDoc := doc($source)
     let $language := eutil:getLanguage($edition)
-    let $label := if($sourceDoc/mei:mei/@meiversion = ("4.0.0", "4.0.1"))(:TODO encoding of source labels may heavily differ in certain encoding contexts, thus introduction of class="http://www.edirom.de/edirom-online/source/label":)
-                    then $sourceDoc//mei:manifestation[@singleton='true']/mei:titleStmt/mei:title[@class = "http://www.edirom.de/edirom-online/source/label"][not(@xml:lang) or @xml:lang = $language]
-                    else $sourceDoc//mei:source/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language]
-    let $label := if($label)
-                    then($label)
-                    else(doc($source)//mei:meiHead/mei:fileDesc/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language])
-    let $label := if($label)
-                    then($label)
-                    else('unknown title')
+    
+    let $label :=
+        (:TODO encoding of source labels may heavily differ in certain encoding contexts, thus introduction of class="http://www.edirom.de/edirom-online/source/label" OR some configuration method, e.g., a user definable function :)
+        if($sourceDoc/mei:mei/@meiversion = ("4.0.0", "4.0.1")) then
+            $sourceDoc//mei:manifestation[@singleton='true']/mei:titleStmt/mei:title[@class = "http://www.edirom.de/edirom-online/source/label"][not(@xml:lang) or @xml:lang = $language]
+        
+        else
+            $sourceDoc//mei:source/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language]
+    
+    let $label :=
+        if($label) then
+            ($label)
+        else
+            (doc($source)//mei:meiHead/mei:fileDesc/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language])
+    
+    let $label :=
+        if($label) then
+            ($label)
+        else
+            ('unknown title')
     return
         string($label)
 
 };
 
 (:~
-: Returns a comma separated list of source sigla
-:
-: @param $sources The URIs of the Sources' documents to process
-: @return The sigla
-:)
+ : Returns a comma separated list of source sigla
+ :
+ : @param $sources The URIs of the Sources' documents to process
+ : @return The sigla
+ :)
 declare function source:getSigla($sources as xs:string*) as xs:string {
+    
     string-join(
         source:getSiglaAsArray($sources)
     , ', ')
+    
 };
 
 (:~
-: Returns an array of source sigla
-:
-: @param $sources The URIs of the Sources' documents to process
-: @return The sigla
-:)
+ : Returns an array of source sigla
+ :
+ : @param $sources The URIs of the Sources' documents to process
+ : @return The sigla
+ :)
 declare function source:getSiglaAsArray($sources as xs:string*) as xs:string* {
-    for $source in $sources return source:getSiglum($source)
+
+    for $source in $sources
+    return
+        source:getSiglum($source)
+
 };
 
 (:~
-: Returns a source's siglum
-:
-: @param $source The URIs of the Source's document to process
-: @return The siglum
-:)
+ : Returns a source's siglum
+ :
+ : @param $source The URIs of the Source's document to process
+ : @return The siglum
+ :)
 declare function source:getSiglum($source as xs:string) as xs:string? {
+
     let $doc := doc($source)
     let $elems := $doc//mei:*[@type eq 'siglum']
-    let $siglum := if(exists($elems)) then($elems[1]//text()) else()
+    let $siglum :=
+        if(exists($elems)) then
+            ($elems[1]//text())
+        else
+            ()
+    
     return $siglum
 };

From 86f24210d631cadcefdb6a61de4199cc56b2fbdc Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:10:25 +0100
Subject: [PATCH 074/103] Update teitext.xqm

---
 add/data/xqm/teitext.xqm | 66 ++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 37 deletions(-)

diff --git a/add/data/xqm/teitext.xqm b/add/data/xqm/teitext.xqm
index bdcfd13e5..96258059d 100644
--- a/add/data/xqm/teitext.xqm
+++ b/add/data/xqm/teitext.xqm
@@ -1,55 +1,47 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: teitext.xqm 1324 2012-05-15 13:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-
 (:~
-: This module provides library functions for Texts
-:
-: @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-:)
+ : This module provides library functions for Texts
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ :)
 module namespace teitext="http://www.edirom.de/xquery/teitext";
 
-declare namespace tei="http://www.tei-c.org/ns/1.0";
+(: IMPORTS ========================================================= :)
 
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+declare namespace tei="http://www.tei-c.org/ns/1.0";
+
+(: FUNCTION DECLARATIONS =========================================== :)
+
 (:~
-: Returns whether a document is a work or not
-:
-: @param $uri The URI of the document
-: @return Is work or not
-:)
+ : Returns whether a document is a work or not
+ :
+ : @param $uri The URI of the document
+ : @return Is work or not
+ :)
 declare function teitext:isText($uri as xs:string) as xs:boolean {
-    
+
     exists(doc($uri)/tei:TEI)
+
 };
 
 (:~
-: Returns a text's label
-:
-: @param $source The URIs of the Text's document to process
-: @return The label
-:)
+ : Returns a text's label
+ :
+ : @param $source The URIs of the Text's document to process
+ : @return The label
+ :)
 declare function teitext:getLabel($uri as xs:string, $edition as xs:string) as xs:string {
+
     let $language := eutil:getLanguage($edition)
+
     return doc($uri)//tei:titleStmt/data(tei:title[not(@xml:lang) or @xml:lang = $language])
-};
\ No newline at end of file
+
+};

From d0fa746ce3eca7e8fed291aa768ef8792f20cc58 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:26:38 +0100
Subject: [PATCH 075/103] Update util.xqm

---
 add/data/xqm/util.xqm | 471 +++++++++++++++++++++++-------------------
 1 file changed, 255 insertions(+), 216 deletions(-)

diff --git a/add/data/xqm/util.xqm b/add/data/xqm/util.xqm
index d05b1a962..ce80a80fc 100644
--- a/add/data/xqm/util.xqm
+++ b/add/data/xqm/util.xqm
@@ -1,247 +1,270 @@
 xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: util.xqm 1334 2012-06-14 12:40:33Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
 (:~
-: This module provides library utility functions
-:
-: @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-: @author <a href="mailto:roewenstrunk@edirom.de">Nikolaos Beer</a>
-: @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
-:)
+ : This module provides library utility functions
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ : @author <a href="mailto:roewenstrunk@edirom.de">Nikolaos Beer</a>
+ : @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
+ :)
 
 module namespace eutil = "http://www.edirom.de/xquery/util";
 
-import module namespace work="http://www.edirom.de/xquery/work" at "work.xqm";
-import module namespace source="http://www.edirom.de/xquery/source" at "source.xqm";
-import module namespace teitext="http://www.edirom.de/xquery/teitext" at "teitext.xqm";
-import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+(: IMPORTS ========================================================= :)
+
 import module namespace functx = "http://www.functx.com";
+
 import module namespace annotation="http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
+import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
+import module namespace source="http://www.edirom.de/xquery/source" at "source.xqm";
+import module namespace teitext="http://www.edirom.de/xquery/teitext" at "teitext.xqm";
+import module namespace work="http://www.edirom.de/xquery/work" at "work.xqm";
 
+(: NAMESPACE DECLARATIONS ========================================== :)
+
+declare namespace edirom="http://www.edirom.de/ns/1.3";
+declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace request="http://exist-db.org/xquery/request";
 declare namespace system="http://exist-db.org/xquery/system";
-declare namespace util="http://exist-db.org/xquery/util";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
-declare namespace edirom="http://www.edirom.de/ns/1.3";
+declare namespace util="http://exist-db.org/xquery/util";
 
-(:~
-: Returns the namespace (standardized prefix)
-:
-: @param $node The node to be processed
-: @return The namespace (prefix)
-:)
+(: FUNCTION DECLARATIONS =========================================== :)
 
+(:~
+ : Returns the namespace (standardized prefix)
+ :
+ : @param $node The node to be processed
+ : @return The namespace (prefix)
+ :)
 declare function eutil:getNamespace($node as node()) as xs:string {
+
   switch (namespace-uri($node))
-    case 'http://www.music-encoding.org/ns/mei' return 'mei'
-    case 'http://www.tei-c.org/ns/1.0' return 'tei'
-    case 'http://www.edirom.de/ns/1.3' return 'edirom'
-    default return 'unknown'
+    case 'http://www.music-encoding.org/ns/mei'
+        return 'mei'
+    case 'http://www.tei-c.org/ns/1.0'
+        return 'tei'
+    case 'http://www.edirom.de/ns/1.3'
+        return 'edirom'
+    default
+        return 'unknown'
+
 };
 
 (:~
-: Returns a localized string
-:
-: @param $node The node to be processed
-: @return The string
-:)
-
+ : Returns a localized string
+ :
+ : @param $node The node to be processed
+ : @return The string
+ :)
 declare function eutil:getLocalizedName($node, $lang) {
 
-let $name :=
-    if ($node/mei:title)
-    then (
-        if ($lang = $node/mei:title/@xml:lang)
-        then $node/mei:title[@xml:lang = $lang]/text()
-        else $node/mei:title[1]/text()
-    )
-    else if ($node/mei:name)
-    then (
-        if ($lang = $node/mei:name/@xml:lang)
-        then $node/mei:name[@xml:lang = $lang]/text()
-        else $node/mei:name[1]/text()
-    )
-    else if ($node/edirom:names)
-        then (
-            if ($lang = $node/edirom:names/edirom:name/@xml:lang)
-            then $node/edirom:names/edirom:name[@xml:lang = $lang]/node()
-            else $node/edirom:names/edirom:name[1]/node()
-    )
-    else if (local-name($node) = 'annot' and $node/@type = 'editorialComment')
-        then(annotation:generateTitle($node))
-    else (normalize-space($node))
-return
-    if($node/edirom:names)
-    then($name)
-    else($name => string-join(' ') => normalize-space())
+    let $name :=
+        if ($node/mei:title) then (
+            if ($lang = $node/mei:title/@xml:lang) then
+                $node/mei:title[@xml:lang = $lang]/text()
+            else
+                $node/mei:title[1]/text()
+        
+        ) else if ($node/mei:name) then (
+            if ($lang = $node/mei:name/@xml:lang) then
+                $node/mei:name[@xml:lang = $lang]/text()
+            else
+                $node/mei:name[1]/text()
+        
+        ) else if ($node/edirom:names) then (
+            if ($lang = $node/edirom:names/edirom:name/@xml:lang) then
+                $node/edirom:names/edirom:name[@xml:lang = $lang]/node()
+            else
+                $node/edirom:names/edirom:name[1]/node()
+        
+        ) else if (local-name($node) = 'annot' and $node/@type = 'editorialComment') then
+            (annotation:generateTitle($node))
+        
+        else
+        (normalize-space($node))
+    
+    return
+        if($node/edirom:names) then
+            ($name)
+        else
+            ($name => string-join(' ') => normalize-space())
+
 };
 
 (:~
-: Returns a localized string
-:
-: @param $node The node to be processed
-: @param $lang Optional parameter for lang selection
-: @return The string (normalized space)
-:)
-
+ : Returns a localized string
+ :
+ : @param $node The node to be processed
+ : @param $lang Optional parameter for lang selection
+ : @return The string (normalized space)
+ :)
 declare function eutil:getLocalizedTitle($node as node(), $lang as xs:string?) as xs:string {
 
-  let $namespace := eutil:getNamespace($node)
-  
-  let $titleMEI := if ($lang != '' and $lang = $node/mei:title/@xml:lang and not($node/mei:title/mei:titlePart))
-                   then ($node/mei:title[@xml:lang = $lang]//text() => string-join() => normalize-space())
-                   else if ($lang != '' and $lang = $node/mei:title/@xml:lang and $node/mei:title/mei:titlePart)
-                   then ($node/mei:title[@xml:lang = $lang]/mei:titlePart[1]//text() => string-join() => normalize-space())
-                   else (($node//mei:title)[1]//text() => string-join() => normalize-space())
+    let $namespace := eutil:getNamespace($node)
   
-  let $titleTEI := if ($lang != '' and $lang = $node/tei:title/@xml:lang)
-                   then $node/tei:title[@xml:lang = $lang]/text()
-                   else $node/tei:title[1]/text()
-  
-  return
-      if ($namespace = 'mei')
-      then($titleMEI)
-      else if ($namespace = 'tei')
-      then($titleTEI)
-      else('unknown')
+    let $titleMEI :=
+        if ($lang != '' and $lang = $node/mei:title/@xml:lang and not($node/mei:title/mei:titlePart)) then
+            ($node/mei:title[@xml:lang = $lang]//text() => string-join() => normalize-space())
+        else if ($lang != '' and $lang = $node/mei:title/@xml:lang and $node/mei:title/mei:titlePart) then
+            ($node/mei:title[@xml:lang = $lang]/mei:titlePart[1]//text() => string-join() => normalize-space())
+        else
+            (($node//mei:title)[1]//text() => string-join() => normalize-space())
+    
+    let $titleTEI :=
+        if ($lang != '' and $lang = $node/tei:title/@xml:lang) then
+            $node/tei:title[@xml:lang = $lang]/text()
+        else
+            $node/tei:title[1]/text()
+    
+    return
+        if ($namespace = 'mei') then
+            ($titleMEI)
+        else if ($namespace = 'tei') then
+            ($titleTEI)
+        else
+            ('unknown')
 
 };
 (:~
-: Returns a document
-:
-: @param $uri The URIs of the documents to process
-: @return The document
-:)
+ : Returns a document
+ :
+ : @param $uri The URIs of the documents to process
+ : @return The document
+ :)
 declare function eutil:getDoc($uri) {
 
-    if(starts-with($uri, 'textgrid:'))
-    then(
+    if(starts-with($uri, 'textgrid:')) then(
         let $session := request:get-cookie-value('edirom_online_textgrid_sessionId')
         return
             doc('http://textgridlab.org/1.0/tgcrud/rest/' || $uri || '/data?sessionId=' || $session)
-    )
-    else(
+    
+    ) else (
         doc($uri)
     )
+
 };
 
 (:~
-: Returns a comma separated list of document labels
-:
-: @param $docs The URIs of the documents to process
-: @return The labels
-:)
+ : Returns a comma separated list of document labels
+ :
+ : @param $docs The URIs of the documents to process
+ : @return The labels
+ :)
 declare function eutil:getDocumentsLabels($docs as xs:string*, $edition as xs:string) as xs:string {
 
     string-join(
         eutil:getDocumentsLabelsAsArray($docs, $edition)
     , ', ')
+
 };
 
 (:~
-: Returns an array of document labels
-:
-: @param $docs The URIs of the documents to process
-: @return The labels
-:)
+ : Returns an array of document labels
+ :
+ : @param $docs The URIs of the documents to process
+ : @return The labels
+ :)
 declare function eutil:getDocumentsLabelsAsArray($docs as xs:string*, $edition as xs:string) as xs:string* {
 
     for $doc in $docs
     return
         eutil:getDocumentLabel($doc, $edition)
+
 };
 
 (:~
-: Returns a document's label
-:
-: @param $doc The URIs of the document to process
-: @return The label
-:)
+ : Returns a document's label
+ :
+ : @param $doc The URIs of the document to process
+ : @return The label
+ :)
 declare function eutil:getDocumentLabel($doc as xs:string, $edition as xs:string) as xs:string {
+
+    if(work:isWork($doc)) then
+        (work:getLabel($doc, $edition))
     
-    if(work:isWork($doc))
-    then(work:getLabel($doc, $edition))
-    
-    else if(source:isSource($doc))
-    then(source:getLabel($doc, $edition))
+    else if(source:isSource($doc)) then
+        (source:getLabel($doc, $edition))
     
-    else if(teitext:isText($doc))
-    then(teitext:getLabel($doc, $edition))
+    else if(teitext:isText($doc)) then
+        (teitext:getLabel($doc, $edition))
+
+    else
+        ('')
 
-    else('')
 };
 
 (:~
-: Returns a part's label (translated if available)
-:
-: @author Dennis Ried
-: @param $partID The xml:id of the Part's node() to process
-: @return The label (translated if available)
-:)
+ : Returns a part's label (translated if available)
+ :
+ : @author Dennis Ried
+ : @param $partID The xml:id of the Part's node() to process
+ : @return The label (translated if available)
+ :)
 declare function eutil:getPartLabel($measureOrPerfRes as node(), $type as xs:string) as xs:string {
-            (: request:get-parameter('lang', '') doesn't work?? [DeRi]:)
-let $lang := if(request:get-parameter('lang', '') = '')
-             then('de')
-             else(request:get-parameter('lang', '')) 
-let $part := $measureOrPerfRes/ancestor::mei:part
-let $voiceRef := $part//mei:staffDef/@decls
-let $voiceID := substring-after($voiceRef, '#')
-
-let $perfResLabel := if($type eq 'measure')
-                     then($measureOrPerfRes/ancestor::mei:mei/id($voiceID)/@label)
-                     else($measureOrPerfRes/@label)
-let $dictKey := 'perfMedium.perfRes.' || functx:substring-before-if-contains($perfResLabel,'.')
-let $label := if(eutil:getLanguageString($dictKey, (), $lang))
-              then(eutil:getLanguageString($dictKey, (), $lang))
-              else($perfResLabel)
-let $numbering := for $i in subsequence(tokenize($perfResLabel,'\.'),2)
-                    where matches($i, '([0-9])|([ivxIVX])')
-                    return
-                        upper-case($i)
-return
-    normalize-space(string-join(($label, $numbering),' '))
+
+    (: request:get-parameter('lang', '') doesn't work?? [DeRi]:)
+
+    let $lang :=
+        if(request:get-parameter('lang', '') = '') then
+            ('de')
+        else
+            (request:get-parameter('lang', ''))
+
+    let $part := $measureOrPerfRes/ancestor::mei:part
+    let $voiceRef := $part//mei:staffDef/@decls
+    let $voiceID := substring-after($voiceRef, '#')
+
+    let $perfResLabel :=
+        if($type eq 'measure') then
+            ($measureOrPerfRes/ancestor::mei:mei/id($voiceID)/@label)
+        else
+            ($measureOrPerfRes/@label)
+
+    let $dictKey := 'perfMedium.perfRes.' || functx:substring-before-if-contains($perfResLabel,'.')
+
+    let $label :=
+        if(eutil:getLanguageString($dictKey, (), $lang)) then
+            (eutil:getLanguageString($dictKey, (), $lang))
+        else
+            ($perfResLabel)
+
+    let $numbering :=
+        for $i in subsequence(tokenize($perfResLabel,'\.'),2)
+        where matches($i, '([0-9])|([ivxIVX])')
+        return
+            upper-case($i)
+
+    return
+        normalize-space(string-join(($label, $numbering),' '))
+
 };
 
 (:~
-: Returns a language specific string
-:
-: @param $key The key to search for
-: @param $values The values to include into the string
-: @return The string
-:)
+ : Returns a language specific string
+ :
+ : @param $key The key to search for
+ : @param $values The values to include into the string
+ : @return The string
+ :)
 declare function eutil:getLanguageString($key as xs:string, $values as xs:string*) as xs:string {
 
     eutil:getLanguageString($key, $values, eutil:getLanguage(''))
+
 };
 
 (:~
-: Returns a language specific string from the locale/edirom-lang files
-:
-: @param $key The key to search for
-: @param $values The values to include into the string
-: @param $lang The language
-: @return The string
-:)
+ : Returns a language specific string from the locale/edirom-lang files
+ :
+ : @param $key The key to search for
+ : @param $values The values to include into the string
+ : @param $lang The language
+ : @return The string
+ :)
 declare function eutil:getLanguageString($key as xs:string, $values as xs:string*, $lang as xs:string) as xs:string {
 
     let $base := system:get-module-load-path()
@@ -249,40 +272,48 @@ declare function eutil:getLanguageString($key as xs:string, $values as xs:string
     
     let $string := $file//entry[@key = $key]/string(@value)
     let $string := functx:replace-multi($string, for $i in (0 to (count($values) - 1)) return concat('\{',$i,'\}'), $values)
-                        
+
     return
         $string
+
 };
 
 (:~
-: Return a value of preference to key
-:
-: @param $key The key to search for
-: @return The string
-:)
+ : Return a value of preference to key
+ :
+ : @param $key The key to search for
+ : @return The string
+ :)
 declare function eutil:getPreference($key as xs:string, $edition as xs:string?) as xs:string {
 
-     let $file := doc('../prefs/edirom-prefs.xml')
-     let $projectFile := doc(edition:getPreferencesURI($edition))
-     
-     return
-        if($projectFile != 'null' and $projectFile//entry[@key = $key]) then ($projectFile//entry[@key = $key]/string(@value))
-        else ($file//entry[@key = $key]/string(@value))
+    let $file := doc('../prefs/edirom-prefs.xml')
+    let $projectFile := doc(edition:getPreferencesURI($edition))
+
+    return
+        if($projectFile != 'null' and $projectFile//entry[@key = $key]) then
+            ($projectFile//entry[@key = $key]/string(@value))
+        else
+            ($file//entry[@key = $key]/string(@value))
+
 };
 
 (:~
-: Return the application and content language
-:
-: @param $edition The edition's path
-: @return The language key
-:)
+ : Return the application and content language
+ :
+ : @param $edition The edition's path
+ : @return The language key
+ :)
 declare function eutil:getLanguage($edition as xs:string?) as xs:string {
 
-    if (request:get-parameter("lang", "") != "")
-    then request:get-parameter("lang", "")
-    else if(request:get-cookie-names() = 'edirom-language')
-    then request:get-cookie-value('edirom-language')
-    else eutil:getPreference('application_language', edition:findEdition($edition))
+    if (request:get-parameter("lang", "") != "") then
+        request:get-parameter("lang", "")
+    
+    else if(request:get-cookie-names() = 'edirom-language') then
+        request:get-cookie-value('edirom-language')
+    
+    else
+        eutil:getPreference('application_language', edition:findEdition($edition))
+
 };
 
 (:~
@@ -297,9 +328,11 @@ declare function eutil:getLanguage($edition as xs:string?) as xs:string {
  : @return a relative path on the server
  :)
 declare function eutil:get-app-base-url() as xs:string? {
-    if(request:exists())
-    then request:get-context-path() || request:get-attribute("exist:prefix") || request:get-attribute('exist:controller')
-    else util:log-system-out('request object does not exist; failing to compute base url')
+
+    if(request:exists()) then
+        request:get-context-path() || request:get-attribute("exist:prefix") || request:get-attribute('exist:controller')
+    else
+        util:log-system-out('request object does not exist; failing to compute base url')
 };
 
 (:~
@@ -311,12 +344,13 @@ declare function eutil:get-app-base-url() as xs:string? {
  : @param   $seq the sequence to sort 
  :)
 declare function eutil:sort-as-numeric-alpha($seq as item()* )  as item()* {
+
    for $item in $seq
    let $itemPart1 := (functx:get-matches($item, '\d+'))[1]
    let $itemPart2 := substring-after($item, $itemPart1)
    order by number($itemPart1), $itemPart2
    return $item
-    
+
 } ;
 
 (:~
@@ -327,7 +361,9 @@ declare function eutil:sort-as-numeric-alpha($seq as item()* )  as item()* {
  : @return xs:string ISO 639 language code, e.g., en
  :)
 declare function eutil:iso3166-1-to-iso639($iso3166-1 as xs:string) as xs:string {
+
     tokenize($iso3166-1, "-")[1]
+
 };
 
 (:~
@@ -338,25 +374,28 @@ declare function eutil:iso3166-1-to-iso639($iso3166-1 as xs:string) as xs:string
  : @return xs:string ISO 639 language code
  :)
 declare function eutil:request-lang-preferred-iso639() as xs:string {
-let $request.accept-language := request:get-header("Accept-Language")
-return
-if($request.accept-language)
-then 
-    let $tokens := tokenize($request.accept-language, ";")
-    let $tokens.qless.ordered := (
-        for $token in $tokens
-            let $q := substring-after(string-join((analyze-string($token, "(q=\d(\.\d)?)")//fn:match)[1], ""), "q=")
-            let $q.decimal := if($q = "") then xs:decimal(1) else xs:decimal($q)
-            let $token.qless := replace($token,",?q=\d(\.\d)?,?", "")
-            order by $q.decimal descending
-            return
-                $token.qless
-    )
-    let $tokens.qmax := $tokens.qless.ordered[1]
-    let $tokens.qmax.first := tokenize($tokens.qmax, ",")[1]
-    return 
-        eutil:iso3166-1-to-iso639($tokens.qmax.first)
-    
-else
-    "en"
+
+    let $request.accept-language := request:get-header("Accept-Language")
+    return
+        if($request.accept-language) then
+            let $tokens := tokenize($request.accept-language, ";")
+            
+            let $tokens.qless.ordered := (
+                for $token in $tokens
+                let $q := substring-after(string-join((analyze-string($token, "(q=\d(\.\d)?)")//fn:match)[1], ""), "q=")
+                let $q.decimal := if($q = "") then xs:decimal(1) else xs:decimal($q)
+                let $token.qless := replace($token,",?q=\d(\.\d)?,?", "")
+                order by $q.decimal descending
+                return
+                    $token.qless
+            )
+            
+            let $tokens.qmax := $tokens.qless.ordered[1]
+            let $tokens.qmax.first := tokenize($tokens.qmax, ",")[1]
+            return 
+                eutil:iso3166-1-to-iso639($tokens.qmax.first)
+        
+        else
+            "en"
+
 };

From 5a434788beafdd5c14cb446181b2b17959c27f80 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:28:37 +0100
Subject: [PATCH 076/103] Update work.xqm

---
 add/data/xqm/work.xqm | 94 ++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 50 deletions(-)

diff --git a/add/data/xqm/work.xqm b/add/data/xqm/work.xqm
index d167c8468..bae24f7ca 100644
--- a/add/data/xqm/work.xqm
+++ b/add/data/xqm/work.xqm
@@ -1,87 +1,81 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
-
-  Edirom Online is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  Edirom Online is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
-
-  ID: $Id: work.xqm 1324 2012-05-15 13:59:35Z daniel $
+For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-
 (:~
-: This module provides library functions for Works
-:
-: @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-:)
+ : This module provides library functions for Works
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ :)
 module namespace work = "http://www.edirom.de/xquery/work";
 
+(: IMPORTS ========================================================= :)
+
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+(: NAMESPACE DECLARATIONS ========================================== :)
+
 declare namespace edirom="http://www.edirom.de/ns/1.3";
+declare namespace mei="http://www.music-encoding.org/ns/mei";
+
+(: FUNCTION DECLARATIONS =========================================== :)
 
 (:~
-: Returns a JSON representation of a Work
-:
-: @param $uri The URI of the Work's document to process
-: @return The JSON representation
-:)
+ : Returns a JSON representation of a Work
+ :
+ : @param $uri The URI of the Work's document to process
+ : @return The JSON representation
+ :)
 declare function work:toJSON($uri as xs:string, $edition as xs:string) as xs:string {
     
     let $work := doc($uri)/mei:mei | doc($uri)/mei:work
     let $lang := request:get-parameter('lang', '')
+    
     return
         concat('
             {',
                 'id: "', $work/string(@xml:id), '", ',
                 'doc: "', $uri, '", ',
-                'title: "', replace(eutil:getLocalizedTitle((($work/descendant-or-self::mei:work)[1]), $lang), '"', '\\"'), '"',
+                'title: "', replace(eutil:getLocalizedTitle((($work/descendant-or-self::mei:work)[1]), $lang), '"', '\\"'),
+                '"',
             '}')
+
 };
 
 (:~
-: Returns whether a document is a work or not
-:
-: @param $uri The URI of the document
-: @return Is work or not
-:)
+ : Returns whether a document is a work or not
+ :
+ : @param $uri The URI of the document
+ : @return Is work or not
+ :)
 declare function work:isWork($uri as xs:string) as xs:boolean {
     
     (exists(doc($uri)//mei:mei) and exists(doc($uri)//mei:work) and not(doc($uri)//mei:source)) or exists(doc($uri)/mei:work)
+
 };
 
 (:~
-: Returns a works's label
-:
-: @param $work The URIs of the Work's document to process
-: @param $edition The ID of the Edition the Work is part of
-: @return The label
-:)
+ : Returns a works's label
+ :
+ : @param $work The URIs of the Work's document to process
+ : @param $edition The ID of the Edition the Work is part of
+ : @return The label
+ :)
 declare function work:getLabel($work as xs:string, $edition as xs:string) as xs:string {
-     
+ 
     eutil:getLocalizedTitle(doc($work)/root()//mei:work, request:get-parameter('lang', ''))
+
 };
 
 (:~
-: Returns the forst works id
-:
-: @param $uri The URIs of the Edition
-: @return The id
-:)
+ : Returns the forst works id
+ :
+ : @param $uri The URIs of the Edition
+ : @return The id
+ :)
 declare function work:findWorkID($uri as xs:string) as xs:string {
-     
+ 
     doc($uri)//edirom:work[1]/data(@xml:id)
-};
\ No newline at end of file
+
+};

From e6bb6549e9f8ce89890f88b3ae82abaf1c2a6e64 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:46:04 +0100
Subject: [PATCH 077/103] unfiy structuring comments

---
 add/data/xql/checkTextGridLogin.xql        |  6 ++++--
 add/data/xql/edirom_printPreview.xql       | 10 +++++-----
 add/data/xql/getAnnotation.xql             | 10 +++++-----
 add/data/xql/getAnnotationInfos.xql        |  8 ++++----
 add/data/xql/getAnnotationMeta.xql         |  6 +++---
 add/data/xql/getAnnotationOpenAllUris.xql  |  6 +++---
 add/data/xql/getAnnotationParticipants.xql |  4 ++--
 add/data/xql/getAnnotationPreviews.xql     |  8 ++++----
 add/data/xql/getAnnotationText.xql         |  6 +++---
 add/data/xql/getAnnotations.xql            |  6 +++---
 add/data/xql/getAnnotationsInRendering.xql |  6 +++---
 add/data/xql/getAnnotationsInText.xql      |  4 ++--
 add/data/xql/getAnnotationsOnPage.xql      |  6 +++---
 add/data/xql/getAudioPlayer.xql            |  6 +++---
 add/data/xql/getChapters.xql               |  8 ++++----
 add/data/xql/getConcordances.xql           | 10 +++++-----
 add/data/xql/getEdition.xql                |  4 ++--
 add/data/xql/getEditionURI.xql             |  4 ++--
 add/data/xql/getExtendedStaff.xql          |  6 +++---
 add/data/xql/getHeader.xql                 |  6 +++---
 add/data/xql/getHelp.xql                   |  2 +-
 add/data/xql/getInternalIdType.xql         |  6 +++---
 add/data/xql/getLanguageFile.xql           |  6 +++---
 add/data/xql/getLinkTarget.xql             | 10 +++++-----
 add/data/xql/getMeasure.xql                |  6 +++---
 add/data/xql/getMeasurePage.xql            |  6 +++---
 add/data/xql/getMeasures.xql               |  8 ++++----
 add/data/xql/getMeasuresOnPage.xql         |  6 +++---
 add/data/xql/getMovements.xql              |  4 ++--
 add/data/xql/getMovementsFirstPage.xql     |  4 ++--
 add/data/xql/getMusicInMdiv.xql            |  2 +-
 add/data/xql/getNavigatorConfig.xql        | 10 +++++-----
 add/data/xql/getOverlayOnPage.xql          |  4 ++--
 add/data/xql/getOverlays.xql               |  4 ++--
 add/data/xql/getPages.xql                  |  6 +++---
 add/data/xql/getParts.xql                  |  6 +++---
 add/data/xql/getPreferences.xql            |  6 +++---
 add/data/xql/getReducedDocument.xql        |  8 ++++----
 add/data/xql/getRendering.xql              |  4 ++--
 add/data/xql/getSummary.xql                | 10 +++++-----
 add/data/xql/getText.xql                   |  6 +++---
 add/data/xql/getWorkID.xql                 |  6 +++---
 add/data/xql/getWorks.xql                  |  6 +++---
 add/data/xql/getXml.xql                    |  6 +++---
 add/data/xql/getZone.xql                   |  4 ++--
 add/data/xql/getiFrameURL.xql              |  4 ++--
 add/data/xql/loginToTextGrid.xql           |  2 +-
 add/data/xql/search.xql                    | 10 +++++-----
 add/data/xqm/annotation.xqm                |  6 +++---
 add/data/xqm/edition.xqm                   |  6 +++---
 add/data/xqm/source.xqm                    |  6 +++---
 add/data/xqm/teitext.xqm                   |  6 +++---
 add/data/xqm/util.xqm                      |  6 +++---
 add/data/xqm/work.xqm                      |  6 +++---
 54 files changed, 165 insertions(+), 163 deletions(-)

diff --git a/add/data/xql/checkTextGridLogin.xql b/add/data/xql/checkTextGridLogin.xql
index 814504527..3352e9dae 100644
--- a/add/data/xql/checkTextGridLogin.xql
+++ b/add/data/xql/checkTextGridLogin.xql
@@ -4,14 +4,16 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace httpclient = "http://exist-db.org/xquery/httpclient";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace html = "http://www.w3.org/1999/xhtml";
 
+(: QUERY BODY ============================================================== :)
+
 let $sessionId := request:get-parameter('sessionId', '')
 let $test := httpclient:head(xs:anyURI('http://textgridlab.org/1.0/tgcrud/rest/textgrid:208dw/data?sessionId=' || $sessionId), false(), ())
 let $status := $test/root()/httpclient:response/string(@statusCode)
diff --git a/add/data/xql/edirom_printPreview.xql b/add/data/xql/edirom_printPreview.xql
index 16c044788..fce9e961e 100644
--- a/add/data/xql/edirom_printPreview.xql
+++ b/add/data/xql/edirom_printPreview.xql
@@ -4,12 +4,12 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace eof = "http://www.edirom.de/xquery/ediromOnlineFunctions";
 declare namespace fo = "http://www.w3.org/1999/XSL/Format";
@@ -19,11 +19,11 @@ declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xhtml = "http://www.w3.org/1999/xhtml";
 declare namespace xslfo = "http://exist-db.org/xquery/xslfo";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=html media-type=text/html omit-xml-declaration=yes indent=yes";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $lang := 'en';
 declare variable $base := concat('file:', replace(system:get-module-load-path(), '\\', '/'), '/../xslt/');
@@ -74,7 +74,7 @@ declare function eof:getLabel($key as xs:string) {
         ($key)
 };
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function eof:getFacsImgParas($areaWidth) {
     concat('&amp;dw=', floor($printResolution * $areaWidth), '&amp;mo=scale')
diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index d29cb36d0..96b57e74a 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -4,14 +4,14 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom_image = "http://www.edirom.de/ns/image";
 declare namespace exist = "http://exist.sourceforge.net/NS/exist";
@@ -20,12 +20,12 @@ declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:media-type "text/html";
 declare option output:method "xhtml";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $imageWidth := 600;
 
@@ -41,7 +41,7 @@ else
 
 declare variable $lang := request:get-parameter('lang', '');
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (: TODO: in Modul auslagern :)
 (:~
diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index 79230d7aa..42759c3cd 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -3,23 +3,23 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $uri := request:get-parameter('uri', '');
 declare variable $edition := request:get-parameter('edition', '');
diff --git a/add/data/xql/getAnnotationMeta.xql b/add/data/xql/getAnnotationMeta.xql
index 35acb05fa..7df02a6d4 100644
--- a/add/data/xql/getAnnotationMeta.xql
+++ b/add/data/xql/getAnnotationMeta.xql
@@ -10,13 +10,13 @@ xquery version "3.1";
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom_image = "http://www.edirom.de/ns/image";
 declare namespace exist = "http://exist.sourceforge.net/NS/exist";
@@ -26,7 +26,7 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "xhtml";
 declare option output:media-type "text/html";
diff --git a/add/data/xql/getAnnotationOpenAllUris.xql b/add/data/xql/getAnnotationOpenAllUris.xql
index 128809412..47499f6b3 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -4,17 +4,17 @@ xquery version "3.1";
  : Copyright: For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/html";
diff --git a/add/data/xql/getAnnotationParticipants.xql b/add/data/xql/getAnnotationParticipants.xql
index ca065ddca..c67f7c35a 100644
--- a/add/data/xql/getAnnotationParticipants.xql
+++ b/add/data/xql/getAnnotationParticipants.xql
@@ -10,12 +10,12 @@ xquery version "3.1";
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/html";
diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index dc65eb6e5..426856a59 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -10,24 +10,24 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm/source.xqm";
 import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $lang := request:get-parameter('lang', '');
 declare variable $edition := request:get-parameter('edition', '');
diff --git a/add/data/xql/getAnnotationText.xql b/add/data/xql/getAnnotationText.xql
index 3a9e545ba..27051e2d9 100644
--- a/add/data/xql/getAnnotationText.xql
+++ b/add/data/xql/getAnnotationText.xql
@@ -9,12 +9,12 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:kepper@edirom.de">Johannes Kepper</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom_image = "http://www.edirom.de/ns/image";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -22,7 +22,7 @@ declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "xhtml";
 declare option output:media-type "text/html";
diff --git a/add/data/xql/getAnnotations.xql b/add/data/xql/getAnnotations.xql
index e5bc415ee..939cd4c63 100644
--- a/add/data/xql/getAnnotations.xql
+++ b/add/data/xql/getAnnotations.xql
@@ -9,17 +9,17 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace annotation = "http://www.edirom.de/xquery/annotation" at "../xqm/annotation.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index e3a6aa5d0..ba0cfe88c 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -9,18 +9,18 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index 020d5e671..25808e105 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -9,7 +9,7 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace ft = "http://exist-db.org/xquery/lucene";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -17,7 +17,7 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getAnnotationsOnPage.xql b/add/data/xql/getAnnotationsOnPage.xql
index 81c73201e..0d29cafe9 100644
--- a/add/data/xql/getAnnotationsOnPage.xql
+++ b/add/data/xql/getAnnotationsOnPage.xql
@@ -10,13 +10,13 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
  :  @author <a href="mailto:bohl@edirom.de">Benjamin W. Bohl</a>
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace ft = "http://exist-db.org/xquery/lucene";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -26,7 +26,7 @@ declare namespace svg = "http://www.w3.org/2000/svg";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
diff --git a/add/data/xql/getAudioPlayer.xql b/add/data/xql/getAudioPlayer.xql
index c97a58352..e5b09a72f 100644
--- a/add/data/xql/getAudioPlayer.xql
+++ b/add/data/xql/getAudioPlayer.xql
@@ -3,16 +3,16 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
diff --git a/add/data/xql/getChapters.xql b/add/data/xql/getChapters.xql
index ba04e7b21..3877f7086 100644
--- a/add/data/xql/getChapters.xql
+++ b/add/data/xql/getChapters.xql
@@ -3,22 +3,22 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function local:changeFormat($n) as xs:string {
 (:TODO replace with fn:format-integer:)
diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index a687342b8..cbddc35ae 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -3,11 +3,11 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom = "http://www.edirom.de/ns/1.3";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -15,15 +15,15 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $lang := request:get-parameter('lang', '');
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function local:getGroups($parent) {
     if ($parent/edirom:groups) then (
diff --git a/add/data/xql/getEdition.xql b/add/data/xql/getEdition.xql
index 6851fce4f..2e0a53878 100644
--- a/add/data/xql/getEdition.xql
+++ b/add/data/xql/getEdition.xql
@@ -9,11 +9,11 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getEditionURI.xql b/add/data/xql/getEditionURI.xql
index 2b001670b..d66549edf 100644
--- a/add/data/xql/getEditionURI.xql
+++ b/add/data/xql/getEditionURI.xql
@@ -9,11 +9,11 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getExtendedStaff.xql b/add/data/xql/getExtendedStaff.xql
index c438f5aa2..1504a9215 100644
--- a/add/data/xql/getExtendedStaff.xql
+++ b/add/data/xql/getExtendedStaff.xql
@@ -4,11 +4,11 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
@@ -17,7 +17,7 @@ declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace transform = "http://exist-db.org/xquery/transform";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
diff --git a/add/data/xql/getHeader.xql b/add/data/xql/getHeader.xql
index 3ea3ccaca..b10e4f176 100644
--- a/add/data/xql/getHeader.xql
+++ b/add/data/xql/getHeader.xql
@@ -3,11 +3,11 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
@@ -16,7 +16,7 @@ declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace transform = "http://exist-db.org/xquery/transform";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
index dd9eaefe9..87c783542 100644
--- a/add/data/xql/getHelp.xql
+++ b/add/data/xql/getHelp.xql
@@ -3,7 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
diff --git a/add/data/xql/getInternalIdType.xql b/add/data/xql/getInternalIdType.xql
index 1719ab8cf..f61c23139 100644
--- a/add/data/xql/getInternalIdType.xql
+++ b/add/data/xql/getInternalIdType.xql
@@ -3,16 +3,16 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getLanguageFile.xql b/add/data/xql/getLanguageFile.xql
index b52ff4528..0a97c9b3b 100644
--- a/add/data/xql/getLanguageFile.xql
+++ b/add/data/xql/getLanguageFile.xql
@@ -9,15 +9,15 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
  : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
diff --git a/add/data/xql/getLinkTarget.xql b/add/data/xql/getLinkTarget.xql
index 48822ed96..328874c53 100644
--- a/add/data/xql/getLinkTarget.xql
+++ b/add/data/xql/getLinkTarget.xql
@@ -3,7 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 import module namespace request = "http://exist-db.org/xquery/request";
@@ -14,7 +14,7 @@ import module namespace source = "http://www.edirom.de/xquery/source" at "../xqm
 import module namespace teitext = "http://www.edirom.de/xquery/teitext" at "../xqm/teitext.xqm";
 import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace html = "http://www.w3.org/1999/xhtml";
 declare namespace map = "http://www.w3.org/2005/xpath-functions/map";
@@ -22,17 +22,17 @@ declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $lang := request:get-parameter('lang', '');
 declare variable $uri := request:get-parameter('uri', '');
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
  : Returns a view for an edirom object
diff --git a/add/data/xql/getMeasure.xql b/add/data/xql/getMeasure.xql
index 3d0350025..ba8a96388 100644
--- a/add/data/xql/getMeasure.xql
+++ b/add/data/xql/getMeasure.xql
@@ -3,11 +3,11 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
@@ -16,7 +16,7 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
diff --git a/add/data/xql/getMeasurePage.xql b/add/data/xql/getMeasurePage.xql
index 7593c3e14..34cc7f61d 100644
--- a/add/data/xql/getMeasurePage.xql
+++ b/add/data/xql/getMeasurePage.xql
@@ -3,18 +3,18 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function local:findMeasure($mei, $movementId, $measureIdName) {
     let $m := $mei/id($measureIdName)
diff --git a/add/data/xql/getMeasures.xql b/add/data/xql/getMeasures.xql
index 1203d5bbf..85e9642a5 100644
--- a/add/data/xql/getMeasures.xql
+++ b/add/data/xql/getMeasures.xql
@@ -3,24 +3,24 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "/db/apps/Edirom-Online/data/xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:string* {
     
diff --git a/add/data/xql/getMeasuresOnPage.xql b/add/data/xql/getMeasuresOnPage.xql
index bea18ec5b..17844272e 100644
--- a/add/data/xql/getMeasuresOnPage.xql
+++ b/add/data/xql/getMeasuresOnPage.xql
@@ -9,7 +9,7 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
@@ -17,12 +17,12 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
     Finds all measures on a page.
diff --git a/add/data/xql/getMovements.xql b/add/data/xql/getMovements.xql
index de1f2801a..1243587af 100644
--- a/add/data/xql/getMovements.xql
+++ b/add/data/xql/getMovements.xql
@@ -3,7 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
@@ -11,7 +11,7 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
diff --git a/add/data/xql/getMovementsFirstPage.xql b/add/data/xql/getMovementsFirstPage.xql
index 9f6b9a314..d32303fb8 100644
--- a/add/data/xql/getMovementsFirstPage.xql
+++ b/add/data/xql/getMovementsFirstPage.xql
@@ -3,14 +3,14 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getMusicInMdiv.xql b/add/data/xql/getMusicInMdiv.xql
index c3d33d271..86e3bba75 100644
--- a/add/data/xql/getMusicInMdiv.xql
+++ b/add/data/xql/getMusicInMdiv.xql
@@ -3,7 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
diff --git a/add/data/xql/getNavigatorConfig.xql b/add/data/xql/getNavigatorConfig.xql
index 21c134e6b..9c4b9ac11 100644
--- a/add/data/xql/getNavigatorConfig.xql
+++ b/add/data/xql/getNavigatorConfig.xql
@@ -3,26 +3,26 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom = "http://www.edirom.de/ns/1.3";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $lang := request:get-parameter('lang', '');
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function local:getCategory($category, $depth) {
     
diff --git a/add/data/xql/getOverlayOnPage.xql b/add/data/xql/getOverlayOnPage.xql
index 7246cea77..410a86a47 100644
--- a/add/data/xql/getOverlayOnPage.xql
+++ b/add/data/xql/getOverlayOnPage.xql
@@ -9,14 +9,14 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace svg = "http://www.w3.org/2000/svg";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
diff --git a/add/data/xql/getOverlays.xql b/add/data/xql/getOverlays.xql
index a4f38b0d9..5cefeec73 100644
--- a/add/data/xql/getOverlays.xql
+++ b/add/data/xql/getOverlays.xql
@@ -3,7 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
@@ -11,7 +11,7 @@ declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
diff --git a/add/data/xql/getPages.xql b/add/data/xql/getPages.xql
index ad5d22247..ea9dbf25c 100644
--- a/add/data/xql/getPages.xql
+++ b/add/data/xql/getPages.xql
@@ -3,11 +3,11 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace img = "http://www.edirom.de/ns/image";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -16,7 +16,7 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "text";
 declare option output:media-type "text/plain";
diff --git a/add/data/xql/getParts.xql b/add/data/xql/getParts.xql
index 715581124..398e83ded 100644
--- a/add/data/xql/getParts.xql
+++ b/add/data/xql/getParts.xql
@@ -3,17 +3,17 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getPreferences.xql b/add/data/xql/getPreferences.xql
index 4488ad117..aabb4f0de 100644
--- a/add/data/xql/getPreferences.xql
+++ b/add/data/xql/getPreferences.xql
@@ -9,15 +9,15 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
  : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
  :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 3bb9986e1..b44de1bcf 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -3,21 +3,21 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 (:declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";:)
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $edition := request:get-parameter('edition', '');
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
diff --git a/add/data/xql/getRendering.xql b/add/data/xql/getRendering.xql
index d4d246366..9d4c2264b 100644
--- a/add/data/xql/getRendering.xql
+++ b/add/data/xql/getRendering.xql
@@ -3,7 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
@@ -11,7 +11,7 @@ declare namespace system = "http://exist-db.org/xquery/system";
 declare namespace transform = "http://exist-db.org/xquery/transform";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 13b53ce72..fea5c9997 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -3,12 +3,12 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom_image = "http://www.edirom.de/ns/image";
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
@@ -16,15 +16,15 @@ declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $imageWidth := 400;
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function local:generateRespSentence($names) {
     string-join(
diff --git a/add/data/xql/getText.xql b/add/data/xql/getText.xql
index fe2295ec7..59abaa6cd 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -3,18 +3,18 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 declare namespace xhtml = "http://www.w3.org/1999/xhtml";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";
 (:declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";:)
diff --git a/add/data/xql/getWorkID.xql b/add/data/xql/getWorkID.xql
index 40b093feb..b5d14ec01 100644
--- a/add/data/xql/getWorkID.xql
+++ b/add/data/xql/getWorkID.xql
@@ -9,15 +9,15 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom = "http://www.edirom.de/ns/1.3";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index 811b09993..3ba6baf45 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -9,16 +9,16 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace work = "http://www.edirom.de/xquery/work" at "../xqm/work.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getXml.xql b/add/data/xql/getXml.xql
index ee4b53b35..cd0819878 100644
--- a/add/data/xql/getXml.xql
+++ b/add/data/xql/getXml.xql
@@ -3,16 +3,16 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=xml media-type=text/xml omit-xml-declaration=no indent=yes";
 
diff --git a/add/data/xql/getZone.xql b/add/data/xql/getZone.xql
index 98ef84fb0..f2326e676 100644
--- a/add/data/xql/getZone.xql
+++ b/add/data/xql/getZone.xql
@@ -9,14 +9,14 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xlink = "http://www.w3.org/1999/xlink";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/getiFrameURL.xql b/add/data/xql/getiFrameURL.xql
index a9714066d..37e25e5b7 100644
--- a/add/data/xql/getiFrameURL.xql
+++ b/add/data/xql/getiFrameURL.xql
@@ -3,12 +3,12 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
 
diff --git a/add/data/xql/loginToTextGrid.xql b/add/data/xql/loginToTextGrid.xql
index 8746cd573..281a4e121 100644
--- a/add/data/xql/loginToTextGrid.xql
+++ b/add/data/xql/loginToTextGrid.xql
@@ -3,7 +3,7 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace html = "http://www.w3.org/1999/xhtml";
 
diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 4495ea0ee..5b758b282 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -3,27 +3,27 @@ xquery version "3.1";
 For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
 :)
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace kwic = "http://exist-db.org/xquery/kwic";
 
 import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei = "http://www.music-encoding.org/ns/mei";
 declare namespace request = "http://exist-db.org/xquery/request";
 declare namespace tei = "http://www.tei-c.org/ns/1.0";
 
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
 
 (:declare option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";:)
 
-(: VARIABLE DECLARATIONS =========================================== :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 declare variable $lang := request:get-parameter('lang', '');
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function local:filter($node as node(), $mode as xs:string) as xs:string? {
     if ($mode eq 'before') then
diff --git a/add/data/xqm/annotation.xqm b/add/data/xqm/annotation.xqm
index eb16542d3..e5fd71da8 100644
--- a/add/data/xqm/annotation.xqm
+++ b/add/data/xqm/annotation.xqm
@@ -12,19 +12,19 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 
 module namespace annotation = "http://www.edirom.de/xquery/annotation";
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace edition="http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 declare namespace request="http://exist-db.org/xquery/request";
 declare namespace system="http://exist-db.org/xquery/system";
 declare namespace transform="http://exist-db.org/xquery/transform";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 declare function annotation:getLocalizedLabel($node) {
 
diff --git a/add/data/xqm/edition.xqm b/add/data/xqm/edition.xqm
index 292705cca..6cfcbe2e0 100644
--- a/add/data/xqm/edition.xqm
+++ b/add/data/xqm/edition.xqm
@@ -10,16 +10,16 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
  :)
 module namespace edition = "http://www.edirom.de/xquery/edition";
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx="http://www.functx.com";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom="http://www.edirom.de/ns/1.3";
 declare namespace xlink="http://www.w3.org/1999/xlink";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
  : Returns a JSON representation of an Edition
diff --git a/add/data/xqm/source.xqm b/add/data/xqm/source.xqm
index cb60b201f..59faf367d 100644
--- a/add/data/xqm/source.xqm
+++ b/add/data/xqm/source.xqm
@@ -11,15 +11,15 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
  :)
 module namespace source = "http://www.edirom.de/xquery/source";
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
  : Returns whether a document is a source or not
diff --git a/add/data/xqm/teitext.xqm b/add/data/xqm/teitext.xqm
index 96258059d..b0e94394e 100644
--- a/add/data/xqm/teitext.xqm
+++ b/add/data/xqm/teitext.xqm
@@ -10,15 +10,15 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
  :)
 module namespace teitext="http://www.edirom.de/xquery/teitext";
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
  : Returns whether a document is a work or not
diff --git a/add/data/xqm/util.xqm b/add/data/xqm/util.xqm
index ce80a80fc..a36e16ac8 100644
--- a/add/data/xqm/util.xqm
+++ b/add/data/xqm/util.xqm
@@ -13,7 +13,7 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
 
 module namespace eutil = "http://www.edirom.de/xquery/util";
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace functx = "http://www.functx.com";
 
@@ -23,7 +23,7 @@ import module namespace source="http://www.edirom.de/xquery/source" at "source.x
 import module namespace teitext="http://www.edirom.de/xquery/teitext" at "teitext.xqm";
 import module namespace work="http://www.edirom.de/xquery/work" at "work.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom="http://www.edirom.de/ns/1.3";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
@@ -32,7 +32,7 @@ declare namespace system="http://exist-db.org/xquery/system";
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 declare namespace util="http://exist-db.org/xquery/util";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
  : Returns the namespace (standardized prefix)
diff --git a/add/data/xqm/work.xqm b/add/data/xqm/work.xqm
index bae24f7ca..a135afaee 100644
--- a/add/data/xqm/work.xqm
+++ b/add/data/xqm/work.xqm
@@ -10,16 +10,16 @@ For LICENSE-Details please refer to the LICENSE file in the root directory of th
  :)
 module namespace work = "http://www.edirom.de/xquery/work";
 
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace edirom="http://www.edirom.de/ns/1.3";
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 
-(: FUNCTION DECLARATIONS =========================================== :)
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
  : Returns a JSON representation of a Work

From 69b35f4cae9f9b0a8f81b38fbdddcaf2de40455d Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:50:32 +0100
Subject: [PATCH 078/103] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 53 +++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 43 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 15d08d8a2..1f1a5fc5f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,7 +47,7 @@ The beginning comments and the structuring comments (see below) of the prolog ar
 3. Each part of the prolog ends with a blank line.
 
 ```xquery
-(: IMPORTS ========================================================= :)
+(: IMPORTS ================================================================= :)
 
 ```
 
@@ -58,23 +58,19 @@ Sort imports by type:
 4. In the groups sort alphabetically by prefix.
 
 ```xquery
-(: NAMESPACE DECLARATIONS ========================================== :)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 ```
 
 All `declare namespace` statements, sorted alphabetically by prefix.
 
 ```xquery
-(: OPTION DECLARATIONS ============================================= :)
+(: OPTION DECLARATIONS ===================================================== :)
+
 
 ```
 All `declare option` statements.
 
-```xquery
-(: VARIABLE DECLARATIONS =========================================== :)
-
-```
-or
 ```xquery
 (: VARIABLE DECLARATIONS =================================================== :)
 
@@ -87,6 +83,8 @@ or
 ```xquery
 (: FUNCTION DECLARATIONS =========================================== :)
 
+(: FUNCTION DECLARATIONS =================================================== :)
+
 ```
 
 1. All `declare function` statements.
@@ -134,12 +132,47 @@ Note: this is derived from the current usage in Edirom-Online code
 
 ### Literal results
 
-TODO: how should literal result be indented, especially when they are long, e.g., as in the case of [getAudioPlayer.xql](add/data/xql/getAudioPlayer.xql).
+TODO: how should literal results be indented, especially when they are long, e.g., as in the case of [getAudioPlayer.xql](add/data/xql/getAudioPlayer.xql).
 
 ### let statements
 
-Short variable definitions should be in a single line
+Short variable definitions should be in a single line:
 
 ```xquery
 let $lang := 'de'
 ```
+
+Longer assignments, especially when the contain if-else-statements or FLWOR-expressions, should break after `:=` and then indent a further level, before following the rules applicable to the respective statements, e.g.:
+
+```xquery
+let $elems :=
+   for $p in $participants
+   let $id := substring-after($p, '#')
+   return doc($doc)/id($id)
+```
+
+### Function declarations
+
+```xquery
+(:~
+ : XQdoc comment
+ :
+ …
+ :
+ :)
+declare function prefix:function-name( $paramOne as datatype, §paramTwo as datatype )
+as datatype
+{
+   …
+};
+
+```
+
+- [ ] at the moment return datatypes and opening curly braces of function declarations are still in the same line as the `declare function` statement
+- [ ] break long function argument
+
+### HowTo ToDo:s
+
+- [ ] literal results formatting
+- [ ] nested return statements
+- [ ] parenthesis placement

From 500d2849f7eddbc2d212fd6c3172677d4149328a Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:57:23 +0100
Subject: [PATCH 079/103] unify license beginning comment

---
 add/data/xql/getAnnotationPreviews.xql     | 4 ++--
 add/data/xql/getAnnotationText.xql         | 4 ++--
 add/data/xql/getAnnotations.xql            | 4 ++--
 add/data/xql/getAnnotationsInRendering.xql | 4 ++--
 add/data/xql/getAnnotationsInText.xql      | 4 ++--
 add/data/xql/getAnnotationsOnPage.xql      | 4 ++--
 add/data/xql/getAudioPlayer.xql            | 4 ++--
 add/data/xql/getChapters.xql               | 4 ++--
 add/data/xql/getConcordances.xql           | 4 ++--
 add/data/xql/getEdition.xql                | 4 ++--
 add/data/xql/getEditionURI.xql             | 4 ++--
 add/data/xql/getExtendedStaff.xql          | 4 ++--
 add/data/xql/getHeader.xql                 | 4 ++--
 add/data/xql/getHelp.xql                   | 4 ++--
 add/data/xql/getInternalIdType.xql         | 4 ++--
 add/data/xql/getLanguageFile.xql           | 4 ++--
 add/data/xql/getLinkTarget.xql             | 4 ++--
 add/data/xql/getMeasure.xql                | 4 ++--
 add/data/xql/getMeasurePage.xql            | 4 ++--
 add/data/xql/getMeasures.xql               | 4 ++--
 add/data/xql/getMeasuresOnPage.xql         | 4 ++--
 add/data/xql/getMovements.xql              | 4 ++--
 add/data/xql/getMovementsFirstPage.xql     | 4 ++--
 add/data/xql/getMusicInMdiv.xql            | 4 ++--
 add/data/xql/getNavigatorConfig.xql        | 4 ++--
 add/data/xql/getOverlayOnPage.xql          | 4 ++--
 add/data/xql/getOverlays.xql               | 4 ++--
 add/data/xql/getPages.xql                  | 4 ++--
 add/data/xql/getParts.xql                  | 4 ++--
 add/data/xql/getPreferences.xql            | 4 ++--
 add/data/xql/getReducedDocument.xql        | 4 ++--
 add/data/xql/getRendering.xql              | 4 ++--
 add/data/xql/getSummary.xql                | 4 ++--
 add/data/xql/getText.xql                   | 4 ++--
 add/data/xql/getWorkID.xql                 | 4 ++--
 add/data/xql/getWorks.xql                  | 4 ++--
 add/data/xql/getXml.xql                    | 4 ++--
 add/data/xql/getZone.xql                   | 4 ++--
 add/data/xql/getiFrameURL.xql              | 4 ++--
 add/data/xql/loginToTextGrid.xql           | 4 ++--
 add/data/xql/search.xql                    | 4 ++--
 add/data/xqm/annotation.xqm                | 4 ++--
 add/data/xqm/edition.xqm                   | 4 ++--
 add/data/xqm/source.xqm                    | 4 ++--
 add/data/xqm/teitext.xqm                   | 4 ++--
 add/data/xqm/util.xqm                      | 4 ++--
 add/data/xqm/work.xqm                      | 4 ++--
 47 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 426856a59..75e131a29 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns the HTML for a specific annotation for an AnnotationView.
diff --git a/add/data/xql/getAnnotationText.xql b/add/data/xql/getAnnotationText.xql
index 27051e2d9..b50e16a43 100644
--- a/add/data/xql/getAnnotationText.xql
+++ b/add/data/xql/getAnnotationText.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns the HTML for the textual content of a specific annotation for an AnnotationView.
diff --git a/add/data/xql/getAnnotations.xql b/add/data/xql/getAnnotations.xql
index 939cd4c63..7b4e86a7c 100644
--- a/add/data/xql/getAnnotations.xql
+++ b/add/data/xql/getAnnotations.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
 : Returns a JSON representation of all Annotations of a document.
diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index ba0cfe88c..4e1dab0aa 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns a JSON sequence with all anotations on a specific page.
diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index 25808e105..32e14eebc 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -1,7 +1,7 @@
 xquery version "1.0";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns a JSON sequence with all anotations in a specific text.
diff --git a/add/data/xql/getAnnotationsOnPage.xql b/add/data/xql/getAnnotationsOnPage.xql
index 0d29cafe9..c0b79e309 100644
--- a/add/data/xql/getAnnotationsOnPage.xql
+++ b/add/data/xql/getAnnotationsOnPage.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  :  Returns a JSON sequence with all anotations on a specific page.
diff --git a/add/data/xql/getAudioPlayer.xql b/add/data/xql/getAudioPlayer.xql
index e5b09a72f..99548c7f9 100644
--- a/add/data/xql/getAudioPlayer.xql
+++ b/add/data/xql/getAudioPlayer.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getChapters.xql b/add/data/xql/getChapters.xql
index 3877f7086..95ef53244 100644
--- a/add/data/xql/getChapters.xql
+++ b/add/data/xql/getChapters.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index cbddc35ae..784349162 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getEdition.xql b/add/data/xql/getEdition.xql
index 2e0a53878..6d5e11800 100644
--- a/add/data/xql/getEdition.xql
+++ b/add/data/xql/getEdition.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
 : Returns a JSON representation of an Edition.
diff --git a/add/data/xql/getEditionURI.xql b/add/data/xql/getEditionURI.xql
index d66549edf..e8c9e0a26 100644
--- a/add/data/xql/getEditionURI.xql
+++ b/add/data/xql/getEditionURI.xql
@@ -1,7 +1,7 @@
 xquery version "3.0";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
 : Returns the URI of the first found Edition.
diff --git a/add/data/xql/getExtendedStaff.xql b/add/data/xql/getExtendedStaff.xql
index 1504a9215..c2881cb84 100644
--- a/add/data/xql/getExtendedStaff.xql
+++ b/add/data/xql/getExtendedStaff.xql
@@ -1,8 +1,8 @@
 xquery version "3.1";
 
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getHeader.xql b/add/data/xql/getHeader.xql
index b10e4f176..d77476a4e 100644
--- a/add/data/xql/getHeader.xql
+++ b/add/data/xql/getHeader.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
index 87c783542..2c91cb5bf 100644
--- a/add/data/xql/getHelp.xql
+++ b/add/data/xql/getHelp.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: OPTION DECLARATIONS ===================================================== :)
 
diff --git a/add/data/xql/getInternalIdType.xql b/add/data/xql/getInternalIdType.xql
index f61c23139..264f6be09 100644
--- a/add/data/xql/getInternalIdType.xql
+++ b/add/data/xql/getInternalIdType.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getLanguageFile.xql b/add/data/xql/getLanguageFile.xql
index 0a97c9b3b..39799c91e 100644
--- a/add/data/xql/getLanguageFile.xql
+++ b/add/data/xql/getLanguageFile.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : Returns a language file as JSON or XML.
diff --git a/add/data/xql/getLinkTarget.xql b/add/data/xql/getLinkTarget.xql
index 328874c53..db7821697 100644
--- a/add/data/xql/getLinkTarget.xql
+++ b/add/data/xql/getLinkTarget.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getMeasure.xql b/add/data/xql/getMeasure.xql
index ba8a96388..5ba36eba1 100644
--- a/add/data/xql/getMeasure.xql
+++ b/add/data/xql/getMeasure.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getMeasurePage.xql b/add/data/xql/getMeasurePage.xql
index 34cc7f61d..38aac2cd5 100644
--- a/add/data/xql/getMeasurePage.xql
+++ b/add/data/xql/getMeasurePage.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/getMeasures.xql b/add/data/xql/getMeasures.xql
index 85e9642a5..4e5d0ee0f 100644
--- a/add/data/xql/getMeasures.xql
+++ b/add/data/xql/getMeasures.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getMeasuresOnPage.xql b/add/data/xql/getMeasuresOnPage.xql
index 17844272e..ff4377e6c 100644
--- a/add/data/xql/getMeasuresOnPage.xql
+++ b/add/data/xql/getMeasuresOnPage.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns a JSON sequence with all measures on a specific page.
diff --git a/add/data/xql/getMovements.xql b/add/data/xql/getMovements.xql
index 1243587af..782500838 100644
--- a/add/data/xql/getMovements.xql
+++ b/add/data/xql/getMovements.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/getMovementsFirstPage.xql b/add/data/xql/getMovementsFirstPage.xql
index d32303fb8..0b316fe6a 100644
--- a/add/data/xql/getMovementsFirstPage.xql
+++ b/add/data/xql/getMovementsFirstPage.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/getMusicInMdiv.xql b/add/data/xql/getMusicInMdiv.xql
index 86e3bba75..ab7201028 100644
--- a/add/data/xql/getMusicInMdiv.xql
+++ b/add/data/xql/getMusicInMdiv.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/getNavigatorConfig.xql b/add/data/xql/getNavigatorConfig.xql
index 9c4b9ac11..3b2543cfa 100644
--- a/add/data/xql/getNavigatorConfig.xql
+++ b/add/data/xql/getNavigatorConfig.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getOverlayOnPage.xql b/add/data/xql/getOverlayOnPage.xql
index 410a86a47..be8ce4b35 100644
--- a/add/data/xql/getOverlayOnPage.xql
+++ b/add/data/xql/getOverlayOnPage.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns an SVG element.
diff --git a/add/data/xql/getOverlays.xql b/add/data/xql/getOverlays.xql
index 5cefeec73..7fb2acd12 100644
--- a/add/data/xql/getOverlays.xql
+++ b/add/data/xql/getOverlays.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/getPages.xql b/add/data/xql/getPages.xql
index ea9dbf25c..46b008267 100644
--- a/add/data/xql/getPages.xql
+++ b/add/data/xql/getPages.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getParts.xql b/add/data/xql/getParts.xql
index 398e83ded..afffa2211 100644
--- a/add/data/xql/getParts.xql
+++ b/add/data/xql/getParts.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getPreferences.xql b/add/data/xql/getPreferences.xql
index aabb4f0de..0c7d4aa41 100644
--- a/add/data/xql/getPreferences.xql
+++ b/add/data/xql/getPreferences.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : Returns preferences as JSON or XML.
diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index b44de1bcf..04d8cde2c 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getRendering.xql b/add/data/xql/getRendering.xql
index 9d4c2264b..3455712d7 100644
--- a/add/data/xql/getRendering.xql
+++ b/add/data/xql/getRendering.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index fea5c9997..cf7e5eb35 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getText.xql b/add/data/xql/getText.xql
index 59abaa6cd..493c42e80 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getWorkID.xql b/add/data/xql/getWorkID.xql
index b5d14ec01..ea66b4241 100644
--- a/add/data/xql/getWorkID.xql
+++ b/add/data/xql/getWorkID.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
 : Returns the ID of the first work of an Edition if the given ID is not valid.
diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index 3ba6baf45..f42f6d827 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
 : Returns a JSON representation of all Works inside an Edition.
diff --git a/add/data/xql/getXml.xql b/add/data/xql/getXml.xql
index cd0819878..e064a1867 100644
--- a/add/data/xql/getXml.xql
+++ b/add/data/xql/getXml.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xql/getZone.xql b/add/data/xql/getZone.xql
index f2326e676..2909070f3 100644
--- a/add/data/xql/getZone.xql
+++ b/add/data/xql/getZone.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns a JSON representation of a zone.
diff --git a/add/data/xql/getiFrameURL.xql b/add/data/xql/getiFrameURL.xql
index 37e25e5b7..5669780af 100644
--- a/add/data/xql/getiFrameURL.xql
+++ b/add/data/xql/getiFrameURL.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/loginToTextGrid.xql b/add/data/xql/loginToTextGrid.xql
index 281a4e121..2f388a10a 100644
--- a/add/data/xql/loginToTextGrid.xql
+++ b/add/data/xql/loginToTextGrid.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: NAMESPACE DECLARATIONS ================================================== :)
 
diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 5b758b282..8c74e51e4 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (: IMPORTS ================================================================= :)
 
diff --git a/add/data/xqm/annotation.xqm b/add/data/xqm/annotation.xqm
index e5fd71da8..b531d7996 100644
--- a/add/data/xqm/annotation.xqm
+++ b/add/data/xqm/annotation.xqm
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : This module provides library functions for Annotations
diff --git a/add/data/xqm/edition.xqm b/add/data/xqm/edition.xqm
index 6cfcbe2e0..e456001c3 100644
--- a/add/data/xqm/edition.xqm
+++ b/add/data/xqm/edition.xqm
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : This module provides library functions for Editions
diff --git a/add/data/xqm/source.xqm b/add/data/xqm/source.xqm
index 59faf367d..2908a45fa 100644
--- a/add/data/xqm/source.xqm
+++ b/add/data/xqm/source.xqm
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : This module provides library functions for Sources
diff --git a/add/data/xqm/teitext.xqm b/add/data/xqm/teitext.xqm
index b0e94394e..ad0142d1a 100644
--- a/add/data/xqm/teitext.xqm
+++ b/add/data/xqm/teitext.xqm
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : This module provides library functions for Texts
diff --git a/add/data/xqm/util.xqm b/add/data/xqm/util.xqm
index a36e16ac8..dfbe2a145 100644
--- a/add/data/xqm/util.xqm
+++ b/add/data/xqm/util.xqm
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : This module provides library utility functions
diff --git a/add/data/xqm/work.xqm b/add/data/xqm/work.xqm
index a135afaee..1cf6fdd83 100644
--- a/add/data/xqm/work.xqm
+++ b/add/data/xqm/work.xqm
@@ -1,7 +1,7 @@
 xquery version "3.1";
 (:
-For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
  : This module provides library functions for Works

From 8fba42d167d8b2a923770e9fe32eaeac5a2d96c5 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Mon, 5 Feb 2024 13:59:58 +0100
Subject: [PATCH 080/103] Update getAnnotationsInText.xql

fix xquery version
---
 add/data/xql/getAnnotationsInText.xql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index 32e14eebc..63d3d2e39 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -1,4 +1,4 @@
-xquery version "1.0";
+xquery version "3.1";
 (:
  : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)

From a2ccf5cab9079ca3f099eae6de20c6401610a612 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 7 Feb 2024 10:29:02 +0100
Subject: [PATCH 081/103] Update add/data/xql/getEditionURI.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getEditionURI.xql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add/data/xql/getEditionURI.xql b/add/data/xql/getEditionURI.xql
index e8c9e0a26..e2c862530 100644
--- a/add/data/xql/getEditionURI.xql
+++ b/add/data/xql/getEditionURI.xql
@@ -1,4 +1,4 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
  : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
  :)

From 09619a193fae1362f01342a4141a72dda2f5af07 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Tue, 13 Feb 2024 08:18:15 +0100
Subject: [PATCH 082/103] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5b3073786..e07179ce3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -81,8 +81,6 @@ All `declare option` statements.
 4. In the groups, sort alphabetically.
 
 ```xquery
-(: FUNCTION DECLARATIONS =========================================== :)
-
 (: FUNCTION DECLARATIONS =================================================== :)
 
 ```
@@ -197,7 +195,7 @@ An example of using the function would be:
 
 ```javascript
 window.doAJAXRequest('data/xql/getAnnotationMeta.xql',
-    'GET', 
+    'GET',
     {
         uri: uri,
         lang: lang

From c601e95a4dbd5598e3e786606986d2661e33d8f2 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Tue, 13 Feb 2024 08:18:45 +0100
Subject: [PATCH 083/103] add missing structure-comment

---
 add/data/xql/getAnnotationPreviews.xql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 75e131a29..eba090b99 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -38,6 +38,8 @@ declare variable $imageBasePath := if ($imageserver = 'leaflet') then
 else
     (eutil:getPreference('image_prefix', $edition));
 
+(: FUNCTION DECLARATIONS =================================================== :)
+
 declare function local:getParticipants($annot as element()) as map(*)* {
     
     let $participants := tokenize($annot/string(@plist), ' ')

From 134e2e7f36d1c6eac05474e2fa59c3869658d9ba Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Tue, 13 Feb 2024 08:18:59 +0100
Subject: [PATCH 084/103] add some documentation

---
 add/data/xql/getAnnotationPreviews.xql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index eba090b99..378c3bd80 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -40,6 +40,13 @@ else
 
 (: FUNCTION DECLARATIONS =================================================== :)
 
+(:~
+ : Tokenizes the value of an annotation and gets attributes of each participant
+ :
+ : @param $annot an mei:annot element
+ :
+ : @return a map{} with the attributes of all participants
+ :)
 declare function local:getParticipants($annot as element()) as map(*)* {
     
     let $participants := tokenize($annot/string(@plist), ' ')

From ca7bd6f7f66b3cecb93b2d4806c31572a9bb4346 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Tue, 13 Feb 2024 08:22:21 +0100
Subject: [PATCH 085/103] fix order of FLOWR expression

fix indentation and trailing whitespaces in local:getParticipants
---
 add/data/xql/getAnnotationPreviews.xql | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index 378c3bd80..d7ddbce72 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -139,8 +139,6 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
         return
             $elem
             
-            where count($elems) gt 0
-        
         let $zones := for $elem in $elems
         return
             local:getZone($elem)
@@ -180,6 +178,9 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
         
         let $linkUri := concat('xmldb:exist://', document-uri($graphic/root()), '#', local:getSourceLinkTarget($elems, $zones))
         
+
+        where count($elems) gt 0
+
         return
             map {
                 'type': $type,

From 7ca98cb09aa8076a2b67e4a8de5d10b9f923e067 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Tue, 13 Feb 2024 08:22:46 +0100
Subject: [PATCH 086/103] Update getAnnotationPreviews.xql

update indentation and remove trailing whitespaces and whitespaces on empty lines
---
 add/data/xql/getAnnotationPreviews.xql | 129 +++++++++++++------------
 1 file changed, 68 insertions(+), 61 deletions(-)

diff --git a/add/data/xql/getAnnotationPreviews.xql b/add/data/xql/getAnnotationPreviews.xql
index d7ddbce72..1c6944c6d 100644
--- a/add/data/xql/getAnnotationPreviews.xql
+++ b/add/data/xql/getAnnotationPreviews.xql
@@ -48,15 +48,16 @@ else
  : @return a map{} with the attributes of all participants
  :)
 declare function local:getParticipants($annot as element()) as map(*)* {
-    
+
     let $participants := tokenize($annot/string(@plist), ' ')
-    
+
     (: get distinct document uris referenced in @plist :)
-    let $docs := distinct-values(
-        for $p in $participants
-        return substring-before($p, '#')
-    )
-    
+    let $docs :=
+        distinct-values(
+            for $p in $participants
+            return substring-before($p, '#')
+        )
+
     return
         for $doc in $docs
         order by $doc
@@ -70,7 +71,7 @@ declare function local:getParticipants($annot as element()) as map(*)* {
 };
 
 declare function local:getTextParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-    
+
     for $participant in $participants
     let $id := substring-after($participant, '#')
     let $hiddenData := concat('uri:', $doc, '__$$__participantId:', $id)
@@ -119,54 +120,61 @@ declare function local:getTextNotePrecedingContent($elem as element()) as xs:str
  : @param $doc a URI pointing to the MEI document
  :)
 declare function local:getSourceParticipants($participants as xs:string*, $doc as xs:string) as map(*)* {
-    
+
     (: group participants :)
     let $combs := local:groupParticipants($participants, $doc)
-    
+
     return
-        
+
         for $comb in distinct-values($combs)
         let $partIndices := tokenize($comb, '-')
-        
+
         let $elems :=
-        for $p in distinct-values($partIndices)
-        let $relevant.participant := $participants[starts-with(., $doc)][number($p)]
-        let $element.id := substring-after($relevant.participant, '#')
-        let $elem := local:getElement($relevant.participant)
-        (:return if(exists($elem)) then(local-name($elem)) else($relevant.participant):)
+            for $p in distinct-values($partIndices)
+            let $relevant.participant := $participants[starts-with(., $doc)][number($p)]
+            let $element.id := substring-after($relevant.participant, '#')
+            let $elem := local:getElement($relevant.participant)
+            (:return if(exists($elem)) then(local-name($elem)) else($relevant.participant):)
             where exists($elem)
             order by count($elem/preceding::*)
-        return
-            $elem
-            
-        let $zones := for $elem in $elems
-        return
-            local:getZone($elem)
-        
+            return
+                $elem
+
+        let $zones :=
+            for $elem in $elems
+            return
+                local:getZone($elem)
+
         let $type := local:getType($zones)
         let $label := local:getItemLabel($elems)
-        
+
         let $mdiv := '' (: TODO if($elem/ancestor-or-self::mei:mdiv) then($elem/ancestor-or-self::mei:mdiv/@label) else(''):)
-        let $page := if ($zones[1]/parent::mei:surface/@label != '') then
-            ($zones[1]/parent::mei:surface/string(@label))
-        else
-            ($zones[1]/parent::mei:surface/string(@n))
+        let $page :=
+            if ($zones[1]/parent::mei:surface/@label != '') then
+                ($zones[1]/parent::mei:surface/string(@label))
+            else
+                ($zones[1]/parent::mei:surface/string(@n))
+
         let $sourceLabel := source:getLabel($doc, $edition)
         let $siglum := ($elems[1]/root()//mei:*[@type eq 'siglum'])[1]/text()
-        
-        let $part := string-join(distinct-values(for $e in $elems
-        return
-            $e/ancestor::mei:part/string(@label)), '-')
-        
+
+        let $part :=
+            string-join(
+                distinct-values(
+                    for $e in $elems
+                    return
+                        $e/ancestor::mei:part/string(@label)),
+            '-')
+
         let $graphic := $zones[1]/../mei:graphic[@type = 'facsimile']
         let $imgWidth := number($graphic/@width)
         let $imgHeight := number($graphic/@height)
-        
+
         let $digilibBaseParams := local:getImageAreaPath($imageBasePath, $graphic)
         let $rect := local:getBoundingZone($zones)
-        
+
         let $digilibSizeParams := local:getImageAreaParams($rect, $imgWidth, $imgHeight)
-        
+
         let $hiddenData := map {
             'width': number($rect/@lrx) - number($rect/@ulx),
             'height': number($rect/@lry) - number($rect/@uly),
@@ -175,9 +183,8 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
             'origH': $imgHeight,
             'origW': $imgWidth
         }
-        
+
         let $linkUri := concat('xmldb:exist://', document-uri($graphic/root()), '#', local:getSourceLinkTarget($elems, $zones))
-        
 
         where count($elems) gt 0
 
@@ -219,20 +226,20 @@ declare function local:getSourceLinkTarget($elems as node()*, $zones as node()*)
 };
 
 declare function local:groupParticipants($participants as xs:string*, $doc as xs:string) as xs:string* {
-    
+
     let $elems :=
         for $p in $participants
         let $id := substring-after($p, '#')
         return doc($doc)/id($id)
-    
+
     let $zones :=
         for $elem in $elems
         return local:getZone($elem)
-    
+
     let $combs :=
         for $p at $i in $participants
         return local:getCombinations($elems, $zones, $i, count($zones))
-    
+
     return
         reverse(
             for $comb at $i in reverse($combs)
@@ -251,10 +258,10 @@ declare function local:groupParticipants($participants as xs:string*, $doc as xs
 };
 
 declare function local:getCombinations($elems as element()*, $zones as element()*, $i as xs:int, $total as xs:int) as xs:string {
-    
+
     let $currentZone := $zones[$i]
     let $currentElem := $elems[$i]
-    
+
     return
         if (local-name($currentElem) eq 'measure' or local-name($currentElem) eq 'staff') then (
             string-join((
@@ -272,7 +279,7 @@ declare function local:getCombinations($elems as element()*, $zones as element()
 };
 
 declare function local:compareZones($zone1 as element(), $zone2 as element()) as xs:boolean {
-    
+
     let $samePage := deep-equal($zone1/.., $zone2/..)
     let $overlapping := not(
         number($zone1/@ulx) gt number($zone2/@lrx) or
@@ -280,7 +287,7 @@ declare function local:compareZones($zone1 as element(), $zone2 as element()) as
         number($zone1/@uly) gt number($zone2/@lry) or
         number($zone1/@lry) lt number($zone2/@uly)
     )
-    
+
     return
         $samePage and $overlapping
 };
@@ -288,7 +295,7 @@ declare function local:compareZones($zone1 as element(), $zone2 as element()) as
 declare function local:getElement($uri as xs:string) as element()? {
     let $doc := substring-before($uri, '#')
     let $id := substring-after($uri, '#')
-    
+
     return
         doc($doc)/id($id)
 };
@@ -331,18 +338,18 @@ declare function local:getBoundingZone($zones as element()*) as element() {
 
 :)
 declare function local:getImageAreaPath($basePath as xs:string, $graphic as element()?) as xs:string {
-    
+
     let $imagePath := string($graphic/@target)
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
     let $isAbsolute := starts-with($imagePath, 'http')
-    
+
     let $fields :=
         if ($imageserver = 'leaflet') then
             (substring-before($imagePath, '.'))
         else
             ()
-    
+
     return
         if ($isAbsolute) then
             $imagePath
@@ -370,30 +377,30 @@ declare function local:getImageAreaPath($basePath as xs:string, $graphic as elem
 :)
 declare function local:getImageAreaParams($zone as element()?, $imgWidth as xs:int, $imgHeight as xs:int) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-    
+
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-    
+
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-    
+
     return
         concat('&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit')
 };
 
 declare function local:getItemLabel($elems as element()*) as xs:string {
     let $language := eutil:getLanguage($edition)
-    
+
     return
         string-join((
             for $type in distinct-values(
                 for $elem in $elems
                 return local-name($elem))
-            
+
             let $items :=
                 for $elem in $elems
                 return
@@ -401,13 +408,13 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                         $elem
                     else
                         ()
-            
+
             let $itemLabelMultiRestSensitive :=
                 if ($items[1]//mei:multiRest) then
                     ($items[1]/@n || '–' || number($items[1]/@n) + number($items[1]//mei:multiRest/@num) - 1)
                 else
                     $items[1]/@n
-            
+
             return
                 if (local-name($items[1]) eq 'measure') then (
                     if (count($items) gt 1) then
@@ -417,7 +424,7 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                 ) else if (local-name($items[1]) eq 'staff') then (: TODO: $itemLabelMultiRestSensitive also for staffs? :) (
                     if (count($items) gt 1) then (
                         let $measureNs := distinct-values($items/ancestor::mei:measure/@n)
-                        
+
                         let $label :=
                             if ($lang = 'de') then(
                                 if (count($measureNs) gt 1) then
@@ -432,12 +439,12 @@ declare function local:getItemLabel($elems as element()*) as xs:string {
                                     concat('Bar ', $measureNs[1])
                                 )
                             )
-                        
+
                         return
                             concat($label, ' (', string-join($items/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ', '), ')')
                     ) else
                         (concat('Takt ', $items[1]/ancestor::mei:measure/@n, ' (', $items[1]/preceding::mei:staffDef[@n = $items[1]/@n][1]/@label.abbr, ')'))
-                
+
                 ) else if (local-name($items[1]) eq 'zone') then (
                     if (count($items) gt 1) then (
                         (:Dieser Fall sollte nicht vorkommen, da freie zones nicht zusammengefasst werden dürfen:)

From 306e23655d19bb0d4c6266519aa1a90200a3de8d Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 15 Feb 2024 01:01:01 +0100
Subject: [PATCH 087/103] Update source.xqm

fix wrong variable reference
---
 add/data/xqm/source.xqm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add/data/xqm/source.xqm b/add/data/xqm/source.xqm
index 3403b9b41..f9fea72c1 100644
--- a/add/data/xqm/source.xqm
+++ b/add/data/xqm/source.xqm
@@ -45,7 +45,7 @@ declare function source:isSource($uri as xs:string) as xs:boolean {
         (: MEI 4.0.1 and 5.0 with all dev and cutomization variants :)
         (matches($doc//mei:mei/@meiversion, $meiVersion4To5Regex) and exists($doc//mei:manifestation[@singleton='true'])) (:mei4+ for manuscripts:)
         or
-        (matches($doc//mei:mei/@meiversion, $meiVersion4ToRegex) and exists($doc//mei:manifestation//mei:item)) (: mei4+ for prints :)
+        (matches($doc//mei:mei/@meiversion, $meiVersion4To5Regex) and exists($doc//mei:manifestation//mei:item)) (: mei4+ for prints :)
 };
 
 (:~

From 84d924f4b621e6cbb46de369eb844c6aa0583fe8 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Thu, 15 Feb 2024 01:01:20 +0100
Subject: [PATCH 088/103] Update source.xqm

remove trailing whitespace
---
 add/data/xqm/source.xqm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/add/data/xqm/source.xqm b/add/data/xqm/source.xqm
index f9fea72c1..c588b3dc4 100644
--- a/add/data/xqm/source.xqm
+++ b/add/data/xqm/source.xqm
@@ -31,7 +31,7 @@ declare namespace mei="http://www.music-encoding.org/ns/mei";
 : is considered a music source or not.
 :)
 declare function source:isSource($uri as xs:string) as xs:boolean {
-    
+
     let $doc := eutil:getDoc($uri)
     let $meiVersion4To5Regex := '^[4-5](\.\d){1,2}(-dev)?(\+(anyStart|basic|CMN|Mensural|Neumes))?$'
 
@@ -39,7 +39,7 @@ declare function source:isSource($uri as xs:string) as xs:boolean {
         (: 2010-05 pre camelCase :)
         (: 2011-05 2012 :)
         (: 2013 +meiversion.num 2.1.1:)
-        (: 3.0.0 :) 
+        (: 3.0.0 :)
         (exists($doc//mei:mei) and exists($doc//mei:source))
         or
         (: MEI 4.0.1 and 5.0 with all dev and cutomization variants :)
@@ -55,11 +55,11 @@ declare function source:isSource($uri as xs:string) as xs:boolean {
  : @return The labels
  :)
 declare function source:getLabels($sources as xs:string*, $edition as xs:string) as xs:string {
-    
+
     string-join(
         for $source in $sources return source:getLabel($source, $edition)
     , ', ')
-    
+
 };
 
 (:~
@@ -69,24 +69,24 @@ declare function source:getLabels($sources as xs:string*, $edition as xs:string)
  : @return The label
  :)
 declare function source:getLabel($source as xs:string, $edition as xs:string) as xs:string {
-    
+
     let $sourceDoc := doc($source)
     let $language := eutil:getLanguage($edition)
-    
+
     let $label :=
         (:TODO encoding of source labels may heavily differ in certain encoding contexts, thus introduction of class="http://www.edirom.de/edirom-online/source/label" OR some configuration method, e.g., a user definable function :)
         if($sourceDoc/mei:mei/@meiversion = ("4.0.0", "4.0.1")) then
             $sourceDoc//mei:manifestation[@singleton='true']/mei:titleStmt/mei:title[@class = "http://www.edirom.de/edirom-online/source/label"][not(@xml:lang) or @xml:lang = $language]
-        
+
         else
             $sourceDoc//mei:source/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language]
-    
+
     let $label :=
         if($label) then
             ($label)
         else
             (doc($source)//mei:meiHead/mei:fileDesc/mei:titleStmt/mei:title[not(@xml:lang) or @xml:lang = $language])
-    
+
     let $label :=
         if($label) then
             ($label)
@@ -104,11 +104,11 @@ declare function source:getLabel($source as xs:string, $edition as xs:string) as
  : @return The sigla
  :)
 declare function source:getSigla($sources as xs:string*) as xs:string {
-    
+
     string-join(
         source:getSiglaAsArray($sources)
     , ', ')
-    
+
 };
 
 (:~
@@ -140,6 +140,6 @@ declare function source:getSiglum($source as xs:string) as xs:string? {
             ($elems[1]//text())
         else
             ()
-    
+
     return $siglum
 };

From 6efd94397b9e45607cf09bd197c7af1a9b94171b Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 09:19:20 +0100
Subject: [PATCH 089/103] Update add/data/xql/getAnnotationsInRendering.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getAnnotationsInRendering.xql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index 4e1dab0aa..7b0709a46 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -28,6 +28,7 @@ declare function local:getAnnotations($edition as xs:string, $edition_path as xs
     
     for $measureId in $elemIds
     let $uriPlusId := concat($uri, '#', $measureId)
+    (: TODO update XPath e.g., parent::node()  at the end or similar :)
     let $annots := collection($edition_path)//mei:annot/@plist[tokenize(string(.), '\s+') = $uriPlusId]/..
     
     return

From 1ffcb202f0a09324ebf15fa312dc9cea742ef3e0 Mon Sep 17 00:00:00 2001
From: bwbohl <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:22:05 +0100
Subject: [PATCH 090/103] Update getAnnotation.xql

---
 add/data/xql/getAnnotation.xql | 476 +++++++++++++++------------------
 1 file changed, 220 insertions(+), 256 deletions(-)

diff --git a/add/data/xql/getAnnotation.xql b/add/data/xql/getAnnotation.xql
index 96b57e74a..fcf1972fd 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -33,11 +33,11 @@ declare variable $edition := request:get-parameter('edition', '');
 
 declare variable $imageserver := eutil:getPreference('image_server', $edition);
 
-declare variable $imageBasePath := if ($imageserver = 'leaflet')
-then
-    (eutil:getPreference('leaflet_prefix', $edition))
-else
-    (eutil:getPreference('image_prefix', $edition));
+declare variable $imageBasePath :=
+    if ($imageserver = 'leaflet') then
+        (eutil:getPreference('leaflet_prefix', $edition))
+    else
+        (eutil:getPreference('image_prefix', $edition));
 
 declare variable $lang := request:get-parameter('lang', '');
 
@@ -51,17 +51,13 @@ declare variable $lang := request:get-parameter('lang', '');
  :  @return The zone element
  :)
 declare function local:getZone($elem as element()) as element()? {
-    if ($elem/@facs)
-    then
-        (
+
+    if ($elem/@facs) then (
         let $zoneId := replace($elem/@facs, '^#', '')
         return
             $elem/root()/id($zoneId)
-        )
-    else
-        (
-        $elem
-        )
+    ) else
+        ($elem)
 };
 
 (:~
@@ -71,24 +67,21 @@ declare function local:getZone($elem as element()) as element()? {
  :  @return the label for the Priority, or, if this fails, $uri
  :)
 declare function local:getPriority($annot as node()) {
-    
+
     let $uri := $annot/mei:ptr[@type eq 'priority']/string(@target)
-    let $doc := if (starts-with($uri, '#'))
-    then
-        (
+
+    let $doc := if (starts-with($uri, '#')) then (
         $annot/root()
-        )
-    else
-        (
+    ) else (
         doc(substring-before($uri, '#'))
-        )
+    )
+
     let $locID := substring-after($uri, '#')
-    
+
     let $elem := $doc/id($locID)
-    
+
     return
-        if ($elem/mei:name)
-        then
+        if ($elem/mei:name) then
             (normalize-space(eutil:getLocalizedName($elem, $lang)))
         else
             ($locID)
@@ -101,24 +94,24 @@ declare function local:getPriority($annot as node()) {
  :  @return the string of annotation labels, or, if one of them fails, the respecitve $uri
  :)
 declare function local:getCategories($annot as node()) {
-    
+
     let $uris := tokenize($annot/mei:ptr[@type eq 'categories']/string(@target), ' ')
-    
-    let $string := for $uri in $uris
-    let $doc := if (starts-with($uri, '#'))
-    then
-        (
-        $annot/root()
-        )
-    else
-        (
-        doc(substring-before($uri, '#'))
-        )
+
+    let $string :=
+        for $uri in $uris
+        let $doc :=
+            if (starts-with($uri, '#')) then (
+                $annot/root()
+            ) else (
+                doc(substring-before($uri, '#'))
+            )
+
     let $locID := substring-after($uri, '#')
+
     let $elem := $doc/id($locID)
+
     return
-        if ($elem/mei:name)
-        then
+        if ($elem/mei:name) then
             (eutil:getLocalizedName($elem, $lang))
         else
             ($locID)
@@ -137,22 +130,23 @@ declare function local:getCategories($annot as node()) {
  :  @return A URL pointing to an image based as xs:string
  :)
 declare function local:getImageAreaPath($basePath as xs:string, $zone as element()?, $width as xs:integer) as xs:string {
+
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-    
+
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-    
+
     let $imagePath := $graphic/@target
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
-    
+
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-    
+
     return
         concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $width, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit')
 };
@@ -160,23 +154,23 @@ declare function local:getImageAreaPath($basePath as xs:string, $zone as element
 (: for tips :)
 declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as element()?, $width as xs:integer, $height as xs:integer) as xs:string {
     let $graphic := $zone/../mei:graphic[@type = 'facsimile']
-    
+
     let $imgX := number($zone/@ulx)
     let $imgY := number($zone/@uly)
     let $w := number($zone/@lrx) - number($zone/@ulx)
     let $h := number($zone/@lry) - number($zone/@uly)
-    
+
     let $imagePath := $graphic/@target
     let $imgWidth := number($graphic/@width)
     let $imgHeight := number($graphic/@height)
-    
+
     let $wx := $imgX div $imgWidth
     let $wy := $imgY div $imgHeight
     let $ww := $w div $imgWidth
     let $wh := $h div $imgHeight
-    
+
     let $cut_path := substring-before($imagePath, '.')
-    
+
     let $im_path := if ($imageserver = 'digilib')
     then
         (concat($basePath, $imagePath, '?dw=', $width, '&amp;amp;dh=', $height, '&amp;amp;wx=', $wx, '&amp;amp;wy=', $wy, '&amp;amp;ww=', $ww, '&amp;amp;wh=', $wh, '&amp;amp;mo=fit'))
@@ -197,44 +191,41 @@ declare function local:getImageAreaPathForTips($basePath as xs:string, $zone as
  :  @return Returns $i if it's square is higher or equals $num.
  :)
 declare function local:getLowestSquareBase($i as xs:integer, $num as xs:integer) {
-    if ($i * $i lt $num)
-    then
+
+    if ($i * $i lt $num) then
         (local:getLowestSquareBase($i + 1, $num))
     else
         ($i)
 };
 
 declare function local:getItemLabel($elem as element()) {
+
     let $name := local-name($elem)
-    return
-        (
-        if ($name = 'measure')
-        then
-            (if ($lang = 'de') then
+    return (
+        if ($name = 'measure') then (
+            if ($lang = 'de') then
                 (concat('Takt ', $elem/@n))
             else
-                (concat('Bar ', $elem/@n)))
-        else
+                (concat('Bar ', $elem/@n))
+        ) else
             (),
-        
-        if ($name = 'staff')
-        then
-            (if ($lang = 'de') then
+
+        if ($name = 'staff') then (
+            if ($lang = 'de') then
                 (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr, ', Takt ', $elem/ancestor::mei:measure/@n))
             else
-                (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr, ', Bar ', $elem/ancestor::mei:measure/@n)))
-        else
+                (concat($elem/preceding::mei:staffDef[@n = $elem/@n][1]/@label.abbr, ', Bar ', $elem/ancestor::mei:measure/@n))
+        ) else
             (),
-        
-        if ($name = 'zone')
-        then
-            (if ($lang = 'de') then
+
+        if ($name = 'zone') then (
+            if ($lang = 'de') then
                 (concat('Ausschnitt (S. ', $elem/parent::mei:surface/@n, ')'))
             else
-                (concat('Detail (p. ', $elem/parent::mei:surface/@n, ')')))
-        else
+                (concat('Detail (p. ', $elem/parent::mei:surface/@n, ')'))
+        ) else
             ()
-        )
+    )
 };
 
 (:~
@@ -242,201 +233,194 @@ declare function local:getItemLabel($elem as element()) {
  :
  :)
 declare function local:calculatePreviewsForTip($participants as xs:string*) {
-    
+
     let $areaWidth := 204
     let $areaHeight := 254
-    
-    let $elems := for $pUri in $participants
-    return
-        doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
-    let $zones := for $elem in $elems
-    return
-        local:getZone($elem)
-    
+
+    let $elems :=
+        for $pUri in $participants
+        return
+            doc(substring-before($pUri, '#'))/id(substring-after($pUri, '#'))
+
+    let $zones :=
+        for $elem in $elems
+        return
+            local:getZone($elem)
+
     let $tall := some $zone in $zones
         satisfies (number($zone/@lry) - number($zone/@uly) gt 2 * (number($zone/@lrx) - number($zone/@ulx)))
+
     let $wide := some $zone in $zones
         satisfies (2 * (number($zone/@lry) - number($zone/@uly)) lt number($zone/@lrx) - number($zone/@ulx))
-    
-    let $w := if ($tall and not($wide))
-    then
-        (round(10000 div count($zones)) div 100)
-    else
-        (
-        if ($wide and not($tall))
-        then
-            (100)
-        else
-            (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
-        )
-    
-    let $h := if ($tall and not($wide))
-    then
-        (100)
-    else
-        (
-        if ($wide and not($tall))
-        then
+
+    let $w :=
+        if ($tall and not($wide)) then
             (round(10000 div count($zones)) div 100)
-        else
-            (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
+        else (
+            if ($wide and not($tall)) then
+                (100)
+            else
+                (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
         )
-    
+
+    let $h :=
+        if ($tall and not($wide)) then
+            (100)
+        else (
+            if ($wide and not($tall)) then
+                (round(10000 div count($zones)) div 100)
+            else
+                (round(10000 div local:getLowestSquareBase(1, count($zones))) div 100)
+        )
+
     let $width := floor($areaWidth * $w div 100)
+
     let $height := floor($areaHeight * $h div 100)
-    
+
     for $zone in $zones
     let $e := $elems[substring(@facs, 2) = $zone/@xml:id][1]
-    let $e := if ($e) then
-        ($e)
-    else
-        ($zone)
-    
-    let $test := if ($imageserver = 'digilib')
-    then
-        (
-        <div
-            class="previewItem"
-            style="width: {$width - (round(100 div $w))}px; height: {$height - round(100 div $h)}px;">
+
+    let $e := +
+        if ($e) then
+            ($e)
+        else
+            ($zone)
+
+    let $test :=
+        if ($imageserver = 'digilib') then (
             <div
-                class="imgBox">
-                <img
-                    src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}"
-                    class="previewImg"/>
+                class="previewItem"
+                style="width: {$width - (round(100 div $w))}px; height: {$height - round(100 div $h)}px;">
+                <div
+                    class="imgBox">
+                    <img
+                        src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}"
+                        class="previewImg"/>
+                </div>
+                <div
+                    class="label">{local:getItemLabel($e)}</div>
             </div>
+        ) else (
             <div
-                class="label">{local:getItemLabel($e)}</div>
-        </div>
-        )
-    else
-        (
-        <div
-            class="previewItem"
-            style="width: {256}px; height: {256}px;">
-            <div
-                class="imgBox">
-                <img
-                    src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}"
-                    class="previewImg"/>
+                class="previewItem"
+                style="width: {256}px; height: {256}px;">
+                <div
+                    class="imgBox">
+                    <img
+                        src="{local:getImageAreaPathForTips($imageBasePath, $zone, $width - 4, $height - 4)}"
+                        class="previewImg"/>
+                </div>
+                <div
+                    class="label">{local:getItemLabel($e)}</div>
             </div>
-            <div
-                class="label">{local:getItemLabel($e)}</div>
-        </div>
         )
-    
+
     return
         $test
 };
 
 let $uri := request:get-parameter('uri', '')
+
 let $target := request:get-parameter('target', '')
+
 let $docUri := substring-before($uri, '#')
+
 let $internalId := substring-after($uri, '#')
+
 let $doc := doc($docUri)
+
 let $annot := $doc/id($internalId)
 
 let $participants := annotation:getParticipants($annot)
 
 let $priority := local:getPriority($annot)
-let $priorityLabel := if ($lang = 'de')
-then
-    ('Priorität')
-else
-    ('Priority')
 
-let $categories := local:getCategories($annot)
-let $categoriesLabel := if ($lang = 'de')
-then
-    (if (count($categories) gt 1) then
-        ('Kategorien')
-    else
-        ('Kategorie'))
-else
-    (if (count($categories) gt 1) then
-        ('Categories')
+let $priorityLabel :=
+    if ($lang = 'de') then
+        ('Priorität')
     else
-        ('Category'))
+        ('Priority')
+
+let $categories := local:getCategories($annot)
+
+let $categoriesLabel :=
+    if ($lang = 'de') then (
+        if (count($categories) gt 1) then
+            ('Kategorien')
+        else
+            ('Kategorie')
+    ) else (
+        if (count($categories) gt 1) then
+            ('Categories')
+        else
+            ('Category'))
 
 let $sources := eutil:getDocumentsLabelsAsArray($participants, $edition)
-let $sourcesLabel := if ($lang = 'de')
-then
-    (if (count($sources) gt 1) then
-        ('Quellen')
-    else
-        ('Quelle'))
-else
-    (if (count($sources) gt 1) then
-        ('Sources')
-    else
-        ('Source'))
+
+let $sourcesLabel :=
+    if ($lang = 'de') then (
+        if (count($sources) gt 1) then
+            ('Quellen')
+        else
+            ('Quelle')
+    ) else (
+        if (count($sources) gt 1) then
+            ('Sources')
+        else
+            ('Source')
+    )
 
 let $sigla := source:getSiglaAsArray($participants)
-let $siglaLabel := if ($lang = 'de')
-then
-    (if (count($sigla) gt 1) then
-        ('Siglen')
-    else
-        ('Siglum'))
-else
-    (if (count($sigla) gt 1) then
-        ('Sources')
-    else
-        ('Source'))
 
-let $annotIDlabel := if ($lang = 'de')
-then
-    ('Anm.-ID')
-else
-    ('Annot.-ID')
+let $siglaLabel :=
+    if ($lang = 'de') then (
+        if (count($sigla) gt 1) then
+            ('Siglen')
+        else
+            ('Siglum')
+    ) else (
+        if (count($sigla) gt 1) then
+            ('Sources')
+        else
+            ('Source')
+    )
+
+let $annotIDlabel :=
+    if ($lang = 'de') then
+        ('Anm.-ID')
+    else
+        ('Annot.-ID')
 
 return
-    if ($target eq 'view')
-    then
-        (
-        
-        <div
-            class="annotView">
-            <div
-                class="metaBox">
-                <div
-                    class="property priority">
-                    <div
-                        class="key">{$priorityLabel}</div>
-                    <div
-                        class="value">{$priority}</div>
+    if ($target eq 'view') then (
+        <div class="annotView">
+            <div class="metaBox">
+                <div class="property priority">
+                    <div class="key">{$priorityLabel}</div>
+                    <div class="value">{$priority}</div>
                 </div>
-                <div
-                    class="property categories">
-                    <div
-                        class="key">{$categoriesLabel}</div>
-                    <div
-                        class="value">{string-join($categories, ', ')}</div>
+                <div class="property categories">
+                    <div class="key">{$categoriesLabel}</div>
+                    <div class="value">{string-join($categories, ', ')}</div>
                 </div>
                 <!--<div class="property sourceLabel">
                     <div class="key">{$sourcesLabel}</div>
                     <div class="value">{string-join($sources, ', ')}</div>
                 </div>-->
-                <div
-                    class="property sourceSiglums">
-                    <div
-                        class="key">{$siglaLabel}</div>
-                    <div
-                        class="value">{string-join($sigla, ', ')}</div>
+                <div class="property sourceSiglums">
+                    <div class="key">{$siglaLabel}</div>
+                    <div class="value">{string-join($sigla, ', ')}</div>
                 </div>
-                <div
-                    class="property annotID">
-                    <div
-                        class="key">{$annotIDlabel}</div>
-                    <div
-                        class="value">{$internalId}</div>
+                <div class="property annotID">
+                    <div class="key">{$annotIDlabel}</div>
+                    <div class="value">{$internalId}</div>
                 </div>
             </div>
-            <div
-                class="contentBox">
+            <div class="contentBox">
                 <h1>{eutil:getLocalizedName($annot, $lang)}</h1>
                 {annotation:getContent($annot, '', $edition)}
             </div>
-            
+
             <!-- <div class="previewArea">
                 {
 
@@ -470,61 +454,41 @@ return
 
                 }
             </div>-->
-        
+
         </div>
-        )
-    else
-        (
-        <div
-            class="annotTip">
-            <div
-                class="metaBox">
-                <div
-                    class="property priority">
-                    <div
-                        class="key">{$priorityLabel}</div>
-                    <div
-                        class="value">{$priority}</div>
+    ) else (
+        <div class="annotTip">
+            <div class="metaBox">
+                <div class="property priority">
+                    <div class="key">{$priorityLabel}</div>
+                    <div class="value">{$priority}</div>
                 </div>
-                <div
-                    class="property categories">
-                    <div
-                        class="key">{$categoriesLabel}</div>
-                    <div
-                        class="value">{string-join($categories, ', ')}</div>
+                <div class="property categories">
+                    <div class="key">{$categoriesLabel}</div>
+                    <div class="value">{string-join($categories, ', ')}</div>
                 </div>
                 <!--<div class="property sourceLabel">
                     <div class="key">{$sourcesLabel}</div>
                     <div class="value">{string-join($sources, ', ')}</div>
                 </div>-->
-                <div
-                    class="property sourceSiglums">
-                    <div
-                        class="key">{$siglaLabel}</div>
-                    <div
-                        class="value">{string-join($sigla, ', ')}</div>
+                <div class="property sourceSiglums">
+                    <div class="key">{$siglaLabel}</div>
+                    <div class="value">{string-join($sigla, ', ')}</div>
                 </div>
-                <div
-                    class="property annotID">
-                    <div
-                        class="key">{$annotIDlabel}</div>
-                    <div
-                        class="value">{$internalId}</div>
+                <div class="property annotID">
+                    <div class="key">{$annotIDlabel}</div>
+                    <div class="value">{$internalId}</div>
                 </div>
             </div>
-            <div
-                class="contentBox">
+            <div class="contentBox">
                 {
-                    if ($annot/mei:annot)
-                    then
-                        (
+                    if ($annot/mei:annot) then (
                         for $a in $annot/mei:annot
-                        return
-                            (<h1>{eutil:getLocalizedTitle($annot, $lang)}</h1>,
-                            annotation:getContent($a, '', $edition))
+                        return (
+                            <h1>{eutil:getLocalizedTitle($annot, $lang)}</h1>,
+                            annotation:getContent($a, '', $edition)
                         )
-                    else
-                        (
+                    ) else (
                         (<h1>{eutil:getLocalizedTitle($annot, $lang)}</h1>,
                         annotation:getContent($annot, '', $edition))
                         )
@@ -537,5 +501,5 @@ return
                 }
             </div>-->
         </div>
-        
+
         )

From 3c75f8e8e0212729dbc1450a5b8562403caa0479 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:23:22 +0100
Subject: [PATCH 091/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index cf7e5eb35..0c8a46c4c 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -382,8 +382,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                             <div
                                 class="key">
                                 {
-                                    if ($respStmt/tei:resp != '')
-                                    then
+                                    if ($respStmt/tei:resp != '') then
                                         ($respStmt/data(tei:resp))
                                     else
                                         (string('Responsible'))

From 8d3720625255000d1ca4f72babebf3247ef3de7f Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:23:33 +0100
Subject: [PATCH 092/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 0c8a46c4c..c45c62067 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -394,8 +394,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                                     for $name at $i in $respStmt/tei:*[local-name() eq 'persName' or local-name() eq 'name' or local-name() eq 'orgName']
                                     let $numNames := count($respStmt/tei:*[local-name() eq 'persName' or local-name() eq 'name' or local-name() eq 'orgName'])
                                     return
-                                        if ($i < $numNames)
-                                        then
+                                        if ($i < $numNames) then
                                             ($name, ', ')
                                         else
                                             ($name)

From c3fdc72a3a18f7eeb9c7e3f2e5926f4a17245ace Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:23:48 +0100
Subject: [PATCH 093/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index c45c62067..1be6d731d 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -418,8 +418,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                 }
                 
                 {
-                    if ($doc//tei:sourceDesc/tei:msDesc//tei:repository)
-                    then
+                    if ($doc//tei:sourceDesc/tei:msDesc//tei:repository) then
                         (
                         <div
                             class="library metaRow">

From c78e85459742fc0eb4eaa965d7c2b7f4f4a134a7 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:24:00 +0100
Subject: [PATCH 094/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 1be6d731d..62120c6a3 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -434,8 +434,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                         )
                     else
                         (),
-                    if ($doc//tei:sourceDesc/tei:msDesc//tei:idno)
-                    then
+                    if ($doc//tei:sourceDesc/tei:msDesc//tei:idno) then
                         (
                         <div
                             class="library metaRow">

From 42a1a0f1cc75dd8191b6e11b965bafe550b934f7 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:24:31 +0100
Subject: [PATCH 095/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 62120c6a3..8aa2ff833 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -453,8 +453,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                 }
                 
                 {
-                    if ($doc//tei:publicationStmt/tei:publisher)
-                    then
+                    if ($doc//tei:publicationStmt/tei:publisher) then
                         (
                         <div
                             class="publisher metaRow">

From f69564b66eb68401374d54002652bdbe5228d68d Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:27:33 +0100
Subject: [PATCH 096/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 8aa2ff833..5208f7172 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -507,8 +507,7 @@ declare function local:getImagePathLeaflet($doc) {
             $tile_path
         )
     else
-        if ($doc//mei:facsimile/mei:surface/mei:graphic)
-        then
+        if ($doc//mei:facsimile/mei:surface/mei:graphic) then
             (
             let $tile_path := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@target
             let $width := $doc//mei:facsimile/mei:surface[1]/mei:graphic[1]/@width

From c40fd2c6075e1964aff86cee9bf7abcfccdaa45a Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:27:45 +0100
Subject: [PATCH 097/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 5208f7172..9e4d0971f 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -352,8 +352,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
                 }
                 
                 {
-                    if ($doc//tei:titleStmt/tei:editor)
-                    then
+                    if ($doc//tei:titleStmt/tei:editor) then
                         (
                         <div
                             class="editor metaRow">

From bc26c5284180176e25aeef615f5e41607cae0f99 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:27:53 +0100
Subject: [PATCH 098/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 9e4d0971f..460e85055 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -334,8 +334,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
             <div
                 class="metaData">
                 {
-                    if ($doc//tei:titleStmt/tei:title[@level eq 's'])
-                    then
+                    if ($doc//tei:titleStmt/tei:title[@level eq 's']) then
                         (
                         <div
                             class="series metaRow">

From dc2a07d8875041f7e9af37a386e2dbc617809bbf Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:28:04 +0100
Subject: [PATCH 099/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 460e85055..cf08664eb 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -271,8 +271,7 @@ declare function local:getWorkSummary($doc, $docUri) {
             
             <h1>
                 {
-                    if ($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'])
-                    then
+                    if ($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main']) then
                         ($doc//mei:work/mei:titleStmt/mei:title[@type eq 'main'][1]//text())
                     else
                         ($doc//mei:work/mei:titleStmt/mei:title[1]//text())

From 44b5118878a25d2a526dc7691a35ae19ff4109ec Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:28:19 +0100
Subject: [PATCH 100/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index cf08664eb..0170f6cf4 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -30,8 +30,7 @@ declare function local:generateRespSentence($names) {
     string-join(
         for $name in $names
         return
-            if (matches($name, '(s|z)$'))
-            then
+            if (matches($name, '(s|z)$')) then
                 (concat($name, "'"))
             else
                 (concat($name, 's'))

From 0ac69d921dab24685e4a55c9c51ad76989825b52 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:50:52 +0100
Subject: [PATCH 101/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index 0170f6cf4..a4e66cce4 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -495,8 +495,7 @@ declare function local:getImagePath($server, $edition) {
 };
 
 declare function local:getImagePathLeaflet($doc) {
-    if ($doc//mei:source//mei:titlePage/@facs)
-    then
+    if ($doc//mei:source//mei:titlePage/@facs) then
         (
         let $tile_path := $doc//mei:source//mei:titlePage[1]/@facs
         return

From 52d6a71a0c6718d44eed217835eafb86b16a2ec3 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:51:07 +0100
Subject: [PATCH 102/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index a4e66cce4..abfc5391f 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -483,8 +483,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
 declare function local:getImagePath($server, $edition) {
     (:let $server :=  eutil:getPreference('image_server', request:get-parameter('edition', '')) :)
     
-    let $i_path := if ($server = 'leaflet')
-    then
+    let $i_path := if ($server = 'leaflet') then
         (eutil:getPreference('leaflet_prefix', $edition))
     else
         (eutil:getPreference('image_prefix', $edition))

From 1ace4df201c9436f2eb10adfd9a1eafbe8680295 Mon Sep 17 00:00:00 2001
From: "Benjamin W. Bohl" <b.w.bohl@gmail.com>
Date: Wed, 21 Feb 2024 10:51:21 +0100
Subject: [PATCH 103/103] Update add/data/xql/getSummary.xql

Co-authored-by: Dennis Ried <dennis.ried@uni-paderborn.de>
---
 add/data/xql/getSummary.xql | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/add/data/xql/getSummary.xql b/add/data/xql/getSummary.xql
index abfc5391f..d3e414fb7 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -465,8 +465,7 @@ declare function local:getTextSummary($doc, $facsBasePath) {
             </div>
             
             { (:TODO: facsimile auswerten:)
-                if ($doc//tei:titlePage)
-                then
+                if ($doc//tei:titlePage) then
                     (
                     <div
                         class="titlePage">