diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 92c23a9b0..93c31191a 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -7,6 +7,9 @@ on:
     types: [ opened, synchronize, reopened ]
     branches: [ develop, main ]
 
+permissions:
+  contents: read
+
 env:
   DOCKER_IMAGE: bwbohl/sencha-cmd
 
@@ -18,10 +21,10 @@ jobs:
 
     steps:
     - name: Chekout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       
     - name: Get short sha
-      uses: benjlevesque/short-sha@v2.2
+      uses: benjlevesque/short-sha@599815c8ee942a9616c92bcfb4f947a3b670ab0b # v3.0
       id: short-sha
       with:
         length: 7       
@@ -31,7 +34,7 @@ jobs:
 
     - name: Upload Artifacts to action run
       if: github.repository == 'Edirom/Edirom-Online'
-      uses: actions/upload-artifact@v3.1.3
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       with:
         # The name that the artifact will be made available under
         name: EdiromOnline_${{ steps.short-sha.outputs.sha }}.zip
diff --git a/.gitignore b/.gitignore
index ef633cde5..9a8b2e120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ Thumbs.db
 *.xpr
 local.properties
 .idea/
+.existdb.json
+.vscode/settings.json
diff --git a/.gitmodules b/.gitmodules
index afe8f047f..d9e177c17 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "packages/eoTheme/resources/fonts/euryanthe"]
 	path = packages/eoTheme/resources/fonts/euryanthe
 	url = https://github.com/Edirom/EuryantheFont
+[submodule "Stylesheets"]
+	path = add/data/xslt/tei/Stylesheets
+	url = https://github.com/TEIC/Stylesheets
+	branch = released
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 80e39c2f8..e07179ce3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,50 +9,200 @@
 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 ================================================== :)
+
 ```
 
-### File Header
+All `declare namespace` statements, sorted alphabetically by prefix.
+
+```xquery
+(: OPTION DECLARATIONS ===================================================== :)
 
-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.
 
-### Declare variables
+```
+All `declare option` statements.
 
-* Use `declare variable` statements for all required external parameters
+```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.
+4. In the groups, sort alphabetically.
+
+```xquery
+(: FUNCTION DECLARATIONS =================================================== :)
+
+```
+
+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.
+
+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
+{
+   …
+}
+```
+
+### 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
+
+* escape with U+00027 APOSTROPHE: `'`
+
+### Literal results
+
+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:
+
+```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
 
-* functions have to be preceded by an xqDoc comment
+```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
+
 
-### XQuery body
+# Javascript
+
+## AJAX calls
+
+The class `EdiromOnline.controller.AJAXController` provides a central method `doAJAXRequest` for performing AJAX requests. The method is provided globally as `window.doAJAXRequest`.
+
+`doAJAXRequest` takes the following arguments:
+
+* `url`: The URL of the requestet site or end point.
+* `method`: The HTTP method like `PUT`, `GET`, `POST`.
+* `params`: An object containing key-value-pairs of parameters for the request.
+* `successFn`: A callback function which is called when the AJAX request was successfull.
+* `retryNo`: The number of retries, if the requests fails. Standard is 2 retries.
+* `async`: Defines the async parameter for AJAX calls. Default is 'true'.
+
+An example of using the function would be:
+
+```javascript
+window.doAJAXRequest('data/xql/getAnnotationMeta.xql',
+    'GET',
+    {
+        uri: uri,
+        lang: lang
+    },
+    Ext.bind(function(response){
+        view.setMeta(response.responseText);
+    }, this)
+);
+```
 
-* Strings: escape with U+00027 APOSTROPHE: `'`
\ No newline at end of file
diff --git a/add/data/xql/checkTextGridLogin.xql b/add/data/xql/checkTextGridLogin.xql
index 3d154e3f5..3352e9dae 100644
--- a/add/data/xql/checkTextGridLogin.xql
+++ b/add/data/xql/checkTextGridLogin.xql
@@ -1,15 +1,22 @@
-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', '')
+(: IMPORTS ================================================================= :)
+
+import module namespace httpclient = "http://exist-db.org/xquery/httpclient";
+
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-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";
 
+(: 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)
 let $status := response:set-status-code(xs:int($status))
-
 return
-    $status
\ No newline at end of file
+    $status
diff --git a/add/data/xql/edirom_printPreview.xql b/add/data/xql/edirom_printPreview.xql
index 6762ed4c7..fce9e961e 100644
--- a/add/data/xql/edirom_printPreview.xql
+++ b/add/data/xql/edirom_printPreview.xql
@@ -1,114 +1,161 @@
-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";
+(: 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 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 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 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";
 
-(: VARIABLES ========================================================= :)
+(: VARIABLE DECLARATIONS =================================================== :)
 
 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('&dw=',floor($printResolution*$areaWidth), '&mo=scale')
+(: FUNCTION DECLARATIONS =================================================== :)
+
+declare function eof:getFacsImgParas($areaWidth) {
+    concat('&dw=', floor($printResolution * $areaWidth), '&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..4e2de75ce 100644
--- a/add/data/xql/getAnnotation.xql
+++ b/add/data/xql/getAnnotation.xql
@@ -1,158 +1,152 @@
 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.
+(:
+ : Copyright: 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 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";
 
-  ID: $Id: getAnnotation.xql 1455 2012-10-11 10:42:55Z daniel $
-:)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-(:~
-    Returns the HTML for a specific annotation for an AnnotationView.
-    
-    @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";
-
-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 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 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";
+declare option output:method "xhtml";
+
+(: VARIABLE DECLARATIONS =================================================== :)
 
 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', '');
 
+(: FUNCTION DECLARATIONS =================================================== :)
+
 (: 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(
+
+    if ($elem/@facs) then (
         let $zoneId := replace($elem/@facs, '^#', '')
-        return $elem/root()/id($zoneId)
-    )
-    else(
-        $elem
-    )
+        return
+            $elem/root()/id($zoneId)
+    ) else
+        ($elem)
 };
 
 (:~
-    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)
-    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)
 };
 
 (:~
-    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),' ')
-    
-    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
+};
 
 (: 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']
-    
+
     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,163 +154,245 @@ 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'))
-    	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
 
 };
 
-(:
-    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(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(),
-        
-        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 = 'measure') then (
+            if ($lang = 'de') then
+                (concat('Takt ', if ($elem/@label) then ($elem/@label) else ($elem/@n)))
+            else
+                (concat('Bar ',if ($elem/@label) then ($elem/@label) else ($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
+            (),
 
-(:
-    This function…
+        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
+            ()
+    )
+};
 
-:)
+(:~
+ :   This function…
+ :
+ :)
 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)
-              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 $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)
+        )
+
     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>
-            <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>
-            <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)
+
 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 $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')else('Category'))
+
+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(
-    
+    if ($target eq 'view') then (
         <div class="annotView">
             <div class="metaBox">
                 <div class="property priority">
@@ -342,46 +418,45 @@ return
             </div>
             <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 ( 
+
+                 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(
+    ) else (
         <div class="annotTip">
             <div class="metaBox">
                 <div class="property priority">
@@ -407,25 +482,24 @@ return
             </div>
             <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(
+                        return (
+                            <h1>{eutil:getLocalizedTitle($annot, $lang)}</h1>,
+                            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),' '))
-                    
+
                 }
             </div>-->
         </div>
-        
-    )
\ No newline at end of file
+
+        )
diff --git a/add/data/xql/getAnnotationInfos.xql b/add/data/xql/getAnnotationInfos.xql
index 4b5775baf..42759c3cd 100644
--- a/add/data/xql/getAnnotationInfos.xql
+++ b/add/data/xql/getAnnotationInfos.xql
@@ -1,18 +1,26 @@
 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 ================================================================= :)
+
+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";
 
-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";
+(: 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);
@@ -21,29 +29,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,52 +60,29 @@ 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
-  
-  (:
-
-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,'"}')
-        , ','),
-        ']}')
-        
-        :)
\ No newline at end of file
+    $map
diff --git a/add/data/xql/getAnnotationMeta.xql b/add/data/xql/getAnnotationMeta.xql
index d181fe603..7df02a6d4 100644
--- a/add/data/xql/getAnnotationMeta.xql
+++ b/add/data/xql/getAnnotationMeta.xql
@@ -1,42 +1,33 @@
-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/>.
+xquery version "3.1";
 
-  ID: $Id: getAnnotationMeta.xql 1324 2012-05-15 13:59:35Z daniel $
-:)
+(:
+ : 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.
-    
+
     @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";
 
-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";
+(: 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 ================================================== :)
+
+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 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";
 
@@ -51,52 +42,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..47499f6b3 100644
--- a/add/data/xql/getAnnotationOpenAllUris.xql
+++ b/add/data/xql/getAnnotationOpenAllUris.xql
@@ -1,63 +1,66 @@
-xquery version "3.0";
-(:
-  Edirom Online
-  Copyright (C) 2011 The Edirom Project
-  http://www.edirom.de
+xquery version "3.1";
 
-  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.
+(:
+ : Copyright: 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 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";
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-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";
 
+(: OPTION DECLARATIONS ===================================================== :)
+
 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 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 +70,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 +104,5 @@ let $doc := doc($uri)
 let $annot := $doc/id($annotId)
 
 return
-    string-join(local:getParticipants($annot),'
-    ')
\ No newline at end of file
+    string-join(local:getParticipants($annot), '
+    ')
diff --git a/add/data/xql/getAnnotationParticipants.xql b/add/data/xql/getAnnotationParticipants.xql
index e3fc191fc..c67f7c35a 100644
--- a/add/data/xql/getAnnotationParticipants.xql
+++ b/add/data/xql/getAnnotationParticipants.xql
@@ -1,32 +1,22 @@
-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.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
-declare namespace request="http://exist-db.org/xquery/request";
+(: 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";
 
@@ -43,9 +33,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..1c6944c6d 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.
@@ -10,49 +10,64 @@ 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);
 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));
 
+(: 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), ' ')
-    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
+                (: 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))
-
-                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(*)* {
@@ -98,9 +113,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
@@ -109,36 +130,41 @@ declare function local:getSourceParticipants($participants as xs:string*, $doc a
         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
-
-            where count($elems) gt 0
+            return
+                $elem
 
-        let $zones := for $elem in $elems
-        return
-            local:getZone($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)
@@ -160,6 +186,8 @@ 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,
@@ -199,35 +227,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)
         )
 };
 
@@ -235,31 +261,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
 };
@@ -281,17 +309,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
-        )
 };
 
 (:~
@@ -320,25 +344,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, '?')
 
 };
 
@@ -372,76 +394,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 ()
+        ), ' ')
 
 };
 
diff --git a/add/data/xql/getAnnotationText.xql b/add/data/xql/getAnnotationText.xql
index 2a7235350..b50e16a43 100644
--- a/add/data/xql/getAnnotationText.xql
+++ b/add/data/xql/getAnnotationText.xql
@@ -1,45 +1,37 @@
-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.
+ :)
 
 (:~
     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";
-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";
+(: 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 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', '')
@@ -53,6 +45,6 @@ return
     <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
+    </div>
diff --git a/add/data/xql/getAnnotations.xql b/add/data/xql/getAnnotations.xql
index 99a73d40b..7b4e86a7c 100644
--- a/add/data/xql/getAnnotations.xql
+++ b/add/data/xql/getAnnotations.xql
@@ -1,24 +1,7 @@
 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.
+ :)
 
 (:~
 : Returns a JSON representation of all Annotations of a document.
@@ -26,30 +9,41 @@ 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";
+(: IMPORTS ================================================================= :)
 
+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";
+(: 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 $map := 
+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)}
+        '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
+
+return
+    serialize($map, $options)
diff --git a/add/data/xql/getAnnotationsInRendering.xql b/add/data/xql/getAnnotationsInRendering.xql
index 78d744e85..7b0709a46 100644
--- a/add/data/xql/getAnnotationsInRendering.xql
+++ b/add/data/xql/getAnnotationsInRendering.xql
@@ -1,75 +1,66 @@
-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.
+ :)
 
 (:~
     Returns a JSON sequence with all anotations on a specific page.
-    
+
     @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
 :)
 
+(: IMPORTS ================================================================= :)
+
 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";
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-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";
+(: 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* {
     
     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)
+    (: 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
         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('
-           	{',
-               	'"id": "', $id, '", ',
-               	'"measureId": "', $measureId, '", ',
-               	'"fn": "loadLink(\"', $uri, '\")", ',
-               	'"uri": "', $uri, '", ',
-               	'"priority": "', $prio, '", ',
-               	'"categories": "', $cat, '"',
-           	'}')
+        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 (:TODO map instead of concat :)
+            concat('
+                {',
+                '"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, ','),
-    ']')
-)
+return
+    concat(
+        '[',
+        string-join($annots, ','),
+        ']'
+    )
diff --git a/add/data/xql/getAnnotationsInText.xql b/add/data/xql/getAnnotationsInText.xql
index d57ed2704..63d3d2e39 100644
--- a/add/data/xql/getAnnotationsInText.xql
+++ b/add/data/xql/getAnnotationsInText.xql
@@ -1,83 +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: 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.
+ :)
 
 (:~
     Returns a JSON sequence with all anotations in a specific text.
-    
+
     @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 xmldb="http://exist-db.org/xquery/xmldb";
+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";
 
 (:~
     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)]
+    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('
-       	{',
-           	'id: "', $id, '", ',
-           	'plist: [', $plist, '], ',
-           	'svgList: [], ',
-           	'fn: "loadLink(\"', $uri, '\")", ',
-           	'uri: "', $uri, '", ',
-           	'priority: "', $prio, '", ',
-           	'categories: "', $cat, '"',
-       	'}')
+    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 (: TODO map instead of concat :)
+        concat('
+           	{',
+            '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), ','),
+        ']'
+    )
diff --git a/add/data/xql/getAnnotationsOnPage.xql b/add/data/xql/getAnnotationsOnPage.xql
index 0dbba5837..c0b79e309 100644
--- a/add/data/xql/getAnnotationsOnPage.xql
+++ b/add/data/xql/getAnnotationsOnPage.xql
@@ -1,170 +1,179 @@
 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.
+ :)
 
 (:~
  :  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>
  :)
 
+(: IMPORTS ================================================================= :)
+
 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";
+(: 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 ft = "http://exist-db.org/xquery/lucene";
+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
- : 
- : @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
+ :
+ : @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)
-	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 := 
+    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 $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
+        }
 };
 
 (:~
  : 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(
-		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')]
-	)
+    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')]
+    )
 };
 
 (:~
-    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]
     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]
+            }
 };
 
 (:~
-    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
     
+    return
         for $svg in $participants
         let $id := $svg/@id
-        return map {
-            'id': $annoId || '__' || $id,
-            'svg': $svg
-        }
+        return
+            map {
+                'id': $annoId || '__' || $id,
+                'svg': $svg
+            }
 };
 
 (:~
- : 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($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 +185,12 @@ let $surfaceId := request:get-parameter('pageId', '')
 let $surface := $mei/id($surfaceId)
 let $zones := $surface//mei:zone
 
-let $measureLike := 
+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 $ref := concat('#', $id)
+    return
+        $mei//*[$ref = tokenize(@facs, '\s')]
+
 let $svgLike := $surface//svg:svg
 
 let $targetLike := $zones | $measureLike | $svgLike
@@ -190,4 +200,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..99548c7f9 100644
--- a/add/data/xql/getAudioPlayer.xql
+++ b/add/data/xql/getAudioPlayer.xql
@@ -1,264 +1,355 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2015 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 ================================================== :)
 
-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 request = "http://exist-db.org/xquery/request";
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+(: 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 $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
-                    '{
-    					"name": "' || replace($recTitle, '"', '\\"') || '"
-    					,"artist": "' || replace($artist, '"', '\\"') || '"
-    					,"album": "' || replace($album, '"', '\\"') || '"
-    					,"url": "' || $avFile || '"
-    					,"live": false' ||
-    					',"cover_art_url": "' || $albumCover || '"' || '
-				    }'
+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
+    (:TODO map instead of concatenation :)
+    '{
+        "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>
-    <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..95ef53244 100644
--- a/add/data/xql/getChapters.xql
+++ b/add/data/xql/getChapters.xql
@@ -1,107 +1,127 @@
-xquery version "3.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 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 ================================================== :)
 
-  ID: $Id: getChapters.xql 1460 2012-10-15 15:58:35Z niko $
-:)
+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";
 
-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 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('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)
+(: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
+        ($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
-                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
-                        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)                                        
+                (: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
+            return
+                (:TODO map instead of concat :)
+                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
-                        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()
+                        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
+            ()
 
-return concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+return
+    concat('[', string-join($ret, ','), ']')
diff --git a/add/data/xql/getConcordances.xql b/add/data/xql/getConcordances.xql
index c3f26fffe..784349162 100644
--- a/add/data/xql/getConcordances.xql
+++ b/add/data/xql/getConcordances.xql
@@ -1,51 +1,45 @@
-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 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 ================================================== :)
 
-  ID: $Id: getConcordances.xql 1219 2012-01-20 08:33:28Z daniel $
-:)
+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";
 
-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 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), ']}')
-    )
-    else(string('null'))
+    if ($parent/edirom:groups) then (
+        concat('
+            {', 'label: "', eutil:getLocalizedName($parent/edirom:groups, $lang),
+            '", groups: [', local:getSingleGroups($parent/edirom:groups), ']}'
+        )
+    ) else
+        (string('null'))
 };
 
 declare function local:getSingleGroups($parent) {
     string-join(
         for $group in $parent/edirom:group
         return
-                concat('
+            concat('
                 {',
                     'name: "', eutil:getLocalizedName($group, $lang), '", ',
                     'connections: ', local:getConnections($group),
@@ -54,18 +48,22 @@ declare function local:getSingleGroups($parent) {
 };
 
 declare function local:getConnections($parent) {
-    if($parent/edirom:connections)
-    then(
-        concat('{', 'label: "', eutil:getLocalizedName($parent/edirom:connections, $lang), '", connections: [', local:getSingleConnections($parent/edirom:connections), ']}')
-    )
-    else(string('null'))
+    if ($parent/edirom:connections) then (
+        concat(
+            '{',
+                'label: "', eutil:getLocalizedName($parent/edirom:connections, $lang), '",
+                connections: [', local:getSingleConnections($parent/edirom:connections),
+            ']}'
+        )
+    ) else
+        (string('null'))
 };
 
 declare function local:getSingleConnections($parent) {
     string-join(
         for $connection in $parent/edirom:connection
         return
-                concat('
+            concat('
                 {',
                     'name: "', $connection/string(@name), '", ',
                     'plist: "', $connection/@plist, '"',
@@ -73,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', '')
@@ -80,18 +80,17 @@ let $work := $mei/id($workId)
 let $concordances := $work//edirom:concordance
 
 return (
-    concat('[',
-
-    string-join(
-        for $concordance in $concordances
-        return
+    concat(
+        '[',
+        string-join(
+            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..6d5e11800 100644
--- a/add/data/xql/getEdition.xql
+++ b/add/data/xql/getEdition.xql
@@ -1,24 +1,7 @@
-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.
+ :)
 
 (:~
 : Returns a JSON representation of an Edition.
@@ -26,9 +9,17 @@ 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";
+(: 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 edition:toJSON($uri)
\ No newline at end of file
+return
+    (:TODO use map an serialization options :)
+    edition:toJSON($uri)
diff --git a/add/data/xql/getEditionURI.xql b/add/data/xql/getEditionURI.xql
index 22256a695..e2c862530 100644
--- a/add/data/xql/getEditionURI.xql
+++ b/add/data/xql/getEditionURI.xql
@@ -1,22 +1,7 @@
-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.
+ :)
 
 (:~
 : Returns the URI of the first found Edition.
@@ -24,12 +9,19 @@ 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";
+(: 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($uri)
-    else(edition:findEdition($uri))
\ No newline at end of file
+    if (doc-available($uri)) then
+        ($uri)
+    else
+        (edition:findEdition($uri))
diff --git a/add/data/xql/getExtendedStaff.xql b/add/data/xql/getExtendedStaff.xql
index 05f0674f3..c2881cb84 100644
--- a/add/data/xql/getExtendedStaff.xql
+++ b/add/data/xql/getExtendedStaff.xql
@@ -1,58 +1,98 @@
-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";
-declare namespace system="http://exist-db.org/xquery/system";
-declare namespace transform="http://exist-db.org/xquery/transform";
+(: 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";
+
+(: 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
-<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..d77476a4e 100644
--- a/add/data/xql/getHeader.xql
+++ b/add/data/xql/getHeader.xql
@@ -1,51 +1,67 @@
-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 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 ================================================== :)
 
-  ID: $Id: getHeader.xql 1455 2012-10-11 10:42:55Z daniel $
-:)
+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";
-
-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";
+(: 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()
\ 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
+        ()
diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
index 09dc6cbf0..2c91cb5bf 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
+ : 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.
-
-  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/>.
-
-:)
+(: 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,10 +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>)
\ No newline at end of file
+    transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'),
+        <parameters>
+            <param name="idPrefix" value="{$idPrefix}"/>
+        </parameters>
+    )
+
diff --git a/add/data/xql/getInternalIdType.xql b/add/data/xql/getInternalIdType.xql
index 43cd7314b..264f6be09 100644
--- a/add/data/xql/getInternalIdType.xql
+++ b/add/data/xql/getInternalIdType.xql
@@ -1,63 +1,62 @@
-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.
-
-  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 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($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..39799c91e 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
+ : 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.
+(:~
+ : Returns a language file as JSON or XML.
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ :)
 
-  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 edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-  ID: $Id: getLanguageFile.xql 1455 2012-10-11 10:42:55Z daniel $
-:)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-(:~
-    Returns a language file as JSON or XML.
-    
-    @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";
+(: 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,24 +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), '"')
-            ), ','),
-        '}',
-        '}')
-    )
-    else($file)
-    
\ No newline at end of file
+    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
+        ($file)
diff --git a/add/data/xql/getLinkTarget.xql b/add/data/xql/getLinkTarget.xql
index 86dcbca9a..db7821697 100644
--- a/add/data/xql/getLinkTarget.xql
+++ b/add/data/xql/getLinkTarget.xql
@@ -1,13 +1,9 @@
 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";
-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
diff --git a/add/data/xql/getMeasure.xql b/add/data/xql/getMeasure.xql
index 99e592b6f..5ba36eba1 100644
--- a/add/data/xql/getMeasure.xql
+++ b/add/data/xql/getMeasure.xql
@@ -1,53 +1,61 @@
-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 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 xmldb="http://exist-db.org/xquery/xmldb";
+(: OPTION DECLARATIONS ===================================================== :)
 
-import module namespace functx = "http://www.functx.com";
+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, '",',
-        'measureCount:"', $measureCount, '"',
-    '}')
\ No newline at end of file
+    'measureId:"', $measureId, '",',
+    'movementId:"', $movementId, '",',
+    'measureCount:"', $measureCount, '"',
+    '}')
diff --git a/add/data/xql/getMeasurePage.xql b/add/data/xql/getMeasurePage.xql
index a20ce63ce..38aac2cd5 100644
--- a/add/data/xql/getMeasurePage.xql
+++ b/add/data/xql/getMeasurePage.xql
@@ -1,41 +1,28 @@
-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.
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-  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.
+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";
 
-  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 $
-:)
-
-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";
+(: 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($m)
-        else(
-            ($mei/id($movementId)//mei:measure[@n eq $measureIdName])[1]
-        )
+        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,25 +31,29 @@ 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), '"',
-        '}')
+        
+        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', '')
@@ -71,20 +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() 
-
-(: 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)]
+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)]
 
 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)
-        ), ','),
-    ']')
\ No newline at end of file
+    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)
+            ), ','),
+    ']')
diff --git a/add/data/xql/getMeasures.xql b/add/data/xql/getMeasures.xql
index ce0af33b3..4e5d0ee0f 100644
--- a/add/data/xql/getMeasures.xql
+++ b/add/data/xql/getMeasures.xql
@@ -1,122 +1,126 @@
 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";
 
-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";
+(: 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 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
-                                                            return
-                                                                string(number($first) + $i - 1)
-                                                        )
-                                                        else ($label)
-                                return
-                                    $labelsAnalyzed
-                            )
-                            else ($mdiv//mei:measure/@n)
+        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)
+        
         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'),
-                                        '"}')
-            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(
-             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):)
+            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('{',
+                    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 (
+            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 (
             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('{',
+            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. :)
-                    '}')
+                    '}'
+                )
         )
     )
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $mdivID := request:get-parameter('mdiv', '')
 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, ','), ']')
diff --git a/add/data/xql/getMeasuresOnPage.xql b/add/data/xql/getMeasuresOnPage.xql
index 4be580089..ff4377e6c 100644
--- a/add/data/xql/getMeasuresOnPage.xql
+++ b/add/data/xql/getMeasuresOnPage.xql
@@ -1,62 +1,57 @@
 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.
+ :)
 
 (:~
     Returns a JSON sequence with all measures on a specific page.
-    
+
     @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";
+(: 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";
+
+(: OPTION DECLARATIONS ===================================================== :)
 
 declare option output:method "json";
 declare option output:media-type "application/json";
 
+(: FUNCTION DECLARATIONS =================================================== :)
+
 (:~
     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']
+    
+    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
     :)
     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,13 +67,17 @@ 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'))
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $surfaceId := request:get-parameter('pageId', '')
 
@@ -90,4 +89,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 79f04fdc4..190539f2e 100644
--- a/add/data/xql/getMovements.xql
+++ b/add/data/xql/getMovements.xql
@@ -1,57 +1,49 @@
 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.
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-  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 $
-:)
-
-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 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";
+
+(: 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),
-                    'parts': for $part in $movement//mei:part
-                             return
-                                map {
-                                    'id': $part/string(@xml:id),
-                                    'name': $part/string(@label)
-                                }
-
-                }
-
-let $array := array { $ret }
+let $ret :=
+    for $movement in $mei//mei:mdiv
+    return
+        map {
+            'id': $movement/string(@xml:id),
+            'name': $movement/string(@label),
+            'parts': for $part in $movement//mei:part
+                     return
+                         map {
+                             'id': $part/string(@xml:id),
+                             'name': $part/string(@label)
+                         }
+
+        }
+
+let $array := array {$ret}
+
 let $options :=
     map {
         'method': 'json',
         'media-type': 'text/plain'
     }
-    
-return serialize($array, $options)
\ No newline at end of file
+
+return
+    serialize($array, $options)
diff --git a/add/data/xql/getMovementsFirstPage.xql b/add/data/xql/getMovementsFirstPage.xql
index 388e48d64..0b316fe6a 100644
--- a/add/data/xql/getMovementsFirstPage.xql
+++ b/add/data/xql/getMovementsFirstPage.xql
@@ -1,41 +1,33 @@
-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.
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-  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.
+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";
 
-  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 $
-:)
-
-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";
+(: 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)
 
-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)
diff --git a/add/data/xql/getMusicInMdiv.xql b/add/data/xql/getMusicInMdiv.xql
index d120f8b2b..ab7201028 100644
--- a/add/data/xql/getMusicInMdiv.xql
+++ b/add/data/xql/getMusicInMdiv.xql
@@ -1,23 +1,35 @@
-xquery version "3.0";
+xquery version "3.1";
+(:
+ : 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";
-declare namespace system="http://exist-db.org/xquery/system";
-declare namespace transform="http://exist-db.org/xquery/transform";
+(: 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";
+
+(: 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" xmlns:xlink="http://www.w3.org/1999/xlink" meiversion="4.0.0">
+    (: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}
         <music>
             <facsimile/>
@@ -25,4 +37,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 1cfbcd69d..3b2543cfa 100644
--- a/add/data/xql/getNavigatorConfig.xql
+++ b/add/data/xql/getNavigatorConfig.xql
@@ -1,112 +1,130 @@
-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 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 ================================================== :)
 
-  ID: $Id: getNavigatorConfig.xql 1279 2012-03-19 13:16:43Z daniel $
-:)
+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";
 
-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 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', '');
 
-declare function local:getCategory($category, $depth) {
+(: FUNCTION DECLARATIONS =================================================== :)
 
-    <div class="navigatorCategory{if($depth = 1)then()else($depth)}" id="{$category/@xml:id}">
-        <div class="navigatorCategoryTitle{if($depth = 1)then()else($depth)}">
+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)
+                }">
             {
-                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(
+                    ) else if (local-name($elem) eq 'navigatorSeparator') then (
                         local:getSeparator()
-                    )
-                    else if(local-name($elem) eq 'navigatorCategory')
-                    then(
+                    ) else if (local-name($elem) eq 'navigatorCategory') then (
                         local:getCategory($elem, $depth + 1)
-                    )
-                    else()
+                    ) 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, ")"))
-    return
-
-    <div class="navigatorItem{if($depth lt 2)then()else($depth)}" id="{$item/@xml:id}" onclick="{$target}">
-        {eutil:getLocalizedName($item, $lang)}
-    </div>
+    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>
 };
 
 declare function local:getSeparator() {
-
+    
     <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(
+        ) else if (local-name($elem) eq 'navigatorSeparator') then (
             local:getSeparator()
-        )
-        else if(local-name($elem) eq 'navigatorCategory')
-        then(
+        ) else if (local-name($elem) eq 'navigatorCategory') then (
             local:getCategory($elem, 1)
-        )
-        else()
+        ) else
+            ()
 };
 
+(: QUERY BODY ============================================================== :)
+
 let $editionId := request:get-parameter('editionId', '')
 let $workId := request:get-parameter('workId', '')
 let $edition := doc($editionId)/root()
@@ -114,4 +132,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 1fe2ce2bb..be8ce4b35 100644
--- a/add/data/xql/getOverlayOnPage.xql
+++ b/add/data/xql/getOverlayOnPage.xql
@@ -1,39 +1,28 @@
 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.
+ :)
 
 (:~
     Returns an SVG element.
-    
+
     @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";
+(: 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 ===================================================== :)
 
 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', '')
@@ -57,7 +46,5 @@ let $options :=
         '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..7fb2acd12 100644
--- a/add/data/xql/getOverlays.xql
+++ b/add/data/xql/getOverlays.xql
@@ -1,50 +1,41 @@
 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.
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-  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 $
-:)
-
-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 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";
+
+(: 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 $array := array { $ret }
 let $options :=
     map {
         'method': 'json',
         'media-type': 'text/plain'
     }
-    
-return serialize($array, $options)
\ No newline at end of file
+
+return
+    serialize($array, $options)
diff --git a/add/data/xql/getPages.xql b/add/data/xql/getPages.xql
index 099cc41db..46b008267 100644
--- a/add/data/xql/getPages.xql
+++ b/add/data/xql/getPages.xql
@@ -1,67 +1,58 @@
 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 ================================================== :)
 
-  ID: $Id: getPages.xql 1268 2012-03-02 09:46:28Z johannes $
-:)
+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 xmldb = "http://exist-db.org/xquery/xmldb";
 
-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 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]
-                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 $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 :=
     map {
@@ -69,4 +60,5 @@ let $options :=
         'media-type': 'text/plain'
     }
 
-return serialize($ret, $options)
+return
+    serialize($ret, $options)
diff --git a/add/data/xql/getParts.xql b/add/data/xql/getParts.xql
index 4b041881f..afffa2211 100644
--- a/add/data/xql/getParts.xql
+++ b/add/data/xql/getParts.xql
@@ -1,43 +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 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 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";
+(: 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, '}'
-                          )
-
-return concat('[', string-join($ret, ','), ']')
\ No newline at end of file
+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, ','), ']')
diff --git a/add/data/xql/getPreferences.xql b/add/data/xql/getPreferences.xql
index e9bdce13c..0c7d4aa41 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
+ : 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.
-
-  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.
+(:~
+ : Returns preferences as JSON or XML.
+ :
+ : @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
+ :)
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+(: IMPORTS ================================================================= :)
 
-  ID: $Id: getPreferences.xql 1455 2012-10-11 10:42:55Z daniel $
-:)
+import module namespace edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-(:~
-    Returns preferences as JSON or XML.
-    
-    @author <a href="mailto:roewenstrunk@edirom.de">Daniel Röwenstrunk</a>
-:)
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-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";
+(: 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,20 +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), '"')
-            ), ','),
-        '}')
-    )
-    else($file)
-    
\ No newline at end of file
+    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
+        ($file)
diff --git a/add/data/xql/getReducedDocument.xql b/add/data/xql/getReducedDocument.xql
index 68b83029f..04d8cde2c 100644
--- a/add/data/xql/getReducedDocument.xql
+++ b/add/data/xql/getReducedDocument.xql
@@ -1,33 +1,35 @@
-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 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";
 
-  You should have received a copy of the GNU General Public License
-  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-  ID: $Id: getReducedDocument.xql 1328 2012-05-16 14:59:35Z daniel $
-:)
+declare namespace request = "http://exist-db.org/xquery/request";
 
-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";
+(: 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));
+
+(: QUERY BODY ============================================================== :)
+
 let $uri := request:get-parameter('uri', '')
 let $selectionId := request:get-parameter('selectionId', '')
 let $subtreeRoot := request:get-parameter('subtreeRoot', '')
@@ -37,27 +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()
-                        
-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 $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 $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>))
+    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..3455712d7 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
+ : 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.
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-  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.
+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";
 
-  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 $
-:)
-
-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";
+(: 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,7 +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
@@ -50,9 +41,8 @@ return
     let $mdiv2show := $movementId
     let $outputStep := 'svg'
     
-   
-    
-    let $svg := transform:transform($doc, concat($base, 'mei2svg.xsl'), <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}"/>
@@ -60,11 +50,13 @@ return
             <param name="showStaff" value="{$showStaff}"/>
             <param name="firstMeasure" value="{$firstMeasure}"/>
             <param name="lastMeasure" value="{$lastMeasure}"/>
-        </parameters>)
+        </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/>)
@@ -74,6 +66,4 @@ 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..d3e414fb7 100644
--- a/add/data/xql/getSummary.xql
+++ b/add/data/xql/getSummary.xql
@@ -1,487 +1,541 @@
-xquery version "3.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 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";
 
-  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: getSummary.xql 1455 2012-10-11 10:42:55Z daniel $
-:)
+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 xmldb = "http://exist-db.org/xquery/xmldb";
 
-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";
+(: 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 ')
+            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>
-                        )
-                        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()
-            }
+                            <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
+                        ()
+                }
+                
+                {
+                    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 :)
+    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/@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/@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 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/@startdate) then
+        (concat('From ', $date/@startdate))
     
-    else if($date/@enddate)
-    then(concat('Until ', $date/@enddate))
+    else if ($date/@enddate) then
+        (concat('Until ', $date/@enddate))
     
-    else if($date/@notbefore)
-    then(concat('Not before ', $date/@notbefore))
+    else if ($date/@notbefore) then
+        (concat('Not before ', $date/@notbefore))
     
-    else if($date/@notafter)
-    then(concat('Not after ', $date/@notafter))
+    else if ($date/@notafter) then
+        (concat('Not after ', $date/@notafter))
     
-    else if(local-name($date) eq 'date')
-    then($date/text())
+    else if (local-name($date) eq 'date') then
+        ($date/text())
     
-    else(string(""))
+    else
+        (string(""))
 };
 
 declare function local:getTeiDateValue($date) {
     
-    if($date/@when)
-    then($date/string(@when)) (: TODO: prettify 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/@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/@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 and $date/@notAfter) then
+        (concat('From ', $date/@from, ', not after ', $date/@notAfter))
     
-    else if($date/@from)
-    then(concat('From ', $date/@from))
+    else if ($date/@notBefore and $date/@to) then
+        (concat('Not before ', $date/@notBefore, ', to ', $date/@to))
     
-    else if($date/@to)
-    then(concat('Until ', $date/@to))
+    else if ($date/@from) then
+        (concat('From ', $date/@from))
     
-    else if($date/@notBefore)
-    then(concat('Not before ', $date/@notBefore))
+    else if ($date/@to) then
+        (concat('Until ', $date/@to))
     
-    else if($date/@notAfter)
-    then(concat('Not after ', $date/@notAfter))
+    else if ($date/@notBefore) then
+        (concat('Not before ', $date/@notBefore))
     
-    else if(local-name($date) eq 'date')
-    then($date/text())
+    else if ($date/@notAfter) then
+        (concat('Not after ', $date/@notAfter))
     
-    else(string(""))
+    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 +543,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(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..942c650c3 100644
--- a/add/data/xql/getText.xql
+++ b/add/data/xql/getText.xql
@@ -1,33 +1,35 @@
-xquery version "3.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 edition = "http://www.edirom.de/xquery/edition" at "../xqm/edition.xqm";
 
-  You should have received a copy of the GNU General Public License
-  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+import module namespace eutil = "http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-  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";
+(: 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";
+declare namespace output = "http://www.w3.org/2010/xslt-xquery-serialization";
 
-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 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 output:method "xhtml";
+
+declare option output:media-type "text/html";
+
+declare option output:omit-xml-declaration "yes";
+
+declare option output:indent "yes";
+
+(: QUERY BODY ============================================================== :)
 
 let $uri := request:get-parameter('uri', '')
 let $idPrefix := request:get-parameter('idPrefix', '')
@@ -36,61 +38,96 @@ let $path := request:get-parameter('path', '')
 let $page := request:get-parameter('page', '')
 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(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
+let $xslInstruction :=
+    for $i in fn:serialize($xslInstruction, ())
     return
-        transform:transform($doc, doc('../xslt/reduceToPage.xsl'), <parameters><param name="pb1" value="{$pb1}"/><param name="pb2" value="{$pb2}"/></parameters>)
-)
+        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>
+            )
+    )
+
+let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '')
+let $edition := request:get-parameter('edition', '')
+let $imageserver := eutil:getPreference('image_server', $edition)
 
-let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '') (:TODO:)
+let $imagePrefix :=
+    if ($imageserver = 'leaflet') then
+    (eutil:getPreference('leaflet_prefix', $edition))
+    else
+        (eutil:getPreference('image_prefix', $edition))
 
-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 $xsl :=
+    if ($xslInstruction) then
+        ($xslInstruction)
+    else
+        ('../xslt/tei/profiles/edirom-body/teiBody2HTML.xsl')
 
-(:let $imagePrefix := eutil:getPreference('image_prefix', request:get-parameter('edition', '')):)
+(: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="documentationLanguage" value="{eutil:getLanguage($edition)}"/>,
+    <param name="footnoteBackLink" value="true"/>,
+    <param name="graphicsPrefix" value="{$imagePrefix}"/>, (:TODO from XSLT <param name="graphicsPrefix"/>:)
+    <param name="numberHeadings" value="false"/>,
+    <param name="pageLayout" value="CSS"/>
+)
+
+let $doc := transform:transform($doc, doc($xsl), <parameters>{$params}</parameters>)
 
-let $xsl := if($xslInstruction)then($xslInstruction)else('../xslt/teiBody2HTML.xsl')
+(: Do a second transformation to add edirom online ID prefixes for unique ID values if object is open mutiple times :)
+let $xsl := '../xslt/edirom_idPrefix.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>))
-
-let $doc := transform:transform($doc, doc('../xslt/edirom_idPrefix.xsl'), <parameters><param name="idPrefix" value="{$idPrefix}"/></parameters>)
+    <param name="idPrefix" value="{$idPrefix}"/>
+)
+
+let $doc := transform:transform($doc, doc($xsl), <parameters>{$params}</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..ea66b4241 100644
--- a/add/data/xql/getWorkID.xql
+++ b/add/data/xql/getWorkID.xql
@@ -1,22 +1,7 @@
-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.
+ :)
 
 (:~
 : Returns the ID of the first work of an Edition if the given ID is not valid.
@@ -24,15 +9,24 @@ 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";
+(: 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";
+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($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))
diff --git a/add/data/xql/getWorks.xql b/add/data/xql/getWorks.xql
index ddb322166..f42f6d827 100644
--- a/add/data/xql/getWorks.xql
+++ b/add/data/xql/getWorks.xql
@@ -1,24 +1,7 @@
-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.
+ :)
 
 (:~
 : Returns a JSON representation of all Works inside an Edition.
@@ -26,22 +9,31 @@ 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";
+(: IMPORTS ================================================================= :)
 
-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 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)
-	       
-	    , ','),
-    ']')
\ No newline at end of file
+(: JSON serialization of map instad of text serialization with concat :)
+    concat(
+        '[',
+        string-join(
+            for $workUri in $workUris
+            return
+                work:toJSON($workUri, $uri)
+        , ','),
+    ']')
diff --git a/add/data/xql/getXml.xql b/add/data/xql/getXml.xql
index ade41e67d..de732f4eb 100644
--- a/add/data/xql/getXml.xql
+++ b/add/data/xql/getXml.xql
@@ -1,31 +1,26 @@
-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 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 ================================================== :)
 
-  ID: $Id: getXml.xql 1219 2012-01-20 08:33:28Z 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";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: OPTION DECLARATIONS ===================================================== :)
 
-declare namespace request="http://exist-db.org/xquery/request";
-declare namespace mei="http://www.music-encoding.org/ns/mei";
+declare option output:method "xml";
+declare option output:media-type "text/xml";
+declare option output:omit-xml-declaration "no";
+declare option output:indent "yes";
 
-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', '')
@@ -33,6 +28,7 @@ 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)
diff --git a/add/data/xql/getZone.xql b/add/data/xql/getZone.xql
index 738b17430..31b86199f 100644
--- a/add/data/xql/getZone.xql
+++ b/add/data/xql/getZone.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/>.
-:)
+ : For LICENSE-Details please refer to the LICENSE file in the root directory of this repository.
+ :)
 
 (:~
     Returns a JSON representation of a zone.
-    
+
     @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";
+(: 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 xmldb="http://exist-db.org/xquery/xmldb";
+(: OPTION DECLARATIONS ===================================================== :)
 
-declare option exist:serialize "method=text media-type=text/plain omit-xml-declaration=yes";
+declare option output:method "json";
+declare option output:media-type "application/json";
 
+(: QUERY BODY ============================================================== :)
 
 let $uri := request:get-parameter('uri', '')
 let $zoneId := request:get-parameter('zoneId', '')
@@ -40,12 +31,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), '"',
-    '}')
-)
\ No newline at end of file
+    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)
+        }
+)
diff --git a/add/data/xql/getiFrameURL.xql b/add/data/xql/getiFrameURL.xql
index 561adf53c..5669780af 100644
--- a/add/data/xql/getiFrameURL.xql
+++ b/add/data/xql/getiFrameURL.xql
@@ -1,34 +1,35 @@
-xquery version "3.0";
+xquery version "3.1";
 (:
-  Edirom Online
-  Copyright (C) 2016 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.
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-  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.
+declare namespace request = "http://exist-db.org/xquery/request";
+declare namespace xmldb = "http://exist-db.org/xquery/xmldb";
 
-  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 $
-:)
-
-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(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..2f388a10a 100644
--- a/add/data/xql/loginToTextGrid.xql
+++ b/add/data/xql/loginToTextGrid.xql
@@ -1,24 +1,30 @@
-xquery version "3.0";
+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";
+(: 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')
 
 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
+    )
diff --git a/add/data/xql/search.xql b/add/data/xql/search.xql
index 6f2fb4a2b..54ec0bb8b 100644
--- a/add/data/xql/search.xql
+++ b/add/data/xql/search.xql
@@ -1,140 +1,188 @@
-xquery version "3.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 kwic = "http://exist-db.org/xquery/kwic";
+import module namespace transform="http://exist-db.org/xquery/transform";
 
-  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 "../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";
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-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 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 option exist:serialize "method=xhtml media-type=text/html omit-xml-declaration=yes indent=yes";:)
+(: OPTION DECLARATIONS ===================================================== :)
+
+declare option output:method "xhtml";
+declare option output:media-type "text/html";
+
+(: 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, ' ')
-  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, ']')
 };
 
+(: 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)}}">
-                            <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 := 
+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(
-            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
+        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
+                ()
         
-    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 (
+            
+            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
+            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="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 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
+    transform:transform($return, $trans, ())
diff --git a/add/data/xqm/annotation.xqm b/add/data/xqm/annotation.xqm
index 7d70812f5..b531d7996 100644
--- a/add/data/xqm/annotation.xqm
+++ b/add/data/xqm/annotation.xqm
@@ -1,67 +1,62 @@
-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>
-:)
+ : 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
 };
 
 (:~
-: 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)
     let $annos := $doc//mei:annot[@type = 'editorialComment']
     return
@@ -69,48 +64,60 @@ declare function annotation:annotationsToJSON($uri as xs:string, $edition as xs:
         return annotation:toJSON($anno, $edition)
 };
 
-
 (:~
-: 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)
     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
@@ -125,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)
@@ -137,68 +144,79 @@ 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/'):)
     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
 };
 
 (:~
-: 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)
     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)
@@ -243,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()
@@ -277,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, ' ')
@@ -291,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
diff --git a/add/data/xqm/edition.xqm b/add/data/xqm/edition.xqm
index 6c2bb17a5..777e9f882 100644
--- a/add/data/xqm/edition.xqm
+++ b/add/data/xqm/edition.xqm
@@ -1,111 +1,100 @@
 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.
-
-  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.
+(:~
+ : 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";
 
-  You should have received a copy of the GNU General Public License
-  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
+(: IMPORTS ================================================================= :)
 
-  ID: $Id: edition.xqm 1334 2012-06-14 12:40:33Z daniel $
-:)
+import module namespace functx="http://www.functx.com";
 
+(: NAMESPACE DECLARATIONS ================================================== :)
 
-(:~
-: 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";
+declare namespace edirom = "http://www.edirom.de/ns/1.3";
+declare namespace xlink = "http://www.w3.org/1999/xlink";
 
-declare namespace edirom="http://www.edirom.de/ns/1.3";
-declare namespace xlink="http://www.w3.org/1999/xlink";
+(: FUNCTION DECLARATIONS =================================================== :)
 
-import module namespace functx="http://www.functx.com";
 (:~
-: 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
     return
         concat('
             {',
-                'id: "', $edition/string(@xml:id), '", ',
-                'doc: "', $uri, '", ',
-                'name: "', $edition/edirom:editionName, '"',
-            '}')
+        'id: "', $edition/string(@xml:id), '", ',
+        'doc: "', $uri, '", ',
+        'name: "', $edition/edirom:editionName, '"',
+        '}')
 };
 
 (:~
-: 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
-    return 'xmldb:exist://' || document-uri($edition/root())
+    return
+        'xmldb:exist://' || document-uri($edition/root())
 };
 
 (:~
-: 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 +103,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,66 +112,74 @@ 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()
+    if(doc($uri)//edirom:preferences/@xlink:href => string()) then(
+        doc($uri)//edirom:preferences/@xlink:href => string()
+    ) else ('../prefs/edirom-prefs.xml')
 };
 
 (:~
-: 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())
-    )
+        return
+            'xmldb:exist://' || document-uri($edition/root())
+        )
 };
 
 (:~
-: 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), '/')
 };
diff --git a/add/data/xqm/source.xqm b/add/data/xqm/source.xqm
index 001ab77cb..c588b3dc4 100644
--- a/add/data/xqm/source.xqm
+++ b/add/data/xqm/source.xqm
@@ -1,121 +1,145 @@
-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.
-
-  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/>.
+(:~
+ : 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";
 
-  ID: $Id: source.xqm 1324 2012-05-15 13:59:35Z daniel $
-:)
+(: IMPORTS ================================================================= :)
 
+import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(:~
-: 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";
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace mei="http://www.music-encoding.org/ns/mei";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: FUNCTION DECLARATIONS =================================================== :)
 
 (:~
-: Returns whether a document is a source or not
+: Returns whether a document is a source or not. Generally this should work for MEI versions
+: 2011-05 through 5.0
 :
 : @param $uri The URI of the document
-: @return Is work or not
+:
+: @return xs:boolean indicating whether the document referenced by @param $uri
+: is considered a music source 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)?'
+    let $meiVersion4To5Regex := '^[4-5](\.\d){1,2}(-dev)?(\+(anyStart|basic|CMN|Mensural|Neumes))?$'
+
     return
-        (exists($doc//mei:mei) and exists($doc//mei:source)) (:mei2 and ?3 :)
+        (: 2010-05 pre camelCase :)
+        (: 2011-05 2012 :)
+        (: 2013 +meiversion.num 2.1.1:)
+        (: 3.0.0 :)
+        (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:)
+        (: 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, $meiVersionRegex) 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 :)
 };
 
 (:~
-: 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
 };
diff --git a/add/data/xqm/teitext.xqm b/add/data/xqm/teitext.xqm
index bdcfd13e5..ad0142d1a 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
+ : 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.
-
-  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/>.
+(:~
+ : 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";
 
-  ID: $Id: teitext.xqm 1324 2012-05-15 13:59:35Z daniel $
-:)
+(: IMPORTS ================================================================= :)
 
+import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
 
-(:~
-: 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";
+(: NAMESPACE DECLARATIONS ================================================== :)
 
 declare namespace tei="http://www.tei-c.org/ns/1.0";
 
-import module namespace eutil="http://www.edirom.de/xquery/util" at "../xqm/util.xqm";
+(: 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
+
+};
diff --git a/add/data/xqm/util.xqm b/add/data/xqm/util.xqm
index d05b1a962..dfbe2a145 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"
+
 };
diff --git a/add/data/xqm/work.xqm b/add/data/xqm/work.xqm
index d167c8468..1cf6fdd83 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
+
+};
diff --git a/add/data/xslt/edirom_idPrefix.xsl b/add/data/xslt/edirom_idPrefix.xsl
index 234720cee..f7e127da0 100644
--- a/add/data/xslt/edirom_idPrefix.xsl
+++ b/add/data/xslt/edirom_idPrefix.xsl
@@ -1,17 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:math="http://www.w3.org/2005/xpath-functions/math" exclude-result-prefixes="xs" version="3.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" exclude-result-prefixes="xs xd" version="3.0">
+
+    <xd:doc scope="stylesheet">
+        <xd:desc>This stylesheet is intended asa sceond run on HTML content for the Edirom Online, in order to prepend any ID with a prefix and avoid invalid HTML when an object is open multiple times in one Edirom Online insatnce.</xd:desc>
+    </xd:doc>
+    
+    <xd:doc scope="component">
+        <xd:desc>The $idPrefix parameter is submitted externally and is the value prepended to IDs etc.</xd:desc>
+    </xd:doc>
     <xsl:param name="idPrefix"/>
+    
+    <xd:doc scope="component">
+        <xd:desc>The root template</xd:desc>
+    </xd:doc>
     <xsl:template match="/">
         <xsl:apply-templates/>
     </xsl:template>
+    
+    <xd:doc>
+        <xd:desc>Override the dafault template for elements to also apply templates on the attribute axis.</xd:desc>
+    </xd:doc>
     <xsl:template match="*">
         <xsl:copy>
             <xsl:apply-templates select="@* | node()"/>
         </xsl:copy>
     </xsl:template>
+    
+    <xd:doc scope="component">
+        <xd:desc>Process id attributes by prepending the $idPrefix.</xd:desc>
+    </xd:doc>
     <xsl:template match="@id">
         <xsl:attribute name="id" select="concat($idPrefix, .)"/>
     </xsl:template>
+    
+    <xd:doc scope="component">
+        <xd:desc>Process href attributes to prepend $idPrefix for fragment identifiers.</xd:desc>
+    </xd:doc>
     <xsl:template match="@href">
         <xsl:choose>
             <xsl:when test="starts-with(., '#')">
@@ -22,13 +46,42 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+    
+    <xd:doc scope="component">
+        <xd:desc>Process data-tipped-options attributes to include $idPrefix.</xd:desc>
+    </xd:doc>
     <xsl:template match="@data-tipped-options">
         <xsl:attribute name="data-tipped-options" select="replace(., 'inline: ''', concat('inline: ''', $idPrefix))"/>
     </xsl:template>
+    
+    <xd:doc scope="component">
+        <xd:desc>Override default template for attributes, to copy instead of printing text content.</xd:desc>
+    </xd:doc>
     <xsl:template match="@*">
         <xsl:copy/>
     </xsl:template>
+    
+    <xd:doc scope="component">
+        <xd:desc>Override default templates for text comments and processing instructions to copy nodes.</xd:desc>
+    </xd:doc>
     <xsl:template match="text() | comment() | processing-instruction()">
         <xsl:copy/>
     </xsl:template>
+    
+    <xd:doc scope="component">
+        <xd:desc>Process onclick attributes to prepend $idPrefix if starting fragement identifiers.</xd:desc>
+    </xd:doc>
+    <xsl:template match="@onclick">
+        <xsl:variable name="matchExpression">loadLink('#</xsl:variable>
+        <xsl:attribute name="onclick">
+            <xsl:analyze-string select="." regex="(loadLink\('#)">
+                <xsl:matching-substring>
+                    <xsl:value-of select="regex-group(1) || $idPrefix"/>
+                </xsl:matching-substring>
+                <xsl:non-matching-substring>
+                    <xsl:copy/>
+                </xsl:non-matching-substring>
+            </xsl:analyze-string>
+        </xsl:attribute>
+    </xsl:template>
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/Stylesheets b/add/data/xslt/tei/Stylesheets
new file mode 160000
index 000000000..2027bc261
--- /dev/null
+++ b/add/data/xslt/tei/Stylesheets
@@ -0,0 +1 @@
+Subproject commit 2027bc2618994057fd96dada434df6dcad748468
diff --git a/add/data/xslt/tei/common2/core.xsl b/add/data/xslt/tei/common2/core.xsl
deleted file mode 100644
index 454269062..000000000
--- a/add/data/xslt/tei/common2/core.xsl
+++ /dev/null
@@ -1,603 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="tei"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the core module. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: core.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <xsl:output indent="no"/>
-    <xsl:strip-space elements="tei:author tei:forename tei:surname tei:editor"/>
-
-  <xsl:key name="MNAMES"
-            match="tei:monogr/tei:author[tei:surname]|tei:monogr/tei:editor[tei:surname]"
-            use="ancestor::tei:biblStruct/@xml:id"/>
-  <xsl:key name="ANAMES"
-            match="tei:analytic/tei:author[tei:surname]|tei:analytic/tei:editor[tei:surname]"
-            use="ancestor::tei:biblStruct/@xml:id"/>
-  
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process all elements to find out their nesting depth</desc>
-   </doc>
-  <xsl:template match="tei:*" mode="depth">99</xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process all elements in plain mode</desc>
-   </doc>
-  <xsl:template match="tei:*" mode="plain">
-      <xsl:apply-templates mode="plain"/>
-  </xsl:template>
-  <xsl:template match="tei:note" mode="plain"/>
-  <xsl:template match="tei:app" mode="plain"/>
-  <xsl:template match="tei:pb" mode="plain"/>
-  <xsl:template match="tei:lb" mode="plain"/>
-  <xsl:template match="tei:figure" mode="plain"/>
-  <xsl:template match="tei:figDesc" mode="plain"/>
-  <xsl:template match="tei:ptr" mode="plain"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process tei:sic</desc>
-   </doc>
-  <xsl:template match="tei:sic">
-      <xsl:apply-templates/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process tei:corr</desc>
-   </doc>
-  <xsl:template match="tei:corr"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process tei:item in runin mode</desc>
-   </doc>
-  <xsl:template match="tei:item" mode="runin">
-      <xsl:text> • </xsl:text>
-      <xsl:apply-templates/>
-      <xsl:text>&#160;</xsl:text>
-  </xsl:template>
-
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element edition</desc>
-   </doc>
-  <xsl:template match="tei:edition">
-      <xsl:apply-templates/>
-      <xsl:if test="ancestor::tei:biblStruct or ancestor::tei:biblFull">
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters">. </xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-  </xsl:template>
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element imprint</desc>
-   </doc>
-  <xsl:template match="tei:imprint">
-      <xsl:choose>
-         <xsl:when test="ancestor::tei:biblStruct or ancestor::tei:biblFull">
-	           <xsl:apply-templates select="tei:date"/>
-	           <xsl:apply-templates select="tei:pubPlace"/>
-	           <xsl:apply-templates select="tei:publisher"/>
-	           <xsl:apply-templates select="tei:biblScope"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:apply-templates/>
-         </xsl:otherwise>
-      </xsl:choose>
-
-  </xsl:template>
-
-
-   <!-- biblStruct -->
-<xsl:template match="tei:biblStruct" mode="xref">
-      <xsl:choose>
-         <xsl:when test="count(key('ANAMES',@xml:id))=1">
-	           <xsl:value-of select="key('ANAMES',@xml:id)/tei:surname"/>
-         </xsl:when>
-         <xsl:when test="count(key('ANAMES',@xml:id))=2">
-	           <xsl:value-of select="key('ANAMES',@xml:id)[1]/tei:surname"/>
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> and </xsl:with-param>
-		   </xsl:call-template>
-	           <xsl:value-of select="key('ANAMES',@xml:id)[2]/tei:surname"/>
-         </xsl:when>
-         <xsl:when test="count(key('ANAMES',@xml:id))&gt;2">
-	           <xsl:value-of select="key('ANAMES',@xml:id)[1]/tei:surname"/>
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> et al.</xsl:with-param>
-		   </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="count(key('MNAMES',@xml:id))=1">
-	           <xsl:value-of select="key('MNAMES',@xml:id)/tei:surname"/>
-         </xsl:when>
-         <xsl:when test="count(key('MNAMES',@xml:id))=2">
-	           <xsl:value-of select="key('MNAMES',@xml:id)[1]/tei:surname"/>
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> and </xsl:with-param>
-		   </xsl:call-template>
-	           <xsl:value-of select="key('MNAMES',@xml:id)[2]/tei:surname"/>
-         </xsl:when>
-         <xsl:when test="count(key('MNAMES',@xml:id))&gt;2">
-	           <xsl:value-of select="key('MNAMES',@xml:id)[1]/tei:surname"/>
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> et al.</xsl:with-param>
-		   </xsl:call-template>
-         </xsl:when>
-         <xsl:when test=".//tei:author[tei:surname]">
-	           <xsl:value-of select=".//tei:author/tei:surname[1]"/>
-         </xsl:when>
-         <xsl:when test=".//tei:author[tei:orgName]">
-	           <xsl:value-of select=".//tei:author/tei:orgName[1]"/>
-         </xsl:when>
-         <xsl:when test=".//tei:author">
-	           <xsl:value-of select=".//tei:author[1]"/>
-         </xsl:when>
-         <xsl:when test=".//tei:editor[tei:surname]">
-	           <xsl:value-of select=".//tei:editor/tei:surname[1]"/>
-         </xsl:when>
-         <xsl:when test=".//tei:editor">
-	           <xsl:value-of select=".//tei:editor[1]"/>
-         </xsl:when>
-         <xsl:otherwise>
-	           <xsl:value-of select=".//tei:title[1]"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-         <xsl:when test="count(tei:*[1]/tei:editor)=1">
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> (ed.)</xsl:with-param>
-		   </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="count(tei:*[1]/tei:editor)&gt;1">
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> (eds.)</xsl:with-param>
-		   </xsl:call-template>
-         </xsl:when>
-      </xsl:choose>
-      <xsl:choose>
-         <xsl:when test="tei:monogr/tei:imprint/tei:date/@when">
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> (</xsl:with-param>
-		   </xsl:call-template>
-	           <xsl:value-of select="substring-before(tei:monogr/tei:imprint/tei:date/@when,'-')"/>
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters">)</xsl:with-param>
-		   </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="tei:monogr/tei:imprint/tei:date">
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters"> (</xsl:with-param>
-		   </xsl:call-template>
-	           <xsl:value-of select="tei:monogr/tei:imprint/tei:date"/>
-	           <xsl:call-template name="tei:makeText">
-		     <xsl:with-param name="letters">)</xsl:with-param>
-		   </xsl:call-template>
-         </xsl:when>
-      </xsl:choose>
-   </xsl:template>
-
-   <!-- authors and editors -->
-<xsl:template match="tei:editor|tei:author">
-  <xsl:choose>
-    <xsl:when test="ancestor::tei:bibl">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:when test="self::tei:author and not(following-sibling::tei:author)">
-      <xsl:apply-templates/>
-      <xsl:call-template name="tei:makeText">
-	<xsl:with-param name="letters">. </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="self::tei:editor and not(following-sibling::tei:editor)">
-      <xsl:apply-templates/>
-      <xsl:call-template name="tei:makeText">
-	<xsl:with-param name="letters"> (ed</xsl:with-param>
-      </xsl:call-template>
-      <xsl:if test="preceding-sibling::tei:editor">s</xsl:if>
-      <xsl:call-template name="tei:makeText">
-	<xsl:with-param name="letters">.) </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-      <xsl:call-template name="tei:makeText">
-	<xsl:with-param name="letters">, </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-   <xsl:template match="tei:surname">
-      <xsl:if test="../tei:forename">
-         <xsl:apply-templates select="../tei:forename" mode="use"/>
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-      <xsl:if test="../tei:nameLink">
-         <xsl:apply-templates select="../tei:nameLink" mode="use"/>
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-      <xsl:apply-templates/>
-   </xsl:template>
-
-   <xsl:template match="tei:forename">
-   </xsl:template>
-
-   <xsl:template match="tei:nameLink">
-</xsl:template>
-
-   <xsl:template match="tei:forename" mode="use">
-      <xsl:if test="preceding-sibling::tei:forename">
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-      <xsl:apply-templates/>
-   </xsl:template>
-
-   <xsl:template match="tei:nameLink" mode="use">
-      <xsl:apply-templates/>
-   </xsl:template>
-
-   <!-- title  -->
-   <xsl:template match="tei:titlePart" mode="simple">
-      <xsl:if test="preceding-sibling::tei:titlePart">
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters"> — </xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-      <xsl:value-of select="."/>
-   </xsl:template>
-
-   <xsl:template match="tei:title" mode="simple">
-      <xsl:value-of select="."/>
-   </xsl:template>
-
-   <xsl:template match="tei:titlePart">
-      <xsl:if test="preceding-sibling::tei:titlePart">
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters"> — </xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-      <xsl:apply-templates/>
-   </xsl:template>
-
-   <xsl:template match="tei:title">
-      <xsl:choose>
-         <xsl:when test="parent::tei:titleStmt/parent::tei:fileDesc">
-            <xsl:if test="preceding-sibling::tei:title">
-	      <xsl:call-template name="tei:makeText">
-		<xsl:with-param name="letters"> — </xsl:with-param>
-	      </xsl:call-template>
-            </xsl:if>
-            <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:when test="@level='m' or not(@level)">
-	   <xsl:call-template name="emphasize">
-	     <xsl:with-param name="class">
-	       <xsl:text>titlem</xsl:text>
-	     </xsl:with-param>
-	     <xsl:with-param name="content">
-	       <xsl:apply-templates/>
-	     </xsl:with-param>
-	   </xsl:call-template>
-	   <xsl:if test="ancestor::tei:biblStruct or ancestor::tei:biblFull">
-	     <xsl:call-template name="tei:makeText">
-	       <xsl:with-param name="letters">, </xsl:with-param>
-	     </xsl:call-template>
-	   </xsl:if>
-         </xsl:when>
-         <xsl:when test="@level='s'">
-	   <xsl:call-template name="emphasize">
-	     <xsl:with-param name="class">
-	       <xsl:text>titles</xsl:text>
-	     </xsl:with-param>
-	     <xsl:with-param name="content">
-	       <xsl:apply-templates/>
-	     </xsl:with-param>
-	   </xsl:call-template>
-	   <xsl:if test="following-sibling::* and
-			 (ancestor::tei:biblStruct  or ancestor::tei:biblFull)">
-	     <xsl:call-template name="tei:makeText">
-	       <xsl:with-param name="letters">
-	       </xsl:with-param>
-	     </xsl:call-template>
-	   </xsl:if>
-         </xsl:when>
-         <xsl:when test="@level='j'">
-	   <xsl:call-template name="emphasize">
-	     <xsl:with-param name="class">
-	       <xsl:text>titlej</xsl:text>
-	     </xsl:with-param>
-	     <xsl:with-param name="content">
-	       <xsl:apply-templates/>
-	     </xsl:with-param>
-	   </xsl:call-template>
-	   <xsl:call-template name="tei:makeText">
-	     <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	   </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="@level='a'">
-	   <xsl:call-template name="emphasize">
-	     <xsl:with-param name="class">
-	       <xsl:text>titlea</xsl:text>
-	     </xsl:with-param>
-	     <xsl:with-param name="content">
-	       <xsl:apply-templates/>
-	     </xsl:with-param>
-	   </xsl:call-template>
-	   <xsl:if test="ancestor::tei:biblStruct or ancestor::tei:biblFull">
-	     <xsl:call-template name="tei:makeText">
-	       <xsl:with-param
-		   name="letters">. </xsl:with-param>
-	     </xsl:call-template>
-	   </xsl:if>
-         </xsl:when>
-         <xsl:when test="@level='u'">
-	   <xsl:call-template name="emphasize">
-	     <xsl:with-param name="class">
-	       <xsl:text>titleu</xsl:text>
-	     </xsl:with-param>
-	     <xsl:with-param name="content">
-	       <xsl:apply-templates/>
-	     </xsl:with-param>
-	   </xsl:call-template>
-	   <xsl:if test="ancestor::tei:biblStruct  or ancestor::tei:biblFull">
-	     <xsl:call-template name="tei:makeText">
-	       <xsl:with-param
-		   name="letters">. </xsl:with-param>
-	     </xsl:call-template>
-	   </xsl:if>
-         </xsl:when>
-         <xsl:when test="ancestor::tei:bibl">
-	   <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:otherwise>
-	   <xsl:call-template name="emphasize">
-	     <xsl:with-param name="class">
-	       <xsl:text>titlem</xsl:text>
-	     </xsl:with-param>
-	     <xsl:with-param name="content">
-	       <xsl:apply-templates/>
-	     </xsl:with-param>
-	   </xsl:call-template>
-         </xsl:otherwise>
-      </xsl:choose>
-   </xsl:template>
-   
-
-   <xsl:template match="tei:meeting">
-      <xsl:call-template name="tei:makeText">
-	<xsl:with-param name="letters"> (</xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates/>
-      <xsl:call-template name="tei:makeText">
-	<xsl:with-param name="letters">)</xsl:with-param>
-      </xsl:call-template>
-      <xsl:if test="following-sibling::* and (ancestor::tei:biblStruct  or ancestor::tei:biblFull)">
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-   </xsl:template>
-
-   <xsl:template match="tei:series">
-      <xsl:apply-templates/>
-   </xsl:template>
-
-   <xsl:template match="tei:biblStruct//tei:date|tei:biblFull//tei:date">
-     <!--
-	 <xsl:choose>
-	 <xsl:when test="starts-with(.,'$Date:')">
-	 <xsl:value-of select="substring-before(substring-after(.,'$Date:'),'$')"/>
-	 </xsl:when>
-	 <xsl:otherwise>
-	 <xsl:apply-templates/>
-	 </xsl:otherwise>
-	 </xsl:choose>
-     -->
-      <xsl:apply-templates/>
-     <xsl:call-template name="tei:makeText">
-       <xsl:with-param name="letters">. </xsl:with-param>
-     </xsl:call-template>
-   </xsl:template>
-
-   <xsl:template match="tei:byline">
-     <xsl:call-template name="makeSpan"/>
-   </xsl:template>
-
-   <xsl:template match="tei:pubPlace">
-     <xsl:call-template name="makeSpan"/>
-     <xsl:choose>
-         <xsl:when test="ancestor::tei:bibl"/>
-         <xsl:when test="following-sibling::tei:pubPlace">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters">, </xsl:with-param>
-	    </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="../tei:publisher">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters">: </xsl:with-param>
-	    </xsl:call-template>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters">. </xsl:with-param>
-	    </xsl:call-template>
-         </xsl:otherwise>
-      </xsl:choose>
-   </xsl:template>
-
-   <xsl:template match="tei:publisher">
-     <xsl:call-template name="makeSpan"/>
-      <xsl:if test="ancestor::tei:biblStruct or ancestor::tei:biblFull">
-         <xsl:call-template name="tei:makeText">
-	   <xsl:with-param name="letters">. </xsl:with-param>
-	 </xsl:call-template>
-      </xsl:if>
-   </xsl:template>
-
-   <!-- details and notes -->
-   <xsl:template match="tei:biblScope">
-      <xsl:choose>
-         <xsl:when test="ancestor::tei:bibl">
-            <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:when test="@type='vol' or @type='volume'">
-            <xsl:call-template name="emphasize">
-               <xsl:with-param name="class">
-	                 <xsl:text>vol</xsl:text>
-               </xsl:with-param>
-               <xsl:with-param name="content">
-	                 <xsl:apply-templates/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="@type='chap'">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters">chapter </xsl:with-param>
-	    </xsl:call-template>
-            <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:when test="@type='issue' or @type='nr'">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters"> (</xsl:with-param>
-	    </xsl:call-template>
-            <xsl:apply-templates/>
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters">) </xsl:with-param>
-	    </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="@type='page_from'">
-	   <xsl:text>pp. </xsl:text>
-	   <xsl:apply-templates/>
-	 </xsl:when>
-         <xsl:when test="@type='page_to'">
-	   <xsl:text>-</xsl:text>
-	   <xsl:apply-templates/>
-	 </xsl:when>
-         <xsl:when test="@type='pp' or @type='pages'">
-            <xsl:choose>
-               <xsl:when test="contains(.,'-')">
-	                 <xsl:call-template name="tei:makeText">
-			   <xsl:with-param
-			       name="letters">pp. </xsl:with-param>
-			 </xsl:call-template>
-               </xsl:when>
-               <xsl:when test="contains(.,'ff')">
-	                 <xsl:call-template name="tei:makeText">
-			   <xsl:with-param
-			       name="letters">pp. </xsl:with-param>
-			 </xsl:call-template>
-               </xsl:when>
-               <xsl:when test="contains(.,' ')">
-	                 <xsl:call-template name="tei:makeText">
-			   <xsl:with-param
-			       name="letters">pp. </xsl:with-param>
-			 </xsl:call-template>
-               </xsl:when>
-               <xsl:otherwise>
-	                 <xsl:call-template name="tei:makeText">
-			   <xsl:with-param
-			       name="letters">p. </xsl:with-param>
-			 </xsl:call-template>
-               </xsl:otherwise>
-            </xsl:choose>
-            <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:apply-templates/>
-         </xsl:otherwise>
-      </xsl:choose>
- 
-      <xsl:choose>
-         <xsl:when test="@type='vol' and      following-sibling::tei:biblScope[@type='issue']">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	    </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="@type='vol' and following-sibling::tei:biblScope">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	    </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="following-sibling::tei:biblScope">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters"><xsl:text> </xsl:text></xsl:with-param>
-	    </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="ancestor::tei:biblStruct or ancestor::tei:biblFull">
-            <xsl:call-template name="tei:makeText">
-	      <xsl:with-param name="letters">. </xsl:with-param>
-	    </xsl:call-template>
-         </xsl:when>
-      </xsl:choose>
-
-   </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element name and tei:persName</desc>
-   </doc>
-  <xsl:template match="tei:name|tei:persName">
-      <xsl:apply-templates/>
-      <xsl:choose>
-         <xsl:when test="not(ancestor::tei:person|ancestor::tei:biblStruct)"/>
-         <xsl:when test="following-sibling::tei:name|following-sibling::tei:persName">
-	   <xsl:call-template name="tei:makeText">
-	     <xsl:with-param name="letters">, </xsl:with-param>
-	   </xsl:call-template>
-         </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="tei:bibl/tei:note|tei:biblStruct/tei:note">
-    <xsl:call-template name="tei:makeText">
-      <xsl:with-param name="letters"> (</xsl:with-param>
-    </xsl:call-template>
-      <xsl:apply-templates/>
-    <xsl:call-template name="tei:makeText">
-      <xsl:with-param name="letters">)</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/common2/figures.xsl b/add/data/xslt/tei/common2/figures.xsl
deleted file mode 100644
index 9b5ae88e1..000000000
--- a/add/data/xslt/tei/common2/figures.xsl
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="tei"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the figures module. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: figures.xsl 9998 2012-01-02 18:27:15Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element figure</desc>
-   </doc>
-  <xsl:template match="tei:figure" mode="xref">
-      <xsl:choose>
-         <xsl:when test="$numberFigures='true'">
-            <xsl:call-template name="i18n">
-               <xsl:with-param name="word">figureWord</xsl:with-param>
-            </xsl:call-template>
-            <xsl:text> </xsl:text>
-            <xsl:choose>
-               <xsl:when test="ancestor::tei:front">
-                  <xsl:number count="tei:figure[tei:head]" from="tei:front" level="any"/>
-               </xsl:when>
-               <xsl:when test="ancestor::tei:back">
-                  <xsl:number count="tei:figure[tei:head]" from="tei:back" level="any"/>
-               </xsl:when>
-               <xsl:when test="ancestor::tei:body">
-                  <xsl:number count="tei:figure[tei:head]" from="tei:body" level="any"/>
-               </xsl:when>
-            </xsl:choose>
-            <xsl:if test="tei:head">
-               <xsl:text>, </xsl:text>
-               <xsl:apply-templates mode="plain" select="tei:head"/>
-            </xsl:if>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:text>this figure</xsl:text>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element table</desc>
-   </doc>
-  <xsl:template match="tei:table" mode="xref">
-      <xsl:choose>
-         <xsl:when test="$numberTables='true'">
-            <xsl:call-template name="i18n">
-               <xsl:with-param name="word">tableWord</xsl:with-param>
-            </xsl:call-template>
-            <xsl:text> </xsl:text>
-            <xsl:number level="any"/>
-            <xsl:if test="tei:head">
-               <xsl:text>. </xsl:text>
-               <xsl:apply-templates mode="plain" select="tei:head"/>
-            </xsl:if>
-         </xsl:when>
-         <xsl:otherwise>
-	   <xsl:choose>
-            <xsl:when test="tei:head">
-               <xsl:apply-templates mode="plain" select="tei:head"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>table</xsl:text>
-	    </xsl:otherwise>
-	   </xsl:choose>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[latex] Analyze attributes of graphics inclusion<param name="mode">Type of output (fo, html, latex) being
-    created</param>
-      </desc>
-   </doc>
-  <xsl:template name="graphicsAttributes">
-      <xsl:param name="mode">fo</xsl:param>
-      <xsl:if test="@width">
-         <xsl:choose>
-            <xsl:when test="ends-with(@width,'%')">
-               <xsl:choose>
-                  <xsl:when test="$mode='fo'">
-                     <xsl:attribute name="content-width">
-                        <xsl:value-of select="@width"/>
-                     </xsl:attribute>
-                  </xsl:when>
-                  <xsl:when test="$mode='latex'">
-                     <xsl:text>width=</xsl:text>
-                     <xsl:value-of select="number(substring-before(@width,'%')) div 100"/>
-                     <xsl:text>\textwidth,</xsl:text>
-                  </xsl:when>
-                  <xsl:otherwise>
-                     <xsl:attribute name="width">
-                        <xsl:value-of select="@width"/>
-                     </xsl:attribute>
-                  </xsl:otherwise>
-               </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:variable name="w">
-                  <xsl:choose>
-                     <xsl:when test="ends-with(@width,'pt')">
-                        <xsl:value-of select="@width"/>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@width,'px') and $mode='latex'">
-                        <xsl:value-of select="substring-before(@width,'px')"/>
-                        <xsl:text>pt</xsl:text>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@width,'in')">
-                        <xsl:value-of select="@width"/>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@width,'px')">
-                        <xsl:value-of select="@width"/>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@width,'cm')">
-                        <xsl:value-of select="@width"/>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <xsl:value-of select="@width"/>
-                        <xsl:text>pt</xsl:text>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </xsl:variable>
-               <xsl:choose>
-                  <xsl:when test="$mode='fo'">
-                     <xsl:attribute name="content-width">
-                        <xsl:value-of select="$w"/>
-                     </xsl:attribute>
-                  </xsl:when>
-                  <xsl:when test="$mode='latex'">
-                     <xsl:text>width=</xsl:text>
-                     <xsl:value-of select="$w"/>
-                     <xsl:text>,</xsl:text>
-                  </xsl:when>
-               </xsl:choose>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:if>
-      <xsl:if test="@height">
-         <xsl:choose>
-            <xsl:when test="ends-with(@height,'%')">
-               <xsl:choose>
-                  <xsl:when test="$mode='fo'">
-                     <xsl:attribute name="content-height">
-                        <xsl:value-of select="@height"/>
-                     </xsl:attribute>
-                  </xsl:when>
-                  <xsl:when test="$mode='latex'">
-                     <xsl:text>height=</xsl:text>
-                     <xsl:value-of select="number(substring-before(@height,'%')) div 100"/>
-                     <xsl:text>\textheight,</xsl:text>
-                  </xsl:when>
-                  <xsl:otherwise>
-                     <xsl:attribute name="height">
-                        <xsl:value-of select="@height"/>
-                     </xsl:attribute>
-                  </xsl:otherwise>
-               </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:variable name="h">
-                  <xsl:choose>
-                     <xsl:when test="ends-with(@height,'pt')">
-                        <xsl:value-of select="@height"/>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@height,'px') and $mode='latex'">
-                        <xsl:value-of select="substring-before(@height,'px')"/>
-                        <xsl:text>pt</xsl:text>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@height,'in')">
-                        <xsl:value-of select="@height"/>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@height,'px')">
-                        <xsl:value-of select="@height"/>
-                     </xsl:when>
-                     <xsl:when test="ends-with(@height,'cm')">
-                        <xsl:value-of select="@height"/>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <xsl:value-of select="@height"/>
-                        <xsl:text>pt</xsl:text>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </xsl:variable>
-               <xsl:choose>
-                  <xsl:when test="$mode='fo'">
-                     <xsl:attribute name="content-height">
-                        <xsl:value-of select="$h"/>
-                     </xsl:attribute>
-                  </xsl:when>
-                  <xsl:when test="$mode='latex'">
-                     <xsl:text>height=</xsl:text>
-                     <xsl:value-of select="$h"/>
-                     <xsl:text>,</xsl:text>
-                  </xsl:when>
-               </xsl:choose>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:if>
-      <xsl:variable name="s">
-         <xsl:choose>
-            <xsl:when test="@scale and ends-with(@scale,'%')">
-               <xsl:value-of select="number(substring-before(@scale,'%')) div 100"/>
-            </xsl:when>
-            <xsl:when test="@scale">
-               <xsl:value-of select="@scale"/>
-            </xsl:when>
-            <xsl:when test="not(@width) and not(@height) and not($standardScale=1)">
-               <xsl:value-of select="$standardScale"/>
-            </xsl:when>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:if test="not($s='')">
-         <xsl:choose>
-            <xsl:when test="$mode='fo'">
-               <xsl:attribute name="scale">
-                  <xsl:value-of select="$s"/>
-               </xsl:attribute>
-            </xsl:when>
-            <xsl:when test="$mode='latex'">
-               <xsl:text>scale=</xsl:text>
-               <xsl:value-of select="$s"/>
-               <xsl:text>,</xsl:text>
-            </xsl:when>
-         </xsl:choose>
-      </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/common2/functions.xsl b/add/data/xslt/tei/common2/functions.xsl
deleted file mode 100644
index 1370ce4d0..000000000
--- a/add/data/xslt/tei/common2/functions.xsl
+++ /dev/null
@@ -1,305 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" version="2.0" exclude-result-prefixes="cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI Utility stylesheet defining functions for use in all
-	 output formats.</p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: functions.xsl 9833 2011-11-27 23:12:23Z rahtz $</p>
-      <p>Copyright: 2008, TEI Consortium</p>
-    </desc>
-  </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Whether a section is "identifiable"</desc>
-  </doc>
-  <xsl:function name="tei:is-identifiable" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-        <xsl:when test="self::tei:div">true</xsl:when>
-        <xsl:when test="self::tei:div1">true</xsl:when>
-        <xsl:when test="self::tei:div2">true</xsl:when>
-        <xsl:when test="self::tei:div3">true</xsl:when>
-        <xsl:when test="self::tei:div4">true</xsl:when>
-        <xsl:when test="self::tei:div5">true</xsl:when>
-        <xsl:when test="self::tei:div6">true</xsl:when>
-        <xsl:when test="self::tei:p[@xml:id]">true</xsl:when>
-        <xsl:when test="self::tei:index[@xml:id]">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Whether a section is "transcribable"</desc>
-  </doc>
-  <xsl:function name="tei:is-transcribable" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-	<xsl:when test="self::tei:p and parent::tei:sp">true</xsl:when>
-        <xsl:when test="self::tei:l">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Whether to render text in small caps.</desc>
-  </doc>
-  <xsl:function name="tei:render-smallcaps" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-        <xsl:when test="contains(@rend,'smallcaps')">true</xsl:when>
-        <xsl:when test="@rend='sc'">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Whether to render text in smart quotes.</desc>
-  </doc>
-  <xsl:function name="tei:render-quotes" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-        <xsl:when test="self::tei:soCalled">true</xsl:when>
-        <xsl:when test="contains(@rend,'quotes')">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Whether to render text in bold.</desc>
-  </doc>
-  <xsl:function name="tei:render-bold" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-        <xsl:when test="parent::tei:hi[starts-with(@rend,'specList-')]">true</xsl:when>
-        <xsl:when test="parent::tei:hi[@rend='bold']">true</xsl:when>
-        <xsl:when test="contains(@rend,'bold')">true</xsl:when>
-        <xsl:when test="@rend='label'">true</xsl:when>
-        <xsl:when test="ancestor-or-self::tei:cell[@role='label']">true</xsl:when>
-        <xsl:when test="ancestor-or-self::tei:cell[@rend='wovenodd-col1']">true</xsl:when>
-        <xsl:when test="self::tei:cell and parent::tei:row[@role='label']">true</xsl:when>
-        <xsl:when test="self::tei:label[following-sibling::tei:item]">true</xsl:when>
-        <xsl:when test="self::tei:term">true</xsl:when>
-        <xsl:when test="self::tei:unclear">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Whether to render something in italic.</desc>
-  </doc>
-  <xsl:function name="tei:render-italic" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-        <xsl:when test="self::tei:ref and tei:render-italic(..)">true</xsl:when>
-        <xsl:when test="contains(@rend,'italic')">true</xsl:when>
-        <xsl:when test="self::tei:emph">true</xsl:when>
-        <xsl:when test="self::tei:hi[not(@rend)]">true</xsl:when>
-        <xsl:when test="self::tbx:hi[@style='italics']">true</xsl:when>
-        <xsl:when test="@rend='ital'">true</xsl:when>
-        <xsl:when test="@rend='it'">true</xsl:when>
-        <xsl:when test="@rend='i'">true</xsl:when>
-        <xsl:when test="@rend='att'">true</xsl:when>
-        <xsl:when test="self::tei:att">true</xsl:when>
-        <xsl:when test="self::tei:speaker">true</xsl:when>
-        <xsl:when test="self::tei:gloss">true</xsl:when>
-        <xsl:when test="self::tei:title">true</xsl:when>
-        <xsl:when test="self::tei:name">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Whether to render something in typewriter-like code.</desc>
-  </doc>
-  <xsl:function name="tei:render-typewriter" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-        <xsl:when test="self::tei:gi">true</xsl:when>
-        <xsl:when test="self::tei:val">true</xsl:when>
-        <xsl:when test="self::tei:code">true</xsl:when>
-        <xsl:when test="self::tei:ident">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Is given an element and defines whether or not this element is to be rendered inline.</desc>
-  </doc>
-  <xsl:function name="tei:is-inline" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-        <xsl:when test="self::mml:math">true</xsl:when>
-        <xsl:when test="self::tei:abbr">true</xsl:when>
-        <xsl:when test="self::tei:affiliation">true</xsl:when>
-        <xsl:when test="self::tei:altIdentifier">true</xsl:when>
-        <xsl:when test="self::tei:analytic">true</xsl:when>
-        <xsl:when test="self::tei:add">true</xsl:when>
-        <xsl:when test="self::tei:am">true</xsl:when>
-        <xsl:when test="self::tei:att">true</xsl:when>
-        <xsl:when test="self::tei:author">true</xsl:when>
-        <xsl:when test="self::tei:bibl and tei:is-inline($element/..)">true</xsl:when>
-        <xsl:when test="self::tei:biblScope">true</xsl:when>
-        <xsl:when test="self::tei:br">true</xsl:when>
-        <xsl:when test="self::tei:byline">true</xsl:when>
-        <xsl:when test="self::tei:c">true</xsl:when>
-        <xsl:when test="self::tei:caesura">true</xsl:when>
-        <xsl:when test="self::tei:choice">true</xsl:when>
-        <xsl:when test="self::tei:code">true</xsl:when>
-        <xsl:when test="self::tei:collection">true</xsl:when>
-        <xsl:when test="self::tei:country">true</xsl:when>
-        <xsl:when test="self::tei:damage">true</xsl:when>
-        <xsl:when test="self::tei:date">true</xsl:when>
-        <xsl:when test="self::tei:del">true</xsl:when>
-        <xsl:when test="self::tei:depth">true</xsl:when>
-        <xsl:when test="self::tei:dim">true</xsl:when>
-        <xsl:when test="self::tei:dimensions">true</xsl:when>
-        <xsl:when test="self::tei:editor">true</xsl:when>
-        <xsl:when test="self::tei:editionStmt">true</xsl:when>
-        <xsl:when test="self::tei:emph">true</xsl:when>
-        <xsl:when test="self::tei:ex">true</xsl:when>
-        <xsl:when test="self::tei:expan">true</xsl:when>
-        <xsl:when test="self::tei:figure[@place='inline']">true</xsl:when>
-        <xsl:when test="self::tei:foreign">true</xsl:when>
-        <xsl:when test="self::tei:forename">true</xsl:when>
-        <xsl:when test="self::tei:gap">true</xsl:when>
-        <xsl:when test="self::tei:genName">true</xsl:when>
-        <xsl:when test="self::tei:geogName">true</xsl:when>
-        <xsl:when test="self::tei:gi">true</xsl:when>
-        <xsl:when test="self::tei:gloss">true</xsl:when>
-        <xsl:when test="self::tei:graphic">true</xsl:when>
-        <xsl:when test="self::tei:height">true</xsl:when>
-        <xsl:when test="self::tei:hi[not(w:*)]">true</xsl:when>
-        <xsl:when test="self::tei:ident">true</xsl:when>
-        <xsl:when test="self::tei:idno">true</xsl:when>
-        <xsl:when test="self::tei:imprint">true</xsl:when>
-        <xsl:when test="self::tei:institution">true</xsl:when>
-        <xsl:when test="self::tei:lb">true</xsl:when>
-        <xsl:when test="self::tei:locus">true</xsl:when>
-        <xsl:when test="self::tei:mentioned">true</xsl:when>
-        <xsl:when test="self::tei:monogr">true</xsl:when>
-        <xsl:when test="self::tei:series">true</xsl:when>
-        <xsl:when test="self::tei:msName">true</xsl:when>
-        <xsl:when test="self::tei:name">true</xsl:when>
-        <xsl:when test="self::tei:note[@place='margin']">false</xsl:when>
-        <xsl:when test="self::tei:note[@place='bottom']">true</xsl:when>
-        <xsl:when test="self::tei:note[@place='comment']">true</xsl:when>
-        <xsl:when test="self::tei:note[@place='end']">true</xsl:when>
-        <xsl:when test="self::tei:note[@place='foot']">true</xsl:when>
-        <xsl:when test="self::tei:note[@place='inline']">true</xsl:when>
-        <xsl:when test="self::tei:note[parent::tei:biblStruct]">true</xsl:when>
-        <xsl:when test="self::tei:note[parent::tei:bibl]">true</xsl:when>
-        <xsl:when test="self::tei:num">true</xsl:when>
-        <xsl:when test="self::tei:orgName">true</xsl:when>
-        <xsl:when test="self::tei:orig">true</xsl:when>
-        <xsl:when test="self::tei:origDate">true</xsl:when>
-        <xsl:when test="self::tei:origPlace">true</xsl:when>
-        <xsl:when test="self::tei:origPlace">true</xsl:when>
-        <xsl:when test="self::tei:pb">true</xsl:when>
-        <xsl:when test="self::tei:persName">true</xsl:when>
-        <xsl:when test="self::tei:placeName">true</xsl:when>
-        <xsl:when test="self::tei:ptr">true</xsl:when>
-        <xsl:when test="self::tei:publisher">true</xsl:when>
-        <xsl:when test="self::tei:pubPlace">true</xsl:when>
-        <xsl:when test="self::tei:q[tei:l]">false</xsl:when>
-        <xsl:when test="self::tei:q[tei:figure or tei:p or tei:note or
-			tei:bibl or tei:sp or tei:floatingText]">false</xsl:when>
-        <xsl:when test="self::tei:q">true</xsl:when>
-        <xsl:when test="self::tei:said">true</xsl:when>
-        <xsl:when test="self::tei:ref">true</xsl:when>
-        <xsl:when test="self::tei:region">true</xsl:when>
-        <xsl:when test="self::tei:repository">true</xsl:when>
-        <xsl:when test="self::tei:roleName">true</xsl:when>
-        <xsl:when test="self::tei:rubric">true</xsl:when>
-        <xsl:when test="self::tei:seg">true</xsl:when>
-        <xsl:when test="self::tei:sic">true</xsl:when>
-        <xsl:when test="self::tei:settlement">true</xsl:when>
-        <xsl:when test="self::tei:soCalled">true</xsl:when>
-        <xsl:when test="self::tei:summary">true</xsl:when>
-        <xsl:when test="self::tei:supplied">true</xsl:when>
-        <xsl:when test="self::tei:surname">true</xsl:when>
-        <xsl:when test="self::tei:term">true</xsl:when>
-        <xsl:when test="self::tei:textLang">true</xsl:when>
-        <xsl:when test="self::tei:title">true</xsl:when>
-        <xsl:when test="self::tei:unclear">true</xsl:when>
-        <xsl:when test="self::tei:val">true</xsl:when>
-        <xsl:when test="self::tei:width">true</xsl:when>
-        <xsl:when test="self::tei:dynamicContent">true</xsl:when>
-        <xsl:when test="self::w:drawing">true</xsl:when>
-        <xsl:when test="self::m:oMath">true</xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="empty($element/..)">false</xsl:when>
-            <xsl:when test="tei:is-inline($element/..)">true</xsl:when>
-            <xsl:otherwise>false</xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Is given an element and says whether the context is at the
-    level of a block</desc>
-  </doc>
-  <xsl:function name="tei:blockContext" as="xs:boolean">
-    <xsl:param name="element"/>
-    <xsl:for-each select="$element">
-      <xsl:choose>
-	<xsl:when test="parent::tei:note[@place='foot'] and self::tei:gap">false</xsl:when>
-	<xsl:when test="parent::tei:note[@place='foot' or @place='bottom']">true</xsl:when>
-	<xsl:when test="parent::tei:body">true</xsl:when>
-	<xsl:when test="tei:floatingText">true</xsl:when>
-	<xsl:when test="parent::tei:div">true</xsl:when>
-	<xsl:when test="parent::tei:titlePage">true</xsl:when>
-	<xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-
-
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/common2/header.xsl b/add/data/xslt/tei/common2/header.xsl
deleted file mode 100644
index a96c75003..000000000
--- a/add/data/xslt/tei/common2/header.xsl
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="tei"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the header module. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: header.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Find a plausible editor name</desc>
-   </doc>
-  <xsl:template name="generateEditor">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:editor">
-        <xsl:for-each
-          select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:editor">
-          <xsl:apply-templates/>
-          <xsl:choose>
-            <xsl:when test="count(following-sibling::tei:editor)=1">
-              <xsl:if test="count(preceding-sibling::tei:editor)>=1">
-                <xsl:text>,</xsl:text>
-              </xsl:if>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">and</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="following-sibling::tei:editor">, </xsl:when>
-          </xsl:choose>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:when
-        test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change/tei:respStmt[tei:resp='editor']">
-        <xsl:apply-templates
-          select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change/tei:respStmt[tei:resp='editor'][1]/tei:name"
-        />
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Find a plausible main author name</desc>
-   </doc>
-  <xsl:template name="generateAuthor">
-      <xsl:choose>
-         <xsl:when test="$useHeaderFrontMatter='true' and ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docAuthor">
-            <xsl:apply-templates mode="author"
-                                 select="ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docAuthor"/>
-         </xsl:when>
-         <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:author">
-            <xsl:for-each select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:author">
-               <xsl:apply-templates/>
-               <xsl:choose>
-            <xsl:when test="count(following-sibling::tei:author)=1">
-              <xsl:if test="count(preceding-sibling::tei:author)>1">
-                <xsl:text>,</xsl:text>
-              </xsl:if>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">and</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-                  <xsl:when test="following-sibling::tei:author">, </xsl:when>
-               </xsl:choose>
-            </xsl:for-each>
-         </xsl:when>
-         <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change/tei:respStmt[tei:resp='author']">
-            <xsl:apply-templates select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change/tei:respStmt[tei:resp='author'][1]/tei:name"/>
-         </xsl:when>
-         <xsl:when test="ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docAuthor">
-            <xsl:apply-templates mode="author"
-                                 select="ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docAuthor"/>
-         </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Find a plausible name of person responsible for current revision</desc>
-   </doc>
-  <xsl:template name="generateRevAuthor">
-      <xsl:variable name="who">
-         <xsl:choose>
-            <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/@vcwho">
-               <xsl:apply-templates select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/@vcwho"/>
-            </xsl:when>
-            <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change[1]/tei:respStmt/tei:name">
-               <xsl:value-of select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change[1]/tei:respStmt/tei:name/text()"/>
-            </xsl:when>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="normalize-space($who)=concat('$Author', '$')"/>
-         <xsl:when test="starts-with($who,'$Author')">
-        <!-- it's RCS -->
-        <xsl:value-of select="normalize-space(substring-before(substring-after($who,'Author'),'$'))"/>
-         </xsl:when>
-         <xsl:when test="starts-with($who,'$LastChangedBy')">
-        <!-- it's Subversion -->
-        <xsl:value-of select="normalize-space(substring-before(substring-after($who,'LastChangedBy:'),'$'))"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:value-of select="$who"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] </desc>
-   </doc>
-  <xsl:template name="generateAuthorList">
-      <xsl:variable name="realauthor">
-         <xsl:call-template name="generateAuthor"/>
-      </xsl:variable>
-      <xsl:variable name="revauthor">
-         <xsl:call-template name="generateRevAuthor"/>
-      </xsl:variable>
-      <xsl:variable name="editor">
-        <xsl:call-template name="generateEditor"/>
-      </xsl:variable>
-      <xsl:if test="not($realauthor = '')">
-        <p xmlns="http://www.w3.org/1999/xhtml" class="mainAuthor">
-         <xsl:text> </xsl:text>
-         <xsl:call-template name="i18n">
-            <xsl:with-param name="word">authorWord</xsl:with-param>
-         </xsl:call-template>
-          <xsl:text>: </xsl:text>
-         <xsl:copy-of select="$realauthor"/>
-        </p>
-      </xsl:if>
-      <xsl:if test="not($revauthor = '')">
-      <p class="mainRevAuthor" xmlns="http://www.w3.org/1999/xhtml">
-         <xsl:text> (</xsl:text>
-         <xsl:call-template name="i18n">
-            <xsl:with-param name="word">revisedWord</xsl:with-param>
-         </xsl:call-template>
-         <xsl:text> </xsl:text>
-         <xsl:copy-of select="$revauthor"/>
-         <xsl:text>)</xsl:text>
-      </p>
-    </xsl:if>
-    <xsl:if test="not($editor = '')">
-      <p class="mainEditor" xmlns="http://www.w3.org/1999/xhtml">
-         <xsl:call-template name="i18n">
-            <xsl:with-param name="word">editorWord</xsl:with-param>
-         </xsl:call-template>
-        <xsl:text>: </xsl:text>
-        <xsl:copy-of select="$editor"/>
-      </p>
-      </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Work out the last revision date of the document </desc>
-   </doc>
-  <xsl:template name="generateRevDate">
-      <xsl:variable name="when">
-         <xsl:choose>
-            <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/@vcdate">
-               <xsl:apply-templates select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/@vcdate"/>
-            </xsl:when>
-            <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/descendant::tei:date">
-               <xsl:value-of select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/descendant::tei:date[1]"/>
-            </xsl:when>
-            <xsl:when
-		test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/descendant::tei:date">
-	      <xsl:value-of select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/descendant::tei:date"/>
-	    </xsl:when>	    
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="starts-with($when,'$Date')">
-        <!-- it's RCS -->
-        <xsl:value-of select="substring($when,16,2)"/>
-            <xsl:text>/</xsl:text>
-            <xsl:value-of select="substring($when,13,2)"/>
-            <xsl:text>/</xsl:text>
-            <xsl:value-of select="substring($when,8,4)"/>
-         </xsl:when>
-         <xsl:when test="starts-with($when,'$LastChangedDate')">
-        <!-- it's Subversion-->
-        <xsl:value-of select="substring-before(substring-after($when,'('),')')"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:value-of select="$when"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Work out the publish date of the document </desc>
-   </doc>
-  <xsl:template name="generateDate">
-      <xsl:choose>
-	 <xsl:when test="$useFixedDate='true'">1970-01-01</xsl:when>
-         <xsl:when test="$useHeaderFrontMatter='true' and ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docDate">
-            <xsl:apply-templates mode="date" select="ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docDate"/>
-         </xsl:when>
-         <xsl:when
-	     test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:editionStmt/descendant::tei:date[@when]">
-            <xsl:value-of select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:editionStmt/descendant::tei:date[@when][1]/@when"/>
-         </xsl:when>
-         <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:editionStmt/descendant::tei:date">
-            <xsl:value-of select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:editionStmt/descendant::tei:date[1]"/>
-         </xsl:when>
-         <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:publicationStmt/tei:date">
-            <xsl:value-of select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:publicationStmt/tei:date"/>
-         </xsl:when>
-         <xsl:when test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:editionStmt/tei:edition">
-            <xsl:apply-templates select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:editionStmt/tei:edition"/>
-         </xsl:when>
-	 <xsl:when
-	     test="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change[@when
-		   or tei:date]">
-            <xsl:for-each
-		select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change[1]">
-	      <xsl:choose>
-		<xsl:when test="@when">
-		  <xsl:value-of select="@when"/>
-		</xsl:when>
-		<xsl:when test="tei:date/@when">
-		  <xsl:value-of select="tei:date/@when"/>
-		</xsl:when>
-		<xsl:when test="tei:date">
-		  <xsl:value-of select="tei:date"/>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:value-of select="format-dateTime(current-dateTime(),'[Y]-[M02]-[D02]')"/>
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:for-each>
-	 </xsl:when>
-	 <xsl:otherwise>
-	   <xsl:value-of select="format-dateTime(current-dateTime(),'[Y]-[M02]-[D02]')"/>
-	 </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Generate a title</desc>
-   </doc>
-  <xsl:template name="generateTitle">
-      <xsl:choose>
-         <xsl:when test="$useHeaderFrontMatter='true' and ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docTitle">
-            <xsl:apply-templates select="ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docTitle/tei:titlePart"/>
-         </xsl:when>
-
-         <xsl:when test="$useHeaderFrontMatter='true' and ancestor-or-self::tei:teiCorpus/tei:text/tei:front//tei:docTitle">
-            <xsl:apply-templates select="ancestor-or-self::tei:teiCorpus/tei:text/tei:front//tei:docTitle/tei:titlePart"/>
-         </xsl:when>
-
-         <xsl:when test="self::tei:teiCorpus">	
-            <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title[not(@type='subordinate')]"/>
-         </xsl:when>
-
-         <xsl:otherwise>
-            <xsl:for-each
-		select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt">
-	      <xsl:choose>
-		<xsl:when test="tei:title[@type='main']">
-		  <xsl:apply-templates select="tei:title[@type='main']"/>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:apply-templates select="tei:title"/>
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:for-each>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[common] </p>
-         <p>Generate simple title with no markup</p>
-      </desc>
-   </doc>
-  <xsl:template name="generateSimpleTitle">
-      <xsl:choose>
-         <xsl:when test="$useHeaderFrontMatter='true' and ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docTitle">
-            <xsl:apply-templates select="ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docTitle"
-                                 mode="simple"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:for-each
-		select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:fileDesc/tei:titleStmt">
-	      <xsl:choose>
-		<xsl:when test="tei:title[@type='main']">
-		  <xsl:apply-templates
-		      select="tei:title[@type='main']" mode="simple"/>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:apply-templates select="tei:title[1]" mode="simple"/>
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:for-each>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Generate sub title </desc>
-   </doc>
-  <xsl:template name="generateSubTitle">
-      <xsl:choose>
-         <xsl:when test="$useHeaderFrontMatter='true' and ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docTitle">
-            <xsl:apply-templates select="ancestor-or-self::tei:TEI/tei:text/tei:front//tei:docTitle"/>
-         </xsl:when>
-         <xsl:when test="$useHeaderFrontMatter='true' and ancestor-or-self::tei:teiCorpus/tei:text/tei:front//tei:docTitle">
-            <xsl:apply-templates select="ancestor-or-self::tei:teiCorpus/tei:text/tei:front//tei:docTitle"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:for-each select="ancestor-or-self::tei:TEI|ancestor-or-self::tei:teiCorpus">
-               <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title[@type='subordinate']"/>
-            </xsl:for-each>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc/>
-   </doc>
-  <xsl:template match="tei:div/tei:docAuthor"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc> Omit docAuthor found outside front matter</desc>
-   </doc>
-  <xsl:template match="tei:div/tei:docDate"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc> Omit docDate if found outside front matter</desc>
-   </doc>
-  <xsl:template match="tei:div/tei:docTitle"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Ignore docTitle in a div</desc>
-   </doc>
-  <xsl:template match="tei:docAuthor" mode="heading">
-      <xsl:if test="preceding-sibling::tei:docAuthor">
-         <xsl:choose>
-            <xsl:when test="not(following-sibling::tei:docAuthor)">
-               <xsl:text> and </xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:text>, </xsl:text>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:if>
-      <xsl:apply-templates/>
-  </xsl:template>
-
-   <xsl:template match="tei:idno[@type='url']">
-      <xsl:text> &lt;</xsl:text>
-      <xsl:call-template name="makeExternalLink">
-         <xsl:with-param name="ptr" select="true()"/>
-         <xsl:with-param name="dest">
-            <xsl:value-of select="normalize-space(.)"/>
-         </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>&gt;.</xsl:text>
-   </xsl:template>
-
-
-   <xsl:template match="tei:idno">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates/>
-   </xsl:template>
-
-   <xsl:template match="tei:idno[@type='doi']"/>
-
-  <xsl:template name="generateEdition">
-    <p xmlns="http://www.w3.org/1999/xhtml" class="editionStmt">
-      <xsl:apply-templates select="/(tei:teiCorpus|tei:TEI)/tei:teiHeader/tei:fileDesc/tei:editionStmt"/>
-    </p>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/common2/i18n.xsl b/add/data/xslt/tei/common2/i18n.xsl
deleted file mode 100644
index 1586363b3..000000000
--- a/add/data/xslt/tei/common2/i18n.xsl
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet 
-    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-    xmlns:fo="http://www.w3.org/1999/XSL/Format" 
-    xmlns:html="http://www.w3.org/1999/xhtml" 
-    xmlns:i="http://www.iso.org/ns/1.0"
-    xmlns:rng="http://relaxng.org/ns/structure/1.0"
-    xmlns:s="http://www.ascc.net/xml/schematron" 
-    xmlns:sch="http://purl.oclc.org/dsdl/schematron" 
-    xmlns:tei="http://www.tei-c.org/ns/1.0"
-    xmlns:teix="http://www.tei-c.org/ns/Examples" 
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="a fo html i rng s sch tei teix xi xs xsl" 
-    version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet definitions common for all of HTML, FO and LaTeX
-      outputs </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: i18n.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <xsl:key match="entry" name="KEYS" use="key"/>
-  <xsl:param name="documentationLanguage">en</xsl:param>
-
-  <!--<xsl:variable name="i18n"
-		select="document('../i18n.xml',document(''))"/>-->
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] give language-specific version of a word or phrase<param name="word">the word(s) to translate</param>
-      </desc>
-   </doc>
-  <xsl:template name="i18n">
-      <xsl:param name="word"/>
-      <xsl:variable name="Word">
-         <xsl:value-of select="normalize-space($word)"/>
-      </xsl:variable>
-      <xsl:variable name="local">
-         <xsl:call-template name="myi18n">
-	           <xsl:with-param name="word">
-	              <xsl:value-of select="$word"/>
-	           </xsl:with-param>
-         </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="string-length($local)&gt;0">
-            <xsl:value-of select="$local"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:for-each select="$i18n">
-	      <xsl:choose>
-		<xsl:when test="key('KEYS',$Word)/text[@xml:lang=$documentationLanguage]">
-		  <xsl:value-of select="key('KEYS',$Word)/text[@xml:lang=$documentationLanguage]"/>
-		</xsl:when>
-		<xsl:when test="key('KEYS',$Word)/text[@lang3=$documentationLanguage]">
-		  <xsl:value-of select="key('KEYS',$Word)/text[lang3=$documentationLanguage]"/>
-		</xsl:when>
-		<xsl:otherwise>
-		  <!--
-		      <xsl:if test="$verbose='true'">
-		      <xsl:message>NO TRANSLATION for <xsl:value-of 
-		      select="$word"/> in <xsl:value-of select="$documentationLanguage"/></xsl:message>
-		      </xsl:if>
-		  -->
-		  <xsl:value-of select="key('KEYS',$Word)/text[@xml:lang='en']"/>
-		</xsl:otherwise>
-	      </xsl:choose>
-            </xsl:for-each>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[localisation] dummy template for overriding in a local system<param name="word">the word(s) to translate</param>
-      </desc>
-   </doc>
-  <xsl:template name="myi18n">
-	     <xsl:param name="word"/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="localisation" type="string">
-      <desc> The language to use when
-    generating text (use ISO 2-letter codes)</desc>
-   </doc>
-  <xsl:param name="lang">en</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="localisation">
-      <desc>[common] Prefix text before an auto-generated table of contents </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="localisation" type="string">
-      <desc> The language the text is in
-    (use ISO 2-letter codes)</desc>
-   </doc>
-  <xsl:param name="doclang">en</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="localisation">
-      <desc>[common] Prefix text before an auto-generated table of contents </desc>
-   </doc>
-  <xsl:template name="contentsHeading">
-      <xsl:call-template name="i18n">
-         <xsl:with-param name="word">contentsHeading</xsl:with-param>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="localisation">
-      <desc>[common] Title for "Contents"; by default uses language-specific
-      lookup table.</desc>
-   </doc>
-  <xsl:template name="contentsWord">
-      <xsl:call-template name="i18n">
-         <xsl:with-param name="word">contentsWord</xsl:with-param>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="localisation">
-      <desc>[common] Title for "Feedback"</desc>
-   </doc>
-  <xsl:template name="feedbackWords">
-      <xsl:call-template name="i18n">
-         <xsl:with-param name="word">feedbackWords</xsl:with-param>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="localisation">
-      <desc>[common] Title for "Search"; by default uses language-specific
-      lookup table. </desc>
-   </doc>
-  <xsl:template name="searchWords">
-      <xsl:call-template name="i18n">
-         <xsl:with-param name="word">searchWords</xsl:with-param>
-      </xsl:call-template>
-  </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/common2/linking.xsl b/add/data/xslt/tei/common2/linking.xsl
deleted file mode 100644
index 301e5b7f6..000000000
--- a/add/data/xslt/tei/common2/linking.xsl
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
-		xmlns:xs="http://www.w3.org/2001/XMLSchema"                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="tei xs"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the linking module. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: linking.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element  in xref mode</desc>
-   </doc>
-  <xsl:template match="tei:TEI" mode="xref">
-      <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title[1]"/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements text in xref mode</desc>
-   </doc>
-  <xsl:template match="tei:text" mode="xref">
-   <xsl:choose>
-     <xsl:when test="tei:head">
-       <xsl:apply-templates select="tei:head" mode="plain"/>
-     </xsl:when>
-     <xsl:when test="tei:body/tei:head">
-       <xsl:apply-templates select="tei:body/tei:head" mode="plain"/>
-     </xsl:when>
-     <xsl:when test="tei:front//tei:titlePart/tei:title">
-       <xsl:apply-templates select="tei:front//tei:titlePart/tei:titl" mode="plain"/>
-     </xsl:when>
-     <xsl:otherwise>
-       <xsl:text>Text </xsl:text>
-       <xsl:number/>
-     </xsl:otherwise>
-   </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element anchor|tei:p in xref mode</desc>
-   </doc>
-  <xsl:template match="tei:anchor|tei:p" mode="xref">
-      <xsl:text>here</xsl:text>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element bibl</desc>
-   </doc>
-  <xsl:template match="tei:bibl" mode="xref">
-      <xsl:text>[</xsl:text>
-      <xsl:number/>
-      <xsl:text>]</xsl:text>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element s
-      tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6 in
-      xref mode<param name="minimal">whether to make a link with just numbers or with
-      text too</param>
-      </desc>
-   </doc>
-  <xsl:template match="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6"
-                 mode="xref">
-      <xsl:param name="minimal">false</xsl:param>
-      <xsl:call-template name="header">
-         <xsl:with-param name="minimal" select="$minimal"/>
-         <xsl:with-param name="display">plain</xsl:with-param>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element ptr in xref mode</desc>
-   </doc>
-  <xsl:template match="tei:ptr">
-      <xsl:call-template name="makeTEILink">
-         <xsl:with-param name="ptr" select="true()"/>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element ref</desc>
-   </doc>
-  <xsl:template match="tei:ref">
-      <xsl:call-template name="makeTEILink">
-         <xsl:with-param name="ptr" select="false()"/>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] Making a heading for something
-         <param name="minimal">whether to display headings</param>
-         <param name="toc">whether this is making a TOC entry</param>
-         <param name="display">detail of display (full, simple, plain), ie
-    whether markup is followed</param>
-      </desc>
-   </doc>
-  <xsl:template name="header">
-      <xsl:param name="minimal">false</xsl:param>
-      <xsl:param name="toc"/>
-      <xsl:param name="display">full</xsl:param>
-      <xsl:variable name="depth">
-         <xsl:apply-templates mode="depth" select="."/>
-      </xsl:variable>
-      <xsl:call-template name="formatHeadingNumber">
-         <xsl:with-param name="toc">
-	   <xsl:value-of select="$toc"/>
-         </xsl:with-param>
-         <xsl:with-param name="text">
-            <xsl:choose>
-               <xsl:when test="local-name(.) = 'TEI'"/>
-               <xsl:when test="$depth &gt; $numberHeadingsDepth"> </xsl:when>
-               <xsl:when test="self::tei:text">
-		 <xsl:number/>
-		 <xsl:call-template name="headingNumberSuffix"/>
-	       </xsl:when>
-               <xsl:when test="ancestor::tei:back">
-                  <xsl:if test="$numberBackHeadings='true'">
-                     <xsl:call-template name="i18n">
-                        <xsl:with-param name="word">appendixWords</xsl:with-param>
-                     </xsl:call-template>
-                     <xsl:text> </xsl:text>
-                     <xsl:call-template name="numberBackDiv"/>
-                     <xsl:if test="$minimal='false'">
-                        <xsl:value-of select="$numberSpacer"/>
-                     </xsl:if>
-                  </xsl:if>
-               </xsl:when>
-               <xsl:when test="ancestor::tei:front">
-                  <xsl:if test="$numberFrontHeadings='true'">
-                     <xsl:call-template name="numberFrontDiv">
-		       <xsl:with-param name="minimal">
-			 <xsl:value-of select="$minimal"/>
-		       </xsl:with-param>
-		     </xsl:call-template>
-                  </xsl:if>
-               </xsl:when>
-               <xsl:when test="$numberHeadings ='true'">
-                  <xsl:choose>
-                     <xsl:when test="$prenumberedHeadings='true'">
-                        <xsl:value-of select="@n"/>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <xsl:call-template name="numberBodyDiv"/>
-                     </xsl:otherwise>
-                  </xsl:choose>
-                  <xsl:if test="$minimal='false'">
-                     <xsl:call-template name="headingNumberSuffix"/>
-                  </xsl:if>
-               </xsl:when>
-            </xsl:choose>
-         </xsl:with-param>
-      </xsl:call-template>
-      <xsl:if test="$minimal='false'">
-         <xsl:choose>
-            <xsl:when test="local-name(.) = 'TEI'">
-               <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title[1]"/>
-            </xsl:when>
-            <xsl:when test="not($toc='')">
-	      <xsl:call-template name="makeInternalLink">
-		<xsl:with-param name="dest">
-		  <xsl:value-of select="$toc"/>
-		</xsl:with-param>
-		<xsl:with-param name="class">
-		  <xsl:value-of select="$class_toc"/>
-		  <xsl:text> </xsl:text>
-		  <xsl:value-of select="concat($class_toc,'_',$depth)"/>
-		</xsl:with-param>
-		<xsl:with-param name="body">
-		  <xsl:choose>
-		    <xsl:when test="not(tei:head) and tei:body/tei:head">
-			<xsl:apply-templates mode="plain" select="tei:body/tei:head"/>
-		    </xsl:when>	
-		    <xsl:when test="not(tei:head) and tei:front//tei:titlePart/tei:title">
-			<xsl:apply-templates mode="plain" select="tei:front//tei:titlePart/tei:title"/>
-		    </xsl:when>	
-		    <xsl:when test="tei:head">
-			<xsl:apply-templates mode="plain" select="tei:head"/>
-		    </xsl:when>
-		    <xsl:when test="$autoHead='true'">
-		      <xsl:call-template name="autoMakeHead">
-			<xsl:with-param name="display" select="$display"/>
-		      </xsl:call-template>
-		    </xsl:when>
-		    <xsl:otherwise>
-		      <xsl:number/>
-		    </xsl:otherwise>
-		  </xsl:choose>
-		</xsl:with-param>
-	      </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$autoHead='true'">
-	      <xsl:choose>
-		<xsl:when test="$outputTarget='epub' and
-				not(tei:head)"/>
-		<xsl:otherwise>
-		  <xsl:call-template name="autoMakeHead">
-		    <xsl:with-param name="display" select="$display"/>
-		  </xsl:call-template>
-		</xsl:otherwise>
-	      </xsl:choose>
-            </xsl:when>
-            <xsl:when test="$display='plain'">
-               <xsl:for-each select="tei:head">
-		 <xsl:apply-templates mode="plain"/>
-	       </xsl:for-each>
-            </xsl:when>
-            <xsl:when test="$display='simple'">
-               <xsl:for-each select="tei:head">
-		 <xsl:apply-templates mode="plain"/>
-	       </xsl:for-each>
-            </xsl:when>
-	    <xsl:when test="self::tei:index">
-	      <xsl:value-of select="substring(tei:term,1,10)"/>
-	      <xsl:text>…</xsl:text>
-	    </xsl:when>
-	    <xsl:when test="not(tei:head)">
-	      <xsl:value-of select="substring(normalize-space(.),1,10)"/>
-	      <xsl:text>…</xsl:text>
-	    </xsl:when>
-            <xsl:otherwise>
-               <xsl:apply-templates select="tei:head" mode="makeheading"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:if>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[common] processing the number portion of a heading</p>
-         <p>By default, the text is printed as is. You may
-    wish to colour it, align it, etc</p>
-         <param name="text"/>
-      </desc>
-   </doc>
-  <xsl:template name="formatHeadingNumber">
-      <xsl:param name="text"/>
-      <xsl:param name="toc"/>
-      <xsl:copy-of select="$text"/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[common] Making a heading for something, and making sure it has
-      contents</p>
-         <p>This is a wrapper around the "header" template which ensures that
-      some text is returned; if all else fails, the element name is
-    used.</p>
-         <param name="minimal">false</param>
-      </desc>
-   </doc>
-  <xsl:template name="headerLink">
-      <xsl:param name="minimal">false</xsl:param>
-      <xsl:variable name="Text">
-         <xsl:call-template name="header">
-            <xsl:with-param name="minimal" select="$minimalCrossRef"/>
-	           <xsl:with-param name="display">plain</xsl:with-param>
-         </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="$Text=''">
-            <xsl:text>&lt;</xsl:text>
-            <xsl:value-of select="local-name(.)"/>
-            <xsl:text>&gt;</xsl:text>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:copy-of select="$Text"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[common] Make a hypertext link</p>
-         <p>cross-referencing </p>
-         <param name="ptr">ptr</param>
-      </desc>
-   </doc>
-  <xsl:template name="makeTEILink">
-      <xsl:param name="ptr" as="xs:boolean" select="false()"/>
-      <!-- is this a ptr or a ref? -->
-
-    <xsl:choose>
-      <!-- If there is a target attribute starting with #, it is always a local reference -->
-      <xsl:when test="@target and starts-with(@target,'#')">
-            <xsl:call-template name="makeInternalLink">
-               <xsl:with-param name="target" select="substring(@target,2)"/>
-               <xsl:with-param name="ptr" select="$ptr"/>
-               <xsl:with-param name="dest">
-                  <xsl:call-template name="generateEndLink">
-                     <xsl:with-param name="where">
-                        <xsl:value-of select="substring(@target,2)"/>
-                     </xsl:with-param>
-                  </xsl:call-template>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <!-- if we are doing TEI P4, all targets are local -->
-      <xsl:when test="@target and $teiP4Compat='true'">
-            <xsl:call-template name="makeInternalLink">
-               <xsl:with-param name="target" select="@target"/>
-               <xsl:with-param name="ptr" select="$ptr"/>
-               <xsl:with-param name="dest">
-                  <xsl:call-template name="generateEndLink">
-                     <xsl:with-param name="where">
-                        <xsl:value-of select="@target"/>
-                     </xsl:with-param>
-                  </xsl:call-template>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <!-- other uses of target means it is external -->
-      <xsl:when test="@target">
-            <xsl:call-template name="makeExternalLink">
-               <xsl:with-param name="ptr" select="$ptr"/>
-               <xsl:with-param name="dest">
-                  <xsl:value-of select="@target"/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <!-- If there is a url attribute starting with #, it is a local
-       reference -->
-      <xsl:when test="@url and starts-with(@url,'#')">
-            <xsl:call-template name="makeInternalLink">
-               <xsl:with-param name="target" select="substring(@url,2)"/>
-               <xsl:with-param name="ptr" select="$ptr"/>
-               <xsl:with-param name="dest">
-                  <xsl:call-template name="generateEndLink">
-                     <xsl:with-param name="where">
-                        <xsl:value-of select="substring(@url,2)"/>
-                     </xsl:with-param>
-                  </xsl:call-template>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <!-- otherwise it is an external URL -->
-      <xsl:when test="@url">
-            <xsl:call-template name="makeExternalLink">
-               <xsl:with-param name="ptr" select="$ptr"/>
-               <xsl:with-param name="dest">
-                  <xsl:value-of select="@url"/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <!-- A doc attribute means an external reference -->
-      <xsl:when test="@doc">
-            <xsl:call-template name="makeExternalLink">
-               <xsl:with-param name="ptr" select="$ptr"/>
-               <xsl:with-param name="dest">
-                  <xsl:value-of select="unparsed-entity-uri(@doc)"/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:otherwise>
-        <!--
-      <xsl:for-each select="@*">
-	[[markup error: <xsl:value-of select="name(.)"/>=<xsl:value-of select="."/>]]
-      </xsl:for-each>
--->
-        <xsl:apply-templates/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/common2/msdescription.xsl b/add/data/xslt/tei/common2/msdescription.xsl
deleted file mode 100644
index 8c26ee490..000000000
--- a/add/data/xslt/tei/common2/msdescription.xsl
+++ /dev/null
@@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="tei" version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI stylesheet dealing with elements from the msdescription module. </p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: msdescription.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-      <p>Copyright: 2011, TEI Consortium</p>
-    </desc>
-  </doc>
-
-
-  <xsl:template name="msSection">
-    <xsl:param name="heading"/>
-    <xsl:param name="level"/>
-    <xsl:param name="implicitBlock"/>
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template name="msBlock">
-    <xsl:param name="style"/>
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template name="msInline">
-    <xsl:param name="before"/>
-    <xsl:param name="after"/>
-    <xsl:param name="style"/>
-    <xsl:value-of select="$before"/>
-    <xsl:apply-templates/>
-    <xsl:value-of select="$after"/>
-  </xsl:template>
-  <xsl:template name="msLabelled">
-    <xsl:param name="before"/>
-    <xsl:value-of select="$before"/>
-    <xsl:text>: </xsl:text>
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template name="msLiteral">
-    <xsl:param name="text"/>
-    <xsl:value-of select="$text"/>
-  </xsl:template>
-  <!-- headings -->
-  <xsl:template match="tei:accMat">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Accompanying material</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:additional">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Additional</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:bindingDesc">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Binding</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:msContents">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">1</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Contents</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:msDesc/tei:head">
-    <xsl:call-template name="msBlock">
-      <xsl:with-param name="style">msHead</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:history">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">1</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>History</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:provenance">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Provenance</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:acquisition">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Acquisition</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:origin">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Origin</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:msIdentifier">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">1</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Identification</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:layoutDesc">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">3</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Layout</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:decoDesc">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">3</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Decoration</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:msWriting">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Writing</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:musicNotation">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Music notation</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:objectDesc">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Object</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:physDesc">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">1</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Physical description</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:seal">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">4</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Seal</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:sealDesc">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">3</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Seal description</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:supportDesc">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">3</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Support description</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:support">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">4</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Support</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:collation">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">4</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Collation</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:extent">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">4</xsl:with-param>
-      <xsl:with-param name="implicitBlock">true</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Extent</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:incipit">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Incipit</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:explicit">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Explicit</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:msItem/tei:listBibl">
-    <xsl:call-template name="msSection">
-      <xsl:with-param name="level">2</xsl:with-param>
-      <xsl:with-param name="heading">
-        <xsl:text>Text editions</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <!-- inline -->
-  <xsl:template match="tei:abbr">
-    <xsl:choose>
-      <xsl:when test="parent::tei:choice">
-	</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="msInline"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:orig">
-    <xsl:choose>
-      <xsl:when test="parent::tei:choice">
-	</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="msInline"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:textLang">
-    <xsl:choose>
-      <xsl:when test="preceding-sibling::tei:summary"/>
-      <xsl:when test="preceding-sibling::tei:*">
-        <xsl:call-template name="msLiteral">
-          <xsl:with-param name="text">
-            <xsl:text>, </xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-    <xsl:call-template name="msLabelled">
-      <xsl:with-param name="before">Language of text</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:summary">
-    <xsl:choose>
-      <xsl:when test="preceding-sibling::tei:*">
-        <xsl:call-template name="msLiteral">
-          <xsl:with-param name="text">
-            <xsl:text>, </xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-    <xsl:call-template name="msLabelled">
-      <xsl:with-param name="before">Summary</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:rubric">
-    <xsl:if test="preceding-sibling::tei:*">
-      <xsl:call-template name="msLiteral">
-        <xsl:with-param name="text">
-          <xsl:text> </xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:call-template name="msInline"/>
-  </xsl:template>
-  <xsl:template match="tei:msItem/tei:author">
-    <xsl:if test="preceding-sibling::tei:*">
-      <xsl:call-template name="msLiteral">
-        <xsl:with-param name="text">
-          <xsl:text> </xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:call-template name="msInline"/>
-  </xsl:template>
-  <xsl:template match="tei:msItem/tei:title">
-    <xsl:if test="preceding-sibling::tei:*">
-      <xsl:call-template name="msLiteral">
-        <xsl:with-param name="text">
-          <xsl:text> </xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="style">italic</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:expan/tei:ex">
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="before">(</xsl:with-param>
-      <xsl:with-param name="after">)</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:locus">
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="style">bold</xsl:with-param>
-      <xsl:with-param name="before"/>
-      <xsl:with-param name="after">: </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:supplied[@reason='damage']">
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="before">&lt;</xsl:with-param>
-      <xsl:with-param name="after">&gt;</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:supplied[@reason='illegible']">
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="before">[</xsl:with-param>
-      <xsl:with-param name="after">]</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:supplied[@reason='omitted']">
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="before">⟨</xsl:with-param>
-      <xsl:with-param name="after">⟩</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:gap" priority="10">
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="before">[...]</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:unclear" priority="10">
-    <xsl:call-template name="msInline">
-      <xsl:with-param name="after">[?]</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:placeName|tei:genName|tei:geogName|tei:roleName|tei:name|tei:persName">
-    <xsl:choose>
-      <xsl:when test="*">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="msInline"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:dimensions">
-    <xsl:for-each select="*">
-      <xsl:apply-templates select="."/>
-      <xsl:call-template name="msLiteral">
-        <xsl:with-param name="text">
-          <xsl:choose>
-            <xsl:when test="string-length(.)=0 and @extent">
-              <xsl:value-of select="@extent"/>
-            </xsl:when>
-            <xsl:when test="@unit">
-              <xsl:value-of select="@unit"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>mm</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:if test="following-sibling::*">
-            <xsl:text> x </xsl:text>
-          </xsl:if>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template match="tei:origDate">
-    <xsl:apply-imports/>
-    <xsl:if test="following-sibling::tei:origPlace">
-      <xsl:call-template name="msLiteral">
-        <xsl:with-param name="text">
-          <xsl:text>, </xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="tei:msIdentifier/tei:*">
-    <xsl:apply-imports/>
-    <xsl:if test="following-sibling::tei:*/text()">
-      <xsl:call-template name="msLiteral">
-        <xsl:with-param name="text">
-          <xsl:text>, </xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <!--
-    <handNote scribe="AM_544_4to_1"
-    script="carolingian-insular minuscule"
-    medium="ink" scope="sole"> 
--->
-  <xsl:template match="tei:handNote">
-    <xsl:if test="not(preceding-sibling::tei:handNote)">
-      <xsl:variable name="Notes">
-        <tei:list type="ordered">
-          <xsl:for-each select="../tei:handNote">
-            <item>
-              <xsl:copy-of select="*|text()"/>
-            </item>
-          </xsl:for-each>
-        </tei:list>
-      </xsl:variable>
-      <xsl:apply-templates select="$Notes"/>
-    </xsl:if>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/common2/odds.xsl b/add/data/xslt/tei/common2/odds.xsl
deleted file mode 100644
index 2cebb30a4..000000000
--- a/add/data/xslt/tei/common2/odds.xsl
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:cals="http://www.oasis-open.org/specs/tm9901" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:iso="http://www.iso.org/ns/1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ve="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:tbx="http://www.lisa.org/TBX-Specification.33.0.html" xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" version="2.0" exclude-result-prefixes="cals ve o r m v wp w10 w wne mml tbx iso tei a xs pic fn">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI Utility stylesheet defining templates for use in
-      processing ODD</p>
-
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: functions.xsl 9464 2011-10-06 08:27:01Z rahtz $</p>
-      <p>Copyright: 2008, TEI Consortium</p>
-    </desc>
-  </doc>
-  <xsl:template name="makeDescription">
-    <xsl:param name="includeValList">false</xsl:param>
-    <xsl:param name="coded">true</xsl:param>
-    <xsl:param name="showListRef">true</xsl:param>
-    <xsl:variable name="documentationLanguage">
-      <xsl:call-template name="generateDoc"/>
-    </xsl:variable>
-    <xsl:variable name="langs">
-      <xsl:value-of select="concat(normalize-space($documentationLanguage),' ')"/>
-    </xsl:variable>
-    <xsl:variable name="firstLang">
-      <xsl:value-of select="substring-before($langs,' ')"/>
-    </xsl:variable>
-    <!-- first the gloss -->
-    <xsl:call-template name="makeGloss">
-      <xsl:with-param name="langs" select="$langs"/>
-    </xsl:call-template>
-    <!-- now the description -->
-    <xsl:choose>
-      <xsl:when test="not(tei:desc)"> </xsl:when>
-      <xsl:when test="count(tei:desc)=1">
-        <xsl:for-each select="tei:desc">
-          <xsl:apply-templates select="." mode="inLanguage"/>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:when test="tei:desc[@xml:lang=$firstLang]">
-        <xsl:for-each select="tei:desc[@xml:lang=$firstLang]">
-          <xsl:apply-templates select="." mode="inLanguage"/>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="D">
-          <xsl:for-each select="tei:desc">
-            <xsl:variable name="currentLang">
-              <xsl:call-template name="findLanguage"/>
-            </xsl:variable>
-            <xsl:if test="contains($langs,concat($currentLang,' '))">
-              <xsl:apply-templates select="." mode="inLanguage"/>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="$D='' and tei:desc[not(@xml:lang)]">
-            <xsl:for-each select="tei:desc[not(@xml:lang)]">
-              <xsl:apply-templates select="." mode="inLanguage"/>
-            </xsl:for-each>
-          </xsl:when>
-          <xsl:when test="$coded='false'">
-            <xsl:value-of select="$D"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$D"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:choose>
-      <xsl:when test="$includeValList='false'"/>
-      <xsl:when test="tei:valList[@type='open']">
-        <xsl:text>&#10;</xsl:text>
-        <xsl:call-template name="i18n">
-          <xsl:with-param name="word">
-            <xsl:text>Sample values include</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>: </xsl:text>
-        <xsl:for-each select="tei:valList/tei:valItem">
-          <xsl:number/>
-          <xsl:text>] </xsl:text>
-          <xsl:choose>
-            <xsl:when test="tei:altIdent=@ident">
-              <xsl:value-of select="@ident"/>
-            </xsl:when>
-            <xsl:when test="tei:altIdent">
-              <xsl:value-of select="normalize-space(tei:altIdent)"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@ident"/>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:variable name="documentationLanguage">
-            <xsl:call-template name="generateDoc"/>
-          </xsl:variable>
-          <xsl:variable name="langs">
-            <xsl:value-of select="concat(normalize-space($documentationLanguage),' ')"/>
-          </xsl:variable>
-          <xsl:variable name="firstLang">
-            <xsl:value-of select="substring-before($langs,' ')"/>
-          </xsl:variable>
-          <xsl:call-template name="makeGloss">
-            <xsl:with-param name="langs" select="$langs"/>
-          </xsl:call-template>
-          <xsl:if test="following-sibling::tei:valItem">
-            <xsl:text>; </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:when test="tei:valList[@type='semi']">
-        <xsl:text>&#10;</xsl:text>
-        <xsl:call-template name="i18n">
-          <xsl:with-param name="word">
-            <xsl:text>Suggested values include</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>: </xsl:text>
-        <xsl:for-each select="tei:valList/tei:valItem">
-          <xsl:number/>
-          <xsl:text>] </xsl:text>
-          <xsl:choose>
-            <xsl:when test="tei:altIdent=@ident">
-              <xsl:value-of select="@ident"/>
-            </xsl:when>
-            <xsl:when test="tei:altIdent">
-              <xsl:value-of select="normalize-space(tei:altIdent)"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@ident"/>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:variable name="documentationLanguage">
-            <xsl:call-template name="generateDoc"/>
-          </xsl:variable>
-          <xsl:variable name="langs">
-            <xsl:value-of select="concat(normalize-space($documentationLanguage),' ')"/>
-          </xsl:variable>
-          <xsl:variable name="firstLang">
-            <xsl:value-of select="substring-before($langs,' ')"/>
-          </xsl:variable>
-          <xsl:call-template name="makeGloss">
-            <xsl:with-param name="langs" select="$langs"/>
-          </xsl:call-template>
-          <xsl:if test="following-sibling::tei:valItem">
-            <xsl:text>; </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:when>
-    </xsl:choose>
-    <xsl:if test="tei:listRef and $showListRef='true'">
-	<xsl:text> [</xsl:text>
-	<xsl:for-each select="tei:listRef/tei:*">
-	  <xsl:apply-templates select="." mode="weave"/>
-	  <xsl:if test="following-sibling::tei:*"> 
-	    <xsl:text> </xsl:text>
-	  </xsl:if>
-	</xsl:for-each>
-	<xsl:text>]</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template name="makeGloss">
-    <xsl:param name="langs"/>
-    <xsl:variable name="firstLang">
-      <xsl:value-of select="substring-before($langs,' ')"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="not(tei:gloss)"/>
-      <xsl:when test="string-length(tei:gloss[1])=0"/>
-      <xsl:when test="count(tei:gloss)=1 and not(tei:gloss[@xml:lang])">
-        <xsl:text> (</xsl:text>
-        <xsl:apply-templates select="tei:gloss" mode="inLanguage"/>
-        <xsl:text>) </xsl:text>
-      </xsl:when>
-      <xsl:when test="tei:gloss[@xml:lang=$firstLang]">
-        <xsl:if test="not(tei:gloss[@xml:lang=$firstLang]='')">
-          <xsl:text> (</xsl:text>
-          <xsl:apply-templates select="tei:gloss[@xml:lang=$firstLang]" mode="inLanguage"/>
-          <xsl:text>) </xsl:text>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="G">
-          <xsl:for-each select="tei:gloss">
-            <xsl:variable name="currentLang">
-              <xsl:call-template name="findLanguage"/>
-            </xsl:variable>
-            <xsl:if test="contains($langs,concat($currentLang,' '))">
-              <xsl:text>(</xsl:text>
-              <xsl:apply-templates select="." mode="inLanguage"/>
-              <xsl:text>) </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="$G='' and tei:gloss[not(@xml:lang)]">
-            <xsl:text> (</xsl:text>
-            <xsl:apply-templates select="tei:gloss[not(@xml:lang)]" mode="inLanguage"/>
-            <xsl:text>) </xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$G"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="findLanguage">
-    <xsl:choose>
-      <xsl:when test="@xml:lang">
-        <xsl:value-of select="@xml:lang"/>
-      </xsl:when>
-      <xsl:when test="ancestor::tei:*[@xml:lang]">
-        <xsl:value-of select="(ancestor::tei:*[@xml:lang])[1]/@xml:lang"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>en</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/common2/tagdocs.xsl b/add/data/xslt/tei/common2/tagdocs.xsl
deleted file mode 100644
index 8b7585a2f..000000000
--- a/add/data/xslt/tei/common2/tagdocs.xsl
+++ /dev/null
@@ -1,2704 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:s="http://www.ascc.net/xml/schematron" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="fo s a tei html rng teix xs sch" version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI stylesheet for weaving TEI ODD documents</p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: tagdocs.xsl 9969 2011-12-17 14:41:18Z rahtz $</p>
-      <p>Copyright: 2011, TEI Consortium</p>
-    </desc>
-  </doc>
-  <xsl:key name="CHILDMOD" match="Element" use="@module"/>
-
-
-  <xsl:template match="tei:ptr|tei:ref" mode="weave">
-    <xsl:choose>
-      <xsl:when test="ancestor::tei:remarks or ancestor::tei:listRef or ancestor::tei:valDesc">
-        <xsl:choose>
-          <xsl:when test="starts-with(@target,'#') and id(substring(@target,2))">
-            <xsl:call-template name="makeInternalLink">
-              <xsl:with-param name="target" select="substring(@target,2)"/>
-              <xsl:with-param name="ptr" select="if (self::tei:ptr)
-						 then true() else false()"/>
-              <xsl:with-param name="dest">
-                <xsl:call-template name="generateEndLink">
-                  <xsl:with-param name="where">
-                    <xsl:value-of select="substring(@target,2)"/>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="starts-with(@target,'#')">
-            <xsl:variable name="Chapter">
-              <xsl:value-of select="substring(@target,2,2)"/>
-            </xsl:variable>
-            <xsl:choose>
-              <xsl:when test="$Chapter='AB' or        $Chapter='AI' or        $Chapter='CC' or        $Chapter='CE' or        $Chapter='CH' or        $Chapter='CO' or        $Chapter='DI' or        $Chapter='DR' or        $Chapter='DS' or        $Chapter='FS' or        $Chapter='FT' or        $Chapter='GD' or        $Chapter='HD' or        $Chapter='MS' or        $Chapter='ND' or        $Chapter='NH' or        $Chapter='PH' or        $Chapter='SA' or        $Chapter='SG' or        $Chapter='ST' or        $Chapter='TC' or        $Chapter='TD' or        $Chapter='TS' or        $Chapter='USE' or        $Chapter='VE' or        $Chapter='WD'">
-                <xsl:call-template name="makeExternalLink">
-		  <xsl:with-param name="ptr" select="if (self::tei:ptr)
-						 then true() else false()"/>
-                  <xsl:with-param name="dest">
-                    <xsl:text>http://www.tei-c.org/release/doc/tei-p5-doc/</xsl:text>
-                    <xsl:value-of select="$documentationLanguage"/>
-                    <xsl:text>/html/</xsl:text>
-                    <xsl:value-of select="$Chapter"/>
-                    <xsl:text>.html</xsl:text>
-                    <xsl:value-of select="@target"/>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>«</xsl:text>
-                <xsl:value-of select="@target"/>
-                <xsl:text>»</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-imports/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template match="tei:attDef" mode="summary">
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="tei:altIdent">
-          <xsl:value-of select="tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_label</xsl:text>
-          <xsl:if test="@status">
-            <xsl:text> status_</xsl:text>
-            <xsl:value-of select="@status"/>
-          </xsl:if>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$codeName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>att</xsl:text>
-          </xsl:attribute>
-          <xsl:value-of select="$name"/>
-        </xsl:element>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_value</xsl:text>
-        </xsl:attribute>
-        <xsl:call-template name="makeDescription"/>
-        <xsl:apply-templates select="valList"/>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element attDef</desc>
-  </doc>
-  <xsl:template match="tei:attDef">
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="tei:altIdent">
-          <xsl:value-of select="tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_label</xsl:text>
-          <xsl:if test="@status">
-            <xsl:text> status_</xsl:text>
-            <xsl:value-of select="@status"/>
-          </xsl:if>
-        </xsl:attribute>
-        <xsl:value-of select="$name"/>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_value</xsl:text>
-        </xsl:attribute>
-        <xsl:call-template name="makeDescription"/>
-        <xsl:element namespace="{$outputNS}" name="{$tableName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>attDef</xsl:text>
-          </xsl:attribute>
-          <xsl:element namespace="{$outputNS}" name="{$rowName}">
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>odd_label</xsl:text>
-              </xsl:attribute>
-              <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                <xsl:attribute name="{$rendName}">
-                  <xsl:text>label</xsl:text>
-                </xsl:attribute>
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Status</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-              <xsl:text> </xsl:text>
-            </xsl:element>
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>odd_value</xsl:text>
-              </xsl:attribute>
-              <xsl:element namespace="{$outputNS}" name="{$segName}">
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:choose>
-                  <xsl:when test="@usage='mwa'">
-                    <xsl:call-template name="i18n">
-                      <xsl:with-param name="word">Mandatory when applicable</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:when test="@usage='opt'">
-                    <xsl:call-template name="i18n">
-                      <xsl:with-param name="word">Optional</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:when test="@usage='rec'">
-                    <xsl:call-template name="i18n">
-                      <xsl:with-param name="word">Recommended</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:when test="@usage='req'">
-                    <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                      <xsl:attribute name="{$rendName}">
-                        <xsl:text>required</xsl:text>
-                      </xsl:attribute>
-                      <xsl:call-template name="i18n">
-                        <xsl:with-param name="word">Required</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:element>
-                  </xsl:when>
-                  <xsl:when test="@usage='rwa'">
-                    <xsl:call-template name="i18n">
-                      <xsl:with-param name="word">Recommended when applicable</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:call-template name="i18n">
-                      <xsl:with-param name="word">Optional</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:element>
-            </xsl:element>
-          </xsl:element>
-          <xsl:apply-templates mode="weave"/>
-        </xsl:element>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element attDef/tei:datatype</desc>
-  </doc>
-  <xsl:template match="tei:attDef/tei:datatype" mode="weave">
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_label</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$hiName}">
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>label</xsl:text>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Datatype</xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-        <xsl:text> </xsl:text>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_value</xsl:text>
-        </xsl:attribute>
-        <xsl:variable name="minOccurs">
-          <xsl:choose>
-            <xsl:when test="@minOccurs">
-              <xsl:value-of select="@minOccurs"/>
-            </xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:variable name="maxOccurs">
-          <xsl:choose>
-            <xsl:when test="@maxOccurs='unbounded'">
-              <xsl:text>∞</xsl:text>
-            </xsl:when>
-            <xsl:when test="@maxOccurs">
-              <xsl:value-of select="@maxOccurs"/>
-            </xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:if test="$minOccurs != '1'  or  $maxOccurs != '1'">
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$minOccurs"/>
-          <xsl:text>–</xsl:text>
-          <xsl:value-of select="$maxOccurs"/>
-          <xsl:text> </xsl:text>
-          <xsl:element namespace="{$outputNS}" name="{$segName}">
-            <xsl:attribute name="xml:lang">
-              <xsl:value-of select="$documentationLanguage"/>
-            </xsl:attribute>
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">occurrences of</xsl:with-param>
-            </xsl:call-template>
-          </xsl:element>
-          <xsl:value-of select="$spaceCharacter"/>
-        </xsl:if>
-        <xsl:call-template name="bitOut">
-          <xsl:with-param name="grammar"/>
-          <xsl:with-param name="element">code</xsl:with-param>
-          <xsl:with-param name="content">
-            <Wrapper>
-              <xsl:copy-of select="rng:*"/>
-            </Wrapper>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:if test="$minOccurs != '1'  or  $maxOccurs != '1'">
-          <xsl:element namespace="{$outputNS}" name="{$segName}">
-            <xsl:attribute name="xml:lang">
-              <xsl:value-of select="$documentationLanguage"/>
-            </xsl:attribute>
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">separated by whitespace</xsl:with-param>
-            </xsl:call-template>
-          </xsl:element>
-        </xsl:if>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element attList</desc>
-  </doc>
-  <xsl:template match="tei:attList" mode="show">
-    <xsl:call-template name="displayAttList">
-      <xsl:with-param name="mode">summary</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element classSpec</desc>
-  </doc>
-  <xsl:template match="tei:classSpec">
-    <xsl:if test="parent::tei:specGrp">
-      <xsl:element namespace="{$outputNS}" name="{$dtName}"><xsl:element namespace="{$outputNS}" name="{$hiName}"><xsl:attribute name="{$rendName}"><xsl:text>label</xsl:text></xsl:attribute><xsl:attribute name="xml:lang"><xsl:value-of select="$documentationLanguage"/></xsl:attribute><xsl:call-template name="i18n"><xsl:with-param name="word">Class</xsl:with-param></xsl:call-template></xsl:element>: <xsl:value-of select="@ident"/></xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$ddName}">
-        <xsl:apply-templates mode="tangle" select="."/>
-        <xsl:text>(</xsl:text>
-        <xsl:element namespace="{$outputNS}" name="{$segName}">
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Members</xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-        <xsl:text>: </xsl:text>
-        <xsl:call-template name="generateMembers"/>
-        <xsl:text>)</xsl:text>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element classSpec</desc>
-  </doc>
-  <xsl:template match="tei:classSpec" mode="weavebody">
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="tei:altIdent">
-          <xsl:value-of select="tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element namespace="{$outputNS}" name="{$sectionName}">
-      <xsl:call-template name="makeSectionHead">
-        <xsl:with-param name="id">
-          <xsl:value-of select="@ident"/>
-        </xsl:with-param>
-        <xsl:with-param name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:element namespace="{$outputNS}" name="{$tableName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$colspan}">2</xsl:attribute>
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col2</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:value-of select="$name"/>
-            </xsl:element>
-            <xsl:call-template name="specHook">
-              <xsl:with-param name="name">
-                <xsl:value-of select="$name"/>
-              </xsl:with-param>
-            </xsl:call-template>
-            <xsl:text>&#160;</xsl:text>
-            <xsl:call-template name="makeDescription"/>
-          </xsl:element>
-        </xsl:element>
-        <xsl:if test="@generate">
-          <xsl:element namespace="{$outputNS}" name="{$rowName}">
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col1</xsl:text>
-              </xsl:attribute>
-              <xsl:element namespace="{$outputNS}" name="{$segName}">
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">
-                    <xsl:text>Classes defined</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col2</xsl:text>
-              </xsl:attribute>
-              <xsl:value-of select="@generate"/>
-            </xsl:element>
-          </xsl:element>
-        </xsl:if>
-        <xsl:if test="@module">
-          <xsl:call-template name="moduleInfo"/>
-        </xsl:if>
-        <xsl:if test="@type='model'">
-          <xsl:element namespace="{$outputNS}" name="{$rowName}">
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col1</xsl:text>
-              </xsl:attribute>
-              <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                <xsl:attribute name="{$rendName}">
-                  <xsl:text>label</xsl:text>
-                </xsl:attribute>
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Used by</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col2</xsl:text>
-              </xsl:attribute>
-              <xsl:call-template name="generateModelParents">
-                <xsl:with-param name="showElements">true</xsl:with-param>
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-        </xsl:if>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col1</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:attribute name="xml:lang">
-                <xsl:value-of select="$documentationLanguage"/>
-              </xsl:attribute>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Members</xsl:with-param>
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col2</xsl:text>
-            </xsl:attribute>
-            <xsl:call-template name="generateMembers"/>
-          </xsl:element>
-        </xsl:element>
-        <xsl:if test="@type='atts'">
-          <xsl:element namespace="{$outputNS}" name="{$rowName}">
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col1</xsl:text>
-              </xsl:attribute>
-              <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                <xsl:attribute name="{$rendName}">
-                  <xsl:text>label</xsl:text>
-                </xsl:attribute>
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Attributes</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col2</xsl:text>
-              </xsl:attribute>
-              <xsl:choose>
-                <xsl:when test="not(tei:attList)">
-                  <xsl:call-template name="showAttClasses"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:for-each select="tei:attList">
-                    <xsl:call-template name="displayAttList">
-                      <xsl:with-param name="mode">all</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:for-each>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:element>
-          </xsl:element>
-        </xsl:if>
-        <xsl:apply-templates mode="weave"/>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element classes</desc>
-  </doc>
-  <xsl:template match="tei:classes" mode="weave"> </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element elementSpec</desc>
-  </doc>
-  <xsl:template match="tei:elementSpec">
-    <xsl:if test="parent::tei:specGrp">
-      <xsl:element namespace="{$outputNS}" name="{$dtName}">
-        <xsl:element namespace="{$outputNS}" name="{$segName}">
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Element</xsl:with-param>
-          </xsl:call-template>
-          <xsl:value-of select="$spaceCharacter"/>
-          <xsl:value-of select="@ident"/>
-        </xsl:element>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$ddName}">
-        <xsl:apply-templates mode="tangle" select="."/>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element elementSpec</desc>
-  </doc>
-  <xsl:template match="tei:elementSpec" mode="weavebody">
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="tei:altIdent">
-          <xsl:value-of select="tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element namespace="{$outputNS}" name="{$sectionName}">
-      <xsl:call-template name="makeSectionHead">
-        <xsl:with-param name="id">
-          <xsl:value-of select="@ident"/>
-        </xsl:with-param>
-        <xsl:with-param name="name">
-          <xsl:text>&lt;</xsl:text>
-          <xsl:choose>
-            <xsl:when test="tei:content/rng:empty">
-              <xsl:call-template name="emptySlash">
-                <xsl:with-param name="name">
-                  <xsl:value-of select="$name"/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$name"/>
-            </xsl:otherwise>
-          </xsl:choose>
-          <xsl:text>&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="specHook">
-        <xsl:with-param name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:element namespace="{$outputNS}" name="{$tableName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$colspan}">2</xsl:attribute>
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col2</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:text>&lt;</xsl:text>
-              <xsl:choose>
-                <xsl:when test="tei:content/rng:empty">
-                  <xsl:call-template name="emptySlash">
-                    <xsl:with-param name="name">
-                      <xsl:value-of select="$name"/>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$name"/>
-                </xsl:otherwise>
-              </xsl:choose>
-              <xsl:text>&gt; </xsl:text>
-            </xsl:element>
-            <xsl:call-template name="makeDescription"/>
-          </xsl:element>
-        </xsl:element>
-        <xsl:if test="@module">
-          <xsl:call-template name="moduleInfo"/>
-        </xsl:if>
-        <xsl:variable name="myatts">
-          <a>
-            <xsl:choose>
-              <xsl:when test="not(tei:attList)">
-                <xsl:call-template name="showAttClasses"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:for-each select="tei:attList">
-                  <xsl:call-template name="displayAttList">
-                    <xsl:with-param name="mode">all</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:for-each>
-              </xsl:otherwise>
-            </xsl:choose>
-          </a>
-        </xsl:variable>
-        <xsl:if test="count($myatts/a/*)&gt;0">
-          <xsl:element namespace="{$outputNS}" name="{$rowName}">
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col1</xsl:text>
-              </xsl:attribute>
-              <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                <xsl:attribute name="{$rendName}">
-                  <xsl:text>label</xsl:text>
-                </xsl:attribute>
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Attributes</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>wovenodd-col2</xsl:text>
-              </xsl:attribute>
-              <xsl:choose>
-                <xsl:when test="not(tei:attList)">
-                  <xsl:call-template name="showAttClasses"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:for-each select="tei:attList">
-                    <xsl:call-template name="displayAttList">
-                      <xsl:with-param name="mode">all</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:for-each>
-                </xsl:otherwise>
-              </xsl:choose>
-              <!--
-	      <xsl:for-each select="$myatts/a">
-		<xsl:copy-of select="*|text()"/>
-	      </xsl:for-each>
--->
-            </xsl:element>
-          </xsl:element>
-        </xsl:if>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col1</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:attribute name="xml:lang">
-                <xsl:value-of select="$documentationLanguage"/>
-              </xsl:attribute>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Used by</xsl:with-param>
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col2</xsl:text>
-            </xsl:attribute>
-            <xsl:call-template name="generateModelParents">
-              <xsl:with-param name="showElements">false</xsl:with-param>
-            </xsl:call-template>
-          </xsl:element>
-        </xsl:element>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col1</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:attribute name="xml:lang">
-                <xsl:value-of select="$documentationLanguage"/>
-              </xsl:attribute>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Contained by</xsl:with-param>
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col2</xsl:text>
-            </xsl:attribute>
-            <xsl:call-template name="generateIndirectParents"/>
-          </xsl:element>
-        </xsl:element>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col1</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:attribute name="xml:lang">
-                <xsl:value-of select="$documentationLanguage"/>
-              </xsl:attribute>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">
-                  <xsl:text>May contain</xsl:text>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col2</xsl:text>
-            </xsl:attribute>
-            <xsl:call-template name="generateChildren"/>
-          </xsl:element>
-        </xsl:element>
-        <xsl:apply-templates mode="weave"/>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element elementSpec/tei:content</desc>
-  </doc>
-  <xsl:template match="tei:elementSpec/tei:content" mode="weave">
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="../tei:altIdent">
-          <xsl:value-of select="../tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="../@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd-col1</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$hiName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>label</xsl:text>
-          </xsl:attribute>
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Declaration</xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd-col2</xsl:text>
-        </xsl:attribute>
-        <xsl:call-template name="bitOut">
-          <xsl:with-param name="grammar"/>
-          <xsl:with-param name="content">
-            <Wrapper>
-              <rng:element name="{$name}">
-                <xsl:if test="not(key('SCHEMASPECS',1))">
-                  <xsl:if test="$autoGlobal='true'">
-                    <rng:ref name="att.global.attributes"/>
-                  </xsl:if>
-                  <xsl:for-each select="..">
-                    <xsl:call-template name="showClassAtts"/>
-                  </xsl:for-each>
-                </xsl:if>
-                <xsl:apply-templates mode="tangle" select="../tei:attList"/>
-                <xsl:copy-of select="rng:*"/>
-              </rng:element>
-            </Wrapper>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:for-each select="tei:valList[@type='closed']">
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Legal values are</xsl:with-param>
-          </xsl:call-template>
-          <xsl:text>:</xsl:text>
-          <xsl:call-template name="valListChildren"/>
-        </xsl:for-each>
-        <xsl:if test="s:*">
-          <xsl:element namespace="{$outputNS}" name="{$divName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>pre</xsl:text>
-            </xsl:attribute>
-            <xsl:apply-templates select="s:*" mode="verbatim"/>
-          </xsl:element>
-        </xsl:if>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="tei:constraintSpec[parent::tei:elementSpec or parent::tei:attDef]" mode="weave">
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd-col1</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$hiName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>label</xsl:text>
-          </xsl:attribute>
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:text>Schematron</xsl:text>
-        </xsl:element>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd-col2</xsl:text>
-        </xsl:attribute>
-        <xsl:call-template name="makeDescription"/>
-        <xsl:for-each select="tei:constraint">
-          <xsl:element namespace="{$outputNS}" name="{$divName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>pre</xsl:text>
-            </xsl:attribute>
-            <xsl:apply-templates mode="verbatim"/>
-          </xsl:element>
-        </xsl:for-each>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template name="showClassAtts">
-    <xsl:for-each select="tei:classes/tei:memberOf">
-      <xsl:for-each select="key('IDENTS',@key)">
-        <xsl:if test="tei:attList">
-          <rng:ref name="{@ident}.attributes"/>
-        </xsl:if>
-        <xsl:call-template name="showClassAtts"/>
-      </xsl:for-each>
-    </xsl:for-each>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process the specification elements elements, classes and macros<param name="atts">attributes we have been asked to display</param>
-      </desc>
-  </doc>
-  <xsl:template match="tei:elementSpec|tei:classSpec|tei:macroSpec" mode="show">
-    <xsl:param name="atts"/>
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="tei:altIdent">
-          <xsl:value-of select="tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element namespace="{$outputNS}" name="{$hiName}">
-      <xsl:attribute name="{$rendName}">
-        <xsl:text>specList-</xsl:text>
-        <xsl:value-of select="local-name(.)"/>
-      </xsl:attribute>
-      <xsl:element namespace="{$outputNS}" name="{$xrefName}">
-        <xsl:attribute name="{$urlName}">
-          <xsl:choose>
-            <xsl:when test="number($splitLevel)=-1">
-              <xsl:text>#</xsl:text>
-              <xsl:value-of select="$idPrefix"/>
-              <xsl:value-of select="$name"/>
-            </xsl:when>
-            <xsl:when test="$STDOUT='true'">
-              <xsl:for-each select="key('IDENTS',$name)">
-                <xsl:call-template name="getSpecURL">
-                  <xsl:with-param name="name">
-                    <xsl:value-of select="$name"/>
-                  </xsl:with-param>
-                  <xsl:with-param name="type">
-                    <xsl:value-of select="substring-before(local-name(),'Spec')"/>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>ref-</xsl:text>
-              <xsl:value-of select="$name"/>
-              <xsl:text>.html</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-        <xsl:value-of select="$name"/>
-        <xsl:for-each select="key('IDENTS',$name)">
-          <xsl:if test="tei:content/rng:empty">
-            <xsl:text>/</xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:element>
-    </xsl:element>
-    <xsl:call-template name="showSpace"/>
-    <xsl:call-template name="makeDescription">
-      <xsl:with-param name="showListRef">false</xsl:with-param>
-    </xsl:call-template>
-    <xsl:choose>
-      <xsl:when test="$atts='-'"/>
-      <xsl:when test="$atts='+'">
-        <xsl:call-template name="showAttClasses">
-          <xsl:with-param name="minimal">true</xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$atts=''"/>
-      <xsl:when test="string-length($atts)&gt;0">
-        <xsl:element namespace="{$outputNS}" name="{$tableName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>specDesc</xsl:text>
-          </xsl:attribute>
-          <xsl:variable name="HERE" select="."/>
-          <xsl:for-each select="tokenize($atts,' ')">
-            <xsl:call-template name="doAnAttToken">
-              <xsl:with-param name="HERE" select="$HERE"/>
-              <xsl:with-param name="TOKEN" select="."/>
-            </xsl:call-template>
-          </xsl:for-each>
-        </xsl:element>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:if test="tei:attList//tei:attDef">
-          <xsl:element namespace="{$outputNS}" name="{$tableName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>attList</xsl:text>
-            </xsl:attribute>
-            <xsl:apply-templates mode="summary" select="tei:attList//tei:attDef"/>
-          </xsl:element>
-        </xsl:if>
-        <xsl:call-template name="showAttClasses">
-          <xsl:with-param name="minimal">true</xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Show a selected attribute<param name="HERE">the starting node </param>
-         <param name="TOKEN">attribute we have been asked to display</param>
-      </desc>
-  </doc>
-  <xsl:template name="doAnAttToken">
-    <xsl:param name="HERE"/>
-    <xsl:param name="TOKEN"/>
-    <xsl:choose>
-      <xsl:when test="$HERE/tei:attList//tei:attDef[@ident=$TOKEN]">
-        <xsl:for-each select="$HERE/tei:attList//tei:attDef[@ident=$TOKEN]">
-          <xsl:call-template name="showAnAttribute"/>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:for-each select="$HERE/tei:classes/tei:memberOf">
-          <xsl:for-each select="key('IDENTS',@key)/tei:attList//tei:attDef[@ident=$TOKEN]">
-            <xsl:call-template name="showAnAttribute"/>
-          </xsl:for-each>
-        </xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Display of an attribute</desc>
-  </doc>
-  <xsl:template name="showAnAttribute">
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>Attribute</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$hiName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>att</xsl:text>
-          </xsl:attribute>
-          <xsl:choose>
-            <xsl:when test="tei:altIdent">
-              <xsl:value-of select="tei:altIdent"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@ident"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:element>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:call-template name="makeDescription"/>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element exemplum</desc>
-  </doc>
-  <xsl:template match="tei:exemplum" mode="doc">
-    <xsl:variable name="documentationLanguage">
-      <xsl:call-template name="generateDoc"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="parent::tei:exemplum">
-        <xsl:call-template name="showExample"/>
-      </xsl:when>
-      <xsl:when test="not(@xml:lang)">
-        <xsl:call-template name="showExample"/>
-      </xsl:when>
-      <xsl:when test="@xml:lang='und'">
-        <xsl:call-template name="showExample"/>
-      </xsl:when>
-      <xsl:when test="@xml:lang='mul' and not($documentationLanguage='zh-tw')">
-        <!-- will need to generalize this if other langs come along like
-		chinese -->
-        <xsl:call-template name="showExample"/>
-      </xsl:when>
-      <xsl:when test="@xml:lang=$documentationLanguage">
-        <xsl:call-template name="showExample"/>
-      </xsl:when>
-      <xsl:when test="not(../tei:exemplum[@xml:lang=$documentationLanguage])                    and (@xml:lang='en'      or @xml:lang='und'      or @xml:lang='mul')">
-        <xsl:call-template name="showExample"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process an example</desc>
-  </doc>
-  <xsl:template name="showExample">
-    <xsl:choose>
-      <xsl:when test="parent::tei:attDef">
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$colspan}">
-              <xsl:text>2</xsl:text>
-            </xsl:attribute>
-            <xsl:apply-templates/>
-          </xsl:element>
-        </xsl:element>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col1</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:attribute name="xml:lang">
-                <xsl:value-of select="$documentationLanguage"/>
-              </xsl:attribute>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Example</xsl:with-param>
-              </xsl:call-template>
-            </xsl:element>
-          </xsl:element>
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>wovenodd-col2</xsl:text>
-            </xsl:attribute>
-            <xsl:apply-templates/>
-          </xsl:element>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element item</desc>
-  </doc>
-  <xsl:template match="tei:item">
-    <xsl:choose>
-      <xsl:when test="parent::tei:list[@type='gloss'] or preceding-sibling::tei:label">
-        <xsl:element namespace="{$outputNS}" name="{$ddName}">
-          <xsl:apply-templates/>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="parent::tei:list[@type='elementlist']">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element namespace="{$outputNS}" name="{$itemName}">
-          <xsl:apply-templates/>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element macroSpec</desc>
-  </doc>
-  <xsl:template match="tei:macroSpec">
-    <xsl:if test="parent::tei:specGrp">
-      <xsl:element namespace="{$outputNS}" name="{$dtName}">
-        <xsl:value-of select="@ident"/>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$ddName}">
-        <xsl:apply-templates mode="tangle" select="."/>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element macroSpec in weavebody mode</desc>
-  </doc>
-  <xsl:template match="tei:macroSpec" mode="weavebody">
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="tei:altIdent">
-          <xsl:value-of select="tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element namespace="{$outputNS}" name="{$sectionName}">
-      <xsl:call-template name="makeSectionHead">
-        <xsl:with-param name="id">
-          <xsl:value-of select="@ident"/>
-        </xsl:with-param>
-        <xsl:with-param name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="specHook">
-        <xsl:with-param name="name">
-          <xsl:value-of select="$name"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:element namespace="{$outputNS}" name="{$tableName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$colspan}">2</xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:value-of select="$name"/>
-            </xsl:element>
-            <xsl:text>&#160;</xsl:text>
-            <xsl:call-template name="makeDescription"/>
-          </xsl:element>
-        </xsl:element>
-        <xsl:if test="@module">
-          <xsl:call-template name="moduleInfo"/>
-        </xsl:if>
-        <xsl:choose>
-          <xsl:when test="@type='pe' or @type='dt'">
-            <xsl:element namespace="{$outputNS}" name="{$rowName}">
-              <xsl:element namespace="{$outputNS}" name="{$cellName}">
-                <xsl:attribute name="{$rendName}">
-                  <xsl:text>wovenodd-col1</xsl:text>
-                </xsl:attribute>
-                <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                  <xsl:attribute name="{$rendName}">
-                    <xsl:text>label</xsl:text>
-                  </xsl:attribute>
-                  <xsl:attribute name="xml:lang">
-                    <xsl:value-of select="$documentationLanguage"/>
-                  </xsl:attribute>
-                  <xsl:call-template name="i18n">
-                    <xsl:with-param name="word">Used by</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:element>
-              </xsl:element>
-              <xsl:element namespace="{$outputNS}" name="{$cellName}">
-                <xsl:attribute name="{$rendName}">
-                  <xsl:text>wovenodd-col2</xsl:text>
-                </xsl:attribute>
-                <xsl:call-template name="generateModelParents">
-                  <xsl:with-param name="showElements">true</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-            </xsl:element>
-          </xsl:when>
-        </xsl:choose>
-        <xsl:apply-templates mode="weave"/>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element macroSpec/tei:content</desc>
-  </doc>
-  <xsl:template match="tei:macroSpec/tei:content" mode="weave">
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd-col1</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$hiName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>label</xsl:text>
-          </xsl:attribute>
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Declaration</xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>wovenodd-col2</xsl:text>
-        </xsl:attribute>
-        <xsl:call-template name="bitOut">
-          <xsl:with-param name="grammar">true</xsl:with-param>
-          <xsl:with-param name="content">
-            <Wrapper>
-              <xsl:variable name="entCont">
-                <Stuff>
-                  <xsl:apply-templates select="rng:*"/>
-                </Stuff>
-              </xsl:variable>
-              <xsl:variable name="entCount">
-                <xsl:for-each select="$entCont/html:Stuff">
-                  <xsl:value-of select="count(*)"/>
-                </xsl:for-each>
-              </xsl:variable>
-              <xsl:choose>
-                <xsl:when test=".=&quot;TEI.singleBase&quot;"/>
-                <xsl:otherwise>
-                  <rng:define name="{../@ident}">
-                    <xsl:if test="starts-with(.,'component')">
-                      <xsl:attribute name="combine">choice</xsl:attribute>
-                    </xsl:if>
-                    <xsl:copy-of select="rng:*"/>
-                  </rng:define>
-                </xsl:otherwise>
-              </xsl:choose>
-            </Wrapper>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element moduleSpec</desc>
-  </doc>
-  <xsl:template match="tei:moduleSpec">
-    <xsl:element namespace="{$outputNS}" name="{$dlName}">
-      <xsl:attribute name="{$rendName}">
-        <xsl:text>moduleSpec</xsl:text>
-      </xsl:attribute>
-      <xsl:element namespace="{$outputNS}" name="{$labelName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>moduleSpecHead</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$segName}">
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Module</xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-        <xsl:value-of select="$spaceCharacter"/>
-        <xsl:value-of select="@ident"/>
-        <xsl:text>: </xsl:text>
-        <xsl:call-template name="makeDescription"/>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$ddName}">
-        <xsl:element namespace="{$outputNS}" name="{$ulName}">
-          <xsl:if test="key('ElementModule',@ident)">
-            <xsl:element namespace="{$outputNS}" name="{$itemName}">
-              <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Elements defined</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-              <xsl:text>: </xsl:text>
-              <xsl:variable name="list">
-                <List>
-                  <xsl:for-each select="key('ElementModule',@ident)">
-                    <xsl:sort select="@ident"/>
-                    <Item>
-                      <xsl:call-template name="linkTogether">
-                        <xsl:with-param name="name" select="@ident"/>
-			<xsl:with-param name="reftext">
-			  <xsl:choose>
-			    <xsl:when test="tei:altIdent">
-			      <xsl:value-of select="tei:altIdent"/>
-			    </xsl:when>
-			    <xsl:otherwise>
-			      <xsl:value-of select="@ident"/>
-			    </xsl:otherwise>
-			  </xsl:choose>
-			</xsl:with-param>
-                      </xsl:call-template>
-                    </Item>
-                  </xsl:for-each>
-                </List>
-              </xsl:variable>
-              <xsl:for-each select="$list/List/Item">
-                <xsl:copy-of select="*|text()"/>
-                <xsl:if test="following-sibling::Item">
-                  <xsl:call-template name="showSpaceBetweenItems"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:element>
-          </xsl:if>
-          <xsl:if test="key('ClassModule',@ident)">
-            <xsl:element namespace="{$outputNS}" name="{$itemName}">
-              <xsl:element namespace="{$outputNS}" name="{$hiName}">
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Classes defined</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-              <xsl:text>: </xsl:text>
-              <xsl:variable name="list">
-                <List>
-                  <xsl:for-each select="key('ClassModule',@ident)">
-                    <xsl:sort select="@ident"/>
-                    <Item>
-                      <xsl:call-template name="linkTogether">
-                        <xsl:with-param name="name" select="@ident"/>
-			<xsl:with-param name="reftext">
-			  <xsl:choose>
-			    <xsl:when test="tei:altIdent">
-			      <xsl:value-of select="tei:altIdent"/>
-			    </xsl:when>
-			    <xsl:otherwise>
-			      <xsl:value-of select="@ident"/>
-			    </xsl:otherwise>
-			  </xsl:choose>
-			</xsl:with-param>
-                      </xsl:call-template>
-                    </Item>
-                  </xsl:for-each>
-                </List>
-              </xsl:variable>
-              <xsl:for-each select="$list/List/Item">
-                <xsl:copy-of select="*|text()"/>
-                <xsl:if test="following-sibling::Item">
-                  <xsl:call-template name="showSpaceBetweenItems"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:element>
-          </xsl:if>
-          <xsl:if test="key('MacroModule',@ident)">
-            <xsl:element namespace="{$outputNS}" name="{$itemName}">
-              <xsl:element namespace="{$outputNS}" name="{$segName}">
-                <xsl:attribute name="xml:lang">
-                  <xsl:value-of select="$documentationLanguage"/>
-                </xsl:attribute>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Macros defined</xsl:with-param>
-                </xsl:call-template>
-              </xsl:element>
-              <xsl:text>: </xsl:text>
-              <xsl:variable name="list">
-                <List>
-                  <xsl:for-each select="key('MacroModule',@ident)">
-                    <xsl:sort select="@ident"/>
-                    <Item>
-                      <xsl:call-template name="linkTogether">
-                        <xsl:with-param name="name" select="@ident"/>
-			<xsl:with-param name="reftext">
-			  <xsl:choose>
-			    <xsl:when test="tei:altIdent">
-			      <xsl:value-of select="tei:altIdent"/>
-			    </xsl:when>
-			    <xsl:otherwise>
-			      <xsl:value-of select="@ident"/>
-			    </xsl:otherwise>
-			  </xsl:choose>
-			</xsl:with-param>
-                      </xsl:call-template>
-                    </Item>
-                  </xsl:for-each>
-                </List>
-              </xsl:variable>
-              <xsl:for-each select="$list/List/Item">
-                <xsl:copy-of select="*|text()"/>
-                <xsl:if test="following-sibling::Item">
-                  <xsl:call-template name="showSpaceBetweenItems"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:element>
-          </xsl:if>
-        </xsl:element>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process tei:remarks</desc>
-  </doc>
-  <xsl:template match="tei:remarks" mode="doc">
-    <xsl:if test="string-length(.)&gt;0">
-      <xsl:element namespace="{$outputNS}" name="{$rowName}">
-        <xsl:element namespace="{$outputNS}" name="{$cellName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>wovenodd-col1</xsl:text>
-          </xsl:attribute>
-          <xsl:element namespace="{$outputNS}" name="{$hiName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>label</xsl:text>
-            </xsl:attribute>
-            <xsl:attribute name="xml:lang">
-              <xsl:value-of select="$documentationLanguage"/>
-            </xsl:attribute>
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">Note</xsl:with-param>
-            </xsl:call-template>
-          </xsl:element>
-        </xsl:element>
-        <xsl:element namespace="{$outputNS}" name="{$cellName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>wovenodd-col2</xsl:text>
-          </xsl:attribute>
-          <xsl:comment>&#160;</xsl:comment>
-          <xsl:apply-templates/>
-        </xsl:element>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process a specDesc</desc>
-  </doc>
-  <xsl:template match="tei:specDesc">
-    <xsl:element namespace="{$outputNS}" name="{$itemName}">
-      <xsl:call-template name="processSpecDesc"/>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process a specGrp</desc>
-  </doc>
-  <xsl:template match="tei:specGrp"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process  a specGrpRef</desc>
-  </doc>
-  <xsl:template match="tei:specGrpRef"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process a specList</desc>
-  </doc>
-  <xsl:template match="tei:specList">
-    <xsl:element namespace="{$outputNS}" name="{$ulName}">
-      <xsl:attribute name="{$rendName}">specList</xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process a valDesc</desc>
-  </doc>
-  <xsl:template match="tei:valDesc" mode="weave">
-    <xsl:variable name="documentationLanguage">
-      <xsl:call-template name="generateDoc"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@xml:lang and         not(@xml:lang=$documentationLanguage)">
-      </xsl:when>
-      <xsl:when test="not(@xml:lang) and         not($documentationLanguage='en')          and         ../tei:valDesc[@xml:lang=$documentationLanguage]">
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element namespace="{$outputNS}" name="{$rowName}">
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>odd_label</xsl:text>
-            </xsl:attribute>
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>label</xsl:text>
-              </xsl:attribute>
-              <xsl:attribute name="xml:lang">
-                <xsl:value-of select="$documentationLanguage"/>
-              </xsl:attribute>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Values</xsl:with-param>
-              </xsl:call-template>
-            </xsl:element>
-            <xsl:text> </xsl:text>
-          </xsl:element>
-          <xsl:element namespace="{$outputNS}" name="{$cellName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>attribute</xsl:text>
-            </xsl:attribute>
-            <xsl:apply-templates/>
-          </xsl:element>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element val</desc>
-  </doc>
-  <xsl:template match="tei:val">
-    <xsl:element namespace="{$outputNS}" name="{$hiName}">
-      <xsl:attribute name="{$rendName}">
-        <xsl:text>val</xsl:text>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element att</desc>
-  </doc>
-  <xsl:template match="tei:att">
-    <xsl:element namespace="{$outputNS}" name="{$hiName}">
-      <xsl:attribute name="{$rendName}">
-        <xsl:text>att</xsl:text>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element tag</desc>
-  </doc>
-  <xsl:template match="tei:tag">
-    <xsl:element namespace="{$outputNS}" name="{$hiName}">
-      <xsl:attribute name="{$rendName}">
-        <xsl:text>tag</xsl:text>
-      </xsl:attribute>
-      <xsl:text>&lt;</xsl:text>
-      <xsl:apply-templates/>
-      <xsl:text>&gt;</xsl:text>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element valList</desc>
-  </doc>
-  <xsl:template match="tei:valList" mode="contents">
-    <xsl:element namespace="{$outputNS}" name="{$rowName}">
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_label</xsl:text>
-        </xsl:attribute>
-        <xsl:element namespace="{$outputNS}" name="{$hiName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>label</xsl:text>
-          </xsl:attribute>
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:choose>
-            <xsl:when test="@type='semi'">
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Suggested values include</xsl:with-param>
-              </xsl:call-template>
-              <xsl:text>:</xsl:text>
-            </xsl:when>
-            <xsl:when test="@type='open'">
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Sample values include</xsl:with-param>
-              </xsl:call-template>
-              <xsl:text>:</xsl:text>
-            </xsl:when>
-            <xsl:when test="@type='closed'">
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Legal values are</xsl:with-param>
-              </xsl:call-template>
-              <xsl:text>:</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>Sample values include</xsl:otherwise>
-          </xsl:choose>
-        </xsl:element>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$cellName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>odd_value</xsl:text>
-        </xsl:attribute>
-        <xsl:call-template name="valListChildren"/>
-      </xsl:element>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[odds] all the values in a valList</desc>
-  </doc>
-  <xsl:template name="valListChildren">
-    <xsl:element namespace="{$outputNS}" name="{$dlName}">
-      <xsl:attribute name="{$rendName}">
-        <xsl:text>valList</xsl:text>
-      </xsl:attribute>
-      <xsl:for-each select="tei:valItem">
-        <xsl:variable name="name">
-          <xsl:choose>
-            <xsl:when test="tei:altIdent">
-              <xsl:value-of select="tei:altIdent"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@ident"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:element namespace="{$outputNS}" name="{$dtName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>odd_label</xsl:text>
-          </xsl:attribute>
-          <xsl:value-of select="$name"/>
-        </xsl:element>
-        <xsl:element namespace="{$outputNS}" name="{$ddName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>odd_value</xsl:text>
-          </xsl:attribute>
-          <xsl:call-template name="makeDescription"/>
-          <xsl:if test="@ident=../../tei:defaultVal">
-            <xsl:element namespace="{$outputNS}" name="{$hiName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>defaultVal</xsl:text>
-              </xsl:attribute>
-              <xsl:attribute name="xml:lang">
-                <xsl:value-of select="$documentationLanguage"/>
-              </xsl:attribute>
-              <xsl:text> [</xsl:text>
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Default</xsl:with-param>
-              </xsl:call-template>
-              <xsl:text>]</xsl:text>
-            </xsl:element>
-          </xsl:if>
-        </xsl:element>
-      </xsl:for-each>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[odds] </desc>
-  </doc>
-  <xsl:template name="moduleInfo">
-    <xsl:if test="not($oddWeaveLite='true')">
-      <xsl:element namespace="{$outputNS}" name="{$rowName}">
-        <xsl:element namespace="{$outputNS}" name="{$cellName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>wovenodd-col1</xsl:text>
-          </xsl:attribute>
-          <xsl:element namespace="{$outputNS}" name="{$hiName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>label</xsl:text>
-            </xsl:attribute>
-            <xsl:attribute name="xml:lang">
-              <xsl:value-of select="$documentationLanguage"/>
-            </xsl:attribute>
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">Module</xsl:with-param>
-            </xsl:call-template>
-          </xsl:element>
-        </xsl:element>
-        <xsl:element namespace="{$outputNS}" name="{$cellName}">
-          <xsl:attribute name="{$rendName}">
-            <xsl:text>wovenodd-col2</xsl:text>
-          </xsl:attribute>
-          <xsl:call-template name="makeTagsetInfo"/>
-        </xsl:element>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[odds] display attribute list  </desc>
-  </doc>
-  <xsl:template name="displayAttList">
-    <xsl:param name="mode"/>
-    <xsl:call-template name="showAttClasses"/>
-    <xsl:if test=".//tei:attDef">
-      <xsl:element namespace="{$outputNS}" name="{$tableName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>attList</xsl:text>
-        </xsl:attribute>
-        <xsl:choose>
-          <xsl:when test="$mode='all'">
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates mode="summary"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[odds] display list of model parents </desc>
-  </doc>
-  <xsl:template name="generateModelParents">
-    <xsl:param name="showElements">true</xsl:param>
-    <xsl:variable name="here" select="."/>
-    <xsl:element namespace="{$outputNS}" name="{$divName}">
-      <xsl:attribute name="{$rendName}">parent</xsl:attribute>
-      <xsl:variable name="Parents">
-        <xsl:for-each select="key('REFS',@ident)/ancestor::tei:content/parent::*">
-          <Element type="{local-name()}" module="{@module}" name="{@ident}">
-            <xsl:attribute name="altName">
-              <xsl:choose>
-                <xsl:when test="tei:altIdent">
-                  <xsl:value-of select="tei:altIdent"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="@ident"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </Element>
-        </xsl:for-each>
-        <xsl:for-each select="tei:classes/tei:memberOf">
-          <xsl:for-each select="key('CLASSES',@key)">
-            <xsl:if test="@type='model'">
-              <Element type="classSpec" module="{@module}" name="{@ident}">
-                <xsl:attribute name="altName">
-                  <xsl:choose>
-                    <xsl:when test="tei:altIdent">
-                      <xsl:value-of select="tei:altIdent"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:value-of select="@ident"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:attribute>
-              </Element>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:for-each>
-      </xsl:variable>
-      <xsl:if test="count($Parents/*)&gt;0">
-        <xsl:for-each-group select="$Parents/*" group-by="@name">
-          <xsl:sort select="@altName"/>
-          <xsl:variable name="name" select="@name"/>
-          <xsl:variable name="alt" select="@altName"/>
-          <xsl:variable name="type" select="@type"/>
-          <xsl:if test="not(@type='elementSpec' and $showElements='false')">
-            <xsl:for-each select="$here">
-              <xsl:call-template name="linkTogether">
-                <xsl:with-param name="name" select="$name"/>
-                <xsl:with-param name="reftext" select="$alt"/>
-                <xsl:with-param name="class">link_odd_<xsl:value-of select="$type"/></xsl:with-param>
-              </xsl:call-template>
-            </xsl:for-each>
-            <xsl:if test="not(position() = last())">
-              <xsl:call-template name="showSpaceBetweenItems"/>
-            </xsl:if>
-          </xsl:if>
-        </xsl:for-each-group>
-      </xsl:if>
-      <xsl:call-template name="generateParentsByAttribute"/>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[odds] display list of generated parents (via models)   </desc>
-  </doc>
-  <xsl:template name="generateIndirectParents">
-    <xsl:element namespace="{$outputNS}" name="{$divName}">
-      <xsl:attribute name="{$rendName}">parent</xsl:attribute>
-      <xsl:variable name="here" select="."/>
-      <xsl:variable name="name" select="@ident"/>
-      <xsl:variable name="Parents">
-        <xsl:call-template name="ProcessDirectRefs"/>
-        <!-- now look at class membership -->
-        <xsl:for-each select="tei:classes/tei:memberOf">
-          <xsl:for-each select="key('CLASSES',@key)">
-            <xsl:if test="@type='model'">
-              <xsl:call-template name="ProcessClass">
-                <xsl:with-param name="name" select="$name"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:for-each>
-      </xsl:variable>
-      <xsl:call-template name="displayElementsByModule">
-        <xsl:with-param name="List">
-          <xsl:copy-of select="$Parents"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template name="ProcessDirectRefs">
-    <!-- direct parents -->
-    <xsl:for-each select="key('REFS',@ident)/ancestor::tei:content/parent::tei:*">
-      <xsl:choose>
-        <xsl:when test="self::tei:elementSpec">
-          <Element type="{local-name()}" module="{@module}" name="{@ident}">
-            <xsl:attribute name="altName">
-              <xsl:choose>
-                <xsl:when test="tei:altIdent">
-                  <xsl:value-of select="tei:altIdent"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="@ident"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </Element>
-        </xsl:when>
-        <xsl:when test="self::tei:macroSpec">
-          <xsl:call-template name="ProcessDirectRefs"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template name="ProcessClass">
-    <xsl:param name="name"/>
-    <xsl:for-each select="key('REFS',@ident)/ancestor::tei:content/parent::tei:*">
-      <xsl:choose>
-        <xsl:when test="self::tei:elementSpec">
-          <Element type="{local-name()}" module="{@module}" name="{@ident}">
-            <xsl:attribute name="altName">
-              <xsl:choose>
-                <xsl:when test="tei:altIdent">
-                  <xsl:value-of select="tei:altIdent"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="@ident"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </Element>
-        </xsl:when>
-        <xsl:when test="self::tei:macroSpec">
-          <xsl:call-template name="ProcessDirectRefs"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:for-each select="tei:classes/tei:memberOf">
-      <xsl:for-each select="key('CLASSES',@key)">
-        <xsl:if test="@type='model'">
-          <xsl:call-template name="ProcessClass">
-            <xsl:with-param name="name" select="$name"/>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template name="generateMembers">
-    <xsl:param name="depth">1</xsl:param>
-    <xsl:param name="me"/>
-    <xsl:variable name="here" select="."/>
-    <xsl:variable name="this" select="@ident"/>
-    <xsl:if test="not($this=$me) and key('CLASSMEMBERS',$this)">
-      <xsl:element namespace="{$outputNS}" name="{$hiName}">
-        <xsl:attribute name="{$rendName}">
-          <xsl:text>showmembers</xsl:text>
-          <xsl:value-of select="$depth"/>
-        </xsl:attribute>
-        <xsl:if test="$depth &gt; 1"> [</xsl:if>
-        <xsl:variable name="list">
-          <ClassList>
-            <xsl:for-each select="key('CLASSMEMBERS',$this)">
-              <Item type="local-name()" ident="@ident">
-                <xsl:call-template name="linkTogether">
-                  <xsl:with-param name="name" select="@ident"/>
-                  <xsl:with-param name="reftext">
-                    <xsl:choose>
-                      <xsl:when test="tei:altIdent">
-                        <xsl:value-of select="tei:altIdent"/>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of select="@ident"/>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:with-param>
-                  <xsl:with-param name="class">
-                    <xsl:text>link_odd_</xsl:text>
-                    <xsl:value-of select="local-name()"/>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="generateMembers">
-                  <xsl:with-param name="depth">
-                    <xsl:value-of select="$depth + 1"/>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </Item>
-            </xsl:for-each>
-          </ClassList>
-        </xsl:variable>
-        <xsl:for-each select="$list/ClassList/Item">
-          <xsl:sort select="@type"/>
-          <xsl:sort select="@ident"/>
-          <xsl:copy-of select="*|text()"/>
-          <xsl:if test="following-sibling::Item">
-            <xsl:call-template name="showSpaceBetweenItems"/>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:if test="$depth &gt; 1">] </xsl:if>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template name="generateParentsByAttribute">
-    <xsl:variable name="this" select="@ident"/>
-    <xsl:variable name="list">
-      <PattList>
-	<xsl:for-each select="key('ATTREFS-CLASS',$this)">
-	  <xsl:sort select="ancestor::tei:classSpec/@ident"/>
-	  <xsl:sort select="@ident"/>
-	  <xsl:element namespace="{$outputNS}" name="{$itemName}">
-	    <xsl:for-each select="ancestor::tei:classSpec">
-	      <Item>
-		<xsl:call-template name="linkTogether">
-		  <xsl:with-param name="name">
-		    <xsl:value-of select="@ident"/>
-		  </xsl:with-param>
-		  <xsl:with-param name="class">
-		    <xsl:text>link_odd_classSpec</xsl:text>
-		  </xsl:with-param>
-		</xsl:call-template>
-	      </Item>
-	    </xsl:for-each>
-	    <xsl:text>/@</xsl:text>
-	    <xsl:value-of select="ancestor::tei:attDef/@ident"/>
-	  </xsl:element>
-	</xsl:for-each>
-      </PattList>
-    </xsl:variable>
-    <xsl:if test="count($list/PattList/Item)&gt;0">
-      <xsl:element namespace="{$outputNS}" name="{$segName}">
-        <xsl:attribute name="xml:lang">
-          <xsl:value-of select="$documentationLanguage"/>
-        </xsl:attribute>
-        <xsl:call-template name="i18n">
-          <xsl:with-param name="word">
-            <xsl:text> Class</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:element>
-      <xsl:text>: </xsl:text>
-      <xsl:element namespace="{$outputNS}" name="{$ulName}">
-        <xsl:for-each select="$list/PattList/Item">
-          <xsl:copy-of select="*|text()"/>
-        </xsl:for-each>
-      </xsl:element>
-    </xsl:if>
-    <xsl:variable name="list2">
-      <PattList>
-	<xsl:for-each select="key('ATTREFS-ELEMENT',$this)">
-	  <xsl:sort select="ancestor::tei:elementSpec/@ident"/>
-	  <xsl:sort select="@ident"/>
-	  <Item>
-	    <xsl:element namespace="{$outputNS}" name="{$itemName}">
-	      <xsl:for-each select="ancestor::tei:elementSpec">
-		<xsl:call-template name="linkTogether">
-		  <xsl:with-param name="name">
-		    <xsl:value-of select="@ident"/>
-		  </xsl:with-param>
-		  <xsl:with-param name="reftext">
-		    <xsl:choose>
-		      <xsl:when test="tei:altIdent">
-			<xsl:value-of select="tei:altIdent"/>
-		      </xsl:when>
-		      <xsl:otherwise>
-			<xsl:value-of select="@ident"/>
-		      </xsl:otherwise>
-		    </xsl:choose>
-		  </xsl:with-param>
-		  <xsl:with-param name="class">
-		    <xsl:text>link_odd_elementSpec</xsl:text>
-		  </xsl:with-param>
-		</xsl:call-template>
-	      </xsl:for-each>
-	      <xsl:text>/@</xsl:text>
-	      <xsl:for-each select="ancestor::tei:attDef">
-		<xsl:value-of select="(tei:altIdent|@ident)[last()]"/>
-	      </xsl:for-each>
-	    </xsl:element>
-	  </Item>
-	</xsl:for-each>
-      </PattList>
-    </xsl:variable>
-    <xsl:if test="count($list2/PattList/Item)&gt;0">
-      <xsl:element namespace="{$outputNS}" name="{$segName}">
-	<xsl:attribute name="xml:lang">
-	  <xsl:value-of select="$documentationLanguage"/>
-	</xsl:attribute>
-	<xsl:call-template name="i18n">
-	  <xsl:with-param name="word">
-	    <xsl:text>Element</xsl:text>
-	  </xsl:with-param>
-	</xsl:call-template>
-	<xsl:text>: </xsl:text>
-      </xsl:element>
-      <xsl:element namespace="{$outputNS}" name="{$ulName}">
-	<xsl:for-each select="$list2/PattList/Item">
-	  <xsl:copy-of select="*|text()"/>
-	</xsl:for-each>
-      </xsl:element>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="tei:classSpec|tei:elementSpec|tei:macroSpec" mode="weave">
-    <xsl:call-template name="refdoc"/>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='modelclasscat']">
-    <xsl:apply-templates mode="weave" select="key('MODELCLASSDOCS',1)">
-      <xsl:sort select="@ident"/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='attclasscat']">
-    <xsl:apply-templates mode="weave" select="key('ATTCLASSDOCS',1)">
-      <xsl:sort select="@ident"/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='macrocat']">
-    <xsl:apply-templates mode="weave" select="key('MACRODOCS',1)">
-      <xsl:sort select="@ident"/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='elementcat']">
-    <xsl:apply-templates mode="weave" select="key('ELEMENTDOCS',1)">
-      <xsl:sort select="@ident"/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='attcat']">
-    <xsl:element namespace="{$outputNS}" name="{$tableName}">
-      <xsl:attribute name="{$rendName}">
-        <xsl:text>attcat</xsl:text>
-      </xsl:attribute>
-      <xsl:for-each select="key('ATTDOCS',1)">
-        <xsl:sort select="@ident"/>
-        <xsl:variable name="this" select="@ident"/>
-        <xsl:if test="generate-id()=generate-id(key('ATTRIBUTES',$this)[1])">
-          <xsl:element namespace="{$outputNS}" name="{$rowName}">
-            <xsl:call-template name="identifyElement">
-              <xsl:with-param name="id">
-                <xsl:value-of select="translate($this,':','_')"/>
-              </xsl:with-param>
-            </xsl:call-template>
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>attcat-col1</xsl:text>
-              </xsl:attribute>
-              <xsl:value-of select="$this"/>
-            </xsl:element>
-            <xsl:element namespace="{$outputNS}" name="{$cellName}">
-              <xsl:attribute name="{$rendName}">
-                <xsl:text>attcat-col2</xsl:text>
-              </xsl:attribute>
-              <xsl:for-each select="key('ATTRIBUTES-CLASS',$this)">
-                <xsl:sort select="ancestor::tei:classSpec/@ident"/>
-                <xsl:for-each select="ancestor::tei:classSpec|ancestor::elementSpec">
-                  <xsl:call-template name="linkTogether">
-                    <xsl:with-param name="name">
-                      <xsl:value-of select="@ident"/>
-                    </xsl:with-param>
-		    <xsl:with-param name="reftext">
-		      <xsl:choose>
-			<xsl:when test="tei:altIdent">
-			  <xsl:value-of select="tei:altIdent"/>
-			</xsl:when>
-			<xsl:otherwise>
-			  <xsl:value-of select="@ident"/>
-			</xsl:otherwise>
-		      </xsl:choose>
-		    </xsl:with-param>
-                    <xsl:with-param name="class">
-                      <xsl:text>link_odd</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:for-each>
-                <xsl:text> </xsl:text>
-              </xsl:for-each>
-              <xsl:for-each select="key('ATTRIBUTES-ELEMENT',$this)">
-                <xsl:sort select="ancestor::tei:elementSpec/@ident"/>
-                <xsl:for-each select="ancestor::tei:elementSpec">
-                  <xsl:call-template name="linkTogether">
-                    <xsl:with-param name="name">
-                      <xsl:value-of select="@ident"/>
-                    </xsl:with-param>
-                    <xsl:with-param name="reftext">
-                      <xsl:choose>
-                        <xsl:when test="tei:altIdent">
-                          <xsl:value-of select="tei:altIdent"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                          <xsl:value-of select="@ident"/>
-                        </xsl:otherwise>
-                      </xsl:choose>
-                    </xsl:with-param>
-                    <xsl:with-param name="class">
-                      <xsl:text>link_odd</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:for-each>
-                <xsl:value-of select="$spaceCharacter"/>
-                <xsl:text> </xsl:text>
-              </xsl:for-each>
-            </xsl:element>
-          </xsl:element>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template match="tei:exemplum" mode="weave">
-    <xsl:if test="teix:egXML/* or teix:egXML/text() or text()">
-      <xsl:apply-templates select="." mode="doc"/>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>No-op processing of elements tei:gloss and tei:desc in
-    normal modes, as they will always be called explicitly if
-    needed.</desc>
-  </doc>
-  <xsl:template match="tei:desc|tei:gloss" mode="weave"/>
-  <xsl:template match="tei:remarks" mode="weave">
-    <xsl:variable name="documentationLanguage">
-      <xsl:call-template name="generateDoc"/>
-    </xsl:variable>
-    <xsl:variable name="langs">
-      <xsl:value-of select="concat(normalize-space($documentationLanguage),' ')"/>
-    </xsl:variable>
-    <xsl:variable name="firstLang">
-      <xsl:value-of select="substring-before($langs,' ')"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@xml:lang=$firstLang">
-        <xsl:apply-templates select="." mode="doc"/>
-      </xsl:when>
-      <xsl:when test="not(@xml:lang) and $documentationLanguage='en'">
-        <xsl:apply-templates select="." mode="doc"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="currentLang">
-          <xsl:call-template name="findLanguage"/>
-        </xsl:variable>
-        <xsl:if test="contains($langs,concat($currentLang,' '))">
-          <xsl:apply-templates select="." mode="doc"/>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element valList</desc>
-  </doc>
-  <xsl:template match="tei:valList" mode="weave">
-    <xsl:apply-templates mode="contents" select="."/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element attList</desc>
-  </doc>
-  <xsl:template match="tei:attList" mode="weave"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element defaultVal</desc>
-  </doc>
-  <xsl:template match="tei:defaultVal" mode="weave"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element desc</desc>
-  </doc>
-  <xsl:template match="tei:desc">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <!-- pretty printing of RNC -->
-  <xsl:template match="nc" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_nc</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="declaration" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_decl</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="prefix" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_prefix</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="param" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_param</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="op" mode="keep">
-    <xsl:value-of select="translate (., ' ', '&#160;')"/>
-  </xsl:template>
-  <xsl:template match="atom" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_atom</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="t" mode="keep">
-    <xsl:choose>
-      <xsl:when test=". = '[' or . = ']'">
-        <xsl:call-template name="showRNC">
-          <xsl:with-param name="style">
-            <xsl:text>rnc_annot</xsl:text>
-          </xsl:with-param>
-          <xsl:with-param name="contents">
-            <xsl:value-of select="."/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="."/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="doc" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_comment</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="annot" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_annot</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="type" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_type</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="keyword" mode="keep">
-    <xsl:call-template name="showRNC">
-      <xsl:with-param name="style">
-        <xsl:text>rnc_keyword</xsl:text>
-      </xsl:with-param>
-      <xsl:with-param name="contents">
-        <xsl:value-of select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="tei:attList[@org='choice']">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template name="showAttClasses">
-    <xsl:param name="minimal">false</xsl:param>
-    <xsl:variable name="clatts">
-      <xsl:for-each select="ancestor-or-self::tei:elementSpec|ancestor-or-self::tei:classSpec">
-        <xsl:call-template name="attClassDetails"/>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:if test="$minimal='true'">
-      <xsl:text> — </xsl:text>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$minimal='true' and not($clatts='')">
-        <xsl:text> [+ </xsl:text>
-        <xsl:copy-of select="$clatts"/>
-        <xsl:text>]</xsl:text>
-      </xsl:when>
-      <xsl:when test="not($clatts='')">
-        <xsl:if test="ancestor::tei:schemaSpec and key('CLASSES','att.global')">
-          <xsl:element namespace="{$outputNS}" name="{$segName}">
-            <xsl:attribute name="xml:lang">
-              <xsl:value-of select="$documentationLanguage"/>
-            </xsl:attribute>
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">
-                <xsl:choose>
-                  <xsl:when test="not($autoGlobal='true')">Attributes</xsl:when>
-                  <xsl:when test=".//tei:attDef">In addition to global attributes and those inherited from</xsl:when>
-                  <xsl:otherwise>Global attributes and those inherited from</xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:call-template>
-            <xsl:value-of select="$spaceCharacter"/>
-          </xsl:element>
-        </xsl:if>
-        <xsl:copy-of select="$clatts"/>
-      </xsl:when>
-      <xsl:when test="ancestor::tei:schemaSpec and not(key('CLASSES','att.global'))">
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="i18n">
-          <xsl:with-param name="word">
-            <xsl:choose>
-              <xsl:when test="not($autoGlobal='true')">Attributes</xsl:when>
-              <xsl:when test=".//tei:attDef">In addition to global attributes</xsl:when>
-              <xsl:otherwise>Global attributes only</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="attClassDetails">
-    <xsl:param name="depth">1</xsl:param>
-    <xsl:for-each select="tei:classes/tei:memberOf">
-      <xsl:choose>
-        <xsl:when test="key('CLASSES',@key)">
-          <xsl:for-each select="key('CLASSES',@key)">
-            <xsl:if test="@type='atts'">
-              <xsl:if test="$depth &gt; 1"> (</xsl:if>
-              <xsl:call-template name="linkTogether">
-                <xsl:with-param name="name" select="@ident"/>
-              </xsl:call-template>
-              <xsl:if test=".//tei:attDef">
-                <xsl:text> (</xsl:text>
-                <xsl:for-each select=".//tei:attDef">
-                  <xsl:call-template name="emphasize">
-                    <xsl:with-param name="class">attribute</xsl:with-param>
-                    <xsl:with-param name="content">
-                      <xsl:text>@</xsl:text>
-                      <xsl:choose>
-                        <xsl:when test="tei:altIdent">
-                          <xsl:value-of select="tei:altIdent"/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                          <xsl:value-of select="@ident"/>
-                        </xsl:otherwise>
-                      </xsl:choose>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:if test="following-sibling::tei:attDef">
-                    <xsl:text>, </xsl:text>
-                  </xsl:if>
-                </xsl:for-each>
-                <xsl:text>)</xsl:text>
-                <xsl:if test="$depth=1">
-                  <xsl:call-template name="showSpace"/>
-                </xsl:if>
-              </xsl:if>
-              <xsl:call-template name="attClassDetails">
-                <xsl:with-param name="depth">
-                  <xsl:value-of select="$depth + 1"/>
-                </xsl:with-param>
-              </xsl:call-template>
-              <xsl:if test="$depth &gt; 1">) </xsl:if>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:when>
-        <xsl:when test="ancestor::tei:schemaSpec">
-	  </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@key"/>
-          <xsl:call-template name="showSpace"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template name="showElement">
-    <xsl:param name="name"/>
-    <xsl:variable name="documentationLanguage">
-      <xsl:call-template name="generateDoc"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$oddmode='tei'">
-        <tei:ref target="#{$name}">
-          <xsl:value-of select="$name"/>
-        </tei:ref>
-      </xsl:when>
-      <xsl:when test="$oddmode='html'">
-        <xsl:choose>
-          <xsl:when test="key('IDENTS',$name) and number($splitLevel)=-1">
-            <a xmlns="http://www.w3.org/1999/xhtml" class="link_element" href="#{$name}">
-              <xsl:value-of select="$name"/>
-            </a>
-          </xsl:when>
-          <xsl:when test="key('IDENTS',$name) and $STDOUT='true'">
-            <a xmlns="http://www.w3.org/1999/xhtml" class="link_element">
-              <xsl:attribute name="href">
-                <xsl:call-template name="getSpecURL">
-                  <xsl:with-param name="name">
-                    <xsl:value-of select="$name"/>
-                  </xsl:with-param>
-                  <xsl:with-param name="type">
-                    <xsl:value-of select="substring-before(local-name(),'Spec')"/>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:value-of select="$name"/>
-            </a>
-          </xsl:when>
-          <xsl:when test="key('IDENTS',$name)">
-            <a xmlns="http://www.w3.org/1999/xhtml" class="link_element" href="ref-{$name}{$outputSuffix}">
-              <xsl:value-of select="$name"/>
-            </a>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$name"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="$oddmode='pdf'">
-        <fo:inline font-style="italic">
-          <xsl:value-of select="$name"/>
-        </fo:inline>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="processSpecDesc">
-    <xsl:variable name="name">
-      <xsl:value-of select="@key"/>
-    </xsl:variable>
-    <xsl:variable name="atts">
-      <xsl:choose>
-        <xsl:when test="@rend='noatts'">-</xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="normalize-space(@atts)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$name=''">
-        <xsl:message>ERROR: no key attribute on specDesc</xsl:message>
-      </xsl:when>
-      <xsl:when test="key('IDENTS',$name)">
-        <xsl:apply-templates mode="show" select="key('IDENTS',$name)">
-          <xsl:with-param name="atts" select="$atts"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:when test="not($localsource='')">
-        <xsl:for-each select="document($localsource)/tei:TEI">
-          <xsl:apply-templates mode="show" select="tei:*[@ident=$name]">
-            <xsl:with-param name="atts" select="$atts"/>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>UNKNOWN ELEMENT </xsl:text>
-        <xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="processatts">
-    <xsl:param name="values"/>
-    <xsl:variable name="here" select="."/>
-    <xsl:for-each select="tokenize($values, ' ')">
-      <xsl:variable name="v" select="."/>
-      <xsl:for-each select="$here">
-        <xsl:apply-templates select="key('IDENTS',.)"/>
-      </xsl:for-each>
-    </xsl:for-each>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element attList</desc>
-  </doc>
-  <xsl:template match="tei:attList" mode="show">
-    <xsl:call-template name="displayAttList">
-      <xsl:with-param name="mode">summary</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template name="makeTagsetInfo">
-    <xsl:value-of select="@module"/>
-    <xsl:for-each select="key('MODULES',@module)/ancestor::tei:div[last()]">
-      <xsl:text> — </xsl:text>
-      <xsl:call-template name="makeInternalLink">
-        <xsl:with-param name="target" select="@xml:id"/>
-        <xsl:with-param name="ptr" select="true()"/>
-        <xsl:with-param name="dest">
-          <xsl:value-of select="tei:head"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template name="generateChildren">
-    <xsl:variable name="name" select="@ident"/>
-    <xsl:variable name="Original" select="/"/>
-    <xsl:choose>
-      <xsl:when test="tei:content//rng:ref[@name='macro.anyXML']">
-        <xsl:element namespace="{$outputNS}" name="{$segName}">
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:text>ANY</xsl:text>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="tei:content/rng:empty">
-        <xsl:element namespace="{$outputNS}" name="{$segName}">
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Empty element</xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="tei:content/rng:text and    count(tei:content/rng:*)=1">
-        <xsl:element namespace="{$outputNS}" name="{$segName}">
-          <xsl:attribute name="xml:lang">
-            <xsl:value-of select="$documentationLanguage"/>
-          </xsl:attribute>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Character data only</xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="Children">
-          <xsl:for-each select="tei:content">
-            <xsl:call-template name="followRef"/>
-          </xsl:for-each>
-        </xsl:variable>
-        <xsl:call-template name="displayElementsByModule">
-          <xsl:with-param name="List">
-            <xsl:copy-of select="$Children"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="displayElementsByModule">
-    <xsl:param name="List"/>
-    <xsl:variable name="here" select="."/>
-    <xsl:for-each select="$List">
-      <xsl:choose>
-        <xsl:when test="Element[@type='Text'] and count(Element)=1">
-          <xsl:element namespace="{$outputNS}" name="{$segName}">
-            <xsl:attribute name="xml:lang">
-              <xsl:value-of select="$documentationLanguage"/>
-            </xsl:attribute>
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">Character data only</xsl:with-param>
-            </xsl:call-template>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="count(Element)=0">
-          <xsl:element namespace="{$outputNS}" name="{$segName}">
-            <xsl:attribute name="xml:lang">
-              <xsl:value-of select="$documentationLanguage"/>
-            </xsl:attribute>
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">Empty element</xsl:with-param>
-            </xsl:call-template>
-          </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:element namespace="{$outputNS}" name="{$divName}">
-            <xsl:attribute name="{$rendName}">
-              <xsl:text>specChildren</xsl:text>
-            </xsl:attribute>
-            <xsl:for-each-group select="*" group-by="@module">
-              <xsl:sort select="@module"/>
-              <xsl:element namespace="{$outputNS}" name="{$divName}">
-                <xsl:attribute name="{$rendName}">
-                  <xsl:text>specChild</xsl:text>
-                </xsl:attribute>
-                <xsl:if test="string-length(current-grouping-key())&gt;0">
-                  <xsl:element namespace="{$outputNS}" name="{$segName}">
-                    <xsl:attribute name="{$rendName}">
-                      <xsl:text>specChildModule</xsl:text>
-                    </xsl:attribute>
-                    <xsl:value-of select="current-grouping-key()"/>
-                    <xsl:text>: </xsl:text>
-                  </xsl:element>
-                </xsl:if>
-                <xsl:element namespace="{$outputNS}" name="{$segName}">
-                  <xsl:attribute name="{$rendName}">
-                    <xsl:text>specChildElements</xsl:text>
-                  </xsl:attribute>
-                  <xsl:for-each-group select="current-group()" group-by="@altName">
-                    <xsl:sort select="@altName"/>
-                    <xsl:variable name="me" select="@name"/>
-                    <xsl:variable name="alt" select="@altName"/>
-                    <xsl:variable name="type" select="@type"/>
-                    <xsl:for-each select="$here">
-                      <xsl:call-template name="linkTogether">
-                        <xsl:with-param name="name" select="$me"/>
-                        <xsl:with-param name="reftext" select="$alt"/>
-                        <xsl:with-param name="class">link_odd_<xsl:value-of select="$type"/></xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:for-each>
-                    <xsl:if test="not(position() = last())">
-                      <xsl:call-template name="showSpaceBetweenItems"/>
-                    </xsl:if>
-                  </xsl:for-each-group>
-                </xsl:element>
-              </xsl:element>
-            </xsl:for-each-group>
-          </xsl:element>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template name="followRef">
-    <xsl:for-each select=".//rng:ref">
-      <xsl:if test="not(starts-with(@name,'any')        or starts-with(@name,'macro.any')       or @name='AnyThing')">
-        <xsl:variable name="Name">
-          <xsl:choose>
-            <xsl:when test="contains(@name,'_sequence')">
-              <xsl:value-of select="substring-before(@name,'_')"/>
-            </xsl:when>
-            <xsl:when test="contains(@name,'_alternat')">
-              <xsl:value-of select="substring-before(@name,'_')"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@name"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:for-each select="key('IDENTS',$Name)">
-          <xsl:choose>
-            <xsl:when test="self::tei:elementSpec">
-              <Element name="{@ident}" module="{@module}" type="{local-name()}">
-                <xsl:attribute name="altName">
-                  <xsl:choose>
-                    <xsl:when test="tei:altIdent">
-                      <xsl:value-of select="tei:altIdent"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:value-of select="@ident"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:attribute>
-              </Element>
-            </xsl:when>
-            <xsl:when test="self::tei:macroSpec">
-              <xsl:for-each select="tei:content">
-                <xsl:choose>
-                  <xsl:when test="rng:text and count(rng:*)=1">
-                    <Element type="TEXT"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:call-template name="followRef"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:for-each>
-            </xsl:when>
-            <xsl:when test="self::tei:classSpec">
-              <xsl:call-template name="followMembers"/>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:for-each>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template name="followMembers">
-    <xsl:for-each select="key('CLASSMEMBERS',@ident)">
-      <xsl:choose>
-        <xsl:when test="self::tei:elementSpec">
-          <Element name="{@ident}" module="{@module}"
-		   type="{local-name()}">
-	    <xsl:attribute name="altName">
-	      <xsl:choose>
-		<xsl:when test="tei:altIdent">
-		  <xsl:value-of select="tei:altIdent"/>
-		</xsl:when>
-		<xsl:otherwise>
-		  <xsl:value-of select="@ident"/>
-		</xsl:otherwise>
-	      </xsl:choose>
-	    </xsl:attribute>
-	  </Element>
-        </xsl:when>
-        <xsl:when test="self::tei:classSpec">
-          <xsl:call-template name="followMembers"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/common2/tei-param.xsl b/add/data/xslt/tei/common2/tei-param.xsl
deleted file mode 100644
index aedbc3270..000000000
--- a/add/data/xslt/tei/common2/tei-param.xsl
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="m tei xsi sch" version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p>TEI stylesheet customization module, common for all output
-      formats.</p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: tei-param.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-      <p>Copyright: 2011, TEI Consortium</p>
-    </desc>
-  </doc>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>Type of output being generated</desc>
-   </doc>
-  <xsl:param name="outputTarget">html</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="CSS" type="string">
-    <desc>CSS class for TOC entries</desc>
-  </doc>
-  <xsl:param name="class_toc">toc</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="figures" type="string">
-    <desc>Directory specification to put before names of graphics files,
-      unless they start with "./"</desc>
-  </doc>
-  <xsl:param name="graphicsPrefix"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="figures" type="string">
-    <desc> Default file suffix for graphics files,
-    if not directly specified</desc>
-  </doc>
-  <xsl:param name="graphicsSuffix">.png</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="figures" type="decimal">
-    <desc> Scaling of imported graphics</desc>
-  </doc>
-  <xsl:param name="standardScale">1</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="headings" type="boolean">
-    <desc> Construct a heading 
-    for &lt;div&gt; elements with no &lt;head&gt;</desc>
-  </doc>
-  <xsl:param name="autoHead"/>
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="headings">
-    <desc>[common] How to make a heading for section if there is no
-      &lt;head&gt;</desc>
-  </doc>
-  <xsl:template name="autoMakeHead">
-    <xsl:param name="display"/>
-    <xsl:choose>
-      <xsl:when test="tei:head and $display='full'">
-        <xsl:apply-templates select="tei:head" mode="makeheading"/>
-      </xsl:when>
-      <xsl:when test="tei:head">
-        <xsl:apply-templates select="tei:head" mode="plain"/>
-      </xsl:when>
-      <xsl:when test="tei:front/tei:head">
-        <xsl:apply-templates select="tei:front/tei:head" mode="plain"/>
-      </xsl:when>
-      <xsl:when test="@n">
-	<xsl:value-of select="@n"/>
-      </xsl:when>
-      <xsl:when test="@type">
-	<xsl:text>[</xsl:text>
-        <xsl:value-of select="@type"/>
-	<xsl:text>]</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>➤</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="headings" type="string">
-    <desc> Punctuation to insert after a section
-    number</desc>
-  </doc>
-  <xsl:template name="headingNumberSuffix">
-    <xsl:text>.</xsl:text>
-    <xsl:value-of select="$numberSpacer"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="headings" type="string">
-    <desc> Character to put after number of
-    section header</desc>
-  </doc>
-  <xsl:param name="numberSpacer">
-    <xsl:text> </xsl:text>
-  </xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="string">
-    <desc> Name of department within institution</desc>
-  </doc>
-  <xsl:param name="department"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="string">
-    <desc> Name of link to home page of application</desc>
-  </doc>
-  <xsl:param name="homeLabel">Home</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="anyURI">
-    <desc>Project Home</desc>
-  </doc>
-  <xsl:param name="homeURL">http://www.tei-c.org/</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="string">
-    <desc>Project</desc>
-  </doc>
-  <xsl:param name="homeWords">TEI</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="string">
-    <desc> Institution</desc>
-  </doc>
-  <xsl:param name="institution">A TEI Project</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="anyURI">
-    <desc> Institution link</desc>
-  </doc>
-  <xsl:param name="parentURL">http://www.tei-c.org/</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="string">
-    <desc> Name of overall institution</desc>
-  </doc>
-  <xsl:param name="parentWords">Parent Institution</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="anyURI">
-    <desc> Link to search application</desc>
-  </doc>
-  <xsl:param name="searchURL">http://www.google.com</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="anyURI">
-    <desc> The home page for these stylesheets</desc>
-  </doc>
-  <xsl:param name="teixslHome">http://www.tei-c.org/Stylesheets/</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="boolean">
-    <desc> Process elements according to assumptions
-    of TEI P4</desc>
-  </doc>
-  <xsl:param name="teiP4Compat">false</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="boolean">
-    <desc> Title, author and date is taken from the
-    &lt;teiHeader&gt; rather than looked for in the front matter</desc>
-  </doc>
-  <xsl:param name="useHeaderFrontMatter">false</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="boolean">
-    <desc>Whether to attempt to work out a current date (set to true
-    for test results which won't differ</desc>
-  </doc>
-  <xsl:param name="useFixedDate">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering">
-    <desc>[common] How to number sections in back matter</desc>
-  </doc>
-  <xsl:template name="numberBackDiv">
-    <xsl:if test="not($numberBackHeadings='')">
-      <xsl:number count="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6" format="A.1.1.1.1.1" level="multiple"/>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Automatically number figures in back
-    matter</desc>
-  </doc>
-  <xsl:param name="numberBackFigures">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="string">
-    <desc> How to construct heading numbering in
-    back matter</desc>
-  </doc>
-  <xsl:param name="numberBackHeadings">A.1</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Automatically number tables in back
-    matter</desc>
-  </doc>
-  <xsl:param name="numberBackTables">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering">
-    <desc>[common] How to number sections in main matter</desc>
-  </doc>
-  <xsl:template name="numberBodyDiv">
-    <xsl:if test="$numberHeadings='true'">
-      <xsl:number count="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6" level="multiple"/>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="string">
-    <desc> How to construct heading numbering in
-    main matter</desc>
-  </doc>
-  <xsl:param name="numberBodyHeadings">1.1.1.1</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Automatically number figures</desc>
-  </doc>
-  <xsl:param name="numberFigures">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering">
-    <desc>[common] How to number sections in front matter</desc>
-  </doc>
-  <xsl:template name="numberFrontDiv">
-    <xsl:param name="minimal"/>
-    <xsl:number count="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6" level="multiple"/>
-    <xsl:if test="$minimal='false'">
-      <xsl:value-of select="$numberSpacer"/>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Automatically number figures in
-    front matter</desc>
-  </doc>
-  <xsl:param name="numberFrontFigures">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="string">
-    <desc> How to construct heading numbering in
-    front matter</desc>
-  </doc>
-  <xsl:param name="numberFrontHeadings"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Automatically number tables in front
-    matter</desc>
-  </doc>
-  <xsl:param name="numberFrontTables">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Automatically number sections</desc>
-  </doc>
-  <xsl:param name="numberHeadings">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="integer">
-    <desc> Depth to which sections should be
-    numbered</desc>
-  </doc>
-  <xsl:param name="numberHeadingsDepth">9</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Automatically number tables</desc>
-  </doc>
-  <xsl:param name="numberTables">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc> Use value of "n" attribute to number
-    sections</desc>
-  </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="numbering" type="boolean">
-    <desc>
-    Automatically number paragraphs.
-  </desc>
-  </doc>
-  <xsl:param name="numberParagraphs">false</xsl:param>
-  <xsl:param name="prenumberedHeadings">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-    <desc> The complete URL when the document is
-    being delivered from a web server (normally set by Apache or Cocoon)</desc>
-  </doc>
-  <xsl:param name="REQUEST"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="boolean">
-    <desc> Write to standard output channel</desc>
-  </doc>
-  <xsl:param name="STDOUT">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="style" type="string">
-    <desc> Display of &lt;pb&gt; element.
-    Choices are "visible", "active" and "none".</desc>
-  </doc>
-  <xsl:param name="pagebreakStyle">visible</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="style" type="string">
-    <desc> How to display Relax NG schema fragments
-    (rnc or rng)</desc>
-  </doc>
-  <xsl:param name="displayMode">rnc</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="style" type="boolean">
-    <desc> Provide minimal context for a link</desc>
-  </doc>
-  <xsl:param name="minimalCrossRef">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="style" type="string">
-    <desc> Character to insert at end of quote.</desc>
-  </doc>
-  <xsl:param name="postQuote">’</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="style" type="string">
-    <desc> Character to insert at start of quote</desc>
-  </doc>
-  <xsl:param name="preQuote">‘</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="tables" type="string">
-    <desc> Default alignment of table cells</desc>
-  </doc>
-  <xsl:param name="cellAlign">left</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="tables" type="string">
-    <desc> Default alignment of tables</desc>
-  </doc>
-  <xsl:param name="tableAlign">left</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="boolean">
-    <desc>
-Whether to make simplified display of ODD
-</desc>
-  </doc>
-  <xsl:param name="oddWeaveLite">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="string">
-    <desc>
-Paragraph indentation
-</desc>
-  </doc>
-  <xsl:param name="parIndent">1em</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="string">
-    <desc>
-Default spacing between paragraphs
-</desc>
-  </doc>
-  <xsl:param name="parSkip">0pt</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-    <desc>[common] Hook where actions can be inserted when making
-     a heading</desc>
-  </doc>
-  <xsl:template name="sectionHeadHook"/>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/common2/tei.xsl b/add/data/xslt/tei/common2/tei.xsl
deleted file mode 100644
index dae9131fb..000000000
--- a/add/data/xslt/tei/common2/tei.xsl
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:s="http://www.ascc.net/xml/schematron"
-                xmlns:fotex="http://www.tug.org/fotex"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                xmlns:sch="http://purl.oclc.org/dsdl/schematron"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="s tei fotex xsi sch fo"
-                version="2.0">
-<!--  <xsl:import href="tei-param.xsl"/>-->
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet definitions common for all of HTML, FO and LaTeX
-      outputs </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: tei.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <!--<xsl:include href="core.xsl"/>
-  <xsl:include href="textstructure.xsl"/>
-  <xsl:include href="header.xsl"/>
-  <xsl:include href="linking.xsl"/>
-  <xsl:include href="figures.xsl"/>
-  <xsl:include href="textcrit.xsl"/>
-  <xsl:include href="i18n.xsl"/>
-  <xsl:include href="functions.xsl"/>-->
-
-  <xsl:key name="APP" match="tei:app" use="1"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" type="string">
-      <desc> Uppercase letters.</desc>
-   </doc>
-  <xsl:variable name="uc">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" type="string">
-      <desc> Lowercase letters.</desc>
-   </doc>
-  <xsl:variable name="lc">abcdefghijklmnopqrstuvwxyz</xsl:variable>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" type="string">
-      <desc> Name of XSLT processor.</desc>
-   </doc>
-  <xsl:variable name="processor">
-      <xsl:value-of select="system-property('xsl:vendor')"/>
-  </xsl:variable>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[common] turn names into quote characters<param name="quote">quote</param>
-      </desc>
-   </doc>
-  <xsl:template name="getQuote">
-      <xsl:param name="quote"/>
-      <xsl:choose>
-         <xsl:when test="$quote='laquo'">«</xsl:when>
-         <xsl:when test="$quote='ldquo'">“</xsl:when>
-         <xsl:when test="$quote='ldquor'">„</xsl:when>
-         <xsl:when test="$quote='lsaquo'">‹</xsl:when>
-         <xsl:when test="$quote='lsquo'">‘</xsl:when>
-         <xsl:when test="$quote='lsquor'">‚</xsl:when>
-         <xsl:when test="$quote='mdash'">—</xsl:when>
-         <xsl:when test="$quote='raquo'">»</xsl:when>
-         <xsl:when test="$quote='rdquo'">”</xsl:when>
-         <xsl:when test="$quote='rdquor'">‟</xsl:when>
-         <xsl:when test="$quote='rsaquo'">›</xsl:when>
-         <xsl:when test="$quote='rsquo'">’</xsl:when>
-         <xsl:when test="$quote='rsquor'">‛</xsl:when>
-         <xsl:otherwise>?</xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  
-  <xsl:template name="whatsTheDate">
-    <xsl:choose>
-      	<xsl:when test="$useFixedDate='true'">1970-01-01</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of
-	      select="format-dateTime(current-dateTime(),'[Y]-[M02]-[D02]T[H02]:[m02]:[s02]Z')"/>
-	</xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  
-
-   <xsl:template name="makeQuote">
-      <xsl:variable name="pre">
-         <xsl:choose>
-            <xsl:when test="contains(@rend,'PRE')">
-	              <xsl:choose>
-	                 <xsl:when test="contains(@rend,'POST')">
-	                    <xsl:call-template name="getQuote">
-	                       <xsl:with-param name="quote"
-                                        select="normalize-space(substring-before(substring-after(@rend,'PRE'),'POST'))"/>
-	                    </xsl:call-template>
-	                 </xsl:when>
-	                 <xsl:otherwise>
-	                    <xsl:call-template name="getQuote">
-	                       <xsl:with-param name="quote" select="normalize-space(substring-after(@rend,'PRE'))"/>
-	                    </xsl:call-template>
-	                 </xsl:otherwise>
-	              </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-	              <xsl:value-of select="$preQuote"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="post">
-         <xsl:choose>
-            <xsl:when test="contains(@rend,'POST')">
-	              <xsl:call-template name="getQuote">
-	                 <xsl:with-param name="quote" select="normalize-space(substring-after(@rend,'POST'))"/>
-	              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-	              <xsl:value-of select="$postQuote"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:value-of select="$pre"/>
-      <xsl:apply-templates/>
-      <xsl:value-of select="$post"/>
-   </xsl:template>
-
-  <xsl:template name="tei:makeText">
-    <xsl:param name="letters"/>
-    <xsl:value-of select="$letters"/>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/common2/textcrit.xsl b/add/data/xslt/tei/common2/textcrit.xsl
deleted file mode 100644
index 9d1204f00..000000000
--- a/add/data/xslt/tei/common2/textcrit.xsl
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a rng tei teix"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p>
-    TEI stylesheet
-    dealing with elements from the
-      textcrit module.
-      </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-
-   <xsl:key name="APP" match="tei:app" use="1"/>
-   
-   <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process element app</p>
-         <p>Process lem and rdg within app. Sends lots of information
-	 to a footnote. If a lem is not found, the first rdg is
-	 used as the base text. 
-	 </p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:app">
-    <xsl:call-template name="appReading">
-      <xsl:with-param name="lemma">
-	<xsl:choose>
-	  <xsl:when test="tei:lem">
-	    <xsl:value-of select="tei:lem"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="tei:rdg[1]"/>
-	</xsl:otherwise>
-      </xsl:choose>
-      </xsl:with-param>
-      <xsl:with-param name="lemmawitness">
-      <xsl:value-of select="@wit"/>
-      </xsl:with-param>
-      <xsl:with-param name="readings">
-	<xsl:for-each select="tei:rdg">
-	  <xsl:choose>
-	    <xsl:when test="not(../tei:lem) and position()=1"/>
-	    <xsl:otherwise>
-	      <xsl:value-of select="."/>
-	      <xsl:text>(</xsl:text>
-	      <xsl:value-of select="translate(substring(@wit,2),' #',', ')"/>
-	      <xsl:text>)</xsl:text>
-	  </xsl:otherwise>
-	  </xsl:choose>
-	  <xsl:if test="following-sibling::tei:rdg">; </xsl:if>
-	</xsl:for-each>
-      </xsl:with-param>
-    </xsl:call-template>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/common2/textstructure.xsl b/add/data/xslt/tei/common2/textstructure.xsl
deleted file mode 100644
index caf643548..000000000
--- a/add/data/xslt/tei/common2/textstructure.xsl
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:tei="http://www.tei-c.org/ns/1.0"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="tei"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the textstructure
-      module. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: textstructure.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Establish nesting depth of sections</desc>
-   </doc>
-  <xsl:template match="tei:text" mode="depth">
-    <xsl:value-of select="count(ancestor::tei:text)-1"/>
-  </xsl:template>
-  <xsl:template match="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6"
-                 mode="depth">
-      <xsl:choose>
-	<xsl:when test="ancestor::tei:text/parent::tei:group and
-			self::tei:div">
-	   <xsl:value-of select="count(ancestor::tei:div) + 1"/>
-	</xsl:when>
-         <xsl:when test="local-name(.) = 'div'">
-            <xsl:value-of select="count(ancestor::tei:div)"/>
-         </xsl:when>
-	<xsl:when test="ancestor::tei:text/parent::tei:group">
-	   <xsl:value-of select="number(substring-after(local-name(.),'div')) "/>
-	</xsl:when>
-	<xsl:when test="ancestor::tei:text/parent::tei:group">
-	  <xsl:value-of select="number(substring-after(local-name(.),'div'))"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:value-of select="number(substring-after(local-name(.),'div')) - 1"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Generate revision description</desc>
-  </doc>
-  <xsl:template match="tei:divGen[@type='revHist']">
-    <xsl:variable name="r">
-      <div xmlns="http://www.tei-c.org/ns/1.0" rend='nonumber'>
-	<head>Revision history</head>
-	<table rend="rules" >
-	  <xsl:for-each
-	      select="ancestor-or-self::tei:TEI/tei:teiHeader/tei:revisionDesc/tei:change">
-	    <row>
-	      <cell><xsl:value-of select="@when"/></cell>
-	      <cell><xsl:value-of select="@who"/></cell>
-	      <cell><xsl:value-of select="."/></cell>
-	    </row>
-	  </xsl:for-each>
-	</table>
-      </div>
-    </xsl:variable>
-    <xsl:for-each select="$r">
-      <xsl:apply-templates/>
-    </xsl:for-each>
-  </xsl:template>
-
-
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/common2/verbatim.xsl b/add/data/xslt/tei/common2/verbatim.xsl
deleted file mode 100644
index 61cad7004..000000000
--- a/add/data/xslt/tei/common2/verbatim.xsl
+++ /dev/null
@@ -1,711 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:i="http://www.iso.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:s="http://www.ascc.net/xml/schematron" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:dbk="http://docbook.org/ns/docbook" exclude-result-prefixes="a fo html i rng s sch tei teix xi xs xsl         m atom xlink xhtml dbk" version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI stylesheet dealing with elements from the core module. </p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: verbatim.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-      <p>Copyright: 2011, TEI Consortium</p>
-    </desc>
-  </doc>
-  <xsl:strip-space elements="teix:* rng:* xsl:* xhtml:* atom:* m:*"/>
-  <xsl:param name="useNSPrefixes">true</xsl:param>
-  <xsl:param name="startComment">&lt;span class="comment"&gt;</xsl:param>
-  <xsl:param name="endComment">&lt;/span&gt;</xsl:param>
-  <xsl:param name="startElement">&lt;span class="element"&gt;</xsl:param>
-  <xsl:param name="endElement">&lt;/span&gt;</xsl:param>
-  <xsl:param name="startElementName">&lt;span class="elementname"&gt;</xsl:param>
-  <xsl:param name="endElementName">&lt;/span&gt;</xsl:param>
-  <xsl:param name="highlightStartElementName">&lt;span class="highlightelementname"&gt;</xsl:param>
-  <xsl:param name="highlightEndElementName">&lt;/span&gt;</xsl:param>
-  <xsl:param name="startAttribute">&lt;span class="attribute"&gt;</xsl:param>
-  <xsl:param name="endAttribute">&lt;/span&gt;</xsl:param>
-  <xsl:param name="startAttributeValue">&lt;span class="attributevalue"&gt;</xsl:param>
-  <xsl:param name="endAttributeValue">&lt;/span&gt;</xsl:param>
-  <xsl:param name="startNamespace">&lt;span class="namespace"&gt;</xsl:param>
-  <xsl:param name="endNamespace">&lt;/span&gt;</xsl:param>
-  <xsl:param name="spaceCharacter">&#160;</xsl:param>
-  <xsl:param name="showNamespaceDecls">true</xsl:param>
-  <xsl:param name="forceWrap">false</xsl:param>
-  <xsl:param name="wrapLength">65</xsl:param>
-  <xsl:param name="attLength">40</xsl:param>
-  <xsl:param name="attsOnSameLine">3</xsl:param>
-  <xsl:param name="omitNSDecls">http://www.tei-c.org/ns/1.0</xsl:param>
-  <xsl:key name="NSUsed" match="*" use="namespace-uri()"/>
-  <xsl:key name="NSUsed" match="@*" use="namespace-uri()"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Work out a namespace prefix for verbatim elements</p>
-      <p>[common] </p>
-    </desc>
-  </doc>
-  <xsl:template name="verbatim-getNamespacePrefix">
-    <xsl:variable name="ns" select="namespace-uri()"/>
-    <xsl:variable name="prefix" select="tei:getPrefix($ns,ancestor-or-self::*[1])[1]"/>
-    <xsl:choose>
-      <xsl:when test="$prefix !=''">
-        <xsl:value-of select="$prefix"/>
-      </xsl:when>
-      <xsl:when test="$ns='http://docbook.org/ns/docbook'">dbk</xsl:when>
-      <xsl:when test="$ns='http://earth.google.com/kml/2.1'">kml</xsl:when>
-      <xsl:when test="$ns='http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0'">nvdl</xsl:when>
-      <xsl:when test="$ns='http://purl.org/rss/1.0/modules/event/'">ev</xsl:when>
-      <xsl:when test="$ns='http://purl.oclc.org/dsdl/schematron'">s</xsl:when>
-      <xsl:when test="$ns='http://relaxng.org/ns/compatibility/annotations/1.0'">a</xsl:when>
-      <xsl:when test="$ns='http://relaxng.org/ns/structure/1.0'">rng</xsl:when>
-      <xsl:when test="$ns='http://www.ascc.net/xml/schematron'">sch</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/1998/Math/MathML'">m</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/1999/XSL/Transform'">xsl</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/1999/xhtml'">xhtml</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/1999/xlink'">xlink</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/2001/XMLSchema'">xsd</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/2005/11/its'">its</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/2005/Atom'">atom</xsl:when>
-      <xsl:when test="$ns='http://www.w3.org/XML/1998/namespace'">xml</xsl:when>
-      <xsl:when test="$ns='http://www.tei-c.org/ns/geneticEditions'">ge</xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="verbatim-newLine"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Make newline</p>
-      <p>[common] </p>
-      <param name="id">identifier for debugging only</param>
-    </desc>
-  </doc>
-  <xsl:template name="verbatim-lineBreak">
-    <xsl:param name="id"/>
-    <xsl:text>&#10;</xsl:text>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process comments in verbatim mode</p>
-      <p>[common] </p>
-    </desc>
-  </doc>
-  <xsl:template match="comment()" mode="verbatim">
-    <xsl:choose>
-      <xsl:when test="ancestor::Wrapper"/>
-      <xsl:when test="ancestor::xhtml:Wrapper"/>
-      <xsl:otherwise>
-        <xsl:call-template name="verbatim-lineBreak">
-          <xsl:with-param name="id">21</xsl:with-param>
-        </xsl:call-template>
-        <xsl:value-of disable-output-escaping="yes" select="$startComment"/>
-        <xsl:text>&lt;!--</xsl:text>
-        <xsl:choose>
-          <xsl:when test="$forceWrap='true'">
-            <xsl:call-template name="verbatim-reformatText">
-              <xsl:with-param name="sofar">0</xsl:with-param>
-              <xsl:with-param name="indent">
-                <xsl:text> </xsl:text>
-              </xsl:with-param>
-              <xsl:with-param name="text">
-                <xsl:value-of select="normalize-space(.)"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="."/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:text>--&gt;</xsl:text>
-        <xsl:value-of disable-output-escaping="yes" select="$endComment"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process text nodes in verbatim mode</p>
-      <p>[common] </p>
-    </desc>
-  </doc>
-  <xsl:template match="text()" mode="verbatim">
-    <xsl:choose>
-      <xsl:when test="$forceWrap='true'">
-        <xsl:variable name="indent">
-          <xsl:for-each select="parent::*">
-            <xsl:call-template name="verbatim-makeIndent"/>
-          </xsl:for-each>
-        </xsl:variable>
-        <xsl:if test="string-length(.)&gt;$wrapLength or parent::sch:assert">
-          <xsl:text>&#10;</xsl:text>
-          <xsl:value-of select="$indent"/>
-        </xsl:if>
-        <xsl:call-template name="verbatim-reformatText">
-          <xsl:with-param name="sofar">0</xsl:with-param>
-          <xsl:with-param name="indent">
-            <xsl:value-of select="$indent"/>
-          </xsl:with-param>
-          <xsl:with-param name="text">
-            <xsl:value-of select="normalize-space(.)"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:if test="string-length(.)&gt;$wrapLength or parent::sch:assert">
-          <xsl:text>&#10;</xsl:text>
-          <xsl:value-of select="$indent"/>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="not(preceding-sibling::node() or         contains(.,'&#10;'))">
-        <xsl:if test="starts-with(.,' ')">
-          <xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:call-template name="verbatim-Text">
-          <xsl:with-param name="words">
-            <xsl:value-of select="normalize-space(.)"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:if test="substring(.,string-length(.),1)=' '">
-          <xsl:text> </xsl:text>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="normalize-space(.)=''">
-        <xsl:for-each select="following-sibling::*[1]">
-          <xsl:call-template name="verbatim-lineBreak">
-            <xsl:with-param name="id">7</xsl:with-param>
-          </xsl:call-template>
-          <xsl:call-template name="verbatim-makeIndent"/>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="verbatim-wraptext">
-          <xsl:with-param name="count">0</xsl:with-param>
-          <xsl:with-param name="indent">
-            <xsl:for-each select="parent::*">
-              <xsl:call-template name="verbatim-makeIndent"/>
-            </xsl:for-each>
-          </xsl:with-param>
-          <xsl:with-param name="text">
-            <xsl:choose>
-              <xsl:when test="starts-with(.,'&#10;') and not          (preceding-sibling::node())">
-                <xsl:value-of select="translate(substring(.,2),'&#10;','⌤')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="translate(.,'&#10;','⌤')"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-        <!--
-	<xsl:if test="substring(.,string-length(.))=' '">
-	  <xsl:text> </xsl:text>
-	</xsl:if>
-	-->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="verbatim-reformatText">
-    <xsl:param name="indent"/>
-    <xsl:param name="text"/>
-    <xsl:param name="sofar"/>
-    <xsl:choose>
-      <xsl:when test="number($sofar) &gt; $wrapLength">
-        <xsl:text>&#10;</xsl:text>
-        <xsl:value-of select="$indent"/>
-        <xsl:call-template name="verbatim-reformatText">
-          <xsl:with-param name="text">
-            <xsl:value-of select="$text"/>
-          </xsl:with-param>
-          <xsl:with-param name="sofar">
-            <xsl:text>0</xsl:text>
-          </xsl:with-param>
-          <xsl:with-param name="indent">
-            <xsl:value-of select="$indent"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="not(contains($text,' '))">
-        <xsl:call-template name="verbatim-Text">
-          <xsl:with-param name="words">
-            <xsl:value-of select="$text"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="chunk">
-          <xsl:value-of select="substring-before($text,' ')"/>
-        </xsl:variable>
-        <xsl:call-template name="verbatim-Text">
-          <xsl:with-param name="words">
-            <xsl:value-of select="$chunk"/>
-            <xsl:text> </xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="verbatim-reformatText">
-          <xsl:with-param name="text">
-            <xsl:value-of select="substring-after($text,' ')"/>
-          </xsl:with-param>
-          <xsl:with-param name="sofar">
-            <xsl:value-of select="$sofar + string-length($chunk) + 1"/>
-          </xsl:with-param>
-          <xsl:with-param name="indent">
-            <xsl:value-of select="$indent"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="verbatim-wraptext">
-    <xsl:param name="indent"/>
-    <xsl:param name="text"/>
-    <xsl:param name="count">0</xsl:param>
-    <xsl:variable name="finalSpace">
-      <xsl:choose>
-        <xsl:when test="substring($text,string-length($text),1)=' '">
-          <xsl:text> </xsl:text>
-        </xsl:when>
-        <xsl:when test="substring($text,string-length($text),1)='⌤'">
-          <xsl:text> </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <!--
-<xsl:message>my text is [<xsl:value-of select="$text"/>]</xsl:message>
-<xsl:message>my space is [<xsl:value-of select="$finalSpace"/>]</xsl:message>
--->
-    <xsl:choose>
-      <xsl:when test="normalize-space($text)=''"/>
-      <xsl:when test="contains($text,'⌤')">
-        <xsl:if test="$count &gt; 0">
-          <xsl:value-of select="$indent"/>
-          <xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:if test="starts-with($text,' ')">
-          <xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:call-template name="verbatim-Text">
-          <xsl:with-param name="words">
-            <xsl:value-of select="normalize-space(substring-before($text,'⌤'))"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <!--	<xsl:if test="not(substring-after($text,'&#10;')='')">-->
-        <xsl:call-template name="verbatim-lineBreak">
-          <xsl:with-param name="id">6</xsl:with-param>
-        </xsl:call-template>
-        <xsl:value-of select="$indent"/>
-        <xsl:call-template name="verbatim-wraptext">
-          <xsl:with-param name="indent">
-            <xsl:value-of select="$indent"/>
-          </xsl:with-param>
-          <xsl:with-param name="text">
-            <xsl:value-of select="normalize-space(substring-after($text,'⌤'))"/>
-            <xsl:value-of select="$finalSpace"/>
-          </xsl:with-param>
-          <xsl:with-param name="count">
-            <xsl:value-of select="$count + 1"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:if test="starts-with($text,' ')">
-          <xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:if test="$count &gt; 0 and parent::*">
-          <xsl:value-of select="$indent"/>
-          <xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:call-template name="verbatim-Text">
-          <xsl:with-param name="words">
-            <xsl:value-of select="normalize-space($text)"/>
-            <xsl:value-of select="$finalSpace"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process text and process ampersands</p>
-      <p>[common] </p>
-    </desc>
-  </doc>
-  <xsl:template name="verbatim-Text">
-    <xsl:param name="words"/>
-    <xsl:analyze-string select="$words" regex="(&amp;)(.)">
-      <xsl:matching-substring>
-        <xsl:choose>
-          <xsl:when test="starts-with(regex-group(2),'#')">
-            <xsl:text>&amp;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>&amp;amp;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:value-of select="regex-group(2)"/>
-      </xsl:matching-substring>
-      <xsl:non-matching-substring>
-        <xsl:value-of select="."/>
-      </xsl:non-matching-substring>
-    </xsl:analyze-string>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process default elements in verbatim mode</p>
-      <p>[common] </p>
-    </desc>
-  </doc>
-  <xsl:template match="*" mode="verbatim">
-    <xsl:param name="highlight"/>
-    <xsl:choose>
-      <xsl:when test="parent::xhtml:Wrapper"/>
-      <!--      <xsl:when test="child::node()[last()]/self::text()[not(.='')] and child::node()[1]/self::text()[not(.='')]"/>-->
-      <xsl:when test="not(parent::*)  or parent::teix:egXML">
-        <xsl:choose>
-          <xsl:when test="preceding-sibling::node()[1][self::text()]      and following-sibling::node()[1][self::text()]"/>
-          <xsl:when test="preceding-sibling::*">
-            <xsl:call-template name="verbatim-lineBreak">
-              <xsl:with-param name="id">-1</xsl:with-param>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="verbatim-newLine"/>
-            <!-- <xsl:call-template name="makeIndent"/>-->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="not(preceding-sibling::node())">
-        <xsl:call-template name="verbatim-lineBreak">
-          <xsl:with-param name="id">-2</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="verbatim-makeIndent"/>
-      </xsl:when>
-      <xsl:when test="preceding-sibling::node()[1]/self::*">
-        <xsl:call-template name="verbatim-lineBreak">
-          <xsl:with-param name="id">1</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="verbatim-makeIndent"/>
-      </xsl:when>
-      <xsl:when test="preceding-sibling::node()[1]/self::text()"> </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="verbatim-lineBreak">
-          <xsl:with-param name="id">9</xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="verbatim-makeIndent"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of disable-output-escaping="yes" select="$startElement"/>
-    <xsl:text>&lt;</xsl:text>
-    <xsl:call-template name="verbatim-makeElementName">
-      <xsl:with-param name="start">true</xsl:with-param>
-      <xsl:with-param name="highlight">
-        <xsl:value-of select="$highlight"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:apply-templates select="@*" mode="verbatim"/>
-    <xsl:if test="$showNamespaceDecls='true' or parent::teix:egXML[@rend='full']">
-      <xsl:choose>
-        <xsl:when test="not(parent::*)">
-          <xsl:call-template name="nsList"/>
-        </xsl:when>
-        <xsl:when test="parent::teix:egXML and not(preceding-sibling::*)">
-          <xsl:call-template name="nsList"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="child::node()">
-        <xsl:text>&gt;</xsl:text>
-        <xsl:value-of disable-output-escaping="yes" select="$endElement"/>
-        <xsl:apply-templates mode="verbatim">
-          <xsl:with-param name="highlight">
-            <xsl:value-of select="$highlight"/>
-          </xsl:with-param>
-        </xsl:apply-templates>
-        <xsl:choose>
-          <xsl:when test="child::node()[last()]/self::text() and child::node()[1]/self::text()"/>
-          <xsl:when test="not(parent::*)  or parent::teix:egXML">
-            <xsl:call-template name="verbatim-lineBreak">
-              <xsl:with-param name="id">23</xsl:with-param>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="child::node()[last()]/self::text()[normalize-space(.)='']">
-            <xsl:call-template name="verbatim-lineBreak">
-              <xsl:with-param name="id">3</xsl:with-param>
-            </xsl:call-template>
-            <xsl:call-template name="verbatim-makeIndent"/>
-          </xsl:when>
-          <xsl:when test="child::node()[last()]/self::comment()">
-            <xsl:call-template name="verbatim-lineBreak">
-              <xsl:with-param name="id">4</xsl:with-param>
-            </xsl:call-template>
-            <xsl:call-template name="verbatim-makeIndent"/>
-          </xsl:when>
-          <xsl:when test="child::node()[last()]/self::*">
-            <xsl:call-template name="verbatim-lineBreak">
-              <xsl:with-param name="id">5</xsl:with-param>
-            </xsl:call-template>
-            <xsl:call-template name="verbatim-makeIndent"/>
-          </xsl:when>
-        </xsl:choose>
-        <xsl:value-of disable-output-escaping="yes" select="$startElement"/>
-        <xsl:text>&lt;/</xsl:text>
-        <xsl:call-template name="verbatim-makeElementName">
-          <xsl:with-param name="start">false</xsl:with-param>
-          <xsl:with-param name="highlight">
-            <xsl:value-of select="$highlight"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:text>&gt;</xsl:text>
-        <xsl:value-of disable-output-escaping="yes" select="$endElement"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>/&gt;</xsl:text>
-        <xsl:value-of disable-output-escaping="yes" select="$endElement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="verbatim-createElement">
-    <xsl:param name="name"/>
-    <xsl:param name="special"/>
-    <xsl:choose>
-      <xsl:when test="$special='true'">
-        <xsl:value-of disable-output-escaping="yes" select="$highlightStartElementName"/>
-        <xsl:value-of select="$name"/>
-        <xsl:value-of disable-output-escaping="yes" select="$highlightEndElementName"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$name"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="verbatim-createAttribute">
-    <xsl:param name="name"/>
-    <xsl:value-of select="$name"/>
-  </xsl:template>
-  <xsl:template name="verbatim-makeElementName">
-    <xsl:param name="start"/>
-    <xsl:param name="highlight"/>
-    <!-- get namespace prefix -->
-    <xsl:variable name="ns-prefix">
-      <xsl:call-template name="verbatim-getNamespacePrefix"/>
-    </xsl:variable>
-    <xsl:variable name="highlightMe">
-      <xsl:choose>
-        <xsl:when test="$highlight=local-name()">true</xsl:when>
-        <xsl:otherwise>false</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="namespace-uri()='http://www.tei-c.org/ns/Examples'">
-        <xsl:call-template name="verbatim-createElement">
-          <xsl:with-param name="name" select="local-name(.)"/>
-          <xsl:with-param name="special">
-            <xsl:value-of select="$highlightMe"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="contains($omitNSDecls,namespace-uri())">
-        <xsl:call-template name="verbatim-createElement">
-          <xsl:with-param name="name" select="local-name(.)"/>
-          <xsl:with-param name="special">
-            <xsl:value-of select="$highlightMe"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$useNSPrefixes='true' and string-length($ns-prefix) &gt; 0">
-        <xsl:call-template name="verbatim-createElement">
-          <xsl:with-param name="name" select="concat($ns-prefix,':',local-name(.))"/>
-          <xsl:with-param name="special">
-            <xsl:value-of select="$highlightMe"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="not(namespace-uri()='')">
-        <xsl:call-template name="verbatim-createElement">
-          <xsl:with-param name="name" select="local-name(.)"/>
-          <xsl:with-param name="special">
-            <xsl:value-of select="$highlightMe"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:if test="$start='true' and not(namespace-uri()=namespace-uri(..))">
-          <xsl:text> xmlns="</xsl:text>
-          <xsl:value-of select="namespace-uri()"/>
-          <xsl:text>"</xsl:text>
-          <!-- 
-	       <xsl:call-template name="verbatim-lineBreak">
-	       <xsl:with-param name="id">5</xsl:with-param>
-	       </xsl:call-template>
-	       <xsl:call-template name="verbatim-makeIndent"/>
-	  -->
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of disable-output-escaping="yes" select="$startElementName"/>
-        <xsl:call-template name="verbatim-createElement">
-          <xsl:with-param name="name" select="local-name(.)"/>
-          <xsl:with-param name="special">
-            <xsl:value-of select="$highlightMe"/>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:value-of disable-output-escaping="yes" select="$endElementName"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="verbatim-makeIndent">
-    <xsl:variable name="depth" select="count(ancestor::*[not(namespace-uri()='http://www.tei-c.org/ns/1.0')])"/>
-    <xsl:call-template name="verbatim-makeSpace">
-      <xsl:with-param name="d">
-        <xsl:value-of select="$depth"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template name="verbatim-makeSpace">
-    <xsl:param name="d"/>
-    <xsl:if test="number($d)&gt;1">
-      <xsl:value-of select="$spaceCharacter"/>
-      <xsl:call-template name="verbatim-makeSpace">
-        <xsl:with-param name="d">
-          <xsl:value-of select="$d -1"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template match="@*" mode="verbatim">
-    <xsl:variable name="L">
-      <xsl:for-each select="../@*">
-        <xsl:value-of select="."/>
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:if test="count(../@*)&gt;$attsOnSameLine or      string-length($L)&gt;$attLength or     ancestor::tei:cell[not(@rend='wovenodd-col2')] or     namespace-uri()='http://www.w3.org/2005/11/its' or     string-length(.)+string-length(name(.)) &gt;     $attLength">
-      <xsl:call-template name="verbatim-lineBreak">
-        <xsl:with-param name="id">5</xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="verbatim-makeIndent"/>
-    </xsl:if>
-    <xsl:value-of select="$spaceCharacter"/>
-    <xsl:variable name="ns-prefix">
-      <xsl:call-template name="verbatim-getNamespacePrefix"/>
-    </xsl:variable>
-    <xsl:variable name="name">
-      <xsl:choose>
-        <xsl:when test="string-length($ns-prefix) &gt; 0">
-          <xsl:value-of select="$ns-prefix"/>
-          <xsl:text>:</xsl:text>
-          <xsl:value-of select="local-name(.)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="local-name(.)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="verbatim-createAttribute">
-      <xsl:with-param name="name" select="$name"/>
-    </xsl:call-template>
-    <xsl:text>="</xsl:text>
-    <xsl:value-of disable-output-escaping="yes" select="$startAttributeValue"/>
-    <xsl:apply-templates select="." mode="attributetext"/>
-    <xsl:value-of disable-output-escaping="yes" select="$endAttributeValue"/>
-    <xsl:text>"</xsl:text>
-  </xsl:template>
-  <xsl:template match="@*" mode="attributetext">
-    <xsl:choose>
-      <xsl:when test="string-length(.)&gt;$attLength and contains(.,' ')">
-        <xsl:call-template name="verbatim-reformatText">
-          <xsl:with-param name="sofar">0</xsl:with-param>
-          <xsl:with-param name="indent">
-            <xsl:text> </xsl:text>
-          </xsl:with-param>
-          <xsl:with-param name="text">
-            <xsl:value-of select="normalize-space(.)"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="."/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="text()|comment()|processing-instruction()" mode="ns"/>
-  <xsl:template match="*" mode="ns">
-    <xsl:for-each select="namespace::*">
-      <xsl:variable name="ns" select="."/>
-      <xsl:choose>
-        <xsl:when test=".='http://relaxng.org/ns/structure/1.0'"/>
-        <xsl:when test=".='http://www.w3.org/2001/XInclude'"/>
-        <xsl:when test=".='http://www.tei-c.org/ns/Examples'"/>
-        <xsl:when test=".='http://www.ascc.net/xml/schematron'"/>
-        <xsl:when test=".='http://relaxng.org/ns/compatibility/annotations/1.0'"/>
-        <xsl:when test="name(.)=''"/>
-        <xsl:when test=".='http://www.w3.org/XML/1998/namespace'"/>
-        <xsl:otherwise>
-          <ns name="{name(.)}" value="{.}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates mode="ns"/>
-  </xsl:template>
-  <xsl:template name="nsList">
-    <xsl:variable name="ns">
-      <all>
-        <names>
-          <xsl:apply-templates select="." mode="ns"/>
-        </names>
-        <text>
-          <xsl:copy-of select="."/>
-        </text>
-      </all>
-    </xsl:variable>
-    <xsl:for-each select="$ns/all/names">
-      <xsl:for-each-group select="ns" group-by="@name">
-        <xsl:if test="key('NSUsed',@value)">
-          <xsl:call-template name="verbatim-lineBreak">
-            <xsl:with-param name="id">22</xsl:with-param>
-          </xsl:call-template>
-          <xsl:text>&#160;&#160;&#160;</xsl:text>
-          <xsl:text>xmlns:</xsl:text>
-          <xsl:value-of select="@name"/>
-          <xsl:text>="</xsl:text>
-          <xsl:value-of select="@value"/>
-          <xsl:text>"</xsl:text>
-        </xsl:if>
-      </xsl:for-each-group>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:function name="tei:getPrefix" as="xs:string*">
-    <xsl:param name="ns"/>
-    <xsl:param name="here"/>
-    <xsl:for-each select="in-scope-prefixes($here)">
-      <xsl:choose>
-        <xsl:when test=".=''"/>
-        <xsl:when test="$ns=namespace-uri-for-prefix(.,$here)">
-          <xsl:value-of select="."/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:for-each>
-  </xsl:function>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/i18n.xml b/add/data/xslt/tei/i18n.xml
deleted file mode 100644
index 8feeefc18..000000000
--- a/add/data/xslt/tei/i18n.xml
+++ /dev/null
@@ -1,2072 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- interface translations for TEI XSL stylesheets -->
-<i18n>
-  <codes>
-    <code xml:lang="hr" lang3="hrv">
-      <desc>Croatian</desc>
-      <name>Neven Jovanović</name>
-      <email>neven.jovanovic@ffzg.hr</email>
-    </code>
-    <code xml:lang="ko" lang3="kor">
-      <desc>Korean</desc>
-      <name>Beom-mo Kang</name>
-      <email>bmkang@korea.ac.kr</email>
-    </code>
-    <code xml:lang="la" lang3="lat">
-      <desc>Latin</desc>
-      <name>Neven Jovanović</name>
-      <email>neven.jovanovic@ffzg.hr</email>
-    </code>
-    <code xml:lang="ru" lang3="rus">
-      <desc>Russian</desc>
-      <name>Ivan A Derzhanski</name>
-      <email>iad@math.bas.bg</email>
-    </code>
-    <code xml:lang="tr" lang3="tur">
-      <desc>Turkish</desc>
-      <name>Ivan A Derzhanski</name>
-      <email>iad@math.bas.bg</email>
-    </code>
-    <code xml:lang="el" lang3="ell">
-      <desc>Greek</desc>
-      <name>Ivan A Derzhanski</name>
-      <email>iad@math.bas.bg</email>
-    </code>
-    <code xml:lang="bg" lang3="bul">
-      <desc>Bulgarian</desc>
-      <name>Ivan A Derzhanski</name>
-      <email>iad@math.bas.bg</email>
-    </code>
-    <code xml:lang="nl" lang3="nld">
-      <desc>Dutch</desc>
-      <name>Bert Van Elsacker</name>
-      <email>bertvanelsacker@yahoo.com</email>
-    </code>
-    <code xml:lang="de" lang3="deu">
-      <desc>German</desc>
-      <name>Christian Wittern, Torsten Schassan </name>
-      <email>wittern@kanji.zinbun.kyoto-u.ac.jp,schassan@hab.de</email>
-    </code>
-    <code xml:lang="ja" lang3="jpn">
-      <desc>Japanese</desc>
-      <name>Christian Wittern and Ohya Kazushi</name>
-      <email>wittern@kanji.zinbun.kyoto-u.ac.jp,ohyakazushi@gmail.com</email>
-    </code>
-    <code xml:lang="ro" lang3="ron">
-      <desc>Romanian</desc>
-      <name>Adrian Dimulescu</name>
-      <email>adrian.dimulescu@free.fr</email>
-    </code>
-    <code xml:lang="fr" lang3="fra">
-      <desc>French</desc>
-      <name>Laurent Romary</name>
-      <email>Laurent.Romary@loria.fr</email>
-    </code>
-    <code xml:lang="pt" lang3="por">
-      <desc>Portuguese</desc>
-      <name>Leonor Barroca</name>
-      <email>l.barroca@open.ac.uk</email>
-    </code>
-    <code xml:lang="es" lang3="spa">
-      <desc>Spanish</desc>
-      <name>Carmen Arronis Llopis</name>
-      <email>arronis@ua.es</email>
-    </code>
-    <code xml:lang="it" lang3="ita">
-      <desc>Italian</desc>
-      <name>Fabio Ciotti, Arianna Ciula, Elena Pierazzo</name>
-      <email>fabio.ciott@uniroma1.it</email>
-    </code>
-    <code xml:lang="sl" lang3="slv">
-      <desc>Slovenian</desc>
-      <name>Matija Ogrin</name>
-      <email>matija.ogrin@zrc-sazu.si</email>
-    </code>
-    <code xml:lang="pl" lang3="pol">
-      <desc>Polish</desc>
-      <name>Radosław Moszczyński</name>
-      <email>r.moszczynski@uw.edu.pl</email>
-    </code>
-    <code xml:lang="sv" lang3="swe">
-      <desc>Swedish</desc>
-      <name>Monica Langerth Zetterman and Matthew Zimmerman</name>
-      <email>monica.langerth@ped.uu.se,matthew.zimmerman@nyu.edu</email>
-    </code>
-    <code xml:lang="no" lang3="nor">
-      <desc>Norwegian</desc>
-      <name>Øyvind Eide</name>
-      <email>oyvind.eide@muspro.uio.no</email>
-    </code>
-    <code xml:lang="zh-tw">
-      <desc>Chinese</desc>
-      <name>Marcus Bingenheimer</name>
-      <email>m.bingenheimer@gmail.com</email>
-    </code>
-    <code xml:lang="sr" lang3="srp">
-      <desc>Serbian</desc>
-      <name>Cvetana Krstev</name>
-      <email>cvetana@poincare.matf.bg.ac.yu</email>
-    </code>
-    <code xml:lang="hi" lang3="hin">
-      <desc>Hindi</desc>
-      <name>Paul Richards</name>
-      <email>paul.richards@ugs.com</email>
-    </code>
-    <code xml:lang="th" lang3="tha">
-      <desc>Thai</desc>
-      <name>Mananya Patamasoontorn</name>
-      <email>mananyap@hotmail.com</email>
-    </code>
-    <code xml:lang="ca" lang3="cat">
-      <desc>Catalan</desc>
-      <name>Mikel L. Forcada</name>
-      <email>mlf@dlsi.ua.es</email>
-    </code>
-  </codes>
-  <entry>
-    <key>TEI</key>
-    <text xml:lang="en" lang3="eng">Text Encoding Initiative</text>
-    <text xml:lang="de" lang3="deu">Text Encoding Initiative</text>
-    <text xml:lang="ro" lang3="ron">Iniţiativa de Codificare a Textului</text>
-    <text xml:lang="pt" lang3="por">Iniciativa de Codificação de Texto</text>
-    <text xml:lang="es" lang3="spa">Iniciativa de Codificación de Textos</text>
-    <text xml:lang="it" lang3="ita">Text Encoding Initiative</text>
-    <text xml:lang="sv" lang3="swe">Text Encoding Initiative</text>
-    <text xml:lang="no" lang3="nor">Text Encoding Initiative</text>
-    <text xml:lang="sr" lang3="srp">Podsticaj obeležavanju teksta</text>
-    <text xml:lang="pl" lang3="pol">Inicjatywa Kodowania Tekstów</text>
-    <text xml:lang="hi" lang3="hin">viShaya anuvAda prathama kAryavAhI</text>
-    <text xml:lang="th" lang3="tha">รหัสวิชา</text>
-    <text xml:lang="nl" lang3="nld">Tekstcoderingsinitiatief</text>
-    <text xml:lang="ru" lang3="rus">Инициатива по кодированию текстов</text>
-    <text xml:lang="tr" lang3="tur">Metin Kodlaması Girişimi</text>
-    <text xml:lang="bg" lang3="bul">Инициатива за кодиране на текстове</text>
-    <text xml:lang="el" lang3="ell">Πρωτοβουλία για την Κωδικοποίησης Κειμενών</text>
-    <text xml:lang="ca" lang3="cat">Iniciativa de Codificació de Textos</text>
-    <text xml:lang="la" lang3="lat">Stimulus textibus annotandis</text>
-    <text xml:lang="hr" lang3="hrv">Inicijativa za obilježavanje tekstova</text>
-    <text xml:lang="ko" lang3="kor">텍스트 부호화 주도</text>
-  </entry>
-  <entry>
-    <key>Attributes</key>
-    <text xml:lang="en" lang3="eng">Attributes</text>
-    <text xml:lang="de" lang3="deu">Attribute</text>
-    <text xml:lang="ro" lang3="ron">Atribute</text>
-    <text xml:lang="fr" lang3="fra">Attributs</text>
-    <text xml:lang="pt" lang3="por">Atributos</text>
-    <text xml:lang="es" lang3="spa">Atributos</text>
-    <text xml:lang="it" lang3="ita">Attributi</text>
-    <text xml:lang="sl" lang3="slv">Atributi</text>
-    <text xml:lang="sv" lang3="swe">Attribut</text>
-    <text xml:lang="no" lang3="nor">Attributt</text>
-    <text xml:lang="zh-tw">屬性</text>
-    <text xml:lang="sr" lang3="srp">Atributi</text>
-    <text xml:lang="ja" lang3="jpn">属性</text>
-    <text xml:lang="pl" lang3="pol">Atrybuty</text>
-    <text xml:lang="hi" lang3="hin">guNa</text>
-    <text xml:lang="th" lang3="tha">คุณสมบัติ</text>
-    <text xml:lang="nl" lang3="nld">Attributen</text>
-    <text xml:lang="ru" lang3="rus">Атрибуты</text>
-    <text xml:lang="tr" lang3="tur">Öznitelikler</text>
-    <text xml:lang="bg" lang3="bul">Атрибути</text>
-    <text xml:lang="el" lang3="ell">Χαρακτηριστικά</text>
-    <text xml:lang="ca" lang3="cat">Atributs</text>
-    <text xml:lang="la" lang3="lat">Attributa</text>
-    <text xml:lang="hr" lang3="hrv">Atributi</text>
-    <text xml:lang="ko" lang3="kor">속성</text>
-  </entry>
-  <entry>
-    <key>Class</key>
-    <text xml:lang="en" lang3="eng">Class</text>
-    <text xml:lang="de" lang3="deu">Klasse</text>
-    <text xml:lang="ro" lang3="ron">Clasă</text>
-    <text xml:lang="fr" lang3="fra">Classe</text>
-    <text xml:lang="pt" lang3="por">Classe</text>
-    <text xml:lang="es" lang3="spa">Clase</text>
-    <text xml:lang="it" lang3="ita">Classe</text>
-    <text xml:lang="sl" lang3="slv">Razred</text>
-    <text xml:lang="sv" lang3="swe">Klass</text>
-    <text xml:lang="no" lang3="nor">Klasse</text>
-    <text xml:lang="zh-tw">分類</text>
-    <text xml:lang="sr" lang3="srp">Klasa</text>
-    <text xml:lang="ja" lang3="jpn">クラス</text>
-    <text xml:lang="pl" lang3="pol">Klasa</text>
-    <text xml:lang="hi" lang3="hin">shreNI</text>
-    <text xml:lang="th" lang3="tha">ชั้นเรียน</text>
-    <text xml:lang="nl" lang3="nld">Klasse</text>
-    <text xml:lang="ru" lang3="rus">Класс</text>
-    <text xml:lang="tr" lang3="tur">Sınıf</text>
-    <text xml:lang="bg" lang3="bul">Клас</text>
-    <text xml:lang="el" lang3="ell">Κλάση</text>
-    <text xml:lang="ca" lang3="cat">Classe</text>
-    <text xml:lang="la" lang3="lat">Classis</text>
-    <text xml:lang="hr" lang3="hrv">Razred</text>
-    <text xml:lang="ko" lang3="kor">부류</text>
-  </entry>
-  <entry>
-    <key>Classes defined</key>
-    <text xml:lang="en" lang3="eng">Classes defined</text>
-    <text xml:lang="de" lang3="deu">Definierte Klassen</text>
-    <text xml:lang="ro" lang3="ron">Clase definite</text>
-    <text xml:lang="fr" lang3="fra">Classes définies</text>
-    <text xml:lang="pt" lang3="por">Classes definidas</text>
-    <text xml:lang="es" lang3="spa">Clases definidas</text>
-    <text xml:lang="it" lang3="ita">Classi definite</text>
-    <text xml:lang="sl" lang3="slv">Definirani razredi</text>
-    <text xml:lang="sv" lang3="swe">Definierade klasser</text>
-    <text xml:lang="no" lang3="nor">Definerte klasser klasser</text>
-    <text xml:lang="zh-tw">被定義的分類</text>
-    <text xml:lang="sr" lang3="srp">Definisane klase</text>
-    <text xml:lang="ja" lang3="jpn">定義済みクラス</text>
-    <text xml:lang="pl" lang3="pol">Zdefiniowane klasy</text>
-    <text xml:lang="hi" lang3="hin">Paribashith shreNI</text>
-    <text xml:lang="th" lang3="tha">หมายเลขชั้นเรียน</text>
-    <text xml:lang="nl" lang3="nld">Gedefinieerde klassen</text>
-    <text xml:lang="ru" lang3="rus">Описанные классы</text>
-    <text xml:lang="tr" lang3="tur">Tanımlı sınıflar</text>
-    <text xml:lang="bg" lang3="bul">Описани класове</text>
-    <text xml:lang="el" lang3="ell">Οριζόμενες κλάσες</text>
-    <text xml:lang="ca" lang3="cat">Classes definides</text>
-    <text xml:lang="la" lang3="lat">Classes definitae</text>
-    <text xml:lang="hr" lang3="hrv">Definirani razredi</text>
-    <text xml:lang="ko" lang3="kor">정의 부류</text>
-  </entry>
-  <entry>
-    <key>Datatype</key>
-    <text xml:lang="en" lang3="eng">Datatype</text>
-    <text xml:lang="de" lang3="deu">Datentyp</text>
-    <text xml:lang="ro" lang3="ron">Tipuri de date</text>
-    <text xml:lang="fr" lang3="fra">Type de données</text>
-    <text xml:lang="pt" lang3="por">Tipo de Dados</text>
-    <text xml:lang="es" lang3="spa">Tipo de datos</text>
-    <text xml:lang="it" lang3="ita">Tipo di dati</text>
-    <text xml:lang="sl" lang3="slv">Podatkovni tip</text>
-    <text xml:lang="sv" lang3="swe">Datatyp</text>
-    <text xml:lang="no" lang3="nor">Datatype</text>
-    <text xml:lang="zh-tw">資料類型</text>
-    <text xml:lang="sr" lang3="srp">Podatkovni tip</text>
-    <text xml:lang="ja" lang3="jpn">データ型</text>
-    <text xml:lang="pl" lang3="pol">Typ danych</text>
-    <text xml:lang="hi" lang3="hin">NirDishta varga</text>
-    <text xml:lang="th" lang3="tha">ชนิดของข้อมูล</text>
-    <text xml:lang="nl" lang3="nld">Datatype</text>
-    <text xml:lang="ru" lang3="rus">Тип данных</text>
-    <text xml:lang="tr" lang3="tur">Veri Türü</text>
-    <text xml:lang="bg" lang3="bul">Тип данни</text>
-    <text xml:lang="el" lang3="ell">Τύπος δεδομένων</text>
-    <text xml:lang="ca" lang3="cat">Tipus de dades</text>
-    <text xml:lang="la" lang3="lat">Datorum qualitas</text>
-    <text xml:lang="hr" lang3="hrv">Vrsta podataka</text>
-    <text xml:lang="ko" lang3="kor">자료 유형</text>
-  </entry>
-  <entry>
-    <key>Declaration</key>
-    <text xml:lang="en" lang3="eng">Declaration</text>
-    <text xml:lang="de" lang3="deu">Deklaration</text>
-    <text xml:lang="ro" lang3="ron">Declaraţie</text>
-    <text xml:lang="fr" lang3="fra">Declaration</text>
-    <text xml:lang="pt" lang3="por">Declaração</text>
-    <text xml:lang="es" lang3="spa">Declaración</text>
-    <text xml:lang="it" lang3="ita">Dichiarazione</text>
-    <text xml:lang="sl" lang3="slv">Deklaracija</text>
-    <text xml:lang="sv" lang3="swe">Deklaration</text>
-    <text xml:lang="no" lang3="nor">Deklarasjon</text>
-    <text xml:lang="zh-tw">宣告</text>
-    <text xml:lang="sr" lang3="srp">Deklaracija</text>
-    <text xml:lang="ja" lang3="jpn">宣言</text>
-    <text xml:lang="pl" lang3="pol">Deklaracja</text>
-    <text xml:lang="hi" lang3="hin">ghoShaNA</text>
-    <text xml:lang="th" lang3="tha">คำประกาศ</text>
-    <text xml:lang="nl" lang3="nld">Declaratie</text>
-    <text xml:lang="ru" lang3="rus">Описание</text>
-    <text xml:lang="tr" lang3="tur">Bildirim</text>
-    <text xml:lang="bg" lang3="bul">Декларация</text>
-    <text xml:lang="el" lang3="ell">Δήλωση</text>
-    <text xml:lang="ca" lang3="cat">Declaració</text>
-    <text xml:lang="la" lang3="lat">Declaratio</text>
-    <text xml:lang="hr" lang3="hrv">Deklaracija</text>
-    <text xml:lang="ko" lang3="kor">선언</text>
-  </entry>
-  <entry>
-    <key>Default</key>
-    <text xml:lang="en" lang3="eng">Default</text>
-    <text xml:lang="de" lang3="deu">Vorgabe</text>
-    <text xml:lang="ro" lang3="ron">Implicit</text>
-    <text xml:lang="fr" lang3="fra">Valeur par défaut</text>
-    <text xml:lang="pt" lang3="por">Valor por defeito</text>
-    <text xml:lang="es" lang3="spa">Por defecto</text>
-    <text xml:lang="it" lang3="ita">Valore di default</text>
-    <text xml:lang="sl" lang3="slv">Privzeta vrednost</text>
-    <text xml:lang="sv" lang3="swe">Standard</text>
-    <text xml:lang="no" lang3="nor">Standard</text>
-    <text xml:lang="zh-tw">預設值</text>
-    <text xml:lang="sr" lang3="srp">Pretpostavljena vrednost</text>
-    <text xml:lang="ja" lang3="jpn">初期値</text>
-    <text xml:lang="pl" lang3="pol">Wartość domyślna</text>
-    <text xml:lang="hi" lang3="hin">aparAdha</text>
-    <text xml:lang="th" lang3="tha">ค่าตั้งเริ่มต้น</text>
-    <text xml:lang="nl" lang3="nld">Defaultwaarde</text>
-    <text xml:lang="ru" lang3="rus">Величина по умолчанию</text>
-    <text xml:lang="tr" lang3="tur">Varsayılan</text>
-    <text xml:lang="bg" lang3="bul">Стойност по подразбиране</text>
-    <text xml:lang="el" lang3="ell">Προεπιλεγμένη τιμή</text>
-    <text xml:lang="ca" lang3="cat">Implícit</text>
-    <text xml:lang="la" lang3="lat">Valores implicitae</text>
-    <text xml:lang="hr" lang3="hrv">Polazne vrijednosti</text>
-    <text xml:lang="ko" lang3="kor">기본값</text>
-  </entry>
-  <entry>
-    <key>Element</key>
-    <text xml:lang="en" lang3="eng">Element</text>
-    <text xml:lang="de" lang3="deu">Element</text>
-    <text xml:lang="ro" lang3="ron">Element</text>
-    <text xml:lang="fr" lang3="fra">Elément</text>
-    <text xml:lang="pt" lang3="por">Elemento</text>
-    <text xml:lang="es" lang3="spa">Elemento</text>
-    <text xml:lang="it" lang3="ita">Elemento</text>
-    <text xml:lang="sl" lang3="slv">Element</text>
-    <text xml:lang="sv" lang3="swe">Element</text>
-    <text xml:lang="no" lang3="nor">Element</text>
-    <text xml:lang="zh-tw">元素</text>
-    <text xml:lang="sr" lang3="srp">Element</text>
-    <text xml:lang="ja" lang3="jpn">要素</text>
-    <text xml:lang="pl" lang3="pol">Element</text>
-    <text xml:lang="hi" lang3="hin">mUla</text>
-    <text xml:lang="nl" lang3="nld">Element</text>
-    <text xml:lang="ru" lang3="rus">Элемент</text>
-    <text xml:lang="tr" lang3="tur">Öğe</text>
-    <text xml:lang="bg" lang3="bul">Елемент</text>
-    <text xml:lang="el" lang3="ell">Στοιχείο</text>
-    <text xml:lang="ca" lang3="cat">Element</text>
-    <text xml:lang="la" lang3="lat">Elementum</text>
-    <text xml:lang="hr" lang3="hrv">Element</text>
-    <text xml:lang="ko" lang3="kor">요소</text>
-  </entry>
-  <entry>
-    <key>Elements defined</key>
-    <text xml:lang="en" lang3="eng">Elements defined</text>
-    <text xml:lang="de" lang3="deu">Definierte Elemente</text>
-    <text xml:lang="ro" lang3="ron">Elemente definite</text>
-    <text xml:lang="fr" lang3="fra">Eléments définis</text>
-    <text xml:lang="pt" lang3="por">Elementos definidos</text>
-    <text xml:lang="es" lang3="spa">Elementos definidos</text>
-    <text xml:lang="it" lang3="ita">Elementi definiti</text>
-    <text xml:lang="sl" lang3="slv">Definirani elementi</text>
-    <text xml:lang="sv" lang3="swe">Definierade element</text>
-    <text xml:lang="no" lang3="nor">Definerte elementer</text>
-    <text xml:lang="zh-tw">被定義的元素</text>
-    <text xml:lang="sr" lang3="srp">Definisani elementi</text>
-    <text xml:lang="ja" lang3="jpn">定義済み要素</text>
-    <text xml:lang="pl" lang3="pol">Zdefiniowane elementy</text>
-    <text xml:lang="hi" lang3="hin">Paribhasith Mula</text>
-    <text xml:lang="th" lang3="tha">ระบุเนื้อหา</text>
-    <text xml:lang="nl" lang3="nld">Gedefinieerde elementen</text>
-    <text xml:lang="ru" lang3="rus">Описанные элементы</text>
-    <text xml:lang="tr" lang3="tur">Tanımlı öğeler</text>
-    <text xml:lang="bg" lang3="bul">Описани елементи</text>
-    <text xml:lang="el" lang3="ell">Οριζόμενα στοιχεία</text>
-    <text xml:lang="ca" lang3="cat">Elements definits</text>
-    <text xml:lang="la" lang3="lat">Elementa definita</text>
-    <text xml:lang="hr" lang3="hrv">Definirani elementi</text>
-    <text xml:lang="ko" lang3="kor">정의 요소</text>
-  </entry>
-  <entry>
-    <key>Example</key>
-    <text xml:lang="en" lang3="eng">Example</text>
-    <text xml:lang="de" lang3="deu">Beispiel</text>
-    <text xml:lang="ro" lang3="ron">Exemplu</text>
-    <text xml:lang="fr" lang3="fra">Exemple</text>
-    <text xml:lang="pt" lang3="por">Exemplo</text>
-    <text xml:lang="es" lang3="spa">Ejemplo</text>
-    <text xml:lang="it" lang3="ita">Esempio</text>
-    <text xml:lang="sl" lang3="slv">Primer</text>
-    <text xml:lang="sv" lang3="swe">Exempel</text>
-    <text xml:lang="no" lang3="nor">Eksempel</text>
-    <text xml:lang="zh-tw">例子</text>
-    <text xml:lang="sr" lang3="srp">Primer</text>
-    <text xml:lang="ja" lang3="jpn">例</text>
-    <text xml:lang="pl" lang3="pol">Przykład</text>
-    <text xml:lang="hi" lang3="hin">udAharaNa</text>
-    <text xml:lang="th" lang3="tha">ตัวอย่าง</text>
-    <text xml:lang="nl" lang3="nld">Voorbeeld</text>
-    <text xml:lang="ru" lang3="rus">Пример</text>
-    <text xml:lang="tr" lang3="tur">Örnek</text>
-    <text xml:lang="bg" lang3="bul">Пример</text>
-    <text xml:lang="el" lang3="ell">Παράδειγμα</text>
-    <text xml:lang="ca" lang3="cat">Exemple</text>
-    <text xml:lang="la" lang3="lat">Exemplum</text>
-    <text xml:lang="hr" lang3="hrv">Primjer</text>
-    <text xml:lang="ko" lang3="kor">예</text>
-  </entry>
-  <entry>
-    <key>Global attributes and those inherited from</key>
-    <text xml:lang="es" lang3="spa">Atributos globales y los heredados de</text>
-    <text xml:lang="ca" lang3="cat">Atributs globals i els heretats de</text>
-    <text xml:lang="en" lang3="eng">Global attributes and those inherited from</text>
-    <text xml:lang="de" lang3="deu">Global gültige Attribute und solche ererbt von ...</text>
-    <text xml:lang="ro" lang3="ron">Atributele globale şi cele moştenite din</text>
-    <text xml:lang="fr" lang3="fra">Attributs globaux et hérités</text>
-    <text xml:lang="pt" lang3="por">Atributos globais e herdados de...</text>
-    <text xml:lang="it" lang3="ita">Attributi globali e quelli ereditati da</text>
-    <text xml:lang="sl" lang3="slv">Globalni atributi in tisti, sprejeti iz</text>
-    <text xml:lang="sv" lang3="swe">Globala attribut samt de som ärvts från</text>
-    <text xml:lang="no" lang3="nor">Globale attributter og de som arves fra</text>
-    <text xml:lang="zh-tw">全域屬性和從...繼承的屬性</text>
-    <text xml:lang="sr" lang3="srp">Globalni atributi i atributi koji se nasledjuju</text>
-    <text xml:lang="ja" lang3="jpn">グローバル属性または継承した属性</text>
-    <text xml:lang="pl" lang3="pol">Atrybuty globalne i odziedziczone po...</text>
-    <text xml:lang="hi" lang3="hin">Vishva Guna Aur Jinmese Adhikara Paya</text>
-    <text xml:lang="th" lang3="tha">คุณสมบัติโดยรวมและที่เทียบโอนมา</text>
-    <text xml:lang="nl" lang3="nld">Globale attributen en attributen geërfd van</text>
-    <text xml:lang="ru" lang3="rus">Глобальные атрибуты и атрибуты, унаследованные от</text>
-    <text xml:lang="tr" lang3="tur">Genel ve ~'dan kalıtsal öznitelikler</text>
-    <text xml:lang="bg" lang3="bul">Глобални атрибути и атрибути, наследени от</text>
-    <text xml:lang="el" lang3="ell">Χαρακτηριστικά καθολικά και κληρονομικά από</text>
-    <text xml:lang="ca" lang3="cat">Atributs globals i aquells heretats de</text>
-    <text xml:lang="la" lang3="lat">Attributa universalia et haereditaria</text>
-    <text xml:lang="hr" lang3="hrv">Globalni i naslijeđeni atributi</text>
-    <text xml:lang="ko" lang3="kor">전반적 속성 및 상속 속성</text>
-  </entry>
-  <entry>
-    <key>Global attributes only</key>
-    <text xml:lang="ca" lang3="cat">A més dels atributs globals i dels heretats de</text>
-    <text xml:lang="en" lang3="eng">Global attributes only</text>
-    <text xml:lang="de" lang3="deu">Nur global gültige Attribute</text>
-    <text xml:lang="ro" lang3="ron">Numai atributele globale</text>
-    <text xml:lang="fr" lang3="fra">Attributs globaux seulement</text>
-    <text xml:lang="pt" lang3="por">Só atributos globais</text>
-    <text xml:lang="es" lang3="spa">Solo atributos globales</text>
-    <text xml:lang="it" lang3="ita">Solo attributi globali</text>
-    <text xml:lang="sl" lang3="slv">Samo globalni atributi</text>
-    <text xml:lang="sv" lang3="swe">Endast globala attribut</text>
-    <text xml:lang="no" lang3="nor">Kun globale attributter</text>
-    <text xml:lang="zh-tw">僅全域屬性</text>
-    <text xml:lang="sr" lang3="srp">Isključivo globalni atributi</text>
-    <text xml:lang="ja" lang3="jpn">グローバル属性のみ</text>
-    <text xml:lang="pl" lang3="pol">Wyłącznie atrybuty globalne</text>
-    <text xml:lang="hi" lang3="hin">Keval Vishva Guna</text>
-    <text xml:lang="th" lang3="tha">คุณสมบัติโดยรวมเท่านั้น</text>
-    <text xml:lang="nl" lang3="nld">Enkel globale attributen</text>
-    <text xml:lang="ru" lang3="rus">Только глобальные атрибуты</text>
-    <text xml:lang="tr" lang3="tur">Sadece genel öznitelikler</text>
-    <text xml:lang="bg" lang3="bul">Само глобални атрибути</text>
-    <text xml:lang="el" lang3="ell">Μόνο καθολικά χαρακτηριστικά</text>
-    <text xml:lang="ca" lang3="cat">Només atributs globals</text>
-    <text xml:lang="la" lang3="lat">Attributa universalia tantum</text>
-    <text xml:lang="hr" lang3="hrv">Samo globalni atributi</text>
-    <text xml:lang="ko" lang3="kor">전체 속성만 허용</text>
-  </entry>
-  <entry>
-    <key>In addition to global attributes</key>
-    <text xml:lang="ca" lang3="cat">Els valors suggerits inclouen</text>
-    <text xml:lang="en" lang3="eng">In addition to global attributes</text>
-    <text xml:lang="de" lang3="deu">Neben global gültigen Attributen</text>
-    <text xml:lang="ro" lang3="ron">În plus faţă de atributele globale</text>
-    <text xml:lang="fr" lang3="fra">En complément des attributs globaux</text>
-    <text xml:lang="pt" lang3="por">Para além de atributos globais</text>
-    <text xml:lang="es" lang3="spa">Además de los atributos globales</text>
-    <text xml:lang="it" lang3="ita">Oltre agli attributi globali</text>
-    <text xml:lang="sl" lang3="slv">Poleg globalnih atributov</text>
-    <text xml:lang="sv" lang3="swe">Förutom globala attribut</text>
-    <text xml:lang="no" lang3="nor">I tillegg til globale attributter</text>
-    <text xml:lang="zh-tw">除全域屬性以外</text>
-    <text xml:lang="sr" lang3="srp">Pored globalnih atributa</text>
-    <text xml:lang="ja" lang3="jpn">グローバル属性の他</text>
-    <text xml:lang="pl" lang3="pol">Oprócz atrybutów globalnych</text>
-    <text xml:lang="hi" lang3="hin">Vishva Guna Ke Alava</text>
-    <text xml:lang="th" lang3="tha">คุณสมบัติโดยรวมเพิ่มเติม</text>
-    <text xml:lang="nl" lang3="nld">Naast de globale attributen</text>
-    <text xml:lang="ru" lang3="rus">Вдобавок к глобальным атрибутам</text>
-    <text xml:lang="tr" lang3="tur">Genel özniteliklerden başka</text>
-    <text xml:lang="bg" lang3="bul">Освен глобалните атрибути</text>
-    <text xml:lang="el" lang3="ell">Πλήν των καθολικών χαρακτηριστικών</text>
-    <text xml:lang="ca" lang3="cat">A més dels atributs globals</text>
-    <text xml:lang="la" lang3="lat">Praeter attributa universalia</text>
-    <text xml:lang="hr" lang3="hrv">Uz globalne atribute</text>
-    <text xml:lang="ko" lang3="kor">전체 속성에 부가</text>
-  </entry>
-  <entry>
-    <key>In addition to global attributes and those inherited from</key>
-    <text xml:lang="en" lang3="eng">In addition to global attributes and those inherited from</text>
-    <text xml:lang="de" lang3="deu">Neben global gültigen Attributen und solchen ererbt von ...</text>
-    <text xml:lang="ro" lang3="ron">În plus faţă de atributele globale şi de cele moştenite din</text>
-    <text xml:lang="fr" lang3="fra">En complément des attributs globaux et hérités</text>
-    <text xml:lang="pt" lang3="por">Para além de atributos globais e herdados de...</text>
-    <text xml:lang="it" lang3="ita">Oltre agli attributi globali e a quelli ereditati da</text>
-    <text xml:lang="sl" lang3="slv">Poleg globalnih atributov in tistih, sprejetih iz</text>
-    <text xml:lang="sv" lang3="swe">Förutom globala attribut samt de som ärvts från</text>
-    <text xml:lang="no" lang3="nor">I tillegg til globale attributter og de som arves fra</text>
-    <text xml:lang="zh-tw">除全域屬性和從...繼承的屬性以外</text>
-    <text xml:lang="sr" lang3="srp">Pored globalnih atributa i onih koji se nasledjuju</text>
-    <text xml:lang="ja" lang3="jpn">グローバル属性または継承した属性の他</text>
-    <text xml:lang="pl" lang3="pol">Oprócz atrybutów globalnych i odziedziczonych po...</text>
-    <text xml:lang="hi" lang3="hin">Vishva Guna Ke Alava Aur Jinmese Adhikara Paya</text>
-    <text xml:lang="th" lang3="tha">คุณสมบัติโดยรวมและที่เทียบโอนมาเพิ่มเติม</text>
-    <text xml:lang="nl" lang3="nld">Naast de globale attributen en de attributen geërfd van</text>
-    <text xml:lang="ru" lang3="rus">Вдобавок к глобальным атрибутам и атрибутам, унаследованным от</text>
-    <text xml:lang="tr" lang3="tur">Genel ve ~'dan kalıtsal özniteliklerden başka</text>
-    <text xml:lang="bg" lang3="bul">Освен глобалните атрибути и атрибутите, наследени от</text>
-    <text xml:lang="el" lang3="ell">Πλήν τωνχαρακτηριστικών καθολικών και κληρονομικών από</text>
-    <text xml:lang="ca" lang3="cat">A més dels atributs globals i els heretats de</text>
-    <text xml:lang="es" lang3="spa">Además de los atributos globales y los heredados de</text>
-    <text xml:lang="ko" lang3="kor">&gt;전체 속성 및 상속 속성에 부가</text>
-  </entry>
-  <entry>
-    <key>Legal values are</key>
-    <text xml:lang="en" lang3="eng">Legal values are</text>
-    <text xml:lang="de" lang3="deu">Gültige Werte</text>
-    <text xml:lang="ro" lang3="ron">Valorile admise sunt</text>
-    <text xml:lang="fr" lang3="fra">Les valeurs autorisées sont</text>
-    <text xml:lang="pt" lang3="por">Valores permitidos são</text>
-    <text xml:lang="es" lang3="spa">Los valores admitidos son</text>
-    <text xml:lang="it" lang3="ita">I valori legali sono</text>
-    <text xml:lang="sl" lang3="slv">Veljavne vrednosti so</text>
-    <text xml:lang="sv" lang3="swe">Tillåtna värden är</text>
-    <text xml:lang="no" lang3="nor">Lovlige verdier er</text>
-    <text xml:lang="zh-tw">合法的值是</text>
-    <text xml:lang="sr" lang3="srp">Dozvoljene vrednosti su</text>
-    <text xml:lang="ja" lang3="jpn">正当な値</text>
-    <text xml:lang="pl" lang3="pol">Dozwolone wartości to</text>
-    <text xml:lang="hi" lang3="hin">niyamAnukUla guNa Hai</text>
-    <text xml:lang="th" lang3="tha">คุณค่าทางกฎหมายคือ</text>
-    <text xml:lang="nl" lang3="nld">Geldige waarden zijn</text>
-    <text xml:lang="ru" lang3="rus">Разрешенные величины:</text>
-    <text xml:lang="tr" lang3="tur">Geçerli değerler:</text>
-    <text xml:lang="bg" lang3="bul">Разрешените стойности са</text>
-    <text xml:lang="el" lang3="ell">Οι νόμιμες τιμές είναι</text>
-    <text xml:lang="ca" lang3="cat">Els valors permesos són</text>
-    <text xml:lang="la" lang3="lat">Valores permissae</text>
-    <text xml:lang="hr" lang3="hrv">Dozvoljene su vrijednosti</text>
-    <text xml:lang="ko" lang3="kor">적법한 값은</text>
-  </entry>
-  <entry>
-    <key>Macros defined</key>
-    <text xml:lang="en" lang3="eng">Macros defined</text>
-    <text xml:lang="de" lang3="deu">Definierte Makros</text>
-    <text xml:lang="ro" lang3="ron">Macrouri definite</text>
-    <text xml:lang="fr" lang3="fra">Macros définies</text>
-    <text xml:lang="pt" lang3="por">Macros definidas</text>
-    <text xml:lang="es" lang3="spa">Macros definidas</text>
-    <text xml:lang="it" lang3="ita">Macro definite</text>
-    <text xml:lang="sl" lang3="slv">Definirani makri</text>
-    <text xml:lang="sv" lang3="swe">Definierade makron</text>
-    <text xml:lang="no" lang3="nor">Definerete makroer</text>
-    <text xml:lang="zh-tw">被定義的巨指令</text>
-    <text xml:lang="sr" lang3="srp">Definisani makroi</text>
-    <text xml:lang="ja" lang3="jpn">定義済みマクロ</text>
-    <text xml:lang="pl" lang3="pol">Zdefiniowane makra</text>
-    <text xml:lang="th" lang3="tha">โคร</text>
-    <text xml:lang="nl" lang3="nld">Gedefinieerde macro's</text>
-    <text xml:lang="ru" lang3="rus">Определенные макросы</text>
-    <text xml:lang="tr" lang3="tur">Tanımlı makrolar</text>
-    <text xml:lang="bg" lang3="bul">Дефинирани макроси</text>
-    <text xml:lang="el" lang3="ell">Οριζόμενες μακροεντολές</text>
-    <text xml:lang="ca" lang3="cat">Macros definides</text>
-    <text xml:lang="la" lang3="lat">Macromandata definita</text>
-    <text xml:lang="hr" lang3="hrv">Definirane makronaredbe</text>
-    <text xml:lang="ko" lang3="kor">정의 크로</text>
-  </entry>
-  <entry>
-    <key>Mandatory when applicable</key>
-    <text xml:lang="en" lang3="eng">Mandatory when applicable</text>
-    <text xml:lang="de" lang3="deu">Obligatorisch wenn zutreffend</text>
-    <text xml:lang="ro" lang3="ron">Obligatoriu dacă se potriveşte</text>
-    <text xml:lang="fr" lang3="fra">Obligatoire quand applicable</text>
-    <text xml:lang="pt" lang3="por">Obrigatório quando aplicável</text>
-    <text xml:lang="es" lang3="spa">Obligatorios cuando se aplican</text>
-    <text xml:lang="it" lang3="ita">Obbligatorio se applicabile</text>
-    <text xml:lang="sl" lang3="slv">Obvezen, če ustreza</text>
-    <text xml:lang="sv" lang3="swe">Obligatorisk om användbar</text>
-    <text xml:lang="no" lang3="nor">Obligatorisk når aktuelt</text>
-    <text xml:lang="zh-tw">可應用時必備的</text>
-    <text xml:lang="sr" lang3="srp">Obavezan, ako se može primeniti</text>
-    <text xml:lang="ja" lang3="jpn">使えるならば必須</text>
-    <text xml:lang="pl" lang3="pol">Obowiązkowe w stosownych przypadkach</text>
-    <text xml:lang="hi" lang3="hin">anivArya JaHa uchita</text>
-    <text xml:lang="th" lang3="tha">ต้องได้รับการอนุมัติเมื่อสมัครเรียน</text>
-    <text xml:lang="nl" lang3="nld">Verplicht indien van toepassing</text>
-    <text xml:lang="ru" lang3="rus">Обязательный, если применим</text>
-    <text xml:lang="tr" lang3="tur">Uygulanabilirse zorunlu</text>
-    <text xml:lang="bg" lang3="bul">Задължителен, ако е приложим</text>
-    <text xml:lang="el" lang3="ell">Υποχρεωτικός αν είναι εφαρμόσιμος</text>
-    <text xml:lang="ca" lang3="cat">Obligatoris quan siga possible</text>
-    <text xml:lang="la" lang3="lat">Obligatoria in loco proprio</text>
-    <text xml:lang="hr" lang3="hrv">Obavezno na odgovarajućem mjestu</text>
-    <text xml:lang="ko" lang3="kor">의무적 적용</text>
-  </entry>
-  <entry>
-    <key>Members</key>
-    <text xml:lang="en" lang3="eng">Members</text>
-    <text xml:lang="de" lang3="deu">Mitglieder</text>
-    <text xml:lang="ro" lang3="ron">Membri</text>
-    <text xml:lang="fr" lang3="fra">Membres</text>
-    <text xml:lang="pt" lang3="por">Membros</text>
-    <text xml:lang="es" lang3="spa">Miembros</text>
-    <text xml:lang="it" lang3="ita">Membri</text>
-    <text xml:lang="sl" lang3="slv">Člani</text>
-    <text xml:lang="sv" lang3="swe">Medlemmar</text>
-    <text xml:lang="no" lang3="nor">Medlemmer</text>
-    <text xml:lang="zh-tw"> 成員</text>
-    <text xml:lang="sr" lang3="srp">Članovi</text>
-    <text xml:lang="ja" lang3="jpn">構成</text>
-    <text xml:lang="pl" lang3="pol">Członkowie</text>
-    <text xml:lang="hi" lang3="hin">sadasya</text>
-    <text xml:lang="th" lang3="tha">สมาชิก</text>
-    <text xml:lang="nl" lang3="nld">Leden</text>
-    <text xml:lang="ru" lang3="rus">Члены</text>
-    <text xml:lang="tr" lang3="tur">Üyeler</text>
-    <text xml:lang="bg" lang3="bul">Членове</text>
-    <text xml:lang="el" lang3="ell">Μέλη</text>
-    <text xml:lang="ca" lang3="cat">Membres</text>
-    <text xml:lang="la" lang3="lat">Membra</text>
-    <text xml:lang="hr" lang3="hrv">Članovi</text>
-    <text xml:lang="ko" lang3="kor">원소</text>
-  </entry>
-  <entry>
-    <key>Module</key>
-    <text xml:lang="en" lang3="eng">Module</text>
-    <text xml:lang="de" lang3="deu">Modul</text>
-    <text xml:lang="ro" lang3="ron">Modul</text>
-    <text xml:lang="fr" lang3="fra">Module</text>
-    <text xml:lang="pt" lang3="por">Módulo</text>
-    <text xml:lang="es" lang3="spa">Módulo</text>
-    <text xml:lang="it" lang3="ita">Modulo</text>
-    <text xml:lang="sl" lang3="slv">Modul</text>
-    <text xml:lang="sv" lang3="swe">Modul</text>
-    <text xml:lang="no" lang3="nor">Modul</text>
-    <text xml:lang="zh-tw">組件</text>
-    <text xml:lang="sr" lang3="srp">Modul</text>
-    <text xml:lang="ja" lang3="jpn">モジュール</text>
-    <text xml:lang="pl" lang3="pol">Moduł</text>
-    <text xml:lang="th" lang3="tha">หลักสูตรการศึกษา</text>
-    <text xml:lang="nl" lang3="nld">Module</text>
-    <text xml:lang="ru" lang3="rus">Модуль</text>
-    <text xml:lang="tr" lang3="tur">Modül</text>
-    <text xml:lang="bg" lang3="bul">Модул</text>
-    <text xml:lang="el" lang3="ell">Στοιχείο</text>
-    <text xml:lang="ca" lang3="cat">Mòdul</text>
-    <text xml:lang="la" lang3="lat">Modulus</text>
-    <text xml:lang="hr" lang3="hrv">Modul</text>
-    <text xml:lang="ko" lang3="kor">모듈</text>
-  </entry>
-  <entry>
-    <key>Note</key>
-    <text xml:lang="en" lang3="eng">Note</text>
-    <text xml:lang="de" lang3="deu">Anmerkung</text>
-    <text xml:lang="ro" lang3="ron">Notă</text>
-    <text xml:lang="fr" lang3="fra">Note</text>
-    <text xml:lang="pt" lang3="por">Nota</text>
-    <text xml:lang="es" lang3="spa">Nota</text>
-    <text xml:lang="it" lang3="ita">Nota</text>
-    <text xml:lang="sl" lang3="slv">Opomba</text>
-    <text xml:lang="sv" lang3="swe">Notering</text>
-    <text xml:lang="no" lang3="nor">Note</text>
-    <text xml:lang="zh-tw">註</text>
-    <text xml:lang="sr" lang3="srp">Napomena</text>
-    <text xml:lang="ja" lang3="jpn">解説</text>
-    <text xml:lang="pl" lang3="pol">Uwagi</text>
-    <text xml:lang="hi" lang3="hin">lekha</text>
-    <text xml:lang="th" lang3="tha">หมายเหตุ</text>
-    <text xml:lang="nl" lang3="nld">Opmerking</text>
-    <text xml:lang="ru" lang3="rus">Примечание</text>
-    <text xml:lang="tr" lang3="tur">Not</text>
-    <text xml:lang="bg" lang3="bul">Забележка</text>
-    <text xml:lang="el" lang3="ell">Σχόλιο</text>
-    <text xml:lang="ca" lang3="cat">Nota</text>
-    <text xml:lang="la" lang3="lat">Notula</text>
-    <text xml:lang="hr" lang3="hrv">Bilješka</text>
-    <text xml:lang="ko" lang3="kor">주석</text>
-  </entry>
-  <entry>
-    <key>Optional</key>
-    <text xml:lang="en" lang3="eng">Optional</text>
-    <text xml:lang="de" lang3="deu">Optional</text>
-    <text xml:lang="ro" lang3="ron">Opţional</text>
-    <text xml:lang="fr" lang3="fra">Optionel</text>
-    <text xml:lang="pt" lang3="por">Opcional</text>
-    <text xml:lang="es" lang3="spa">Opcional</text>
-    <text xml:lang="it" lang3="ita">Opzionale</text>
-    <text xml:lang="sl" lang3="slv">Neobvezen</text>
-    <text xml:lang="sv" lang3="swe">Valfri</text>
-    <text xml:lang="no" lang3="nor">Valgfritt</text>
-    <text xml:lang="zh-tw">非必備的</text>
-    <text xml:lang="sr" lang3="srp">Neobavezan</text>
-    <text xml:lang="ja" lang3="jpn">任意</text>
-    <text xml:lang="pl" lang3="pol">Opcjonalny</text>
-    <text xml:lang="hi" lang3="hin">vaikalpika</text>
-    <text xml:lang="th" lang3="tha">ตัวเลือก</text>
-    <text xml:lang="nl" lang3="nld">Optioneel</text>
-    <text xml:lang="ru" lang3="rus">Факультативный</text>
-    <text xml:lang="tr" lang3="tur">Seçmeli</text>
-    <text xml:lang="bg" lang3="bul">Незадължителен</text>
-    <text xml:lang="el" lang3="ell">Προαιρετικός</text>
-    <text xml:lang="ca" lang3="cat">Opcional</text>
-    <text xml:lang="la" lang3="lat">Si libet</text>
-    <text xml:lang="hr" lang3="hrv">Po želji</text>
-    <text xml:lang="ko" lang3="kor">수의적</text>
-  </entry>
-  <entry>
-    <entry>
-      <key>Required</key>
-      <text xml:lang="en" lang3="eng">Required</text>
-      <text xml:lang="de" lang3="deu">Obligatorisch</text>
-      <text xml:lang="ro" lang3="ron">Obligatoriu</text>
-      <text xml:lang="fr" lang3="fra">Requis</text>
-      <text xml:lang="pt" lang3="por">Obrigatório</text>
-      <text xml:lang="es" lang3="spa">Necesario</text>
-      <text xml:lang="it" lang3="ita">Richiesto</text>
-      <text xml:lang="sl" lang3="slv">Zahtevan</text>
-      <text xml:lang="sv" lang3="swe">Nödvändig</text>
-      <text xml:lang="no" lang3="nor">Obligatorisk</text>
-      <text xml:lang="zh-tw">必備的</text>
-      <text xml:lang="sr" lang3="srp">Tražen</text>
-      <text xml:lang="ja" lang3="jpn">必須</text>
-      <text xml:lang="pl" lang3="pol">Wymagany</text>
-      <text xml:lang="hi" lang3="hin">Avashyaka</text>
-      <text xml:lang="th" lang3="tha">ต้องการข้อมูล</text>
-      <text xml:lang="nl" lang3="nld">Verplicht</text>
-      <text xml:lang="ru" lang3="rus">Обязательный</text>
-      <text xml:lang="tr" lang3="tur">Gerekli</text>
-      <text xml:lang="bg" lang3="bul">Задължителен</text>
-      <text xml:lang="el" lang3="ell">Απαραίτητος</text>
-      <text xml:lang="ca" lang3="cat">Requerit</text>
-      <text xml:lang="la" lang3="lat">Necessarium</text>
-      <text xml:lang="hr" lang3="hrv">Obavezno</text>
-      <text xml:lang="ko" lang3="kor">필수적</text>
-    </entry>
-    <key>Recommended</key>
-    <text xml:lang="en" lang3="eng">Recommended</text>
-    <text xml:lang="de" lang3="deu">Empfohlen</text>
-    <text xml:lang="ro" lang3="ron">Recomandat</text>
-    <text xml:lang="fr" lang3="fra">Recommendé</text>
-    <text xml:lang="pt" lang3="por">Recomendado</text>
-    <text xml:lang="es" lang3="spa">Recomendado</text>
-    <text xml:lang="it" lang3="ita">Consigliato</text>
-    <text xml:lang="sl" lang3="slv">Priporočen</text>
-    <text xml:lang="sv" lang3="swe">Rekommenderad</text>
-    <text xml:lang="no" lang3="nor">Anbefalt</text>
-    <text xml:lang="zh-tw">推薦的</text>
-    <text xml:lang="sr" lang3="srp">Preporučen</text>
-    <text xml:lang="ja" lang3="jpn">推薦される</text>
-    <text xml:lang="pl" lang3="pol">Zalecany</text>
-    <text xml:lang="hi" lang3="hin">svIkArniYa</text>
-    <text xml:lang="th" lang3="tha">คำแนะนำ</text>
-    <text xml:lang="nl" lang3="nld">Aanbevolen</text>
-    <text xml:lang="ru" lang3="rus">Рекомендуемый</text>
-    <text xml:lang="tr" lang3="tur">Önerilen</text>
-    <text xml:lang="bg" lang3="bul">Препоръчителен</text>
-    <text xml:lang="el" lang3="ell">Συστημένος</text>
-    <text xml:lang="ca" lang3="cat">Recomanat</text>
-    <text xml:lang="la" lang3="lat">Commendata</text>
-    <text xml:lang="hr" lang3="hrv">Preporučeno</text>
-    <text xml:lang="ko" lang3="kor">권고적</text>
-  </entry>
-  <entry>
-    <key>Recommended when applicable</key>
-    <text xml:lang="en" lang3="eng">Recommended when applicable</text>
-    <text xml:lang="de" lang3="deu">Empfohlen wenn zutreffend</text>
-    <text xml:lang="ro" lang3="ron">Recomandat dacă se potriveşte</text>
-    <text xml:lang="fr" lang3="fra">Recommendé quand applicable</text>
-    <text xml:lang="pt" lang3="por">Recomendado quando aplicável</text>
-    <text xml:lang="es" lang3="spa">Recomendado cuando se aplica</text>
-    <text xml:lang="it" lang3="ita">Consigliato se applicabile</text>
-    <text xml:lang="sl" lang3="slv">Priporočen, če ustreza</text>
-    <text xml:lang="sv" lang3="swe">Rekommenderad om användbar</text>
-    <text xml:lang="no" lang3="nor">Anbefalt når aktuelt</text>
-    <text xml:lang="zh-tw">可應用時推薦應用</text>
-    <text xml:lang="sr" lang3="srp">Preporučen, ako se može primeniti</text>
-    <text xml:lang="ja" lang3="jpn">利用できる場合は推奨．</text>
-    <text xml:lang="pl" lang3="pol">Zalecany w stosownych przypadkach</text>
-    <text xml:lang="hi" lang3="hin">Avashyaka JaHa uchita</text>
-    <text xml:lang="th" lang3="tha">ต้องการข้อมูลเมื่อสมัคร</text>
-    <text xml:lang="nl" lang3="nld">Aanbevolen indien van toepassing</text>
-    <text xml:lang="ca" lang3="cat">Recomanat quan siga possible</text>
-    <text xml:lang="la" lang3="lat">Commendata in loco proprio</text>
-    <text xml:lang="hr" lang3="hrv">Preporučeno na odgovarajućem mjestu</text>
-    <text xml:lang="ru" lang3="rus">Желателен, если применим</text>
-    <text xml:lang="tr" lang3="tur">Önerilen gereken</text>
-    <text xml:lang="bg" lang3="bul">Препоръчителен, където е приложим</text>
-    <text xml:lang="el" lang3="ell">Συνιστώμενος αν είναι εφαρμόσιμος</text>
-  </entry>
-
-  <entry>
-    <key>Sample values include</key>
-    <text xml:lang="en" lang3="eng">Sample values include</text>
-    <text xml:lang="de" lang3="deu">Beispielwerte sind etwa</text>
-    <text xml:lang="ro" lang3="ron">De exemplu, valorile pot fi</text>
-    <text xml:lang="fr" lang3="fra">Exemple de valeurs possibles</text>
-    <text xml:lang="pt" lang3="por">Exemplos de valores incluidos</text>
-    <text xml:lang="es" lang3="spa">Posibles valores</text>
-    <text xml:lang="it" lang3="ita">I valori esemplificativi includono</text>
-    <text xml:lang="sl" lang3="slv">Možne vrednosti so denimo</text>
-    <text xml:lang="sv" lang3="swe">Exempel på värden som kan inkluderas</text>
-    <text xml:lang="no" lang3="nor">Eksempler på mulige verdier er</text>
-    <text xml:lang="zh-tw">實例值包含</text>
-    <text xml:lang="sr" lang3="srp">Neke moguće vrednosti su</text>
-    <text xml:lang="ja" lang3="jpn">例としての値は以下の通り</text>
-    <text xml:lang="pl" lang3="pol">Przykładowe wartości obejmują</text>
-    <text xml:lang="hi" lang3="hin">misAla guNa mein Sammil Hai</text>
-    <text xml:lang="th" lang3="tha">รวมค่าตัวอย่าง</text>
-    <text xml:lang="nl" lang3="nld">Voorbeeldwaarden zijn onder meer</text>
-    <text xml:lang="ru" lang3="rus">Примерные величины включают</text>
-    <text xml:lang="tr" lang3="tur">Örnek değerler arasında</text>
-    <text xml:lang="bg" lang3="bul">Примерните стойности включват</text>
-    <text xml:lang="el" lang3="ell">Οι δειγματικές τιμές συμπεριλαμβάνουν</text>
-    <text xml:lang="ca" lang3="cat">Exemples de valors possibles</text>
-    <text xml:lang="la" lang3="lat">Valores exemplares</text>
-    <text xml:lang="hr" lang3="hrv">Primjer vrijednosti</text>
-    <text xml:lang="ko" lang3="kor">샘플 값은 다음을 포함한다 Sample values include</text>
-  </entry>
-  <entry>
-    <key>Status</key>
-    <text xml:lang="en" lang3="eng">Status</text>
-    <text xml:lang="de" lang3="deu">Zustand</text>
-    <text xml:lang="ro" lang3="ron">Stare</text>
-    <text xml:lang="fr" lang3="fra">Statut</text>
-    <text xml:lang="pt" lang3="por">Status</text>
-    <text xml:lang="es" lang3="spa">Estado</text>
-    <text xml:lang="it" lang3="ita">Stato</text>
-    <text xml:lang="sl" lang3="slv">Stanje</text>
-    <text xml:lang="sv" lang3="swe">Status</text>
-    <text xml:lang="no" lang3="nor">Status</text>
-    <text xml:lang="zh-tw">狀態</text>
-    <text xml:lang="sr" lang3="srp">Status</text>
-    <text xml:lang="ja" lang3="jpn">状態</text>
-    <text xml:lang="pl" lang3="pol">Status</text>
-    <text xml:lang="th" lang3="tha">สถานะ</text>
-    <text xml:lang="nl" lang3="nld">Status</text>
-    <text xml:lang="ru" lang3="rus">Состояние</text>
-    <text xml:lang="tr" lang3="tur">Durum</text>
-    <text xml:lang="bg" lang3="bul">Състояние</text>
-    <text xml:lang="el" lang3="ell">Κατάσταση</text>
-    <text xml:lang="ca" lang3="cat">Estat</text>
-    <text xml:lang="la" lang3="lat">Status</text>
-    <text xml:lang="hr" lang3="hrv">Stanje</text>
-    <text xml:lang="ko" lang3="kor">상태</text>
-  </entry>
-  <entry>
-    <key>Suggested values include</key>
-    <text xml:lang="es" lang3="spa">Los valores sugeridos incluyen</text>
-    <text xml:lang="en" lang3="eng">Suggested values include</text>
-    <text xml:lang="de" lang3="deu">Empfohlene Werte sind</text>
-    <text xml:lang="ro" lang3="ron">Valori recomandate sunt</text>
-    <text xml:lang="fr" lang3="fra">Les valeurs suggérées comprennent</text>
-    <text xml:lang="pt" lang3="por">Os valores sugeridos incluem</text>
-    <text xml:lang="it" lang3="ita">I valori suggeriti includono</text>
-    <text xml:lang="sl" lang3="slv">Priporočene vrednosti so denimo</text>
-    <text xml:lang="sv" lang3="swe">Förslag på värden som bör inkluderas</text>
-    <text xml:lang="no" lang3="nor">Eksempler på verdier som foreslås er</text>
-    <text xml:lang="zh-tw">被推薦的值包含</text>
-    <text xml:lang="sr" lang3="srp">Preporučene vrednosti su</text>
-    <text xml:lang="ja" lang3="jpn">提案する値は以下の通り</text>
-    <text xml:lang="pl" lang3="pol">Sugerowane wartości obejmują</text>
-    <text xml:lang="hi" lang3="hin">sujheeT guNa mein Sammil Hai</text>
-    <text xml:lang="th" lang3="tha">รวมค่าแนะนำ</text>
-    <text xml:lang="nl" lang3="nld">Voorgestelde waarden</text>
-    <text xml:lang="ru" lang3="rus">Рекомендуемые величины включают</text>
-    <text xml:lang="tr" lang3="tur">Önerilen değerler arasında</text>
-    <text xml:lang="bg" lang3="bul">Препоръчваните стойности включват</text>
-    <text xml:lang="el" lang3="ell">Οι συστημένες τιμές συμπεριλαμβάνουν</text>
-    <text xml:lang="ca" lang3="cat">Exemples de valors suggerits</text>
-    <text xml:lang="la" lang3="lat">Valores propositae sunt</text>
-    <text xml:lang="hr" lang3="hrv">Predložene su vrijednosti</text>
-    <text xml:lang="ko" lang3="kor">제안값은 다음을 포함한다</text>
-  </entry>
-  <entry>
-    <key>Values</key>
-    <text xml:lang="en" lang3="eng">Values</text>
-    <text xml:lang="de" lang3="deu">Werte</text>
-    <text xml:lang="ro" lang3="ron">Valori</text>
-    <text xml:lang="fr" lang3="fra">Valeurs</text>
-    <text xml:lang="pt" lang3="por">Valores</text>
-    <text xml:lang="es" lang3="spa">Valores</text>
-    <text xml:lang="it" lang3="ita">Valori</text>
-    <text xml:lang="sl" lang3="slv">Vrednosti</text>
-    <text xml:lang="sv" lang3="swe">Värden</text>
-    <text xml:lang="no" lang3="nor">Verdier</text>
-    <text xml:lang="zh-tw">值</text>
-    <text xml:lang="sr" lang3="srp">Vrednosti</text>
-    <text xml:lang="ja" lang3="jpn">値</text>
-    <text xml:lang="pl" lang3="pol">Wartości</text>
-    <text xml:lang="hi" lang3="hin">guNa</text>
-    <text xml:lang="nl" lang3="nld">Waarden</text>
-    <text xml:lang="ru" lang3="rus">Величины</text>
-    <text xml:lang="tr" lang3="tur">Değerler</text>
-    <text xml:lang="bg" lang3="bul">Стойности</text>
-    <text xml:lang="el" lang3="ell">Τιμές</text>
-    <text xml:lang="ca" lang3="cat">Valors</text>
-    <text xml:lang="la" lang3="lat">Valores</text>
-    <text xml:lang="hr" lang3="hrv">Vrijednosti</text>
-    <text xml:lang="ko" lang3="kor">값</text>
-  </entry>
-  <entry>
-    <key>include</key>
-    <text xml:lang="en" lang3="eng">include</text>
-    <text xml:lang="de" lang3="deu">enthalten</text>
-    <text xml:lang="ro" lang3="ron">conţin</text>
-    <text xml:lang="fr" lang3="fra">inclure</text>
-    <text xml:lang="pt" lang3="por">inclui (incluem)</text>
-    <text xml:lang="es" lang3="spa">incluir</text>
-    <text xml:lang="it" lang3="ita">include</text>
-    <text xml:lang="sl" lang3="slv">vsebuje</text>
-    <text xml:lang="sv" lang3="swe">inkludera</text>
-    <text xml:lang="no" lang3="nor">inkludere</text>
-    <text xml:lang="zh-tw">包含</text>
-    <text xml:lang="sr" lang3="srp">uključuje</text>
-    <text xml:lang="ja" lang3="jpn">含む</text>
-    <text xml:lang="pl" lang3="pol">włącz</text>
-    <text xml:lang="hi" lang3="hin">sammil</text>
-    <text xml:lang="th" lang3="tha">รวมถึง</text>
-    <text xml:lang="nl" lang3="nld">zijn onder meer</text>
-    <text xml:lang="ru" lang3="rus">включить</text>
-    <text xml:lang="tr" lang3="tur">içer</text>
-    <text xml:lang="bg" lang3="bul">включи</text>
-    <text xml:lang="el" lang3="ell">ενσωμάτωσης</text>
-    <text xml:lang="ca" lang3="cat">inclou</text>
-    <text xml:lang="la" lang3="lat">inclusum est</text>
-    <text xml:lang="hr" lang3="hrv">sadrži</text>
-    <text xml:lang="ko" lang3="kor">포함한다</text>
-  </entry>
-  <entry>
-    <key>appendixWords</key>
-    <text xml:lang="en" lang3="eng">Appendix</text>
-    <text xml:lang="de" lang3="deu">Anhang</text>
-    <text xml:lang="ro" lang3="ron">Apendice</text>
-    <text xml:lang="fr" lang3="fra">Annexe</text>
-    <text xml:lang="pt" lang3="por">Apêndice</text>
-    <text xml:lang="es" lang3="spa">Apéndice</text>
-    <text xml:lang="it" lang3="ita">Appendice</text>
-    <text xml:lang="sl" lang3="slv">Dodatek</text>
-    <text xml:lang="sv" lang3="swe">Bilaga</text>
-    <text xml:lang="no" lang3="nor">Vedlegg</text>
-    <text xml:lang="zh-tw">附錄</text>
-    <text xml:lang="sr" lang3="srp">Dodatak</text>
-    <text xml:lang="ja" lang3="jpn">付録</text>
-    <text xml:lang="pl" lang3="pol">Dodatek</text>
-    <text xml:lang="hi" lang3="hin">Atirikta</text>
-    <text xml:lang="th" lang3="tha">ภาคผนวก</text>
-    <text xml:lang="nl" lang3="nld">Appendix</text>
-    <text xml:lang="ru" lang3="rus">Приложение</text>
-    <text xml:lang="tr" lang3="tur">Ek</text>
-    <text xml:lang="bg" lang3="bul">Приложение</text>
-    <text xml:lang="el" lang3="ell">Παράρτημα</text>
-    <text xml:lang="ca" lang3="cat">Apèndix</text>
-    <text xml:lang="la" lang3="lat">Appendix</text>
-    <text xml:lang="hr" lang3="hrv">Dodatak</text>
-    <text xml:lang="ko" lang3="kor">부록</text>
-  </entry>
-  <entry>
-    <key>editorWord</key>
-    <text xml:lang="en" lang3="eng">Editor</text> 
-  </entry>
-  <entry>
-    <key>authorWord</key>
-    <text xml:lang="en" lang3="eng">Author</text>
-   <text xml:lang="de" lang3="deu">Autor</text>
-    <text xml:lang="ro" lang3="ron">Autor</text>
-    <text xml:lang="fr" lang3="fra">Auteur</text>
-    <text xml:lang="pt" lang3="por">Autor</text>
-    <text xml:lang="es" lang3="spa">Autor</text>
-    <text xml:lang="it" lang3="ita">Autore</text>
-    <text xml:lang="sl" lang3="slv">Avtor</text>
-    <text xml:lang="sv" lang3="swe">Författare</text>
-    <text xml:lang="no" lang3="nor">Forfatter</text>
-    <text xml:lang="zh-tw">作者</text>
-    <text xml:lang="sr" lang3="srp">Autor</text>
-    <text xml:lang="ja" lang3="jpn">著者</text>
-    <text xml:lang="pl" lang3="pol">Autor</text>
-    <text xml:lang="hi" lang3="hin">Lekhaka</text>
-    <text xml:lang="th" lang3="tha">ผู้แต่ง</text>
-    <text xml:lang="nl" lang3="nld">Auteur</text>
-    <text xml:lang="ru" lang3="rus">Автор</text>
-    <text xml:lang="tr" lang3="tur">Yazar</text>
-    <text xml:lang="bg" lang3="bul">Автор</text>
-    <text xml:lang="el" lang3="ell">Δημιουργός</text>
-    <text xml:lang="ca" lang3="cat">Autor</text>
-    <text xml:lang="la" lang3="lat">Auctor</text>
-    <text xml:lang="hr" lang3="hrv">Autor</text>
-    <text xml:lang="ko" lang3="kor">저자</text>
-  </entry>
-  <entry>
-    <key>biblioWords</key>
-    <text xml:lang="en" lang3="eng">Bibliography</text>
-    <text xml:lang="de" lang3="deu">Bibliographie</text>
-    <text xml:lang="ro" lang3="ron">Bibliografie</text>
-    <text xml:lang="fr" lang3="fra">Bibliographie</text>
-    <text xml:lang="pt" lang3="por">Bibiografia</text>
-    <text xml:lang="es" lang3="spa">Bibliografía</text>
-    <text xml:lang="it" lang3="ita">Bibliografia</text>
-    <text xml:lang="sl" lang3="slv">Bibliografija</text>
-    <text xml:lang="sv" lang3="swe">Bibliografi</text>
-    <text xml:lang="no" lang3="nor">Bibliografi</text>
-    <text xml:lang="zh-tw">參考書目</text>
-    <text xml:lang="sr" lang3="srp">Bibliografija</text>
-    <text xml:lang="ja" lang3="jpn">目録</text>
-    <text xml:lang="pl" lang3="pol">Bibliografia</text>
-    <text xml:lang="hi" lang3="hin">Bibliography</text>
-    <text xml:lang="th" lang3="tha">บรรณานุกรม</text>
-    <text xml:lang="nl" lang3="nld">Bibliografie</text>
-    <text xml:lang="ru" lang3="rus">Библиография</text>
-    <text xml:lang="tr" lang3="tur">Bibliyografya</text>
-    <text xml:lang="bg" lang3="bul">Литература</text>
-    <text xml:lang="el" lang3="ell">Βιβλιογραφία</text>
-    <text xml:lang="ca" lang3="cat">Bibliografia</text>
-    <text xml:lang="la" lang3="lat">Auctores</text>
-    <text xml:lang="hr" lang3="hrv">Bibliografija</text>
-    <text xml:lang="ko" lang3="kor">서지목록</text>
-  </entry>
-  <entry>
-    <key>contentsHeading</key>
-    <text xml:lang="en" lang3="eng">Sections in this document:</text>
-    <text xml:lang="de" lang3="deu">Abschnitte in diesem Dokument:</text>
-    <text xml:lang="ro" lang3="ron">Capitolele acestui document:</text>
-    <text xml:lang="fr" lang3="fra">Sections de ce document:</text>
-    <text xml:lang="pt" lang3="por">Índice geral:</text>
-    <text xml:lang="es" lang3="spa">Secciones en este documento:</text>
-    <text xml:lang="it" lang3="ita">Sommario di questo documento:</text>
-    <text xml:lang="sl" lang3="slv">Razdelki v tem dokumentu:</text>
-    <text xml:lang="sv" lang3="swe">Sektioner i detta dokument</text>
-    <text xml:lang="no" lang3="nor">Deler i dette dokumentet:</text>
-    <text xml:lang="zh-tw">本文章節:</text>
-    <text xml:lang="sr" lang3="srp">Odeljci u ovom dokumentu:</text>
-    <text xml:lang="ja" lang3="jpn">表題</text>
-    <text xml:lang="pl" lang3="pol">Sekcje zawarte w bieżącym dokumencie:</text>
-    <text xml:lang="th" lang3="tha">บทในเอกสารนี้</text>
-    <text xml:lang="nl" lang3="nld">Onderdelen van dit document:</text>
-    <text xml:lang="ru" lang3="rus">Разделы в этом документе:</text>
-    <text xml:lang="tr" lang3="tur">Bu belgenin bölümleri:</text>
-    <text xml:lang="bg" lang3="bul">Раздели в този документ:</text>
-    <text xml:lang="el" lang3="ell">Τμήματα αυτού του εγγράφου:</text>
-    <text xml:lang="ca" lang3="cat">Seccions en aquest document:</text>
-    <text xml:lang="la" lang3="lat">Capitula textus:</text>
-    <text xml:lang="hr" lang3="hrv">Odjeljci ovog dokumenta:</text>
-    <text xml:lang="ko" lang3="kor">본 문서의 절</text>
-  </entry>
-  <entry>
-    <key>contentsWord</key>
-    <text xml:lang="en" lang3="eng">Contents</text>
-    <text xml:lang="de" lang3="deu">Inhalt</text>
-    <text xml:lang="ro" lang3="ron">Cuprins</text>
-    <text xml:lang="fr" lang3="fra">Contenu</text>
-    <text xml:lang="pt" lang3="por">Índice geral</text>
-    <text xml:lang="es" lang3="spa">Contenidos</text>
-    <text xml:lang="sl" lang3="slv">Vsebina</text>
-    <text xml:lang="sv" lang3="swe">Innehåll</text>
-    <text xml:lang="no" lang3="nor">Innhold</text>
-    <text xml:lang="zh-tw">內容</text>
-    <text xml:lang="sr" lang3="srp">Sadržaj</text>
-    <text xml:lang="ja" lang3="jpn">目次</text>
-    <text xml:lang="pl" lang3="pol">Spis treści</text>
-    <text xml:lang="hi" lang3="hin">Mula Shabda</text>
-    <text xml:lang="th" lang3="tha">เนื้อหา</text>
-    <text xml:lang="nl" lang3="nld">Inhoud</text>
-    <text xml:lang="ru" lang3="rus">Оглавление</text>
-    <text xml:lang="tr" lang3="tur">İçerik</text>
-    <text xml:lang="bg" lang3="bul">Съдържание</text>
-    <text xml:lang="el" lang3="ell">Περιεχόμενα</text>
-    <text xml:lang="ca" lang3="cat">Índex general</text>
-    <text xml:lang="it" lang3="ita">Argomenti</text>
-    <text xml:lang="la" lang3="lat">Tabula contentorum</text>
-    <text xml:lang="hr" lang3="hrv">Sadržaj</text>
-    <text xml:lang="ko" lang3="kor">내용</text>
-  </entry>
-  <entry>
-    <key>dateWord</key>
-    <text xml:lang="en" lang3="eng">Date</text>
-    <text xml:lang="de" lang3="deu">Datum</text>
-    <text xml:lang="ro" lang3="ron">Data</text>
-    <text xml:lang="fr" lang3="fra">Date</text>
-    <text xml:lang="pt" lang3="por">Data</text>
-    <text xml:lang="es" lang3="spa">Fecha</text>
-    <text xml:lang="it" lang3="ita">Data</text>
-    <text xml:lang="sl" lang3="slv">Datum</text>
-    <text xml:lang="sv" lang3="swe">Datum</text>
-    <text xml:lang="no" lang3="nor">Dato</text>
-    <text xml:lang="zh-tw">日期</text>
-    <text xml:lang="sr" lang3="srp">Datum</text>
-    <text xml:lang="ja" lang3="jpn">日付</text>
-    <text xml:lang="pl" lang3="pol">Data</text>
-    <text xml:lang="hi" lang3="hin">Tarikha</text>
-    <text xml:lang="th" lang3="tha">วันที่</text>
-    <text xml:lang="nl" lang3="nld">Datum</text>
-    <text xml:lang="ru" lang3="rus">Дата</text>
-    <text xml:lang="tr" lang3="tur">Tarih</text>
-    <text xml:lang="bg" lang3="bul">Дата</text>
-    <text xml:lang="el" lang3="ell">Ημερομηνία</text>
-    <text xml:lang="ca" lang3="cat">Dataa</text>
-    <text xml:lang="la" lang3="lat">Die dato</text>
-    <text xml:lang="hr" lang3="hrv">Datum</text>
-    <text xml:lang="ko" lang3="kor">날짜</text>
-  </entry>
-  <entry>
-    <key>feedbackWords</key>
-    <text xml:lang="en" lang3="eng">Feedback</text>
-    <text xml:lang="de" lang3="deu">Kommentare</text>
-    <text xml:lang="ro" lang3="ron">Retur</text>
-    <text xml:lang="fr" lang3="fra">Commentaires</text>
-    <text xml:lang="pt" lang3="por">Comentários</text>
-    <text xml:lang="es" lang3="spa">Comentarios</text>
-    <text xml:lang="it" lang3="ita">Commenti e suggerimenti</text>
-    <text xml:lang="sl" lang3="slv">Odzivi</text>
-    <text xml:lang="sv" lang3="swe">Kommentarer</text>
-    <text xml:lang="no" lang3="nor">Kommentarer</text>
-    <text xml:lang="zh-tw">回饋</text>
-    <text xml:lang="sr" lang3="srp">Komentari</text>
-    <text xml:lang="ja" lang3="jpn">ご意見・ご感想</text>
-    <text xml:lang="pl" lang3="pol">Komentarze</text>
-    <text xml:lang="hi" lang3="hin">Tippani</text>
-    <text xml:lang="th" lang3="tha">ตอบกลับ</text>
-    <text xml:lang="nl" lang3="nld">Feedback</text>
-    <text xml:lang="ru" lang3="rus">Отзывы</text>
-    <text xml:lang="tr" lang3="tur">Geri besleme</text>
-    <text xml:lang="bg" lang3="bul">Коментари</text>
-    <text xml:lang="el" lang3="ell">Γνώμες</text>
-    <text xml:lang="ca" lang3="cat">Comentaris</text>
-    <text xml:lang="la" lang3="lat">Responsiones</text>
-    <text xml:lang="hr" lang3="hrv">Komentari</text>
-    <text xml:lang="ko" lang3="kor">피드백</text>
-  </entry>
-  <entry>
-    <key>figureWord</key>
-    <text xml:lang="en" lang3="eng">Figure</text>
-    <text xml:lang="de" lang3="deu">Abbildung</text>
-    <text xml:lang="ro" lang3="ron">Figura</text>
-    <text xml:lang="fr" lang3="fra">Figure</text>
-    <text xml:lang="pt" lang3="por">Figura</text>
-    <text xml:lang="es" lang3="spa">Imagen</text>
-    <text xml:lang="it" lang3="ita">Figura</text>
-    <text xml:lang="sl" lang3="slv">Slika</text>
-    <text xml:lang="sv" lang3="swe">Figur</text>
-    <text xml:lang="no" lang3="nor">Figur</text>
-    <text xml:lang="zh-tw">圖表</text>
-    <text xml:lang="sr" lang3="srp">Slika</text>
-    <text xml:lang="ja" lang3="jpn">図</text>
-    <text xml:lang="pl" lang3="pol">Rysunek</text>
-    <text xml:lang="hi" lang3="hin">Chitr</text>
-    <text xml:lang="th" lang3="tha">ภาพ</text>
-    <text xml:lang="nl" lang3="nld">Afbeelding</text>
-    <text xml:lang="ru" lang3="rus">Фигура</text>
-    <text xml:lang="tr" lang3="tur">Şekil</text>
-    <text xml:lang="bg" lang3="bul">Фигура</text>
-    <text xml:lang="el" lang3="ell">Σχήμα</text>
-    <text xml:lang="ca" lang3="cat">Figura</text>
-    <text xml:lang="la" lang3="lat">Figura</text>
-    <text xml:lang="hr" lang3="hrv">Ilustracija</text>
-    <text xml:lang="ko" lang3="kor">그림</text>
-  </entry>
-  <entry>
-    <key>figureWords</key>
-    <text xml:lang="en" lang3="eng">Figures</text>
-    <text xml:lang="de" lang3="deu">Abbildungen</text>
-    <text xml:lang="ro" lang3="ron">Figuri</text>
-    <text xml:lang="fr" lang3="fra">Figures</text>
-    <text xml:lang="pt" lang3="por">Figuras</text>
-    <text xml:lang="es" lang3="spa">Imágenes</text>
-    <text xml:lang="it" lang3="ita">Figure</text>
-    <text xml:lang="sl" lang3="slv">Slike</text>
-    <text xml:lang="sv" lang3="swe">Figurer</text>
-    <text xml:lang="no" lang3="nor">Figurer</text>
-    <text xml:lang="zh-tw">圖表</text>
-    <text xml:lang="sr" lang3="srp">Slike</text>
-    <text xml:lang="ja" lang3="jpn">図</text>
-    <text xml:lang="pl" lang3="pol">Rysunki</text>
-    <text xml:lang="hi" lang3="hin">Chitr</text>
-    <text xml:lang="th" lang3="tha">ภาพ</text>
-    <text xml:lang="nl" lang3="nld">Afbeeldingen</text>
-    <text xml:lang="ru" lang3="rus">Фигуры</text>
-    <text xml:lang="tr" lang3="tur">Şekiller</text>
-    <text xml:lang="bg" lang3="bul">Фигури</text>
-    <text xml:lang="el" lang3="ell">Σχήματα</text>
-    <text xml:lang="ca" lang3="cat">Figures</text>
-    <text xml:lang="la" lang3="lat">Figurae</text>
-    <text xml:lang="hr" lang3="hrv">Ilustracije</text>
-    <text xml:lang="ko" lang3="kor">그림들</text>
-  </entry>
-  <entry>
-    <key>nextWord</key>
-    <text xml:lang="en" lang3="eng">Next</text>
-    <text xml:lang="de" lang3="deu">Nächstes</text>
-    <text xml:lang="ro" lang3="ron">Următorul</text>
-    <text xml:lang="fr" lang3="fra">Suivant</text>
-    <text xml:lang="pt" lang3="por">Seguinte</text>
-    <text xml:lang="es" lang3="spa">Siguiente</text>
-    <text xml:lang="it" lang3="ita">Seguente</text>
-    <text xml:lang="sl" lang3="slv">Naslednji</text>
-    <text xml:lang="sv" lang3="swe">Nästa</text>
-    <text xml:lang="no" lang3="nor">Neste</text>
-    <text xml:lang="zh-tw">下一頁</text>
-    <text xml:lang="sr" lang3="srp">Sledeći</text>
-    <text xml:lang="ja" lang3="jpn">次</text>
-    <text xml:lang="pl" lang3="pol">Następny</text>
-    <text xml:lang="hi" lang3="hin">Agala</text>
-    <text xml:lang="th" lang3="tha">ต่อไป</text>
-    <text xml:lang="nl" lang3="nld">Volgende</text>
-    <text xml:lang="ru" lang3="rus">Следующий</text>
-    <text xml:lang="tr" lang3="tur">Sonraki</text>
-    <text xml:lang="bg" lang3="bul">Следващ</text>
-    <text xml:lang="el" lang3="ell">Επόμενος</text>
-    <text xml:lang="ca" lang3="cat">Següent</text>
-    <text xml:lang="la" lang3="lat">Porro</text>
-    <text xml:lang="hr" lang3="hrv">Dalje</text>
-    <text xml:lang="ko" lang3="kor">다음</text>
-  </entry>
-  <entry>
-    <key>noteHeading</key>
-    <text xml:lang="en" lang3="eng">Notes</text>
-    <text xml:lang="de" lang3="deu">Noten</text>
-    <text xml:lang="ro" lang3="ron">Note</text>
-    <text xml:lang="fr" lang3="fra">Notes</text>
-    <text xml:lang="pt" lang3="por">Nota</text>
-    <text xml:lang="es" lang3="spa">Notas</text>
-    <text xml:lang="it" lang3="ita">Note</text>
-    <text xml:lang="sl" lang3="slv">Opombe</text>
-    <text xml:lang="sv" lang3="swe">Noteringar</text>
-    <text xml:lang="no" lang3="nor">Noter</text>
-    <text xml:lang="zh-tw">註解</text>
-    <text xml:lang="sr" lang3="srp">Napomene</text>
-    <text xml:lang="ja" lang3="jpn">注釈</text>
-    <text xml:lang="pl" lang3="pol">Uwagi</text>
-    <text xml:lang="hi" lang3="hin">Dhyan</text>
-    <text xml:lang="th" lang3="tha">หมายเหตุ</text>
-    <text xml:lang="nl" lang3="nld">Opmerkingen</text>
-    <text xml:lang="ru" lang3="rus">Примечания</text>
-    <text xml:lang="tr" lang3="tur">Notlar</text>
-    <text xml:lang="bg" lang3="bul">Забележки</text>
-    <text xml:lang="el" lang3="ell">Σχόλια</text>
-    <text xml:lang="ca" lang3="cat">Notes</text>
-    <text xml:lang="la" lang3="lat">Notae</text>
-    <text xml:lang="hr" lang3="hrv">Bilješke</text>
-    <text xml:lang="ko" lang3="kor">주석</text>
-  </entry>
-  <entry>
-    <key>previousWord</key>
-    <text xml:lang="en" lang3="eng">Previous</text>
-    <text xml:lang="de" lang3="deu">Vorheriges</text>
-    <text xml:lang="ro" lang3="ron">Precedentul</text>
-    <text xml:lang="fr" lang3="fra">Précédent</text>
-    <text xml:lang="pt" lang3="por">Prévio</text>
-    <text xml:lang="es" lang3="spa">Anterior</text>
-    <text xml:lang="it" lang3="ita">Precedente</text>
-    <text xml:lang="sl" lang3="slv">Prejšnji</text>
-    <text xml:lang="sv" lang3="swe">Föregående</text>
-    <text xml:lang="no" lang3="nor">Forrige</text>
-    <text xml:lang="zh-tw">上一頁</text>
-    <text xml:lang="sr" lang3="srp">Prethodni</text>
-    <text xml:lang="ja" lang3="jpn">前</text>
-    <text xml:lang="pl" lang3="pol">Poprzedni</text>
-    <text xml:lang="hi" lang3="hin">Purva"</text>
-    <text xml:lang="nl" lang3="nld">Vorige</text>
-    <text xml:lang="ru" lang3="rus">Предыдущий</text>
-    <text xml:lang="tr" lang3="tur">Önceki</text>
-    <text xml:lang="bg" lang3="bul">Предходен</text>
-    <text xml:lang="el" lang3="ell">Προηγούμενος</text>
-    <text xml:lang="ca" lang3="cat">Anterior</text>
-    <text xml:lang="la" lang3="lat">Retro</text>
-    <text xml:lang="hr" lang3="hrv">Natrag</text>
-    <text xml:lang="ko" lang3="kor">이전</text>
-  </entry>
-  <entry>
-    <key>revisedWord</key>
-    <text xml:lang="en" lang3="eng">revised</text>
-    <text xml:lang="de" lang3="deu">überarbeitet</text>
-    <text xml:lang="ro" lang3="ron">revăzut</text>
-    <text xml:lang="fr" lang3="fra">révisé</text>
-    <text xml:lang="pt" lang3="por">revisto</text>
-    <text xml:lang="es" lang3="spa">Revisado</text>
-    <text xml:lang="it" lang3="ita">revisionato</text>
-    <text xml:lang="sl" lang3="slv">dopolnjeno</text>
-    <text xml:lang="sv" lang3="swe">Ändrad</text>
-    <text xml:lang="no" lang3="nor">Revidert</text>
-    <text xml:lang="zh-tw">修訂</text>
-    <text xml:lang="sr" lang3="srp">izmenjeno</text>
-    <text xml:lang="ja" lang3="jpn">改訂</text>
-    <text xml:lang="pl" lang3="pol">poprawione</text>
-    <text xml:lang="hi" lang3="hin">duharAnA</text>
-    <text xml:lang="th" lang3="tha">ทบทวน</text>
-    <text xml:lang="nl" lang3="nld">herzien</text>
-    <text xml:lang="ru" lang3="rus">Пересмотрено</text>
-    <text xml:lang="tr" lang3="tur">Düzeltilmiş</text>
-    <text xml:lang="bg" lang3="bul">Променено</text>
-    <text xml:lang="el" lang3="ell">Μετάβλητο</text>
-    <text xml:lang="ca" lang3="cat">Revisat</text>
-    <text xml:lang="la" lang3="lat">Accurate revisum</text>
-    <text xml:lang="hr" lang3="hrv">Pregledano</text>
-    <text xml:lang="ko" lang3="kor">수정</text>
-  </entry>
-  <entry>
-    <key>searchWords</key>
-    <text xml:lang="en" lang3="eng">Search</text>
-    <text xml:lang="de" lang3="deu">Suche</text>
-    <text xml:lang="ro" lang3="ron">Caută</text>
-    <text xml:lang="fr" lang3="fra">Recherche</text>
-    <text xml:lang="pt" lang3="por">Pesquisa</text>
-    <text xml:lang="es" lang3="spa">Buscar</text>
-    <text xml:lang="it" lang3="ita">Cerca</text>
-    <text xml:lang="sl" lang3="slv">Iskanje</text>
-    <text xml:lang="sv" lang3="swe">Sök</text>
-    <text xml:lang="no" lang3="nor">Sok</text>
-    <text xml:lang="zh-tw">搜尋</text>
-    <text xml:lang="sr" lang3="srp">Pretraga</text>
-    <text xml:lang="ja" lang3="jpn">検索</text>
-    <text xml:lang="pl" lang3="pol">Szukaj</text>
-    <text xml:lang="hi" lang3="hin">Khoj</text>
-    <text xml:lang="th" lang3="tha">ค้นหา</text>
-    <text xml:lang="nl" lang3="nld">Zoeken</text>
-    <text xml:lang="ru" lang3="rus">Поиск</text>
-    <text xml:lang="tr" lang3="tur">Ara</text>
-    <text xml:lang="bg" lang3="bul">Търси</text>
-    <text xml:lang="el" lang3="ell">Ψάχνε</text>
-    <text xml:lang="ca" lang3="cat">Cercar</text>
-    <text xml:lang="la" lang3="lat">Quaere</text>
-    <text xml:lang="hr" lang3="hrv">Pretraživanje</text>
-    <text xml:lang="ko" lang3="kor">검색</text>
-  </entry>
-  <entry>
-    <key>tableWord</key>
-    <text xml:lang="en" lang3="eng">Table</text>
-    <text xml:lang="de" lang3="deu">Tabelle</text>
-    <text xml:lang="ro" lang3="ron">Tabel</text>
-    <text xml:lang="fr" lang3="fra">Table</text>
-    <text xml:lang="pt" lang3="por">Tabela</text>
-    <text xml:lang="es" lang3="spa">Tabla</text>
-    <text xml:lang="it" lang3="ita">Tavola</text>
-    <text xml:lang="sl" lang3="slv">Tabela</text>
-    <text xml:lang="sv" lang3="swe">Tabell</text>
-    <text xml:lang="no" lang3="nor">Tabell</text>
-    <text xml:lang="zh-tw">表格</text>
-    <text xml:lang="sr" lang3="srp">Tabela</text>
-    <text xml:lang="ja" lang3="jpn">表</text>
-    <text xml:lang="pl" lang3="pol">Tabela</text>
-    <text xml:lang="hi" lang3="hin">Patti</text>
-    <text xml:lang="th" lang3="tha">ตาราง</text>
-    <text xml:lang="nl" lang3="nld">Tabel</text>
-    <text xml:lang="ru" lang3="rus">Таблица</text>
-    <text xml:lang="tr" lang3="tur">Tablo</text>
-    <text xml:lang="bg" lang3="bul">Таблица</text>
-    <text xml:lang="el" lang3="ell">Πίνακας</text>
-    <text xml:lang="ca" lang3="cat">Taula</text>
-    <text xml:lang="la" lang3="lat">Tabella</text>
-    <text xml:lang="hr" lang3="hrv">Tablica</text>
-    <text xml:lang="ko" lang3="kor">표</text>
-  </entry>
-  <entry>
-    <key>tableWords</key>
-    <text xml:lang="en" lang3="eng">Tables</text>
-    <text xml:lang="de" lang3="deu">Tabellen</text>
-    <text xml:lang="ro" lang3="ron">Tabele</text>
-    <text xml:lang="fr" lang3="fra">Tables</text>
-    <text xml:lang="pt" lang3="por">Tabelas</text>
-    <text xml:lang="es" lang3="spa">Tablas</text>
-    <text xml:lang="it" lang3="ita">Tavole</text>
-    <text xml:lang="sl" lang3="slv">Tabele</text>
-    <text xml:lang="sv" lang3="swe">Tabeller</text>
-    <text xml:lang="no" lang3="nor">Tabeller</text>
-    <text xml:lang="zh-tw">表格</text>
-    <text xml:lang="sr" lang3="srp">Tabele</text>
-    <text xml:lang="ja" lang3="jpn">表</text>
-    <text xml:lang="pl" lang3="pol">Tabele</text>
-    <text xml:lang="hi" lang3="hin">Pattiya</text>
-    <text xml:lang="th" lang3="tha">คาราง</text>
-    <text xml:lang="nl" lang3="nld">Tabellen</text>
-    <text xml:lang="ru" lang3="rus">Таблицы</text>
-    <text xml:lang="tr" lang3="tur">Tablolar</text>
-    <text xml:lang="bg" lang3="bul">Таблици</text>
-    <text xml:lang="el" lang3="ell">Πίνακες</text>
-    <text xml:lang="ca" lang3="cat">Taules</text>
-    <text xml:lang="la" lang3="lat">Tabellae</text>
-    <text xml:lang="hr" lang3="hrv">Tablice</text>
-    <text xml:lang="ko" lang3="kor">표들</text>
-  </entry>
-  <entry>
-    <key>tocWords</key>
-    <text xml:lang="en" lang3="eng">Table of contents</text>
-    <text xml:lang="de" lang3="deu">Inhalt</text>
-    <text xml:lang="ro" lang3="ron">Cuprins</text>
-    <text xml:lang="fr" lang3="fra">Contenu</text>
-    <text xml:lang="pt" lang3="por">Índice geral</text>
-    <text xml:lang="es" lang3="spa">Índice</text>
-    <text xml:lang="it" lang3="ita">Indice</text>
-    <text xml:lang="sl" lang3="slv">Kazalo</text>
-    <text xml:lang="sv" lang3="swe">Innehåll</text>
-    <text xml:lang="no" lang3="nor">Innhold</text>
-    <text xml:lang="zh-tw">內容</text>
-    <text xml:lang="sr" lang3="srp">Sadržaj</text>
-    <text xml:lang="ja" lang3="jpn">目次</text>
-    <text xml:lang="pl" lang3="pol">Spis treści</text>
-    <text xml:lang="hi" lang3="hin">mula</text>
-    <text xml:lang="th" lang3="tha">สารบัญ</text>
-    <text xml:lang="nl" lang3="nld">Inhoud</text>
-    <text xml:lang="ru" lang3="rus">Оглавление</text>
-    <text xml:lang="tr" lang3="tur">İçerik</text>
-    <text xml:lang="bg" lang3="bul">Съдържание</text>
-    <text xml:lang="el" lang3="ell">Περιεχόμενα</text>
-    <text xml:lang="ca" lang3="cat">Índice general</text>
-    <text xml:lang="la" lang3="lat">Tabula contentorum</text>
-    <text xml:lang="hr" lang3="hrv">Sadržaj</text>
-    <text xml:lang="ko" lang3="kor">목차</text>
-  </entry>
-  <entry>
-    <key>upWord</key>
-    <text xml:lang="en" lang3="eng">Up</text>
-    <text xml:lang="de" lang3="deu">Aufwärts</text>
-    <text xml:lang="ro" lang3="ron">Sus</text>
-    <text xml:lang="fr" lang3="fra">Haut</text>
-    <text xml:lang="pt" lang3="por">Topo</text>
-    <text xml:lang="es" lang3="spa">Arriba</text>
-    <text xml:lang="it" lang3="ita">Su</text>
-    <text xml:lang="sl" lang3="slv">Gor</text>
-    <text xml:lang="sv" lang3="swe">Upp</text>
-    <text xml:lang="no" lang3="nor">Opp</text>
-    <text xml:lang="zh-tw">往上</text>
-    <text xml:lang="sr" lang3="srp">Gore</text>
-    <text xml:lang="ja" lang3="jpn">上</text>
-    <text xml:lang="pl" lang3="pol">W górę</text>
-    <text xml:lang="hi" lang3="hin">Upara Shabda</text>
-    <text xml:lang="th" lang3="tha">ไปข้างบน</text>
-    <text xml:lang="nl" lang3="nld">Hoger</text>
-    <text xml:lang="ru" lang3="rus">Вверх</text>
-    <text xml:lang="tr" lang3="tur">Yukarı</text>
-    <text xml:lang="bg" lang3="bul">Нагоре</text>
-    <text xml:lang="el" lang3="ell">Ανω</text>
-    <text xml:lang="ca" lang3="cat">Amunt</text>
-    <text xml:lang="la" lang3="lat">Sursum</text>
-    <text xml:lang="hr" lang3="hrv">Gore</text>
-    <text xml:lang="ko" lang3="kor">상위</text>
-  </entry>
-  <entry>
-    <key>appearsintheoriginalas</key>
-    <text xml:lang="en" lang3="eng">Appears in the original as</text>
-    <text xml:lang="es" lang3="spa">Aparece en el original como</text>
-    <text xml:lang="ca" lang3="cat">Apareix en l'original com</text>
-    <text xml:lang="de" lang3="deu">Erscheint im Original als</text>
-    <text xml:lang="la" lang3="lat">In exemplari legitur</text>
-    <text xml:lang="hr" lang3="hrv">U izvorniku se pojavljuje kao</text>
-    <text xml:lang="ko" lang3="kor">와 같이 원본에 나타난다</text>
-  </entry>
-  <text xml:lang="it" lang3="ita">Nell'originale appare come</text>
-  <entry>
-    <key>shouldbereadas</key>
-    <text xml:lang="en" lang3="eng">Should be read as</text>
-    <text xml:lang="es" lang3="spa">Debería leerse como</text>
-    <text xml:lang="ca" lang3="cat">S'hi hauria de llegir</text>
-    <text xml:lang="it" lang3="ita">Da leggersi come</text>
-    <text xml:lang="de" lang3="deu">Sollte gelesen werden als</text>
-    <text xml:lang="la" lang3="lat">Legendum est</text>
-    <text xml:lang="hr" lang3="hrv">Čita se kao</text>
-    <text xml:lang="ko" lang3="kor">와 같이 해석해야 한다</text>
-  </entry>
-  <entry>
-    <key>page</key>
-    <text xml:lang="en" lang3="eng">Page</text>
-    <text xml:lang="es" lang3="spa">Página</text>
-    <text xml:lang="ca" lang3="cat">Pàgina</text>
-    <text xml:lang="it" lang3="ita">Pagina</text>
-    <text xml:lang="de" lang3="deu">Seite</text>
-    <text xml:lang="la" lang3="lat">Pagina</text>
-    <text xml:lang="hr" lang3="hrv">Stranica</text>
-    <text xml:lang="ko" lang3="kor">쪽</text>
-  </entry>
-  <entry>
-    <key>asfoundin</key>
-    <text xml:lang="en" lang3="eng">As found in</text>
-    <text xml:lang="es" lang3="spa">Tal como se encuentra en</text>
-    <text xml:lang="ca" lang3="cat">Tal com es troba en</text>
-    <text xml:lang="de" lang3="deu">So wie gefunden in</text>
-    <text xml:lang="it" lang3="ita">Da riferirsi a</text>
-    <text xml:lang="la" lang3="lat">Ut legitur in</text>
-    <text xml:lang="hr" lang3="hrv">Prema izvoru</text>
-    <text xml:lang="ko" lang3="kor">에서와 같이 발견된</text>
-  </entry>
-  <entry>
-    <key>otherreadings</key>
-    <text xml:lang="en" lang3="eng">Other readings</text>
-    <text xml:lang="es" lang3="spa">Otras lecturas</text>
-    <text xml:lang="ca" lang3="cat">D'altres lectures</text>
-    <text xml:lang="de" lang3="deu">Andere Lesarten</text>
-    <text xml:lang="it" lang3="ita">Altre intepretazioni</text>
-    <text xml:lang="la" lang3="lat">Aliae lectiones</text>
-    <text xml:lang="hr" lang3="hrv">Druga čitanja</text>
-    <text xml:lang="ko" lang3="kor">다른 해석</text>
-  </entry>
-  <entry>
-    <key>homeWord</key>
-    <text xml:lang="ca" lang3="cat">Principal</text>
-    <text xml:lang="en" lang3="eng">Home</text>
-    <text xml:lang="fr" lang3="fra">Accueil</text>
-    <text xml:lang="pl" lang3="pol">Strona główna</text>
-    <text xml:lang="sw" lang3="swe">Hem</text>
-    <text xml:lang="th" lang3="tha">หน้าแรก</text>
-    <text xml:lang="de" lang3="deu">Anfang</text>
-    <text xml:lang="pt" lang3="por">Página inicial</text>
-    <text xml:lang="ja" lang3="jpn">ホーム</text>
-    <text xml:lang="sl" lang3="slv">Domov</text>
-    <text xml:lang="zh-tw">首頁</text>
-    <text xml:lang="no" lang3="nor">Hjem</text>
-    <text xml:lang="ro" lang3="ron">Acasă</text>
-    <text xml:lang="it" lang3="ita">Home</text>
-    <text xml:lang="es" lang3="spa">Principal</text>
-    <text xml:lang="ko" lang3="kor">가정</text>
-  </entry>
-  <entry>
-    <key>Used by</key>
-    <text xml:lang="ca" lang3="cat">Usat per</text>
-    <text xml:lang="en" lang3="eng">Used by</text>
-    <text xml:lang="pl" lang3="pol">Użyto w</text>
-    <text xml:lang="sw" lang3="swe">Används av</text>
-    <text xml:lang="de" lang3="deu">Verwendet von</text>
-    <text xml:lang="pt" lang3="por">Usado por</text>
-    <text xml:lang="no" lang3="nor">Brukt av</text>
-    <text xml:lang="sl" lang3="slv">Uporabljen v</text>
-    <text xml:lang="ja" lang3="jpn">当該モジュールを使用するもの</text>
-    <text xml:lang="zh-tw">屬於</text>
-    <text xml:lang="th" lang3="tha">ใช้โดย</text>
-    <text xml:lang="ro" lang3="ron">Folosit de</text>
-    <text xml:lang="fr" lang3="fra">Utilisé par</text>
-    <text xml:lang="it" lang3="ita">Usato da</text>
-    <text xml:lang="es" lang3="spa">Usado por</text>
-    <text xml:lang="ko" lang3="kor">에 의해 사용된</text>
-  </entry>
-  <entry>
-    <key>May contain</key>
-    <text xml:lang="ca" lang3="cat">Pot contenir</text>
-    <text xml:lang="en" lang3="eng">May contain</text>
-    <text xml:lang="pl" lang3="pol">Może zawierać</text>
-    <text xml:lang="sw" lang3="swe">Kan innehålla</text>
-    <text xml:lang="de" lang3="deu">Kann enthalten</text>
-    <text xml:lang="pt" lang3="por">Pode conter</text>
-    <text xml:lang="th" lang3="tha">ประกอบด้วย</text>
-    <text xml:lang="ja" lang3="jpn">下位</text>
-    <text xml:lang="sl" lang3="slv">Lahko vsebuje</text>
-    <text xml:lang="zh-tw">可包含</text>
-    <text xml:lang="no" lang3="nor">Kan inneholde</text>
-    <text xml:lang="ro" lang3="ron">Poate conţine</text>
-    <text xml:lang="fr" lang3="fra">Peut contenir</text>
-    <text xml:lang="it" lang3="ita">Può contenere</text>
-    <text xml:lang="es" lang3="spa">Puede contener</text>
-    <text xml:lang="ko" lang3="kor">포함할 수 있다</text>
-  </entry>
-  <entry>
-    <key>Contained by</key>
-    <text xml:lang="ca" lang3="cat">Contingut en</text>
-    <text xml:lang="ro" lang3="ron">Conţinut de</text>
-    <text xml:lang="en" lang3="eng">Contained by</text>
-    <text xml:lang="pl" lang3="pol">Zawiera się w</text>
-    <text xml:lang="sw" lang3="swe">Ingår i</text>
-    <text xml:lang="de" lang3="deu">Enthalten in</text>
-    <text xml:lang="pt" lang3="por">Contido em</text>
-    <text xml:lang="sl" lang3="slv">Vsebovan v</text>
-    <text xml:lang="ja" lang3="jpn">上位</text>
-    <text xml:lang="zh-tw">可包含在於</text>
-    <text xml:lang="no" lang3="nor">Er en del av</text>
-    <text xml:lang="th" lang3="tha">บรรจุอยู่ใน</text>
-    <text xml:lang="fr" lang3="fra">Contenu dans</text>
-    <text xml:lang="it" lang3="ita">Contenuto in</text>
-    <text xml:lang="es" lang3="spa">Contenido en</text>
-    <text xml:lang="ko" lang3="kor">에 의해 포함된</text>
-  </entry>
-  <entry>
-    <key>Compact to XML format</key>
-    <text xml:lang="ca" lang3="cat">De format compacte a XML</text>
-    <text xml:lang="en" lang3="eng">Compact to XML format</text>
-    <text xml:lang="zh-tw">簡潔式轉到XML式</text>
-    <text xml:lang="it" lang3="ita">Compatta in formato XML</text>
-    <text xml:lang="fr" lang3="fra">Transformer en syntaxe XML</text>
-    <text xml:lang="pt" lang3="por">De Compact para formato XML</text>
-    <text xml:lang="ja" lang3="jpn">XML表記</text>
-    <text xml:lang="es" lang3="spa">De formato compacto a XML</text>
-    <text xml:lang="de" lang3="deu">Vom kompakten zum XML-Format</text>
-    <text xml:lang="ko" lang3="kor">XML 형식에 따른 규약?</text>
-  </entry>
-  <entry>
-    <key>XML format to compact</key>
-    <text xml:lang="ca" lang3="cat">De format XML a compacte</text>
-    <text xml:lang="en" lang3="eng">XML format to compact</text>
-    <text xml:lang="fr" lang3="fra">Transformer en syntaxe compact</text>
-    <text xml:lang="zh-tw">XML式轉到簡潔式</text>
-    <text xml:lang="it" lang3="ita">Formato XML da compattare</text>
-    <text xml:lang="pt" lang3="por">De formato XML para Compact</text>
-    <text xml:lang="ja" lang3="jpn">簡易表記</text>
-    <text xml:lang="es" lang3="spa">De formato XML a compacto</text>
-    <text xml:lang="de" lang3="deu">Vom XML-Format zum kompakten</text>
-    <text xml:lang="ko" lang3="kor">규약에 대한 XML 형식?</text>
-  </entry>
-  <entry>
-    <key>Empty element</key>
-    <text xml:lang="ca" lang3="cat">Element buit</text>
-    <text xml:lang="en" lang3="eng">Empty element</text>
-    <text xml:lang="fr" lang3="fra">Elément vide</text>
-    <text xml:lang="zh-tw">空白元素</text>
-    <text xml:lang="it" lang3="ita">Elemento vuoto</text>
-    <text xml:lang="pt" lang3="por">Elemento vazio</text>
-    <text xml:lang="ja" lang3="jpn">空要素</text>
-    <text xml:lang="es" lang3="spa">Elemento vacío</text>
-    <text xml:lang="de" lang3="deu">Leeres Element</text>
-    <text xml:lang="ko" lang3="kor">공백 요소</text>
-  </entry>
-  <entry>
-    <key>Character data only</key>
-    <text xml:lang="ca" lang3="cat">Sols dades de caràcters</text>
-    <text xml:lang="en" lang3="eng">Character data only</text>
-    <text xml:lang="fr" lang3="fra">Des données textuelles uniquement</text>
-    <text xml:lang="zh-tw">僅文字符號資料</text>
-    <text xml:lang="it" lang3="ita">Ammessi soltanto caratteri di testo</text>
-    <text xml:lang="ja" lang3="jpn">文字データのみ</text>
-    <text xml:lang="es" lang3="spa">Sólo datos de caracteres</text>
-    <text xml:lang="de" lang3="deu">Nur Zeichen</text>
-    <text xml:lang="ko" lang3="kor">문자 자료만 허용</text>
-  </entry>
-  <entry>
-    <key>separated by whitespace</key>
-    <text xml:lang="ca" lang3="cat">separat per espai en blanc</text>
-    <text xml:lang="en" lang3="eng">separated by whitespace</text>
-    <text xml:lang="fr" lang3="fra">séparé par un espace</text>
-    <text xml:lang="zh-tw">以空白鍵隔開</text>
-    <text xml:lang="it" lang3="ita">separato da spazio bianco</text>
-    <text xml:lang="pt" lang3="por">separado por espaços</text>
-    <text xml:lang="ja" lang3="jpn">空白文字で区切られる</text>
-    <text xml:lang="es" lang3="spa">separado por espacio en blanco</text>
-    <text xml:lang="de" lang3="deu">Durch Leerzeichen getrennt</text>
-    <text xml:lang="ko" lang3="kor">공백문자로 분리됨</text>
-  </entry>
-  <entry>
-    <key>Text body</key>
-    <text xml:lang="ca" lang3="cat">Cos del text</text>
-    <text xml:lang="en" lang3="eng">Text body</text>
-    <text xml:lang="fr" lang3="fra">Corps du texte</text>
-    <text xml:lang="zh-tw">正文</text>
-    <text xml:lang="it" lang3="ita">Corpo del testo</text>
-    <text xml:lang="pt" lang3="por">Texto</text>
-    <text xml:lang="ja" lang3="jpn">本文</text>
-    <text xml:lang="es" lang3="spa">Cuerpo del texto</text>
-    <text xml:lang="de" lang3="deu">Textkörper</text>
-    <text xml:lang="ko" lang3="kor">텍스트 본문</text>
-  </entry>
-  <entry>
-    <key>Back Matter</key>
-    <text xml:lang="ca" lang3="cat">Material final</text>
-    <text xml:lang="en" lang3="eng">Back Matter</text>
-    <text xml:lang="fr" lang3="fra">Annexes</text>
-    <text xml:lang="zh-tw">正文後資訊</text>
-    <text xml:lang="ja" lang3="jpn">後付</text>
-    <text xml:lang="it" lang3="ita">Sezioni conclusive</text>
-    <text xml:lang="pt" lang3="por">Anexos</text>
-    <text xml:lang="es" lang3="spa">Material final</text>
-    <text xml:lang="de" lang3="deu">Nachspann</text>
-    <text xml:lang="ko" lang3="kor">권말 부분</text>
-  </entry>
-  <entry>
-    <key>Front Matter</key>
-    <text xml:lang="ca" lang3="cat">Material preliminar</text>
-    <text xml:lang="en" lang3="eng">Front Matter</text>
-    <text xml:lang="fr" lang3="fra">Pièces liminaires</text>
-    <text xml:lang="zh-tw">正文前資訊</text>
-    <text xml:lang="it" lang3="ita">Sezioni preliminari</text>
-    <text xml:lang="pt" lang3="por">Front Matter</text>
-    <text xml:lang="ja" lang3="jpn">前付</text>
-    <text xml:lang="es" lang3="spa">Material preliminar</text>
-    <text xml:lang="de" lang3="deu">Vorspann</text>
-    <text xml:lang="ko" lang3="kor">책 앞부분</text>
-  </entry>
-  <entry>
-    <key>Getting the most recent version</key>
-    <text xml:lang="ca" lang3="cat">Obtenir la versió més recent</text>
-    <text xml:lang="en" lang3="eng">Getting the most recent version</text>
-    <text xml:lang="fr" lang3="fra">Obtenir la dernière version</text>
-    <text xml:lang="zh-tw">取得最新版本</text>
-    <text xml:lang="it" lang3="ita">Otteni la versione più recente</text>
-    <text xml:lang="pt" lang3="por">Como obter a versão mais recente</text>
-    <text xml:lang="ja" lang3="jpn">最新版の入手方法</text>
-    <text xml:lang="es" lang3="spa">Obtener la versión más reciente</text>
-    <text xml:lang="de" lang3="deu">Die aktuellste Version holen</text>
-    <text xml:lang="ko" lang3="kor">최신 버전 얻기</text>
-  </entry>
-  <entry>
-    <key>Sourceforge Subversion Repository</key>
-    <text xml:lang="ca" lang3="cat">Magatzem Subversion en Sourceforge</text>
-    <text xml:lang="en" lang3="eng">Sourceforge Subversion Repository</text>
-    <text xml:lang="fr" lang3="fra">Répertoire Subversion dans Sourceforge</text>
-    <text xml:lang="zh-tw">P5原始檔典藏@Sourceforge</text>
-    <text xml:lang="it" lang3="ita">Sourceforge Subversion Repository</text>
-    <text xml:lang="pt" lang3="por">Sourceforge Subversion Repository</text>
-    <text xml:lang="ja" lang3="jpn">各種データ(Sourceforge)</text>
-    <text xml:lang="es" lang3="spa">Almacén Subversion en Sourceforge</text>
-    <text xml:lang="de" lang3="deu">Sourceforge Subversion Repositorium</text>
-    <text xml:lang="ko" lang3="kor">소스 하위 버전 저장소 Sourceforge Subversion Repository</text>
-  </entry>
-  <entry>
-    <key>BugsFeatures</key>
-    <text xml:lang="ca" lang3="cat">Informes d'errors, peticions de característiques</text>
-    <text xml:lang="en" lang3="eng">Bug Reports, Feature Requests, etc.</text>
-    <text xml:lang="ja" lang3="jpn">バグ報告や要望など</text>
-    <text xml:lang="fr" lang3="fra">Rapports d'erreurs, demandes de modifications etc</text>
-    <text xml:lang="zh-tw">錯誤回報、功能要求等等。</text>
-    <text xml:lang="it" lang3="ita">Liste di bug, Richieste di nuove funzionalità, etc.</text>
-    <text xml:lang="pt" lang3="por">Relatório de Erros, Pedidos de Modificaçoes, etc.</text>
-    <text xml:lang="es" lang3="spa">Informes de errores, peticiones de características</text>
-    <text xml:lang="de" lang3="deu">Fehlerberichte, Anfragen zu Funktionen, etc.</text>
-    <text xml:lang="ko" lang3="kor">버그 보고, 특성 요구 등</text>
-  </entry>
-  <entry>
-    <key>Some Popular Sections</key>
-    <text xml:lang="ca" lang3="cat">Seccions populars</text>
-    <text xml:lang="ja" lang3="jpn">代表的な章</text>
-    <text xml:lang="en" lang3="eng">Some Popular Sections</text>
-    <text xml:lang="fr" lang3="fra">Parties les plus visitées</text>
-    <text xml:lang="zh-tw">一些受歡迎的章節</text>
-    <text xml:lang="it" lang3="ita">Alcune fra le sezioni più richieste</text>
-    <text xml:lang="pt" lang3="por">Algumas Secçoes Populares</text>
-    <text xml:lang="es" lang3="spa">Secciones populares</text>
-    <text xml:lang="de" lang3="deu">Einige beliebte Sektionen</text>
-    <text xml:lang="ko" lang3="kor">인기있는 절</text>
-  </entry>
-  <entry>
-    <key>GuidelinesTEI</key>
-    <text xml:lang="ca" lang3="cat">Directrius per a la codificació i l'intercanvi de textos electrònics</text>
-    <text xml:lang="ja" lang3="jpn">TEIガイドライン</text>
-    <text xml:lang="en" lang3="eng">Guidelines for Electronic Text Encoding and Interchange</text>
-    <text xml:lang="fr" lang3="fra">Principes directeurs pour l'encodage et l'échange de textes électroniques</text>
-    <text xml:lang="zh-tw">TEI指引</text>
-    <text xml:lang="it" lang3="ita">Linee guida per la codifica e l'interscambio del testo elettronico</text>
-    <text xml:lang="pt" lang3="por">Instruçoes para Electronic Text Encoding and Interchange</text>
-    <text xml:lang="es" lang3="spa">Directrices para la codificación y el intercambio de textos electrónicos</text>
-    <text xml:lang="de" lang3="deu">Richtlinien für die Auszeichnung und den Austausch elektronischer Texte</text>
-    <text xml:lang="ko" lang3="kor">전자 텍스트 부호화 및 교환에 대한 지침</text>
-  </entry>
-  <entry>
-    <key>edited by</key>
-    <text xml:lang="ca" lang3="cat">editat per</text>
-    <text xml:lang="en" lang3="eng">edited by</text>
-    <text xml:lang="fr" lang3="fra">édité par</text>
-    <text xml:lang="zh-tw">編輯者：</text>
-    <text xml:lang="it" lang3="ita">edito da</text>
-    <text xml:lang="pt" lang3="por">editado por</text>
-    <text xml:lang="ja" lang3="jpn">監修</text>
-    <text xml:lang="es" lang3="spa">editado por</text>
-    <text xml:lang="de" lang3="deu">ediert von</text>
-    <text xml:lang="ko" lang3="kor">에 의해 편집</text>
-  </entry>
-  <entry>
-    <key>Versions of the Guidelines</key>
-    <text xml:lang="ca" lang3="cat">Versions de les directrius</text>
-    <text xml:lang="en" lang3="eng">Versions of the Guidelines</text>
-    <text xml:lang="fr" lang3="fra">Versions des Principes directeurs</text>
-    <text xml:lang="zh-tw">指引版本</text>
-    <text xml:lang="it" lang3="ita">Versioni delle Linee guida</text>
-    <text xml:lang="pt" lang3="por">Versoes das instruçoes</text>
-    <text xml:lang="ko" lang3="kor">지침 버전</text>
-    <text xml:lang="ja" lang3="jpn">ガイドラインについて</text>
-    <text xml:lang="es" lang3="spa">Versiones de las directrices</text>
-    <text xml:lang="de" lang3="deu">Versionen der Richtlinien</text>
-  </entry>
-  <entry>
-    <key>Sorted alphabetically</key>
-    <text xml:lang="ca" lang3="cat">Ordenat alfabèticament</text>
-    <text xml:lang="en" lang3="eng">Sorted alphabetically</text>
-    <text xml:lang="it" lang3="ita">In ordine alfabetico</text>
-    <text xml:lang="zh-tw">按羅馬字母排序</text>
-    <text xml:lang="fr" lang3="fra">Trié alphabétiquement</text>
-    <text xml:lang="pt" lang3="por">Ordenado alfabeticamente</text>
-    <text xml:lang="ja" lang3="jpn">アルファベット順</text>
-    <text xml:lang="es" lang3="spa">Ordenado alfabéticamente</text>
-    <text xml:lang="de" lang3="deu">Alphabetisch geordnet</text>
-    <text xml:lang="ko" lang3="kor">알파벳 순</text>
-  </entry>
-  <entry>
-    <key>Show all</key>
-    <text xml:lang="ca" lang3="cat">Mostrar tot</text>
-    <text xml:lang="en" lang3="eng">Show all</text>
-    <text xml:lang="it" lang3="ita">Mostra tutto</text>
-    <text xml:lang="zh-tw">全部顯示</text>
-    <text xml:lang="fr" lang3="fra">Toute la liste</text>
-    <text xml:lang="pt" lang3="por">Mostre tudo</text>
-    <text xml:lang="ja" lang3="jpn">一括表示</text>
-    <text xml:lang="es" lang3="spa">Mostrar todo</text>
-    <text xml:lang="de" lang3="deu">Alle anzeigen</text>
-    <text xml:lang="ko" lang3="kor">모두 보기</text>
-  </entry>
-  <entry>
-    <key>Show by module</key>
-    <text xml:lang="ca" lang3="cat">Mostrar per mòdul</text>
-    <text xml:lang="en" lang3="eng">Show by module</text>
-    <text xml:lang="it" lang3="ita">Mostra modulo per modulo</text>
-    <text xml:lang="zh-tw">按模組顯示</text>
-    <text xml:lang="fr" lang3="fra">Par module</text>
-    <text xml:lang="pt" lang3="por">Mostre por módulo</text>
-    <text xml:lang="ja" lang3="jpn">モジュール別表示</text>
-    <text xml:lang="es" lang3="spa">Mostrar por módulo</text>
-    <text xml:lang="de" lang3="deu">Nach Modulen geordnet anzeigen</text>
-    <text xml:lang="ko" lang3="kor">모듈로 보기</text>
-  </entry>
-  <entry>
-    <key>occurrences of</key>
-    <text xml:lang="ca" lang3="cat">aparicions de</text>
-    <text xml:lang="en" lang3="eng">occurrences of</text>
-    <text xml:lang="es" lang3="spa">apariciones de</text>
-    <text xml:lang="de" lang3="deu">Vorkommen von</text>
-    <text xml:lang="it" lang3="ita">occorrenze di</text>
-    <text xml:lang="zh-tw">次可出現:</text>
-    <text xml:lang="ko" lang3="kor">출현</text>
-  </entry>
-  <entry>
-    <key>author</key>
-    <text xml:lang="en" lang3="eng">Author</text>
-    <text xml:lang="de" lang3="deu">Verfasser</text>
-    <text xml:lang="fr" lang3="fra">Auteur</text>
-    <text xml:lang="it" lang3="ita">Autore</text>
-    <text xml:lang="ko" lang3="kor">저자</text>
-  </entry>
-  <entry>
-    <key>title</key>
-    <text xml:lang="en" lang3="eng">Title</text>
-    <text xml:lang="de" lang3="deu">Titel</text>
-    <text xml:lang="fr" lang3="fra">Titre</text>
-    <text xml:lang="it" lang3="ita">Titolo</text>
-    <text xml:lang="ko" lang3="kor">제목</text>
-  </entry>
-  <entry>
-    <key>remarks</key>
-    <text xml:lang="en" lang3="eng">Remarks</text>
-    <text xml:lang="de" lang3="deu">Bemerkungen</text>
-    <text xml:lang="fr" lang3="fra">Remarques</text>
-    <text xml:lang="it" lang3="ita">Osservazioni</text>
-    <text xml:lang="ko" lang3="kor">해설</text>
-  </entry>
-  <entry>
-    <key>physDesc</key>
-    <text xml:lang="en" lang3="eng">Physical description</text>
-    <text xml:lang="de" lang3="deu">Äußere Beschreibung</text>
-    <text xml:lang="fr" lang3="fra">Description physique</text>
-    <text xml:lang="it" lang3="ita">Descrizione fisica</text>
-    <text xml:lang="ko" lang3="kor">물리적 기술</text>
-  </entry>
-  <entry>
-    <key>watermarks</key>
-    <text xml:lang="en" lang3="eng">Watermarks</text>
-    <text xml:lang="de" lang3="deu">Wasserzeichen</text>
-    <text xml:lang="fr" lang3="fra">Filigrane</text>
-    <text xml:lang="it" lang3="ita">Filigrana</text>
-    <text xml:lang="ko" lang3="kor">투명 표식</text>
-  </entry>
-  <entry>
-    <key>musicNotations</key>
-    <text xml:lang="en" lang3="eng">Musical notations</text>
-    <text xml:lang="de" lang3="deu">Musikalische Notationen</text>
-    <text xml:lang="fr" lang3="fra">Notation musicale</text>
-    <text xml:lang="it" lang3="ita">Notazioni musicali</text>
-    <text xml:lang="ko" lang3="kor">음악 표기법</text>
-  </entry>
-  <entry>
-    <key>history</key>
-    <text xml:lang="en" lang3="eng">History of the manuscript</text>
-    <text xml:lang="de" lang3="deu">Geschichte der Handschrift</text>
-    <text xml:lang="fr" lang3="fra">Histoire du manuscrit</text>
-    <text xml:lang="it" lang3="ita">Storia del manoscritto</text>
-    <text xml:lang="ko" lang3="kor">필사본 역사</text>
-  </entry>
-  <entry>
-    <key>availability</key>
-    <text xml:lang="en" lang3="eng">With kind permission of </text>
-    <text xml:lang="fr" lang3="fra">With kind permission of </text>
-    <text xml:lang="it" lang3="ita">With kind permission of </text>
-    <text xml:lang="de" lang3="deu">Mit freundlicher Genehmigung von</text>
-    <text xml:lang="ko" lang3="kor">친절한 허용</text>
-  </entry>
-  <entry>
-    <key>acquisition</key>
-    <text xml:lang="en" lang3="eng">Acquisition of the manuscript</text>
-    <text xml:lang="fr" lang3="fra">Acquisition du manuscrit</text>
-    <text xml:lang="it" lang3="ita">Acquisizione del manoscritto</text>
-    <text xml:lang="de" lang3="deu">Erwerb der Handschrift</text>
-    <text xml:lang="ko" lang3="kor">필사본의의 입수</text>
-  </entry>
-  <entry>
-    <key>additions</key>
-    <text xml:lang="en" lang3="eng">Additions</text>
-    <text xml:lang="fr" lang3="fra">Compléments à posteriori</text>
-    <text xml:lang="it" lang3="ita">Aggiunte</text>
-    <text xml:lang="de" lang3="deu">Spätere Ergänzungen</text>
-    <text xml:lang="ko" lang3="kor">추가사항</text>
-  </entry>
-  <entry>
-    <key>altIdentifier[@type="formerShelfmark"]</key>
-    <text xml:lang="en" lang3="eng">Former shelfmark</text>
-    <text xml:lang="fr" lang3="fra">Cote</text>
-    <text xml:lang="it" lang3="ita">segnatura</text>
-    <text xml:lang="de" lang3="deu">Frühere Signatur</text>
-    <text xml:lang="ko" lang3="kor">이전 서가기호</text>
-  </entry>
-  <entry>
-    <key>msPart</key>
-    <text xml:lang="en" lang3="eng">Manuscript part</text>
-    <text xml:lang="fr" lang3="fra">Partie du manuscrit</text>
-    <text xml:lang="it" lang3="ita">Sezione del manoscritto</text>
-    <text xml:lang="de" lang3="deu">Handschriftenteil</text>
-    <text xml:lang="ko" lang3="kor">필사본 부분</text>
-  </entry>
-  <entry>
-    <key>binding</key>
-    <text xml:lang="en" lang3="eng">Binding</text>
-    <text xml:lang="fr" lang3="fra">Couverture</text>
-    <text xml:lang="it" lang3="ita">Legatura</text>
-    <text xml:lang="de" lang3="deu">Einband</text>
-    <text xml:lang="ko" lang3="kor">제책</text>
-  </entry>
-  <entry>
-    <key>collation</key>
-    <text xml:lang="en" lang3="eng">Collation</text>
-    <text xml:lang="fr" lang3="fra">Composition des fascicules</text>
-    <text xml:lang="it" lang3="ita">Composizione dei fascicoli</text>
-    <text xml:lang="de" lang3="deu">Lagenstruktur</text>
-    <text xml:lang="ko" lang3="kor">쪽 순서 대조</text>
-  </entry>
-  <entry>
-    <key>condition</key>
-    <text xml:lang="en" lang3="eng">Condition</text>
-    <text xml:lang="fr" lang3="fra">Etat</text>
-    <text xml:lang="it" lang3="ita">Condizioni</text>
-    <text xml:lang="de" lang3="deu">Zustand</text>
-    <text xml:lang="ko" lang3="kor">상태</text>
-  </entry>
-  <entry>
-    <key>decoDesc</key>
-    <text xml:lang="en" lang3="eng">Decoration</text>
-    <text xml:lang="fr" lang3="fra">Reliure d'art</text>
-    <text xml:lang="it" lang3="ita">Decorazione</text>
-    <text xml:lang="de" lang3="deu">Buchschmuck</text>
-    <text xml:lang="ko" lang3="kor">장식</text>
-  </entry>
-  <entry>
-    <key>extent</key>
-    <text xml:lang="en" lang3="eng">Extent</text>
-    <text xml:lang="fr" lang3="fra">Volume</text>
-    <text xml:lang="it" lang3="ita">Dimensioni</text>
-    <text xml:lang="de" lang3="deu">Umfang</text>
-    <text xml:lang="ko" lang3="kor">분량</text>
-  </entry>
-  <entry>
-    <key>foliation</key>
-    <text xml:lang="en" lang3="eng">Foliation</text>
-    <text xml:lang="fr" lang3="fra">Numérotation des pages</text>
-    <text xml:lang="it" lang3="ita">Numerazione delle pagine</text>
-    <text xml:lang="de" lang3="deu">Seitennummerierung</text>
-    <text xml:lang="ko" lang3="kor">쪽수</text>
-  </entry>
-  <entry>
-    <key>handDesc</key>
-    <text xml:lang="en" lang3="eng">Writing and hands</text>
-    <text xml:lang="fr" lang3="fra">Type d'écritures et copistes</text>
-    <text xml:lang="it" lang3="ita">Tipo di scrittura e e mani</text>
-    <text xml:lang="de" lang3="deu">Schrift und Hände</text>
-    <text xml:lang="ko" lang3="kor">집필과 필체</text>
-  </entry>
-  <entry>
-    <key>msDesc/head/title</key>
-    <text xml:lang="en" lang3="eng">Author and title</text>
-    <text xml:lang="fr" lang3="fra">Auteur et titre</text>
-    <text xml:lang="it" lang3="ita">Autore e titolo</text>
-    <text xml:lang="de" lang3="deu">Autor und Titel</text>
-    <text xml:lang="ko" lang3="kor">저자와 제목</text>
-  </entry>
-  <entry>
-    <key>origPlace</key>
-    <text xml:lang="en" lang3="eng">Place of origin</text>
-    <text xml:lang="fr" lang3="fra">Origine</text>
-    <text xml:lang="it" lang3="ita">Luogo di origine</text>
-    <text xml:lang="de" lang3="deu">Entstehungsort</text>
-    <text xml:lang="ko" lang3="kor">원본 생산 장소</text>
-  </entry>
-  <entry>
-    <key>origDate</key>
-    <text xml:lang="en" lang3="eng">Date of origin</text>
-    <text xml:lang="fr" lang3="fra">Période</text>
-    <text xml:lang="it" lang3="ita">Datazione</text>
-    <text xml:lang="de" lang3="deu">Entstehungszeit</text>
-    <text xml:lang="ko" lang3="kor">원본 생산 날짜 </text>
-  </entry>
-  <entry>
-    <key>msDesc/head/note[@type="respStmt"]</key>
-    <text xml:lang="en" lang3="eng">Writer</text>
-    <text xml:lang="fr" lang3="fra">Scribe</text>
-    <text xml:lang="it" lang3="ita">Copista</text>
-    <text xml:lang="de" lang3="deu">Schreiber</text>
-    <text xml:lang="ko" lang3="kor">작가</text>
-  </entry>
-  <entry>
-    <key>provenance</key>
-    <text xml:lang="en" lang3="eng">Provenance of the manuscript</text>
-    <text xml:lang="fr" lang3="fra">Provenance du manuscrit</text>
-    <text xml:lang="it" lang3="ita">Provenienza del manoscritto</text>
-    <text xml:lang="de" lang3="deu">Provenienz der Handschrift</text>
-    <text xml:lang="ko" lang3="kor">필사본의 출처</text>
-  </entry>
-  <entry>
-    <key>layoutDesc | layout</key>
-    <text xml:lang="en" lang3="eng">Page layout</text>
-    <text xml:lang="fr" lang3="fra">Mise en page</text>
-    <text xml:lang="it" lang3="ita">Disposizione della pagina</text>
-    <text xml:lang="de" lang3="deu">Seiteneinrichtung</text>
-    <text xml:lang="ko" lang3="kor">페이지 레이아웃</text>
-  </entry>
-  <entry>
-    <key>msDesc/additional/listBibl</key>
-    <text xml:lang="en" lang3="eng">Bibliography</text>
-    <text xml:lang="fr" lang3="fra">Bibliographie</text>
-    <text xml:lang="it" lang3="ita">Bibliografia</text>
-    <text xml:lang="de" lang3="deu">Literaturverzeichnis</text>
-    <text xml:lang="ko" lang3="kor">서지항목</text>
-  </entry>
-  <entry>
-    <key>measure[@type="leaveSize"]</key>
-    <text xml:lang="en" lang3="eng">Format</text>
-    <text xml:lang="fr" lang3="fra">Format</text>
-    <text xml:lang="it" lang3="ita">Formato</text>
-    <text xml:lang="de" lang3="deu">Format</text>
-    <text xml:lang="ko" lang3="kor">형식</text>
-  </entry>
-  <entry>
-    <key>msContents</key>
-    <text xml:lang="en" lang3="eng">Contents</text>
-    <text xml:lang="fr" lang3="fra">Sommaire</text>
-    <text xml:lang="it" lang3="ita">Contenuto</text>
-    <text xml:lang="de" lang3="deu">Inhaltsangabe</text>
-    <text xml:lang="ko" lang3="kor">내용</text>
-  </entry>
-  <entry>
-    <key>origin</key>
-    <text xml:lang="en" lang3="eng">Origin of the manuscript</text>
-    <text xml:lang="fr" lang3="fra">Parution du manuscrit</text>
-    <text xml:lang="it" lang3="ita">Origine del manoscritto</text>
-    <text xml:lang="de" lang3="deu">Entstehung der Handschrift</text>
-    <text xml:lang="ko" lang3="kor">필사본의 유래</text>
-  </entry>
-  <entry>
-    <key>support</key>
-    <text xml:lang="en" lang3="eng">Support</text>
-    <text xml:lang="fr" lang3="fra">Support de substitution</text>
-    <text xml:lang="it" lang3="ita">Supporto materiale</text>
-    <text xml:lang="de" lang3="deu">Beschreibstoff</text>
-    <text xml:lang="ko" lang3="kor">지원</text>
-  </entry>
-  <entry>
-    <key>surrogates</key>
-    <text xml:lang="en" lang3="eng">Surrogates</text>
-    <text xml:lang="fr" lang3="fra">Surrogates</text>
-    <text xml:lang="it" lang3="ita">Surrogates</text>
-    <text xml:lang="de" lang3="deu">Sekundärformen</text>
-    <text xml:lang="ko" lang3="kor">대용</text>
-  </entry>
-  <entry>
-    <key>textLang</key>
-    <text xml:lang="en" lang3="eng">Main language</text>
-    <text xml:lang="fr" lang3="fra">Langue principale</text>
-    <text xml:lang="it" lang3="ita">Lingua principale</text>
-    <text xml:lang="de" lang3="deu">Hauptsprache</text>
-    <text xml:lang="ko" lang3="kor">주 언어</text>
-  </entry>
-  <entry>
-    <key>and</key>
-    <text xml:lang="en" lang3="eng">and</text>
-    <text xml:lang="de" lang3="deu">und</text>
-    <text xml:lang="es" lang3="spa">y</text>
-  </entry>
-</i18n>
diff --git a/add/data/xslt/teiBody2HTML.xsl b/add/data/xslt/tei/profiles/edirom-body/teiBody2HTML.xsl
similarity index 66%
rename from add/data/xslt/teiBody2HTML.xsl
rename to add/data/xslt/tei/profiles/edirom-body/teiBody2HTML.xsl
index 7088b1507..7293d0923 100644
--- a/add/data/xslt/teiBody2HTML.xsl
+++ b/add/data/xslt/tei/profiles/edirom-body/teiBody2HTML.xsl
@@ -2,36 +2,14 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:tei="http://www.tei-c.org/ns/1.0"
     xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:exist="http://exist.sourceforge.net/NS/exist" xmlns:functx="http://www.functx.com"
+    xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
     exclude-result-prefixes="#default xs tei xhtml" version="2.0">
-    <xsl:import href="http://www.functx.com/functx.xsl"/>
-    <xsl:import href="tei/common2/tei-param.xsl"/>
-    <xsl:import href="tei/common2/tei.xsl"/>
-    <xsl:import href="tei/xhtml2/tei-param.xsl"/>
-    <xsl:import href="tei/common2/core.xsl"/>
-    <xsl:import href="tei/common2/textstructure.xsl"/>
-    <xsl:import href="tei/common2/header.xsl"/>
-    <xsl:import href="tei/common2/linking.xsl"/>
-    <xsl:import href="tei/common2/figures.xsl"/>
-    <xsl:import href="tei/common2/textcrit.xsl"/>
-    <xsl:import href="tei/common2/i18n.xsl"/>
-    <xsl:import href="tei/common2/functions.xsl"/>
-    <xsl:import href="tei/xhtml2/core.xsl"/>
-    <xsl:import href="tei/xhtml2/corpus.xsl"/>
-    <xsl:import href="tei/xhtml2/dictionaries.xsl"/>
-    <xsl:import href="tei/xhtml2/drama.xsl"/>
-    <xsl:import href="tei/xhtml2/figures.xsl"/>
-    <xsl:import href="tei/xhtml2/header.xsl"/>
-    <xsl:import href="tei/xhtml2/linking.xsl"/>
-    <xsl:import href="tei/xhtml2/namesdates.xsl"/>
-    <xsl:import href="tei/xhtml2/tagdocs.xsl"/>
-    <xsl:import href="tei/xhtml2/textstructure.xsl"/>
-    <xsl:import href="tei/xhtml2/textcrit.xsl"/>
-    <xsl:import href="tei/xhtml2/transcr.xsl"/>
-    <xsl:import href="tei/xhtml2/verse.xsl"/>
-    <xsl:import href="tei/common2/verbatim.xsl"/>
+    <xsl:import href="https://raw.githubusercontent.com/transpect/xslt-util/master/functx/xsl/functx.xsl"/>
+    <xsl:import href="../../Stylesheets/common/common.xsl"/>
+    <xsl:import href="../../Stylesheets/html/html.xsl"/>
     <xsl:output encoding="UTF-8" media-type="text/xhmtl" method="xhtml" omit-xml-declaration="yes" indent="yes" xml:space="preserve"/>
     <xsl:param name="lang">en</xsl:param>
-    <xsl:param name="base" as="xs:string"/>
+    <xsl:param name="base"  select="'../../../'" as="xs:string"/>
     <xsl:param name="docUri" as="xs:anyURI"/>
     <xsl:param name="contextPath" as="xs:string"/>
     <!-- OVERWRITE FOLLOWING TEI-PARAMS -->
@@ -40,7 +18,22 @@
     <xsl:param name="textType"/>
     <!-- END FREIDI PARAMETER -->
     <xsl:variable name="masterFile" select="string('file')"/>
-    <xsl:variable name="i18n" select="document(concat($base, 'tei/i18n.xml'))"/>
+    <!-- LEGACY TEI PARAM -->
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="string">
+        <desc>
+            <p>Character separating values in a rend attribute.</p>
+            <p>Some projects use multiple values in <tt
+                xmlns="http://www.w3.org/1999/xhtml">rend</tt>
+                attributes. These are handled, but the separator character(s)
+                must be specified.</p>
+        </desc>
+    </doc>
+    <xsl:param name="rendSeparator">; </xsl:param>
+    <!-- / LEGACY TEI PARAM -->
+    
+    <xd:doc scope="component">
+        <xd:desc>The language variable for the Edirom Online language file.</xd:desc>
+    </xd:doc>
     <xsl:variable name="language">
         <xsl:choose>
             <xsl:when test="doc-available(concat($base, 'i18n/{$lang}.xml'))">
@@ -51,144 +44,60 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:variable>
-    <xsl:variable name="fallback">
-        <xsl:choose>
-            <xsl:when test="$lang eq 'en'"/>
-            <xsl:otherwise>
-                <xsl:copy-of select="document(concat($base, 'i18n/en.xml'))"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
+    
+    <xd:doc scope="component">
+        <xd:desc>Get a label text from the Edirom or edition-specific language files.</xd:desc>
+        <xd:param name="key">The key to lookup in the language file.</xd:param>
+    </xd:doc>
     <xsl:function name="tei:getLabel" xpath-default-namespace="">
         <xsl:param name="key"/>
         <xsl:choose>
-            <!--<xsl:when test="$lang eq 'en'">
-                <xsl:value-of select="$language/id($key)/text()"/>
-            </xsl:when>-->
             <xsl:when test="$language/id($key) and not($language/id($key)/text() eq '')">
                 <xsl:value-of select="$language/id($key)/text()"/>
             </xsl:when>
             <xsl:otherwise>
-                <!--<xsl:value-of select="$fallback/id($key)/text()"/><!-\- BWB welchen Sinn macht das? -\->-->
                 <xsl:value-of select="$key"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:function>
-    <xsl:function name="tei:calcDimension">
-        <xsl:param name="value"/>
-        <xsl:choose>
-            <xsl:when test="contains($value,'in')">
-                <xsl:value-of select="round($dpi * number(substring-before($value,'in')))"/>
-            </xsl:when>
-            <xsl:when test="contains($value,'pt')">
-                <xsl:value-of select="round($dpi * (number(substring-before($value,'pt')) div 72))"/>
-            </xsl:when>
-            <xsl:when test="contains($value,'cm')">
-                <xsl:value-of select="round($dpi * (number(substring-before($value,'cm')) div 2.54 ))"/>
-            </xsl:when>
-            <xsl:when test="contains($value,'px')">
-                <xsl:value-of select="substring-before($value,'px')"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:value-of select="$value"/>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:function>
+    
+    <!-- OLD EDIROM OVERRIDES -->
+    <!-- TODO: check if still needed -->
+    <!-- 
+        maybe this is not needed any more and was for the header transformation.
+        potential solution iv override still needed
+        capture Edirom specific cases and default to:
+        <xsl:next-match>
+            <xsl:with-param name="level" select="$level"/>
+            <xsl:with-param name="heading" select="if (tei:getLabel(local-name($element)) != '') then tei:getLabel(local-name($element)) else if ($heading != '') then $heading else local-name($element)"/>
+            <xsl:with-param name="implicitBlock" select="$implicitBlock"/>
+        </xsl:next-match>
+    -->
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>Section-like object</desc>
+    </doc>
     <xsl:template name="makeSection">
         <xsl:param name="element"/>
+        <xsl:param name="level"/>
+        <xsl:param name="heading"/>
+        <xsl:param name="implicitBlock"/>
         <xsl:element name="div">
             <xsl:attribute name="class" select="string('section')"/>
-            <xsl:element name="h1">
-                <xsl:value-of select="if(tei:getLabel(local-name($element)) != '')then(tei:getLabel(local-name($element)))else(local-name($element))"/>
+            <xsl:element name="h{$level}">
+                <xsl:value-of select="if (tei:getLabel(local-name($element)) != '') then tei:getLabel(local-name($element)) else if ($heading != '') then $heading else local-name($element)"/>
             </xsl:element>
             <xsl:element name="div">
                 <xsl:attribute name="class" select="string('propertyList')"/>
             </xsl:element>
         </xsl:element>
     </xsl:template>
-    <xsl:template name="bodyMicroData"/>
-    <xsl:template name="divContents">
-        <xsl:param name="Depth"/>
-        <xsl:param name="nav">false</xsl:param>
-        <xsl:variable name="ident">
-            <xsl:apply-templates mode="ident" select="."/>
-        </xsl:variable>
-        <xsl:choose>
-            <xsl:when test="parent::tei:*/@rend='multicol'">
-                <td valign="top">
-                    <xsl:if test="not($Depth = '')">
-                        <xsl:element name="h{$Depth + $divOffset}">
-                            <xsl:for-each select="tei:head[1]">
-                                <xsl:call-template name="rendToClass">
-                                    <xsl:with-param name="default"/>
-                                </xsl:call-template>
-                            </xsl:for-each>
-                            <xsl:call-template name="header">
-                                <xsl:with-param name="display">full</xsl:with-param>
-                            </xsl:call-template>
-                            <xsl:call-template name="sectionHeadHook"/>
-                        </xsl:element>
-                    </xsl:if>
-                    <xsl:apply-templates/>
-                </td>
-            </xsl:when>
-            <xsl:when test="@rend='multicol'">
-                <xsl:apply-templates select="*[not(local-name(.)='div')]"/>
-                <table>
-                    <tr>
-                        <xsl:apply-templates select="tei:div"/>
-                    </tr>
-                </table>
-            </xsl:when>
-            <xsl:when test="@rend='nohead' or not(tei:head)">
-                <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:if test="not($Depth = '')">
-                    <xsl:element name="{if (number($Depth)+$divOffset &gt;6) then 'div'                     else concat('h',number($Depth) + $divOffset)}">
-                        <xsl:choose>
-                            <xsl:when test="@rend">
-                                <xsl:call-template name="rendToClass">
-                                    <xsl:with-param name="id">false</xsl:with-param>
-                                </xsl:call-template>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:for-each select="tei:head">
-                                    <xsl:call-template name="rendToClass">
-                                        <xsl:with-param name="default">
-                                            <xsl:if test="number($Depth)&gt;5">
-                                                <xsl:text>div</xsl:text>
-                                                <xsl:value-of select="$Depth"/>
-                                            </xsl:if>
-                                        </xsl:with-param>
-                                    </xsl:call-template>
-                                </xsl:for-each>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                        <xsl:call-template name="header">
-                            <xsl:with-param name="display">full</xsl:with-param>
-                        </xsl:call-template>
-                        <xsl:call-template name="sectionHeadHook"/>
-                    </xsl:element>
-                    <xsl:if test="$topNavigationPanel='true' and $nav='true'">
-                        <xsl:call-template name="xrefpanel">
-                            <xsl:with-param name="homepage" select="concat($masterFile,$standardSuffix)"/>
-                            <xsl:with-param name="mode" select="local-name(.)"/>
-                        </xsl:call-template>
-                    </xsl:if>
-                </xsl:if>
-                <xsl:apply-templates/>
-                <xsl:if test="$bottomNavigationPanel='true' and $nav='true'">
-                    <xsl:call-template name="xrefpanel">
-                        <xsl:with-param name="homepage" select="concat($masterFile,$standardSuffix)"/>
-                        <xsl:with-param name="mode" select="local-name(.)"/>
-                    </xsl:call-template>
-                </xsl:if>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html] display graphic file</desc>
+    </doc>
     <xsl:template name="showGraphic">
-        <xsl:variable name="File">
+        <!-- Edirom Online specific cutomization -->
+        <!-- TODO check if all these cases reolve properly
+        
             <xsl:choose>
                 <xsl:when test="starts-with(@url, 'http://')">
                     <xsl:value-of select="@url"/>
@@ -200,12 +109,12 @@
                     <xsl:variable name="folder-ups" select="functx:number-of-matches(@url, '../')"/>
                     <xsl:variable name="unprefixedDocUri" select="substring-after($docUri, 'xmldb:exist:///db/')"/>
                     <xsl:variable name="uri-tokens" select="tokenize($unprefixedDocUri, '/')" as="xs:string*"/>
-<!--                    <xsl:value-of select="string-join(($uri-tokens[position() lt last() - $folder-ups]), '/') || functx:substring-after-last-match(@url, '../')"/>-->
+<!-/-                    <xsl:value-of select="string-join(($uri-tokens[position() lt last() - $folder-ups]), '/') || functx:substring-after-last-match(@url, '../')"/>-/->
                     <xsl:value-of select="string-join(($contextPath, $uri-tokens[position() lt last() - $folder-ups + 1], functx:substring-after-last-match(@url, '\.\./')), '/')"/>
                 </xsl:when>
                 <xsl:when test="@url != ''">
                     <xsl:value-of select="@url"/>
-                    <!--<xsl:value-of select="concat($graphicsPrefix, @url)"/>
+                    <!-/-<xsl:value-of select="concat($graphicsPrefix, @url)"/>
                     <xsl:if test="not(contains(@url,'.'))">
                         <xsl:value-of select="$graphicsSuffix"/>
                     </xsl:if>
@@ -229,7 +138,7 @@
                     <xsl:if test="not(@width | @height | @scale)">
                         <xsl:value-of select="concat('dw=350', '&amp;', 'amp;')"/>
                     </xsl:if>
-                    <xsl:text>mo=fit</xsl:text>-->
+                    <xsl:text>mo=fit</xsl:text>-/->
                 </xsl:when>
                 <xsl:when test="@url = ''">error<xsl:value-of select="$graphicsSuffix"/>
                 </xsl:when>
@@ -238,6 +147,28 @@
                     </xsl:message>
                 </xsl:otherwise>
             </xsl:choose>
+        -->
+        <xsl:variable name="graphicsPrefix">
+            <xsl:choose>
+                <xsl:when test="starts-with(@url, '../')">
+                    <xsl:value-of select="$contextPath || '/' || substring-after(functx:substring-before-last($docUri, '/'), 'xmldb:exist:///db/') || '/'"/>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:variable>
+        <!-- /Edirom Online specific cutomization -->
+        <xsl:variable name="File">
+            <xsl:choose>
+                <xsl:when test="self::tei:binaryObject"/>
+                <xsl:when test="@url">
+                    <xsl:sequence select="tei:resolveURI(.,@url)"/>
+                    <xsl:if test="not(contains(@url,'.'))">
+                        <xsl:value-of select="$graphicsSuffix"/>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:message>Found binaryObject without @url.</xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
         </xsl:variable>
         <xsl:variable name="Alt">
             <xsl:choose>
@@ -269,7 +200,8 @@
                 <xsl:choose>
                     <xsl:when test="@type='thumbnail'"/>
                     <xsl:when test="starts-with(@mimeType, 'video')">
-                        <video src="{$File}" controls="controls">
+                        <video src="{$graphicsPrefix}{$File}"
+                            controls="controls">
                             <xsl:if test="../tei:graphic[@type='thumbnail']">
                                 <xsl:attribute name="poster">
                                     <xsl:value-of select="../tei:graphic[@type='thumbnail']/@url"/>
@@ -278,42 +210,68 @@
                         </video>
                     </xsl:when>
                     <xsl:otherwise>
-                        <img src="{$File}">
-                            <xsl:attribute name="alt">
-                                <xsl:value-of select="$Alt"/>
-                            </xsl:attribute>
-                            <xsl:call-template name="imgHook"/>
-                            <xsl:if test="@xml:id">
-                                <xsl:attribute name="id">
-                                    <xsl:value-of select="@xml:id"/>
-                                </xsl:attribute>
-                            </xsl:if>
-                            <xsl:call-template name="rendToClass"/>
+                        <xsl:variable name="sizes">
                             <xsl:if test="@width">
-                                <xsl:call-template name="setDimension">
-                                    <xsl:with-param name="value">
-                                        <xsl:value-of select="@width"/>
-                                    </xsl:with-param>
-                                    <xsl:with-param name="name">width</xsl:with-param>
-                                </xsl:call-template>
+                                <xsl:text> width:</xsl:text>
+                                <xsl:value-of select="@width"/>
+                                <xsl:text>;</xsl:text>
                             </xsl:if>
                             <xsl:if test="@height">
-                                <xsl:call-template name="setDimension">
-                                    <xsl:with-param name="value">
-                                        <xsl:value-of select="@height"/>
-                                    </xsl:with-param>
-                                    <xsl:with-param name="name">height</xsl:with-param>
-                                </xsl:call-template>
+                                <xsl:text> height:</xsl:text>
+                                <xsl:value-of select="@height"/>
+                                <xsl:text>;</xsl:text>
                             </xsl:if>
-                        </img>
+                        </xsl:variable>
+                        <xsl:variable name="i">
+                            <img>
+                                <xsl:attribute name="src">
+                                    <xsl:choose>
+                                        <xsl:when test="self::tei:binaryObject">
+                                            <xsl:variable name="mime" select="if (@mimeType) then @mimeType else 'image/*'"/>
+                                            <xsl:variable name="enc" select="if (@encoding) then @encoding else 'base64'"/>
+                                            <xsl:value-of select="concat('data:', $mime, ';', $enc, ',', normalize-space(text()))"/>
+                                        </xsl:when>
+                                        <xsl:otherwise>
+                                            <xsl:value-of
+                                                select="concat($graphicsPrefix,$File)"/>
+                                        </xsl:otherwise>
+                                    </xsl:choose>
+                                </xsl:attribute>
+                                <xsl:attribute name="alt">
+                                    <xsl:value-of select="$Alt"/>
+                                </xsl:attribute>
+                                <xsl:call-template name="imgHook"/>
+                                <xsl:if test="@xml:id">
+                                    <xsl:attribute name="id">
+                                        <xsl:value-of select="@xml:id"/>
+                                    </xsl:attribute>
+                                </xsl:if>
+                                <xsl:call-template name="makeRendition"/>
+                            </img>
+                        </xsl:variable>
+                        <xsl:for-each select="$i/*">
+                            <xsl:copy>
+                                <xsl:copy-of select="@*[not(name()='style')]"/>
+                                <xsl:choose>
+                                    <xsl:when test="$sizes=''">
+                                        <xsl:copy-of select="@style"/>
+                                    </xsl:when>
+                                    <xsl:when test="not(@style)">
+                                        <xsl:attribute name="style" select="$sizes"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:attribute name="style"
+                                            select="concat(@style,';' ,$sizes)"/>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:copy>
+                        </xsl:for-each>
                     </xsl:otherwise>
                 </xsl:choose>
             </xsl:when>
             <xsl:otherwise>
                 <div class="altfigure">
-                    <xsl:call-template name="i18n">
-                        <xsl:with-param name="word">figureWord</xsl:with-param>
-                    </xsl:call-template>
+                    <xsl:sequence select="tei:i18n('figureWord')"/>
                     <xsl:text> </xsl:text>
                     <xsl:for-each select="self::tei:figure|parent::tei:figure">
                         <xsl:number count="tei:figure[tei:head]" level="any"/>
@@ -327,9 +285,12 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
+    
+    <xd:doc scope="component">
+        <xd:desc>Override template for tei:ref if link target starts with xmldb:exist://</xd:desc>
+    </xd:doc>
     <xsl:template match="tei:ref">
-        <xsl:param name="class">link_<xsl:value-of select="local-name(.)"/>
-        </xsl:param>
+        <xsl:param name="class" select="'link_' || local-name(.)"/>
         <xsl:choose>
             <xsl:when test="starts-with(@target, 'xmldb:exist://')">
                 <a>
@@ -397,36 +358,7 @@
                 </a>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:variable name="id" select="@xml:id"/>
-                <xsl:variable name="targetExternal" select="@type"/>
-                <xsl:variable name="targetInternal" select="starts-with(@target, '#')" as="xs:boolean"/>
-                <xsl:variable name="link">
-                    <xsl:call-template name="makeTEILink">
-                        <xsl:with-param name="ptr" select="false()"/>
-                    </xsl:call-template>
-                </xsl:variable>
-                <xsl:for-each select="$link/*">
-                    <xsl:copy>
-                        <xsl:if test="$id">
-                            <xsl:attribute name="id" select="$id"/>
-                        </xsl:if>
-                        <xsl:if test="$targetExternal eq 'external'">
-                            <xsl:attribute name="target" select="'_blank'"/>
-                        </xsl:if>
-                        <xsl:if test="$targetInternal">
-                            <xsl:attribute name="target" select="'_self'"/>
-                        </xsl:if>
-                        <xsl:for-each select="*|text()|@*">
-                            <xsl:copy-of select="."/>
-                        </xsl:for-each>
-                    <xsl:if test="count(text()) = 0">
-                            <xsl:variable name="href" select="@href"/>
-                            <xsl:element name="span">
-                                <xsl:attribute name="class">external-link</xsl:attribute>
-                                [Link: <xsl:value-of select="$href"/>]
-                            </xsl:element></xsl:if>
-                    </xsl:copy>
-                </xsl:for-each>
+                <xsl:next-match />
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
@@ -439,12 +371,17 @@
             <xsl:apply-templates select="text()"/>
         </xsl:element>
     </xsl:template>
-<xsl:template match="exist:match">
+    
+    <xd:doc>
+        <xd:desc>Mark exist:match KWIC result with span</xd:desc>
+    </xd:doc>
+    <xsl:template match="exist:match">
         <span class="searchResult">
             <xsl:apply-templates/>
         </span>
     </xsl:template>
-<xsl:template match="tei:pb" priority="5">
+    
+    <xsl:template match="tei:pb" priority="5">
         <xsl:variable name="page_folio">
             <xsl:choose>
                 <xsl:when test="matches(@n, '\d+[a-z]?(r|v)')"> fol. </xsl:when>
@@ -474,7 +411,7 @@
                         </xsl:otherwise>
                     </xsl:choose>
                 </xsl:variable>
-                <xsl:element name="{if (tei:is-inline(..)) then 'span' else 'div'}">
+                <xsl:element name="{if (tei:isInline(..)) then 'span' else 'div'}">
                     <xsl:call-template name="rendToClass"/>
                     <img src="{$IMG}" alt="page image"/>
                 </xsl:element>
@@ -538,7 +475,7 @@
             select="tei:*[not(self::tei:speaker) and not(self::tei:stage[@rend = 'inline'][1])]"/>
     </xsl:template>
     <xsl:template match="tei:del" priority="5">
-        <xsl:element name="{if (tei:blockContext(.) or *[not(tei:is-inline(.))]) then 'div' else 'span' }">
+        <xsl:element name="{if (*[not(tei:isInline(.))]) then 'div' else 'span' }">
             <xsl:call-template name="rendToClass">
                 <xsl:with-param name="default">del</xsl:with-param>
             </xsl:call-template>
@@ -655,7 +592,7 @@
     </xsl:template>
     <xsl:template match="tei:stage" priority="5">
         <xsl:element
-            name="{if (tei:blockContext(.) or *[not(tei:is-inline(.))]) then 'div' else 'span' }">
+            name="{if (*[not(tei:isInline(.))]) then 'div' else 'span' }">
             <xsl:call-template name="rendToClass">
                 <xsl:with-param name="default">
                     <xsl:choose>
@@ -681,7 +618,7 @@
     </xsl:template>
     <xsl:template match="tei:add" priority="5">
         <xsl:element
-            name="{if (tei:blockContext(.) or *[not(tei:is-inline(.))]) then 'div' else 'span' }">
+            name="{if (*[not(tei:isInline(.))]) then 'div' else 'span' }">
             <xsl:if test="./parent::tei:subst and @place='above'">
                 <xsl:variable name="del" select="preceding-sibling::tei:del"/>
                 <xsl:variable name="delLines" select="count($del//tei:lb)"/>
@@ -709,7 +646,7 @@
     </xsl:template>
     <xsl:template match="tei:subst" priority="5">
         <xsl:element
-            name="{if (tei:blockContext(.) or *[not(tei:is-inline(.))]) then 'div' else 'span' }">
+            name="{if (*[not(tei:isInline(.))]) then 'div' else 'span' }">
             <xsl:call-template name="rendToClass">
                 <xsl:with-param name="default"> subst </xsl:with-param>
             </xsl:call-template>
@@ -739,7 +676,7 @@
                 </xsl:call-template>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:call-template name="doDivBody"/>
+                <xsl:call-template name="makeDivBody"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
@@ -1029,204 +966,74 @@
         </div>
     </xsl:template>
     
-    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-        <desc>
-            <p>Process element note</p>
-            <p>copied from TEI Stylesheets xhtml2/core.xsl in order to fix link target in Edirom-Online</p>
-        </desc>
-    </doc>
-    <xsl:template match="tei:note">
+    <xd:doc scope="component">
+        <xd:desc>
+            <xd:p>Process footnotes and endnotes</xd:p>
+            <xd:p>Copied from TEI Stylesheets/html/html_core.xsl to override the creation of footnote links for Edirom Online.</xd:p>
+        </xd:desc>
+    </xd:doc>
+    <xsl:template name="footNote">
         <xsl:variable name="identifier">
             <xsl:call-template name="noteID"/>
         </xsl:variable>
-        <xsl:choose>
-            <xsl:when test="@place='none'"/>
-            <xsl:when test="ancestor::tei:listBibl or ancestor::tei:biblFull         or ancestor::tei:biblStruct">
-                <xsl:text> [</xsl:text>
-                <xsl:apply-templates/>
-                <xsl:text>]</xsl:text>
-            </xsl:when>
-            <xsl:when test="@place='foot' or @place='bottom' or @place='end' or $autoEndNotes='true'">
-                <xsl:element name="{if (parent::tei:head or parent::tei:hi)  then 'span'           else if (parent::tei:l) then 'span'           else if (parent::tei:bibl/parent::tei:head) then 'span'           else if (parent::tei:stage/parent::tei:q) then 'span'           else if  (parent::tei:body or *[not(tei:is-inline(.))]) then 'div' else 'span' }">
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="concat($identifier,'_return')"/>
-                    </xsl:call-template>
-                    <xsl:variable name="note-title">
-                        <xsl:variable name="note-text">
-                            <xsl:apply-templates mode="plain"/>
-                        </xsl:variable>
-                        <xsl:value-of select="substring($note-text,1,500)"/>
-                        <xsl:if test="string-length($note-text) &gt; 500">
-                            <xsl:text>…</xsl:text>
-                        </xsl:if>
-                    </xsl:variable>
-                    <xsl:choose>
-                        <xsl:when test="$footnoteFile='true'">
-                            <a class="notelink" title="{normalize-space($note-title)}" href="{$masterFile}-notes.html#{$identifier}">
-                                <xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
-                                    <xsl:call-template name="noteN"/>
-                                </xsl:element>
-                            </a>
-                            <xsl:if test="following-sibling::node()[1][self::tei:note]">
-                                <xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
-                                    <xsl:text>,</xsl:text>
-                                </xsl:element>
-                            </xsl:if>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <xsl:element name="a">
-                                <!-- here are the Edirom Online specific modifications -->
-                                <xsl:attribute name="class">notelink</xsl:attribute>
-                                <xsl:attribute name="href" select="$docUri || '#' || $identifier"/>
-                                <xsl:attribute name="title" select="normalize-space($note-title)"/>
-                                <xsl:attribute name="onclick">
-                                    <xsl:text>loadLink('</xsl:text>
-                                    <xsl:value-of select="$docUri || '#' || $identifier"/>
-                                    <xsl:text>', {useExisting:true}); return false;</xsl:text>
-                                </xsl:attribute>
-                                <!-- end of the Edirom Online specific modifications -->
-                                <xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
-                                    <xsl:call-template name="noteN"/>
-                                </xsl:element>
-                            </xsl:element>
-                            <xsl:if test="following-sibling::node()[1][self::tei:note]">
-                                <xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
-                                    <xsl:text>,</xsl:text>
-                                </xsl:element>
-                            </xsl:if>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="parent::tei:head and @place='margin'">
-                <span class="margnote">
-                    <xsl:apply-templates/>
-                </span>
-            </xsl:when>
-            <xsl:when test="parent::tei:head">
-                <xsl:text> [</xsl:text>
-                <xsl:apply-templates/>
-                <xsl:text>]</xsl:text>
-            </xsl:when>
-            <xsl:when test="@type='footnote'">
-                <div class="note">
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <span class="noteNumber">
-                        <xsl:number/>
-                    </span>
-                    <xsl:apply-templates/>
-                </div>
-            </xsl:when>
-            <xsl:when test="(@place='display' or tei:q)          and (parent::tei:div or parent::tei:p or parent::tei:body)">
-                <div class="note">
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <span class="noteLabel">
-                        <xsl:choose>
-                            <xsl:when test="@n">
-                                <xsl:value-of select="@n"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:call-template name="i18n">
-                                    <xsl:with-param name="word">Note</xsl:with-param>
-                                </xsl:call-template>
-                                <xsl:text>: </xsl:text>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </span>
-                    <xsl:apply-templates/>
-                </div>
-            </xsl:when>
-            <xsl:when test="@place='display'">
-                <blockquote>
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <xsl:call-template name="rendToClass"/>
-                    <xsl:choose>
-                        <xsl:when test="$outputTarget='html5'">
-                            <xsl:apply-templates/>
-                        </xsl:when>
-                        <xsl:when test="tei:q">
-                            <xsl:apply-templates/>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <p>
-                                <xsl:apply-templates/>
-                            </p>
-                        </xsl:otherwise>
-                    </xsl:choose>
-                </blockquote>
-            </xsl:when>
-            <xsl:when test="@place='margin' and parent::tei:hi and not(*)">
-                <span class="margnote">
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <xsl:apply-templates/>
-                </span>
-            </xsl:when>
-            <xsl:when test="@place='margin' and *[not(tei:is-inline(.))]">
-                <div class="margnote">
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <xsl:apply-templates/>
-                </div>
-            </xsl:when>
-            <xsl:when test="@place='margin'">
-                <span class="margnote">
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <xsl:apply-templates/>
-                </span>
-            </xsl:when>
-            <xsl:when test="@place='inline' or (parent::tei:p or parent::tei:hi or parent::tei:head)">
-                <span class="note">
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <xsl:text> [</xsl:text>
-                    <xsl:apply-templates/>
-                    <xsl:text>]</xsl:text>
-                </span>
-            </xsl:when>
-            <xsl:otherwise>
-                <div>
-                    <xsl:call-template name="makeAnchor">
-                        <xsl:with-param name="name" select="$identifier"/>
-                    </xsl:call-template>
-                    <xsl:attribute name="class">
-                        <xsl:text>note </xsl:text>
-                        <xsl:value-of select="@type"/>
-                    </xsl:attribute>
-                    <span class="noteLabel">
-                        <xsl:choose>
-                            <xsl:when test="@n">
-                                <xsl:value-of select="@n"/>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:call-template name="i18n">
-                                    <xsl:with-param name="word">Note</xsl:with-param>
-                                </xsl:call-template>
-                                <xsl:text>: </xsl:text>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </span>
-                    <xsl:apply-templates/>
-                </div>
-            </xsl:otherwise>
-        </xsl:choose>
+        <xsl:element name="{if (tei:isInline(.)) then 'span' else 'div' }">
+            <xsl:call-template name="makeAnchor">
+                <xsl:with-param name="name" select="concat($identifier,'_return')"/>
+            </xsl:call-template>
+            <xsl:variable name="note-title">
+                <xsl:variable name="note-text">
+                    <xsl:apply-templates mode="plain"/>
+                </xsl:variable>
+                <xsl:value-of select="substring($note-text,1,150)"/>
+                <xsl:if test="string-length($note-text) &gt; 150">
+                    <xsl:text>…</xsl:text>
+                </xsl:if>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="$footnoteFile='true'">
+                    <a class="notelink" title="{normalize-space($note-title)}" href="{$masterFile}-notes.html#{$identifier}">
+                        <xsl:element name="{if (tei:match(@rend,'nosup')) then 'span' else 'sup'}">
+                            <xsl:call-template name="noteN"/>
+                        </xsl:element>
+                    </a>
+                    <xsl:if test="following-sibling::node()[1][self::tei:note]">
+                        <xsl:element name="{if (tei:match(@rend,'nosup')) then 'span' else 'sup'}">
+                            <xsl:text>,</xsl:text>
+                        </xsl:element>
+                    </xsl:if>
+                </xsl:when>
+                <xsl:otherwise>
+                    <!-- START of Edirom Online specific customization -->
+                    <xsl:variable name="linkTarget" select="$docUri || '#' || $identifier"/>
+                    <xsl:element name="a">
+                        <xsl:attribute name="class">notelink</xsl:attribute>
+                        <xsl:attribute name="href" select="$linkTarget"/>
+                        <xsl:attribute name="title" select="normalize-space($note-title)"/>
+                        <xsl:attribute name="onclick">
+                            <xsl:text>loadLink('</xsl:text>
+                            <xsl:value-of select="$linkTarget"/>
+                            <xsl:text>', {useExisting:true}); return false;</xsl:text>
+                        </xsl:attribute>
+                        <xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
+                            <xsl:call-template name="noteN"/>
+                        </xsl:element>
+                    </xsl:element>
+                    <!-- END of Edirom Online specific customization -->
+                    <xsl:if test="following-sibling::node()[1][self::tei:note]">
+                        <xsl:element name="{if (tei:match(@rend,'nosup')) then 'span' else 'sup'}">
+                            <xsl:text>,</xsl:text>
+                        </xsl:element>
+                    </xsl:if>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:element>
     </xsl:template>
     
     <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
         <desc>
             <p>Process element note</p>
-            <p>copied from TEI Stylesheets xhtml2/core.xsl in order to fix link target in Edirom-Online</p>
+            <p>copied from TEI Stylesheets/html/html_core.xsl in order to fix link target in Edirom-Online</p>
+            <p>Used, e.g., for endnotes</p>
         </desc>
     </doc>
     <xsl:template name="makeaNote">
@@ -1252,19 +1059,23 @@
             </div>
             <xsl:if test="$footnoteBackLink= 'true'">
                 <xsl:text> </xsl:text>
+                <!-- here are the Edirom Online specific modifications -->
                 <xsl:element name="a">
-                    <!-- here are the Edirom Online specific modifications -->
+                    <xsl:variable name="linkTarget" select="$docUri || '#' || $identifier || '_return'"/><!-- TODO: move linkTarget calculation to edirom-specific function -->
                     <xsl:attribute name="class">link_return</xsl:attribute>
-                    <xsl:attribute name="href" select="$docUri || '#' || $identifier || '_return'"/>
-                    <xsl:attribute name="title">"Go back to text</xsl:attribute>
+                    <xsl:attribute name="href" select="$linkTarget">
+                        <!-- actually not needed for functionality of Edirom Online -->
+                    </xsl:attribute>
+                    <xsl:attribute name="title">Go back to text</xsl:attribute><!-- TODO: use i18n -->
                     <xsl:attribute name="onclick">
+                        <!-- this is where the real magic happens -->
                         <xsl:text>loadLink('</xsl:text>
-                        <xsl:value-of select="$docUri || '#' || $identifier || '_return'"/>
+                        <xsl:value-of select="$linkTarget"/>
                         <xsl:text>', {useExisting:true}); return false;</xsl:text>
                     </xsl:attribute>
-                    <!-- end of the Edirom Online specific modifications -->
-                    <xsl:text>↵</xsl:text>
+                    <xsl:text>↵</xsl:text><!-- TODO: parametrize -->
                 </xsl:element>
+                <!-- end of the Edirom Online specific modifications -->
             </xsl:if>
         </div>
     </xsl:template>
@@ -1291,4 +1102,205 @@
         <xsl:param name="title"/>
     </xsl:template>
     
+    <!-- / OLD EDIROM OVERRIDES -->
+    
+    
+    <!-- SAVED OLD TEI FUNCTIONS AND TEMPLATES TO MAKE THIS WORK -->
+    
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html] Active a value for @rend<param name="value">value</param>
+        </desc>
+    </doc>
+    <xsl:template name="applyRend">
+        <!-- TODO: look for alternative in new version of Stylesheets -->
+        <xsl:param name="value"/>
+        <xsl:choose>
+            <xsl:when test="not($value='')">
+                <xsl:variable name="thisparm" select="substring-before($value,$rendSeparator)"/>
+                <xsl:call-template name="renderingInner">
+                    <xsl:with-param name="value" select="$thisparm"/>
+                    <xsl:with-param name="rest" select="substring-after($value,$rendSeparator)"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:apply-templates/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html] convert rend attribute to HTML class</desc>
+    </doc>
+    <xsl:template name="rendToClass">
+        <!-- TODO: look for alternative in new version of Stylesheets -->
+        <xsl:param name="id">true</xsl:param>
+        <xsl:param name="default">.</xsl:param>
+        <xsl:choose>
+            <xsl:when test="$id='false'"/>
+            <xsl:when test="$id=''"/>
+            <xsl:when test="$id='true' and @xml:id">
+                <xsl:attribute name="id">
+                    <xsl:value-of select="@xml:id"/>
+                </xsl:attribute>
+            </xsl:when>
+            <xsl:when test="$id='true' and self::tei:p and $generateParagraphIDs='true'">
+                <xsl:attribute name="id">
+                    <xsl:value-of select="generate-id()"/>
+                </xsl:attribute>
+            </xsl:when>
+            <xsl:when test="$id='true'"/>
+            <xsl:otherwise>
+                <xsl:attribute name="id" select="$id"/>
+            </xsl:otherwise>
+        </xsl:choose>
+        <xsl:if test="$outputTarget='html5'">
+            <xsl:call-template name="microdata"/>
+        </xsl:if>
+        <xsl:variable name="class1">
+            <xsl:choose>
+                <xsl:when test="$default=''"/>
+                <xsl:when test="not($default='.')">
+                    <xsl:value-of select="$default"/>
+                </xsl:when>
+                <xsl:when test="@type">
+                    <xsl:value-of select="@type"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="local-name()"/>
+                </xsl:otherwise>
+            </xsl:choose>
+            <xsl:call-template name="rendToClassHook"/>
+            <xsl:if test="tei:isTranscribable(.) and $mediaoverlay='true'">
+                <xsl:text> transcribable</xsl:text>
+            </xsl:if>
+        </xsl:variable>
+        <xsl:variable name="class2">
+            <xsl:choose>
+                <xsl:when test="@rend">
+                    <xsl:value-of select="translate(@rend,'/','-')"/>
+                </xsl:when>
+                <xsl:when test="@rendition">
+                    <xsl:call-template name="findRendition">
+                        <xsl:with-param name="value">
+                            <xsl:value-of select="@rendition"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:when>
+                <xsl:when test="key('TAGREND',local-name())">
+                    <xsl:for-each select="key('TAGREND',local-name())">
+                        <xsl:call-template name="findRendition">
+                            <xsl:with-param name="value">
+                                <xsl:value-of select="@render"/>
+                            </xsl:with-param>
+                        </xsl:call-template>
+                    </xsl:for-each>
+                </xsl:when>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$class1='' and $class2=''"/>
+            <xsl:when test="$class2=''">
+                <xsl:attribute name="class">
+                    <xsl:value-of select="normalize-space($class1)"/>
+                </xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:attribute name="class">
+                    <xsl:if test="not($class1='')">
+                        <xsl:value-of select="$class1"/>
+                        <xsl:text> </xsl:text>
+                    </xsl:if>
+                    <xsl:value-of select="$class2"/>
+                </xsl:attribute>
+            </xsl:otherwise>
+        </xsl:choose>
+        <xsl:choose>
+            <xsl:when test="@rendition">
+                <xsl:call-template name="applyRendition"/>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+    
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html] Activate a value for @rendition<param name="value">value</param>
+        </desc>
+    </doc>
+    <xsl:template name="applyRendition">
+        <!-- TODO: look for alternative in new version of Stylesheets -->
+        <xsl:attribute name="class">
+            <xsl:for-each select="tokenize(normalize-space(@rendition),' ')">
+                <xsl:call-template name="findRendition">
+                    <xsl:with-param name="value">
+                        <xsl:value-of select="."/>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:for-each>
+        </xsl:attribute>
+    </xsl:template>
+    
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html] Look up rendition value <param name="value">value</param>
+        </desc>
+    </doc>
+    <xsl:template name="findRendition">
+        <!-- TODO: look for alternative in new version of Stylesheets -->
+        <xsl:param name="value"/>
+        <xsl:choose>
+            <xsl:when test="starts-with($value,'#')">
+                <xsl:value-of select="substring-after($value,'#')"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:for-each select="document($value)">
+                    <xsl:apply-templates select="@xml:id"/>
+                </xsl:for-each>
+            </xsl:otherwise>
+        </xsl:choose>
+        <xsl:text> </xsl:text>
+    </xsl:template>
+    
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html] allow for local extensions to rendToClass</desc>
+    </doc>
+    <xsl:template name="rendToClassHook">
+        <!-- TODO: do we really need this? look for alternative in new version of Stylesheets -->
+    </xsl:template>
+    
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html] Process unknown rend attribute by turning it into
+            an HTML class<param name="value">current value</param>
+            <param name="rest">remaining values</param>
+        </desc>
+    </doc>
+    <xsl:template name="unknownRendBlock">
+        <!-- TODO: look for alternative in new version of Stylesheets -->
+        <xsl:param name="value"/>
+        <xsl:param name="rest"/>
+        <xsl:if test="not($value='')">
+            <xsl:attribute name="class">
+                <xsl:value-of select="$value"/>
+            </xsl:attribute>
+            <xsl:call-template name="applyRend">
+                <xsl:with-param name="value" select="$rest"/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
+    <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
+        <desc>[html]  Process unknown rend attribute by turning it into
+            an HTML class<param name="value">value</param>
+            <param name="rest">rest</param>
+        </desc>
+    </doc>
+    <xsl:template name="unknownRendInline">
+        <!-- TODO: look for alternative in new version of Stylesheets -->
+        <xsl:param name="value"/>
+        <xsl:param name="rest"/>
+        <xsl:if test="not($value='')">
+            <span class="{$value}">
+                <xsl:call-template name="applyRend">
+                    <xsl:with-param name="value" select="$rest"/>
+                </xsl:call-template>
+            </span>
+        </xsl:if>
+    </xsl:template>
+    <!-- /SAVED OLD TEI TEMPLATES TO MAKE THIS WORK -->
 </xsl:stylesheet>
diff --git a/add/data/xslt/teiHeader2HTML.xsl b/add/data/xslt/tei/profiles/edirom-header/teiHeader2HTML.xsl
similarity index 100%
rename from add/data/xslt/teiHeader2HTML.xsl
rename to add/data/xslt/tei/profiles/edirom-header/teiHeader2HTML.xsl
diff --git a/add/data/xslt/tei/xhtml2/build-to.xml b/add/data/xslt/tei/xhtml2/build-to.xml
deleted file mode 100644
index 864a8a3c9..000000000
--- a/add/data/xslt/tei/xhtml2/build-to.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="." default="dist" name="teitohtml">
-<!--
-	This library is free software; you can redistribute it and/or
-	modify it under the terms of the GNU Lesser General Public
-	License as published by the Free Software Foundation; either
-	version 2.1 of the License, or (at your option) any later version.
-	
-	This library 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
-	Lesser General Public License for more details.
-	
-	You should have received a copy of the GNU Lesser General Public
-	License along with this library; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-	
-        Id: $Id: build-to.xml 9875 2011-12-04 18:27:43Z rahtz $
-        Copyright: 2011, TEI Consortium<
--->
-  <!--
- Convert TEI documents into HTML files.
- -->
-  <!-- Path to TEI XML file. -->
-  <property name="inputFile" value=""/>
-  <!-- Path where the output ePUB file will be saved. -->
-  <property name="outputFile" value=""/>
-  <!-- which profile -->
-  <property name="profile" value="default"/>
-  <!-- where does oxygen keep stuff -->
-  <property name="oxygenlib" value=""/>
-  <!-- Stylesheet for transformation -->
-  <property name="stylesheetFile"  value="../profiles/${profile}/html/to.xsl"/>
-  <dirname property="inputFileDir" file="${inputFile}"/>
-  <dirname property="outputDir" file="${outputFile}"/>
-  <property name="outputTempDir" value="${outputDir}/temp-dir-for-ant"/>
-  <path id="classpath">
-    <pathelement path="${java.class.path}"/>
-  </path>
-  <import file="../odds2/build-to.xml"/>
-  <target name="setup">
-    <delete dir="${outputTempDir}"/>
-    <mkdir dir="${outputTempDir}"/>
-  </target>
- 
-  <target name="transform">
-    <echo level="info">XSLT generate HTML files</echo>
-    <xslt force="yes" style="${stylesheetFile}" in="${outputTempDir}/tmp2.xml" out="${outputFile}" classpath="classpath">
-      <xmlcatalog>
-        <catalogpath>
-          <pathelement location="../../../../catalog.xml"/>
-          <pathelement location="../../../../../xhtml11/dtd/xhtmlcatalog.xml"/>
-        </catalogpath>
-      </xmlcatalog>
-      <factory name="net.sf.saxon.TransformerFactoryImpl"/>
-      <classpath location="${oxygenlib}/saxon9ee.jar"/>
-      <param name="directory" expression="file:///${outputTempDir}"/>
-      <param name="inputDir" expression="${inputFileDir}/"/>
-      <param name="cssFile" expression="${cssFile}" if="cssFile"/>
-      <!-- name of media overlay file -->
-      <param name="mediaoverlay" expression="${mediaoverlay}" if="mediaoverlay"/>
-      <!-- file per page -->
-      <param name="filePerPage" expression="${filePerPage}" if="filePerPage"/>
-      <!-- supply name of language-->
-      <param name="lang" expression="${lang}" if="lang"/>
-      <!-- emit some diagnostics"-->
-      <param name="debug" expression="${debug}" if="debug"/>
-      <!-- be verbose-->
-      <param name="verbose" expression="${verbose}" if="verbose"/>
-    </xslt>
-  </target>
-
- <target name="dist" depends="setup,odd,notodd,transform,cleanup"/>
-
-  <target name="cleanup" unless="debug">  
-    <delete dir="${outputTempDir}"/>
-  </target>
-
-</project>
diff --git a/add/data/xslt/tei/xhtml2/core.xsl b/add/data/xslt/tei/xhtml2/core.xsl
deleted file mode 100644
index a5864333e..000000000
--- a/add/data/xslt/tei/xhtml2/core.xsl
+++ /dev/null
@@ -1,2466 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0" exclude-result-prefixes="a fo html rng tei teix teidocx" version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI stylesheet dealing with elements from the core module, making
-      HTML output. </p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: core.xsl 9995 2012-01-02 15:22:30Z rahtz $</p>
-      <p>Copyright: 2011, TEI Consortium</p>
-    </desc>
-  </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process elements tei:*</p>
-      <p>
-        <p xmlns="http://www.w3.org/1999/xhtml"> anything with a head can go in the TOC </p>
-      </p>
-      <param name="forcedepth">forcedepth</param>
-    </desc>
-  </doc>
-  <xsl:template match="tei:*" mode="maketoc">
-    <xsl:param name="forcedepth"/>
-    <xsl:variable name="myName">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:variable>
-    <xsl:if test="tei:head or $autoHead='true'">
-      <xsl:variable name="Depth">
-        <xsl:choose>
-          <xsl:when test="not($forcedepth='')">
-            <xsl:value-of select="$forcedepth"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$tocDepth"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="thislevel">
-        <xsl:choose>
-          <xsl:when test="$myName = 'div'">
-            <xsl:value-of select="count(ancestor::tei:div)"/>
-          </xsl:when>
-          <xsl:when test="starts-with($myName,'div')">
-            <xsl:value-of select="number(substring-after($myName,'div')) - 1"/>
-          </xsl:when>
-          <xsl:otherwise>99</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="pointer">
-        <xsl:apply-templates mode="generateLink" select="."/>
-      </xsl:variable>
-      <li>
-        <xsl:attribute name="class">
-          <xsl:text>toc</xsl:text>
-          <xsl:if test="not($autoHead='true') and not(tei:head or @n)"> headless</xsl:if>
-        </xsl:attribute>
-        <xsl:call-template name="header">
-          <xsl:with-param name="toc" select="$pointer"/>
-          <xsl:with-param name="minimal">false</xsl:with-param>
-          <xsl:with-param name="display">plain</xsl:with-param>
-        </xsl:call-template>
-        <xsl:if test="$thislevel &lt; $Depth">
-          <xsl:call-template name="continuedToc"/>
-        </xsl:if>
-      </li>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element ab</desc>
-  </doc>
-  <xsl:template match="tei:ab">
-    <xsl:choose>
-      <xsl:when test="ancestor::tei:head or parent::tei:title or parent::tei:stage">
-        <xsl:apply-templates/>
-        <xsl:if test="following-sibling::tei:ab">
-          <br/>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="parent::tei:sp">
-        <div>
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default">spProse</xsl:with-param>
-          </xsl:call-template>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <div>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element addrLine</desc>
-  </doc>
-  <xsl:template match="tei:addrLine">
-    <xsl:apply-templates/>
-    <br/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element address</desc>
-  </doc>
-  <xsl:template match="tei:address">
-    <address>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:apply-templates/>
-    </address>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element argument</desc>
-  </doc>
-  <xsl:template match="tei:argument">
-    <div class="argument">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element author</desc>
-  </doc>
-  <xsl:template match="tei:author">
-    <span>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:apply-imports/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element bibl</desc>
-  </doc>
-  <xsl:template match="tei:bibl">
-    <xsl:choose>
-      <xsl:when test="parent::tei:q/parent::tei:head or parent::tei:q[@rend='inline']">
-        <span class="citbibl">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:when test="parent::tei:cit | parent::tei:q">
-        <div class="citbibl">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="tei:blockContext(.)">
-        <div class="biblfree">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <span>
-          <xsl:attribute name="class">
-            <xsl:text>bibl</xsl:text>
-            <xsl:if test="@type">
-              <xsl:text> bibl-</xsl:text>
-              <xsl:value-of select="@type"/>
-            </xsl:if>
-          </xsl:attribute>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element change</desc>
-  </doc>
-  <xsl:template match="tei:change">
-    <tr>
-      <td valign="top" width="15%">
-        <xsl:value-of select="tei:date"/>
-      </td>
-      <td width="85%">
-        <xsl:value-of select="tei:item"/>
-      </td>
-    </tr>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element choice</desc>
-  </doc>
-  <xsl:template match="tei:choice">
-    <xsl:choose>
-      <xsl:when test="tei:abbr and tei:expan">
-        <xsl:apply-templates select="tei:expan"/>
-        <xsl:text> (</xsl:text>
-        <xsl:apply-templates select="tei:abbr"/>
-        <xsl:text>)</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element choice in plain mode - selects "critical" reading.</desc>
-  </doc>
-  <xsl:template match="tei:choice" mode="plain">
-    <xsl:value-of select="tei:reg"/>
-    <xsl:value-of select="tei:expan"/>
-    <xsl:value-of select="tei:corr"/>
-    <xsl:apply-templates select="tei:choice"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element choice</desc>
-  </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process element cit</p>
-      <p>
-        <p xmlns="http://www.w3.org/1999/xhtml"> quoting </p>
-      </p>
-    </desc>
-  </doc>
-  <xsl:template match="tei:cit">
-    <xsl:choose>
-      <xsl:when test="@rend='display' and tei:quote">
-        <div>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:if test="@n">
-            <xsl:text>(</xsl:text>
-            <xsl:value-of select="@n"/>
-            <xsl:text>) </xsl:text>
-          </xsl:if>
-          <xsl:apply-templates select="tei:q|tei:quote"/>
-          <xsl:apply-templates select="tei:*[not(self::tei:q or self::tei:quote)]"/>
-        </div>
-      </xsl:when>
-      <xsl:when test="@rend='display'">
-        <blockquote>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:variable name="contents">
-            <xsl:if test="@n">
-              <xsl:text>(</xsl:text>
-              <xsl:value-of select="@n"/>
-              <xsl:text>) </xsl:text>
-            </xsl:if>
-            <xsl:apply-templates select="tei:q|tei:quote"/>
-            <xsl:apply-templates select="tei:*[not(self::tei:q or self::tei:quote)]"/>
-          </xsl:variable>
-          <xsl:choose>
-            <xsl:when test="$outputTarget='html5'">
-              <xsl:copy-of select="$contents"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <p>
-                <xsl:copy-of select="$contents"/>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </blockquote>
-      </xsl:when>
-      <xsl:when test="tei:bibl">
-        <div>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:if test="@n">
-            <xsl:text>(</xsl:text>
-            <xsl:value-of select="@n"/>
-            <xsl:text>) </xsl:text>
-          </xsl:if>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <span>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:if test="@n">
-            <xsl:text>(</xsl:text>
-            <xsl:value-of select="@n"/>
-            <xsl:text>) </xsl:text>
-          </xsl:if>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element code</desc>
-  </doc>
-  <xsl:template match="tei:code">
-    <code>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:apply-templates/>
-    </code>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-    Does not do anything yet.
-  </desc>
-  </doc>
-  <xsl:template match="tei:corr">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Decorate date</desc>
-  </doc>
-  <xsl:template match="tei:date">
-    <span>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:apply-imports/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>The del element</desc>
-  </doc>
-  <xsl:template match="tei:del">
-    <del>
-      <xsl:apply-templates/>
-    </del>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element eg</desc>
-  </doc>
-  <xsl:template match="tei:eg">
-    <div>
-      <xsl:if test="$cssFile">
-        <xsl:attribute name="class">
-          <xsl:text>pre_eg</xsl:text>
-          <xsl:if test="not(*)">
-            <xsl:text> cdata</xsl:text>
-          </xsl:if>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element emph</desc>
-  </doc>
-  <xsl:template match="tei:emph">
-    <xsl:choose>
-      <xsl:when test="@rend">
-        <xsl:call-template name="rendering"/>
-      </xsl:when>
-      <xsl:when test="@rendition">
-        <span>
-	  <xsl:call-template name="applyRendition"/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <em>
-          <xsl:apply-templates/>
-        </em>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element epigraph</desc>
-  </doc>
-  <xsl:template match="tei:epigraph">
-    <div>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element epigraph/lg</desc>
-  </doc>
-  <xsl:template match="tei:epigraph/tei:lg">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element foreign and unclear</desc>
-  </doc>
-  <xsl:template match="tei:foreign|tei:unclear">
-    <span>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element caesura</desc>
-  </doc>
-  <xsl:template match="tei:caesura">
-    <span class="caesura">    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element gap</desc>
-  </doc>
-  <xsl:template match="tei:gap">
-    <xsl:element name="{if (tei:blockContext(.)) then 'div' else 'span'}">
-      <xsl:attribute name="class">gap</xsl:attribute>
-      <xsl:if test="tei:desc">
-        <xsl:attribute name="title">
-          <xsl:value-of select="tei:desc"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="starts-with(@rend,'content:')">
-          <xsl:value-of select="substring-after(@rend,'content:')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text> [...]</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process element att</p>
-      <p>
-        <p xmlns="http://www.w3.org/1999/xhtml"> special purpose </p>
-      </p>
-    </desc>
-  </doc>
-  <xsl:template match="tei:att">
-    <span class="gi">
-      <b>@<xsl:apply-templates/>
-         </b>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process gloss element</desc>
-  </doc>
-  <xsl:template match="tei:gloss">
-    <span class="gloss">
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process element head</p>
-      <p xmlns="http://www.w3.org/1999/xhtml"> headings etc </p>
-    </desc>
-  </doc>
-  <xsl:template match="tei:head">
-    <xsl:variable name="parent" select="local-name(..)"/>
-    <xsl:choose>
-      <xsl:when test="parent::tei:group or parent::tei:body or parent::tei:front or parent::tei:back">
-        <h1>
-          <xsl:apply-templates/>
-        </h1>
-      </xsl:when>
-      <xsl:when test="parent::tei:argument">
-        <div>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="not(starts-with($parent,'div'))">
-        <xsl:apply-templates/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element head in plain mode</desc>
-  </doc>
-  <xsl:template match="tei:head" mode="plain">
-    <xsl:if test="preceding-sibling::tei:head">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="plain"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element head in heading mode</desc>
-  </doc>
-  <xsl:template match="tei:head" mode="makeheading">
-    <xsl:if test="preceding-sibling::tei:head">
-      <br/>
-    </xsl:if>
-    <span>
-      <xsl:call-template name="rendToClass">
-        <xsl:with-param name="id">false</xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element hi</desc>
-  </doc>
-  <xsl:template match="tei:hi">
-    <xsl:choose>
-      <xsl:when test="@rend">
-        <xsl:call-template name="rendering"/>
-      </xsl:when>
-      <xsl:when test="@rendition">
-        <span>
-          <xsl:call-template name="applyRendition"/>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:when test="key('TAGREND','hi')">
-        <span>
-          <xsl:attribute name="class">
-            <xsl:for-each select="key('TAGREND',local-name())">
-              <xsl:call-template name="findRendition">
-                <xsl:with-param name="value">
-                  <xsl:value-of select="@render"/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:for-each>
-          </xsl:attribute>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="hi">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element item</desc>
-  </doc>
-  <xsl:template match="tei:item" mode="bibl">
-    <p>
-      <xsl:call-template name="makeAnchor"/>
-      <xsl:apply-templates/>
-    </p>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element item</desc>
-  </doc>
-  <xsl:template match="tei:item" mode="glosstable">
-    <tr>
-      <td valign="top">
-        <strong>
-          <xsl:apply-templates mode="print" select="preceding-sibling::tei:*[1]"/>
-        </strong>
-      </td>
-      <td>
-        <xsl:call-template name="makeAnchor"/>
-        <xsl:apply-templates/>
-      </td>
-    </tr>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element item</desc>
-  </doc>
-  <xsl:template match="tei:item" mode="gloss">
-    <dt>
-      <xsl:call-template name="makeAnchor"/>
-      <xsl:apply-templates mode="print" select="preceding-sibling::tei:label[1]"/>
-    </dt>
-    <dd>
-      <xsl:apply-templates/>
-    </dd>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element item</desc>
-  </doc>
-  <xsl:template match="tei:item">
-    <li>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:choose>
-        <xsl:when test="@xml:id">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name">
-              <xsl:value-of select="@xml:id"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$generateParagraphIDs='true'">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name">
-              <xsl:value-of select="generate-id()"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-      </xsl:choose>
-      <xsl:apply-templates/>
-    </li>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element item</desc>
-  </doc>
-  <xsl:template match="tei:item" mode="inline">
-    <xsl:if test="preceding-sibling::tei:item">, </xsl:if>
-    <xsl:if test="not(following-sibling::tei:item) and preceding-sibling::tei:item">
-      and </xsl:if>
-    <xsl:text>• </xsl:text>
-    <xsl:apply-templates/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element item/tei:label</desc>
-  </doc>
-  <xsl:template match="tei:item/tei:label">
-    <xsl:choose>
-      <xsl:when test="@rend">
-        <xsl:call-template name="rendering"/>
-      </xsl:when>
-      <xsl:when test="@rendition">
-        <span>
-          <xsl:call-template name="applyRendition"/>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <strong>
-          <xsl:apply-templates/>
-        </strong>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element label</desc>
-  </doc>
-  <xsl:template match="tei:label">
-    <span>
-      <xsl:call-template name="makeAnchor"/>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element label</desc>
-  </doc>
-  <xsl:template match="tei:label" mode="print">
-    <span>
-      <xsl:call-template name="makeAnchor"/>
-      <xsl:choose>
-        <xsl:when test="@rend">
-          <xsl:call-template name="rendering"/>
-        </xsl:when>
-        <xsl:when test="@rendition">
-          <span>
-            <xsl:call-template name="applyRendition"/>
-            <xsl:apply-templates/>
-          </span>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element lb in plain mode</desc>
-  </doc>
-  <xsl:template match="tei:lb" mode="plain">
-    <xsl:text> </xsl:text>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element lb</desc>
-  </doc>
-  <xsl:template match="tei:lb">
-    <xsl:choose>
-      <xsl:when test="parent::tei:body"/>
-      <xsl:when test="parent::tei:back"/>
-      <xsl:when test="parent::tei:front"/>
-      <xsl:when test="@type='hyphenInWord' and @rend='hidden'"/>
-      <xsl:when test="@rend='hidden'">
-        <xsl:text> </xsl:text>
-      </xsl:when>
-      <xsl:when test="@rend='-' or @type='hyphenInWord'">
-        <xsl:text>-</xsl:text>
-        <br/>
-      </xsl:when>
-      <xsl:when test="@rend='above'">
-        <xsl:text>⌜</xsl:text>
-      </xsl:when>
-      <xsl:when test="@rend='below'">
-        <xsl:text>⌞</xsl:text>
-      </xsl:when>
-      <xsl:when test="@rend">
-        <br class="{@rend}"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <br/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element l</desc>
-  </doc>
-  <xsl:template match="tei:l">
-    <xsl:element name="{if (ancestor::tei:head or ancestor::tei:hi) then 'span' else 'div'}">
-      <xsl:call-template name="rendToClass">
-        <xsl:with-param name="default">l</xsl:with-param>
-      </xsl:call-template>
-      <xsl:choose>
-        <xsl:when test="ancestor::tei:div[contains(@rend,'linenumber')]">
-          <xsl:variable name="n">
-            <xsl:number/>
-          </xsl:variable>
-          <div class="numbering">
-            <xsl:choose>
-              <xsl:when test="$n mod 5 = 0">
-                <xsl:value-of select="$n"/>
-              </xsl:when>
-              <xsl:otherwise> </xsl:otherwise>
-            </xsl:choose>
-          </div>
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element lg</desc>
-  </doc>
-  <xsl:template match="tei:lg">
-    <xsl:choose>
-      <xsl:when test="$filePerPage='true'">
-        <xsl:for-each-group select="node()" group-starting-with="tei:pb">
-          <xsl:choose>
-            <xsl:when test="self::tei:pb">
-              <xsl:apply-templates select="."/>
-              <div>
-                <xsl:for-each select="..">
-                  <xsl:call-template name="rendToClass">
-                    <xsl:with-param name="id">
-                      <xsl:choose>
-                        <xsl:when test="@xml:id">
-                          <xsl:value-of select="@xml:id"/>
-                          <xsl:text>continued</xsl:text>
-                        </xsl:when>
-                        <xsl:otherwise>
-                          <xsl:text>false</xsl:text>
-                        </xsl:otherwise>
-                      </xsl:choose>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:for-each>
-                <xsl:apply-templates select="current-group() except ."/>
-              </div>
-            </xsl:when>
-            <xsl:otherwise>
-              <div>
-                <xsl:for-each select="..">
-                  <xsl:call-template name="rendToClass"/>
-                </xsl:for-each>
-                <xsl:apply-templates select="current-group()"/>
-              </div>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:for-each-group>
-      </xsl:when>
-      <xsl:otherwise>
-        <div>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element lg/tei:l</desc>
-  </doc>
-  <xsl:template match="tei:lg/tei:l">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@rend">
-          <xsl:attribute name="class">
-            <xsl:choose>
-              <xsl:when test="@rend='Alignr'">
-                <xsl:text>right</xsl:text>
-              </xsl:when>
-              <xsl:when test="@rend='Alignc'">
-                <xsl:text>center</xsl:text>
-              </xsl:when>
-              <xsl:when test="starts-with(@rend,'indent(')">
-                <xsl:text>indent</xsl:text>
-                <xsl:value-of select="concat(substring-before(substring-after(@rend,'('),')'),'em')"/>
-              </xsl:when>
-              <xsl:when test="@rend='indent'">
-                <xsl:text>indent1</xsl:text>
-              </xsl:when>
-              <xsl:when test="@rend">
-                <xsl:value-of select="@rend"/>
-              </xsl:when>
-            </xsl:choose>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="@rendition">
-          <xsl:call-template name="applyRendition"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="class">
-            <xsl:value-of select="local-name()"/>
-          </xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process element list</p>
-      <p>
-        <p xmlns="http://www.w3.org/1999/xhtml">Lists. Depending on the value of the 'type' attribute, various HTML
-        lists are generated: <dl><dt>bibl</dt><dd>Items are processed in mode 'bibl'</dd><dt>catalogue</dt><dd>A gloss list is created, inside a paragraph</dd><dt>gloss</dt><dd>A gloss list is created, expecting alternate label and item
-            elements</dd><dt>glosstable</dt><dd>Label and item pairs are laid out in a two-column table</dd><dt>inline</dt><dd>A comma-separate inline list</dd><dt>runin</dt><dd>An inline list with bullets between items</dd><dt>unordered</dt><dd>A simple unordered list</dd><dt>ordered</dt><dd>A simple ordered list</dd><dt>valList</dt><dd>(Identical to glosstable)</dd></dl>
-            </p>
-      </p>
-    </desc>
-  </doc>
-  <xsl:template match="tei:list">
-    <xsl:if test="tei:head">
-      <xsl:element name="{if (tei:blockContext(.)) then 'div' else 'span' }">
-        <xsl:attribute name="class">listhead</xsl:attribute>
-        <xsl:apply-templates select="tei:head"/>
-      </xsl:element>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="@type='catalogue'">
-        <p>
-          <dl>
-            <xsl:call-template name="rendToClass">
-              <xsl:with-param name="default"/>
-            </xsl:call-template>
-            <xsl:for-each select="tei:item">
-              <p/>
-              <xsl:apply-templates mode="gloss" select="."/>
-            </xsl:for-each>
-          </dl>
-        </p>
-      </xsl:when>
-      <xsl:when test="@type='gloss' and @rend='multicol'">
-        <xsl:variable name="nitems">
-          <xsl:value-of select="count(tei:item)div 2"/>
-        </xsl:variable>
-        <p>
-          <table>
-            <xsl:call-template name="rendToClass">
-              <xsl:with-param name="default"/>
-            </xsl:call-template>
-            <tr>
-              <td valign="top">
-                <dl>
-                  <xsl:apply-templates mode="gloss" select="tei:item[position()&lt;=$nitems ]"/>
-                </dl>
-              </td>
-              <td valign="top">
-                <dl>
-                  <xsl:apply-templates mode="gloss" select="tei:item[position() &gt;$nitems]"/>
-                </dl>
-              </td>
-            </tr>
-          </table>
-        </p>
-      </xsl:when>
-      <xsl:when test="@type='gloss' or  tei:label">
-        <dl>
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default"/>
-          </xsl:call-template>
-          <xsl:apply-templates mode="gloss" select="tei:item"/>
-        </dl>
-      </xsl:when>
-      <xsl:when test="@type='glosstable' or @type='valList'">
-        <table>
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default"/>
-          </xsl:call-template>
-          <xsl:apply-templates mode="glosstable" select="tei:item"/>
-        </table>
-      </xsl:when>
-      <xsl:when test="@type='inline' or ancestor::tei:head or parent::tei:label">
-        <!--<xsl:if test="not(tei:item)">None</xsl:if>-->
-        <xsl:apply-templates mode="inline" select="tei:item"/>
-      </xsl:when>
-      <xsl:when test="@type='runin'">
-        <p>
-          <xsl:apply-templates mode="runin" select="tei:item"/>
-        </p>
-      </xsl:when>
-      <xsl:when test="@type='unordered' or @type='simple'">
-        <ul>
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default"/>
-          </xsl:call-template>
-          <xsl:apply-templates select="tei:item"/>
-        </ul>
-      </xsl:when>
-      <xsl:when test="@type='bibl'">
-        <xsl:apply-templates mode="bibl" select="tei:item"/>
-      </xsl:when>
-      <xsl:when test="starts-with(@type,'ordered')">
-        <ol>
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default"/>
-          </xsl:call-template>
-          <xsl:if test="starts-with(@type,'ordered:')">
-            <xsl:attribute name="start">
-              <xsl:value-of select="substring-after(@type,':')"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:apply-templates select="tei:item"/>
-        </ol>
-      </xsl:when>
-      <xsl:otherwise>
-        <ul>
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default"/>
-          </xsl:call-template>
-          <xsl:apply-templates select="tei:item"/>
-        </ul>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element list/tei:label</desc>
-  </doc>
-  <xsl:template match="tei:list/tei:label"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element listBibl</desc>
-  </doc>
-  <xsl:template match="tei:listBibl">
-    <xsl:choose>
-      <xsl:when test="tei:biblStruct">
-        <ol class="listBibl">
-          <xsl:for-each select="tei:biblStruct">
-            <xsl:sort select="translate((          tei:*/tei:author/tei:surname|          tei:*[1]/tei:author/tei:orgName|            tei:*[1]/tei:author/tei:name|            tei:*[1]/tei:author|            tei:*[1]/tei:editor/tei:surname|            tei:*[1]/tei:editor/tei:name|            tei:*[1]/tei:editor|            tei:*[1]/tei:title[1])[1],  $uc,$lc)"/>
-            <xsl:sort select="tei:monogr/tei:imprint/tei:date"/>
-            <!--
-	   <dt>
-              <xsl:call-template name="makeAnchor"/>
-              <xsl:apply-templates select="." mode="xref"/>
-            </dt>
-            <dd>
-              <xsl:apply-templates select="."/>
-            </dd>
-	    -->
-            <li>
-              <xsl:call-template name="makeAnchor"/>
-              <xsl:apply-templates select="."/>
-            </li>
-          </xsl:for-each>
-        </ol>
-      </xsl:when>
-      <xsl:otherwise>
-        <ol class="listBibl">
-          <xsl:for-each select="tei:bibl|tei:biblItem">
-            <li>
-              <xsl:call-template name="makeAnchor">
-                <xsl:with-param name="name">
-                  <xsl:apply-templates mode="ident" select="."/>
-                </xsl:with-param>
-              </xsl:call-template>
-              <xsl:apply-templates select="."/>
-            </li>
-          </xsl:for-each>
-        </ol>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element mentioned</desc>
-  </doc>
-  <xsl:template match="tei:mentioned">
-    <span>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element name in mode "plain"</desc>
-  </doc>
-  <xsl:template match="tei:name" mode="plain">
-    <xsl:variable name="ident">
-      <xsl:apply-templates mode="ident" select="."/>
-    </xsl:variable>
-    <span>
-      <xsl:call-template name="makeAnchor">
-        <xsl:with-param name="name">
-          <xsl:value-of select="$ident"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element note</desc>
-  </doc>
-  <xsl:template match="tei:note">
-    <xsl:variable name="identifier">
-      <xsl:call-template name="noteID"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@place='none'"/>
-      <xsl:when test="ancestor::tei:listBibl or ancestor::tei:biblFull         or ancestor::tei:biblStruct">
-        <xsl:text> [</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>]</xsl:text>
-      </xsl:when>
-      <xsl:when test="@place='foot' or @place='bottom' or @place='end' or $autoEndNotes='true'">
-        <xsl:element name="{if (parent::tei:head or parent::tei:hi)  then 'span'           else if (parent::tei:l) then 'span'           else if (parent::tei:bibl/parent::tei:head) then 'span'           else if (parent::tei:stage/parent::tei:q) then 'span'           else if  (parent::tei:body or *[not(tei:is-inline(.))]) then 'div' else 'span' }">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="concat($identifier,'_return')"/>
-          </xsl:call-template>
-          <xsl:variable name="note-title">
-            <xsl:variable name="note-text">
-              <xsl:apply-templates mode="plain"/>
-            </xsl:variable>
-            <xsl:value-of select="substring($note-text,1,500)"/>
-            <xsl:if test="string-length($note-text) &gt; 500">
-              <xsl:text>…</xsl:text>
-            </xsl:if>
-          </xsl:variable>
-          <xsl:choose>
-            <xsl:when test="$footnoteFile='true'">
-              <a class="notelink" title="{normalize-space($note-title)}" href="{$masterFile}-notes.html#{$identifier}">
-		<xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
-                  <xsl:call-template name="noteN"/>
-		</xsl:element>
-              </a>
-              <xsl:if test="following-sibling::node()[1][self::tei:note]">
-		<xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
-                  <xsl:text>,</xsl:text>
-                </xsl:element>
-              </xsl:if>
-            </xsl:when>
-            <xsl:otherwise>
-              <a class="notelink" title="{normalize-space($note-title)}" href="#{$identifier}">
-		<xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">				  
-                  <xsl:call-template name="noteN"/>
-                </xsl:element>
-              </a>
-              <xsl:if test="following-sibling::node()[1][self::tei:note]">
-		<xsl:element name="{if (@rend='nosup') then 'span' else 'sup'}">
-                  <xsl:text>,</xsl:text>
-                </xsl:element>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="parent::tei:head and @place='margin'">
-        <span class="margnote">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:when test="parent::tei:head">
-        <xsl:text> [</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>]</xsl:text>
-      </xsl:when>
-      <xsl:when test="@type='footnote'">
-        <div class="note">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <span class="noteNumber">
-            <xsl:number/>
-          </span>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="(@place='display' or tei:q)          and (parent::tei:div or parent::tei:p or parent::tei:body)">
-        <div class="note">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <span class="noteLabel">
-            <xsl:choose>
-              <xsl:when test="@n">
-                <xsl:value-of select="@n"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Note</xsl:with-param>
-                </xsl:call-template>
-                <xsl:text>: </xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </span>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="@place='display'">
-        <blockquote>
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:choose>
-            <xsl:when test="$outputTarget='html5'">
-              <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:when test="tei:q">
-              <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:otherwise>
-              <p>
-                <xsl:apply-templates/>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </blockquote>
-      </xsl:when>
-      <xsl:when test="@place='margin' and parent::tei:hi and not(*)">
-        <span class="margnote">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:when test="@place='margin' and *[not(tei:is-inline(.))]">
-        <div class="margnote">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="@place='margin'">
-        <span class="margnote">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:when test="@place='inline' or (parent::tei:p or parent::tei:hi or parent::tei:head)">
-        <span class="note">
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <xsl:text> [</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>]</xsl:text>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <div>
-          <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-          </xsl:call-template>
-          <xsl:attribute name="class">
-            <xsl:text>note </xsl:text>
-            <xsl:value-of select="@type"/>
-          </xsl:attribute>
-          <span class="noteLabel">
-            <xsl:choose>
-              <xsl:when test="@n">
-                <xsl:value-of select="@n"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">Note</xsl:with-param>
-                </xsl:call-template>
-                <xsl:text>: </xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </span>
-          <xsl:apply-templates/>
-        </div>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Check whether a note should be processed if we are at the top</desc>
-  </doc>
-  <xsl:template match="tei:note" mode="printallnotes">
-    <xsl:choose>
-      <xsl:when test="number($splitLevel)=-1">
-        <xsl:call-template name="makeaNote"/>
-      </xsl:when>
-      <xsl:when test="ancestor::tei:group"/>
-      <xsl:when test="not(ancestor::tei:div or ancestor::tei:div1)">
-        <xsl:call-template name="makeaNote"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Check whether a note should be processed. If we are
-    splitting, check that we are in the correct file</desc>
-  </doc>
-  <xsl:template match="tei:note" mode="printnotes">
-    <xsl:param name="whence" select="."/>
-    <xsl:choose>
-      <xsl:when test="ancestor::tei:listBibl"/>
-      <xsl:when test="number($splitLevel)=-1"/>
-      <xsl:when test="@place='foot' or @place='bottom' or @place='end'         or $autoEndNotes='true'">
-        <xsl:variable name="parent">
-          <xsl:call-template name="locateParentDiv"/>
-        </xsl:variable>
-        <xsl:if test="$whence = $parent">
-          <xsl:call-template name="makeaNote"/>
-        </xsl:if>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element note</desc>
-  </doc>
-  <xsl:template name="makeaNote">
-    <xsl:variable name="identifier">
-      <xsl:call-template name="noteID"/>
-    </xsl:variable>
-    <xsl:if test="$verbose='true'">
-      <xsl:message>Make note <xsl:value-of select="$identifier"/></xsl:message>
-    </xsl:if>
-    <div class="note">
-      <xsl:call-template name="makeAnchor">
-        <xsl:with-param name="name" select="$identifier"/>
-      </xsl:call-template>
-      <span class="noteLabel">
-        <xsl:call-template name="noteN"/>
-        <xsl:if test="matches(@n,'[0-9]')">
-          <xsl:text>.</xsl:text>
-        </xsl:if>
-        <xsl:text> </xsl:text>
-      </span>
-      <div class="noteBody">
-        <xsl:apply-templates/>
-      </div>
-      <xsl:if test="$footnoteBackLink= 'true'">
-        <xsl:text> </xsl:text>
-        <a class="link_return" title="Go back to text" href="#{concat($identifier,'_return')}">↵</a>
-      </xsl:if>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element note[@type='action']</desc>
-  </doc>
-  <xsl:template match="tei:note[@type='action']">
-    <div class="right"><b>Action <xsl:number count="tei:note[@type='action']" level="any"/>
-         </b>: <i><xsl:apply-templates/></i></div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>Process element pb</p>
-      <p>Indication of a page break. For the purposes of HTML, we simply
-      make it an anchor if it has an ID.</p>
-    </desc>
-  </doc>
-  <xsl:template match="tei:pb" mode="ident">
-    <xsl:choose>
-      <xsl:when test="@xml:id">
-        <xsl:value-of select="@xml:id"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>page</xsl:text>
-        <!--
-	<xsl:for-each select="ancestor::tei:div[1]">
-	  <xsl:number level="multiple" format="1.1.1.1.1"/>
-	  <xsl:text>-</xsl:text>
-	</xsl:for-each>
--->
-        <xsl:number level="any"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:pb">
-    <xsl:choose>
-      <xsl:when test="$filePerPage='true'">
-        <PAGEBREAK>
-          <xsl:attribute name="name">
-            <xsl:apply-templates select="." mode="ident"/>
-          </xsl:attribute>
-          <xsl:copy-of select="@facs"/>
-        </PAGEBREAK>
-      </xsl:when>
-      <xsl:when test="@facs and not(@rend='none')">
-        <xsl:variable name="IMG">
-          <xsl:choose>
-            <xsl:when test="starts-with(@facs,'#')">
-              <xsl:for-each select="id(substring(@facs,2))">
-                <xsl:value-of select="tei:graphic[1]/@url"/>
-              </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@facs"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:element name="{if (tei:is-inline(..)) then 'span' else 'div'}">
-          <xsl:call-template name="rendToClass"/>
-          <img src="{$IMG}" alt="page image"/>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="$pagebreakStyle='active'">
-        <div class="pagebreak">
-          <xsl:call-template name="rendToClass"/>
-        </div>
-      </xsl:when>
-      <xsl:when test="$pagebreakStyle='visible' and (parent::tei:body         or parent::tei:front or parent::tei:back or parent::tei:group)">
-        <div class="pagebreak">
-          <xsl:call-template name="makeAnchor"/>
-          <xsl:text> [</xsl:text>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">page</xsl:with-param>
-          </xsl:call-template>
-          <xsl:if test="@n">
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="@n"/>
-          </xsl:if>
-          <xsl:text>] </xsl:text>
-        </div>
-      </xsl:when>
-      <xsl:when test="$pagebreakStyle='visible'">
-        <span class="pagebreak">
-          <xsl:call-template name="makeAnchor"/>
-          <xsl:text> [</xsl:text>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">page</xsl:with-param>
-          </xsl:call-template>
-          <xsl:if test="@n">
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="@n"/>
-          </xsl:if>
-          <xsl:text>] </xsl:text>
-        </span>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element p</desc>
-  </doc>
-  <xsl:template match="tei:p">
-    <xsl:variable name="wrapperElement">
-      <xsl:choose>
-        <xsl:when test="$outputTarget='html5'">p</xsl:when>
-        <xsl:when test="parent::tei:figure and (tei:q/tei:l or tei:figure or parent::tei:figure/parent::tei:div)">div</xsl:when>
-        <xsl:when test="parent::tei:figure">span</xsl:when>
-        <xsl:when test="parent::tei:head or    parent::tei:q/parent::tei:head or    parent::tei:note[@place='margin']/parent::tei:head">span</xsl:when>
-        <xsl:when test="parent::tei:note[not(@place or @rend)]">span</xsl:when>
-        <xsl:when test="$outputTarget='epub'">div</xsl:when>
-        <xsl:when test="tei:eg">div</xsl:when>
-        <xsl:when test="tei:figure">div</xsl:when>
-        <xsl:when test="tei:floatingText">div</xsl:when>
-        <xsl:when test="tei:l">div</xsl:when>
-        <xsl:when test="tei:list">div</xsl:when>
-        <xsl:when test="tei:moduleSpec">div</xsl:when>
-        <xsl:when test="tei:note[@place='display']">div</xsl:when>
-        <xsl:when test="tei:note[@place='margin']">div</xsl:when>
-        <xsl:when test="tei:note[tei:q]">div</xsl:when>
-        <xsl:when test="tei:q/tei:figure">div</xsl:when>
-        <xsl:when test="tei:q/tei:list">div</xsl:when>
-        <xsl:when test="tei:q[@rend='display']">div</xsl:when>
-        <xsl:when test="tei:q[@rend='inline' and tei:note/@place]">div</xsl:when>
-        <xsl:when test="tei:q[tei:l]">div</xsl:when>
-        <xsl:when test="tei:q[tei:lg]">div</xsl:when>
-        <xsl:when test="tei:q[tei:p]">div</xsl:when>
-        <xsl:when test="tei:q[tei:sp]">div</xsl:when>
-        <xsl:when test="tei:q[tei:floatingText]">div</xsl:when>
-        <xsl:when test="tei:quote">div</xsl:when>
-        <xsl:when test="tei:specGrp">div</xsl:when>
-        <xsl:when test="tei:specGrpRef">div</xsl:when>
-        <xsl:when test="tei:specList">div</xsl:when>
-        <xsl:when test="tei:table">div</xsl:when>
-        <xsl:when test="teix:egXML">div</xsl:when>
-        <xsl:when test="ancestor::tei:floatingText">div</xsl:when>
-        <xsl:when test="ancestor::tei:closer">div</xsl:when>
-        <xsl:when test="parent::tei:p">div</xsl:when>
-        <xsl:when test="parent::tei:q">div</xsl:when>
-        <xsl:when test="parent::tei:note">div</xsl:when>
-        <xsl:when test="parent::tei:remarks">div</xsl:when>
-        <xsl:otherwise>
-          <xsl:text>p</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$filePerPage='true'">
-        <xsl:for-each-group select="node()" group-starting-with="tei:pb">
-          <xsl:choose>
-            <xsl:when test="self::tei:pb">
-              <xsl:apply-templates select="."/>
-              <xsl:element name="{$wrapperElement}">
-                <xsl:for-each select="..">
-                  <xsl:call-template name="rendToClass">
-                    <xsl:with-param name="id">
-                      <xsl:choose>
-                        <xsl:when test="@xml:id">
-                          <xsl:value-of select="@xml:id"/>
-                          <xsl:text>continued</xsl:text>
-                        </xsl:when>
-                        <xsl:otherwise>
-                          <xsl:text>false</xsl:text>
-                        </xsl:otherwise>
-                      </xsl:choose>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:for-each>
-                <xsl:apply-templates select="current-group() except ."/>
-              </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:element name="{$wrapperElement}">
-                <xsl:for-each select="..">
-                  <xsl:call-template name="rendToClass"/>
-                </xsl:for-each>
-                <xsl:apply-templates select="current-group()"/>
-              </xsl:element>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:for-each-group>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$wrapperElement}">
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default">
-              <xsl:if test="not($wrapperElement ='p')">
-                <xsl:text>p</xsl:text>
-              </xsl:if>
-            </xsl:with-param>
-          </xsl:call-template>
-          <xsl:if test="$numberParagraphs='true'">
-	    <xsl:call-template name="numberParagraph"/>
-          </xsl:if>
-          <xsl:apply-templates/>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>How to number paragraphs</desc>
-  </doc>
-  <xsl:template name="numberParagraph">
-    <span class="numberParagraph">
-      <xsl:number/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element p[@rend='box']</desc>
-  </doc>
-  <xsl:template match="tei:p[@rend='box']">
-    <p class="box">
-      <xsl:apply-templates/>
-    </p>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element q and tei:said</desc>
-  </doc>
-  <xsl:template match="tei:q[@rend='inline margQuotes' or          @rend='inline margSglQuotes']">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <xsl:template match="tei:q[not(@place) and tei:l]">
-    <xsl:choose>
-      <xsl:when test="tei:blockContext(.)">
-        <div class="blockquote">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:q|tei:said">
-    <xsl:choose>
-      <xsl:when test="parent::tei:q/tei:note[@place='bottom']">
-        <span class="inlineq">
-          <xsl:call-template name="makeQuote"/>
-        </span>
-      </xsl:when>
-      <xsl:when test="parent::tei:note[@place='bottom'] and not(*)">
-        <span class="inlineq">
-          <xsl:call-template name="makeQuote"/>
-        </span>
-      </xsl:when>
-      <xsl:when test="tei:blockContext(.)">
-        <div class="blockquote {@rend}">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="parent::tei:q[@rend=current()/@rend] or parent::tei:hi or ancestor::tei:head">
-        <span class="inlineq {@rend}">
-          <xsl:call-template name="makeQuote"/>
-        </span>
-      </xsl:when>
-      <xsl:when test="not(tei:is-inline(.)) or *[not(tei:is-inline(.))]">
-        <div class="blockquote {@rend}">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="@rend='display'">
-        <p class="blockquote {@rend}">
-          <xsl:apply-templates/>
-        </p>
-      </xsl:when>
-      <xsl:when test="tei:lg">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="@rendition">
-        <span>
-          <xsl:call-template name="applyRendition"/>
-        </span>
-      </xsl:when>
-      <xsl:when test="contains(@rend,'PRE')">
-        <xsl:call-template name="makeQuote"/>
-      </xsl:when>
-      <xsl:when test="@rend">
-        <span class="q {@rend}">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="makeQuote"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element q[@rend='display']</desc>
-  </doc>
-  <xsl:template match="tei:q[@rend='display']">
-    <blockquote>
-      <xsl:call-template name="rendToClass"/>
-      <xsl:choose>
-        <xsl:when test="tei:p">
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:when test="$outputTarget='html5'">
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <p>
-            <xsl:apply-templates/>
-          </p>
-        </xsl:otherwise>
-      </xsl:choose>
-    </blockquote>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element q[@rend='eg']</desc>
-  </doc>
-  <xsl:template match="tei:q[@rend='eg']">
-    <div>
-      <xsl:if test="$cssFile">
-        <xsl:attribute name="class">eg</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element quote</desc>
-  </doc>
-  <xsl:template match="tei:quote">
-    <xsl:choose>
-      <xsl:when test="parent::tei:cit">
-        <div class="citquote">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:when test="@rend='quoted'">
-        <span class="quote_inline">
-          <xsl:value-of select="$preQuote"/>
-          <xsl:apply-templates/>
-          <xsl:value-of select="$postQuote"/>
-        </span>
-      </xsl:when>
-      <xsl:when test="@rend='display' or tei:lb or tei:p or tei:l or string-length(.)&gt;150">
-        <blockquote>
-          <xsl:call-template name="rendToClass"/>
-          <xsl:choose>
-            <xsl:when test="$outputTarget='html5'">
-              <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:when test="tei:p|tei:l|tei:lg">
-              <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:otherwise>
-              <p>
-                <xsl:apply-templates/>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </blockquote>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="quote_inline">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element resp</desc>
-  </doc>
-  <xsl:template match="tei:resp">
-    <xsl:apply-templates/>
-    <xsl:text> </xsl:text>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element respStmt</desc>
-  </doc>
-  <xsl:template match="tei:respStmt">
-    <xsl:apply-templates/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element salute</desc>
-  </doc>
-  <xsl:template match="tei:salute">
-    <xsl:choose>
-      <xsl:when test="parent::tei:closer">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <div class="left">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element seg, pass through @type and @rend as @class</desc>
-  </doc>
-  <xsl:template match="tei:seg">
-    <span>
-      <xsl:choose>
-        <xsl:when test="@type">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@type"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="@rend">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@rend"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-      <xsl:apply-templates/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-    put (sic) after text
-  </desc>
-  </doc>
-  <xsl:template match="tei:sic">
-    <xsl:apply-templates/>
-    <xsl:text> (sic)</xsl:text>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element signed</desc>
-  </doc>
-  <xsl:template match="tei:signed">
-    <div class="signed">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element space</desc>
-  </doc>
-  <xsl:template match="tei:space">
-    <span style="display:inline-block">
-      <xsl:if test="@extent">
-        <xsl:variable name="unit">
-          <xsl:choose>
-            <xsl:when test="@unit='chars'">
-              <xsl:text>em</xsl:text>
-            </xsl:when>
-            <xsl:when test="@unit">
-              <xsl:value-of select="@unit"/>
-            </xsl:when>
-            <xsl:otherwise>em</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-        <xsl:attribute name="width">
-          <xsl:value-of select="@extent"/>
-          <xsl:value-of select="$unit"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:text> </xsl:text>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element term</desc>
-  </doc>
-  <xsl:template match="tei:term">
-    <xsl:choose>
-      <xsl:when test="@rend">
-        <xsl:call-template name="rendering"/>
-      </xsl:when>
-      <xsl:when test="@rendition">
-        <span>
-          <xsl:call-template name="applyRendition"/>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="term">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element title in "withbr" mode</desc>
-  </doc>
-  <xsl:template match="tei:title" mode="withbr">
-    <xsl:value-of select="."/>
-    <br/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element title when it is a child of body</desc>
-  </doc>
-  <xsl:template match="tei:body/tei:title">
-    <div class="title">
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element witList</desc>
-  </doc>
-  <xsl:template match="tei:witList">
-    <xsl:apply-templates select="./witness"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element witness</desc>
-  </doc>
-  <xsl:template match="tei:witness">
-    <p id="{@sigil}">
-      <b>Sigle: <xsl:value-of select="@sigil"/>
-         </b>
-      <br/>
-      <xsl:value-of select="text()"/>
-      <br/>
-      <xsl:apply-templates select="tei:biblStruct"/>
-      <xsl:if test="child::tei:note"><br/>See: <xsl:apply-templates select="child::tei:note"/></xsl:if>
-    </p>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] Activate a value for @rendition<param name="value">value</param>
-      </desc>
-  </doc>
-  <xsl:template name="applyRendition">
-    <xsl:attribute name="class">
-      <xsl:for-each select="tokenize(normalize-space(@rendition),' ')">
-        <xsl:call-template name="findRendition">
-          <xsl:with-param name="value">
-            <xsl:value-of select="."/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:for-each>
-    </xsl:attribute>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] Look up rendition value <param name="value">value</param>
-      </desc>
-  </doc>
-  <xsl:template name="findRendition">
-    <xsl:param name="value"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($value,'#')">
-        <xsl:value-of select="substring-after($value,'#')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:for-each select="document($value)">
-          <xsl:apply-templates select="@xml:id"/>
-        </xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text> </xsl:text>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] Active a value for @rend<param name="value">value</param>
-      </desc>
-  </doc>
-  <xsl:template name="applyRend">
-    <xsl:param name="value"/>
-    <xsl:choose>
-      <xsl:when test="not($value='')">
-        <xsl:variable name="thisparm" select="substring-before($value,$rendSeparator)"/>
-        <xsl:call-template name="renderingInner">
-          <xsl:with-param name="value" select="$thisparm"/>
-          <xsl:with-param name="rest" select="substring-after($value,$rendSeparator)"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] sections in mode for table of contents</desc>
-  </doc>
-  <xsl:template name="continuedToc">
-    <xsl:if test="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6">
-      <ul class="toc">
-        <xsl:apply-templates mode="maketoc" select="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6"/>
-      </ul>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] How to identify a note</desc>
-  </doc>
-  <xsl:template name="noteID">
-    <xsl:choose>
-      <xsl:when test="@xml:id">
-        <xsl:value-of select="@xml:id"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>Note</xsl:text>
-        <xsl:number count="tei:note" level="any"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] How to label a note</desc>
-  </doc>
-  <xsl:template name="noteN">
-    <xsl:choose>
-      <xsl:when test="@n">
-        <xsl:value-of select="@n"/>
-      </xsl:when>
-      <xsl:when test="not(@place) and $consecutiveFNs='true'">
-        <xsl:number count="tei:note[not(@place)]" level="any"/>
-      </xsl:when>
-      <xsl:when test="not(@place)">
-        <xsl:choose>
-          <xsl:when test="ancestor::tei:front">
-            <xsl:number count="tei:note[not(@place)]" from="tei:front" level="any"/>
-          </xsl:when>
-          <xsl:when test="ancestor::tei:back">
-            <xsl:number count="tei:note[not(@place)]" from="tei:back" level="any"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:number count="tei:note[not(@place)]" from="tei:body" level="any"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="@place='end'">
-        <xsl:choose>
-          <xsl:when test="$consecutiveFNs = 'true'">
-            <xsl:number count="tei:note[./@place='end']" level="any"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="ancestor::tei:front">
-                <xsl:number count="tei:note[./@place='end' ]" from="tei:front" level="any"/>
-              </xsl:when>
-              <xsl:when test="ancestor::tei:back">
-                <xsl:number count="tei:note[./@place='end' ]" from="tei:back" level="any"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:number count="tei:note[./@place='end' ]" from="tei:body" level="any"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$consecutiveFNs = 'true'">
-            <xsl:number count="tei:note[@place='foot' or @place='bottom']" level="any"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="ancestor::tei:front">
-                <xsl:number count="tei:note[@place='foot' or @place='bottom']" from="tei:front" level="any"/>
-              </xsl:when>
-              <xsl:when test="ancestor::tei:back">
-                <xsl:number count="tei:note[@place='foot' or @place='bottom']" from="tei:back" level="any"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:number count="tei:note[@place='foot' or @place='bottom']" from="tei:body" level="any"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] Show relevant footnotes <param name="currentID">currentID</param>
-      </desc>
-  </doc>
-  <xsl:template name="partialFootNotes">
-    <xsl:param name="currentID"/>
-    <xsl:choose>
-      <xsl:when test="$currentID='current'"/>
-      <xsl:when test="$currentID='' and number($splitLevel)=-1">
-        <xsl:call-template name="printNotes"/>
-      </xsl:when>
-      <xsl:when test="$currentID=''">
-        <xsl:for-each select="descendant::tei:text">
-          <xsl:call-template name="printNotes"/>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="count(id($currentID))&gt;0">
-            <xsl:for-each select="id($currentID)">
-              <xsl:call-template name="printNotes"/>
-            </xsl:for-each>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates mode="xpath" select="ancestor-or-self::tei:TEI/descendant::tei:text">
-              <xsl:with-param name="xpath" select="$currentID"/>
-              <xsl:with-param name="action">notes</xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] </desc>
-  </doc>
-  <xsl:template name="printNotes">
-    <xsl:if test="count(key('NOTES',1)) or ($autoEndNotes='true' and count(key('ALLNOTES',1)))">
-      <xsl:choose>
-        <xsl:when test="$footnoteFile='true'">
-          <xsl:variable name="BaseFile">
-            <xsl:value-of select="$masterFile"/>
-            <xsl:call-template name="addCorpusID"/>
-          </xsl:variable>
-          <xsl:variable name="outName">
-            <xsl:call-template name="outputChunkName">
-              <xsl:with-param name="ident">
-                <xsl:value-of select="concat($BaseFile,'-notes')"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:if test="$verbose='true'">
-            <xsl:message>Opening file <xsl:value-of select="$outName"/>
-               </xsl:message>
-          </xsl:if>
-          <xsl:result-document doctype-public="{$doctypePublic}" doctype-system="{$doctypeSystem}" encoding="{$outputEncoding}" href="{$outName}" method="{$outputMethod}">
-            <html>
-              <xsl:comment>THIS FILE IS GENERATED FROM AN XML MASTER. DO NOT EDIT (11)</xsl:comment>
-              <xsl:call-template name="addLangAtt"/>
-              <head>
-                <title>
-                  <xsl:apply-templates select="descendant-or-self::tei:text/tei:front//tei:docTitle//text()"/>
-                  <xsl:text>: </xsl:text>
-                  <xsl:call-template name="i18n">
-                    <xsl:with-param name="word">noteHeading</xsl:with-param>
-                  </xsl:call-template>
-                </title>
-                <xsl:call-template name="includeCSS"/>
-                <xsl:call-template name="cssHook"/>
-              </head>
-              <body>
-                <xsl:call-template name="bodyMicroData"/>
-                <xsl:call-template name="bodyJavascriptHook"/>
-                <xsl:call-template name="bodyHook"/>
-                <div class="stdheader">
-                  <xsl:call-template name="stdheader">
-                    <xsl:with-param name="title">
-                      <xsl:apply-templates select="descendant-or-self::tei:text/tei:front//tei:docTitle//text()"/>
-                      <xsl:text>: </xsl:text>
-                      <xsl:call-template name="i18n">
-                        <xsl:with-param name="word">noteHeading</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </div>
-                <div class="notes">
-                  <div class="noteHeading">
-                    <xsl:call-template name="i18n">
-                      <xsl:with-param name="word">noteHeading</xsl:with-param>
-                    </xsl:call-template>
-                  </div>
-                  <xsl:choose>
-                    <xsl:when test="$autoEndNotes='true'">
-                      <xsl:apply-templates mode="printnotes" select="key('ALLNOTES',1)"/>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:apply-templates mode="printnotes" select="key('NOTES',1)"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </div>
-                <xsl:call-template name="stdfooter"/>
-                <xsl:call-template name="bodyEndHook"/>
-              </body>
-            </html>
-          </xsl:result-document>
-          <xsl:if test="$verbose='true'">
-            <xsl:message>Closing file <xsl:value-of select="$outName"/>
-               </xsl:message>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="me">
-            <xsl:apply-templates select="." mode="ident"/>
-          </xsl:variable>
-          <xsl:variable name="NOTES">
-            <xsl:choose>
-              <xsl:when test="self::tei:TEI">
-                <xsl:choose>
-                  <xsl:when test="$autoEndNotes='true'">
-                    <xsl:apply-templates mode="printallnotes" select="key('ALLNOTES',1)"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates mode="printallnotes" select="key('NOTES',1)"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:when>
-              <xsl:when test="parent::tei:group and tei:group">
-	      </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates mode="printnotes" select=".//tei:note">
-                  <xsl:with-param name="whence" select="$me"/>
-                </xsl:apply-templates>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-          <xsl:for-each select="$NOTES">
-            <xsl:if test="html:div">
-              <div class="notes">
-                <div class="noteHeading">
-                  <xsl:call-template name="i18n">
-                    <xsl:with-param name="word">noteHeading</xsl:with-param>
-                  </xsl:call-template>
-                </div>
-                <xsl:copy-of select="*"/>
-              </div>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-    <xsl:if test="ancestor-or-self::tei:TEI/tei:text/descendant::tei:app">
-      <div class="notes">
-        <div class="noteHeading">
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">noteHeading</xsl:with-param>
-          </xsl:call-template>
-        </div>
-        <xsl:apply-templates mode="printnotes" select="descendant::tei:app"/>
-      </div>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>
-      <p>[html] </p>
-      <p>
-        <p xmlns="http://www.w3.org/1999/xhtml"> rendering. support for multiple rendition elements added by Nick
-        Nicholas </p>
-      </p>
-    </desc>
-  </doc>
-  <xsl:template name="rendering">
-    <xsl:call-template name="applyRend">
-      <xsl:with-param name="value" select="concat(@rend,$rendSeparator)"/>
-    </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] <param name="value">the current segment of the value of the rend
-      attribute</param>
-         <param name="rest">the remainder of the attribute</param>
-      </desc>
-  </doc>
-  <xsl:template name="renderingInner">
-    <xsl:param name="value"/>
-    <xsl:param name="rest"/>
-    <xsl:choose>
-      <xsl:when test="$value='bold' or $value='bo'">
-        <b>
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </b>
-      </xsl:when>
-      <xsl:when test="$value='center'">
-        <center>
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </center>
-      </xsl:when>
-      <xsl:when test="$value='code'">
-        <b>
-          <tt>
-            <xsl:call-template name="applyRend">
-              <xsl:with-param name="value" select="$rest"/>
-            </xsl:call-template>
-          </tt>
-        </b>
-      </xsl:when>
-      <xsl:when test="$value='italics' or $value='italic' or $value='cursive' or         $value='it' or $value='ital'">
-        <i>
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </i>
-      </xsl:when>
-      <xsl:when test="$value='ro' or $value='roman'">
-        <span style="font-style: normal">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='sc' or $value='smcap'">
-        <span style="font-variant: small-caps">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='plain'">
-        <xsl:call-template name="applyRend">
-          <xsl:with-param name="value" select="$rest"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$value='quoted'">
-        <xsl:text>‘</xsl:text>
-        <xsl:call-template name="applyRend">
-          <xsl:with-param name="value" select="$rest"/>
-        </xsl:call-template>
-        <xsl:text>’</xsl:text>
-      </xsl:when>
-      <xsl:when test="$value='sub'">
-        <sub>
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </sub>
-      </xsl:when>
-      <xsl:when test="$value='sup'">
-        <sup>
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </sup>
-      </xsl:when>
-      <xsl:when test="$value='important'">
-        <span class="important">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='ul'">
-        <u>
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </u>
-      </xsl:when>
-      <xsl:when test="$value='interlinMarks'">
-        <xsl:text>`</xsl:text>
-        <xsl:call-template name="applyRend">
-          <xsl:with-param name="value" select="$rest"/>
-        </xsl:call-template>
-        <xsl:text>´</xsl:text>
-      </xsl:when>
-      <xsl:when test="$value='overbar'">
-        <span style="text-decoration:overline">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='expanded'">
-        <span style="letter-spacing: 0.15em">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='strike'">
-        <span style="text-decoration: line-through">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='small'">
-        <span style="font-size: 75%">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='large'">
-        <span style="font-size: 150%">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='smaller'">
-        <span style="font-size: 50%">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='larger'">
-        <span style="font-size: 200%">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='calligraphic' or $value='cursive'">
-        <span style="font-family: cursive">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='gothic'">
-        <span style="font-family: Papyrus, fantasy">
-          <xsl:call-template name="applyRend">
-            <xsl:with-param name="value" select="$rest"/>
-          </xsl:call-template>
-        </span>
-      </xsl:when>
-      <xsl:when test="$value='noindex'">
-        <xsl:call-template name="applyRend">
-          <xsl:with-param name="value" select="$rest"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="local-name(.)='p'">
-            <xsl:call-template name="unknownRendBlock">
-              <xsl:with-param name="rest" select="$rest"/>
-              <xsl:with-param name="value" select="$value"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="unknownRendInline">
-              <xsl:with-param name="rest" select="$rest"/>
-              <xsl:with-param name="value" select="$value"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] Process unknown rend attribute by turning it into
-    an HTML class<param name="value">current value</param>
-         <param name="rest">remaining values</param>
-      </desc>
-  </doc>
-  <xsl:template name="unknownRendBlock">
-    <xsl:param name="value"/>
-    <xsl:param name="rest"/>
-    <xsl:if test="not($value='')">
-      <xsl:attribute name="class">
-        <xsl:value-of select="$value"/>
-      </xsl:attribute>
-      <xsl:call-template name="applyRend">
-        <xsl:with-param name="value" select="$rest"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html]  Process unknown rend attribute by turning it into
-    an HTML class<param name="value">value</param>
-         <param name="rest">rest</param>
-      </desc>
-  </doc>
-  <xsl:template name="unknownRendInline">
-    <xsl:param name="value"/>
-    <xsl:param name="rest"/>
-    <xsl:if test="not($value='')">
-      <span class="{$value}">
-        <xsl:call-template name="applyRend">
-          <xsl:with-param name="value" select="$rest"/>
-        </xsl:call-template>
-      </span>
-    </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] Create a point to which we can link in the HTML<param name="name">value for identifier</param>
-      </desc>
-  </doc>
-  <xsl:template name="makeAnchor">
-    <xsl:param name="name"/>
-    <xsl:choose>
-      <xsl:when test="self::tei:anchor and $name">
-        <a id="{$name}">
-          <xsl:comment>anchor</xsl:comment>
-        </a>
-      </xsl:when>
-      <xsl:when test="self::tei:anchor">
-        <a id="{@xml:id}">
-          <xsl:comment>anchor</xsl:comment>
-        </a>
-      </xsl:when>
-      <xsl:when test="self::tei:index and $name">
-        <a id="{$name}">
-          <xsl:comment>index</xsl:comment>
-        </a>
-      </xsl:when>
-      <xsl:when test="self::tei:index">
-        <a id="{@xml:id}">
-          <xsl:comment>index</xsl:comment>
-        </a>
-      </xsl:when>
-      <xsl:when test="$name">
-        <xsl:attribute name="id" select="$name"/>
-      </xsl:when>
-      <xsl:when test="@xml:id">
-        <xsl:attribute name="id" select="@xml:id"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="me"><xsl:value-of select="$masterFile"/>-<xsl:value-of select="local-name(.)"/>-<xsl:value-of select="generate-id()"/></xsl:variable>
-        <xsl:attribute name="id" select="$me"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element soCalled</desc>
-  </doc>
-  <xsl:template match="tei:soCalled">
-    <xsl:choose>
-      <xsl:when test="@rend">
-        <xsl:call-template name="rendering"/>
-      </xsl:when>
-      <xsl:when test="@rendition">
-        <span>
-          <xsl:call-template name="applyRendition"/>
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$preQuote"/>
-        <xsl:apply-templates/>
-        <xsl:value-of select="$postQuote"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Copy all attributes in HTML namespace</desc>
-  </doc>
-  <xsl:template name="htmlAttributes">
-    <xsl:for-each select="@*">
-      <xsl:if test="namespace-uri(.)='http://www.w3.org/1999/xhtml'">
-        <xsl:attribute name="{local-name(.)}">
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-      </xsl:if>
-    </xsl:for-each>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] convert rend attribute to HTML class</desc>
-  </doc>
-  <xsl:template name="rendToClass">
-    <xsl:param name="id">true</xsl:param>
-    <xsl:param name="default">.</xsl:param>
-    <xsl:choose>
-      <xsl:when test="$id='false'"/>
-      <xsl:when test="$id=''"/>
-      <xsl:when test="$id='true' and @xml:id">
-        <xsl:attribute name="id">
-          <xsl:value-of select="@xml:id"/>
-        </xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$id='true' and self::tei:p and $generateParagraphIDs='true'">
-        <xsl:attribute name="id">
-          <xsl:value-of select="generate-id()"/>
-        </xsl:attribute>
-      </xsl:when>
-      <xsl:when test="$id='true'"/>
-      <xsl:otherwise>
-        <xsl:attribute name="id" select="$id"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:if test="$outputTarget='html5'">
-      <xsl:call-template name="microdata"/>
-    </xsl:if>
-    <xsl:variable name="class1">
-      <xsl:choose>
-        <xsl:when test="$default=''"/>
-        <xsl:when test="not($default='.')">
-          <xsl:value-of select="$default"/>
-        </xsl:when>
-        <xsl:when test="@type">
-          <xsl:value-of select="@type"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="local-name()"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="rendToClassHook"/>
-      <xsl:if test="tei:is-transcribable(.) and $mediaoverlay='true'">
-        <xsl:text> transcribable</xsl:text>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:variable name="class2">
-      <xsl:choose>
-        <xsl:when test="@rend">
-          <xsl:value-of select="translate(@rend,'/','-')"/>
-        </xsl:when>
-        <xsl:when test="@rendition">
-          <xsl:call-template name="findRendition">
-            <xsl:with-param name="value">
-              <xsl:value-of select="@rendition"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="key('TAGREND',local-name())">
-          <xsl:for-each select="key('TAGREND',local-name())">
-            <xsl:call-template name="findRendition">
-              <xsl:with-param name="value">
-                <xsl:value-of select="@render"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:for-each>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$class1='' and $class2=''"/>
-      <xsl:when test="$class2=''">
-        <xsl:attribute name="class">
-          <xsl:value-of select="normalize-space($class1)"/>
-        </xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="class">
-          <xsl:if test="not($class1='')">
-            <xsl:value-of select="$class1"/>
-            <xsl:text> </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="$class2"/>
-        </xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:choose>
-      <xsl:when test="@rendition">
-        <xsl:call-template name="applyRendition"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] allow for local extensions to rendToClass</desc>
-  </doc>
-  <xsl:template name="rendToClassHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] standard case of TEI element which produces a span</desc>
-  </doc>
-  <xsl:template name="makeSpan">
-    <xsl:element name="{if (tei:blockContext(.)) then 'div' else 'span'}">
-      <xsl:choose>
-        <xsl:when test="@rendition">
-          <xsl:call-template name="applyRendition"/>
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="rendToClass">
-            <xsl:with-param name="default">
-              <xsl:value-of select="local-name()"/>
-            </xsl:with-param>
-          </xsl:call-template>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:template>
-  <xsl:template name="microdata"/>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/corpus.xsl b/add/data/xslt/tei/xhtml2/corpus.xsl
deleted file mode 100644
index c48986183..000000000
--- a/add/data/xslt/tei/xhtml2/corpus.xsl
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a fo rng tei teix"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the corpus module,
-      making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: corpus.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element catRef</desc>
-   </doc>
-  <xsl:template match="tei:catRef">
-      <xsl:variable name="W">
-         <xsl:choose>
-            <xsl:when test="starts-with(@target,'#')">
-               <xsl:value-of select="substring(@target,2)"/>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:value-of select="@target"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:if test="preceding-sibling::tei:catRef">
-         <xsl:text> 
-    </xsl:text>
-      </xsl:if>
-      <em>
-         <xsl:value-of select="@scheme"/>
-      </em>: <xsl:apply-templates select="id($W)/catDesc"/>
-   </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element teiCorpus</desc>
-   </doc>
-  <xsl:template match="tei:teiCorpus">
-      <xsl:element name="html" namespace="{$outputNamespace}">
-         <xsl:call-template name="addLangAtt"/>
-         <head>
-            <title>
-               <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title/text()"/>
-            </title>
-            <xsl:call-template name="includeCSS"/>
-            <xsl:call-template name="cssHook"/>
-         </head>
-         <body class="simple">
-	   <xsl:call-template name="bodyMicroData"/>
-	   <xsl:call-template name="bodyHook"/>
-	   <xsl:call-template name="bodyJavascriptHook"/>
-	   <div class="stdheader">
-	     <xsl:call-template name="stdheader">
-		<xsl:with-param name="title">
-		  <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title"/>
-		</xsl:with-param>
-	     </xsl:call-template>
-	    </div>
-	    <xsl:call-template name="corpusBody"/>
-            <xsl:call-template name="stdfooter"/>
-            <xsl:call-template name="bodyEndHook"/>
-         </body>
-      </xsl:element>
-  </xsl:template>
-  <xsl:template match="tei:teiCorpus" mode="split">
-      <xsl:variable name="BaseFile">
-         <xsl:value-of select="$masterFile"/>
-         <xsl:call-template name="addCorpusID"/>
-      </xsl:variable>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML: run start hook template teiStartHook</xsl:message>
-      </xsl:if>
-      <xsl:call-template name="teiStartHook"/>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML in corpus splitting mode, base file is <xsl:value-of select="$BaseFile"/>
-         </xsl:message>
-      </xsl:if>
-      <xsl:variable name="outName">
-         <xsl:call-template name="outputChunkName">
-	           <xsl:with-param name="ident">
-	              <xsl:value-of select="$BaseFile"/>
-	           </xsl:with-param>
-         </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:if test="$verbose='true'">
-         <xsl:message>Opening file <xsl:value-of select="$outName"/>
-         </xsl:message>
-      </xsl:if>
-      <xsl:result-document doctype-public="{$doctypePublic}" 
-			   doctype-system="{$doctypeSystem}"
-                           encoding="{$outputEncoding}"
-                           href="{$outName}"
-                           method="{$outputMethod}">
-      
-         <xsl:element name="html" namespace="{$outputNamespace}">
-	   <xsl:call-template name="addLangAtt"/>
-	   <head>
-	     <title>
-	       <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title/text()"/>
-	     </title>
-	     <xsl:call-template name="includeCSS"/>
-	     <xsl:call-template name="cssHook"/>
-	   </head>
-	   <body class="simple">
-	     <xsl:call-template name="bodyMicroData"/>
-	     <xsl:call-template name="bodyJavascriptHook"/>
-	     <xsl:call-template name="bodyHook"/>
-	     <div class="stdheader">
-	       <xsl:call-template name="stdheader">
-		 <xsl:with-param name="title">
-		   <xsl:apply-templates select="tei:teiHeader/tei:fileDesc/tei:titleStmt/tei:title[1]"/>
-		 </xsl:with-param>
-	       </xsl:call-template>
-	     </div>
-	     <xsl:call-template name="corpusBody"/>
-	     <xsl:call-template name="stdfooter"/>
-	     <xsl:call-template name="bodyEndHook"/>
-	   </body>
-         </xsl:element>
-      </xsl:result-document>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>Closing file <xsl:value-of select="$outName"/>
-         </xsl:message>
-      </xsl:if>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML: run end hook template teiEndHook</xsl:message>
-      </xsl:if>
-      <xsl:call-template name="teiEndHook"/>
-      <xsl:apply-templates select="tei:TEI" mode="split"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="corpusBody">
-    <xsl:call-template name="mainTOC"/>
-  </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/xhtml2/dictionaries.xsl b/add/data/xslt/tei/xhtml2/dictionaries.xsl
deleted file mode 100644
index 28ca37ac3..000000000
--- a/add/data/xslt/tei/xhtml2/dictionaries.xsl
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-
-                xmlns:m="http://www.w3.org/1998/Math/MathML"
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a fo rng tei teix m"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the dictionaries
-      module, making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: dictionaries.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/xhtml2/drama.xsl b/add/data/xslt/tei/xhtml2/drama.xsl
deleted file mode 100644
index 9407160f5..000000000
--- a/add/data/xslt/tei/xhtml2/drama.xsl
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes=" a fo rng tei teix html"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the drama module,
-      making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: drama.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element actor</desc>
-   </doc>
-  <xsl:template match="tei:actor">
-      <span class="actor">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element camera</desc>
-   </doc>
-  <xsl:template match="tei:camera">
-      <span class="camera">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element caption</desc>
-   </doc>
-  <xsl:template match="tei:caption">
-      <span class="caption">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element castGroup</desc>
-   </doc>
-  <xsl:template match="tei:castGroup">
-      <ul>
-         <xsl:apply-templates/>
-      </ul>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element castItem</desc>
-   </doc>
-  <xsl:template match="tei:castItem">
-      <li>
-         <xsl:apply-templates/>
-      </li>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element castList</desc>
-   </doc>
-  <xsl:template match="tei:castList">
-      <xsl:if test="tei:head">
-         <p>
-            <em>
-               <xsl:for-each select="tei:head">
-                  <xsl:apply-templates/>
-               </xsl:for-each>
-            </em>
-         </p>
-      </xsl:if>
-      <ul>
-         <xsl:apply-templates/>
-      </ul>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element castList/tei:head</desc>
-   </doc>
-  <xsl:template match="tei:castList/tei:head"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element role</desc>
-   </doc>
-  <xsl:template match="tei:role">
-      <span class="role">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element roleDesc</desc>
-   </doc>
-  <xsl:template match="tei:roleDesc">
-      <blockquote>
-	        <xsl:choose>
-	           <xsl:when test="@rend">
-	              <xsl:attribute name="class">
-		                <xsl:value-of select="@rend"/>
-	              </xsl:attribute>
-	           </xsl:when>
-	           <xsl:when test="@rendition">
-		             <xsl:call-template name="applyRendition"/>
-	           </xsl:when>
-	           <xsl:otherwise>
-	              <xsl:attribute name="class">
-		                <xsl:text>roleDesc</xsl:text>
-	              </xsl:attribute>
-	           </xsl:otherwise>
-	        </xsl:choose>
-         <xsl:choose>
-            <xsl:when test="tei:p">
-               <xsl:apply-templates/>
-            </xsl:when>
-            <xsl:otherwise>
-               <p>
-                  <xsl:apply-templates/>
-               </p>
-            </xsl:otherwise>
-         </xsl:choose>
-      </blockquote>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element set</desc>
-   </doc>
-  <xsl:template match="tei:set">
-      <span class="set">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element sound</desc>
-   </doc>
-  <xsl:template match="tei:sound">
-      <span class="sound">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process element sp</p>
-         <p>
-            <p xmlns="http://www.w3.org/1999/xhtml"> elaborated by Nick Nicholas &lt;nicholas@uci.edu&gt;, March
-        2001 </p>
-         </p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:sp">
-    <div class="speaker">
-      <xsl:call-template name="makeAnchor"/>
-      <xsl:apply-templates select="tei:speaker"/>
-    </div>
-    <xsl:apply-templates select="tei:*[not(self::tei:speaker)]"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element sp/tei:p</desc>
-   </doc>
-  <xsl:template match="tei:sp/tei:p">
-    <xsl:choose>
-      <xsl:when test="$filePerPage='true'">
-	<xsl:for-each-group select="node()" group-starting-with="tei:pb">
-	  <xsl:choose>
-	    <xsl:when test="self::tei:pb">
-	      <xsl:apply-templates select="."/>
-	      <div>
-		<xsl:for-each select="..">
-		  <xsl:call-template name="rendToClass">      
-		    <xsl:with-param name="default">p-in-sp</xsl:with-param>
-		    <xsl:with-param name="id">
-		      <xsl:choose>
-			<xsl:when test="@xml:id">
-			  <xsl:value-of select="@xml:id"/>
-			  <xsl:text>continued</xsl:text>
-			</xsl:when>
-			<xsl:otherwise>
-			  <xsl:text>false</xsl:text>
-			</xsl:otherwise>
-		      </xsl:choose>
-		    </xsl:with-param>
-		  </xsl:call-template>
-		</xsl:for-each>
-		<xsl:apply-templates select="current-group() except ."/>
-	      </div>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <div>
-		<xsl:for-each select="..">
-		  <xsl:call-template name="rendToClass">      
-		    <xsl:with-param name="default">p-in-sp</xsl:with-param>
-		  </xsl:call-template>
-		</xsl:for-each>
-		<xsl:apply-templates select="current-group()"/>
-	      </div>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:for-each-group>
-      </xsl:when>
-      <xsl:otherwise>
-	<div>
-	  <xsl:call-template name="rendToClass">      
-	    <xsl:with-param name="default">p-in-sp</xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:apply-templates/>
-	</div>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element stage</desc>
-   </doc>
-  <xsl:template match="tei:stage">
-    <xsl:element name="{if (tei:blockContext(.) or *[not(tei:is-inline(.))]) then 'div' else 'span' }">
-      <xsl:call-template name="rendToClass">
-	<xsl:with-param name="default">
-	  <xsl:choose>
-	    <xsl:when
-		test="ancestor::tei:text/@rend='firstfolio'">stage</xsl:when>
-	    <xsl:otherwise>stage it</xsl:otherwise>
-	  </xsl:choose>
-	</xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element tech</desc>
-   </doc>
-  <xsl:template match="tei:tech">
-      <span class="tech">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element view</desc>
-   </doc>
-  <xsl:template match="tei:view">
-      <span class="view">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/xhtml2/figures.xsl b/add/data/xslt/tei/xhtml2/figures.xsl
deleted file mode 100644
index 5f2372d80..000000000
--- a/add/data/xslt/tei/xhtml2/figures.xsl
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:svg="http://www.w3.org/2000/svg"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                xmlns:m="http://www.w3.org/1998/Math/MathML"
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/"                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="svg a fo html rng tei teidocx teix m"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the figures module,
-      making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: figures.xsl 10001 2012-01-02 19:12:05Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements m:*|@*|comment()|processing-instruction()|text()</desc>
-   </doc>
-  <xsl:template match="m:*|@*|comment()|processing-instruction()|text()" mode="math">
-      <xsl:copy>
-         <xsl:apply-templates mode="math" select="*|@*|processing-instruction()|text()"/>
-      </xsl:copy>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements m:math</desc>
-   </doc>
-  <xsl:template match="m:math">
-      <m:math>
-         <xsl:copy-of select="@*"/>
-         <xsl:apply-templates mode="math"/>
-      </m:math>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element cell</desc>
-   </doc>
-  <xsl:template match="tei:cell">
-    <xsl:variable name="cellname">
-      <xsl:choose>
-	<xsl:when test="parent::tei:row[@rend='thead']">th</xsl:when>
-	<xsl:otherwise>td</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element name="{$cellname}">
-      <xsl:attribute name="valign">top</xsl:attribute>
-      <xsl:for-each select="@*">
-	<xsl:choose>
-	  <xsl:when test="name(.) = 'width' or name(.) =
-			  'border' or name(.) = 'cellspacing'
-			  or name(.) = 'cellpadding'">
-	    <xsl:copy-of select="."/>
-	  </xsl:when>
-	  <xsl:when test="name(.)='rend' and starts-with(.,'width:')">
-	    <xsl:attribute name="width">
-	      <xsl:value-of select="substring-after(.,'width:')"/>
-	    </xsl:attribute>
-	  </xsl:when>
-	  <xsl:when test="name(.)='rend' and starts-with(.,'class:')">
-	    <xsl:attribute name="class">
-	      <xsl:value-of select="substring-after(.,'class:')"/>
-	    </xsl:attribute>
-	  </xsl:when>
-	  <xsl:when test="name(.)='rend' and starts-with(.,'style=')">
-	    <xsl:attribute name="style">
-	      <xsl:value-of select="substring-after(.,'style=')"/>
-	    </xsl:attribute>
-	  </xsl:when>
-	  <xsl:when test="name(.)='rend'">
-	    <xsl:attribute name="class">
-	      <xsl:value-of select="."/>
-	    </xsl:attribute>
-	  </xsl:when>
-	  <xsl:when test="name(.)='cols'">
-	    <xsl:attribute name="colspan">
-	      <xsl:value-of select="."/>
-	    </xsl:attribute>
-	  </xsl:when>
-	  <xsl:when test="name(.)='rows'">
-	    <xsl:attribute name="rowspan">
-	      <xsl:value-of select="."/>
-	    </xsl:attribute>
-	  </xsl:when>
-	  <xsl:when test="name(.)='align'">
-	    <xsl:attribute name="align">
-	      <xsl:value-of select="."/>
-	    </xsl:attribute>
-	  </xsl:when>
-	</xsl:choose>
-      </xsl:for-each>
-      <xsl:choose>
-	<xsl:when test="@teidocx:align">
-	  <xsl:attribute name="align">
-	    <xsl:value-of select="@teidocx:align"/>
-	  </xsl:attribute>
-	</xsl:when>
-	<xsl:when test="@align"/>
-	<xsl:when test="not($cellAlign='left')">
-	  <xsl:attribute name="align">
-	    <xsl:value-of select="$cellAlign"/>
-	  </xsl:attribute>
-	</xsl:when>
-      </xsl:choose>
-      <xsl:if test="@role and not (@rend)">
-	<xsl:attribute name="class">
-	  <xsl:value-of select="@role"/>
-	</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@xml:id">	   
-	<xsl:call-template name="makeAnchor"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element figDesc</desc>
-   </doc>
-  <xsl:template match="tei:figDesc"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element figure</desc>
-   </doc>
-  <xsl:template match="tei:figure">
-    <xsl:variable name="container">
-      <xsl:choose>
-	<xsl:when test="$outputTarget='html5'">figure</xsl:when>
-	<xsl:otherwise>div</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="parent::tei:head or @rend='inline' or @place='inline'">
-	<xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="parent::tei:ref">
-	<xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:element name="{$container}">
-	  <xsl:choose>
-	    <xsl:when test="@rend">
-	      <xsl:attribute name="class">
-		<xsl:text>figure </xsl:text>
-		<xsl:value-of select="@rend"/>
-	      </xsl:attribute>
-	    </xsl:when>
-	    <xsl:when test="@rendition">
-	      <xsl:call-template name="applyRendition"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:attribute name="class">
-		<xsl:text>figure</xsl:text>
-	      </xsl:attribute>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	  
-	  <xsl:if test="@xml:id">
-	    <xsl:attribute name="id">
-	      <xsl:value-of select="@xml:id"/>
-	    </xsl:attribute>
-	  </xsl:if>
-	  <xsl:call-template name="figureHook"/>
-	  <xsl:apply-templates/>
-	</xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element figure/tei:head</desc>
-  </doc>
-  <xsl:template match="tei:figure/tei:head">
-    <xsl:variable name="captionlabel">
-      <xsl:choose>
-	<xsl:when test="ancestor::tei:front and  $numberFrontFigures='true'">
-	  <xsl:call-template name="i18n">
-	    <xsl:with-param name="word">figureWord</xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text> </xsl:text>
-	  <xsl:number count="tei:figure[tei:head]" from="tei:front" level="any"/>
-	  <xsl:text>. </xsl:text>
-	</xsl:when>
-	<xsl:when test="ancestor::tei:back and $numberBackFigures='true'">
-	  <xsl:call-template name="i18n">
-	    <xsl:with-param name="word">figureWord</xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text> </xsl:text>
-	  <xsl:for-each select="..">
-	    <xsl:number count="tei:figure[tei:head]" from="tei:back" level="any"/>
-	  </xsl:for-each>
-	  <xsl:text>. </xsl:text>
-	</xsl:when>
-	<xsl:when test="ancestor::tei:body and $numberFigures='true'">
-	  <xsl:call-template name="i18n">
-	    <xsl:with-param name="word">figureWord</xsl:with-param>
-	  </xsl:call-template>
-	  <xsl:text> </xsl:text>
-	  <xsl:for-each select="..">
-	    <xsl:number count="tei:figure[tei:head]" from="tei:body"
-			level="any"/>
-	    </xsl:for-each>
-	  <xsl:text>. </xsl:text>
-	</xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$outputTarget='html5'">
-	<figcaption>
-	  <xsl:if test="@rend">
-	    <xsl:attribute name="class" select="@rend"/>
-	  </xsl:if>
-	  <xsl:call-template name="rendering"/>
-	  <xsl:copy-of select="$captionlabel"/>
-	  <xsl:apply-templates/>
-	</figcaption>
-      </xsl:when>
-      <xsl:otherwise>
-	<span class="caption {@rend}">
-	  <xsl:copy-of select="$captionlabel"/>
-	  <xsl:apply-templates/>
-	</span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element formula</desc>
-  </doc>
-  <xsl:template match="tei:formula" mode="xref">
-    <xsl:number/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element graphic</desc>
-   </doc>
-  <xsl:template match="tei:graphic">
-      <xsl:call-template name="showGraphic"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element row</desc>
-   </doc>
-  <xsl:template match="tei:row">
-      <tr>
-         <xsl:call-template name="rendToClass">
-	           <xsl:with-param name="default"/>
-         </xsl:call-template>
-         <xsl:if test="@role">
-            <xsl:attribute name="class">
-               <xsl:value-of select="@role"/>
-            </xsl:attribute>
-         </xsl:if>
-         <xsl:apply-templates/>
-      </tr>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element table</desc>
-   </doc>
-  <xsl:template match="tei:table">
-      <div>
-         <xsl:attribute name="class">
-	           <xsl:text>table</xsl:text>
-	           <xsl:if test="@align">
-	              <xsl:text> </xsl:text>
-	              <xsl:value-of select="@align"/>
-	           </xsl:if>
-         </xsl:attribute>
-	 <xsl:if test="@xml:id">	   
-	   <xsl:call-template name="makeAnchor"/>
-	 </xsl:if>
-         <table>
-            <xsl:call-template name="rendToClass">
-	              <xsl:with-param name="id">false</xsl:with-param>
-	           </xsl:call-template>
-            <xsl:if test="@rend='frame' or @rend='rules'">
-               <xsl:attribute name="rules">all</xsl:attribute>
-               <xsl:attribute name="border">1</xsl:attribute>
-            </xsl:if>
-            <xsl:for-each select="@*">
-               <xsl:if test="name(.)='summary' or name(.) = 'width' or name(.) = 'border' or name(.) = 'frame' or name(.) = 'rules' or name(.) = 'cellspacing' or name(.) = 'cellpadding'">
-                  <xsl:copy-of select="."/>
-               </xsl:if>
-            </xsl:for-each>
-	    <xsl:if test="tei:head">
-	      <caption>
-		<xsl:apply-templates select="tei:head"/>
-	      </caption>
-	    </xsl:if>
-	    <xsl:choose>
-	      <xsl:when test="tei:row[@rend='thead']">
-		<thead>
-		  <xsl:apply-templates
-		      select="tei:row[@rend='thead']"/>
-		</thead>
-		<tbody>
-		  <xsl:apply-templates select="tei:row[not(@rend='thead')]"/>
-		</tbody>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:apply-templates select="tei:row"/>
-	      </xsl:otherwise>
-	    </xsl:choose>
-         </table>
-	 <xsl:apply-templates select="tei:note"/>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element table[@rend='simple']</desc>
-   </doc>
-  <xsl:template match="tei:table[@rend='simple']">
-      <table>
-         <xsl:choose>
-	           <xsl:when test="@rend">
-	              <xsl:attribute name="class">
-	                 <xsl:value-of select="@rend"/>
-               </xsl:attribute>
-	           </xsl:when>
-	           <xsl:when test="@rendition">
-	              <xsl:call-template name="applyRendition"/>
-	           </xsl:when>
-         </xsl:choose>
-         <xsl:for-each select="@*">
-            <xsl:if test="name(.)='summary'    or name(.) = 'width'    or name(.) = 'border'    or name(.) = 'frame'    or name(.) = 'rules'    or name(.) = 'cellspacing'    or name(.) = 'cellpadding'">
-               <xsl:copy-of select="."/>
-            </xsl:if>
-         </xsl:for-each>
-	 <xsl:if test="@xml:id">
-	   <xsl:call-template name="makeAnchor"/>
-	 </xsl:if>
-         <xsl:apply-templates/>
-      </table>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="name">name</param>
-         <param name="value">value</param>
-      </desc>
-   </doc>
-  <xsl:template name="setDimension">
-      <xsl:param name="name"/>
-      <xsl:param name="value"/>
-
-      <xsl:variable name="calcvalue">
-         <xsl:choose>
-            <xsl:when test="contains($value,'in')">
-               <xsl:value-of select="round($dpi * number(substring-before($value,'in')))"/>
-            </xsl:when>
-            <xsl:when test="contains($value,'pt')">
-               <xsl:value-of select="round($dpi * (number(substring-before($value,'pt')) div 72))"/>
-            </xsl:when>
-            <xsl:when test="contains($value,'cm')">
-               <xsl:value-of select="round($dpi * (number(substring-before($value,'cm')) div 2.54 ))"/>
-            </xsl:when>
-            <xsl:when test="contains($value,'px')">
-               <xsl:value-of select="substring-before($value,'px')"/>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:value-of select="$value"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:attribute name="{$name}">
-         <xsl:value-of select="$calcvalue"/>
-      </xsl:attribute>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="showGraphic">
-      <xsl:variable name="File">
-         <xsl:choose>
-            <xsl:when test="@url">
-               <xsl:value-of select="@url"/>
-               <xsl:if test="not(contains(@url,'.'))">
-                  <xsl:value-of select="$graphicsSuffix"/>
-               </xsl:if>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:message terminate="yes">Cannot work out how to do a graphic
-          </xsl:message>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="Alt">
-         <xsl:choose>
-            <xsl:when test="tei:desc">
-               <xsl:for-each select="tei:desc">
-		 <xsl:apply-templates mode="plain"/>
-	       </xsl:for-each>
-            </xsl:when>
-            <xsl:when test="tei:figDesc">
-               <xsl:for-each select="tei:figDesc">
-	                 <xsl:apply-templates mode="plain"/>
-	              </xsl:for-each>
-            </xsl:when>
-            <xsl:when test="tei:head">
-               <xsl:value-of select="tei:head/text()"/>
-            </xsl:when>
-            <xsl:when test="parent::tei:figure/tei:figDesc">
-               <xsl:for-each select="parent::tei:figure/tei:figDesc">
-	                 <xsl:apply-templates mode="plain"/>
-	              </xsl:for-each>
-            </xsl:when>
-            <xsl:when test="parent::tei:figure/tei:head">
-               <xsl:value-of select="parent::tei:figure/tei:head/text()"/>
-            </xsl:when>
-         </xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-	<xsl:when test="$showFigures='true'">
-	  <xsl:choose>
-	    <xsl:when test="@type='thumbnail'"/>
-	    <xsl:when test="starts-with(@mimeType, 'video')">
-	      <video src="{$graphicsPrefix}{$File}"
-		     controls="controls">
-		<xsl:if test="../tei:graphic[@type='thumbnail']">
-		  <xsl:attribute name="poster">
-		    <xsl:value-of select="../tei:graphic[@type='thumbnail']/@url"/>
-		  </xsl:attribute>
-		</xsl:if>
-	      </video>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <img src="{$graphicsPrefix}{$File}">
-		<xsl:attribute name="alt">
-		  <xsl:value-of select="$Alt"/>
-		</xsl:attribute>
-		<xsl:call-template name="imgHook"/>
-		<xsl:if test="@xml:id">
-		  <xsl:attribute name="id">
-		    <xsl:value-of select="@xml:id"/>
-		  </xsl:attribute>
-		</xsl:if>
-		<xsl:call-template name="rendToClass"/>
-		<xsl:if test="@width">
-		  <xsl:call-template name="setDimension">
-		    <xsl:with-param name="value">
-		      <xsl:value-of select="@width"/>
-		    </xsl:with-param>
-		    <xsl:with-param name="name">width</xsl:with-param>
-		  </xsl:call-template>
-		</xsl:if>
-		<xsl:if test="@height">
-		  <xsl:call-template name="setDimension">
-		    <xsl:with-param name="value">
-		      <xsl:value-of select="@height"/>
-		    </xsl:with-param>
-		    <xsl:with-param name="name">height</xsl:with-param>
-		  </xsl:call-template>
-		</xsl:if>
-	      </img>
-	    </xsl:otherwise>
-	  </xsl:choose>	  
-         </xsl:when>
-         <xsl:otherwise>
-            <div class="altfigure">
-	      <xsl:call-template name="i18n">
-		<xsl:with-param name="word">figureWord</xsl:with-param>
-	      </xsl:call-template>
-	      <xsl:text> </xsl:text>
-	      <xsl:for-each select="self::tei:figure|parent::tei:figure">
-		<xsl:number count="tei:figure[tei:head]" level="any"/>
-	      </xsl:for-each>
-	      <xsl:text> </xsl:text>
-	      <xsl:value-of select="$File"/>
-	      <xsl:text> [</xsl:text>
-	      <xsl:value-of select="$Alt"/>
-	      <xsl:text>] </xsl:text>
-	    </div>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:binaryObject">
-      <img>
-         <xsl:attribute name="src">
-            <xsl:text>data:</xsl:text>
-            <xsl:value-of select="@mimetype"/>
-            <xsl:text>;base64,</xsl:text>
-            <xsl:copy-of select="text()"/>
-         </xsl:attribute>
-         <xsl:if test="@width">
-            <xsl:call-template name="setDimension">
-               <xsl:with-param name="value">
-                  <xsl:value-of select="@width"/>
-               </xsl:with-param>
-               <xsl:with-param name="name">width</xsl:with-param>
-            </xsl:call-template>
-         </xsl:if>
-         <xsl:if test="@height">
-            <xsl:call-template name="setDimension">
-               <xsl:with-param name="value">
-                  <xsl:value-of select="@height"/>
-               </xsl:with-param>
-               <xsl:with-param name="name">height</xsl:with-param>
-            </xsl:call-template>
-         </xsl:if>
-      </img>
-      <!-- also alt -->
-    <!-- this is what we'll need for IE:
-<style type="text/css">
-   img {behavior: expression(fixBase64(this));}
-  </style>
-  <script type="text/javascript">
-  	// a regular expression to test for Base64 data
-	var BASE64_DATA = /^data:.*;base64/i;
-	// path to the PHP module that will decode the encoded data
-	var base64Path = "/my/base64.php";
-	function fixBase64(img) {
-		// stop the CSS expression from being endlessly evaluated
-		img.runtimeStyle.behavior = "none";
-		// check the image src
-		if (BASE64_DATA.test(img.src)) {
-		// pass the data to the PHP routine
-		img.src = base64Path + "?" + img.src.slice(5);
-		}
-	};
-  </script>
-  Dean Edwards http://dean.edwards.name/weblog/2005/06/base64-sexy/
-<?php
-$data = split(";", $_SERVER["REDIRECT_QUERY_STRING"]);
-$type = $data[0];
-$data = split(",", $data[1]);
-header("Content-type: ".$type);
-echo base64_decode($data[1]);
-?>
--->
-  </xsl:template>
-
-  <xsl:template match="svg:*">
-      <xsl:copy-of select="."/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/header.xsl b/add/data/xslt/tei/xhtml2/header.xsl
deleted file mode 100644
index 9ba154551..000000000
--- a/add/data/xslt/tei/xhtml2/header.xsl
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
-                exclude-result-prefixes="a fo rng tei teix">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the header module,
-      making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: header.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-
-  <xsl:key name="ALL-EXTRENDITION" match="@rendition[not(starts-with(.,'#'))]" use="1"/>
-  <xsl:key name="EXTRENDITION"     match="@rendition[not(starts-with(.,'#'))]" use="."/>
-  <xsl:key name="ALL-LOCALRENDITION" match="tei:rendition" use='1'/>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element teiHeader</desc>
-   </doc>
-  <xsl:template match="tei:teiHeader"/>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>make a style section from rendition elements in the header</desc>
-   </doc>
-  
-  <xsl:template name="generateLocalCSS">
-      <xsl:if test="key('ALL-LOCALRENDITION',1)">
-         <style type="text/css">
-	   <xsl:for-each select="key('ALL-LOCALRENDITION',1)">
-	     <xsl:text>&#10;.</xsl:text>
-	     <xsl:value-of select="@xml:id"/>
-	     <xsl:text> {&#10;	</xsl:text>
-	     <xsl:value-of select="."/>
-	     <xsl:text>;&#10;}</xsl:text>
-	   </xsl:for-each>
-	   <xsl:text>&#10;</xsl:text>
-         </style>
-      </xsl:if>
-      <xsl:if test="key('ALL-EXTRENDITION',1)">
-         <style type="text/css">
-	   <xsl:for-each select="key('ALL-EXTRENDITION',1)">
-	     <xsl:variable name="pointer">
-	       <xsl:value-of select="."/>
-	     </xsl:variable>
-	    <!-- <xsl:for-each select="key('RENDITION',$pointer)[1]">
-	       <xsl:for-each select="document($pointer)">
-		 <xsl:text>&#10;.</xsl:text>
-		 <xsl:value-of select="@xml:id"/>
-		 <xsl:text> {&#10;</xsl:text>
-		 <xsl:value-of select="."/>
-		 <xsl:text>;&#10;}</xsl:text>
-	       </xsl:for-each>
-	     </xsl:for-each>-->
-	   </xsl:for-each>
-         </style>
-      </xsl:if>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] processing licence</desc>
-  </doc>
-  <xsl:template match="tei:availability"  mode="copyrighttext">
-    <xsl:apply-templates mode="copyrighttext"/>
-  </xsl:template>
-
-  <xsl:template match="tei:licence"  mode="copyrighttext">
-    <xsl:if test="@target">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="@target"/>
-      <xsl:text>] </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </xsl:template>
-  
-
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/xhtml2/linking.xsl b/add/data/xslt/tei/xhtml2/linking.xsl
deleted file mode 100644
index f6348c839..000000000
--- a/add/data/xslt/tei/xhtml2/linking.xsl
+++ /dev/null
@@ -1,553 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-		xmlns:xs="http://www.w3.org/2001/XMLSchema"                
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="2.0"
-                exclude-result-prefixes="a fo rng tei html teix xs">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the linking module,
-      making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: linking.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process any element and work out a unique identififying string</desc>
-   </doc>
-  <xsl:template match="*" mode="ident">
-      <xsl:variable name="BaseFile">
-         <xsl:value-of select="$masterFile"/>
-         <xsl:call-template name="addCorpusID"/>
-      </xsl:variable>
-
-      <xsl:choose>
-         <xsl:when test="@xml:id and $useIDs='true'">
-            <xsl:value-of select="@xml:id"/>
-         </xsl:when>
-         <xsl:when test="starts-with(local-name(.),'div') or
-			 self::tei:text">
-            <xsl:variable name="xpath">
-               <xsl:for-each select="ancestor-or-self::tei:*">
-	                 <xsl:value-of select="local-name()"/>
-	                 <xsl:text>.</xsl:text>
-	                 <xsl:number/>
-	                 <xsl:if test="not(position() = last())">
-	                    <xsl:text>_</xsl:text>
-	                 </xsl:if>
-	              </xsl:for-each>
-	           </xsl:variable>
-	           <xsl:value-of select="$BaseFile"/>
-	           <xsl:text>-</xsl:text>
-            <xsl:value-of select="substring-after(substring-after($xpath,'_text.'),'_')"/>
-         </xsl:when>
-         <xsl:when test="self::tei:TEI and parent::tei:teiCorpus">
-	   <xsl:value-of select="$masterFile"/>
-	   <xsl:call-template name="addCorpusID"/>
-	 </xsl:when>
-         <xsl:otherwise>
-	   <xsl:value-of select="$BaseFile"/>
-	   <xsl:text>-</xsl:text>
-	   <xsl:value-of select="local-name(.)"/>
-	   <xsl:text>-</xsl:text>
-	   <xsl:value-of select="generate-id()"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements *</desc>
-   </doc>
-  <xsl:template match="*" mode="generateLink">
-      <xsl:variable name="ident">
-         <xsl:apply-templates mode="ident" select="."/>
-      </xsl:variable>
-      <xsl:variable name="depth">
-         <xsl:apply-templates mode="depth" select="."/>
-      </xsl:variable>
-      <xsl:variable name="Hash">
-         <xsl:text>#</xsl:text>
-      </xsl:variable>
-
-      <xsl:choose>
-	<xsl:when test="$filePerPage='true'">
-	  <xsl:choose>
-	    <xsl:when test="preceding::tei:pb">
-	      <xsl:apply-templates select="preceding::tei:pb[1]"
-				   mode="ident"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>index</xsl:text>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	  <xsl:value-of select="$standardSuffix"/>
-	</xsl:when>
-         <xsl:when test="$STDOUT='true' and number($depth) &lt;= number($splitLevel)">
-            <xsl:value-of select="$masterFile"/>
-            <xsl:value-of select="$standardSuffix"/>
-            <xsl:value-of select="$urlChunkPrefix"/>
-            <xsl:value-of select="$ident"/>
-         </xsl:when>
-         <xsl:when test="ancestor::tei:elementSpec and not($STDOUT='true')">
-	           <xsl:text>ref-</xsl:text>
-	           <xsl:value-of select="ancestor::tei:elementSpec/@ident"/>
-            <xsl:value-of select="$standardSuffix"/>
-	           <xsl:value-of select="concat($Hash,$ident)"/>
-         </xsl:when>
-         <xsl:when test="ancestor::tei:classSpec and not($STDOUT='true')">
-	           <xsl:text>ref-</xsl:text>
-	           <xsl:value-of select="ancestor::tei:classSpec/@ident"/>
-            <xsl:value-of select="$standardSuffix"/>
-	           <xsl:value-of select="concat($Hash,$ident)"/>
-         </xsl:when>
-         <xsl:when test="ancestor::tei:back and not($splitBackmatter)">
-            <xsl:value-of select="concat($Hash,$ident)"/>
-         </xsl:when>
-         <xsl:when test="ancestor::tei:front and not($splitFrontmatter)">
-            <xsl:value-of select="concat($Hash,$ident)"/>
-         </xsl:when>
-	 <xsl:when test="self::tei:text and $splitLevel=0">
-	   <xsl:value-of select="$ident"/>
-	   <xsl:value-of select="$standardSuffix"/>
-	 </xsl:when>
-         <xsl:when test="number($splitLevel)= -1 and
-			 ancestor::tei:teiCorpus">
-            <xsl:value-of select="$masterFile"/>
-            <xsl:call-template name="addCorpusID"/>
-            <xsl:value-of select="$standardSuffix"/>
-            <xsl:value-of select="concat($Hash,$ident)"/>
-         </xsl:when>
-         <xsl:when test="number($splitLevel)= -1">
-            <xsl:value-of select="concat($Hash,$ident)"/>
-         </xsl:when>
-         <xsl:when test="number($depth) &lt;= number($splitLevel)">
-            <xsl:value-of select="concat($ident,$standardSuffix)"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:variable name="parent">
-               <xsl:call-template name="locateParentDiv"/>
-            </xsl:variable>
-            <xsl:choose>
-               <xsl:when test="$STDOUT='true'">
-                  <xsl:value-of select="$masterFile"/>
-                  <xsl:value-of select="$urlChunkPrefix"/>
-                  <xsl:value-of select="$parent"/>
-                  <xsl:text>#</xsl:text>
-                  <xsl:value-of select="$ident"/>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:value-of select="$parent"/>
-                  <xsl:value-of select="concat($standardSuffix,'#')"/>
-                  <xsl:value-of select="$ident"/>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process element TEI in generateLink mode</p>
-         <p>
-            <p xmlns="http://www.w3.org/1999/xhtml"> when a &lt;div&gt; is referenced, see whether its plain
-        anchor, or needs a parent HTML name prepended </p>
-         </p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:TEI" mode="generateLink">
-      <xsl:variable name="BaseFile">
-	<xsl:apply-templates select="." mode="ident"/>
-      </xsl:variable>
-      <xsl:value-of select="concat($BaseFile,$standardSuffix)"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element anchor</desc>
-   </doc>
-  <xsl:template match="tei:anchor">
-      <xsl:call-template name="makeAnchor"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process extra elements in generateLink mode</desc>
-   </doc>
-  <xsl:template match="tei:label|tei:figure|tei:table|tei:item|tei:p|tei:bibl|tei:anchor|tei:cell|tei:lg|tei:list|tei:sp"
-                 mode="generateLink">
-      <xsl:variable name="ident">
-         <xsl:apply-templates mode="ident" select="."/>
-      </xsl:variable>
-      <xsl:variable name="file">
-         <xsl:apply-templates mode="generateLink"
-                              select="ancestor::tei:*[starts-with(local-name(),'div')][1]"/>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="starts-with($file,'#')">
-            <xsl:text>#</xsl:text>
-            <xsl:value-of select="$ident"/>
-         </xsl:when>
-         <xsl:when test="contains($file,'#')">
-            <xsl:value-of select="substring-before($file,'#')"/>
-            <xsl:text>#</xsl:text>
-            <xsl:value-of select="$ident"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:value-of select="$file"/>
-            <xsl:text>#</xsl:text>
-            <xsl:value-of select="$ident"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element note</desc>
-   </doc>
-  <xsl:template match="tei:note" mode="generateLink">
-    <xsl:variable name="file">
-      <xsl:apply-templates mode="generateLink"
-			   select="ancestor::tei:*[starts-with(local-name(),'div')][1]"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="starts-with($file,'#')"/>
-      <xsl:when test="contains($file,'#')">
-            <xsl:value-of select="substring-before($file,'#')"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:value-of select="$file"/>
-         </xsl:otherwise>
-      </xsl:choose>
-      <xsl:text>#</xsl:text>
-      <xsl:call-template name="noteID"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="where">where</param>
-      </desc>
-   </doc>
-  <xsl:template name="generateEndLink">
-      <xsl:param name="where"/>
-      <xsl:choose>
-	<xsl:when test="id($where)">
-	  <xsl:apply-templates mode="generateLink" select="id($where)"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:text>[[undefined </xsl:text>
-	  <xsl:value-of select="$where"/>
-	  <xsl:text>]]</xsl:text>
-	</xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Find the name of the outermost container for the
-      current object which would create an output file</desc>
-   </doc>
-  <xsl:template name="locateParentDiv">
-
-      <xsl:choose>
-
-	<xsl:when
-	     test="ancestor-or-self::tei:body/parent::tei:text/ancestor::tei:group">
-            <xsl:apply-templates mode="ident" select="ancestor::tei:text[1]"/>
-         </xsl:when>
-
-	 <xsl:when test="ancestor-or-self::tei:front/parent::tei:text/ancestor::tei:group">
-            <xsl:apply-templates mode="ident" select="ancestor::tei:text[1]"/>
-         </xsl:when>
-
-	 <xsl:when test="ancestor-or-self::tei:back/parent::tei:text/ancestor::tei:group">
-            <xsl:apply-templates mode="ident" select="ancestor::tei:text[1]"/>
-         </xsl:when>
-
-         <xsl:when test="ancestor-or-self::tei:div and number($splitLevel) &lt; 0">
-            <xsl:apply-templates mode="ident" select="ancestor::tei:div[last()]"/>
-         </xsl:when>
-
-         <xsl:when test="ancestor-or-self::tei:div">
-	   <xsl:variable name="ancestors" select="count(ancestor-or-self::tei:div)"/>
-	   <xsl:variable name="diff" select="$ancestors - number($splitLevel)"/>
-	   <xsl:variable name="what" select="if ($diff &lt;= 1) then 1
-					     else $diff "/>
-	   <xsl:apply-templates mode="ident" select="ancestor-or-self::tei:div[$what]"/>
-         </xsl:when>
-
-         <xsl:otherwise>
-	   <xsl:variable name="ancestors" select="count(ancestor-or-self::tei:*[local-name()='div1'
-				 or local-name()='div2'
-				 or local-name()='div3'
-				 or local-name()='div4'
-				 or local-name()='div5'
-				 or local-name()='div6'])"/>
-	   <xsl:variable name="what"
-			 select="if
-				 ($ancestors &lt; number($splitLevel)) then 1 else
-				 $ancestors - number($splitLevel) + 1"/>
-            <xsl:apply-templates mode="ident"
-				 select="ancestor-or-self::tei:*[local-name()='div1'
-				 or local-name()='div2'
-				 or local-name()='div3'
-				 or local-name()='div4'
-				 or local-name()='div5'
-				 or local-name()='div6'][$what]"/>
-         </xsl:otherwise>
-      </xsl:choose>
-
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] create external link<param name="ptr">ptr</param>
-         <param name="dest">dest</param>
-         <param name="class">class</param>
-      </desc>
-   </doc>
-  <xsl:template name="makeExternalLink">
-      <xsl:param name="ptr" as="xs:boolean"  select="false()"/>
-      <xsl:param name="dest"/>
-      <xsl:param name="class">link_<xsl:value-of select="local-name(.)"/>
-      </xsl:param>
-      <a>
-        <xsl:choose>
-            <xsl:when test="@rend">
-	              <xsl:attribute name="class">
-	                 <xsl:value-of select="@rend"/>
-	              </xsl:attribute>
-            </xsl:when>
-	           <xsl:when test="@rendition">
-	              <xsl:call-template name="applyRendition"/>
-	           </xsl:when>
-            <xsl:when test="parent::tei:item/parent::tei:list[@rend]">
-	              <xsl:attribute name="class">
-	                 <xsl:value-of select="parent::tei:item/parent::tei:list/@rend"/>
-	              </xsl:attribute>
-            </xsl:when>
-	           <xsl:when test="parent::tei:item[@rend]">
-	              <xsl:attribute name="class">
-	                 <xsl:value-of select="parent::tei:item/@rend"/>
-	              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-	              <xsl:attribute name="class">
-	                 <xsl:value-of select="$class"/>
-	              </xsl:attribute>
-            </xsl:otherwise>
-        </xsl:choose>
-
-         <xsl:if test="@type">
-            <xsl:attribute name="type">
-               <xsl:value-of select="@type"/>
-            </xsl:attribute>
-         </xsl:if>
-         <xsl:attribute name="href">
-            <xsl:value-of select="$dest"/>
-            <xsl:if test="contains(@from,'id (')">
-               <xsl:text>#</xsl:text>
-               <xsl:value-of select="substring(@from,5,string-length(normalize-space(@from))-1)"/>
-            </xsl:if>
-         </xsl:attribute>
-	 <xsl:choose>
-	   <xsl:when test="@n">
-	     <xsl:attribute name="title">
-	       <xsl:value-of select="@n"/>
-	     </xsl:attribute>
-	   </xsl:when>
-	 </xsl:choose>
-         <xsl:call-template name="xrefHook"/>
-         <xsl:choose>
-	   <xsl:when test="$dest=''">??</xsl:when>
-            <xsl:when test="$ptr">
-               <xsl:element name="{$urlMarkup}">
-                  <xsl:choose>
-                     <xsl:when test="starts-with($dest,'mailto:')">
-                        <xsl:value-of select="substring-after($dest,'mailto:')"/>
-                     </xsl:when>
-                     <xsl:when test="starts-with($dest,'file:')">
-                        <xsl:value-of select="substring-after($dest,'file:')"/>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <xsl:value-of select="$dest"/>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:apply-templates/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </a>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] create an internal link<param name="target">target</param>
-         <param name="ptr">ptr</param>
-         <param name="dest">dest</param>
-         <param name="body">body</param>
-         <param name="class">class</param>
-      </desc>
-   </doc>
-  <xsl:template name="makeInternalLink">
-      <xsl:param name="target"/>
-      <xsl:param name="ptr" as="xs:boolean" select="false()"/>
-      <xsl:param name="dest"/>
-      <xsl:param name="body"/>
-      <xsl:param name="class">
-         <xsl:text>link_</xsl:text>
-         <xsl:value-of select="local-name(.)"/>
-      </xsl:param>
-      <xsl:variable name="W">
-         <xsl:choose>
-            <xsl:when test="$target">
-               <xsl:value-of select="$target"/>
-            </xsl:when>
-            <xsl:when test="contains($dest,'#')">
-               <xsl:value-of select="substring-after($dest,'#')"/>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:value-of select="$dest"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-         <xsl:when test="$dest=''">
-            <xsl:choose>
-               <xsl:when test="not($body='')">
-                  <xsl:value-of select="$body"/>
-               </xsl:when>
-               <xsl:when test="$ptr">
-                  <xsl:apply-templates mode="xref" select="id($W)">
-                     <xsl:with-param name="minimal" select="$minimalCrossRef"/>
-                  </xsl:apply-templates>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:apply-templates/>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:when>
-         <xsl:otherwise>
-	   <xsl:variable name="eventualtarget">
-	     <xsl:choose>
-	       <xsl:when test="starts-with($dest,'#') or  contains($dest,$outputSuffix) or contains($dest,'ID=')">
-		 <xsl:value-of select="$dest"/>
-	       </xsl:when>
-	       <xsl:when test="id($W)"/>
-	       <xsl:otherwise>
-		 <xsl:apply-templates mode="generateLink" select="id($W)"/>
-	       </xsl:otherwise>
-	     </xsl:choose>
-	   </xsl:variable>
-	   <xsl:variable name="linktext">
-	     <xsl:choose>
-	       <xsl:when test="not($body='')">
-		 <xsl:value-of select="$body"/>
-	       </xsl:when>
-               <xsl:when test="$ptr and @type='footnote'">
-		 <xsl:text>[</xsl:text>
-		 <xsl:number level="any"/>
-		 <xsl:text>]</xsl:text>
-	       </xsl:when>
-	       <xsl:when test="$ptr and id($W)">
-		 <xsl:apply-templates mode="xref" select="id($W)">
-		   <xsl:with-param name="minimal" select="$minimalCrossRef"/>
-		 </xsl:apply-templates>
-	       </xsl:when>
-	       <xsl:when test="$ptr">
-		 <xsl:value-of select="$dest"/>
-	       </xsl:when>
-	       <xsl:otherwise>
-		 <xsl:apply-templates/>
-	       </xsl:otherwise>
-	     </xsl:choose>
-	   </xsl:variable>
-	   <xsl:choose>
-	     <xsl:when test="$eventualtarget=''">
-	       <xsl:copy-of select="$linktext"/>
-	     </xsl:when>
-	     <xsl:otherwise>
-	       <a href="{$eventualtarget}">
-		 <xsl:call-template name="htmlAttributes"/>
-		 <xsl:choose>
-		   <xsl:when test="@rend">
-		     <xsl:attribute name="class">
-		       <xsl:value-of select="@rend"/>
-		     </xsl:attribute>
-		   </xsl:when>
-		   <xsl:when test="@rendition">
-		     <xsl:call-template name="applyRendition"/>
-		   </xsl:when>
-		   <xsl:when test="string-length($class)=0"/>
-		   <xsl:otherwise>
-		     <xsl:attribute name="class">
-		       <xsl:value-of select="$class"/>
-		     </xsl:attribute>
-		   </xsl:otherwise>
-		 </xsl:choose>
-		 
-		 <xsl:for-each select="id($W)">
-		     <xsl:choose>
-		       <xsl:when test="starts-with(local-name(.),'div')">
-			 <xsl:attribute name="title">
-			   <xsl:value-of
-			       select="translate(normalize-space(tei:head[1]),'&gt;&lt;','')"/>
-			 </xsl:attribute>
-		       </xsl:when>
-		     </xsl:choose>
-		 </xsl:for-each>
-	       <xsl:copy-of select="$linktext"/>
-	       </a>
-	     </xsl:otherwise>
-	   </xsl:choose>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process cross-ref to note</desc>
-   </doc>
-  <xsl:template match="tei:note" mode="xref">
-      <xsl:number level="any"/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>formatting of the number part of a header</desc>
-   </doc>
-  <xsl:template name="formatHeadingNumber">
-      <xsl:param name="text"/>
-      <xsl:param name="toc"/>
-      <xsl:if test="not($text='')">
-	<span class="headingNumber">
-	  <xsl:copy-of select="$text"/>
-	</span>
-      </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/namesdates.xsl b/add/data/xslt/tei/xhtml2/namesdates.xsl
deleted file mode 100644
index cd4eb175b..000000000
--- a/add/data/xslt/tei/xhtml2/namesdates.xsl
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a fo rng tei teix"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the namesdates module,
-      making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: namesdates.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-
-  <xsl:template match="tei:listPerson">
-      <ul>
-         <xsl:apply-templates/>
-      </ul>
-  </xsl:template>
-
-  <xsl:template match="tei:person">
-      <li>
-         <xsl:apply-templates/>
-      </li>
-  </xsl:template>
-
-  <xsl:template match="tei:affiliation">
-      <br/>
-      <xsl:apply-templates/>
-  </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/xhtml2/oddprocessing.xsl b/add/data/xslt/tei/xhtml2/oddprocessing.xsl
deleted file mode 100644
index 10b1b6601..000000000
--- a/add/data/xslt/tei/xhtml2/oddprocessing.xsl
+++ /dev/null
@@ -1,1189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0"
-  exclude-result-prefixes="#default s html a fo rng tei teix"
-  xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-  xmlns:fo="http://www.w3.org/1999/XSL/Format"
-  xmlns:html="http://www.w3.org/1999/xhtml"
-  xmlns:rng="http://relaxng.org/ns/structure/1.0"
-  xmlns:s="http://www.ascc.net/xml/schematron"
-  xmlns:tei="http://www.tei-c.org/ns/1.0"
-  xmlns:teix="http://www.tei-c.org/ns/Examples"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns="http://www.w3.org/1999/xhtml" >
-
-  <xsl:param name="cssFile"/>
-  <xsl:param name="cssSecondaryFile"/>
-  <xsl:param name="summaryDoc">false</xsl:param>
-  <xsl:include href="../common2/tagdocs.xsl"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI stylesheet dealing with elements from the tagdocs module,
-      making HTML output. </p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: oddprocessing.xsl 9966 2011-12-16 20:15:28Z rahtz $</p>
-      <p>Copyright: 2011, TEI Consortium</p>
-    </desc>
-  </doc>
-  <xsl:param name="oddmode">html</xsl:param>
-  <xsl:param name="xrefName">a</xsl:param>
-  <xsl:param name="urlName">href</xsl:param>
-  <xsl:param name="ulName">ul</xsl:param>
-  <xsl:param name="dlName">dl</xsl:param>
-  <xsl:param name="codeName">span</xsl:param>
-  <xsl:param name="colspan">colspan</xsl:param>
-  <xsl:param name="ddName">dd</xsl:param>
-  <xsl:param name="dtName">dt</xsl:param>
-  <xsl:param name="hiName">span</xsl:param>
-  <xsl:param name="itemName">li</xsl:param>
-  <xsl:param name="labelName">dt</xsl:param>
-  <xsl:param name="rendName">class</xsl:param>
-  <xsl:param name="rowName">tr</xsl:param>
-  <xsl:param name="tableName">table</xsl:param>
-  <xsl:param name="cellName">td</xsl:param>
-  <xsl:param name="divName">div</xsl:param>
-  <xsl:param name="sectionName">div</xsl:param>
-  <xsl:param name="segName">span</xsl:param>
-  <xsl:param name="outputNS">http://www.w3.org/1999/xhtml</xsl:param>
-  <xsl:key match="tei:*" name="NameToID" use="@ident"/>
-  <xsl:key name="MODEL-CLASS-MODULE" match="tei:classSpec[@type='model']" use="@module"/>
-  <xsl:key name="ATT-CLASS-MODULE" match="tei:classSpec[@type='atts']" use="@module"/>
-  <xsl:key name="ELEMENT-MODULE" match="tei:elementSpec" use="@module"/>
-  <xsl:key name="MACRO-MODULE" match="tei:macroSpec" use="@module"/>
-  <xsl:key name="ELEMENT-ALPHA" match="tei:elementSpec" use="substring(translate(@ident,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'),1,1)"/>
-  <xsl:key name="MODEL-CLASS-ALPHA" match="tei:classSpec[@type='model']" use="substring(translate(@ident,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'),7,1)"/>
-  <xsl:key name="ATT-CLASS-ALPHA" match="tei:classSpec[@type='atts']" use="substring(translate(@ident,'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'),5,1)"/>
-  <xsl:key match="tei:moduleSpec[@ident]" name="FILES" use="@ident"/>
-  <xsl:variable name="top" select="/"/>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[odds] Document an element, macro, or class</desc>
-  </doc>
-  <xsl:template name="refdoc">
-    <xsl:if test="$verbose='true'">
-      <xsl:message> refdoc for <xsl:value-of select="name(.)"/> - <xsl:value-of select="@ident"/>
-         </xsl:message>
-    </xsl:if>
-    <xsl:variable name="objectname">
-      <xsl:choose>
-        <xsl:when test="tei:altIdent">
-          <xsl:value-of select="tei:altIdent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@ident"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="name">
-      <xsl:value-of select="$objectname"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="self::tei:classSpec and not(@ident='att.global') and         count(key('CLASSMEMBERS',@ident))=0">
-        <xsl:if test="$verbose='true'">
-          <xsl:message> class <xsl:value-of select="@ident"/> omitted as it has no members
-      </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="number($splitLevel)=-1 or $STDOUT='true'">
-        <xsl:apply-templates mode="weavebody" select="."/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="BaseFile">
-          <xsl:value-of select="$masterFile"/>
-          <xsl:if test="ancestor::tei:teiCorpus">
-            <xsl:text>-</xsl:text>
-            <xsl:choose>
-              <xsl:when test="@xml:id">
-                <xsl:value-of select="@xml:id"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:number/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:if>
-        </xsl:variable>
-        <xsl:variable name="outName">
-          <xsl:call-template name="outputChunkName">
-            <xsl:with-param name="ident">
-              <xsl:text>ref-</xsl:text>
-              <xsl:value-of select="@ident"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:if test="$verbose='true'">
-          <xsl:message>Opening file <xsl:value-of select="$outName"/>
-               </xsl:message>
-        </xsl:if>
-        <xsl:variable name="documentationLanguage">
-          <xsl:call-template name="generateDoc"/>
-        </xsl:variable>
-        <xsl:variable name="langs">
-          <xsl:value-of select="concat(normalize-space($documentationLanguage),' ')"/>
-        </xsl:variable>
-        <xsl:result-document doctype-public="{$doctypePublic}" doctype-system="{$doctypeSystem}" encoding="{$outputEncoding}" href="{$outName}" method="{$outputMethod}">
-          <xsl:element name="html" namespace="{$outputNamespace}">
-            <xsl:call-template name="addLangAtt"/>
-            <xsl:comment>THIS IS A GENERATED FILE. DO NOT EDIT (7) </xsl:comment>
-            <head>
-              <title>
-                <xsl:text>TEI </xsl:text>
-                <xsl:value-of select="substring-before(local-name(),'Spec')"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="$name"/>
-                <xsl:text> </xsl:text>
-                <xsl:call-template name="makeGloss">
-                  <xsl:with-param name="langs" select="$langs"/>
-                </xsl:call-template>
-              </title>
-              <xsl:call-template name="metaHTML">
-                <xsl:with-param name="title">
-                  <xsl:value-of select="substring-before(local-name(),'Spec')"/>
-                  <xsl:text> </xsl:text>
-                  <xsl:value-of select="@ident"/>
-                  <xsl:text> </xsl:text>
-                  <xsl:call-template name="makeGloss">
-                    <xsl:with-param name="langs" select="$langs"/>
-                  </xsl:call-template>
-                  <xsl:text> - </xsl:text>
-                  <xsl:call-template name="generateTitle"/>
-                </xsl:with-param>
-              </xsl:call-template>
-              <xsl:call-template name="includeCSS"/>
-              <xsl:call-template name="generateLocalCSS"/>
-              <xsl:call-template name="includeJavascript"/>
-              <xsl:call-template name="javascriptHook"/>
-            </head>
-            <body id="TOP">
-              <xsl:call-template name="bodyMicroData"/>
-              <xsl:call-template name="bodyHook"/>
-              <xsl:call-template name="guidelinesTop">
-                <xsl:with-param name="name">
-                  <xsl:value-of select="$name"/>
-                </xsl:with-param>
-              </xsl:call-template>
-              <div class="main-content">
-                <xsl:call-template name="startDivHook"/>
-                <xsl:apply-templates mode="weavebody" select="."/>
-              </div>
-              <xsl:call-template name="stdfooter">
-                <xsl:with-param name="file">
-                  <xsl:text>ref-</xsl:text>
-                  <xsl:value-of select="@ident"/>
-                </xsl:with-param>
-              </xsl:call-template>
-              <xsl:call-template name="bodyEndHook"/>
-            </body>
-          </xsl:element>
-        </xsl:result-document>
-        <xsl:if test="$verbose='true'">
-          <xsl:message>Closing file <xsl:value-of select="$outName"/>
-               </xsl:message>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] Provide a footer for each reference document</desc>
-  </doc>
-  <xsl:template name="refdocFooter">
-    <xsl:call-template name="preAddressHook"/>
-    <div style="margin: 20pt; font-weight: bold;">
-      <a href="{$refDocFooterURL}">
-        <xsl:value-of select="$refDocFooterText"/>
-      </a>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] <param name="text">text</param>
-      </desc>
-  </doc>
-  <xsl:template name="typewriter">
-    <xsl:param name="text"/>
-    <tt>
-      <xsl:copy-of select="$text"/>
-    </tt>
-  </xsl:template>
-  <xsl:template name="showRNC">
-    <xsl:param name="style"/>
-    <xsl:param name="contents"/>
-    <span class="{$style}">
-      <xsl:choose>
-        <xsl:when test="string-length($contents)&lt;50">
-          <xsl:value-of select="$contents"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="verbatim-reformatText">
-            <xsl:with-param name="sofar">0</xsl:with-param>
-            <xsl:with-param name="indent">
-              <xsl:text> </xsl:text>
-            </xsl:with-param>
-            <xsl:with-param name="text">
-              <xsl:value-of select="$contents"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </span>
-  </xsl:template>
-  <xsl:template name="emptySlash">
-    <xsl:param name="name"/>
-    <span class="emptySlash">
-      <xsl:value-of select="$name"/>
-    </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process elements teix:egXML</desc>
-  </doc>
-  <xsl:template match="teix:egXML">
-    <xsl:param name="simple">false</xsl:param>
-    <xsl:param name="highlight"/>
-    <div>
-      <xsl:attribute name="id">
-        <xsl:apply-templates mode="ident" select="."/>
-      </xsl:attribute>
-      <xsl:attribute name="class">
-	<xsl:text>pre</xsl:text>
-	<xsl:if test="not(*)">
-	  <xsl:text> cdata</xsl:text>
-	</xsl:if>
-	<xsl:choose>
-	  <xsl:when test="@valid='feasible'">
-	    <xsl:text> egXML_feasible</xsl:text>
-	  </xsl:when>
-	  <xsl:when test="@valid='false'">
-	    <xsl:text> egXML_invalid</xsl:text>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:text> egXML_valid</xsl:text>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$simple='true'">
-          <xsl:apply-templates mode="verbatim">
-            <xsl:with-param name="highlight">
-              <xsl:value-of select="$highlight"/>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="egXMLStartHook"/>
-          <xsl:apply-templates mode="verbatim">
-            <xsl:with-param name="highlight">
-              <xsl:value-of select="$highlight"/>
-            </xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="egXMLEndHook"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[html] <param name="grammar">grammar</param>
-         <param name="content">content</param>
-         <param name="element">element</param>
-      </desc>
-  </doc>
-  <xsl:template name="bitOut">
-    <xsl:param name="grammar"/>
-    <xsl:param name="content"/>
-    <xsl:param name="element">pre</xsl:param>
-    <xsl:choose>
-      <xsl:when test="$displayMode='both'">
-        <div class="displayRelax">
-          <button class="displayRelaxButton">
-            <span class="RNG_Compact">
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">Compact to XML format</xsl:with-param>
-              </xsl:call-template>
-            </span>
-            <span class="RNG_XML">
-              <xsl:call-template name="i18n">
-                <xsl:with-param name="word">XML format to compact</xsl:with-param>
-              </xsl:call-template>
-            </span>
-          </button>
-          <pre class="RNG_XML">
-            <xsl:apply-templates mode="verbatim" select="$content/*/*"/>
-          </pre>
-          <pre class="RNG_Compact">
-            <xsl:call-template name="make-body-from-r-t-f">
-              <xsl:with-param name="schema">
-                <xsl:for-each select="$content/*">
-                  <xsl:call-template name="make-compact-schema"/>
-                </xsl:for-each>
-              </xsl:with-param>
-            </xsl:call-template>
-          </pre>
-        </div>
-      </xsl:when>
-      <xsl:when test="$displayMode='rng'">
-        <xsl:element name="{$element}">
-          <xsl:attribute name="class">eg</xsl:attribute>
-          <xsl:apply-templates mode="verbatim" select="$content/*/*"/>
-        </xsl:element>
-      </xsl:when>
-      <xsl:when test="$displayMode='rnc'">
-        <xsl:element name="{$element}">
-          <xsl:attribute name="class">eg</xsl:attribute>
-          <xsl:call-template name="make-body-from-r-t-f">
-            <xsl:with-param name="schema">
-              <xsl:for-each select="$content/*">
-                <xsl:call-template name="make-compact-schema"/>
-              </xsl:for-each>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:element>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$element}">
-          <xsl:attribute name="class">eg</xsl:attribute>
-          <xsl:for-each select="$content/*">
-            <xsl:apply-templates mode="literal"/>
-          </xsl:for-each>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="showSpace">
-    <xsl:text> </xsl:text>
-  </xsl:template>
-  <xsl:template name="showSpaceBetweenItems">
-    <xsl:text> </xsl:text>
-  </xsl:template>
-  <xsl:template match="tei:schemaSpec">
-    <xsl:choose>
-      <xsl:when test="tei:specGrpRef">
-        <xsl:variable name="SPECS">
-          <tei:schemaSpec>
-            <xsl:copy-of select="@*"/>
-            <xsl:apply-templates mode="expandSpecs"/>
-          </tei:schemaSpec>
-        </xsl:variable>
-        <xsl:for-each select="$SPECS/tei:schemaSpec">
-          <xsl:call-template name="schemaSpecWeave"/>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="schemaSpecWeave"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="schemaSpecWeave">
-    <xsl:if test="$verbose='true'">
-      <xsl:message>Processing schemaSpec <xsl:value-of select="@ident"/>, summaryDoc=<xsl:value-of select="$summaryDoc"/>
-         </xsl:message>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$summaryDoc='true'">
-        <h2>Schema <xsl:value-of select="@ident"/>: changed components</h2>
-        <xsl:for-each select="tei:classSpec[@mode or @rend='change']        | tei:macroSpec[(@mode or @rend='change')]        | tei:elementSpec[(@mode or @rend='change')]">
-          <xsl:sort select="@ident"/>
-          <xsl:apply-templates mode="weave" select="."/>
-        </xsl:for-each>
-        <h2>Schema <xsl:value-of select="@ident"/>:  unchanged  components</h2>
-        <table>
-          <xsl:for-each select="tei:classSpec[not(@mode or @rend)]          | tei:macroSpec[not(@mode or  @rend)]          | tei:elementSpec[not(@mode or @rend)]">
-            <xsl:sort select="@ident"/>
-            <tr>
-              <td id="{@ident}"><a href="http://www.tei-c.org/release/doc/tei-p5-doc/{$documentationLanguage}/html/ref-{@ident}.html"><xsl:value-of select="@ident"/></a>:
-		     <xsl:call-template name="makeDescription"/></td>
-            </tr>
-          </xsl:for-each>
-        </table>
-      </xsl:when>
-      <xsl:otherwise>
-        <h2>Schema <xsl:value-of select="@ident"/>: Elements</h2>
-        <xsl:apply-templates mode="weave" select="tei:elementSpec">
-          <xsl:sort select="@ident"/>
-        </xsl:apply-templates>
-        <xsl:if test="tei:classSpec[@type='model']">
-          <h2>Schema <xsl:value-of select="@ident"/>: Model classes</h2>
-          <xsl:apply-templates mode="weave" select="tei:classSpec[@type='model']">
-            <xsl:sort select="@ident"/>
-          </xsl:apply-templates>
-        </xsl:if>
-        <xsl:if test="tei:classSpec[@type='atts']">
-          <h2>Schema <xsl:value-of select="@ident"/>: Attribute classes</h2>
-          <xsl:apply-templates mode="weave" select="tei:classSpec[@type='atts']">
-            <xsl:sort select="@ident"/>
-          </xsl:apply-templates>
-        </xsl:if>
-        <xsl:if test="tei:macroSpec">
-          <h2>Schema <xsl:value-of select="@ident"/>: Macros</h2>
-          <xsl:apply-templates mode="weave" select="tei:macroSpec">
-            <xsl:sort select="@ident"/>
-          </xsl:apply-templates>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>[odds] make a link<param name="name">name</param>
-         <param name="id">id</param>
-      </desc>
-  </doc>
-  <xsl:template name="makeSectionHead">
-    <xsl:param name="name"/>
-    <xsl:param name="id"/>
-    <h3>
-      <xsl:attribute name="class">
-      <xsl:text>oddSpec</xsl:text>
-      <xsl:if test="@status">
-	<xsl:text> status_</xsl:text>
-	<xsl:value-of select="@status"/>
-      </xsl:if>
-      </xsl:attribute>
-      <xsl:call-template name="makeAnchor">
-        <xsl:with-param name="name">
-          <xsl:value-of select="$id"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:value-of select="$name"/>
-      <xsl:if test="@ns">
-	[<xsl:value-of select="@ns"/>]
-      </xsl:if>
-    </h3>
-  </xsl:template>
-  <xsl:template name="specHook">
-    <xsl:param name="name"/>
-  </xsl:template>
-  <xsl:template match="tei:ident">
-    <xsl:choose>
-      <xsl:when test="@type='class' and key('CLASSES',.)">
-        <xsl:call-template name="linkTogether">
-          <xsl:with-param name="name">
-            <xsl:value-of select="."/>
-          </xsl:with-param>
-          <xsl:with-param name="reftext">
-            <xsl:value-of select="."/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="@type">
-        <span class="ident-{@type}">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="ident">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:gi">
-    <xsl:variable name="lookup" select="."/>
-    <xsl:choose>
-      <xsl:when test="parent::tei:ref or parent::tei:head or string-length(@scheme)&gt;0">
-        <span class="gi">
-          <xsl:text>&lt;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </span>
-      </xsl:when>
-      <xsl:when test="key('ELEMENTS',$lookup)">
-        <xsl:for-each select="key('ELEMENTS',$lookup)[last()]">
-          <xsl:call-template name="linkTogether">
-            <xsl:with-param name="class">gi</xsl:with-param>
-            <xsl:with-param name="name">
-              <xsl:value-of select="@ident"/>
-            </xsl:with-param>
-            <xsl:with-param name="reftext">
-              <xsl:choose>
-                <xsl:when test="tei:content/rng:empty">
-                  <span class="emptySlash">
-                    <xsl:value-of select="(tei:altIdent|@ident)[last()]"/>
-                  </span>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="(tei:altIdent|@ident)[last()]"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="gi">
-          <xsl:text>&lt;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="processSchemaFragment">
-    <xsl:param name="filename"/>
-    <div class="schemaFragment">
-      <xsl:if test="tei:elementSpec">
-        <h2>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Elements defined</xsl:with-param>
-          </xsl:call-template>
-        </h2>
-        <xsl:apply-templates mode="weave" select="tei:elementSpec">
-          <xsl:sort select="tei:altIdent|@ident"/>
-        </xsl:apply-templates>
-      </xsl:if>
-      <xsl:if test="tei:classSpec">
-        <h2>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Classes defined</xsl:with-param>
-          </xsl:call-template>
-        </h2>
-        <xsl:apply-templates mode="weave" select="tei:classSpec">
-          <xsl:sort select="tei:altIdent|@ident"/>
-        </xsl:apply-templates>
-      </xsl:if>
-      <xsl:if test="tei:macroSpec">
-        <h2>
-          <xsl:call-template name="i18n">
-            <xsl:with-param name="word">Macros defined</xsl:with-param>
-          </xsl:call-template>
-        </h2>
-        <xsl:apply-templates mode="weave" select="tei:macroSpec">
-          <xsl:sort select="tei:altIdent|@ident"/>
-        </xsl:apply-templates>
-      </xsl:if>
-      <xsl:apply-templates select="tei:specGrpRef"/>
-    </div>
-  </xsl:template>
-  <xsl:template name="listSpecs">
-    <xsl:for-each select="..//tei:schemaSpec">
-      <hr/>
-      <xsl:for-each select="tei:classSpec">
-        <xsl:sort select="tei:altIdent"/>
-        <xsl:sort select="@ident"/>
-        <xsl:element name="{$tocElement}">
-          <xsl:attribute name="class">toclist0</xsl:attribute>
-          <a class="toclist" href="#{@ident}">
-            <xsl:choose>
-              <xsl:when test="tei:altIdent">
-                <xsl:value-of select="tei:altIdent"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@ident"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </a>
-        </xsl:element>
-      </xsl:for-each>
-      <hr/>
-      <xsl:for-each select="tei:elementSpec">
-        <xsl:sort select="tei:altIdent"/>
-        <xsl:sort select="@ident"/>
-        <xsl:element name="{$tocElement}">
-          <xsl:attribute name="class">toclist0</xsl:attribute>
-          <a class="toclist" href="#{@ident}">
-            <xsl:choose>
-              <xsl:when test="tei:altIdent">
-                <xsl:value-of select="tei:altIdent"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@ident"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </a>
-        </xsl:element>
-      </xsl:for-each>
-      <hr/>
-      <xsl:for-each select="tei:macroSpec">
-        <xsl:sort select="tei:altIdent"/>
-        <xsl:sort select="@ident"/>
-        <xsl:element name="{$tocElement}">
-          <xsl:attribute name="class">toclist0</xsl:attribute>
-          <a class="toclist" href="#{@ident}">
-            <xsl:choose>
-              <xsl:when test="tei:altIdent">
-                <xsl:value-of select="tei:altIdent"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@ident"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </a>
-        </xsl:element>
-      </xsl:for-each>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template match="tei:elementSpec[@mode='delete']">
-    <dt>Element <xsl:value-of select="@ident"/>
-      </dt>
-    <dd>
-      <b>DELETED</b>
-    </dd>
-  </xsl:template>
-  <xsl:template name="verbatim-lineBreak">
-    <xsl:param name="id"/>
-    <xsl:text disable-output-escaping="yes">&lt;br/&gt;</xsl:text>
-  </xsl:template>
-  <xsl:template match="rng:ref/@name" mode="attributetext">
-    <xsl:variable name="me">
-      <xsl:choose>
-        <xsl:when test="contains(.,'.attributes')">
-          <xsl:value-of select="substring-before(.,'.attributes')"/>
-        </xsl:when>
-        <xsl:when test="contains(.,'.content')">
-          <xsl:value-of select="substring-before(.,'.content')"/>
-        </xsl:when>
-        <xsl:when test="contains(.,'.attribute.')">
-          <xsl:value-of select="substring-before(.,'.attribute.')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="."/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="n" select="."/>
-    <xsl:choose>
-      <xsl:when test="contains(.,'.localattributes')">
-        <xsl:value-of select="$n"/>
-      </xsl:when>
-      <xsl:when test="contains(.,'.content')">
-        <xsl:value-of select="$n"/>
-      </xsl:when>
-      <xsl:when test="ancestor::teix:egXML">
-        <xsl:value-of select="$n"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:for-each select="$top">
-          <xsl:call-template name="linkTogether">
-            <xsl:with-param name="name">
-              <xsl:value-of select="$me"/>
-            </xsl:with-param>
-            <xsl:with-param name="reftext">
-              <xsl:value-of select="$n"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="rng:*">
-    <xsl:copy>
-      <xsl:copy-of select="@*"/>
-      <xsl:apply-templates select="rng:*|tei:*|text()|comment()"/>
-    </xsl:copy>
-  </xsl:template>
-  <xsl:template match="rng:zeroOrMore">
-    <xsl:choose>
-      <xsl:when test="count(rng:*)=1 and rng:zeroOrMore">
-        <xsl:apply-templates select="rng:*|tei:*|text()|comment()"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <rng:zeroOrMore>
-          <xsl:copy-of select="@*"/>
-          <xsl:apply-templates select="rng:*|tei:*|text()|comment()"/>
-        </rng:zeroOrMore>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template match="tei:listRef" mode="weave"/>
-  <xsl:template match="tei:elementSpec[@mode='delete']" mode="weave"/>
-  <xsl:template match="a:documentation" mode="verbatim"/>
-  <xsl:template match="tei:ptr[@type='cit']">
-    <a class="citlink">
-      <xsl:for-each select="id(substring(@target,2))">
-        <xsl:attribute name="href">
-          <xsl:apply-templates select="." mode="generateLink"/>
-        </xsl:attribute>
-        <xsl:apply-templates select="." mode="xref"/>
-      </xsl:for-each>
-    </a>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='macrocat']" priority="100">
-    <h3>Alphabetical list</h3>
-    <xsl:for-each select="key('MACRODOCS',1)">
-      <xsl:sort select="@module"/>
-      <xsl:if test="generate-id(.)=generate-id(key('MACRO-MODULE',@module)[1])">
-        <div id="macro-{@module}">
-          <h3>
-            <xsl:for-each select="key('MODULES',@module)">
-              <xsl:text>[</xsl:text>
-              <xsl:value-of select="@ident"/>
-              <xsl:text>] </xsl:text>
-              <xsl:call-template name="makeDescription"/>
-            </xsl:for-each>
-          </h3>
-          <xsl:for-each select="key('MACRO-MODULE',@module)">
-            <xsl:sort select="@ident"/>
-            <xsl:call-template name="refDocLink"/>
-          </xsl:for-each>
-        </div>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:apply-templates mode="weave" select="key('MACRODOCS',1)">
-      <xsl:sort select="@ident"/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='elementcat']"  priority="100">
-    <div class="atozwrapper">
-      <xsl:call-template name="atozHeader">
-        <xsl:with-param name="Key">ELEMENT-ALPHA</xsl:with-param>
-      </xsl:call-template>
-      <xsl:for-each select="key('ELEMENTDOCS',1)">
-        <xsl:sort select="translate(@ident,$uc,$lc)"/>
-        <xsl:variable name="letter">
-          <xsl:value-of select="substring(@ident,1,1)"/>
-        </xsl:variable>
-        <xsl:if test="generate-id(.)=generate-id(key('ELEMENT-ALPHA',$letter)[1])">
-          <div id="element-{$letter}" class="atoz">
-            <span class="listhead">
-              <xsl:value-of select="$letter"/>
-            </span>
-            <ul class="atoz">
-              <xsl:for-each select="key('ELEMENT-ALPHA',$letter)">
-                <xsl:sort select="@ident"/>
-                <li>
-		  <xsl:call-template name="refDocLink"/>
-                </li>
-              </xsl:for-each>
-            </ul>
-          </div>
-        </xsl:if>
-      </xsl:for-each>
-    </div>
-    <div id="byMod">
-      <xsl:for-each select="key('ELEMENTDOCS',1)">
-        <xsl:sort select="@module"/>
-        <xsl:if test="generate-id(.)=generate-id(key('ELEMENT-MODULE',@module)[1])">
-          <div>
-            <h3>
-              <xsl:for-each select="key('MODULES',@module)">
-                <xsl:text>[</xsl:text>
-                <xsl:value-of select="@ident"/>
-                <xsl:text>] </xsl:text>
-                <xsl:call-template name="makeDescription"/>
-              </xsl:for-each>
-            </h3>
-            <xsl:for-each select="key('ELEMENT-MODULE',@module)">
-              <xsl:sort
-		  select="@ident"/>
-	      <xsl:call-template name="refDocLink"/>
-	    </xsl:for-each>
-          </div>
-        </xsl:if>
-      </xsl:for-each>
-    </div>
-    <xsl:for-each select="key('ELEMENTDOCS',1)">
-      <xsl:apply-templates mode="weave" select="."/>
-    </xsl:for-each>
-  </xsl:template>
-
-
-  <xsl:template name="refDocLink">
-    <span
-	class="refDocLink">
-      <a>
-	<xsl:attribute name="href">
-	  <xsl:choose>
-	    <xsl:when test="number($splitLevel)=-1 or $STDOUT='true'">
-	      <xsl:text>#</xsl:text>
-	      <xsl:value-of select="@ident"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:text>ref-</xsl:text>
-	      <xsl:value-of
-		  select="@ident"/>
-	      <xsl:value-of select="$outputSuffix"/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-	</xsl:attribute>
-	<xsl:value-of select="@ident"/>
-      </a>
-      <xsl:text> </xsl:text>
-    </span>
-  </xsl:template>
-
-  <xsl:template match="tei:divGen[@type='modelclasscat']"  priority="100">
-    <div class="atozwrapper">
-      <xsl:call-template name="atozHeader">
-        <xsl:with-param name="Key">MODEL-CLASS-ALPHA</xsl:with-param>
-      </xsl:call-template>
-      <xsl:for-each select="key('MODELCLASSDOCS',1)">
-        <xsl:sort select="translate(substring-after(@ident,'model.'),$uc,$lc)"/>
-        <xsl:variable name="letter">
-          <xsl:value-of select="substring(@ident,7,1)"/>
-        </xsl:variable>
-        <xsl:if test="generate-id(.)=generate-id(key('MODEL-CLASS-ALPHA',$letter)[1])">
-          <div id="element-{$letter}" class="atoz">
-            <span class="listhead">
-              <xsl:value-of select="$letter"/>
-            </span>
-            <ul class="atoz">
-              <xsl:for-each select="key('MODEL-CLASS-ALPHA',$letter)">
-                <xsl:sort select="translate(substring-after(@ident,'model.'),$lc,$uc)"/>
-                <li>
-		  <xsl:call-template name="refDocLink"/>
-                </li>
-              </xsl:for-each>
-            </ul>
-          </div>
-        </xsl:if>
-      </xsl:for-each>
-    </div>
-    <div id="byMod">
-      <xsl:for-each select="key('MODELCLASSDOCS',1)">
-        <xsl:sort select="@module"/>
-        <xsl:if test="generate-id(.)=generate-id(key('MODEL-CLASS-MODULE',@module)[1])">
-          <div>
-            <h3>
-              <xsl:for-each select="key('MODULES',@module)">
-                <xsl:text>[</xsl:text>
-                <xsl:value-of select="@ident"/>
-                <xsl:text>] </xsl:text>
-                <xsl:call-template name="makeDescription"/>
-              </xsl:for-each>
-            </h3>
-            <xsl:for-each select="key('MODEL-CLASS-MODULE',@module)">
-              <xsl:sort
-		  select="@ident"/>
-	      <xsl:call-template name="refDocLink"/>
-            </xsl:for-each>
-          </div>
-        </xsl:if>
-      </xsl:for-each>
-    </div>
-    <xsl:for-each select="key('MODELCLASSDOCS',1)">
-      <xsl:apply-templates select="." mode="weave"/>
-    </xsl:for-each>
-  </xsl:template>
-  <xsl:template match="tei:divGen[@type='attclasscat']"  priority="100">
-    <div class="atozwrapper">
-      <xsl:call-template name="atozHeader">
-        <xsl:with-param name="Key">ATT-CLASS-ALPHA</xsl:with-param>
-      </xsl:call-template>
-      <xsl:for-each select="key('ATTCLASSDOCS',1)">
-        <xsl:sort select="translate(substring-after(@ident,'att.'),$uc,$lc)"/>
-        <xsl:variable name="letter">
-          <xsl:value-of select="substring(@ident,5,1)"/>
-        </xsl:variable>
-        <xsl:if test="generate-id(.)=generate-id(key('ATT-CLASS-ALPHA',$letter)[1])">
-          <div id="element-{$letter}" class="atoz">
-            <span class="listhead">
-              <xsl:value-of select="$letter"/>
-            </span>
-            <ul class="atoz">
-              <xsl:for-each select="key('ATT-CLASS-ALPHA',$letter)">
-                <xsl:sort select="translate(substring-after(@ident,'att.'),$lc,$uc)"/>
-                <li>
-		  <xsl:call-template name="refDocLink"/>
-		</li>
-              </xsl:for-each>
-            </ul>
-          </div>
-        </xsl:if>
-      </xsl:for-each>
-    </div>
-    <div id="byMod">
-      <xsl:for-each select="key('ATTCLASSDOCS',1)">
-        <xsl:sort select="@module"/>
-        <xsl:if test="generate-id(.)=generate-id(key('ATT-CLASS-MODULE',@module)[1])">
-          <div>
-            <h3>
-              <xsl:for-each select="key('MODULES',@module)">
-                <xsl:text>[</xsl:text>
-                <xsl:value-of select="@ident"/>
-                <xsl:text>] </xsl:text>
-                <xsl:call-template name="makeDescription"/>
-              </xsl:for-each>
-            </h3>
-            <xsl:for-each
-		select="key('ATT-CLASS-MODULE',@module)">
-	      <xsl:call-template name="refDocLink"/>
-            </xsl:for-each>
-          </div>
-        </xsl:if>
-      </xsl:for-each>
-    </div>
-    <xsl:apply-templates mode="weave" select="key('ATTCLASSDOCS',1)">
-      <xsl:sort select="@ident"/>
-    </xsl:apply-templates>
-  </xsl:template>
-  <xsl:template name="javascriptHook">
-    <xsl:call-template name="jsForOdds"/>
-  </xsl:template>
-  <xsl:template name="jsForOdds">
-    <script type="text/javascript">
-      <xsl:comment>
-        <xsl:text disable-output-escaping="yes">
-var displayXML=0;
-states=new Array()
-states[0]="element-a"
-states[1]="element-b"
-states[2]="element-c"
-states[3]="element-d"
-states[4]="element-e"
-states[5]="element-f"
-states[6]="element-g"
-states[7]="element-h"
-states[8]="element-i"
-states[9]="element-j"
-states[10]="element-k"
-states[11]="element-l"
-states[12]="element-m"
-states[13]="element-n"
-states[14]="element-o"
-states[15]="element-p"
-states[16]="element-q"
-states[17]="element-r"
-states[18]="element-s"
-states[19]="element-t"
-states[20]="element-u"
-states[21]="element-v"
-states[22]="element-w"
-states[23]="element-x"
-states[24]="element-y"
-states[25]="element-z"
-
-function startUp() {
-
-}
-
-function hideallExcept(elm) {
-for (var i = 0; i &lt; states.length; i++) {
- var layer;
- if (layer = document.getElementById(states[i]) ) {
-  if (states[i] != elm) {
-    layer.style.display = "none";
-  }
-  else {
-   layer.style.display = "block";
-      }
-  }
- }
- var mod;
- if ( mod = document.getElementById('byMod') ) {
-     mod.style.display = "none";
- }
-}
-
-function showall() {
- for (var i = 0; i &lt; states.length; i++) {
-   var layer;
-   if (layer = document.getElementById(states[i]) ) {
-      layer.style.display = "block";
-      }
-  }
-}
-
-function showByMod() {
-  hideallExcept('');
-  var mod;
-  if (mod = document.getElementById('byMod') ) {
-     mod.style.display = "block";
-     }
-}
-
-	</xsl:text>
-      </xsl:comment>
-    </script>
-  </xsl:template>
-
-  <xsl:template name="identifyElement">
-    <xsl:param name="id"/>
-    <xsl:attribute name="id">
-      <xsl:value-of select="$id"/>
-    </xsl:attribute>
-  </xsl:template>
-
-  <xsl:template name="guidelinesTop">
-    <xsl:param name="name"/>
-    <div id="hdr">
-      <xsl:call-template name="stdheader">
-        <xsl:with-param name="title">
-          <xsl:value-of select="$name"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </div>
-  </xsl:template>
-
-  <xsl:template name="atozHeader">
-    <xsl:param name="Key"/>
-    <div id="azindex">
-      <span>
-        <xsl:call-template name="i18n">
-          <xsl:with-param name="word">Sorted alphabetically</xsl:with-param>
-        </xsl:call-template>
-      </span>
-      <ul class="index">
-        <xsl:if test="count(key($Key,'a'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-a');" href="#">a</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'b'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-b');" href="#">b</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'c'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-c');" href="#">c</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'d'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-d');" href="#">d</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'e'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-e');" href="#">e</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'f'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-f');" href="#">f</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'g'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-g');" href="#">g</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'h'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-h');" href="#">h</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'i'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-i');" href="#">i</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'j'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-j');" href="#">j</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'k'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-k');" href="#">k</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'l'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-l');" href="#">l</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'m'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-m');" href="#">m</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'n'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-n');" href="#">n</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'o'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-o');" href="#">o</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'p'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-p');" href="#">p</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'q'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-q');" href="#">q</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'r'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-r');" href="#">r</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'s'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-s');" href="#">s</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'t'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-t');" href="#">t</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'u'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-u');" href="#">u</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'v'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-v');" href="#">v</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'w'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-w');" href="#">w</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'x'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-x');" href="#">x</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'y'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-y');" href="#">y</a>
-          </li>
-        </xsl:if>
-        <xsl:if test="count(key($Key,'z'))&gt;0">
-          <li>
-            <a onclick="hideallExcept('element-z');" href="#">z</a>
-          </li>
-        </xsl:if>
-        <li class="showall">
-          <a onclick="showall();" href="#">
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">Show all</xsl:with-param>
-            </xsl:call-template>
-          </a>
-        </li>
-        <li class="showall">
-          <a onclick="showByMod();" href="#">
-            <xsl:call-template name="i18n">
-              <xsl:with-param name="word">Show by module</xsl:with-param>
-            </xsl:call-template>
-          </a>
-        </li>
-      </ul>
-    </div>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/tagdocs.xsl b/add/data/xslt/tei/xhtml2/tagdocs.xsl
deleted file mode 100644
index 2b90b1d41..000000000
--- a/add/data/xslt/tei/xhtml2/tagdocs.xsl
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet  xmlns:s="http://www.ascc.net/xml/schematron" xmlns="http://www.w3.org/1999/xhtml" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:teix="http://www.tei-c.org/ns/Examples" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" exclude-result-prefixes="s html a fo rng tei teix" version="2.0">
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-    <desc>
-      <p> TEI stylesheet dealing with elements from the tagdocs module,
-      making HTML output. </p>
-      <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-      <p>Author: See AUTHORS</p>
-      <p>Id: $Id: tagdocs.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-      <p>Copyright: 2011, TEI Consortium</p>
-    </desc>
-  </doc>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process elements teix:egXML</desc>
-  </doc>
-  <xsl:template match="teix:egXML">
-    <xsl:param name="simple">false</xsl:param>
-    <xsl:param name="highlight"/>
-    <div>
-      <xsl:attribute name="id">
-        <xsl:apply-templates mode="ident" select="."/>
-      </xsl:attribute>
-      <xsl:attribute name="class">
-	<xsl:text>pre</xsl:text>
-	<xsl:if test="not(*)">
-	  <xsl:text> cdata</xsl:text>
-	</xsl:if>
-	<xsl:choose>
-	  <xsl:when test="@valid='feasible'">
-	    <xsl:text> egXML_feasible</xsl:text>
-	  </xsl:when>
-	  <xsl:when test="@valid='false'">
-	    <xsl:text> egXML_invalid</xsl:text>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:text> egXML_valid</xsl:text>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:attribute>
-      <xsl:choose>
-        <xsl:when test="$simple='true'">
-          <xsl:apply-templates mode="verbatim">
-            <xsl:with-param name="highlight">
-              <xsl:value-of select="$highlight"/>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="egXMLStartHook"/>
-          <xsl:apply-templates mode="verbatim">
-            <xsl:with-param name="highlight">
-              <xsl:value-of select="$highlight"/>
-            </xsl:with-param>
-          </xsl:apply-templates>
-          <xsl:call-template name="egXMLEndHook"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </div>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element ident</desc>
-  </doc>
-  <xsl:template match="tei:ident">
-    <xsl:choose>
-      <xsl:when test="@type">
-        <span class="ident-{@type}">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:when>
-      <xsl:otherwise>
-        <span class="ident">
-          <xsl:apply-templates/>
-        </span>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process element gi</desc>
-  </doc>
-  <xsl:template match="tei:gi">
-    <span class="gi">
-      <xsl:text>&lt;</xsl:text>
-      <xsl:apply-templates/>
-      <xsl:text>&gt;</xsl:text>
-    </span>
-  </xsl:template>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/tei-param.xsl b/add/data/xslt/tei/xhtml2/tei-param.xsl
deleted file mode 100644
index af8412880..000000000
--- a/add/data/xslt/tei/xhtml2/tei-param.xsl
+++ /dev/null
@@ -1,773 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml"                 
-    xmlns:html="http://www.w3.org/1999/xhtml"                
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"                
-    xmlns:tei="http://www.tei-c.org/ns/1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="tei html xs"
-    version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>     <p>
-    TEI stylesheet customization module for HTML output.</p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: tei-param.xsl 9993 2012-01-02 14:30:13Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <xsl:key name="INDEX" use="1" match="tei:index"/>
-  <xsl:key name="PB" match="tei:pb" use="1"/>
-  <xsl:key name="NOTES" use="1"
-	   match="tei:note[@place='foot' or @place='bottom' or @place='end'
-		  and not(parent::tei:bibl or ancestor::tei:teiHeader)]"/>
-  <xsl:key name="ALLNOTES" use="1"
-	   match="tei:note[not(@place='margin' or @place='inline' or @place='display')
-		  and not(parent::tei:bibl or  ancestor::tei:teiHeader)]"/>
-
-  <xsl:key name="TAGREND" match="tei:tagUsage[@render]" use="@gi"/>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="CSS" type="string">
-    <desc>  CSS class for links derived from &lt;ptr&gt;    </desc>
-  </doc>
-  <xsl:param name="class_ptr">ptr</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="CSS" type="string">
-      <desc>CSS class for links derived from &lt;ref&gt;</desc>
-
-   </doc>
-  <xsl:param name="class_ref">ref</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="boolean">
-      <desc>Whether we should construct a separate file for each page
-      (based on page breaks)</desc>
-   </doc>
-  <xsl:param name="filePerPage">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="number">
-      <desc>When making fixed format epub, width of viewport</desc>
-  </doc>
-  <xsl:param name="viewPortWidth">1200</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="number">
-      <desc>When making fixed format epub, height of viewport</desc>
-  </doc>
-  <xsl:param name="viewPortHeight">1700</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="boolean">
-      <desc>Number footnotes consecutively</desc>
-   </doc>
-  <xsl:param name="consecutiveFNs">false</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="boolean">
-      <desc>Link back from footnotes to reference</desc>
-
-   </doc>
-  <xsl:param name="footnoteBackLink">false</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="cssFileInclude"
-        type="boolean">
-      <desc>Whether to include CSS by reference or by XInclusion</desc>
-
-   </doc>
-  <xsl:param name="cssFileInclude">false</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="CSS" type="anyURI">
-      <desc>CSS style file to be associated with output file(s)</desc>
-
-   </doc>
-  <xsl:param name="cssFile" as="xs:string">http://www.tei-c.org/release/xml/tei/stylesheet/tei.css</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="CSS" type="anyURI">
-      <desc>CSS style file for print; this will be given a media=print attribute.
-    </desc>
-   </doc>
-  <xsl:param name="cssPrintFile" as="xs:string">http://www.tei-c.org/release/xml/tei/stylesheet/tei-print.css</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="CSS" type="anyURI">
-      <desc>Secondary CSS style file; this will be given a media=screen attribute,
-so that it does not affect printing. It should be used for screen layout.
-  </desc>
-   </doc>
-    <xsl:param name="cssSecondaryFile"  as="xs:string" select="''"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="CSS" type="anyURI">
-      <desc>CSS file to include in the output file directly</desc>
-   </doc>
-    <xsl:param name="cssInlineFile"  as="xs:string" select="''"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="figures" type="integer">
-      <desc>Resolution of images. This is needed to calculate
-HTML width and height (in pixels) from supplied dimensions.</desc>
-
-   </doc>
-  <xsl:param name="dpi">96</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="figures" type="boolean">
-      <desc>Display figures.</desc>
-
-   </doc>
-  <xsl:param name="showFigures">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted just after &lt;body&gt;</desc>
-   </doc>
-  <xsl:template name="bodyHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>     <p>[html] Hook where HTML can be inserted just before the
-    &lt;body&gt; ends.</p>
-         <p>This can be used to add a page-wide footer block.</p>
-      </desc>
-   </doc>
-  <xsl:template name="bodyEndHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where Javascript calls can be inserted  just after &lt;body&gt;</desc>
-   </doc>
-  <xsl:template name="bodyJavascriptHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>     <p>[html] Hook where extra CSS can be inserted</p>
-         <p>&#160; </p>
-      </desc>
-   </doc>
-  <xsl:template name="cssHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>     <p>[html] Hook where code can be added to the HTML &lt;head&gt;.</p>
-         <p>This would be used to insert &lt;meta&gt; tags.</p>
-      </desc>
-   </doc>
-  <xsl:template name="headHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted when creating an &lt;img&gt;</desc>
-   </doc>
-  <xsl:template name="imgHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted when processing a
-    figure</desc>
-   </doc>
-  <xsl:template name="figureHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where extra Javascript functions can be defined</desc>
-   </doc>
-  <xsl:template name="javascriptHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted just before the &lt;address&gt;</desc>
-   </doc>
-  <xsl:template name="preAddressHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted at the start of
-    processing each section</desc>
-   </doc>
-  <xsl:template name="startDivHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted at the beginning
-    of the main text, after the header</desc>
-   </doc>
-  <xsl:template name="startHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted after processing &lt;TEI&gt;</desc>
-   </doc>
-  <xsl:template name="teiEndHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted before processing &lt;TEI&gt;</desc>
-   </doc>
-  <xsl:template name="teiStartHook"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hook where HTML can be inserted when creating an
-    &lt;a&gt; element</desc>
-   </doc>
-  <xsl:template name="xrefHook"/>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="i18n">
-      <desc>[html] Make a copyright claim</desc>
-   </doc>
-  <xsl:template name="copyrightStatement">This page is copyrighted</xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Banner for top of column</desc>
-   </doc>
-  <xsl:template name="columnHeader">
-</xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="string">
-      <desc>     <p>How to use the front/body/back matter in creating
-columns.</p>
-         <p>
-	   The choice is between
-	   <ul xmlns="http://www.w3.org/1999/xhtml">
-	     <li>
-	       <b>all</b>: use &lt;front&gt; for left-hand column,
-	       use &lt;body&gt; for centre column, and use &lt;back&gt; for
-	     right-hand column</li>
-	     <li>
-	       <b>body</b>: use &lt;body&gt; for right-hand column,
-	     generate left-hand with a TOC or whatever</li>
-	   </ul>
-         </p>
-      </desc>
-  </doc>
-  <xsl:param name="contentStructure">body</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="integer">
-      <desc>     <p>The difference between TEI div levels and HTML.
-headings.</p>
-         <p>TEI &lt;div&gt;s are implicitly or explicitly numbered from 0
-upwards; this offset is added to that number to produce an HTML
-&lt;Hn&gt; element. So a value of 2 here means that a &lt;div1&gt;
-will generate an &lt;h2&gt;</p>
-      </desc>
-   </doc>
-  <xsl:param name="divOffset">2</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="boolean">
-      <desc>Make a separate file for footnotes</desc>
-
-   </doc>
-  <xsl:param name="footnoteFile">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Header section across top of page </desc>
-   </doc>
-  <xsl:template name="hdr">
-      <xsl:call-template name="pageHeader">
-         <xsl:with-param name="mode"/>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Navigation bar </desc>
-   </doc>
-  <xsl:template name="hdr2">
-      <xsl:call-template name="navbar"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Text or action to take at the start of the
-    breadcrumb trail </desc>
-   </doc>
-  <xsl:template name="preBreadCrumbPath"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Breadcrumb trail </desc>
-   </doc>
-  <xsl:template name="hdr3">
-      <a href="#rh-col" title="Go to main page content" class="skiplinks">Skip links</a>
-      <a class="hide">|</a>
-      <xsl:call-template name="crumbPath"/>
-      <a class="hide">|</a>
-      <a class="bannerright" href="{$parentURL}" title="Go to home page">
-         <xsl:value-of select="$parentWords"/>
-      </a>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html]Bottom of left-hand column<param name="currentID">ID of selected section</param>
-      </desc>
-   </doc>
-  <xsl:template name="lh-col-bottom">
-      <xsl:param name="currentID"/>
-      <xsl:call-template name="leftHandFrame">
-         <xsl:with-param name="currentID" select="$currentID"/>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html]Top of left-hand column </desc>
-   </doc>
-  <xsl:template name="lh-col-top">
-      <xsl:call-template name="searchbox"/>
-      <xsl:call-template name="printLink"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="string">
-      <desc>Width of left-hand column when $pageLayout is "Table"</desc>
-
-   </doc>
-  <xsl:param name="linksWidth">15%</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Logo</desc>
-   </doc>
-  <xsl:template name="logoPicture">
-      <a class="framelogo" href="http://www.tei-c.org/Stylesheets/">
-         <img src="http://www.tei-c.org/release/common2/doc/tei-xsl-common/teixsl.png" vspace="5" width="124"
-              height="161"
-              border="0"
-              alt="created by TEI XSL Stylesheets"/>
-      </a>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Making elements in HTML &lt;head&gt;<param name="title">The text used to create the DC.Title field
-    in the HTML header</param>
-      </desc>
-   </doc>
-  <xsl:template name="metaHTML">
-      <xsl:param name="title"/>
-      <meta name="author">
-         <xsl:attribute name="content">
-            <xsl:call-template name="generateAuthor"/>
-         </xsl:attribute>
-      </meta>
-      <xsl:if test="$filePerPage='true'">
-	<meta name="viewport" content="width={$viewPortWidth}, height={$viewPortHeight}"/>
-      </xsl:if>
-      <meta name="generator" content="Text Encoding Initiative Consortium XSLT stylesheets"/>
-      <xsl:choose>
-	<xsl:when test="$outputTarget='html5'">
-	  <meta charset="utf-8" />
-	</xsl:when>
-	<xsl:otherwise>
-	  <meta http-equiv="Content-Type" content="text/html;
-						   charset={$outputEncoding}"/>
-	  <meta name="DC.Title">
-	    <xsl:attribute name="content">
-	      <xsl:value-of select="normalize-space(translate($title,'&lt;&gt;','&#x2329;&#x3009;'))"/>
-	    </xsl:attribute>
-	  </meta>
-	  <meta name="DC.Type" content="Text"/>
-	  <meta name="DC.Format" content="text/html"/>
-	</xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-	<doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>     <p>[html] Construction of navigation bar </p>
-         <p>A file is looked for relative to the <i xmlns="http://www.w3.org/1999/xhtml">stylesheet</i> (the
-    second parameter of the document function), which is expected to
-    contain a TEI &lt;list&gt; where each &lt;item&gt; has an embedded
-    &lt;xref&gt;</p>
-      </desc>
-   </doc>
-  <xsl:template name="navbar">
-    <xsl:choose>
-      <xsl:when test="$navbarFile=''">
-	<xsl:comment>no nav bar</xsl:comment>
-      </xsl:when>
-      <xsl:otherwise>
-         <xsl:for-each select="document($navbarFile,document(''))">
-            <xsl:for-each select="tei:list/tei:item">
-               <span class="navbar">
-                  <a href="{$URLPREFIX}{tei:xref/@url}" class="navbar">
-                     <xsl:apply-templates select="tei:xref/text()"/>
-                  </a>
-               </span>
-               <xsl:if test="following-sibling::tei:item"> | </xsl:if>
-            </xsl:for-each>
-         </xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="anyURI">
-      <desc>     <p>XML resource defining a navigation bar.</p>
-         <p>The XML should provide a &lt;list&gt; containing a series
-of &lt;item&gt; elements, each containing an &lt;xref&gt; link.</p>
-      </desc>
-   </doc>
-  <xsl:param name="navbarFile"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Banner for top of page<param name="mode">layout mode</param>
-      </desc>
-   </doc>
-  <xsl:template name="pageHeader">
-      <xsl:param name="mode"/>
-      <xsl:choose>
-         <xsl:when test="$mode='table'">
-            <table width="100%" border="0">
-               <tr>
-                  <td height="98" class="bgimage" onclick="window.location='{$homeURL}'"
-                      cellpadding="0">
-
-	                    <xsl:call-template name="makeHTMLHeading">
-		                      <xsl:with-param name="class">subtitle</xsl:with-param>
-		                      <xsl:with-param name="text">
-		                         <xsl:call-template name="generateSubTitle"/>
-		                      </xsl:with-param>
-		                      <xsl:with-param name="level">2</xsl:with-param>
-	                    </xsl:call-template>
-
-	                    <xsl:call-template name="makeHTMLHeading">
-		                      <xsl:with-param name="class">title</xsl:with-param>
-		                      <xsl:with-param name="text">
-		                         <xsl:call-template name="generateTitle"/>
-		                      </xsl:with-param>
-		                      <xsl:with-param name="level">1</xsl:with-param>
-	                    </xsl:call-template>
-
-                  </td>
-                  <td valign="top"/>
-               </tr>
-            </table>
-         </xsl:when>
-         <xsl:otherwise>
-	           <xsl:call-template name="makeHTMLHeading">
-	              <xsl:with-param name="class">subtitle</xsl:with-param>
-	              <xsl:with-param name="text">
-	                 <xsl:call-template name="generateSubTitle"/>
-	              </xsl:with-param>
-	              <xsl:with-param name="level">2</xsl:with-param>
-	           </xsl:call-template>
-	
-	           <xsl:call-template name="makeHTMLHeading">
-	              <xsl:with-param name="class">title</xsl:with-param>
-	              <xsl:with-param name="text">
-	                 <xsl:call-template name="generateTitle"/>
-	              </xsl:with-param>
-	              <xsl:with-param name="level">1</xsl:with-param>
-	           </xsl:call-template>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Make a heading, if there some text to display<param name="text">Heading title</param>
-         <param name="class">CSS class</param>
-         <param name="level">Heading level</param>
-      </desc>
-   </doc>
-  <xsl:template name="makeHTMLHeading">
-      <xsl:param name="text"/>
-      <xsl:param name="class">title</xsl:param>
-      <xsl:param name="level">1</xsl:param>
-      <xsl:if test="not($text='')">
-	<xsl:choose>
-	<xsl:when test="$level &gt; 6">
-	  <div class="h{$level}">
-            <xsl:copy-of select="$text"/>
-	  </div>
-	</xsl:when>
-	<xsl:otherwise>
-         <xsl:element name="h{$level}">
-	   <xsl:attribute name="class">
-	     <xsl:value-of select="$class"/>
-	   </xsl:attribute>
-	   <xsl:copy-of select="$text"/>
-         </xsl:element>
-	</xsl:otherwise>
-	</xsl:choose>
-      </xsl:if>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Make a link saying how to get printable version
-    of file</desc>
-   </doc>
-  <xsl:template name="printLink"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Bottom of right-hand column<param name="currentID">ID of selected section</param>
-      </desc>
-   </doc>
-  <xsl:template name="rh-col-bottom">
-      <xsl:param name="currentID"/>
-      <xsl:call-template name="mainFrame">
-         <xsl:with-param name="currentID" select="$currentID"/>
-      </xsl:call-template>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Top of right-hand column</desc>
-   </doc>
-  <xsl:template name="rh-col-top">
-      <xsl:call-template name="columnHeader"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Make a search box</desc>
-   </doc>
-  <xsl:template name="searchbox"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout">
-      <desc>[html] Construct a label for the link which makes a
-    printable version of the document.</desc>
-   </doc>
-  <xsl:template name="singleFileLabel">For Printing</xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="string">
-      <desc>How to align the navigation panel at the bottom of the page</desc>
-
-   </doc>
-  <xsl:param name="alignNavigationPanel">right</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="boolean">
-      <desc>Display navigation panel at bottom of pages</desc>
-
-   </doc>
-  <xsl:param name="bottomNavigationPanel">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="anyURI">
-      <desc>Link for feedback</desc>
-
-   </doc>
-  <xsl:param name="feedbackURL">mailto:feedback</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="string">
-      <desc>Fixed string to insert before normal page title in HTML meta
-&lt;title&gt; element</desc>
-
-   </doc>
-  <xsl:param name="htmlTitlePrefix"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="links" type="boolean">
-      <desc>Make a panel with next page/previous page links.</desc>
-
-   </doc>
-  <xsl:param name="linkPanel">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="boolean">
-      <desc>Generate a unique ID for all paragraphs</desc>
-
-   </doc>
-  <xsl:param name="generateParagraphIDs">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="string">
-      <desc>     <p>Character separating values in a rend attribute.</p>
-         <p>Some projects use multiple values in <tt
-         xmlns="http://www.w3.org/1999/xhtml">rend</tt>
-         attributes. These are handled, but the separator character(s)
-         must be specified.</p>
-      </desc>
-   </doc>
-  <xsl:param name="rendSeparator">; </xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="boolean">
-      <desc>Show a title and author at start of document</desc>
-
-   </doc>
-  <xsl:param name="showTitleAuthor">false</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="misc" type="boolean">
-      <desc>Be talkative while working.</desc>
-
-   </doc>
-
-  <xsl:param name="verbose">false</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="layout" type="boolean">
-      <desc>Make all notes into endnotes
-  </desc>
-   </doc>
-  <xsl:param name="autoEndNotes">false</xsl:param>
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>An ID passed to the stylesheet to indicate which section to display</desc>
-
-   </doc>
-  <xsl:param name="ID"/>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>A wrapper around the ID, to allow for other ways of getting it</desc>
-
-   </doc>
-  <xsl:param name="requestedID">
-      <xsl:value-of select="$ID"/>
-  </xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>A path fragment to put before all internal URLs </desc>
-
-   </doc>
-  <xsl:param name="URLPREFIX"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>The name of the output file</desc>
-
-   </doc>
-  <xsl:param name="outputName"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>Directory in which to place generated files.</desc>
-
-   </doc>
-  <xsl:param name="outputDir"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>Encoding of output file(s).</desc>
-
-   </doc>
-  <xsl:param name="outputEncoding">utf-8</xsl:param>
-
-  <xsl:param name="outputNamespace">http://www.w3.org/1999/xhtml</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>Output method for output file(s).</desc>
-   </doc>
-  <xsl:param name="outputMethod">xhtml</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>Suffix of output file(s).</desc>
-
-   </doc>
-  <xsl:param name="outputSuffix">.html</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>Public Doctype of output file(s).</desc>
-
-   </doc>
-
-  <xsl:param name="doctypePublic">-//W3C//DTD XHTML 1.0 Transitional//EN</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>System Doctype of output file(s).</desc>
-
-   </doc>
-  <xsl:param name="doctypeSystem">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>     <p>The style of HTML (Simple, CSS or Table) which creates the layout for generated pages.</p>
-         <p>The choice is between
-<ul xmlns="http://www.w3.org/1999/xhtml">
-               <li>
-                  <b>Simple</b>: A linear presentation is created</li>
-               <li>
-                  <b>CSS</b>: The page is created as a series of nested
- &lt;div&gt;s which can be arranged using CSS into a multicolumn
-layout</li>
-               <li>
-                  <b>Table</b>: The page is created as an HTML table</li>
-            </ul>
-         </p>
-      </desc>
-   </doc>
-  <xsl:param name="pageLayout">Simple</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="boolean">
-      <desc>Break back matter into separate HTML pages (if splitting enabled).</desc>
-
-   </doc>
-  <xsl:param name="splitBackmatter">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="boolean">
-      <desc>Break front matter into separate HTML pages (if splitting enabled).</desc>
-
-   </doc>
-  <xsl:param name="splitFrontmatter">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="integer">
-      <desc>     <p>Level at which to split sections.</p>
-         <p>When processing a &lt;div&gt; or &lt;div[0-5]&gt;, compare
-the nesting depth and see whether to start a new HTML page. Since the
-TEI starts with &lt;div1&gt;, setting this parameter to 0 will cause
-top-level sections to be split apart. The default is not to split at
-all.
-</p>
-      </desc>
-   </doc>
-  <xsl:param name="splitLevel">-1</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>Suffix for generated output files.</desc>
-
-   </doc>
-  <xsl:param name="standardSuffix">
-      <xsl:choose>
-         <xsl:when test="tei:teiCorpus">.html</xsl:when>
-         <xsl:when test="$STDOUT='true'"/>
-         <xsl:otherwise>
-	           <xsl:value-of select="$outputSuffix"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="boolean">
-      <desc>Display navigation panel at top of pages.</desc>
-
-   </doc>
-  <xsl:param name="topNavigationPanel">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="string">
-      <desc>How to specify infra-document links. When a document is split,
-links need to be constructed between parts of the document. 
-The default is to use a query parameter on the URL.</desc>
-
-   </doc>
-  <xsl:param name="urlChunkPrefix">?ID=</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="output" type="boolean">
-      <desc>     <p>Construct links using existing ID values.</p>
-         <p>It is often nice if, when making separate files, their names
-correspond to the ID attribute of the &gt;div&lt;. Alternatively, you
-	  can let the system choose names.</p>
-      </desc>
-   </doc>
-  <xsl:param name="useIDs">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="style" type="string">
-      <desc>HTML element to put around visible text of display URLs</desc>
-
-   </doc>
-  <xsl:param name="urlMarkup">span</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="boolean">
-      <desc>Make an automatic table of contents</desc>
-
-   </doc>
-  <xsl:param name="autoToc">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="string">
-      <desc>CSS class for second-level TOC entries</desc>
-
-   </doc>
-  <xsl:param name="class_subtoc">subtoc</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="integer">
-      <desc>
-	<p>Depth at which to stop doing a recursive table of contents.</p>
-         <p>You can have a mini table of contents at the start of each
-         section. The default is only to construct a TOC at the top
-         level; a value of -1 here means no subtoc at all. </p>
-      </desc>
-   </doc>
-  <xsl:param name="subTocDepth">-1</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="boolean">
-      <desc>Include the back matter in the table of contents.</desc>
-
-   </doc>
-  <xsl:param name="tocBack">true</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="string">
-      <desc>Depth to which table of contents is constructed.</desc>
-
-   </doc>
-  <xsl:param name="tocDepth">5</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="boolean">
-      <desc>Include the front matter in the table of contents.</desc>
-
-   </doc>
-  <xsl:param name="tocFront">true</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="string">
-      <desc>Which HTML element to wrap each TOCs entry in.</desc>
-
-   </doc>
-  <xsl:param name="tocElement">p</xsl:param>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="string">
-      <desc>Which HTML element to wrap each TOC sections in.</desc>
-
-   </doc>
-  <xsl:param name="tocContainerElement">div</xsl:param>
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="string">
-      <desc>Text to link back to from foot of ODD reference pages
-  </desc>
-   </doc>
-   <xsl:param name="refDocFooterText">TEI Guidelines</xsl:param>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="toc" type="anyURI">
-      <desc>URL to link back to from foot of ODD reference pages
-  </desc>
-   </doc>
-   <xsl:param name="refDocFooterURL">index.html</xsl:param>
-
-
-   <xsl:template name="navInterSep">
-      <xsl:text>: </xsl:text>
-   </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" class="hook">
-      <desc>[html] Hooks where HTML can be inserted when processing
-    &lt;egXML&gt; element</desc>
-   </doc>
-   <xsl:template name="egXMLStartHook"/>
-   <xsl:template name="egXMLEndHook"/>
-
-   <xsl:template name="emphasize">
-      <xsl:param name="class"/>
-      <xsl:param name="content"/>
-      <xsl:choose>
-         <xsl:when test="$class='titlea'">
-            <q class="titlea">
-	              <xsl:copy-of select="$content"/>
-            </q>
-         </xsl:when>
-         <xsl:otherwise>
-            <span class="{$class}">
-	              <xsl:copy-of select="$content"/>
-            </span>
-         </xsl:otherwise>
-      </xsl:choose>
-   </xsl:template>
-
-  <xsl:param name="mediaoverlay">false</xsl:param>
-
-
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/tei.xsl b/add/data/xslt/tei/xhtml2/tei.xsl
deleted file mode 100644
index 7b800c0f0..000000000
--- a/add/data/xslt/tei/xhtml2/tei.xsl
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml"                  
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-		xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="html a fo rng tei teix teidocx"
-                version="2.0">
-  <xsl:import href="../common2/tei.xsl"/>
-  <xsl:import href="tei-param.xsl"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p>
-    TEI stylesheet for making HTML output.
-      </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: tei.xsl 9669 2011-11-07 19:17:54Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <xsl:include href="core.xsl"/>
-  <xsl:include href="corpus.xsl"/>
-  <xsl:include href="dictionaries.xsl"/>
-  <xsl:include href="drama.xsl"/>
-  <xsl:include href="figures.xsl"/>
-  <xsl:include href="header.xsl"/>
-  <xsl:include href="linking.xsl"/>
-  <xsl:include href="namesdates.xsl"/>
-  <xsl:include href="tagdocs.xsl"/>
-  <xsl:include href="textstructure.xsl"/>
-  <xsl:include href="textcrit.xsl"/>
-  <xsl:include href="transcr.xsl"/>
-  <xsl:include href="verse.xsl"/>
-  <xsl:include href="../common2/verbatim.xsl"/>
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" type="string">
-      <desc>
-Stylesheet constant setting the name of the main output file.
-</desc>
-   </doc>
-  <xsl:variable name="top" select="/"/>
-  <xsl:variable name="masterFile">
-      <xsl:choose>
-         <xsl:when test="not($outputName ='')">
-            <xsl:choose>
-               <xsl:when test="$STDOUT='true'">
-                  <xsl:value-of select="$outputName"/>
-               </xsl:when>
-               <xsl:when test="contains($outputName,'.xml')">
-                  <xsl:value-of select="substring-before($outputName,'.xml')"/>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:value-of select="$outputName"/>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:when>
-         <xsl:when test="contains($REQUEST,'.ID=')">
-            <xsl:call-template name="get-basename">
-               <xsl:with-param name="file">
-                  <xsl:value-of select="substring-before($REQUEST,'.ID=')"/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="not($REQUEST='')">
-            <xsl:call-template name="get-basename">
-               <xsl:with-param name="file">
-                  <xsl:value-of select="$REQUEST"/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="$STDOUT='true'">
-            <xsl:text>index.xml</xsl:text>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:text>index</xsl:text>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:variable>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] How to work out the filename component of a path<param name="file">filename</param>
-      </desc>
-   </doc>
-  <xsl:template name="get-basename">
-      <xsl:param name="file"/>
-      <xsl:choose>
-         <xsl:when test="contains($file,'/')">
-            <xsl:call-template name="get-basename">
-               <xsl:with-param name="file">
-                  <xsl:value-of select="substring-after($file,'/')"/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:choose>
-               <xsl:when test="$STDOUT='true'">
-                  <xsl:value-of select="$file"/>
-               </xsl:when>
-               <xsl:when test="contains($file,'.xml')">
-                  <xsl:value-of select="substring-before($file,'.xml')"/>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:value-of select="$file"/>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="bodyMicroData"/>
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/textcrit.xsl b/add/data/xslt/tei/xhtml2/textcrit.xsl
deleted file mode 100644
index 2239a06bf..000000000
--- a/add/data/xslt/tei/xhtml2/textcrit.xsl
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml"  xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:dbk="http://docbook.org/ns/docbook"
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                xmlns:xhtml="http://www.w3.org/1999/xhtml"
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-
-                
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a fo dbk xlink xhtml rng tei teix"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the textcrit
-      module, making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: textcrit.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-
-   <xsl:template name="appReading">
-     <xsl:param name="lemma"/>
-     <xsl:param name="lemmawitness"/>
-     <xsl:param name="readings"/>
-     <xsl:value-of select="$lemma"/>
-      <xsl:variable name="identifier">
-         <xsl:text>App</xsl:text>
-         <xsl:choose>
-	   <xsl:when test="@xml:id">
-	     <xsl:value-of select="@xml:id"/>
-	   </xsl:when>
-	   <xsl:when test="@n">
-	     <xsl:value-of select="@n"/>
-	   </xsl:when>
-	   <xsl:otherwise>
-	     <xsl:number count="tei:app" level="any"/>
-	   </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-       <xsl:when test="$footnoteFile='true'">
-	 <a class="notelink" href="{$masterFile}-notes.html#{$identifier}">
-	   <sup>
-	     <xsl:call-template name="appN"/>
-	   </sup>
-	 </a>
-       </xsl:when>
-       <xsl:otherwise>
-	 <a class="notelink" href="#{$identifier}">
-	   <sup>
-	     <xsl:call-template name="appN"/>
-	   </sup>
-	 </a>
-       </xsl:otherwise>
-      </xsl:choose>
-
-  </xsl:template>
-
-
-   <xsl:template name="appN">
-      <xsl:choose>
-         <xsl:when test="@n">
-            <xsl:value-of select="@n"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:number from="tei:text" level="any"/>
-         </xsl:otherwise>
-      </xsl:choose>
-   </xsl:template>
-
-   <xsl:template match="tei:app" mode="printnotes">
-      <xsl:variable name="identifier">
-         <xsl:text>App</xsl:text>
-         <xsl:choose>
-            <xsl:when test="@xml:id">
-	              <xsl:value-of select="@xml:id"/>
-            </xsl:when>
-            <xsl:when test="@n">
-	              <xsl:value-of select="@n"/>
-            </xsl:when>
-            <xsl:otherwise>
-	              <xsl:number count="tei:app" level="any"/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-      <div class="note">
-         <xsl:call-template name="makeAnchor">
-            <xsl:with-param name="name" select="$identifier"/>
-         </xsl:call-template>
-         <span class="noteLabel">
-            <xsl:call-template name="appN"/>
-            <xsl:text>. </xsl:text>
-         </span>
-         <span class="noteBody">
-            <xsl:apply-templates/>
-         </span>
-      </div>
-  
-   </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/xhtml2/textstructure.xsl b/add/data/xslt/tei/xhtml2/textstructure.xsl
deleted file mode 100644
index a07dccbb5..000000000
--- a/add/data/xslt/tei/xhtml2/textstructure.xsl
+++ /dev/null
@@ -1,2906 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml"  xmlns:xlink="http://www.w3.org/1999/xlink"
-		xmlns:teidocx="http://www.tei-c.org/ns/teidocx/1.0"
-		xmlns:its="http://www.w3.org/2005/11/its"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:dbk="http://docbook.org/ns/docbook"
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a fo dbk xlink rng tei html
-					 teix its teidocx"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p> TEI stylesheet dealing with elements from the textstructure
-      module, making HTML output. </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: textstructure.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements * in inner mode</desc>
-   </doc>
-  <xsl:template match="*" mode="innertext">
-      <xsl:apply-templates select="."/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements * in paging mode</desc>
-   </doc>
-  <xsl:template match="*" mode="paging">
-      <xsl:choose>
-         <xsl:when test="self::tei:divGen[@type='summary']">
-            <xsl:call-template name="summaryToc"/>
-         </xsl:when>
-         <xsl:when test="self::tei:divGen">
-            <xsl:apply-templates select="."/>
-         </xsl:when>
-         <xsl:when test="starts-with(local-name(),'div')">
-            <xsl:if test="not(preceding-sibling::tei:*) or preceding-sibling::tei:titlePage">
-               <xsl:call-template name="doDivBody">
-		 <xsl:with-param name="Depth">2</xsl:with-param>
-		 <xsl:with-param name="nav">true</xsl:with-param>
-	       </xsl:call-template>
-            </xsl:if>
-         </xsl:when>
-         <xsl:when test="local-name(..)='front'">
-            <xsl:apply-templates select="."/>
-            <xsl:apply-templates mode="paging" select="following-sibling::*[1]"/>
-            <xsl:apply-templates mode="paging" select="../../tei:body/*[1]"/>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:apply-templates select="."/>
-            <xsl:apply-templates mode="paging" select="following-sibling::*[1]"/>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process root /</p>
-	 <p xmlns="http://www.w3.org/1999/xhtml"> processors must support `key' </p>
-      </desc>
-   </doc>
-  <xsl:template match="/">
-    <xsl:call-template name="processTEI"/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process top-level elements /</p>
-      </desc>
-   </doc>
-   <xsl:template name="processTEI">
-     <xsl:choose>
-       <!-- there are various choices of how to proceed, driven by
-	    
-	    $pageLayout: Simple, CSS, Table
-	    
-	    $STDOUT: true or false
-	    
-	    $splitLevel: -1 to 3
-	    
-	    $requestedID: requests a particular page
-       -->
-       <!-- we are making a composite layout and there is a TEI or teiCorpus element -->
-       <xsl:when test="($pageLayout = 'CSS' or $pageLayout = 'Table') and (tei:TEI or tei:teiCorpus)">
-	 <xsl:if test="$verbose='true'">
-	   <xsl:message>case 1: pageLayout <xsl:value-of select="$pageLayout"/>
-	   </xsl:message>
-	 </xsl:if>
-	 <xsl:for-each select="tei:TEI|tei:teiCorpus">
-	   <xsl:call-template name="doPageTable">
-	     <xsl:with-param name="currentID" select="$requestedID"/>
-	   </xsl:call-template>
-	 </xsl:for-each>
-	 <xsl:if test="$STDOUT='false'">
-	   <xsl:call-template name="doDivs"/>
-	 </xsl:if>
-       </xsl:when>
-       <!-- we have been asked for a particular section of the document -->
-       <xsl:when test="not($requestedID='')">
-	 <xsl:if test="$verbose='true'">
-	   <xsl:message>case 3: ID <xsl:value-of select="$requestedID"/>, pageLayout
-	   <xsl:value-of select="$pageLayout"/>
-	   </xsl:message>
-	 </xsl:if>
-	 <xsl:choose>
-	   <xsl:when test="$requestedID='prelim___'">
-	     <xsl:apply-templates/>
-	   </xsl:when>
-	   <xsl:when test="count(id($requestedID))&gt;0">
-	     <xsl:for-each select="id($requestedID)">
-	       <xsl:call-template name="writeDiv"/>
-	     </xsl:for-each>
-	   </xsl:when>
-	   <xsl:otherwise>
-	     <!-- the passed ID is a pseudo-XPath expression
-		  which starts below TEI/text.
-		  The real XPath syntax is changed to avoid problems
-	     -->
-	     <xsl:apply-templates mode="xpath" select="tei:TEI/tei:text">
-	       <xsl:with-param name="xpath" select="$requestedID"/>
-	     </xsl:apply-templates>
-	   </xsl:otherwise>
-	 </xsl:choose>
-       </xsl:when>
-       <!-- we want HTML to just splurge out-->
-       <xsl:when test="$STDOUT='true'">
-	 <xsl:if test="$verbose='true'">
-	   <xsl:message>case 4: write to stdout, pageLayout <xsl:value-of select="$pageLayout"/>
-	   </xsl:message>
-	 </xsl:if>
-	 <xsl:apply-templates/>
-       </xsl:when>
-       <!-- we want the document split up into separate files -->
-       <xsl:when test="tei:TEI or tei:teiCorpus and number($splitLevel)&gt;-1">
-	 <xsl:if test="$verbose='true'">
-	   <xsl:message>case 5: split output, <xsl:value-of select="$splitLevel"/> pageLayout <xsl:value-of select="$pageLayout"/>
-	   </xsl:message>
-	 </xsl:if>
-	 <xsl:apply-templates mode="split"/>
-       </xsl:when>
-       <!-- we want the whole document, in an output file -->
-       <xsl:otherwise>
-	 <xsl:if test="$verbose='true'">
-	   <xsl:message>case 6: one document, pageLayout <xsl:value-of select="$pageLayout"/>
-	   </xsl:message>
-	 </xsl:if>
-	 <xsl:choose>
-	   <xsl:when test="$masterFile='' or $STDOUT='true'">
-	     <xsl:apply-templates/>
-	   </xsl:when>
-	   <xsl:otherwise>
-	     
-	     <xsl:variable name="outName">
-	       <xsl:call-template name="outputChunkName">
-		 <xsl:with-param name="ident">
-		   <xsl:value-of select="$masterFile"/>
-		 </xsl:with-param>
-	       </xsl:call-template>
-	     </xsl:variable>
-	     
-	     <xsl:if test="$verbose='true'">
-	       <xsl:message>Opening file <xsl:value-of select="$outName"/>
-	       </xsl:message>
-	     </xsl:if>
-	     <xsl:result-document doctype-public="{$doctypePublic}" doctype-system="{$doctypeSystem}"
-				  encoding="{$outputEncoding}"
-				  href="{$outName}"
-				  method="{$outputMethod}">
-	       <xsl:apply-templates/>
-	     </xsl:result-document>
-	     
-	     <xsl:if test="$verbose='true'">
-	       <xsl:message>Closing file <xsl:value-of select="$outName"/>
-	       </xsl:message>
-	     </xsl:if>
-	     
-	   </xsl:otherwise>
-	 </xsl:choose>
-       </xsl:otherwise>
-     </xsl:choose>
-   </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements processing-instruction()[name()='xmltex']</desc>
-   </doc>
-  <xsl:template match="processing-instruction()[name()='xmltex']">
-      <xsl:value-of select="."/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element *</desc>
-   </doc>
-  <xsl:template match="tei:*" mode="generateNextLink">
-      <span class="nextLink">
-         <xsl:text> </xsl:text>
-         <xsl:call-template name="i18n">
-	           <xsl:with-param name="word">nextWord</xsl:with-param>
-         </xsl:call-template>
-         <xsl:call-template name="navInterSep"/>
-      </span>
-      <a class="navigation">
-         <xsl:attribute name="href">
-	           <xsl:apply-templates mode="generateLink" select="."/>
-         </xsl:attribute>
-         <xsl:call-template name="headerLink">
-	           <xsl:with-param name="minimal" select="$minimalCrossRef"/>
-         </xsl:call-template>
-      </a>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements looking for something to link to backwards</desc>
-   </doc>
-  <xsl:template match="tei:*" mode="generatePreviousLink">
-      <span class="previousLink">
-         <xsl:text> </xsl:text>
-         <xsl:call-template name="i18n">
-            <xsl:with-param name="word">previousWord</xsl:with-param>
-         </xsl:call-template>
-         <xsl:call-template name="navInterSep"/>
-      </span>
-      <a class="navigation">
-         <xsl:attribute name="href">
-            <xsl:apply-templates mode="generateLink" select="."/>
-         </xsl:attribute>
-         <xsl:call-template name="headerLink">
-            <xsl:with-param name="minimal" select="$minimalCrossRef"/>
-         </xsl:call-template>
-      </a>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process any element in xpath mode</p>
-         <p>
-            <p xmlns="http://www.w3.org/1999/xhtml"> This nice bit of code is from Jeni Tennison </p>
-         </p>
-         <param name="xpath">xpath</param>
-         <param name="action">action</param>
-      </desc>
-   </doc>
-  <xsl:template match="tei:*" mode="xpath">
-      <xsl:param name="xpath"/>
-      <xsl:param name="action"/>
-      <xsl:choose>
-      <!-- if there is a path -->
-      <xsl:when test="$xpath">
-        <!-- step is the part before the '_' (if there is one) -->
-        <xsl:variable name="step">
-               <xsl:choose>
-                  <xsl:when test="contains($xpath, '_')">
-                     <xsl:value-of select="substring-before($xpath, '_')"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                     <xsl:value-of select="$xpath"/>
-                  </xsl:otherwise>
-               </xsl:choose>
-            </xsl:variable>
-            <!-- the child's name is the part before the '.' -->
-        <xsl:variable name="childName" select="substring-before($step, '.')"/>
-            <!-- and its index is the part after '.' -->
-        <xsl:variable name="childIndex" select="substring-after($step, '.')"/>
-            <!-- so apply templates to that child, passing in the $xpath
-	     left after the first step -->
-        <xsl:apply-templates mode="xpath" select="*[name() = $childName]          [number($childIndex)]">
-               <xsl:with-param name="xpath" select="substring-after($xpath, '_')"/>
-               <xsl:with-param name="action" select="$action"/>
-            </xsl:apply-templates>
-         </xsl:when>
-         <!-- if there's no path left, then this is the element we want -->
-      <xsl:otherwise>
-            <xsl:choose>
-               <xsl:when test="$action='header'">
-                  <xsl:apply-templates mode="xref" select="."/>
-               </xsl:when>
-               <xsl:when test="$action='notes'">
-                  <xsl:call-template name="printNotes"/>
-               </xsl:when>
-               <xsl:when test="$action='toclist'">
-                  <xsl:call-template name="linkListContents">
-                     <xsl:with-param name="style" select="'toclist'"/>
-                  </xsl:call-template>
-               </xsl:when>
-               <xsl:when test="starts-with(local-name(),'div') and      $pageLayout='Table'      or      $pageLayout='CSS'">
-                  <xsl:call-template name="doDivBody">
-		    <xsl:with-param name="Depth">2</xsl:with-param>
-		    <xsl:with-param name="nav">true</xsl:with-param>
-		  </xsl:call-template>
-               </xsl:when>
-               <xsl:when test="self::tei:divGen[@type='summary']">
-                  <xsl:call-template name="summaryToc"/>
-               </xsl:when>
-               <xsl:otherwise>
-                  <html>
-                     <xsl:call-template name="addLangAtt"/>
-                     <xsl:call-template name="htmlFileTop"/>
-		     <body id="TOP">
-                        <xsl:call-template name="bodyMicroData"/>
-                        <xsl:call-template name="bodyJavascriptHook"/>
-			<xsl:call-template name="bodyHook"/>
-			<div class="stdheader">
-			  <xsl:call-template name="stdheader">
-			    <xsl:with-param name="title">
-			      <xsl:call-template name="generateTitle"/>
-                              </xsl:with-param>
-			  </xsl:call-template>
-			</div>
-                        <h2>
-                           <xsl:apply-templates mode="xref" select="."/>
-			   <xsl:call-template name="sectionHeadHook"/>
-                        </h2>
-                        <xsl:apply-templates/>
-                        <xsl:call-template name="printNotes"/>
-                        <xsl:call-template name="htmlFileBottom"/>
-			<xsl:call-template name="bodyEndHook"/>
-		     </body>
-		  </html>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process root element TEI</p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:TEI">
-      <xsl:call-template name="teiStartHook"/>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML in single document mode </xsl:message>
-      </xsl:if>
-      <html>
-         <xsl:call-template name="addLangAtt"/>
-         <head>
-            <xsl:variable name="pagetitle">
-               <xsl:call-template name="generateTitle"/>
-            </xsl:variable>
-            <title>
-               <xsl:value-of select="$pagetitle"/>
-            </title>
-            <xsl:call-template name="headHook"/>
-            <xsl:call-template name="metaHTML">
-               <xsl:with-param name="title" select="$pagetitle"/>
-            </xsl:call-template>
-            <xsl:call-template name="includeCSS"/>
-            <xsl:call-template name="cssHook"/>
-            <xsl:call-template name="includeJavascript"/>
-            <xsl:call-template name="javascriptHook"/>
-         </head>
-         <body class="simple" id="TOP">
-            <xsl:call-template name="bodyMicroData"/>
-            <xsl:call-template name="bodyJavascriptHook"/>
-	    <xsl:call-template name="bodyHook"/>
-            <xsl:if test="not(tei:text/tei:front/tei:titlePage)">
-	      <div class="stdheader">
-		<xsl:call-template name="stdheader">
-		  <xsl:with-param name="title">
-		    <xsl:call-template name="generateTitle"/>
-		  </xsl:with-param>
-		</xsl:call-template>
-	      </div>
-            </xsl:if>
-            <xsl:call-template name="startHook"/>
-            <xsl:call-template name="simpleBody"/>
-            <xsl:call-template name="stdfooter"/>
-            <xsl:call-template name="bodyEndHook"/>
-         </body>
-      </html>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML: run end hook template teiEndHook</xsl:message>
-      </xsl:if>
-      <xsl:call-template name="teiEndHook"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process root element TEI in splitting mode</p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:TEI" mode="split">
-      <xsl:variable name="BaseFile">
-         <xsl:value-of select="$masterFile"/>
-         <xsl:call-template name="addCorpusID"/>
-      </xsl:variable>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML: run start hook template teiStartHook</xsl:message>
-      </xsl:if>
-      <xsl:call-template name="teiStartHook"/>
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML in splitting mode, base file is <xsl:value-of select="$BaseFile"/>
-         </xsl:message>
-      </xsl:if>
-
-      <xsl:variable name="outName">
-         <xsl:call-template name="outputChunkName">
-	           <xsl:with-param name="ident">
-	              <xsl:choose>
-	                 <xsl:when test="parent::tei:teiCorpus">
-	                    <xsl:apply-templates select="." mode="ident"/>
-	                 </xsl:when>
-	                 <xsl:otherwise>
-	                    <xsl:value-of select="$BaseFile"/>
-	                 </xsl:otherwise>
-	              </xsl:choose>
-	           </xsl:with-param>
-         </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:if test="$verbose='true'">
-         <xsl:message>Opening file <xsl:value-of select="$outName"/>
-         </xsl:message>
-      </xsl:if>
-      <xsl:result-document doctype-public="{$doctypePublic}" doctype-system="{$doctypeSystem}"
-                           encoding="{$outputEncoding}"
-                           href="{$outName}"
-                           method="{$outputMethod}">
-    
-        <xsl:call-template name="pageLayoutSimple"/>
-      </xsl:result-document>
-    
-      <xsl:if test="$verbose='true'">
-         <xsl:message>Closing file <xsl:value-of select="$outName"/>
-         </xsl:message>
-      </xsl:if>
-
-      <xsl:if test="$verbose='true'">
-         <xsl:message>TEI HTML: run end hook template teiEndHook</xsl:message>
-      </xsl:if>
-      <xsl:call-template name="teiEndHook"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process elements front, body or back in splitting mode</desc>
-   </doc>
-  <xsl:template match="tei:front|tei:body|tei:back" mode="split">
-      <xsl:for-each select="*">
-         <xsl:choose>
-            <xsl:when test="starts-with(local-name(.),'div')">
-               <xsl:apply-templates mode="split" select="."/>
-            </xsl:when>
-            <xsl:otherwise>
-               <xsl:apply-templates select="."/>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:for-each>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element body in inner mode</desc>
-   </doc>
-  <xsl:template match="tei:body" mode="inner">
-      <xsl:apply-templates/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element closer</desc>
-   </doc>
-  <xsl:template match="tei:closer">
-	<xsl:choose>
-	  <xsl:when test="tei:signed">
-	    <div class="closer">
-	      <xsl:apply-templates/>
-	    </div>
-	  </xsl:when>
-	  <xsl:when test="tei:postscript">
-	    <div class="closer">
-	      <xsl:apply-templates/>
-	    </div>
-	  </xsl:when>
-	  <xsl:when test="tei:p">
-	    <blockquote class="closer">
-	      <xsl:apply-templates/>
-	    </blockquote>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <blockquote class="closer">
-	      <p>
-		<xsl:apply-templates/>
-	      </p>
-	    </blockquote>
-	  </xsl:otherwise>
-	</xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element dateline</desc>
-   </doc>
-  <xsl:template match="tei:dateline">
-      <span class="dateline">
-         <xsl:apply-templates/>
-      </span>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element divGen[@type='actions']</desc>
-   </doc>
-  <xsl:template match="tei:divGen[@type='actions']">
-      <h3>Actions arising</h3>
-      <dl>
-         <xsl:for-each select="/tei:TEI/tei:text//tei:note[@type='action']">
-            <dt>
-               <b>
-                  <xsl:number count="tei:note[@type='action']" level="any"/>
-               </b>
-            </dt>
-            <dd>
-               <xsl:apply-templates/>
-            </dd>
-         </xsl:for-each>
-      </dl>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process element divGen[@type='toc']</p>
-         <p>
-            <p xmlns="http://www.w3.org/1999/xhtml"> table of contents </p>
-         </p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:divGen[@type='toc']">
-    <div class="tei_toc">
-      <h2>
-         <xsl:call-template name="i18n">
-            <xsl:with-param name="word">tocWords</xsl:with-param>
-         </xsl:call-template>
-      </h2>
-      <xsl:call-template name="mainTOC"/>
-    </div>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>index element, by default does nothing, unless it has an xml:id</p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:index">
-    <xsl:if test="@xml:id">
-      <span>
-	<xsl:attribute name="id" select="@xml:id"/>
-	<span style="display:none">
-	  <xsl:value-of select="normalize-space(tei:term)"/>
-	</span>
-      </span>
-    </xsl:if>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Simplistic processing of element divGen[@type='index']</p>
-         <p>
-            <p xmlns="http://www.w3.org/1999/xhtml">make an index;
-	    does not take indexName or nested index into account </p>
-         </p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:divGen[@type='index']">
-    <div class="tei_index">
-      <h2>Index</h2>
-      <xsl:variable name="index">
-	<xsl:for-each select="key('INDEX',1)">
-	  <tei:REF>
-	    <tei:SORT>
-	      <xsl:value-of select="lower-case(normalize-unicode(tei:term,'NFD'))"/>
-	    </tei:SORT>	    
-	    <tei:TERM>
-	      <xsl:value-of select="tei:term"/>
-	    </tei:TERM>	    
-	    <xsl:for-each select="ancestor-or-self::*[tei:is-identifiable(.)][1]">
-	      <tei:LINK>
-		  <xsl:apply-templates mode="generateLink"
-				       select="."/>
-	      </tei:LINK>
-	      <tei:TARGET>
-		<xsl:call-template name="header"/>
-	      </tei:TARGET>
-	    </xsl:for-each>
-	  </tei:REF>
-	</xsl:for-each>
-      </xsl:variable>
-      <dl>
-	<xsl:for-each-group select="$index/tei:REF" group-by="tei:TERM">
-	  <xsl:sort select="tei:SORT" lang="{$doclang}"/>
-	  <dt><xsl:value-of select="current-grouping-key()"/></dt>
-	  <dd>
-	    <xsl:for-each-group select="current-group()" group-by="tei:LINK">
-	      <xsl:for-each select="current-group()[1]">
-		<a href="{tei:LINK}">
-		  <xsl:value-of select="tei:TARGET"/>
-		</a>
-	      </xsl:for-each>
-	      <xsl:value-of select="$spaceCharacter"/>
-	    </xsl:for-each-group>
-	  </dd>
-	</xsl:for-each-group>
-      </dl>
-    </div>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-    <desc>Process elements
-      tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6</desc>
-   </doc>
-  <xsl:template match="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6">
-      <xsl:variable name="depth">
-         <xsl:apply-templates mode="depth" select="."/>
-      </xsl:variable>
-      <!-- depending on depth and splitting level, 
-	 we may do one of two things: -->
-    <xsl:choose>
-      <!-- -1. Override at top level -->
-      <xsl:when test="ancestor::tei:floatingText">
-	  <xsl:call-template name="doDivBody">
-	    <xsl:with-param name="Depth" select="$depth"/>
-	  </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="ancestor::tei:TEI/@rend='all'">
-	  <xsl:call-template name="doDivBody">
-	    <xsl:with-param name="Depth" select="$depth"/>
-	  </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="ancestor::tei:TEI/@rend='frontpage'">
-	  <xsl:call-template name="doDivBody">
-	    <xsl:with-param name="Depth" select="$depth"/>
-	  </xsl:call-template>
-      </xsl:when>
-      <!-- 0. We have gone far enough -->
-      <xsl:when test="$depth = $splitLevel and $STDOUT='true'">
-      </xsl:when>
-      <!-- 1. our section depth is below the splitting level -->
-      <xsl:when test="number($depth) &gt; number($splitLevel) or         @rend='nosplit' or ancestor::tei:TEI/@rend='all' or         ancestor::tei:TEI/@rend='frontpage' or         ancestor::tei:TEI/@rend='nosplit'">
-	  <xsl:call-template name="doDivBody">
-	    <xsl:with-param name="Depth" select="$depth"/>
-	  </xsl:call-template>
-      </xsl:when>
-      <!-- 2. we are at or above splitting level, 
-	   so start a new page  -->
-      <xsl:when test="number($depth) &lt;= number($splitLevel) and ancestor::tei:front and $splitFrontmatter='true'">
-	<xsl:call-template name="makeDivPage">
-	  <xsl:with-param name="depth" select="$depth"/>
-	</xsl:call-template>
-      </xsl:when>
-      <xsl:when test="number($depth) &lt;= number($splitLevel) and ancestor::tei:back and $splitBackmatter='true'">
-	<xsl:call-template name="makeDivPage">
-	  <xsl:with-param name="depth" select="$depth"/>
-	</xsl:call-template>
-      </xsl:when>
-      <xsl:when test="number($depth) &lt;= number($splitLevel) and ancestor::tei:body">
-	<xsl:call-template name="makeDivPage">
-	  <xsl:with-param name="depth" select="$depth"/>
-	</xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-	  <xsl:call-template name="doDivBody">
-	    <xsl:with-param name="Depth" select="$depth"/>
-	  </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Create a new output page for a section
-      <param name="depth">depth of section (1, 2 3, 4 etc)</param>
-      </desc>
-   </doc>
-  <xsl:template name="makeDivPage">
-      <xsl:param name="depth"/>
-      <xsl:variable name="outName">
-	<xsl:call-template name="outputChunkName">
-	  <xsl:with-param name="ident">
-	    <xsl:apply-templates mode="ident" select="."/>
-	  </xsl:with-param>
-	</xsl:call-template>
-      </xsl:variable>
-      
-      <xsl:if test="$verbose='true'">
-	<xsl:message>Opening file <xsl:value-of select="$outName"/>
-	</xsl:message>
-      </xsl:if>
-      <xsl:result-document doctype-public="{$doctypePublic}" doctype-system="{$doctypeSystem}"
-			   encoding="{$outputEncoding}"
-			   href="{$outName}"
-			   method="{$outputMethod}">	     
-	<xsl:choose>
-	  <xsl:when test="$pageLayout='CSS'">
-	    <xsl:call-template name="pageLayoutCSS">
-	      <xsl:with-param name="currentID">
-		<xsl:apply-templates mode="ident" select="."/>
-	      </xsl:with-param>
-	    </xsl:call-template>
-	  </xsl:when>
-	  <xsl:when test="$pageLayout='Table'">
-	    <xsl:call-template name="pageLayoutTable">
-	      <xsl:with-param name="currentID">
-		<xsl:apply-templates mode="ident" select="."/>
-	      </xsl:with-param>
-	    </xsl:call-template>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:call-template name="writeDiv"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-	
-      </xsl:result-document>
-      
-      <xsl:if test="$verbose='true'">
-	<xsl:message>Closing file <xsl:value-of select="$outName"/>
-	</xsl:message>
-      </xsl:if>
-  </xsl:template>
-  
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element docAuthor in "author" mode"</desc>
-   </doc>
-  <xsl:template match="tei:docAuthor" mode="author">
-      <xsl:if test="preceding-sibling::tei:docAuthor">
-         <xsl:text>, </xsl:text>
-      </xsl:if>
-      <xsl:apply-templates/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>Process element docTitle, docAuthor, docImprint and
-	 tei:docDate</p>
-         <p>
-            <p xmlns="http://www.w3.org/1999/xhtml"> Translate these to a corresponding HTML div </p>
-         </p>
-      </desc>
-   </doc>
-  <xsl:template match="tei:docTitle|tei:docAuthor|tei:docImprint|tei:titlePage/tei:titlePart|tei:docDate">
-    <xsl:variable name="container">
-      <xsl:choose>
-	<xsl:when test="parent::tei:titlePage">
-	 <xsl:text>div</xsl:text>
-	</xsl:when>
-	<xsl:otherwise>
-	 <xsl:text>span</xsl:text>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element name="{$container}">
-      <xsl:call-template name="microdata"/>
-      <xsl:choose>
-	<xsl:when test="@rendition">
-	  <xsl:call-template name="applyRendition"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:call-template name="rendToClass">
-	    <xsl:with-param name="default">
-	      <xsl:value-of select="local-name()"/>
-	    </xsl:with-param>
-	  </xsl:call-template>
-	</xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element opener</desc>
-   </doc>
-
-  <xsl:template match="tei:opener">
-    <xsl:choose>
-      <xsl:when test="tei:signed|tei:salute">
-	<div class="opener">
-	  <xsl:apply-templates/>
-	</div>
-      </xsl:when>
-      <xsl:when test="tei:p">
-	<blockquote class="opener">
-	  <xsl:apply-templates/>
-	</blockquote>
-      </xsl:when>
-      <xsl:otherwise>
-	<blockquote class="opener">
-	  <p>
-	    <xsl:apply-templates/>
-	  </p>
-	</blockquote>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element text</desc>
-   </doc>
-  <xsl:template match="tei:text">
-      <xsl:choose>
-         <xsl:when test="parent::tei:TEI">
-            <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:when test="ancestor::tei:group and $splitLevel=0">
-	   <xsl:call-template name="makeDivPage">
-	     <xsl:with-param name="depth">-1</xsl:with-param>
-	   </xsl:call-template>
-         </xsl:when>
-	 <xsl:otherwise>
-	   <xsl:call-template name="doDivBody"/>
-	 </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>Process element titlePage</desc>
-   </doc>
-  <xsl:template match="tei:titlePage">
-      <div class="titlePage">
-         <xsl:apply-templates/>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="crumbBody">crumbBody</param>
-      </desc>
-   </doc>
-  <xsl:template name="aCrumb">
-      <xsl:param name="crumbBody"/>
-      <li class="breadcrumb">
-         <xsl:copy-of select="$crumbBody"/>
-      </li>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="addCorpusID">
-      <xsl:if test="ancestor-or-self::tei:teiCorpus">
-         <xsl:for-each select="ancestor-or-self::tei:TEI">
-            <xsl:text>-</xsl:text>
-            <xsl:choose>
-               <xsl:when test="@xml:id">
-                  <xsl:value-of select="@xml:id"/>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:number/>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:for-each>
-      </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="addLangAtt">
-      <xsl:variable name="documentationLanguage">
-         <xsl:choose>
-            <xsl:when test="string-length($doclang)&gt;0">
-	      <xsl:value-of select="$doclang"/>
-            </xsl:when>
-            <xsl:when test="ancestor-or-self::tei:schemaSpec/@docLang">
-	      <xsl:value-of select="//tei:schemaSpec[1]/@docLang"/>
-            </xsl:when>
-            <xsl:otherwise>
-	      <xsl:text>en</xsl:text>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="supplied">
-	<xsl:choose>
-	  <xsl:when test="ancestor-or-self::tei:*[@xml:lang]">
-	    <xsl:value-of select="ancestor-or-self::tei:*[@xml:lang][1]/@xml:lang"/>
-	  </xsl:when>
-	  <xsl:when test="ancestor-or-self::tei:*[@lang]">
-	    <xsl:value-of select="ancestor-or-self::tei:*[@lang][1]/@lang"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:value-of select="$documentationLanguage"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-	<xsl:when test="$outputTarget='html'">
-	  <xsl:attribute name="xml:lang">
-	    <xsl:value-of select="$supplied"/>
-	  </xsl:attribute>
-	</xsl:when>
-	<xsl:when test="$outputTarget='html5'">
-	  <xsl:attribute name="lang">
-	    <xsl:value-of select="$supplied"/>
-	  </xsl:attribute>
-	</xsl:when>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[html] </p>
-         <p>where to start the path from</p>
-         <param name="crumbRoot">/</param>
-      </desc>
-   </doc>
-  <xsl:template name="crumbPath">
-      <xsl:param name="crumbRoot">/</xsl:param>
-      <div class="breadcrumb">
-         <xsl:call-template name="preBreadCrumbPath"/>
-         <ul class="breadcrumb">
-            <li class="breadcrumb-first">
-               <a class="breadcrumb" href="{$homeURL}">
-                  <xsl:value-of select="$homeLabel"/>
-               </a>
-            </li>
-            <xsl:call-template name="walkTree">
-               <xsl:with-param name="path">
-                  <xsl:value-of select="substring-after($REQUEST,$crumbRoot)"/>
-               </xsl:with-param>
-               <xsl:with-param name="whole">
-                  <xsl:value-of select="$crumbRoot"/>
-               </xsl:with-param>
-               <xsl:with-param name="class">breadcrumb</xsl:with-param>
-            </xsl:call-template>
-         </ul>
-      </div>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Make a section heading
-      <param name="Depth">which head level to make</param>
-      </desc>
-   </doc>
-  <xsl:template name="doDivBody">
-      <xsl:param name="Depth"/>
-      <xsl:param name="nav">false</xsl:param>
-      <xsl:variable name="container">
-	<xsl:choose>
-	  <xsl:when test="$outputTarget='html5'">section</xsl:when>
-	  <xsl:otherwise>div</xsl:otherwise>
-	</xsl:choose>
-      </xsl:variable>
-      <xsl:choose>
-	<xsl:when test="$filePerPage='true'">
-	    <xsl:call-template name="startDivHook"/>
-	    <xsl:call-template name="divContents">
-	      <xsl:with-param name="Depth" select="$Depth"/>
-	      <xsl:with-param name="nav" select="$nav"/>
-	    </xsl:call-template>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:element name="{$container}">
-	    <xsl:call-template name="microdata"/>
-	    <xsl:call-template name="divClassAttribute">
-	      <xsl:with-param name="depth" select="$Depth"/>
-	    </xsl:call-template>	
-	    <xsl:call-template name="startDivHook"/>
-	    <xsl:call-template name="divContents">
-	      <xsl:with-param name="Depth" select="$Depth"/>
-	      <xsl:with-param name="nav" select="$nav"/>
-	    </xsl:call-template>
-	  </xsl:element>
-	</xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] doing the contents of a div</desc>
-   </doc>
-
-  <xsl:template name="divContents">
-      <xsl:param name="Depth"/>
-      <xsl:param name="nav">false</xsl:param>
-      <xsl:variable name="ident">
-	<xsl:apply-templates mode="ident" select="."/>
-      </xsl:variable>
-      
-	<xsl:choose>
-	  <xsl:when test="parent::tei:*/@rend='multicol'">
-	    <td valign="top">
-	      <xsl:if test="not($Depth = '')">
-		<xsl:element name="h{$Depth + $divOffset}">
-		  <xsl:for-each select="tei:head[1]">		
-		    <xsl:call-template name="rendToClass">
-		      <xsl:with-param name="default"/>
-		    </xsl:call-template>
-		 </xsl:for-each>
-		 <xsl:call-template name="header">
-		   <xsl:with-param name="display">full</xsl:with-param>
-		 </xsl:call-template>
-		 <xsl:call-template name="sectionHeadHook"/>
-	       </xsl:element>
-	     </xsl:if>
-	     <xsl:apply-templates/>
-	   </td>
-         </xsl:when>
-         <xsl:when test="@rend='multicol'">
-            <xsl:apply-templates select="*[not(local-name(.)='div')]"/>
-            <table>
-               <tr>
-                  <xsl:apply-templates select="tei:div"/>
-               </tr>
-            </table>
-         </xsl:when>
-	 <xsl:when test="@rend='nohead'">
-	   <xsl:apply-templates/>
-	 </xsl:when>
-         <xsl:otherwise>
-	   <xsl:if test="not($Depth = '')">
-	     <xsl:element name="{if (number($Depth)+$divOffset &gt;6) then 'div'
-				else concat('h',number($Depth) + $divOffset)}">
-	       <xsl:choose>
-		 <xsl:when test="@rend">
-		   <xsl:call-template name="rendToClass">
-		     <xsl:with-param
-			 name="id">false</xsl:with-param>
-		   </xsl:call-template>
-		 </xsl:when>
-		 <xsl:otherwise>
-		   <xsl:for-each select="tei:head[1]">
-		     <xsl:call-template name="rendToClass">
-		       <xsl:with-param name="default">
-			 <xsl:if test="number($Depth)&gt;5">
-			   <xsl:text>div</xsl:text>
-			   <xsl:value-of select="$Depth"/>
-			 </xsl:if>
-		       </xsl:with-param>
-		     </xsl:call-template>
-		   </xsl:for-each>
-		 </xsl:otherwise>
-	       </xsl:choose>
-	       <xsl:call-template name="header">
-		 <xsl:with-param name="display">full</xsl:with-param>
-	       </xsl:call-template>
-	       <xsl:call-template name="sectionHeadHook"/>
-	     </xsl:element>
-		 <xsl:if test="$topNavigationPanel='true' and $nav='true'">
-		   <xsl:call-template name="xrefpanel">
-		     <xsl:with-param name="homepage" select="concat($masterFile,$standardSuffix)"/>
-		     <xsl:with-param name="mode" select="local-name(.)"/>
-		   </xsl:call-template>
-		 </xsl:if>
-	   </xsl:if>
-	   <xsl:apply-templates/>
-		 <xsl:if test="$bottomNavigationPanel='true' and $nav='true'">
-		   <xsl:call-template name="xrefpanel">
-		     <xsl:with-param name="homepage" select="concat($masterFile,$standardSuffix)"/>
-		     <xsl:with-param name="mode" select="local-name(.)"/>
-		   </xsl:call-template>
-		 </xsl:if>
-         </xsl:otherwise>
-	</xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] process divisions</desc>
-   </doc>
-  <xsl:template name="doDivs">
-      <xsl:for-each select="tei:TEI/tei:text">
-         <xsl:for-each select="tei:front|tei:body|tei:back">
-            <xsl:for-each select="tei:div|tei:div1">
-               <xsl:variable name="currentID">
-                  <xsl:apply-templates mode="ident" select="."/>
-               </xsl:variable>
-               <xsl:call-template name="doPageTable">
-                  <xsl:with-param name="currentID" select="$currentID"/>
-               </xsl:call-template>
-            </xsl:for-each>
-         </xsl:for-each>
-      </xsl:for-each>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="currentID">currentID</param>
-      </desc>
-   </doc>
-  <xsl:template name="doPageTable">
-      <xsl:param name="currentID"/>
-      <xsl:variable name="BaseFile">
-         <xsl:value-of select="$masterFile"/>
-         <xsl:call-template name="addCorpusID"/>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="$STDOUT='true'">
-	           <xsl:choose>
-	              <xsl:when test="$pageLayout='CSS'">
-                  <xsl:call-template name="pageLayoutCSS">
-                     <xsl:with-param name="currentID" select="$currentID"/>
-                  </xsl:call-template>
-               </xsl:when>
-               <xsl:when test="$pageLayout='Table'">
-                  <xsl:call-template name="pageLayoutTable">
-                     <xsl:with-param name="currentID" select="$currentID"/>
-                  </xsl:call-template>
-               </xsl:when>
-            </xsl:choose>
-         </xsl:when>
-         <xsl:otherwise>
-
-
-	           <xsl:variable name="outName">
-	              <xsl:call-template name="outputChunkName">
-	                 <xsl:with-param name="ident">
-	                    <xsl:choose>
-		                      <xsl:when test="not($currentID='')">
-		                         <xsl:value-of select="$currentID"/>
-		                      </xsl:when>
-		                      <xsl:otherwise>
-		                         <xsl:value-of select="$BaseFile"/>
-	                       </xsl:otherwise>
-	                    </xsl:choose>
-	                 </xsl:with-param>
-	              </xsl:call-template>
-	           </xsl:variable>
-	
-	           <xsl:if test="$verbose='true'">
-	              <xsl:message>Opening file <xsl:value-of select="$outName"/>
-               </xsl:message>
-	           </xsl:if>
-	           <xsl:result-document doctype-public="{$doctypePublic}" doctype-system="{$doctypeSystem}"
-                                 encoding="{$outputEncoding}"
-                                 href="{$outName}"
-                                 method="{$outputMethod}">
-	              <xsl:choose>
-	                 <xsl:when test="$pageLayout='CSS'">
-		                   <xsl:call-template name="pageLayoutCSS">
-		                      <xsl:with-param name="currentID" select="$currentID"/>
-		                   </xsl:call-template>
-	                 </xsl:when>
-	                 <xsl:when test="$pageLayout='Table'">
-		                   <xsl:call-template name="pageLayoutTable">
-		                      <xsl:with-param name="currentID" select="$currentID"/>
-		                   </xsl:call-template>
-	                 </xsl:when>
-	              </xsl:choose>
-	           </xsl:result-document>
-	
-	           <xsl:if test="$verbose='true'">
-	              <xsl:message>Closing file <xsl:value-of select="$outName"/>
-               </xsl:message>
-	           </xsl:if>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>plain text version of title for div [html] </desc>
-   </doc>
-  <xsl:template name="generateDivtitle">
-      <xsl:apply-templates select="tei:head" mode="plain"/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>link to level above[html] </desc>
-   </doc>
-  <xsl:template name="generateUpLink">
-      <xsl:variable name="myName">
-         <xsl:value-of select="local-name(.)"/>
-      </xsl:variable>
-      <xsl:variable name="BaseFile">
-         <xsl:value-of select="$masterFile"/>
-         <xsl:value-of select="$standardSuffix"/>
-         <xsl:call-template name="addCorpusID"/>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="$myName = 'div' and not(ancestor::tei:div)">
-            <xsl:call-template name="upLink">
-	              <xsl:with-param name="up" select="$BaseFile"/>
-	              <xsl:with-param name="title" select="$homeLabel"/>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="$myName = 'div'">
-            <xsl:call-template name="upLink">
-               <xsl:with-param name="up" select="ancestor::tei:div[1]"/>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="$myName='div1'">
-	           <xsl:call-template name="upLink">
-	              <xsl:with-param name="up" select="$BaseFile"/>
-	              <xsl:with-param name="title" select="$homeLabel"/>
-	           </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="$myName='div2'">
-	           <xsl:call-template name="upLink">
-	              <xsl:with-param name="up" select="ancestor::tei:div1"/>
-	           </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="$myName='div3'">
-	           <xsl:call-template name="upLink">
-	              <xsl:with-param name="up" select="ancestor::tei:div2"/>
-	           </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="$myName='div4'">
-	           <xsl:call-template name="upLink">
-	              <xsl:with-param name="up" select="ancestor::tei:div3"/>
-	           </xsl:call-template>
-         </xsl:when>
-         <xsl:when test="$myName='div5'">
-	           <xsl:call-template name="upLink">
-	              <xsl:with-param name="up" select="ancestor::tei:div4"/>
-	           </xsl:call-template>
-         </xsl:when>
-         <xsl:otherwise>
-	           <xsl:call-template name="upLink">
-	              <xsl:with-param name="up" select="(ancestor::tei:div1|ancestor::tei:div)[1]"/>
-	           </xsl:call-template>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>What happens at the end of an HTML file [html] </p>
-      </desc>
-   </doc>
-  <xsl:template name="htmlFileBottom">
-      <xsl:call-template name="topNavigation"/>
-      <xsl:call-template name="stdfooter"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="htmlFileTop">
-      <xsl:comment>THIS FILE IS GENERATED FROM AN XML MASTER. DO NOT EDIT (6)</xsl:comment>
-      <xsl:variable name="pagetitle">
-         <xsl:call-template name="generateTitle"/>
-      </xsl:variable>
-      <head>
-         <title>
-            <xsl:value-of select="$pagetitle"/>
-         </title>
-         <xsl:call-template name="headHook"/>
-         <xsl:call-template name="metaHTML">
-            <xsl:with-param name="title" select="$pagetitle"/>
-         </xsl:call-template>
-         <xsl:call-template name="includeCSS"/>
-         <xsl:call-template name="cssHook"/>
-         <xsl:call-template name="includeJavascript"/>
-         <xsl:call-template name="javascriptHook"/>
-      </head>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="includeCSS">
-
-      <xsl:if test="string-length($cssFile)&gt;0">
-	<link href="{$cssFile}" rel="stylesheet" type="text/css"/>
-      </xsl:if>
-
-      <xsl:if test="string-length($cssSecondaryFile)&gt;0">
-	<link href="{$cssSecondaryFile}" rel="stylesheet" type="text/css"/>
-      </xsl:if>
-      
-      <xsl:if test="string-length($cssPrintFile)&gt;0">
-	<link rel="stylesheet" media="print" type="text/css">
-	  <xsl:attribute name="href" select="$cssPrintFile"/>
-	</link>
-      </xsl:if>
-      
-      <xsl:if test="$cssInlineFile">
-	<style type="text/css" title="inline_css">
-	  <xsl:for-each select="tokenize(unparsed-text($cssInlineFile),
-				'\r?\n')">
-	    <xsl:value-of select="normalize-space(.)"/>
-	    <xsl:text>&#10;</xsl:text>
-	  </xsl:for-each>
-	</style>
-      </xsl:if>
-
-      <xsl:call-template name="generateLocalCSS"/>
-      
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Javascript functions to be declared in HTML header</desc>
-   </doc>
-   <xsl:template name="includeJavascript">
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[html] Write out some Javascript into the HTML</p>
-         <p>Note that it does not have to commented if the output is
-    XHTML</p>
-         <param name="content">The code</param>
-      </desc>
-   </doc>
-  <xsl:template name="writeJavascript">
-      <xsl:param name="content"/>
-      <script type="text/javascript">
-	<xsl:value-of select="$content"/>
-      </script>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Make contents of left-hand column<param name="currentID">currentID</param>
-      </desc>
-   </doc>
-  <xsl:template name="leftHandFrame">
-      <xsl:param name="currentID"/>
-      <xsl:call-template name="makeSidebar"/>
-      <xsl:choose>
-         <xsl:when test="$currentID=''">
-            <xsl:call-template name="linkListContents">
-               <xsl:with-param name="style" select="'toclist'"/>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:choose>
-               <xsl:when test="count(id($currentID))&gt;0">
-                  <xsl:for-each select="id($currentID)">
-                     <xsl:call-template name="linkListContents">
-                        <xsl:with-param name="style" select="'toclist'"/>
-                     </xsl:call-template>
-                  </xsl:for-each>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:apply-templates mode="xpath" select="ancestor-or-self::tei:TEI/tei:text">
-                     <xsl:with-param name="xpath" select="$currentID"/>
-                     <xsl:with-param name="action" select="'toclist'"/>
-                  </xsl:apply-templates>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] bypass sidebar lists in normal mode</desc>
-   </doc>
-  <xsl:template match="tei:list[@type='sidebar']"/>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Summary links in left-hand column</desc>
-   </doc>
-  <xsl:template name="makeSidebar">
-      <xsl:for-each select="ancestor-or-self::tei:TEI/tei:text/tei:body/tei:list[@type='sidebar']">
-         <xsl:for-each select=".//tei:ref">
-            <p class="sidebar">
-               <a class="toclist" href="{@url}">
-                  <xsl:apply-templates/>
-               </a>
-            </p>
-         </xsl:for-each>
-      </xsl:for-each>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Summary table of contents in left-hand column<param name="style">style</param>
-      </desc>
-   </doc>
-  <xsl:template name="linkListContents">
-      <xsl:param name="style" select="'toc'"/>
-      <xsl:variable name="BaseFile">
-         <xsl:value-of select="$masterFile"/>
-         <xsl:call-template name="addCorpusID"/>
-      </xsl:variable>
-      <xsl:variable name="thisOne">
-         <xsl:value-of select="generate-id()"/>
-      </xsl:variable>
-      <xsl:for-each select="ancestor-or-self::tei:TEI/tei:text">
-      <!-- front matter -->
-      <xsl:for-each select="tei:front">
-	           <xsl:if test="tei:div1|tei:div">
-	              <div class="tocFront">
-	                 <xsl:element name="{$tocContainerElement}">
-	                    <xsl:attribute name="class">
-		                      <xsl:text>tocContainer</xsl:text>
-	                    </xsl:attribute>
-	                    <xsl:call-template name="tocSection">
-		                      <xsl:with-param name="id" select="$thisOne"/>
-		                      <xsl:with-param name="style" select="$style"/>
-	                    </xsl:call-template>
-	                 </xsl:element>
-	              </div>
-	           </xsl:if>
-         </xsl:for-each>
-         <!-- body matter -->
-      <xsl:for-each select="tei:body">
-	           <xsl:if test="tei:div1|tei:div">
-	              <div class="tocBody">
-	                 <xsl:comment>start TOC</xsl:comment>
-	                 <xsl:element name="{$tocContainerElement}">
-	                    <xsl:attribute name="class">
-		                      <xsl:text>tocContainer</xsl:text>
-	                    </xsl:attribute>
-	                    <xsl:comment>TOC components</xsl:comment>
-	                    <xsl:call-template name="tocSection">
-		                      <xsl:with-param name="id" select="$thisOne"/>
-		                      <xsl:with-param name="style" select="$style"/>
-	                    </xsl:call-template>
-	                 </xsl:element>
-	              </div>
-	           </xsl:if>
-         </xsl:for-each>
-         <!-- back matter -->
-      <xsl:for-each select="tei:back">
-	           <xsl:if test="tei:div1|tei:div">
-	              <div class="tocBack">
-	                 <xsl:element name="{$tocContainerElement}">
-	                    <xsl:attribute name="class">
-		                      <xsl:text>tocContainer</xsl:text>
-	                    </xsl:attribute>
-	                    <xsl:call-template name="tocSection">
-		                      <xsl:with-param name="id" select="$thisOne"/>
-		                      <xsl:with-param name="style" select="$style"/>
-	                    </xsl:call-template>
-	                 </xsl:element>
-	              </div>
-	           </xsl:if>
-         </xsl:for-each>
-      </xsl:for-each>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Main page in right-hand column<param name="currentID">currentID</param>
-      </desc>
-   </doc>
-  <xsl:template name="mainFrame">
-      <xsl:param name="currentID"/>
-      <xsl:param name="minimal">false</xsl:param>
-      <xsl:choose>
-         <xsl:when test="$currentID='current'">
-            <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:when test="$currentID='' and number($splitLevel)=-1">
-            <xsl:apply-templates/>
-         </xsl:when>
-         <xsl:when test="self::teiCorpus.2">
-            <xsl:call-template name="corpusBody"/>
-         </xsl:when>
-         <xsl:when test="$currentID=''">
-        <!-- we need to locate the first interesting object in the file, ie
-	     the first grandchild of <text > -->
-        <xsl:for-each select=" descendant-or-self::tei:TEI/tei:text/tei:*[1]/*[1]">
-               <xsl:apply-templates mode="paging" select="."/>
-               <xsl:if test="$autoToc='true'">
-                  <xsl:if test="following-sibling::tei:div/tei:head">
-                     <xsl:call-template name="contentsHeading"/>
-                     <ul class="toc">
-                        <xsl:apply-templates mode="maketoc" select="following-sibling::tei:div">
-                           <xsl:with-param name="forcedepth" select="'0'"/>
-                        </xsl:apply-templates>
-                     </ul>
-                  </xsl:if>
-               </xsl:if>
-            </xsl:for-each>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:choose>
-               <xsl:when test="count(id($currentID))&gt;0">
-                  <xsl:for-each select="id($currentID)">
-                     <h2>
-                        <xsl:apply-templates mode="xref" select="."/>
-			<xsl:call-template name="sectionHeadHook"/>
-                     </h2>
-		     <xsl:if test="$topNavigationPanel='true'">
-		       <xsl:call-template name="xrefpanel">
-			 <xsl:with-param name="homepage" select="concat($masterFile,$standardSuffix)"/>
-			 <xsl:with-param name="mode" select="local-name(.)"/>
-		       </xsl:call-template>
-		     </xsl:if>
-                     <xsl:call-template name="doDivBody"/>
-                     <xsl:if test="$bottomNavigationPanel='true'">
-                        <xsl:call-template name="xrefpanel">
-                           <xsl:with-param name="homepage" select="concat($masterFile,$standardSuffix)"/>
-                           <xsl:with-param name="mode" select="local-name(.)"/>
-                        </xsl:call-template>
-                     </xsl:if>
-                  </xsl:for-each>
-               </xsl:when>
-               <xsl:otherwise>
-            <!-- the passed ID is a pseudo-XPath expression
-		 which starts below TEI/tei:text.
-		 The real XPath syntax is changed to avoid problems
-	    -->
-            <xsl:choose>
-                     <xsl:when test="ancestor-or-self::tei:TEI/tei:group/tei:text">
-                        <xsl:apply-templates mode="xpath" select="ancestor-or-self::tei:TEI/tei:group/tei:text">
-                           <xsl:with-param name="xpath" select="$currentID"/>
-                        </xsl:apply-templates>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <xsl:apply-templates mode="xpath" select="ancestor-or-self::tei:TEI/tei:text">
-                           <xsl:with-param name="xpath" select="$currentID"/>
-                        </xsl:apply-templates>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:if test="$minimal='false'">
-	<xsl:call-template name="partialFootNotes">
-	  <xsl:with-param name="currentID" select="$currentID"/>
-	</xsl:call-template>
-	<xsl:call-template name="stdfooter"/>
-      </xsl:if>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Table of contents       </desc>
-   </doc>
-  <xsl:template name="mainTOC">
-      <xsl:choose>
-	<xsl:when test="self::tei:teiCorpus">
-	  <ul class="toc toc_corpus">
-	    <xsl:for-each select="tei:TEI">
-	      <li>
-		<a>
-                  <xsl:attribute name="href">
-		    <xsl:apply-templates mode="generateLink" select="."/>
-                  </xsl:attribute>
-                  <xsl:call-template name="header">
-		    <xsl:with-param name="minimal">false</xsl:with-param>
-		    <xsl:with-param name="display">plain</xsl:with-param>
-                  </xsl:call-template>
-		</a>
-	      </li>
-	    </xsl:for-each>
-	  </ul>
-	</xsl:when>
-	<xsl:when
-	    test="ancestor-or-self::tei:TEI/tei:text/tei:group and
-		  $splitLevel=0">
-	  <xsl:for-each
-	      select="ancestor-or-self::tei:TEI/tei:text/tei:front">
-	       <xsl:call-template name="partTOC">
-		 <xsl:with-param name="part">front</xsl:with-param>
-	       </xsl:call-template>
-	  </xsl:for-each>
-	  
-	  <xsl:for-each
-	      select="ancestor-or-self::tei:TEI/tei:text/tei:group">
-	    <xsl:call-template name="groupTOC"/>
-	  </xsl:for-each>
-
-	  <xsl:for-each
-	      select="ancestor-or-self::tei:TEI/tei:text/tei:back">
-	    <xsl:call-template name="partTOC">
-	      <xsl:with-param name="part">back</xsl:with-param>
-	    </xsl:call-template>
-	  </xsl:for-each>
-	</xsl:when>
-	
-	<xsl:when
-	    test="ancestor-or-self::tei:TEI/tei:text/tei:group">	  
-	  <xsl:for-each
-	      select="ancestor-or-self::tei:TEI/tei:text/tei:group/tei:text">
-	    <h3>
-	      <xsl:number/>
-	      <xsl:choose>
-		<xsl:when test="tei:body/tei:head">
-		  <xsl:text>. </xsl:text>
-		  <xsl:apply-templates select="tei:body/tei:head" mode="plain"/>
-		</xsl:when>
-		<xsl:when
-		    test="tei:front/tei:titlePage//tei:title">
-		  <xsl:apply-templates select="tei:front/tei:titlePage//tei:title[1]" mode="plain"/>
-		</xsl:when>
-	      </xsl:choose>
-	    </h3>
-	    <xsl:for-each select="tei:front">
-	      <xsl:call-template name="partTOC">
-		<xsl:with-param name="part">front</xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:for-each>
-	    
-	    <xsl:for-each select="tei:body">
-	      <xsl:call-template name="partTOC">
-		<xsl:with-param name="part">body</xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:for-each>
-	    
-	    <xsl:for-each select="tei:back">
-	      <xsl:call-template name="partTOC">
-		<xsl:with-param name="part">back</xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:for-each>
-	    
-	  </xsl:for-each>
-	  
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:if test="$tocFront">
-	    <xsl:for-each select="ancestor-or-self::tei:TEI/tei:text/tei:front">
-	      <xsl:call-template name="partTOC">
-		<xsl:with-param name="part">front</xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:for-each>
-	  </xsl:if>
-	  
-	  <xsl:for-each select="ancestor-or-self::tei:TEI/tei:text/tei:body">
-	    <xsl:call-template name="partTOC">
-	      <xsl:with-param name="part">body</xsl:with-param>
-	    </xsl:call-template>
-	  </xsl:for-each>
-	  
-	  <xsl:if test="$tocBack">
-	    <xsl:for-each select="ancestor-or-self::tei:TEI/tei:text/tei:back">
-	      <xsl:call-template name="partTOC">
-		<xsl:with-param name="part">back</xsl:with-param>
-	      </xsl:call-template>
-	    </xsl:for-each>
-	  </xsl:if>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[html] </p>
-	 <p xmlns="http://www.w3.org/1999/xhtml"> make table of
-	 contents for nested texts/groups</p>
-      </desc>
-   </doc>
-    <xsl:template name="groupTOC">
-      <xsl:variable name="gDepth"
-		    select="count(ancestor::tei:group)"/>
-      <ul class="toc toc_group{$gDepth}">	    	   
-	<li>
-	  <xsl:if test="not($autoHead='true') and not(tei:head or tei:body/tei:head or @n)">
-	    <xsl:attribute
-		name="class">headless</xsl:attribute>
-	  </xsl:if>
-	  <ul>
-	    <xsl:for-each select="tei:text">
-	      <li>
-		
-		<xsl:call-template name="header">
-		  <xsl:with-param name="toc">
-		    <xsl:apply-templates mode="generateLink" select="."/>
-		  </xsl:with-param>
-		  <xsl:with-param name="minimal">false</xsl:with-param>
-		  <xsl:with-param name="display">plain</xsl:with-param>
-		</xsl:call-template>
-		
-		<xsl:for-each select="tei:front">
-		  <xsl:if
-		      test="tei:titlePage/tei:docTitle/tei:titlePart">
-		    <span>
-		      <xsl:apply-templates
-			  select="tei:titlePage/tei:docTitle/tei:titlePart"
-			  mode="plain"/>
-		    </span>
-		  </xsl:if>
-		  <xsl:call-template name="partTOC">
-		    <xsl:with-param name="part">front</xsl:with-param>
-		  </xsl:call-template>
-		</xsl:for-each>
-		
-		<xsl:for-each select="tei:group">
-		  <xsl:call-template name="groupTOC"/>
-		</xsl:for-each>
-		
-		<xsl:for-each select="tei:body">
-		  <xsl:call-template name="partTOC">
-		    <xsl:with-param name="part">body</xsl:with-param>
-		  </xsl:call-template>
-		</xsl:for-each>
-		
-		<xsl:for-each select="tei:back">
-		  <xsl:call-template name="partTOC">
-		    <xsl:with-param name="part">back</xsl:with-param>
-		  </xsl:call-template>
-		</xsl:for-each>
-	      </li>
-	    </xsl:for-each>
-	    <xsl:for-each select="tei:group">
-	      <li>
-		<xsl:call-template name="groupTOC"/>
-	      </li>
-	    </xsl:for-each>
-	</ul>
-      </li>
-      </ul>
-    </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[html] </p>
-	 <p xmlns="http://www.w3.org/1999/xhtml"> make partial
-	    table of contents         </p>
-      </desc>
-   </doc>
-  <xsl:template name="partTOC">
-      <xsl:param name="part"/>
-      <xsl:param name="force"/>
-      <xsl:if test="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6">
-         <ul class="toc{$force} toc_{$part}">
-	   <xsl:apply-templates mode="maketoc"
-				select="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6">
-	              <xsl:with-param name="forcedepth" select="$force"/>
-	   </xsl:apply-templates>
-         </ul>
-      </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>
-         <p>[html] </p>
-         <p>
-            <p xmlns="http://www.w3.org/1999/xhtml"> xref to previous and last sections </p>
-         </p>
-      </desc>
-   </doc>
-  <xsl:template name="nextLink">
-      <xsl:variable name="myName">
-         <xsl:value-of select="local-name(.)"/>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="following-sibling::tei:TEI">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:TEI[1]"/>
-         </xsl:when>
-         <xsl:when test="following-sibling::tei:div[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:div[1]"/>
-         </xsl:when>
-         <xsl:when test="parent::tei:body/following-sibling::tei:back/tei:div[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink"
-                                 select="parent::tei:body/following-sibling::tei:back/tei:div[1]"/>
-         </xsl:when>
-         <xsl:when test="parent::tei:front/following-sibling::tei:body/tei:div[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink"
-                                 select="parent::tei:front/following-sibling::tei:body/tei:div[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div1' and following-sibling::tei:div1[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:div1[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div2' and following-sibling::tei:div2[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:div2[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div3' and following-sibling::tei:div3[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:div3[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div4' and following-sibling::tei:div4[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:div4[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div5' and following-sibling::tei:div5[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:div5[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div6' and following-sibling::tei:div6[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generateNextLink" select="following-sibling::tei:div6[1]"/>
-         </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Generate name for a chunk of output<param name="ident">ident</param>
-      </desc>
-   </doc>
-  <xsl:template name="outputChunkName">
-      <xsl:param name="ident"/>
-      <xsl:choose>
-        <xsl:when test="not($outputDir ='')">
-            <xsl:value-of select="$outputDir"/>
-            <xsl:if test="not(substring($outputDir,string-length($outputDir),string-length($outputDir))='/')">
-               <xsl:text>/</xsl:text>
-            </xsl:if>
-        </xsl:when>
-      </xsl:choose>
-      <xsl:value-of select="$ident"/>
-      <xsl:value-of select="$outputSuffix"/>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Make a new page using CSS layout <param name="currentID">current ID</param>
-      </desc>
-   </doc>
-  <xsl:template name="pageLayoutCSS">
-      <xsl:param name="currentID"/>
-      <html>
-         <xsl:call-template name="addLangAtt"/>
-         <xsl:comment>THIS FILE IS GENERATED FROM AN XML MASTER. DO NOT EDIT (4)</xsl:comment>
-         <xsl:text>&#10;</xsl:text>
-         <head>
-	   <xsl:variable name="pagetitle">
-	     <xsl:choose>
-	       <xsl:when test="$currentID=''">
-		 <xsl:call-template name="generateTitle"/>
-	       </xsl:when>
-	       <xsl:otherwise>
-		 <xsl:choose>
-		   <xsl:when test="$currentID='current'">
-		     <xsl:apply-templates mode="xref" select="."/>
-		   </xsl:when>
-		   <xsl:when test="count(id($currentID))&gt;0">
-		     <xsl:for-each select="id($currentID)">
-		       <xsl:apply-templates mode="xref" select="."/>
-		     </xsl:for-each>
-		   </xsl:when>
-		   <xsl:otherwise>
-		     <xsl:apply-templates mode="xpath" select="descendant::text">
-		       <xsl:with-param name="xpath" select="$currentID"/>
-		       <xsl:with-param name="action" select="'header'"/>
-		     </xsl:apply-templates>
-		   </xsl:otherwise>
-		 </xsl:choose>
-		 <xsl:text> - </xsl:text>
-		 <xsl:call-template name="generateTitle"/>
-	       </xsl:otherwise>
-	     </xsl:choose>
-	   </xsl:variable>
-	   <title>
-	     <xsl:value-of select="$htmlTitlePrefix"/>
-	     <xsl:text> </xsl:text>
-	     <xsl:value-of select="$pagetitle"/>
-	   </title>
-	   <link href="/favicon.ico" rel="icon" type="image/x-icon"/>
-	   <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
-	   <xsl:call-template name="headHook"/>
-	   <xsl:call-template name="metaHTML">
-	     <xsl:with-param name="title" select="$pagetitle"/>
-	   </xsl:call-template>
-	   <xsl:call-template name="includeCSS"/>
-	   <xsl:call-template name="cssHook"/>
-	   <xsl:call-template name="includeJavascript"/>
-	   <xsl:call-template name="javascriptHook"/>
-         </head>
-         <body>
-	   <xsl:copy-of select="tei:text/tei:body/@unload"/>
-	   <xsl:copy-of select="tei:text/tei:body/@onunload"/>
-	   <xsl:call-template name="bodyMicroData"/>
-	   <xsl:call-template name="bodyJavascriptHook"/>
-	   <xsl:call-template name="bodyHook"/>
-	   <xsl:call-template name="mainPage">
-	     <xsl:with-param name="currentID">
-	       <xsl:value-of select="$currentID"/>
-	     </xsl:with-param>
-	   </xsl:call-template>
-	   <xsl:call-template name="bodyEndHook"/>
-         </body>
-      </html>
-  </xsl:template>
-  
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] the main page structure</desc>
-   </doc>
-  <xsl:template name="mainPage">
-      <xsl:param name="currentID"/>
-      <!-- header -->
-    <div id="hdr">
-         <xsl:call-template name="hdr"/>
-      </div>
-      <div id="accessibility">
-         <span class="tocontent">
-            <a href="{$REQUEST}?style=text">Text only</a>
-      | <a class="skiplinks" href="#rh-col" title="Go to main page content">Skip links</a>
-         </span>
-      </div>
-      <div id="hdr2">
-         <xsl:call-template name="hdr2"/>
-      </div>
-      <xsl:if test="not($contentStructure='all' or @rend='all')">
-         <div id="hdr3">
-	           <xsl:call-template name="hdr3"/>
-         </div>
-      </xsl:if>
-      <xsl:choose>
-         <xsl:when test="$contentStructure='all' or @rend='all'">
-	           <div class="column-wrapper">
-	              <xsl:call-template name="col1"/>
-	              <xsl:call-template name="col2"/>
-	              <xsl:call-template name="col3"/>
-	           </div>
-         </xsl:when>
-         <xsl:when test="@rend='frontpage'">
-	           <div class="column-wrapper">
-	              <div id="rh-col">
-	                 <xsl:for-each select="descendant-or-self::tei:TEI/tei:text/tei:body">
-	                    <xsl:apply-templates/>
-	                 </xsl:for-each>
-	              </div>
-	              <div id="lh-col">
-	                 <xsl:for-each select="descendant-or-self::tei:TEI/tei:text/tei:front">
-	                    <xsl:apply-templates/>
-	                 </xsl:for-each>
-	              </div>
-	           </div>
-         </xsl:when>
-         <xsl:when test="$contentStructure='body'">
-	           <xsl:call-template name="bodyLayout">
-	              <xsl:with-param name="currentID" select="$currentID"/>
-	           </xsl:call-template>
-         </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] what to do in column 1 of 3 column arrangement </desc>
-   </doc>
-  <xsl:template name="col1">
-      <div id="col1">
-         <xsl:for-each select="descendant-or-self::tei:TEI/tei:text/tei:front">
-            <xsl:apply-templates/>
-         </xsl:for-each>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] what to do in column 2 of 3 column arrangement </desc>
-   </doc>
-  <xsl:template name="col2">
-      <div id="col2">
-         <xsl:for-each select="descendant-or-self::tei:TEI/tei:text/tei:body">
-            <xsl:apply-templates/>
-         </xsl:for-each>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] what to do in column 3 of 3 column arrangement </desc>
-   </doc>
-  <xsl:template name="col3">
-      <div id="col3">
-         <xsl:for-each select="descendant-or-self::tei:TEI/tei:text/tei:back">
-            <xsl:apply-templates/>
-         </xsl:for-each>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] arrangment of page as HTML divs <param name="currentID">currentID</param>
-      </desc>
-   </doc>
-  <xsl:template name="bodyLayout">
-      <xsl:param name="currentID"/>
-      <div class="column-wrapper">
-         <div id="lh-col">
-            <div id="lh-col-top">
-               <xsl:comment>top of left-hand column</xsl:comment>
-               <xsl:call-template name="lh-col-top"/>
-            </div>
-            <div id="lh-col-bottom">
-               <xsl:comment>bottom of left-hand column</xsl:comment>
-               <xsl:call-template name="lh-col-bottom">
-                  <xsl:with-param name="currentID" select="$currentID"/>
-               </xsl:call-template>
-            </div>
-         </div>
-         <div id="rh-col">
-	   <div id="rh-col-top">
-	     <xsl:comment>top of right-hand column</xsl:comment>
-	     <xsl:call-template name="rh-col-top"/>
-            </div>
-            <div id="rh-col-bottom">
-               <xsl:comment>bottom of right-hand column</xsl:comment>
-               <xsl:call-template name="rh-col-bottom">
-                  <xsl:with-param name="currentID" select="$currentID"/>
-               </xsl:call-template>
-            </div>
-         </div>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Generate a page using simple layout </desc>
-   </doc>
-  <xsl:template name="pageLayoutSimple">
-      <html>
-         <xsl:call-template name="addLangAtt"/>
-         <xsl:call-template name="htmlFileTop"/>
-         <body class="simple" id="TOP">
-	   <xsl:copy-of select="tei:text/tei:body/@unload"/>
-	   <xsl:copy-of select="tei:text/tei:body/@onunload"/>
-	   <xsl:call-template name="bodyMicroData"/>
-	   <xsl:call-template name="bodyJavascriptHook"/>
-	   <xsl:call-template name="bodyHook"/>
-	   <xsl:if test="not(tei:text/tei:front/tei:titlePage)">
-	     <div class="stdheader">
-	       <xsl:call-template name="stdheader">
-		 <xsl:with-param name="title">
-		   <xsl:call-template name="generateTitle"/>
-		 </xsl:with-param>
-	       </xsl:call-template>
-	     </div>
-	   </xsl:if>
-	    <xsl:comment> front matter </xsl:comment>
-	    <xsl:apply-templates select="tei:text/tei:front"/>
-	    <xsl:if test="$autoToc='true' and (descendant::tei:div or descendant::tei:div1) and not(descendant::tei:divGen[@type='toc'])">
-	      <h2>
-		<xsl:call-template name="i18n">
-		  <xsl:with-param name="word">tocWords</xsl:with-param>
-		</xsl:call-template>
-	      </h2>
-	      <xsl:call-template name="mainTOC"/>
-	    </xsl:if>
-	    <xsl:choose>
-	      <xsl:when test="tei:text/tei:group">
-		<xsl:apply-templates select="tei:text/tei:group"/>
-	      </xsl:when>
-	      <xsl:when test="@rend='multicol'">
-		<table>
-		  <tr>
-		    <xsl:apply-templates select="tei:text/tei:body"/>
-		  </tr>
-		</table>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:comment>body matter </xsl:comment>
-		<xsl:call-template name="startHook"/>
-		<xsl:variable name="ident">
-		  <xsl:apply-templates mode="ident" select="."/>
-		</xsl:variable>
-		<xsl:apply-templates select="tei:text/tei:body"/>
-	      </xsl:otherwise>
-	    </xsl:choose>
-	    <xsl:comment>back matter </xsl:comment>
-	    <xsl:apply-templates select="tei:text/tei:back"/>
-            <xsl:call-template name="printNotes"/>
-            <xsl:call-template name="htmlFileBottom"/>
-            <xsl:call-template name="bodyEndHook"/>
-         </body>
-      </html>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Generate a page using table layout<param name="currentID">currentID</param>
-      </desc>
-   </doc>
-  <xsl:template name="pageLayoutTable">
-      <xsl:param name="currentID"/>
-      <html>
-         <xsl:call-template name="addLangAtt"/>
-         <xsl:comment>THIS FILE IS GENERATED FROM AN XML MASTER. DO NOT EDIT (1)</xsl:comment>
-         <xsl:text>&#10;</xsl:text>
-         <head>
-            <xsl:variable name="pagetitle">
-               <xsl:choose>
-                  <xsl:when test="$currentID=''">
-                     <xsl:call-template name="generateTitle"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                     <xsl:call-template name="generateTitle"/>: <xsl:choose>
-                        <xsl:when test="count(id($currentID))&gt;0">
-                           <xsl:for-each select="id($currentID)">
-                              <xsl:apply-templates mode="xref" select="."/>
-                           </xsl:for-each>
-                        </xsl:when>
-                        <xsl:otherwise>
-                           <xsl:apply-templates mode="xpath" select="descendant-or-self::tei:TEI/tei:text">
-                              <xsl:with-param name="xpath" select="$currentID"/>
-                              <xsl:with-param name="action" select="'header'"/>
-                           </xsl:apply-templates>
-                        </xsl:otherwise>
-                     </xsl:choose>
-                  </xsl:otherwise>
-               </xsl:choose>
-            </xsl:variable>
-            <title>
-               <xsl:value-of select="$htmlTitlePrefix"/>
-               <xsl:value-of select="$pagetitle"/>
-            </title>
-            <link href="/favicon.ico" rel="icon" type="image/x-icon"/>
-            <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon"/>
-            <xsl:call-template name="headHook"/>
-            <xsl:call-template name="metaHTML">
-               <xsl:with-param name="title" select="$pagetitle"/>
-            </xsl:call-template>
-            <xsl:call-template name="includeCSS"/>
-            <xsl:call-template name="cssHook"/>
-            <xsl:call-template name="includeJavascript"/>
-            <xsl:call-template name="javascriptHook"/>
-         </head>
-         <body class="pagetable">
-            <xsl:call-template name="bodyMicroData"/>
-            <xsl:call-template name="bodyJavascriptHook"/>
-	    <xsl:call-template name="bodyHook"/>
-            <xsl:call-template name="pageHeader">
-               <xsl:with-param name="mode">table</xsl:with-param>
-            </xsl:call-template>
-            <xsl:call-template name="pageLayoutTableBody">
-               <xsl:with-param name="currentID" select="$currentID"/>
-            </xsl:call-template>
-            <xsl:call-template name="bodyEndHook"/>
-         </body>
-      </html>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] The page body, when using table layout<param name="currentID">currentID</param>
-      </desc>
-   </doc>
-  <xsl:template name="pageLayoutTableBody">
-      <xsl:param name="currentID"/>
-      <table>
-         <tr>
-            <td class="hdr" colspan="2">
-               <xsl:call-template name="hdr"/>
-            </td>
-         </tr>
-         <tr>
-            <td class="hdr2" colspan="2">
-               <xsl:call-template name="hdr2"/>
-            </td>
-         </tr>
-         <tr>
-            <td class="hdr3" colspan="2">
-               <xsl:call-template name="hdr3"/>
-            </td>
-         </tr>
-         <tr>
-            <td align="left" class="sidetext" rowspan="2" valign="top" width="{$linksWidth}">
-               <xsl:call-template name="searchbox"/>
-               <xsl:call-template name="leftHandFrame">
-                  <xsl:with-param name="currentID" select="$requestedID"/>
-               </xsl:call-template>
-            </td>
-         </tr>
-         <tr>
-            <td class="maintext" colspan="2" valign="top">
-               <xsl:call-template name="mainFrame">
-                  <xsl:with-param name="currentID" select="$currentID"/>
-               </xsl:call-template>
-            </td>
-         </tr>
-      </table>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="previousLink">
-      <xsl:variable name="myName">
-         <xsl:value-of select="local-name(.)"/>
-      </xsl:variable>
-      <xsl:choose>
-         <xsl:when test="preceding-sibling::tei:TEI">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:TEI[1]"/>
-         </xsl:when>
-         <xsl:when test="preceding-sibling::tei:div[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:div[1]"/>
-         </xsl:when>
-         <xsl:when test="parent::tei:body/preceding-sibling::tei:front/tei:div[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink"
-                                 select="parent::tei:body/preceding-sibling::tei:front/tei:div[last()]"/>
-         </xsl:when>
-         <xsl:when test="parent::tei:back/preceding-sibling::tei:body/tei:div[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink"
-                                 select="parent::tei:body/preceding-sibling::tei:body/tei:div[last()]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div1' and preceding-sibling::tei:div1[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:div1[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div2' and preceding-sibling::tei:div2[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:div2[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div3' and preceding-sibling::tei:div3[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:div3[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div4' and preceding-sibling::tei:div4[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:div4[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div5' and preceding-sibling::tei:div5[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:div5[1]"/>
-         </xsl:when>
-         <xsl:when test="$myName='div6' and preceding-sibling::tei:div6[tei:head or $autoHead='true']">
-            <xsl:apply-templates mode="generatePreviousLink" select="preceding-sibling::tei:div6[1]"/>
-         </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-  <xsl:template name="simpleBody">
-    <xsl:choose>
-      <xsl:when test="tei:text/tei:group">
-	<xsl:apply-templates select="tei:text/tei:group"/>
-      </xsl:when>
-       <xsl:when test="$filePerPage='true'">
-	 <xsl:variable name="pass1">	 
-	   <xsl:apply-templates select="tei:text/*"/>
-	 </xsl:variable>
-	 <xsl:choose>
-	   <xsl:when test="not($pass1/html:PAGEBREAK)">
-	     <xsl:for-each-group select="$pass1/*"
-				 group-ending-with="*[(position() mod 40) = 0]">
-	       <xsl:call-template name="pageperfile">
-		 <xsl:with-param name="page">
-		   <xsl:text>page</xsl:text>
-		   <xsl:value-of select="position()"/>
-		 </xsl:with-param>
-	       </xsl:call-template>
-	     </xsl:for-each-group>
-	   </xsl:when>
-	   <xsl:otherwise>
-	     <xsl:for-each-group select="$pass1/*"
-				 group-starting-with="html:PAGEBREAK">
-	       <xsl:choose>
-		 <xsl:when test="self::html:PAGEBREAK">
-		   <xsl:call-template name="pageperfile">
-		     <xsl:with-param name="page" select="self::html:PAGEBREAK/@name"/>
-		   </xsl:call-template>
-		 </xsl:when>
-		 <xsl:otherwise>
-		   <xsl:copy-of select="current-group()"/>
-		 </xsl:otherwise>
-	       </xsl:choose>
-	     </xsl:for-each-group>
-	   </xsl:otherwise>
-	 </xsl:choose>
-       </xsl:when>
-      <xsl:otherwise>
-    <!-- front matter -->
-    <xsl:apply-templates select="tei:text/tei:front"/>
-      <xsl:if test="$autoToc='true' and (descendant::tei:div or descendant::tei:div1) and not(descendant::tei:divGen[@type='toc'])">
-         <h2>
-            <xsl:call-template name="i18n">
-               <xsl:with-param name="word">tocWords</xsl:with-param>
-            </xsl:call-template>
-         </h2>
-         <xsl:call-template name="mainTOC"/>
-      </xsl:if>
-      <!-- main text -->
-	<xsl:apply-templates select="tei:text/tei:body"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <!-- back matter -->
-    <xsl:apply-templates select="tei:text/tei:back"/>
-      <xsl:call-template name="printNotes"/>
-  </xsl:template>
-
-  <xsl:template name="pageperfile">
-    <xsl:param name="page"/>
-    <xsl:variable name="outName">
-      <xsl:call-template name="outputChunkName">
-	<xsl:with-param name="ident">
-	  <xsl:value-of select="$page"/>
-	</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="$verbose='true'">
-      <xsl:message>Opening file <xsl:value-of select="$outName"/></xsl:message>
-    </xsl:if>
-    
-    <xsl:result-document href="{$outName}">
-      <html>
-	<xsl:call-template name="addLangAtt"/>
-	<head>
-	  <xsl:variable name="pagetitle">
-	    <xsl:call-template name="generateTitle"/>
-	    <xsl:text> page </xsl:text>
-	    <xsl:value-of select="$page"/>
-	  </xsl:variable>
-	  <title>
-	    <xsl:value-of select="$pagetitle"/>
-	  </title>
-	  <xsl:call-template name="headHook"/>
-	  <xsl:call-template name="metaHTML">
-	    <xsl:with-param name="title" select="$pagetitle"/>
-	  </xsl:call-template>
-	  <xsl:call-template name="includeCSS"/>
-	  <xsl:call-template name="cssHook"/>
-	  <xsl:call-template name="includeJavascript"/>
-	  <xsl:call-template name="javascriptHook"/>
-	</head>
-	<body>
-	  <xsl:apply-templates select="current-group()" mode="copy"/>
-	</body>
-      </html>
-    </xsl:result-document>
-    <xsl:if test="@facs">
-      <xsl:variable name="outNameFacs">
-	<xsl:call-template name="outputChunkName">
-	  <xsl:with-param name="ident">
-	    <xsl:value-of select="$page"/>
-	    <xsl:text>-facs</xsl:text>
-	  </xsl:with-param>
-	</xsl:call-template>
-      </xsl:variable>
-      <xsl:result-document href="{$outNameFacs}">
-	<html>
-	  <xsl:call-template name="addLangAtt"/>
-	  <head>
-	    <xsl:variable name="pagetitle">
-	      <xsl:call-template name="generateTitle"/>
-	      <xsl:text> page </xsl:text>
-	      <xsl:value-of select="$page"/>
-	      <xsl:text> (facsimile) </xsl:text>
-	    </xsl:variable>
-	    <title>
-	      <xsl:value-of select="$pagetitle"/>
-	    </title>
-	    <xsl:call-template name="headHook"/>
-	    <xsl:call-template name="metaHTML">
-	      <xsl:with-param name="title" select="$pagetitle"/>
-	    </xsl:call-template>
-	    <xsl:call-template name="includeCSS"/>
-	    <xsl:call-template name="cssHook"/>
-	    <xsl:call-template name="includeJavascript"/>
-	    <xsl:call-template name="javascriptHook"/>
-	  </head>
-	  <body style="margin:0;padding:0">
-	    <p><img src="{@facs}" class="fullpage" alt="page facsimile"/></p>
-	  </body>
-	</html>
-      </xsl:result-document>      
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="html:PAGEBREAK" mode="copy"/>
-  <xsl:template match="html:*" mode="copy">
-    <xsl:copy-of select="."/>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="stdfooter">
-      <xsl:param name="style" select="'plain'"/>
-      <xsl:param name="file"/>
-      <xsl:variable name="date">
-         <xsl:call-template name="generateDate"/>
-      </xsl:variable>
-      <xsl:variable name="author">
-         <xsl:call-template name="generateAuthor"/>
-      </xsl:variable>
-      <div class="stdfooter">
-         <xsl:if test="$linkPanel='true'">
-            <div class="footer">
-               <xsl:if test="not($parentURL='')">
-                  <a class="{$style}" href="{$parentURL}">
-                     <xsl:value-of select="$parentWords"/>
-                  </a> | </xsl:if>
-               <a class="{$style}" href="{$homeURL}">
-                  <xsl:value-of select="$homeWords"/>
-               </a>
-               <xsl:if test="$searchURL">
-		 <xsl:text>| </xsl:text>
-		 <a class="{$style}" href="{$searchURL}">
-		   <xsl:call-template name="i18n">
-		     <xsl:with-param name="word">searchWords</xsl:with-param>
-		   </xsl:call-template>            
-		 </a>
-               </xsl:if>
-               <xsl:if test="$feedbackURL"> | <a class="{$style}" href="{$feedbackURL}">
-	       <xsl:call-template name="i18n">
-		 <xsl:with-param name="word">feedbackWords</xsl:with-param>
-	       </xsl:call-template>
-	     </a>
-               </xsl:if>
-            </div>
-         </xsl:if>
-         <xsl:call-template name="preAddressHook"/>
-         <address>
-            <xsl:if test="not($author='')">
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="$author"/>.
-      </xsl:if>
-            <xsl:call-template name="i18n">
-               <xsl:with-param name="word">dateWord</xsl:with-param>
-            </xsl:call-template>
-            <xsl:text>: </xsl:text>
-            <xsl:value-of select="$date"/>
-            <br/>
-            <xsl:call-template name="copyrightStatement"/>
-            <xsl:comment>
-               <xsl:text>
-	  Generated </xsl:text>
-               <xsl:if test="not($masterFile='index')">
-                  <xsl:text>from </xsl:text>
-                  <xsl:value-of select="$masterFile"/>
-               </xsl:if>
-               <xsl:text> using an XSLT version </xsl:text>
-               <xsl:value-of select="system-property('xsl:version')"/> stylesheet
-	  based on <xsl:value-of select="$teixslHome"/>
-	  processed using <xsl:value-of select="system-property('xsl:vendor')"/>
-	  on <xsl:call-template name="whatsTheDate"/>
-            </xsl:comment>
-         </address>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="title">title</param>
-      </desc>
-   </doc>
-  <xsl:template name="stdheader">
-      <xsl:param name="title">(no title)</xsl:param>
-      <xsl:choose>
-         <xsl:when test="$pageLayout='Simple'">
-	   <xsl:if test="not($institution='')">
-            <h2 class="institution">
-               <xsl:value-of select="$institution"/>
-            </h2>
-	   </xsl:if>
-	   <xsl:if test="not($department='')">
-            <h2 class="department">
-               <xsl:value-of select="$department"/>
-            </h2>
-	   </xsl:if>
-	   
-	   <xsl:call-template name="makeHTMLHeading">
-	     <xsl:with-param name="class">maintitle</xsl:with-param>
-	     <xsl:with-param name="text">
-	       <xsl:copy-of select="$title"/>
-	     </xsl:with-param>
-	     <xsl:with-param name="level">1</xsl:with-param>
-	   </xsl:call-template>
-	   
-	   <xsl:call-template name="makeHTMLHeading">
-	     <xsl:with-param name="class">subtitle</xsl:with-param>
-	     <xsl:with-param name="text">
-	       <xsl:call-template name="generateSubTitle"/>
-	     </xsl:with-param>
-	     <xsl:with-param name="level">2</xsl:with-param>
-	   </xsl:call-template>
-	   
-
-	   <xsl:if test="$showTitleAuthor='true'">
-	     <xsl:if test="$verbose='true'">
-	       <xsl:message>displaying author and date</xsl:message>
-	     </xsl:if>
-	     <xsl:call-template name="generateAuthorList"/>
-	     <xsl:call-template name="generateDate"/>
-	     <xsl:call-template name="generateEdition"/>
-	   </xsl:if>
-	 </xsl:when>
-	 <xsl:otherwise>
-	   <xsl:call-template name="makeHTMLHeading">
-	     <xsl:with-param name="class">maintitle</xsl:with-param>
-	     <xsl:with-param name="text">
-	       <xsl:value-of select="$title"/>
-	     </xsl:with-param>
-	     <xsl:with-param name="level">1</xsl:with-param>
-	   </xsl:call-template>
-	   
-	   <xsl:call-template name="makeHTMLHeading">
-	     <xsl:with-param name="class">subtitle</xsl:with-param>
-	     <xsl:with-param name="text">
-	       <xsl:call-template name="generateTitle"/>
-	     </xsl:with-param>
-	     <xsl:with-param name="level">2</xsl:with-param>
-	   </xsl:call-template>
-	   
-	   <xsl:if test="$showTitleAuthor='true'">
-	     <xsl:if test="$verbose='true'">
-	       <xsl:message>displaying author and date</xsl:message>
-	     </xsl:if>
-	     <xsl:call-template name="generateAuthorList"/>
-	     <xsl:call-template name="generateDate"/>
-	     <xsl:call-template name="generateEdition"/>
-	   </xsl:if>
-	 </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="subtoc">
-      <xsl:if test="child::tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6">
-         <xsl:variable name="parent">
-            <xsl:choose>
-               <xsl:when test="ancestor::tei:div">
-                  <xsl:apply-templates mode="ident" select="ancestor::tei:div[last()]"/>
-               </xsl:when>
-               <xsl:otherwise>
-                  <xsl:apply-templates mode="ident" select="."/>
-               </xsl:otherwise>
-            </xsl:choose>
-         </xsl:variable>
-         <xsl:variable name="depth">
-            <xsl:apply-templates mode="depth" select="."/>
-         </xsl:variable>
-         <p>
-            <span class="subtochead">
-               <xsl:call-template name="i18n">
-                  <xsl:with-param name="word">tocWords</xsl:with-param>
-               </xsl:call-template>
-            </span>
-         </p>
-         <div class="subtoc">
-            <ul class="subtoc">
-               <xsl:for-each select="tei:div|tei:div1|tei:div2|tei:div3|tei:div4|tei:div5|tei:div6">
-                  <xsl:variable name="innerdent">
-                     <xsl:apply-templates mode="generateLink" select="."/>
-                  </xsl:variable>
-                  <li class="subtoc">
-                     <xsl:call-template name="makeInternalLink">
-                        <xsl:with-param name="dest">
-                           <xsl:value-of select="$innerdent"/>
-                        </xsl:with-param>
-                        <xsl:with-param name="class">
-                           <xsl:value-of select="$class_subtoc"/>
-                        </xsl:with-param>
-                        <xsl:with-param name="body">
-                           <xsl:call-template name="header">
-		                            <xsl:with-param name="display">simple</xsl:with-param>
-		                         </xsl:call-template>
-                        </xsl:with-param>
-                     </xsl:call-template>
-                  </li>
-               </xsl:for-each>
-            </ul>
-         </div>
-      </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="summaryToc">
-      <div class="teidiv">
-         <p>Select headings on the left-hand side to see more explanation of the
-        links on the right.</p>
-         <table cellspacing="7">
-            <thead>
-               <tr>
-                  <th nowrap="nowrap"/>
-                  <th/>
-               </tr>
-            </thead>
-	    <tbody>
-            <xsl:for-each select="//tei:body/tei:div">
-               <xsl:text>&#10;</xsl:text>
-               <tr class="summaryline">
-                  <td align="right" class="summarycell" valign="top">
-                     <b>
-                        <a class="nolink">
-                           <xsl:attribute name="href">
-                              <xsl:apply-templates mode="generateLink" select="."/>
-                           </xsl:attribute>
-                           <xsl:value-of select="tei:head"/>
-                        </a>
-                     </b>
-                  </td>
-                  <td class="link" valign="top">
-                     <xsl:for-each select=".//xref|.//xptr">
-                        <xsl:if test="position() &gt; 1">
-                           <xsl:text>&#160;</xsl:text>
-                           <img alt="*" src="/images/dbluball.gif"/>
-                           <xsl:text> </xsl:text>
-                        </xsl:if>
-                        <span class="nowrap">
-                           <xsl:apply-templates select="."/>
-                        </span>
-                     </xsl:for-each>
-                  </td>
-               </tr>
-            </xsl:for-each>
-	    </tbody>
-         </table>
-      </div>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Make a TOC section <param name="style">CSS style to use</param>
-         <param name="id">ID to link to</param>
-         <param name="force">whether to force a TOC entry even if other rules
-      would normally prevent it</param>
-      </desc>
-   </doc>
-  <xsl:template name="tocSection">
-      <xsl:param name="style"/>
-      <xsl:param name="id"/>
-      <xsl:param name="force">false</xsl:param>
-      <xsl:choose>
-         <xsl:when test="tei:div1">
-            <xsl:for-each select="tei:div1[tei:head or $autoHead='true']">
-               <xsl:call-template name="tocEntry">
-                  <xsl:with-param name="style" select="$style"/>
-                  <xsl:with-param name="id" select="$id"/>
-               </xsl:call-template>
-            </xsl:for-each>
-         </xsl:when>
-         <xsl:when test="tei:div2 and (number($splitLevel) &gt;=1 or $force='true')">
-            <xsl:for-each select="tei:div2[tei:head or $autoHead='true']">
-               <xsl:call-template name="tocEntry">
-                  <xsl:with-param name="style" select="$style"/>
-                  <xsl:with-param name="id" select="$id"/>
-               </xsl:call-template>
-            </xsl:for-each>
-         </xsl:when>
-         <xsl:when test="tei:div3 and (number($splitLevel) &gt;=2 or $force='true')">
-            <xsl:for-each select="tei:div3[tei:head or $autoHead='true']">
-               <xsl:call-template name="tocEntry">
-                  <xsl:with-param name="style" select="$style"/>
-                  <xsl:with-param name="id" select="$id"/>
-               </xsl:call-template>
-            </xsl:for-each>
-         </xsl:when>
-         <xsl:when test="self::tei:div">
-            <xsl:variable name="depth">
-               <xsl:apply-templates mode="depth" select="."/>
-            </xsl:variable>
-            <xsl:if test="(number($splitLevel)&gt;number($depth)  or $force='true' or ancestor::tei:TEI/@rend='nosplit')">
-               <xsl:for-each select="tei:div[tei:head or $autoHead='true']">
-                  <xsl:call-template name="tocEntry">
-                     <xsl:with-param name="style" select="$style"/>
-                     <xsl:with-param name="id" select="$id"/>
-                  </xsl:call-template>
-               </xsl:for-each>
-            </xsl:if>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:for-each select="tei:div[tei:head or $autoHead='true']">
-               <xsl:call-template name="tocEntry">
-                  <xsl:with-param name="style" select="$style"/>
-                  <xsl:with-param name="id" select="$id"/>
-               </xsl:call-template>
-            </xsl:for-each>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] Make a TOC entry <param name="style">style</param>
-         <param name="id">id</param>
-      </desc>
-   </doc>
-  <xsl:template name="tocEntry">
-      <xsl:param name="style"/>
-      <xsl:param name="id"/>
-      <xsl:element name="{$tocElement}">
-         <xsl:attribute name="class">
-            <xsl:value-of select="$style"/>
-            <xsl:apply-templates mode="depth" select="."/>
-         </xsl:attribute>
-         <xsl:choose>
-            <xsl:when test="generate-id(.)=$id">
-               <span class="toclist-this">
-                  <xsl:call-template name="header">
-	                    <xsl:with-param name="display">simple</xsl:with-param>
-	                 </xsl:call-template>
-               </span>
-            </xsl:when>
-            <xsl:otherwise>
-               <a>
-                  <xsl:attribute name="class">
-                     <xsl:value-of select="$style"/>
-                  </xsl:attribute>
-                  <xsl:attribute name="href">
-                     <xsl:apply-templates mode="generateLink" select="."/>
-                  </xsl:attribute>
-                  <xsl:call-template name="header">
-		    <xsl:with-param name="display">simple</xsl:with-param>
-		  </xsl:call-template>
-               </a>
-            </xsl:otherwise>
-         </xsl:choose>
-         <xsl:text>&#10;</xsl:text>
-         <xsl:call-template name="tocSection">
-            <xsl:with-param name="style" select="$style"/>
-            <xsl:with-param name="id" select="$id"/>
-            <xsl:with-param name="force">
-               <xsl:if test="generate-id(.)=$id">true</xsl:if>
-            </xsl:with-param>
-         </xsl:call-template>
-      </xsl:element>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="topNavigation">
-      <xsl:if test="ancestor::teiCorpus">
-         <p class="{$alignNavigationPanel}">
-            <xsl:call-template name="nextLink"/>
-            <xsl:call-template name="previousLink"/>
-            <xsl:call-template name="upLink">
-               <xsl:with-param name="up" select="concat($masterFile,$standardSuffix)"/>
-               <xsl:with-param name="title">
-                  <xsl:call-template name="contentsWord"/>
-               </xsl:with-param>
-            </xsl:call-template>
-         </p>
-      </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="up">the link to which "Up" goes</param>
-         <param name="title">the text of the link</param>
-      </desc>
-   </doc>
-  <xsl:template name="upLink">
-      <xsl:param name="up"/>
-      <xsl:param name="title"/>
-      <xsl:if test="$up">
-         <span class="upLink">
-	           <xsl:text> </xsl:text>
-	           <xsl:call-template name="i18n">
-               <xsl:with-param name="word">upWord</xsl:with-param>
-            </xsl:call-template>
-	           <xsl:call-template name="navInterSep"/>
-         </span>
-         <a class="navigation">
-	           <xsl:choose>
-	              <xsl:when test="$title">
-	                 <xsl:attribute name="href">
-	                    <xsl:value-of select="$up"/>
-	                 </xsl:attribute>
-	                 <xsl:value-of select="$title"/>
-	              </xsl:when>
-	              <xsl:otherwise>
-	                 <xsl:attribute name="href">
-	                    <xsl:apply-templates mode="generateLink" select="$up"/>
-	                 </xsl:attribute>
-	                 <xsl:for-each select="$up">
-	                    <xsl:call-template name="headerLink">
-		                      <xsl:with-param name="minimal" select="$minimalCrossRef"/>
-	                    </xsl:call-template>
-	                 </xsl:for-each>
-	              </xsl:otherwise>
-	           </xsl:choose>
-         </a>
-      </xsl:if>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="path">path</param>
-         <param name="class">class</param>
-         <param name="whole">whole</param>
-      </desc>
-   </doc>
-  <xsl:template name="walkTree">
-      <xsl:param name="path"/>
-      <xsl:param name="class"/>
-      <xsl:param name="whole"/>
-      <xsl:choose>
-         <xsl:when test="contains($path,'/')">
-            <xsl:variable name="current">
-               <xsl:value-of select="substring-before($path,'/')"/>
-            </xsl:variable>
-            <xsl:variable name="rest">
-               <xsl:value-of select="substring-after($path,'/')"/>
-            </xsl:variable>
-            <xsl:call-template name="aCrumb">
-               <xsl:with-param name="crumbBody">
-                  <xsl:choose>
-                     <xsl:when test="$rest='index.xsp' and $requestedID=''">
-                        <xsl:value-of select="$current"/>
-                     </xsl:when>
-                     <xsl:when test="$rest='index.xml' and $requestedID=''">
-                        <xsl:value-of select="$current"/>
-                     </xsl:when>
-                     <xsl:otherwise>
-                        <a class="{$class}">
-			  <xsl:attribute name="href">
-			    <xsl:value-of select="$whole"/>
-			    <xsl:value-of select="$current"/>
-			    <xsl:text>/</xsl:text>
-			  </xsl:attribute>
-			  <xsl:value-of select="$current"/>
-                        </a>
-                     </xsl:otherwise>
-                  </xsl:choose>
-               </xsl:with-param>
-            </xsl:call-template>
-            <xsl:call-template name="walkTree">
-               <xsl:with-param name="class">
-                  <xsl:value-of select="$class"/>
-               </xsl:with-param>
-               <xsl:with-param name="path" select="$rest"/>
-               <xsl:with-param name="whole">
-	                 <xsl:value-of select="$whole"/>
-	                 <xsl:value-of select="$current"/>
-	                 <xsl:text>/</xsl:text>
-	              </xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:otherwise>
-            <xsl:if test="not($path='index.xsp' or $path='index.xml')">
-               <xsl:call-template name="aCrumb">
-                  <xsl:with-param name="crumbBody">
-                     <a class="{$class}">
-		       <xsl:attribute name="href">
-			 <xsl:value-of select="$whole"/>
-			 <xsl:value-of select="$path"/>
-		       </xsl:attribute>
-		       <xsl:value-of select="$path"/>
-                     </a>
-                  </xsl:with-param>
-               </xsl:call-template>
-            </xsl:if>
-         </xsl:otherwise>
-      </xsl:choose>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template name="writeDiv">
-      <xsl:variable name="BaseFile">
-         <xsl:value-of select="$masterFile"/>
-         <xsl:call-template name="addCorpusID"/>
-      </xsl:variable>
-      <html>
-         <xsl:call-template name="addLangAtt"/>
-         <xsl:comment>THIS IS A GENERATED FILE. DO NOT EDIT (2)</xsl:comment>
-         <head>
-            <xsl:variable name="pagetitle">
-               <xsl:call-template name="generateDivtitle"/>
-            </xsl:variable>
-            <title>
-               <xsl:value-of select="$pagetitle"/>
-            </title>
-            <xsl:call-template name="headHook"/>
-            <xsl:call-template name="metaHTML">
-               <xsl:with-param name="title" select="$pagetitle"/>
-            </xsl:call-template>
-            <xsl:call-template name="includeCSS"/>
-            <xsl:call-template name="cssHook"/>
-            <xsl:call-template name="includeJavascript"/>
-            <xsl:call-template name="javascriptHook"/>
-         </head>
-         <body id="TOP">
-            <xsl:call-template name="bodyMicroData"/>
-            <xsl:call-template name="bodyJavascriptHook"/>
-	    <xsl:call-template name="bodyHook"/>
-            <div class="teidiv">
-               <xsl:call-template name="stdheader">
-                  <xsl:with-param name="title">
-		    <xsl:call-template name="header"/>
-                  </xsl:with-param>
-               </xsl:call-template>
-               <xsl:if test="$topNavigationPanel='true'">
-                  <xsl:call-template name="xrefpanel">
-                     <xsl:with-param name="homepage" select="concat($BaseFile,$standardSuffix)"/>
-                     <xsl:with-param name="mode" select="local-name(.)"/>
-                  </xsl:call-template>
-               </xsl:if>
-               <xsl:if test="$subTocDepth &gt;= 0">
-                  <xsl:call-template name="subtoc"/>
-               </xsl:if>
-               <xsl:call-template name="startHook"/>
-               <xsl:call-template name="doDivBody"/>
-               <xsl:call-template name="printNotes"/>
-               <xsl:if test="$bottomNavigationPanel='true'">
-                  <xsl:call-template name="xrefpanel">
-                     <xsl:with-param name="homepage" select="concat($BaseFile,$standardSuffix)"/>
-                     <xsl:with-param name="mode" select="local-name(.)"/>
-                  </xsl:call-template>
-               </xsl:if>
-               <xsl:call-template name="stdfooter"/>
-	              <xsl:call-template name="bodyEndHook"/>
-            </div>
-         </body>
-      </html>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html]provide a class attribute and/or ID for each div <param name="depth">depth of section (1, 2 3, 4 etc)</param>
-      </desc>
-   </doc>
-  <xsl:template name="divClassAttribute">
-      <xsl:param name="depth"/>
-      <xsl:if test="@its:dir">
-	<xsl:attribute name="dir" select="@its:dir"/>
-      </xsl:if>
-      <xsl:attribute name="class">
-         <xsl:choose>
-	   <xsl:when test="@type">
-	     <xsl:value-of select="@type"/>
-	   </xsl:when>
-	   <xsl:otherwise>
-	     <xsl:text>teidiv</xsl:text>
-	     <xsl:value-of select="$depth"/>
-	   </xsl:otherwise>
-         </xsl:choose>
-         <xsl:if test="@rend">
-	   <xsl:text> </xsl:text>
-	   <xsl:value-of select="@rend"/>
-         </xsl:if>
-      </xsl:attribute>
-      <xsl:variable name="ident">
-         <xsl:apply-templates mode="ident" select="."/>
-      </xsl:variable>
-      <xsl:attribute name="id">
-         <xsl:value-of select="$ident"/>
-      </xsl:attribute>
-  </xsl:template>
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] <param name="homepage">homepage</param>
-         <param name="mode">mode</param>
-      </desc>
-   </doc>
-  <xsl:template name="xrefpanel">
-      <xsl:param name="homepage"/>
-      <xsl:param name="mode"/>
-      <p class="{$alignNavigationPanel}">
-	<xsl:call-template name="generateUpLink"/>
-	<xsl:if test="not(ancestor-or-self::tei:TEI[@rend='nomenu'])">
-	  <xsl:call-template name="previousLink"/>
-	  <xsl:call-template name="nextLink"/>
-	</xsl:if>
-      </p>
-  </xsl:template>
-
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl">
-      <desc>[html] </desc>
-   </doc>
-  <xsl:template match="tei:floatingText">
-      <div class="floatingText">
-	        <xsl:for-each select="tei:front">
-	           <div class="floatingText_front">
-	              <xsl:apply-templates/>
-	           </div>
-	        </xsl:for-each>
-	        <xsl:for-each select="tei:body">
-	           <div class="floatingText_body">
-	              <xsl:apply-templates/>
-	           </div>
-	        </xsl:for-each>
-	        <xsl:for-each select="tei:back">
-	           <div class="floatingText_back">
-	              <xsl:apply-templates/>
-	           </div>
-	        </xsl:for-each>
-      </div>
-  </xsl:template>
-
-  <xsl:template match="tei:trailer">
-      <div class="trailer">
-	<xsl:apply-templates/>
-      </div>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/add/data/xslt/tei/xhtml2/transcr.xsl b/add/data/xslt/tei/xhtml2/transcr.xsl
deleted file mode 100644
index e4da1ff08..000000000
--- a/add/data/xslt/tei/xhtml2/transcr.xsl
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a fo rng tei teix"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p>
-    TEI stylesheet
-    dealing  with elements from the
-    transcr module, making HTML output.
-      </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: transcr.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/add/data/xslt/tei/xhtml2/verse.xsl b/add/data/xslt/tei/xhtml2/verse.xsl
deleted file mode 100644
index 819481c7a..000000000
--- a/add/data/xslt/tei/xhtml2/verse.xsl
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns="http://www.w3.org/1999/xhtml" 
-                
-                xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-
-                xmlns:rng="http://relaxng.org/ns/structure/1.0"
-                xmlns:tei="http://www.tei-c.org/ns/1.0"
-                xmlns:teix="http://www.tei-c.org/ns/Examples"
-                xmlns:html="http://www.w3.org/1999/xhtml"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                exclude-result-prefixes="a fo rng tei teix"
-                version="2.0">
-  <doc xmlns="http://www.oxygenxml.com/ns/doc/xsl" scope="stylesheet" type="stylesheet">
-      <desc>
-         <p>
-    TEI stylesheet
-    dealing  with elements from the
-      verse module, making HTML output.
-      </p>
-         <p>This software is dual-licensed:
-
-1. Distributed under a Creative Commons Attribution-ShareAlike 3.0
-Unported License http://creativecommons.org/licenses/by-sa/3.0/ 
-
-2. http://www.opensource.org/licenses/BSD-2-Clause
-		
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-This software is provided by the copyright holders and contributors
-"as is" and any express or implied warranties, including, but not
-limited to, the implied warranties of merchantability and fitness for
-a particular purpose are disclaimed. In no event shall the copyright
-holder or contributors be liable for any direct, indirect, incidental,
-special, exemplary, or consequential damages (including, but not
-limited to, procurement of substitute goods or services; loss of use,
-data, or profits; or business interruption) however caused and on any
-theory of liability, whether in contract, strict liability, or tort
-(including negligence or otherwise) arising in any way out of the use
-of this software, even if advised of the possibility of such damage.
-</p>
-         <p>Author: See AUTHORS</p>
-         <p>Id: $Id: verse.xsl 9646 2011-11-05 23:39:08Z rahtz $</p>
-         <p>Copyright: 2011, TEI Consortium</p>
-      </desc>
-   </doc>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/app/Application.js b/app/Application.js
index 2d340823f..f28a016e4 100644
--- a/app/Application.js
+++ b/app/Application.js
@@ -75,34 +75,34 @@ Ext.define('EdiromOnline.Application', {
         if(editionParam !== null)
             me.activeEdition = editionParam;
         
-        Ext.Ajax.request({
-            url: 'data/xql/getEditionURI.xql',
-            async: false,
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getEditionURI.xql',
+            'GET', 
+            {
                 uri: me.activeEdition
-            },success: function(response){
-                this.activeEdition = response.responseText;
             },
-            scope: this
-        });
-        
+            Ext.bind(function(response){
+                this.activeEdition = response.responseText;
+            }, this),
+            2, // retries
+            false // async
+        );
+
         var workParam = me.getURLParameter('work');
         if(workParam !== null)
             me.activeWork = workParam;
         
-        Ext.Ajax.request({
-            url: 'data/xql/getWorkID.xql',
-            async: false,
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getWorkID.xql',
+            'GET', 
+            {
                 uri: me.activeEdition,
                 workId: me.activeWork
-            },success: function(response){
-                this.activeWork = response.responseText;
             },
-            scope: this
-        });
+            Ext.bind(function(response){
+                this.activeWork = response.responseText;
+            }, this),
+            2, // retries
+            false // async
+        );
         
         me.getController('PreferenceController').initPreferences(me.activeEdition);
         me.getController('LanguageController').initLangFile(me.activeEdition, 'de');
diff --git a/app/controller/AJAXController.js b/app/controller/AJAXController.js
index 6db90970b..94573d820 100644
--- a/app/controller/AJAXController.js
+++ b/app/controller/AJAXController.js
@@ -27,19 +27,45 @@ Ext.define('EdiromOnline.controller.AJAXController', {
         window.doAJAXRequest = Ext.bind(this.doAJAXRequest, this);
     },
 
-    doAJAXRequest: function(url, method, params, successFn, retryNo) {
+    /**
+     * Performs an AJAX request.
+     *
+     * @param {String}   url       The URL of the requestet site or end point.
+     * @param {String}   method    The HTTP method like 'PUT', 'GET', 'POST'.
+     * @param {Object}   params    An object containing key-value-pairs of parameters for the request.
+     * @param {Function} successFn A callback function which is called when the AJAX request was successfull.
+     * @param {Number}   retryNo   The number of retries, if the requests fails. Standard is 2 retries.
+     * @param {Boolean}  async     Defines the async parameter for AJAX calls. Default is 'true'.
+     */
+    doAJAXRequest: function(url, method, params, successFn, retryNo, async) {
         var me = this;
         
         var editionId = this.application.activeEdition;
         params = Ext.applyIf(params, {edition: editionId});
         
-        var override = window.getPreference(url, true);
+        var lang = window.getLanguage();
+        params = Ext.applyIf(params, {lang: lang});
+
+        // define some requests that will make Edirom Online fail if it looks for an override
+        var doNotOverride  = [
+            'data/xql/getEditionURI.xql',
+            'data/xql/getPreferences.xql',
+            'data/xql/getWorkID.xql',
+        ];
+
+        var override = null;
+
+        if(doNotOverride.indexOf(url) == -1)
+            override = window.getPreference(url, true);
 
         if(override != null)
             url = override;
             
-        if(typeof(retryNo) === 'undefined')
+        if(typeof retryNo === 'undefined')
             retryNo = 2;
+            
+        if(typeof async === 'undefined')
+            async = true;
 
         var fn = Ext.bind(function(response, options, retryNoInt) {
         
@@ -58,7 +84,8 @@ Ext.define('EdiromOnline.controller.AJAXController', {
             url: url,
             method: method,
             params: params,
-            success: fn
+            success: fn,
+            async: async
         });
     }
 });
\ No newline at end of file
diff --git a/app/controller/LanguageController.js b/app/controller/LanguageController.js
index 14741d0ae..6df3c0039 100644
--- a/app/controller/LanguageController.js
+++ b/app/controller/LanguageController.js
@@ -35,20 +35,19 @@ Ext.define('EdiromOnline.controller.LanguageController', {
 
     initLangFile: function(editionURI, lang) {
 
-        Ext.Ajax.request({
-            url: 'data/xql/getLanguageFile.xql',
-            async: false,
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getLanguageFile.xql',
+            'GET', 
+            {
                 lang: lang,
                 mode: 'json',
                 edition: editionURI
-            },success: function(response){
-
-                this.langFiles.add(lang, Ext.JSON.decode(response.responseText));
             },
-            scope: this
-        });
+            Ext.bind(function(response){
+                this.langFiles.add(lang, Ext.JSON.decode(response.responseText));
+            }, this),
+            2, // retries
+            false // async
+        );
     },
 
     getLanguageString: function(key) {
diff --git a/app/controller/LinkController.js b/app/controller/LinkController.js
index 23cbc0d53..794818d98 100644
--- a/app/controller/LinkController.js
+++ b/app/controller/LinkController.js
@@ -156,18 +156,16 @@ Ext.define('EdiromOnline.controller.LinkController', {
 
                 if(singleUri.indexOf('#') != -1) {
 
-                    Ext.Ajax.request({
-                        url: 'data/xql/getInternalIdType.xql',
-                        method: 'GET',
-                        params: {
+                    window.doAJAXRequest('data/xql/getInternalIdType.xql',
+                        'GET', 
+                        {
                             uri: singleUri
                         },
-                        success: function(response){
+                        Ext.bind(function(response){
                             win.loadInternalId(singleUri.split('#')[1], response.responseText.trim());
                             win.show();
-                        },
-                        scope: this
-                    });
+                        }, this)
+                    );
                 }else
                     win.showView('summaryView');
                     
diff --git a/app/controller/PreferenceController.js b/app/controller/PreferenceController.js
index 5669b75e7..c4e5d86a9 100644
--- a/app/controller/PreferenceController.js
+++ b/app/controller/PreferenceController.js
@@ -30,18 +30,18 @@ Ext.define('EdiromOnline.controller.PreferenceController', {
 
     initPreferences: function(editionURI) {
 
-        Ext.Ajax.request({
-            url: 'data/xql/getPreferences.xql',
-            async: false,
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getPreferences.xql',
+            'GET', 
+            {
                 mode: 'json',
                 edition: editionURI
-            },success: function(response){
-                this.setPreferences(Ext.JSON.decode(response.responseText));
             },
-            scope: this
-        });
+            Ext.bind(function(response){
+                this.setPreferences(Ext.JSON.decode(response.responseText));
+            }, this),
+            2, // retries
+            false // async
+        );
     },
 
     setPreferences: function(preferences) {
@@ -50,14 +50,14 @@ Ext.define('EdiromOnline.controller.PreferenceController', {
 
         for(var key in me.preferences) {
             if(key.indexOf('plugin_') == 0)
-                Ext.Ajax.request({
-                    url: me.preferences[key],
-                    method: 'GET',
-                    success: function(response){
+                
+                window.doAJAXRequest(me.preferences[key],
+                    'GET', 
+                    {},
+                    Ext.bind(function(response){
                         eval(response.responseText);
-                    },
-                    scope: this
-                });
+                    }, this)
+                );
         }
     },
 
diff --git a/app/controller/navigator/Navigator.js b/app/controller/navigator/Navigator.js
index 784f86de0..52e645973 100644
--- a/app/controller/navigator/Navigator.js
+++ b/app/controller/navigator/Navigator.js
@@ -47,24 +47,22 @@ Ext.define('EdiromOnline.controller.navigator.Navigator', {
         var editionId = this.application.activeEdition;
         var lang = window.getLanguage('application_language');
 
-        Ext.Ajax.request({
-            url: 'data/xql/getNavigatorConfig.xql',
-            params: {
+        window.doAJAXRequest('data/xql/getNavigatorConfig.xql',
+            'GET', 
+            {
                 editionId: editionId,
                 workId: workId,
                 lang: lang
             },
-            success: function(response){
-
+            Ext.bind(function(response){
                 this.navigatorContents.add(workId, response.responseText);
 
                 Ext.Array.each(this.navigators, function(navigator) {
                     navigator.body.update(this.getNavigatorContent(workId));
                     navigator.setLoading(false);
                 }, this);
-            },
-            scope: this
-        });
+            }, this)
+        );
     },
 
     getNavigatorContent: function(workId) {
diff --git a/app/controller/window/HeaderView.js b/app/controller/window/HeaderView.js
index e08ee87f6..e48adac7f 100644
--- a/app/controller/window/HeaderView.js
+++ b/app/controller/window/HeaderView.js
@@ -42,17 +42,15 @@ Ext.define('EdiromOnline.controller.window.HeaderView', {
         var uri = view.uri;
         var type = view.type;
 
-        Ext.Ajax.request({
-            url: 'data/xql/getHeader.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getHeader.xql',
+            'GET', 
+            {
                 uri: uri,
                 type: type
             },
-            success: function(response){
+            Ext.bind(function(response){
                 view.setContent(response.responseText);
-            },
-            scope: this
-        });
+            }, this)
+        );
     }
 });
diff --git a/app/controller/window/SummaryView.js b/app/controller/window/SummaryView.js
index e60519c8b..e7c911e27 100644
--- a/app/controller/window/SummaryView.js
+++ b/app/controller/window/SummaryView.js
@@ -43,20 +43,18 @@ Ext.define('EdiromOnline.controller.window.SummaryView', {
 		var app = EdiromOnline.getApplication();
 		var activeEdition = app.activeEdition
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getSummary.xql',
-			method: 'GET',
-			params: {
-				uri: uri,
+		window.doAJAXRequest('data/xql/getSummary.xql',
+            'GET', 
+            {
+                uri: uri,
 				type: type,
 				edition: activeEdition
-			},
-			success: function (response) {				
-				var data = response.responseText;
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 
                 view.setContent(data);
-			},
-			scope: this
-		});
+            }, this)
+        );
 	}
 });
\ No newline at end of file
diff --git a/app/controller/window/XmlView.js b/app/controller/window/XmlView.js
index f8d4b03f3..c1bf4bd4a 100644
--- a/app/controller/window/XmlView.js
+++ b/app/controller/window/XmlView.js
@@ -47,18 +47,16 @@ Ext.define('EdiromOnline.controller.window.XmlView', {
         var uri = xmlview.uri;
         var internalId = xmlview.internalId;
 
-        Ext.Ajax.request({
-            url: 'data/xql/getXml.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getXml.xql',
+            'GET', 
+            {
                 uri: uri,
                 internalId: internalId
             },
-            success: function(response){
+            Ext.bind(function(response){
                 xmlview.setXmlContent(response.responseText);
-            },
-            scope: this
-        });
+            }, this)
+        );
     },
 
     resize: function(xmlview, width, height){
diff --git a/app/controller/window/iFrameView.js b/app/controller/window/iFrameView.js
index a8bba086f..b0c4a0e85 100644
--- a/app/controller/window/iFrameView.js
+++ b/app/controller/window/iFrameView.js
@@ -41,16 +41,14 @@ Ext.define('EdiromOnline.controller.window.iFrameView', {
 
         var uri = view.uri;
         
-        Ext.Ajax.request({
-            url: 'data/xql/getiFrameURL.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getiFrameURL.xql',
+            'GET', 
+            {
                 uri: uri
             },
-            success: function(response){
+            Ext.bind(function(response){
                 view.setContent(response.responseText);
-            },
-            scope: this
-        });
+            }, this)
+        );
     }
 });
diff --git a/app/controller/window/source/MeasureBasedView.js b/app/controller/window/source/MeasureBasedView.js
index d9f69fb8d..dd051b7e9 100644
--- a/app/controller/window/source/MeasureBasedView.js
+++ b/app/controller/window/source/MeasureBasedView.js
@@ -68,14 +68,13 @@ Ext.define('EdiromOnline.controller.window.source.MeasureBasedView', {
     onMdivSelected: function(mdiv, view) {
         var me = this;
 
-        Ext.Ajax.request({
-            url: 'data/xql/getMeasures.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getMeasures.xql',
+            'GET', 
+            {
                 uri: view.owner.uri,
                 mdiv: mdiv
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var measures = Ext.create('Ext.data.Store', {
@@ -83,8 +82,8 @@ Ext.define('EdiromOnline.controller.window.source.MeasureBasedView', {
                     data: Ext.JSON.decode(data)
                 });
                 me.measuresLoaded(measures, view);
-            }
-        });        
+            }, this)
+        );
     },
 
     measuresLoaded: function(measures, view) {
@@ -98,19 +97,18 @@ Ext.define('EdiromOnline.controller.window.source.MeasureBasedView', {
     onShowMeasure: function(view, uri, measureId, count) {
         var me = this;
 
-        Ext.Ajax.request({
-            url: 'data/xql/getMeasurePage.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getMeasurePage.xql',
+            'GET', 
+            {
                 id: uri,
                 measure: measureId,
                 measureCount: count
             },
-            success: Ext.bind(function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
                 this.showMeasure(view, uri, measureId, Ext.JSON.decode(data));
             }, me)
-        });
+        );
     },
     
     showMeasure: function(view, uri, measureId, data) {
@@ -128,14 +126,13 @@ Ext.define('EdiromOnline.controller.window.source.MeasureBasedView', {
     },
     
     fetchMeasures: function(uri, pageId, fn) {
-        Ext.Ajax.request({
-            url: 'data/xql/getMeasuresOnPage.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getMeasuresOnPage.xql',
+            'GET', 
+            {
                 uri: uri,
                 pageId: pageId
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var measures = Ext.create('Ext.data.Store', {
@@ -145,8 +142,8 @@ Ext.define('EdiromOnline.controller.window.source.MeasureBasedView', {
 
                 if(typeof fn == 'function')
                     fn(measures);
-            }
-        });
+            }, this)
+        );
     },
     
     measuresOnPageLoaded: function(measures, viewer, pageId) {
@@ -198,16 +195,15 @@ Ext.define('EdiromOnline.controller.window.source.MeasureBasedView', {
            
            if(overlays[overlayId]) {
                
- 			Ext.Ajax.request({
- 				url: 'data/xql/getOverlayOnPage.xql',
- 				method: 'GET',
- 				params: {
- 					uri: uri,
- 					pageId: pageId,
- 					overlayId: overlayId
- 				},
- 				success: function (response) {
- 					var data = response.responseText;
+               window.doAJAXRequest('data/xql/getOverlayOnPage.xql',
+                   'GET', 
+                   {
+                       uri: uri,
+ 					  pageId: pageId,
+ 					  overlayId: overlayId
+                   },
+                   Ext.bind(function(response){
+                     var data = response.responseText;
  					
  					if (data.trim() == '') return;
  					
@@ -218,8 +214,8 @@ Ext.define('EdiromOnline.controller.window.source.MeasureBasedView', {
  
  					
  					me.overlayLoaded(viewer, pageId, overlayId, overlay, sourceView);
- 				}
- 			});
+                   }, this)
+               );
            }else {
                viewer.removeSVGOverlay(overlayId);
            }
diff --git a/app/controller/window/source/PageBasedView.js b/app/controller/window/source/PageBasedView.js
index 0101cd168..7835cf120 100644
--- a/app/controller/window/source/PageBasedView.js
+++ b/app/controller/window/source/PageBasedView.js
@@ -40,14 +40,13 @@ Ext.define('EdiromOnline.controller.window.source.PageBasedView', {
 		if (view.initialized) return;
 		view.initialized = true;
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getPages.xql',
-			method: 'GET',
-			params: {
-				uri: view.owner.uri
-			},
-			success: function (response) {
-				var data = response.responseText;
+		window.doAJAXRequest('data/xql/getPages.xql',
+            'GET', 
+            {
+                uri: view.owner.uri
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 				
 				var pages = Ext.create('Ext.data.Store', {
 					fields:[ 'id', 'name', 'path', 'width', 'height', 'measures', 'annotations'],
@@ -55,8 +54,8 @@ Ext.define('EdiromOnline.controller.window.source.PageBasedView', {
 				});
 				
 				me.pagesLoaded(pages, view);
-			}
-		});
+            }, this)
+        );
 	},
 	
 	pagesLoaded: function (pages, view) {
@@ -70,16 +69,15 @@ Ext.define('EdiromOnline.controller.window.source.PageBasedView', {
            
            if(overlays[overlayId]) {  // if visible
            
- 			Ext.Ajax.request({
- 				url: 'data/xql/getOverlayOnPage.xql',
- 				method: 'GET',
- 				params: {
- 					uri: uri,
- 					pageId: pageId,
- 					overlayId: overlayId
- 				},
- 				success: function (response) {
- 					var data = response.responseText;
+            window.doAJAXRequest('data/xql/getOverlayOnPage.xql',
+                'GET', 
+                {
+                    uri: uri,
+ 				   pageId: pageId,
+ 				   overlayId: overlayId
+                },
+                Ext.bind(function(response){
+                    var data = response.responseText;
  					
  					if (data.trim() == '') return;
  					
@@ -89,8 +87,8 @@ Ext.define('EdiromOnline.controller.window.source.PageBasedView', {
                      });
  
  					me.overlayLoaded(viewer, pageId, overlayId, overlay, sourceView);
- 				}
- 			});
+                }, this)
+            );
            }else {
                viewer.imageViewer.removeSVGOverlay(overlayId);
            }
diff --git a/app/controller/window/source/SourceView.js b/app/controller/window/source/SourceView.js
index 6d6281169..a5a7b1606 100644
--- a/app/controller/window/source/SourceView.js
+++ b/app/controller/window/source/SourceView.js
@@ -53,14 +53,12 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
         ToolsController.addAnnotationVisibilityListener(view.id, Ext.bind(view.checkGlobalAnnotationVisibility, view));
         view.checkGlobalAnnotationVisibility(ToolsController.areAnnotationsVisible());
 
-
-        Ext.Ajax.request({
-            url: 'data/xql/getMovements.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getMovements.xql',
+            'GET', 
+            {
                 uri: view.uri
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var movements = Ext.create('Ext.data.Store', {
@@ -69,8 +67,8 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
                 });
 
                 me.movementsLoaded(movements, view);
-            }
-        });
+            }, this)
+        );
         
         window.doAJAXRequest('data/xql/getAnnotationInfos.xql',
             'GET',
@@ -97,13 +95,12 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
             }, this)
         );
         
-        Ext.Ajax.request({
-            url: 'data/xql/getOverlays.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getOverlays.xql',
+            'GET', 
+            {
                 uri: view.uri
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var overlays = Ext.create('Ext.data.Store', {
@@ -112,8 +109,8 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
                 });
 
                 me.overlaysLoaded(overlays, view);
-            }
-        });
+            }, this)
+        );
     },
 
     movementsLoaded: function(movements, view) {
@@ -131,18 +128,17 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
     onGotoMovement: function(view, movementId) {
         var me = this;
 
-        Ext.Ajax.request({
-            url: 'data/xql/getMovementsFirstPage.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getMovementsFirstPage.xql',
+            'GET', 
+            {
                 uri: view.uri,
                 movementId: movementId
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
                 me.gotoMovement(Ext.String.trim(data), view);
-            }
-        });
+            }, this)
+        );
     },
 
     gotoMovement: function(pageId, view) {
@@ -167,14 +163,13 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
     },
 
     fetchMeasures: function(uri, pageId, fn) {
-        Ext.Ajax.request({
-            url: 'data/xql/getMeasuresOnPage.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getMeasuresOnPage.xql',
+            'GET', 
+            {
                 uri: uri,
                 pageId: pageId
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var measures = Ext.create('Ext.data.Store', {
@@ -184,8 +179,8 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
 
                 if(typeof fn == 'function')
                     fn(measures);
-            }
-        });
+            }, this)
+        );
     },
 
     measuresOnPageLoaded: function(measures, view, pageId) {
@@ -242,39 +237,35 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
 	onGotoMeasureByName: function (view, measure, movementId) {
 		var me = this;
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getMeasurePage.xql',
-			method: 'GET',
-			params: {
-				id: view.uri,
+		window.doAJAXRequest('data/xql/getMeasurePage.xql',
+            'GET', 
+            {
+                id: view.uri,
 				measure: measure,
 				movementId: movementId
-			},
-			success: Ext.bind(function (response) {
-				var data = response.responseText;
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 				this.gotoMeasure(Ext.JSON.decode(data)[0], view);
-			},
-			me)
-		});
+            }, me)
+        );
 	},
 	
 	onGotoMeasure: function (view, measureId) {
 		
 		var me = this;
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getMeasure.xql',
-			method: 'GET',
-			params: {
-				id: view.uri,
+		window.doAJAXRequest('data/xql/getMeasure.xql',
+            'GET', 
+            {
+                id: view.uri,
 				measureId: measureId
-			},
-			success: Ext.bind(function (response) {
-				var data = response.responseText;
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 				this.gotoMeasure(Ext.JSON.decode(data), view);
-			},
-			me)
-		});
+            }, me)
+        );
 	},
 	
 	gotoMeasure: function (result, view) {
@@ -293,19 +284,17 @@ Ext.define('EdiromOnline.controller.window.source.SourceView', {
 		
 		var me = this;
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getZone.xql',
-			method: 'GET',
-			params: {
-				uri: view.uri,
+		window.doAJAXRequest('data/xql/getZone.xql',
+            'GET', 
+            {
+                uri: view.uri,
 				zoneId: zoneId
-			},
-			success: Ext.bind(function (response) {
-				var data = response.responseText;
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 				this.gotoZone(Ext.JSON.decode(data), view);
-			},
-			me)
-		});
+            }, this)
+        );
 	},
 	
 	gotoZone: function (result, view) {
diff --git a/app/controller/window/source/VerovioView.js b/app/controller/window/source/VerovioView.js
index e0fd376c7..fb79c506d 100644
--- a/app/controller/window/source/VerovioView.js
+++ b/app/controller/window/source/VerovioView.js
@@ -44,14 +44,13 @@ Ext.define('EdiromOnline.controller.window.source.VerovioView', {
 		view.on('gotoMeasureByName', me.onGotoMeasureByName, me);
 		view.on('gotoMeasure', me.onGotoMeasure, me);
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getMovements.xql',
-			method: 'GET',
-			params: {
-				uri: view.uri
-			},
-			success: function (response) {
-				var data = response.responseText;
+		window.doAJAXRequest('data/xql/getMovements.xql',
+            'GET', 
+            {
+                uri: view.uri
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 				
 				var movements = Ext.create('Ext.data.Store', {
 					fields:[ 'id', 'name'],
@@ -59,8 +58,8 @@ Ext.define('EdiromOnline.controller.window.source.VerovioView', {
 				});
 				
 				me.movementsLoaded(movements, view);
-			}
-		});
+            }, this)
+        );
 	},
 
 	movementsLoaded: function (movements, view) {
@@ -70,39 +69,35 @@ Ext.define('EdiromOnline.controller.window.source.VerovioView', {
 	onGotoMeasureByName: function (view, measure, movementId) {
 		var me = this;
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getMeasurePage.xql',
-			method: 'GET',
-			params: {
-				id: view.uri,
+		window.doAJAXRequest('data/xql/getMeasurePage.xql',
+            'GET', 
+            {
+                id: view.uri,
 				measure: measure,
 				movementId: movementId
-			},
-			success: Ext.bind(function (response) {
-				var data = response.responseText;
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 				this.gotoMeasure(Ext.JSON.decode(data)[0], view);
-			},
-			me)
-		});
+            }, me)
+        );
 	},
 
 	onGotoMeasure: function (view, measureId) {
 		
 		var me = this;
 		
-		Ext.Ajax.request({
-			url: 'data/xql/getMeasure.xql',
-			method: 'GET',
-			params: {
-				id: view.uri,
+		window.doAJAXRequest('data/xql/getMeasure.xql',
+            'GET', 
+            {
+                id: view.uri,
 				measureId: measureId
-			},
-			success: Ext.bind(function (response) {
-				var data = response.responseText;
+            },
+            Ext.bind(function(response){
+                var data = response.responseText;
 				this.gotoMeasure(Ext.JSON.decode(data), view);
-			},
-			me)
-		});
+            }, me)
+        );
 	},
 	
 	gotoMeasure: function (result, view) {
diff --git a/app/controller/window/text/FacsimileView.js b/app/controller/window/text/FacsimileView.js
index b15bb7a47..930f79d27 100644
--- a/app/controller/window/text/FacsimileView.js
+++ b/app/controller/window/text/FacsimileView.js
@@ -16,77 +16,85 @@
  *  You should have received a copy of the GNU General Public License
  *  along with Edirom Online.  If not, see <http://www.gnu.org/licenses/>.
  */
-Ext.define('EdiromOnline.controller.window.text.FacsimileView', {
+Ext.define("EdiromOnline.controller.window.text.FacsimileView", {
+    extend: "Ext.app.Controller",
 
-    extend: 'Ext.app.Controller',
+    views: ["window.text.FacsimileView"],
 
-    views: [
-        'window.text.FacsimileView'
-    ],
-
-    init: function() {
+    init: function () {
         this.control({
-            'facsimileView': {
-               afterlayout : this.onAfterLayout,
-               single: true
-            }
+            facsimileView: {
+                afterlayout: this.onAfterLayout,
+                single: true,
+            },
         });
     },
-    
-    onAfterLayout: function(view) {
 
+    onAfterLayout: function (view) {
         var me = this;
 
-        if(view.initialized) return;
+        if (view.initialized) return;
         view.initialized = true;
 
-        view.on('gotoChapter', me.onGotoChapter, me);
+        view.on("gotoChapter", me.onGotoChapter, me);
 
         var uri = view.uri;
 
-        Ext.Ajax.request({
-            url: 'data/xql/getPages.xql',
-            method: 'GET',
-            params: {
-                uri: uri
+        window.doAJAXRequest(
+            "data/xql/getPages.xql",
+            "GET",
+            {
+                uri: uri,
             },
-            success: function(response){
+            Ext.bind(function (response) {
                 var data = response.responseText;
 
-                var pages = Ext.create('Ext.data.Store', {
-                    fields: ['id', 'name', 'path', 'width', 'height', 'measures', 'annotations'],
-                    data: Ext.JSON.decode(data)
+                var pages = Ext.create("Ext.data.Store", {
+                    fields: [
+                        "id",
+                        "name",
+                        "path",
+                        "width",
+                        "height",
+                        "measures",
+                        "annotations",
+                    ],
+                    data: Ext.JSON.decode(data),
                 });
 
-                view.setImageSet(pages);
-            }
-        });
-        
-        Ext.Ajax.request({
-            url: 'data/xql/getChapters.xql',
-            method: 'GET',
-            params: {
+                me.pagesLoaded(pages, view);
+            }, this),
+        );
+
+        window.doAJAXRequest(
+            "data/xql/getChapters.xql",
+            "GET",
+            {
                 uri: view.uri,
-                mode: 'pageMode'
+                mode: "pageMode",
             },
-            success: function(response){
+            Ext.bind(function (response) {
                 var data = response.responseText;
 
-                var chapters = Ext.create('Ext.data.Store', {
-                    fields: ['id', 'name', 'pageId'],
-                    data: Ext.JSON.decode(data)
+                var chapters = Ext.create("Ext.data.Store", {
+                    fields: ["id", "name", "pageId"],
+                    data: Ext.JSON.decode(data),
                 });
 
                 me.chaptersLoaded(chapters, view);
-            }
-        });
+            }, this),
+        );
     },
-    
-    chaptersLoaded: function(chapters, view) {
+
+    pagesLoaded: function (pages, view) {
+        view.setImageSet(pages);
+    },
+
+    chaptersLoaded: function (chapters, view) {
         view.setChapters(chapters);
     },
-    
-    onGotoChapter: function(view, pageId) {
+
+    onGotoChapter: function (view, pageId) {
         view.gotoPage(pageId);
-    }
+    },
 });
diff --git a/app/controller/window/text/TextFacsimileSplitView.js b/app/controller/window/text/TextFacsimileSplitView.js
index 1d47b36d4..e05b08aae 100644
--- a/app/controller/window/text/TextFacsimileSplitView.js
+++ b/app/controller/window/text/TextFacsimileSplitView.js
@@ -50,13 +50,12 @@ Ext.define('EdiromOnline.controller.window.text.TextFacsimileSplitView', {
 
         var uri = view.uri;
 
-        Ext.Ajax.request({
-            url: 'data/xql/getPages.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getPages.xql',
+            'GET', 
+            {
                 uri: uri
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var pages = Ext.create('Ext.data.Store', {
@@ -65,17 +64,16 @@ Ext.define('EdiromOnline.controller.window.text.TextFacsimileSplitView', {
                 });
 
                 view.setImageSet(pages);
-            }
-        });
+            }, this)
+        );
         
-        Ext.Ajax.request({
-            url: 'data/xql/getChapters.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getChapters.xql',
+            'GET', 
+            {
                 uri: view.uri,
                 mode: 'pageMode'
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var chapters = Ext.create('Ext.data.Store', {
@@ -84,8 +82,8 @@ Ext.define('EdiromOnline.controller.window.text.TextFacsimileSplitView', {
                 });
 
                 me.chaptersLoaded(chapters, view);
-            }
-        });
+            }, this)
+        );
     },
     
     onAfterImageChanged: function(view) {
@@ -148,14 +146,13 @@ Ext.define('EdiromOnline.controller.window.text.TextFacsimileSplitView', {
         var me = this;
 
         if(visible)
-            Ext.Ajax.request({
-                url: 'data/xql/getAnnotationsInText.xql',
-                method: 'GET',
-                params: {
+            window.doAJAXRequest('data/xql/getAnnotationsInText.xql',
+                'GET', 
+                {
                     uri: view.uri,
                     page: view.getActivePage()
                 },
-                success: function(response){
+                Ext.bind(function(response){
                     var data = response.responseText;
 
                     var annotations = Ext.create('Ext.data.Store', {
@@ -164,9 +161,8 @@ Ext.define('EdiromOnline.controller.window.text.TextFacsimileSplitView', {
                     });
 
                     me.annotationsLoaded(annotations, view);
-                }
-            });
-
+                }, this)
+            );
         else
             view.hideAnnotations();
     },
diff --git a/app/controller/window/text/TextView.js b/app/controller/window/text/TextView.js
index f780d1851..d40bae8e5 100644
--- a/app/controller/window/text/TextView.js
+++ b/app/controller/window/text/TextView.js
@@ -69,13 +69,12 @@ Ext.define('EdiromOnline.controller.window.text.TextView', {
 
         view.setContent(content);
 
-        Ext.Ajax.request({
-            url: 'data/xql/getChapters.xql',
-            method: 'GET',
-            params: {
+        window.doAJAXRequest('data/xql/getChapters.xql',
+            'GET', 
+            {
                 uri: view.uri
             },
-            success: function(response){
+            Ext.bind(function(response){
                 var data = response.responseText;
 
                 var chapters = Ext.create('Ext.data.Store', {
@@ -84,8 +83,8 @@ Ext.define('EdiromOnline.controller.window.text.TextView', {
                 });
 
                 me.chaptersLoaded(chapters, view);
-            }
-        });
+            }, this)
+        );
 
         window.doAJAXRequest('data/xql/getAnnotationInfos.xql',
             'GET',
@@ -121,13 +120,12 @@ Ext.define('EdiromOnline.controller.window.text.TextView', {
         var me = this;
 
         if(visible)
-            Ext.Ajax.request({
-                url: 'data/xql/getAnnotationsInText.xql',
-                method: 'GET',
-                params: {
+            window.doAJAXRequest('data/xql/getAnnotationsInText.xql',
+                'GET', 
+                {
                     uri: view.uri
                 },
-                success: function(response){
+                Ext.bind(function(response){
                     var data = response.responseText;
 
                     var annotations = Ext.create('Ext.data.Store', {
@@ -136,9 +134,8 @@ Ext.define('EdiromOnline.controller.window.text.TextView', {
                     });
 
                     me.annotationsLoaded(annotations, view);
-                }
-            });
-
+                }, this)
+            );
         else
             view.hideAnnotations();
     },
diff --git a/app/view/window/AnnotationView.js b/app/view/window/AnnotationView.js
index 97f18033a..74d95e4c0 100644
--- a/app/view/window/AnnotationView.js
+++ b/app/view/window/AnnotationView.js
@@ -753,17 +753,17 @@ Ext.define('EdiromOnline.view.window.AnnotationView', {
         var uri = txtData.match(/uri:(.*)__\$\$__/)[1];
         var id = txtData.match(/__\$\$__participantId:(.*)/)[1];
 
-        Ext.Ajax.request({
-            url: 'data/xql/getReducedDocument.xql?uri=' + uri + '&selectionId=' + id + '&subtreeRoot=div&idPrefix=' + me.id + '_',
-            success: function(response){
+        window.doAJAXRequest('data/xql/getReducedDocument.xql?uri=' + uri + '&selectionId=' + id + '&subtreeRoot=div&idPrefix=' + me.id + '_',
+            'GET', 
+            {},
+            Ext.bind(function(response){
                 var contEl = this.el.getById(me.id + '_annotationParticipantsSingle');
                 var txtBox = new Ext.Element(contEl.query('div.txtBox')[0]);
                 txtBox.update(response.responseText);
 
                 contEl.query('#' + this.id + '_' + id)[0].scrollIntoView(txtBox);
-            },
-            scope: me
-        });
+            }, me)
+        );
     },
 
     previousParticipantSingle: function() {
diff --git a/app/view/window/image/LeafletFacsimile.js b/app/view/window/image/LeafletFacsimile.js
index ffb198a72..ed933f676 100644
--- a/app/view/window/image/LeafletFacsimile.js
+++ b/app/view/window/image/LeafletFacsimile.js
@@ -303,32 +303,28 @@ Ext.define('EdiromOnline.view.window.image.LeafletFacsimile', {
 		var me = this;
 		
 		rectangleCenter.on('mouseover', function (e) {
-               Ext.Ajax.request({
-                        url: 'data/xql/getAnnotation.xql',
-                        method: 'GET',
-                        params: {
-                            uri: annotURI,
-                            target: 'tip',
-                            edition: EdiromOnline.getApplication().activeEdition
-                        },
-                        success: function(response){
-                            //this.update(response.responseText);
-                            me.facsimileTile.disableRectangle();
-							me.facsimileTile.enableRectangle(ulx, uly, lrx, lry, true);
-                          	//rect_tmp = me.facsimileTile.createPupup(ulx, uly, lrx, lry, rectangleCenter , response.responseText);
-                             var overview = response.responseText;       
-                            var test = $(overview).html();
-                            tooltip.setHtml(test);
+		    window.doAJAXRequest('data/xql/getAnnotation.xql',
+                'GET', 
+                {
+                    uri: annotURI,
+                    target: 'tip',
+                    edition: EdiromOnline.getApplication().activeEdition
+                },
+                Ext.bind(function(response){
+                    //this.update(response.responseText);
+                    me.facsimileTile.disableRectangle();
+					me.facsimileTile.enableRectangle(ulx, uly, lrx, lry, true);
+                    //rect_tmp = me.facsimileTile.createPupup(ulx, uly, lrx, lry, rectangleCenter , response.responseText);
+                    var overview = response.responseText;       
+                    var test = $(overview).html();
+                    tooltip.setHtml(test);
 					/*var tooltip = L.tooltip({
           						target: rectangleCenter,
 	     					 	map: me.getMap(),
 	      						html: response.responseText
       						});*/
-                            
-                           
-                        }
-                       // scope: this
-                    });
+                }, this)
+            );
         
                 });
 
diff --git a/app/view/window/image/VerovioImage.js b/app/view/window/image/VerovioImage.js
index 77a0cee90..d22b01b91 100644
--- a/app/view/window/image/VerovioImage.js
+++ b/app/view/window/image/VerovioImage.js
@@ -18,36 +18,36 @@
  */
 Ext.define('EdiromOnline.view.window.image.VerovioImage', {
 	extend: 'Ext.panel.Panel',
-	
+
 	layout: 'fit',
-	
+
 	initComponent: function () {
-		
+
 		var me = this;
-		
+
 		me.html = '<div id="' + me.id + '_rendCont" class="renderingViewContent"><iframe id="' + me.id +
-		'_rendContIFrame" style="width:100%; height:100%; border:none; background-color:white;"></iframe></div>';
-		
+		'_rendContIFrame"></iframe></div>';
+
 		me.callParent();
 	},
-	
+
 	setIFrameURL: function (url) {
 		var me = this;
 		var contEl = me.el.getById(me.id + '_rendContIFrame');
 		contEl.set({
 			'src': url
 		});
-		
+
 	},
-	
+
 	showMovement: function (movementId) {
 		var me = this;
-		
+
 		var iframe = Ext.fly(me.id + '_rendContIFrame').dom.contentWindow;
 		iframe.showMovement(movementId);
 	},
-	
-    /* 
+
+    /*
      * Call showMeasure of corresponding iframe.
      * @param {string} movementId - The XML-ID of the selected movement.
      * @param {string} measureId - The XML-ID of the selected measure.
diff --git a/app/view/window/text/FacsimileView.js b/app/view/window/text/FacsimileView.js
index 7a17c0ef1..bbb101d2c 100644
--- a/app/view/window/text/FacsimileView.js
+++ b/app/view/window/text/FacsimileView.js
@@ -1,14 +1,34 @@
-Ext.define('EdiromOnline.view.window.text.FacsimileView', {
-    extend: 'EdiromOnline.view.window.View',
+/**
+ *  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/>.
+ *
+ */
+Ext.define("EdiromOnline.view.window.text.FacsimileView", {
+    extend: "EdiromOnline.view.window.View",
 
     requires: [
-        'EdiromOnline.view.window.image.ImageViewer',
-        'EdiromOnline.view.window.image.LeafletFacsimile'
+        "EdiromOnline.view.window.image.ImageViewer",
+        "EdiromOnline.view.window.image.OpenSeaDragonViewer",
+        "EdiromOnline.view.window.image.LeafletFacsimile",
     ],
 
-    alias : 'widget.facsimileView',
+    alias: "widget.facsimileView",
 
-    layout: 'border',
+    layout: "border",
 
     border: 0,
 
@@ -18,95 +38,110 @@ Ext.define('EdiromOnline.view.window.text.FacsimileView', {
     measuresVisible: false,
     annotationsVisible: false,
 
-	image_server: null,
+    image_server: null,
+
+    cls: "facsimileView",
 
     initComponent: function () {
+        var me = this;
 
-        this.addEvents();
-        
-        this.image_server = getPreference('image_server');
-    	
-    	if(this.image_server === 'leaflet'){
-    		this.imageViewer = Ext.create('EdiromOnline.view.window.image.LeafletFacsimile');
-    	}
-    	else{
-    		this.imageViewer = Ext.create('EdiromOnline.view.window.image.ImageViewer');
-    	}
+        me.addEvents();
+
+        var image_server = getPreference("image_server");
+
+        if (image_server === "leaflet") {
+            me.imageViewer = Ext.create(
+                "EdiromOnline.view.window.image.LeafletFacsimile",
+                { flex: 1, width: "100%" },
+            );
+        } else if (image_server === "openseadragon") {
+            me.imageViewer = Ext.create(
+                "EdiromOnline.view.window.image.OpenSeaDragonViewer",
+            );
+        } else {
+            /*TODO: test agains 'digilib'? -> what should be the fallback? */
+            me.imageViewer = Ext.create(
+                "EdiromOnline.view.window.image.ImageViewer",
+            );
+        }
 
-        this.imageViewer.region = 'center';
+        me.imageViewer.region = "center";
 
-        this.bottomBar = new EdiromOnline.view.window.BottomBar({owner:this, region:'south'});
+        me.bottomBar = new EdiromOnline.view.window.BottomBar({
+            owner: me,
+            region: "south",
+            enableOverflow: false,
+        });
 
-        this.items = [
-            this.imageViewer,
-            this.bottomBar
-        ];
+        me.items = [me.imageViewer, me.bottomBar];
 
-        this.callParent();
+        me.callParent();
 
-        this.on('afterrender', this.createMenuEntries, this, {single: true});
-        this.on('afterrender', this.createToolbarEntries, this, {single: true});
-        this.imageViewer.on('zoomChanged', this.updateZoom, this);
+        me.on("afterrender", me.createMenuEntries, me, { single: true });
+        me.on("afterrender", me.createToolbarEntries, me, { single: true });
+        me.imageViewer.on("zoomChanged", me.updateZoom, me);
 
-        this.window.on('loadInternalLink', this.loadInternalId, this);
+        me.window.on("loadInternalLink", me.loadInternalId, me);
     },
 
-    getWeightForInternalLink: function(uri, type, id) {
+    getWeightForInternalLink: function (uri, type, id) {
         var me = this;
-        
-        if(me.uri != uri)
-            return 0;
-        
-        if(type == 'graphic' || type == 'surface' || type == 'zone')
-            return 70;
-            
+
+        if (me.uri != uri) return 0;
+
+        if (type == "graphic" || type == "surface" || type == "zone") return 70;
+
         return 0;
     },
 
-    loadInternalId: function() {
+    loadInternalId: function () {
         var me = this;
 
-        if(me.window.internalIdType == 'surface' || me.window.internalIdType == 'graphic' ) {
+        if (
+            me.window.internalIdType == "surface" ||
+            me.window.internalIdType == "graphic"
+        ) {
             me.window.requestForActiveView(me);
             me.showPage(me.window.internalId);
         }
     },
 
-    setImageSet: function(imageSet) {
+    setImageSet: function (imageSet) {
         var me = this;
         me.imageSet = imageSet;
 
         me.pageSpinner.setStore(me.imageSet);
 
-        if(me.imageToShow != null) {
+        if (me.imageToShow != null) {
             me.pageSpinner.setPage(me.imageSet.getById(me.imageToShow));
             me.imageToShow = null;
-
-        }else if(me.imageSet.getCount() > 0)
+        } else if (me.imageSet.getCount() > 0)
             me.pageSpinner.setPage(me.imageSet.getAt(0));
-            
-        me.fireEvent('afterImagesLoaded', me, imageSet);
-    },
 
-    setPage: function(combo, store) {
+        me.fireEvent("afterImagesLoaded", me, imageSet);
+    },
 
+    setPage: function (combo, store) {
         var me = this;
 
         // Remove old stuff
         me.imageViewer.clear();
 
         var id = combo.getValue();
-        var imgIndex = me.imageSet.findExact('id', id);
+        var imgIndex = me.imageSet.findExact("id", id);
         me.activePage = me.imageSet.getAt(imgIndex);
 
-        me.imageViewer.showImage(me.activePage.get('path'),
-            me.activePage.get('width'), me.activePage.get('height'));
+        me.imageViewer.showImage(
+            me.activePage.get("path"),
+            me.activePage.get("width"),
+            me.activePage.get("height"),
+        );
     },
 
-    showPage: function(pageId) {
+    showPage: function (pageId) {
         var me = this;
 
-        if(me.imageSet == null) {
+        if (me.imageSet == null) {
             me.imageToShow = pageId;
             return;
         }
@@ -114,113 +149,236 @@ Ext.define('EdiromOnline.view.window.text.FacsimileView', {
         me.pageSpinner.setPage(me.imageSet.getById(pageId));
     },
 
-    getActivePage: function() {
+    getActivePage: function () {
         return this.activePage;
     },
 
-    createMenuEntries: function() {
-
+    createMenuEntries: function () {
         var me = this;
 
-        me.viewMenu =  Ext.create('Ext.button.Button', {
-            text: getLangString('view.window.source.SourceView_viewMenu'),
+        var image_server = getPreference("image_server");
+
+        if (image_server === "digilib") {
+            me.zoomSlider = Ext.create("Ext.slider.Single", {
+                width: 140,
+                value: 100,
+                increment: 5,
+                minValue: 10,
+                maxValue: 400,
+                checkChangeBuffer: 100,
+                useTips: true,
+                cls: "zoomSlider",
+                tipText: function (thumb) {
+                    return Ext.String.format("{0}%", thumb.value);
+                },
+                listeners: {
+                    change: Ext.bind(me.zoomChanged, me, [], 0),
+                },
+            });
+        }
+        if (image_server === "openseadragon") {
+            me.zoomSlider = Ext.create("Ext.slider.Single", {
+                width: 140,
+                value: 100,
+                increment: 5,
+                minValue: 90,
+                maxValue: 700,
+                checkChangeBuffer: 100,
+                useTips: true,
+                cls: "zoomSlider",
+                tipText: function (thumb) {
+                    return Ext.String.format("{0}%", thumb.value);
+                },
+                listeners: {
+                    change: Ext.bind(me.zoomChanged, me, [], 0),
+                },
+            });
+        }
+
+        /*TODO
+            pageSppinner
+            separator
+        */
+
+        if (image_server === "digilib" || image_server === "openseadragon") {
+            return [me.zoomSlider, me.separator, me.pageSpinner];
+        } else {
+            return [me.pageSpinner];
+        }
+
+        me.viewMenu = Ext.create("Ext.button.Button", {
+            text: getLangString("view.window.source.SourceView_viewMenu"),
             indent: false,
-            cls: 'menuButton',
-            menu : {
+            cls: "menuButton",
+            menu: {
                 items: [
                     {
-                        id: me.id + '_fitFacsimile',
-                        text: getLangString('view.window.source.SourceView_fitView'),
-                        handler: Ext.bind(me.fitFacsimile, me, [], 0)
-                    }
-                ]
-            }
+                        id: me.id + "_fitFacsimile",
+                        text: getLangString(
+                            "view.window.source.SourceView_fitView",
+                        ),
+                        handler: Ext.bind(me.fitFacsimile, me, [], 0),
+                    },
+                ],
+            },
         });
         me.window.getTopbar().addViewSpecificItem(me.viewMenu, me.id);
     },
 
-    createToolbarEntries: function() {
-
+    createToolbarEntries: function () {
         var me = this;
 
-		if(me.image_server === 'digilib'){
-        	me.zoomSlider = Ext.create('Ext.slider.Single', {
-            	width: 140,
-            	value: 100,
-            	increment: 5,
-            	minValue: 10,
-            	maxValue: 400,
-            	checkChangeBuffer: 100,
-            	useTips: true,
-            	cls: 'zoomSlider',
-            	tipText: function(thumb){
-                	return Ext.String.format('{0}%', thumb.value);
-            	},
-            	listeners: {
-                	change: Ext.bind(me.zoomChanged, me, [], 0)
-            	}
-        	});
-        	me.bottomBar.add(me.zoomSlider);
-		}
-
-        me.pageSpinner = Ext.create('EdiromOnline.view.window.util.PageSpinner', {
-            width: 121,
-            cls: 'pageSpinner',
-            owner: me
+        var image_server = getPreference("image_server");
+
+        if (image_server === "digilib") {
+            me.zoomSlider = Ext.create("Ext.slider.Single", {
+                width: 140,
+                value: 100,
+                increment: 5,
+                minValue: 10,
+                maxValue: 400,
+                checkChangeBuffer: 100,
+                useTips: true,
+                cls: "zoomSlider",
+                tipText: function (thumb) {
+                    return Ext.String.format("{0}%", thumb.value);
+                },
+                listeners: {
+                    change: Ext.bind(me.zoomChanged, me, [], 0),
+                },
+            });
+        }
+        if (image_server === "openseadragon") {
+            me.zoomSlider = Ext.create("Ext.slider.Single", {
+                width: 140,
+                value: 100,
+                increment: 5,
+                minValue: 90,
+                maxValue: 700,
+                checkChangeBuffer: 100,
+                useTips: true,
+                cls: "zoomSlider",
+                tipText: function (thumb) {
+                    return Ext.String.format("{0}%", thumb.value);
+                },
+                listeners: {
+                    change: Ext.bind(me.zoomChanged, me, [], 0),
+                },
+            });
+        }
+
+        me.pageSpinner = Ext.create(
+            "EdiromOnline.view.window.util.PageSpinner",
+            {
+                width: 121,
+                cls: "pageSpinner",
+                owner: me,
+            },
+        );
+
+        me.separator = Ext.create("Ext.toolbar.Separator");
+
+        var entries = [];
+
+        if (image_server === "digilib" || image_server === "openseadragon") {
+            entries = [me.zoomSlider, me.separator, me.pageSpinner];
+        } else {
+            entries = [me.pageSpinner];
+        }
+
+        Ext.Array.each(entries, function (entry) {
+            if (
+                image_server === "digilib" ||
+                image_server === "openseadragon"
+            ) {
+                me.bottomBar.add(entry);
+            } else if (
+                entry.initialCls !== "zoomSlider" &&
+                entry.xtype !== "tbseparator"
+            ) {
+                me.bottomBar.add(entry);
+            }
         });
-        me.bottomBar.add(me.pageSpinner);
     },
 
-    fitFacsimile: function() {
+    hideToolbarEntries: function () {
+        var me = this;
+        if (typeof me.zoomSlider !== "undefined") {
+            me.zoomSlider.hide();
+        }
+        me.pageSpinner.hide();
+        if (typeof me.separator !== "undefined") {
+            me.separator.hide();
+        }
+    },
+
+    showToolbarEntries: function () {
+        var me = this;
+        if (typeof me.zoomSlider !== "undefined") {
+            me.zoomSlider.show();
+        }
+        me.pageSpinner.show();
+        if (typeof me.separator !== "undefined") {
+            me.separator.show();
+        }
+    },
+
+    fitFacsimile: function () {
         this.imageViewer.fitInImage();
     },
 
-    updateZoom: function(zoom) {
-        this.zoomSlider.suspendEvents();
-        this.zoomSlider.setValue(Math.round(zoom * 100));
-        this.zoomSlider.resumeEvents();
+    updateZoom: function (zoom) {
+        if (typeof this.zoomSlider !== "undefined") {
+            this.zoomSlider.suspendEvents();
+            this.zoomSlider.setValue(Math.round(zoom * 100));
+            this.zoomSlider.resumeEvents();
+        }
     },
 
-    zoomChanged: function(slider) {
+    zoomChanged: function (slider) {
         this.imageViewer.setZoomAndCenter(slider.getValue() / 100);
     },
-    
-    setChapters: function(chapters) {
+
+    setChapters: function (chapters) {
         var me = this;
 
-        if(chapters.getTotalCount() == 0) return;
+        if (chapters.getTotalCount() == 0) return;
 
-        me.gotoMenu =  Ext.create('Ext.button.Button', {
-            text: getLangString('view.window.text.TextView_gotoMenu'),
+        me.gotoMenu = Ext.create("Ext.button.Button", {
+            text: getLangString("view.window.text.TextView_gotoMenu"),
             indent: false,
-            cls: 'menuButton',
-            menu : {
-                items: [
-                ]
-            }
+            cls: "menuButton",
+            menu: {
+                items: [],
+            },
         });
         me.window.getTopbar().addViewSpecificItem(me.gotoMenu, me.id);
 
         me.chapters = chapters;
 
         var chapterItems = [];
-        chapters.each(function(chapter) {
+        chapters.each(function (chapter) {
             chapterItems.push({
-                text: chapter.get('name'),
-                handler: Ext.bind(me.gotoChapter, me, chapter.get('pageId'), true)
+                text: chapter.get("name"),
+                handler: Ext.bind(
+                    me.gotoChapter,
+                    me,
+                    chapter.get("pageId"),
+                    true,
+                ),
             });
         });
 
         me.gotoMenu.menu.add(chapterItems);
         me.gotoMenu.show();
     },
-	
-	gotoChapter: function (menuItem, event, pageId) {
-		this.fireEvent('gotoChapter', this, pageId);
-	},
-    
+
+    gotoChapter: function (menuItem, event, pageId) {
+        this.fireEvent("gotoChapter", this, pageId);
+    },
+
     gotoPage: function (pageId) {
-		var me = this;
-		me.pageSpinner.setPage(me.imageSet.getById(pageId));
-	}
-});
\ No newline at end of file
+        var me = this;
+        me.pageSpinner.setPage(me.imageSet.getById(pageId));
+    },
+});
diff --git a/app/view/window/text/TextFacsimileSplitView.js b/app/view/window/text/TextFacsimileSplitView.js
index 325e3ca09..d0605307c 100644
--- a/app/view/window/text/TextFacsimileSplitView.js
+++ b/app/view/window/text/TextFacsimileSplitView.js
@@ -205,18 +205,16 @@ Ext.define('EdiromOnline.view.window.text.TextFacsimileSplitView', {
                 });
 
                 tip.on('afterrender', function() {
-                    Ext.Ajax.request({
-                        url: 'data/xql/getAnnotation.xql',
-                        method: 'GET',
-                        params: {
+                    window.doAJAXRequest('data/xql/getAnnotation.xql',
+                        'GET', 
+                        {
                             uri: uri,
                             target: 'tip'
                         },
-                        success: function(response){
+                        Ext.bind(function(response){
                             this.update(response.responseText);
-                        },
-                        scope: this
-                    });
+                        }, this)
+                    );
                 }, tip);
 
             }, me);
diff --git a/app/view/window/text/TextView.js b/app/view/window/text/TextView.js
index 7221b9b12..08c6a5364 100644
--- a/app/view/window/text/TextView.js
+++ b/app/view/window/text/TextView.js
@@ -170,18 +170,16 @@ Ext.define('EdiromOnline.view.window.text.TextView', {
                 });
 
                 tip.on('afterrender', function() {
-                    Ext.Ajax.request({
-                        url: 'data/xql/getAnnotation.xql',
-                        method: 'GET',
-                        params: {
+                    window.doAJAXRequest('data/xql/getAnnotation.xql',
+                        'GET', 
+                        {
                             uri: uri,
                             target: 'tip'
                         },
-                        success: function(response){
+                        Ext.bind(function(response){
                             this.update(response.responseText);
-                        },
-                        scope: this
-                    });
+                        }, this)
+                    );
                 }, tip);
 
             }, me);
diff --git a/build.xml b/build.xml
index 80fbf7e27..077b8eba2 100755
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
     
     <import file="${basedir}/.sencha/app/build-impl.xml"/>
     
-    <property name="project.version" value="1.0.0-beta.5"/>
+    <property name="project.version" value="1.0.0-beta.6"/>
     <property name="project.app" value="Edirom-Online"/>
     <property name="project.title" value="Edirom Online"/>
     <property name="repo.target" value="${project.app}"/>
@@ -15,8 +15,24 @@
     <tstamp/>
 
     <target name="build-plus">
-        <copy todir="${build.dir}">
-            <fileset dir="${basedir}/add"/>
+        <copy todir="${build.dir}" preservelastmodified="true">
+            <fileset dir="${basedir}/add">
+                <include name="*"/>
+                <include name="data/locale/"/>
+                <include name="data/prefs/"/>
+                <include name="data/xql/"/>
+                <include name="data/xqm/"/>
+                <include name="data/xslt/*"/>
+                <include name="data/xslt/i18n/"/>
+                <include name="data/xslt/tei/profiles/**"/>
+                <include name="data/xslt/tei/Stylesheets/catalog.xml"/>
+                <include name="data/xslt/tei/Stylesheets/i18n.xml"/>
+                <include name="data/xslt/tei/Stylesheets/html/"/>
+                <include name="data/xslt/tei/Stylesheets/common/"/>
+                <include name="data/xslt/tei/Stylesheets/VERSION"/>
+                <include name="help/**"/>
+                <include name="index/**"/>
+            </fileset>
             <filterset begintoken="@" endtoken="@">
                 <filter token="project.version" value="${project.version}"/>
                 <filter token="project.app" value="${project.app}"/>
diff --git a/packages/eoTheme/sass/etc/all.scss b/packages/eoTheme/sass/etc/all.scss
index afcb277a4..50a944a2b 100644
--- a/packages/eoTheme/sass/etc/all.scss
+++ b/packages/eoTheme/sass/etc/all.scss
@@ -1,11 +1,11 @@
-@import 'webfonts.scss';	
+@import 'webfonts.scss';
 @import 'mixins.scss';
 
 /*Edirom*/
 @import 'facsimile.scss';
 @import 'xml.scss';
 @import 'toolbar.scss';
- 
+
 //@import 'textViewContent.scss';
 @import 'textView.scss';
 @import 'headerView.scss';
@@ -16,4 +16,7 @@
 @import 'freidi.scss';
 
 /*Annotations*/
-@import 'annotation.scss';
\ No newline at end of file
+@import 'annotation.scss';
+
+/*renderingView (Verovio)*/
+@import 'renderingViewContent.scss'
diff --git a/packages/eoTheme/sass/etc/renderingViewContent.scss b/packages/eoTheme/sass/etc/renderingViewContent.scss
new file mode 100644
index 000000000..a9ef7c70a
--- /dev/null
+++ b/packages/eoTheme/sass/etc/renderingViewContent.scss
@@ -0,0 +1,7 @@
+/* make verovio iFrame fit Edirom window */
+.renderingViewContent, .renderingViewContent iframe {
+    width: 100%;
+    height: 100%;
+    border: none;
+    overflow: hidden;
+}
diff --git a/resources/css/todo.css b/resources/css/todo.css
index fd7fe2e2c..b94fb4654 100644
--- a/resources/css/todo.css
+++ b/resources/css/todo.css
@@ -400,10 +400,4 @@ span#workSwitch-btnInnerEl:before {
 .x-menu-item-active {
     background-color: rgb(36, 145, 235) !important;
     color: rgb(161, 209, 247) !important;
-}
-
-/* Verovio view */
-
-.renderingViewContent {
-    height: 100%;
-}
+}
\ No newline at end of file
diff --git a/resources/css/verovio-view.css b/resources/css/verovio-view.css
index 333f23ba2..1ba61c69d 100644
--- a/resources/css/verovio-view.css
+++ b/resources/css/verovio-view.css
@@ -17,7 +17,7 @@ body {
     left: 0;
     right: 0;
     bottom: 0;
-    background-color: #cccccc;
+    background-color: rgba(0, 0, 0, 10%);
     text-align: center;
     line-height: 2em;
 }