From c6a5b9b4a8a46c18ea94886627e57dcfbb7bfa0d Mon Sep 17 00:00:00 2001 From: Phil Holmes Date: Fri, 31 Aug 2012 17:48:55 +0100 Subject: [PATCH] Fixes bug in abc2ly and abc2ly regtest --- input/regression/abc2ly/clefs.abc | 8 ++++---- scripts/abc2ly.py | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 input/regression/abc2ly/clefs.abc diff --git a/input/regression/abc2ly/clefs.abc b/input/regression/abc2ly/clefs.abc old mode 100644 new mode 100755 index 18403238ac..18ed718ca5 --- 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 d04068fa31..60900ca831 100644 --- 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 () -- 2.39.2