diff --git a/build.xml b/build.xml index c7adc35..36a0907 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/expath-pkg.xml b/expath-pkg.xml index a0d8da5..abf75df 100644 --- a/expath-pkg.xml +++ b/expath-pkg.xml @@ -1,5 +1,5 @@ - + FreiDi:proofMEIdata diff --git a/index.html b/index.html index 2ec3570..efa37b3 100644 --- a/index.html +++ b/index.html @@ -39,7 +39,7 @@
-

Welcome to FreiDi:proofMEIdata Version 0.7.0-alpha

+

Welcome to FreiDi:proofMEIdata Version 0.8.0-alpha

Please choose a tool from the top navigation…

diff --git a/pmdCE/resources/js/controlEvents.js b/pmdCE/resources/js/controlEvents.js index 03bd711..b1f9854 100644 --- a/pmdCE/resources/js/controlEvents.js +++ b/pmdCE/resources/js/controlEvents.js @@ -99,6 +99,7 @@ var controlevents = (function(){ obj.tstamp2 = ''; obj.startStaffID = ''; obj.staff = ''; + obj.docUri = currentSourcePath; if(type === 'slur') { obj.endIDs = new Array(); diff --git a/pmdCE/resources/js/grid.js b/pmdCE/resources/js/grid.js index cbb5a11..9301c48 100644 --- a/pmdCE/resources/js/grid.js +++ b/pmdCE/resources/js/grid.js @@ -260,7 +260,6 @@ var grid = (function() { for(var i=0;i + ) else( if($type eq 'hairpin') then( - + ) else( diff --git a/pmdCE/resources/xql/saveMEI.xql b/pmdCE/resources/xql/saveMEI.xql index c65ba08..14f83d5 100644 --- a/pmdCE/resources/xql/saveMEI.xql +++ b/pmdCE/resources/xql/saveMEI.xql @@ -22,8 +22,8 @@ let $change := let $operation := $x/string(@operation) let $content := $x/* let $startIDs := $content/descendant-or-self::mei:slur/string(@startid) - let $doc := doc('/db/apps/controlevents-data/' || $source) - let $measure := local:findMeasure($doc, $startIDs) + let $doc := if(ends-with($source,'.xml'))then(doc('/db/apps/controlevents-data/' || $source))else(collection('/db/apps/controlevents-data/')/id($source)/root()) + let $measure := local:findMeasure($doc, $startIDs[1]) let $change := switch($operation) case 'create' return diff --git a/pmdCE/resources/xsl/prepareRendering.xsl b/pmdCE/resources/xsl/prepareRendering.xsl index b582771..ec11c36 100644 --- a/pmdCE/resources/xsl/prepareRendering.xsl +++ b/pmdCE/resources/xsl/prepareRendering.xsl @@ -114,6 +114,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/rendering/Verovio MEI Viewer_files/AudioDetect.js b/rendering/Verovio MEI Viewer_files/AudioDetect.js new file mode 100644 index 0000000..a5dd465 --- /dev/null +++ b/rendering/Verovio MEI Viewer_files/AudioDetect.js @@ -0,0 +1,69 @@ +/* + ------------------------------------- + MIDI.audioDetect : 0.3 + ------------------------------------- + https://github.com/mudcube/MIDI.js + ------------------------------------- + Probably, Maybe, No... Absolutely! + ------------------------------------- + Test to see what types of