Fixes bug in abc2ly and abc2ly regtest

diff --git a/input/regression/abc2ly/clefs.abc b/input/regression/abc2ly/clefs.abc
old mode 100644 (file)
new mode 100755 (executable)
index 1840323..18ed718
--- a/input/regression/abc2ly/clefs.abc
+++ b/input/regression/abc2ly/clefs.abc
@@ -3,11 +3,11 @@ T: Various different clefs
 L: 1/4
 K: none
 CEGc | [K: C treble] CEGc |[K: Cm bass]CEGc |
-w: none | treble | bass |
+w: none * * * | treble * * * | bass * * * |
 [K: C bass3]CEGc | [K: Cm alto4]CEGc| [K: C alto]CEGc |
-w: baritone | tenor | alto |
+w: baritone * * * | tenor * * * | alto * * * |
 [K: Cm alto2]CEGc | [K: C alto1]CEGc | [K: Cm treble-8]CEGc |
-w: mezzosoprano | soprano | treble-8 | 
+w: mezzosoprano * * * | soprano * * * | treble-8 * * |
 [K: C treble-8va]CEGc | [K: Cm treble+8]CEGc | [K: C treble8]CEGc |]
-w: treble-8va | treble+8 | treble8 | 
+w: treble-8va * * | treble+8 * * * | treble8 * * * |
 

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index d04068fa31cdaa25a51aef3d902ac3a36a1951ec..60900ca8315d78890eebea3a208b4a139790c8f0 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -433,6 +433,8 @@ key_lookup = {         # abc to lilypond key mode names
 }
 
 def lily_key (k):
+    if k == 'none':
+        return
     orig = "" + k
     # UGR
     k = k.lower ()