Merge branch 'develop'

music-encoding · Oct 20, 2016 · f814992 · f814992
2 parents 2fea149 + c1a93fd
commit f814992
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/src/ExportGenerators.mss b/src/ExportGenerators.mss
@@ -592,6 +592,10 @@ function GenerateLayers (staffnum, measurenum) {
             {
                 mobj = GenerateLine(bobj);
             }
+            case('GlissandoLine')
+            {
+                mobj = GenerateLine(bobj);
+            }
             case('Trill')
             {
                 mobj = GenerateLine(bobj);
@@ -1332,6 +1336,10 @@ function GenerateLine (bobj) {
             libmei.AddAttribute(line, 'dis', octrend[0]);
             libmei.AddAttribute(line, 'dis.place', octrend[1]);
         }
+        case ('GlissandoLine')
+        {
+            line = libmei.Gliss();
+        }
         case ('Trill')
         {
             line = GenerateTrill(bobj);

diff --git a/src/GLOBALS.mss b/src/GLOBALS.mss
@@ -1,4 +1,4 @@
-Version     "2.0.3"
+Version     "2.0.4"
 PluginName  "Sibelius to MEI Exporter"
 Author      "Andrew Hankinson"
 

diff --git a/src/Utilities.mss b/src/Utilities.mss
@@ -164,13 +164,35 @@ function AddBarObjectInfoToElement (bobj, element) {
 
     libmei.AddAttribute(element, 'tstamp', ConvertPositionToTimestamp(bobj.Position, bar));
 
-    if (bobj.Type = 'Line' or bobj.Type = 'Slur' or bobj.Type = 'DiminuendoLine' or bobj.Type = 'CrescendoLine')
+    switch (bobj.Type)
     {
-        libmei.AddAttribute(element, 'tstamp2', ConvertPositionWithDurationToTimestamp(bobj));
+        case('Line')
+        {
+            libmei.AddAttribute(element, 'tstamp2', ConvertPositionWithDurationToTimestamp(bobj));
+        }
+        case('Slur')
+        {
+            libmei.AddAttribute(element, 'tstamp2', ConvertPositionWithDurationToTimestamp(bobj));
+        }
+        case('DiminuendoLine')
+        {
+            libmei.AddAttribute(element, 'tstamp2', ConvertPositionWithDurationToTimestamp(bobj));
+        }
+        case('CrescendoLine')
+        {
+            libmei.AddAttribute(element, 'tstamp2', ConvertPositionWithDurationToTimestamp(bobj));
+        }
+        case('GlissandoLine')
+        {
+            libmei.AddAttribute(element, 'tstamp2', ConvertPositionWithDurationToTimestamp(bobj));
+        }
+        case('Trill')
+        {
+            libmei.AddAttribute(element, 'tstamp2', ConvertPositionWithDurationToTimestamp(bobj));
+        }
     }
 
     libmei.AddAttribute(element, 'staff', bar.ParentStaff.StaffNum);
-
     libmei.AddAttribute(element, 'layer', voicenum);
 
     if (bobj.Dx > 0)