Merge branch 'rel/1.0.0-beta.5'

Data for Release Christmas22

Author: Dennis Ried

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/eoTheme/resources/fonts/euryanthe"]
+	path = packages/eoTheme/resources/fonts/euryanthe
+	url = https://github.com/Edirom/EuryantheFont

README.md

@@ -1,12 +1,26 @@
 # Edirom Online
 
-Edirom Online is a web application written in XQuery and Javascript, and designed for deployment in eXist-db[http://exist-db.org/exist/apps/homepage/index.html](http://exist-db.org/exist/apps/homepage/index.html). It is based on the work of the [_Edirom_-Project](https://edirom.de/edirom-projekt/) that originally was funded by the German Research Foundation (DFG). This software brings paperbased historio-critical editions of music texts to the web.
+Edirom Online is a web application written in XQuery and JavaScript, and designed for deployment in [eXist-db](https://exist-db.org/). It is based on the work of the [_Edirom_-Project](https://edirom.de/edirom-projekt/) that originally was funded by the German Research Foundation (DFG). This software brings paperbased historio-critical editions of music texts to the web.
 
 The software is still under high development and has to be seen as beta software.
 
+## Cloning this repository
+
+Since this repository uses submodules for e.g. fonts, it is necessary to clone the repository with the recursive addition.
+
+```bash
+git clone --recursive <project url>
+```
+
+If the submodules are not yet present after cloning, you can update them with:
+
+```bash
+git submodule update --init --recursive
+```
+
 ## Dependencies
 
-Edirom Online depends heavily on the javascript framework ExtJS (<http://www.sencha.com/products/extjs/>) which is included in parts in our code base. We use ExtJS 4.2.1 in the GPL version. Edirom Online also includes the Raphaël javscript library (<http://raphaeljs.com>, MIT License) and the ACE editor (<http://ace.ajax.org>, BSD license).
+Edirom Online depends heavily on the JavaScript framework [Ext JS](https://www.sencha.com/products/extjs) which is included in parts in our code base. We use Ext JS 4.2.1 in the GPL version. Edirom Online also includes the Raphaël javscript library (<http://raphaeljs.com>, MIT License) and the ACE editor (<http://ace.ajax.org>, BSD license).
 
 ## Contributing
 

add/data/xql/getMeasures.xql

@@ -64,14 +64,26 @@ declare function local:getMeasures($mei as node(), $mdivID as xs:string) as xs:s
                                 then (
                                     for $part in $mdiv//mei:part
                                         for $measure in $part//mei:measure[@label = $measureN][1] | $measures[ancestor::mei:part = $part]
+                                            let $voiceRef := $part//mei:staffDef/@decls
+                                            let $voiceID := substring-after($voiceRef, '#')
                                             return
-                                                concat('{id:"', $measure/@xml:id, '", voice: "', $part//mei:staffDef/@decls, '"}')
+                                                concat('{id:"', $measure/@xml:id, '",
+                                                voice: "', $voiceRef,
+                                                '", partLabel: "', $mei/id($voiceID)/@label,
+                                                '"}')
                                 )
                                 else (
                                     for $part in $mdiv//mei:part
+(:                                    let $partMeasures := $part//mei:measure:)
                                         for $measure in $part//mei:measure[@n = $measureN][1] | $measures[ancestor::mei:part = $part]
+                                            let $voiceRef := $part//mei:staffDef/@decls
+                                            let $voiceID := substring-after($voiceRef, '#')
                                             return
-                                                concat('{id:"', $measure/@xml:id, '", voice: "', $part//mei:staffDef/@decls, '"}')
+                                                concat('{id:"',
+                                                $measure/@xml:id,
+                                                '", voice: "', $voiceRef,
+                                                '", partLabel: "', $mei/id($voiceID)/@label,
+                                                '"}')
                                 )
             return
                 concat('{',

add/data/xqm/edition.xqm

@@ -96,19 +96,21 @@ declare function edition:getPreferencesURI($uri as xs:string) as xs:string {
 };
 
 (:~
-: Returns the URI of the first found Edition
+: Returns the URI of the edition specified by the submitted $editionID parameter.
+: Only succeeds if the supplied id is the @xml:id of a edirom:edition element in '/db/apps'.
+: If $editionID is the empty string, returns the URI of the first edition found in '/db/apps'.
 :
-: @param $uri The URI of the Edition's document to process
-: @return The URI
+: @param $editionID The '@xml:id' of the edirom:edition document to process
+: @return The URI of the Edition file
 :)
-declare function edition:findEdition($uri as xs:string) as xs:string {
-    if($uri eq '')
+declare function edition:findEdition($editionID as xs:string) as xs:string {
+    if($editionID eq '')
     then(
         let $edition := (collection('/db/apps')//edirom:edition)[1]
         return 'xmldb:exist://' || document-uri($edition/root())
     )
     else (
-        let $edition := collection('/db/apps')//edirom:edition[@xml:id eq $uri]
+        let $edition := collection('/db/apps')//edirom:edition/id($editionID)
         return 'xmldb:exist://' || document-uri($edition/root())
     )
 };

add/data/xqm/util.xqm

@@ -66,7 +66,7 @@ declare function eutil:getNamespace($node as node()) as xs:string {
 : @return The string
 :)
 
-declare function eutil:getLocalizedName($node, $lang) as xs:string {
+declare function eutil:getLocalizedName($node, $lang) {
 
 let $name :=
     if ($node/mei:title)
@@ -91,7 +91,9 @@ let $name :=
         then(annotation:generateTitle($node))
     else (normalize-space($node))
 return
-    $name => string-join(' ')
+    if($node/edirom:names)
+    then($name)
+    else($name => string-join(' ') => normalize-space())
 };
 
 (:~

add/data/xslt/meiP2html.xsl

@@ -1,8 +1,5 @@
 <?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:mei="http://www.music-encoding.org/ns/mei" 
-	xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" exclude-result-prefixes="xs xd mei" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mei="http://www.music-encoding.org/ns/mei" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" xmlns:functx="http://www.functx.com" exclude-result-prefixes="xs xd" version="2.0">
     <xd:doc scope="stylesheet">
         <xd:desc>
             <xd:p>
@@ -15,8 +12,45 @@
     <xsl:output method="xhtml" media-type="text/html" indent="yes" omit-xml-declaration="yes"/>
     <xsl:param name="idPrefix" select="string('')"/>
     <xsl:param name="imagePrefix" select="string('')"/>
+    
+    <xsl:variable name="footnotes">
+        <xsl:copy-of select=".//mei:annot[@type = 'note' and @place = 'foot']"/>
+    </xsl:variable>
+    
+    <xsl:variable name="footnotesBlock">
+        <xsl:for-each select="$footnotes/mei:annot">
+            <xsl:variable name="counter">
+                <xsl:value-of select="position()"></xsl:value-of>
+            </xsl:variable>
+            <xsl:variable name="content">
+                <xsl:apply-templates/>
+            </xsl:variable>
+            <div style="display:flex; color: grey; font-size: smaller; margin-bottom:0.5rem;">
+                <span class="superscript">
+                    <xsl:value-of select="$counter"></xsl:value-of>
+                </span>
+                <div style="display: inline; margin-left: .25rem;">
+                    <xsl:copy-of select="$content"></xsl:copy-of>
+                </div>
+            </div>
+        </xsl:for-each>
+    </xsl:variable>
+    
+    <xsl:function name="functx:index-of-deep-equal-node" as="xs:integer*">
+        <xsl:param name="nodes" as="node()*"/>
+        <xsl:param name="nodeToFind" as="node()"/>
+        <xsl:sequence select="
+            for $seq in (1 to count($nodes))
+            return $seq[deep-equal($nodes[$seq],$nodeToFind)]
+            "/>
+    </xsl:function>
+    
     <xsl:template match="/">
         <xsl:apply-templates/>
+        <xsl:if test="$footnotes != ''">
+            <hr/>
+            <xsl:copy-of select="$footnotesBlock"/>
+        </xsl:if>
     </xsl:template>
     <xsl:template match="mei:p">
         <p>
@@ -26,6 +60,12 @@
             <xsl:apply-templates select="* | text()"/>
         </p>
     </xsl:template>
+    <xsl:template match="mei:annot[@type = 'note' and @place = 'foot']">
+        <xsl:variable name="footnoteCount">
+            <xsl:value-of select="functx:index-of-deep-equal-node($footnotes/mei:annot, .)"></xsl:value-of>
+        </xsl:variable>
+        <span class="superscript"><xsl:value-of select="$footnoteCount"/></span>
+    </xsl:template>
     <xsl:template match="mei:ref">
         <span class="ref">
             <xsl:choose>

app/view/window/image/ImageViewer.js

@@ -46,6 +46,7 @@ Ext.define('EdiromOnline.view.window.image.ImageViewer', {
 
     shapes: null,
     shapesHidden: false,
+    partLabel: null,
 
     svgOverlays: null,
     annotSVGOverlays: null,
@@ -65,10 +66,30 @@ Ext.define('EdiromOnline.view.window.image.ImageViewer', {
 
         me.addEvents('zoomChanged',
                     'imageChanged');
-
-        me.html = '<div id="' + me.id + '_facsCont" style="overflow: hidden; background-color: black; top:0px; bottom: 0px; left: 0px; right: 0px; position:absolute;"></div>' +
-                  '<div id="' + me.id + '_facsContEvents" class="facsContEvents"></div>';
-
+       
+/*       from OPERA*/
+       var facsContEvents;
+
+        if (me.partLabel != null) {
+         facsContEvents = '<div id="' + me.id + '_facsContEvents" class="facsContEvents">' +
+            '<div  id="' + me.id + '_' + me.partLabel + '" class="part">' +
+              '<span class="partInner" id="' + me.id + '_' + me.partLabel + '_inner">' +
+              me.partLabel + '</span>' +
+            '</div>' +
+         '</div>';
+        }
+        else {
+          facsContEvents = '<div id="' + me.id + '_facsContEvents" class="facsContEvents"></div>';
+         };
+         
+        me.html = '<div id="' + me.id + '_facsCont" style="background-color: black; top:0px; bottom: 0px; left: 0px; right: 0px; position:absolute;"></div>' + facsContEvents;
+
+/*       from OPERA END*/
+                    
+/*                    */
+/*        me.html = '<div id="' + me.id + '_facsCont" style="overflow: hidden; background-color: black; top:0px; bottom: 0px; left: 0px; right: 0px; position:absolute;"></div>' +*/
+/*                  '<div id="' + me.id + '_facsContEvents" class="facsContEvents"></div>';*/
+/*                    */
         me.imageLoader = new EdiromOnline.view.window.image.ImageLoader({
             viewer: me
         });

app/view/window/image/VerovioImage.js

@@ -45,5 +45,16 @@ Ext.define('EdiromOnline.view.window.image.VerovioImage', {
 
 		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.
+     */
+	showMeasure: function (movementId, measureId) {
+	    var me = this;
+	    var iframe = Ext.fly(me.id + '_rendContIFrame').dom.contentWindow;
+	    iframe.showMeasure(movementId, measureId);
 	}
 });

app/view/window/source/MeasureBasedView.js

@@ -225,14 +225,16 @@ Ext.define('EdiromOnline.view.window.source.MeasureBasedView', {
         Ext.Array.each(me.measures.get('measures'), function(m) {
 
             var voice = m['voice'];
+            var partLabel = m['partLabel'];
 
             if(voice == 'score' || me.parts.getById(voice.substr(1)).get('selected')) {
 
                 var viewer = me.viewers.get(voice);
 
                 if(typeof viewer == 'undefined') {
                     viewer = Ext.create('EdiromOnline.view.window.source.HorizontalMeasureViewer', {
-                        owner: me
+                        owner: me,
+                        partLabel: partLabel
                     });
 
                     me.viewers.add(voice, viewer);
@@ -391,6 +393,8 @@ Ext.define('EdiromOnline.view.window.source.HorizontalMeasureViewer', {
 
     border: false,
 
+    partLabel: '',
+    
     style: {
         borderColor: 'black',
         borderStyle: 'solid',
@@ -417,12 +421,12 @@ Ext.define('EdiromOnline.view.window.source.HorizontalMeasureViewer', {
         var image_server = getPreference('image_server');
         var viewer = null;   	
     	if(image_server === 'leaflet'){
-    		viewer = Ext.create('EdiromOnline.view.window.image.LeafletFacsimile', {flex: 1, width: '100%'});
+    		viewer = Ext.create('EdiromOnline.view.window.image.LeafletFacsimile', {flex: 1, width: '100%', partLabel: me.partLabel});
     	}
     	else if(image_server === 'openseadragon'){
-    		viewer = Ext.create('EdiromOnline.view.window.image.OpenSeaDragonViewer', {flex: 1, width: '100%'});
+    		viewer = Ext.create('EdiromOnline.view.window.image.OpenSeaDragonViewer', {flex: 1, width: '100%', partLabel: me.partLabel});
     	}else {
-    		viewer = Ext.create('EdiromOnline.view.window.image.ImageViewer', {flex: 1});
+    		viewer = Ext.create('EdiromOnline.view.window.image.ImageViewer', {flex: 1, partLabel: me.partLabel});
     	}
 
         viewer.on('imageChanged', me.onViewerImageChange, me);