patch::: 1.5.17.jcn6

1.5.17.jcn6 - aka: `pgwit!  Ah, dacht dat-i zo wel aardig was.'

diff --git a/CHANGES b/CHANGES
index 8dc35c4df8351dd97c64c79aff071f0d5981b809..e10993120db552b49cf33af98fdd2535bdcc570f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-1.5.17.jcn5 - aka: `pgwit!  Ah, dacht dat-i zo wel aardig was.'
+1.5.17.jcn6 - aka: `pgwit!  Ah, dacht dat-i zo wel aardig was.'
 ===========
 
 * Some more hacking at midi2ly.py:
@@ -13,7 +13,8 @@
    - don't repeat duration by default
    - bugfix: allow 8th notes too
    - include new version of input/test/midi-scales.ly
-   - added barchecks
+   - added barchecks + fix
+   - bugfix for relative mode
 
 * Shorter MIDI creation texts.
 

diff --git a/VERSION b/VERSION
index 74e93a0f36532e559aecb29d0ad938986c160245..b8f2d2a038c1cb54a2b0d23f42b24eb862712c25 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=17
-MY_PATCH_LEVEL=jcn5
+MY_PATCH_LEVEL=jcn6
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index aadc17f24d39d3455b2f856f7c9c5ac3b156af8b..3e29526addfb7b80c106561948e6c1bef88a9847 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -216,9 +216,11 @@ class Note:
                else:
                        delta = self.pitch - reference_note.pitch
                        commas = sign (delta) * (abs (delta) / 12)
-                       if (sign (delta) \
-                           * (self.notename - reference_note.notename) + 7) \
-                           % 7 >= 4:
+                       if ((sign (delta) \
+                            * (self.notename - reference_note.notename) + 7) \
+                           % 7 >= 4) \
+                           or ((self.notename == reference_note.notename) \
+                               and (abs (delta) > 4) and (abs (delta) < 12)):
                                commas = commas + sign (delta)
                        
                if commas > 0:
@@ -599,7 +601,11 @@ def dump_bar_line (last_bar_t, t, bar_count):
                
                if t - last_bar_t == bar_t:
                        s = '|\n  %% %d\n  ' % bar_count
-               last_bar_t = t
+                       last_bar_t = t
+               else:
+                       # urg, this will barf at meter changes
+                       last_bar_t = last_bar_t + (t - last_bar_t) / bar_t * bar_t
+                       
        return (s, last_bar_t, bar_count)