midi fix

diff --git a/ChangeLog b/ChangeLog
index 1d97d84456737bb07aa62e21ede06c8b41d62911..fc50fac890ada49618c810577a86b867a745637c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-21  Han-Wen  <hanwen@cs.uu.nl>
 
+       * scm/grob-description.scm:  fix alignment of barnumber: make sure
+       it doesn't hit the G-clef. 
+
        * input/mozart-hrn3-defs.ly (startGraceMusic): typo (it's
        startGraceMusic not startGraceContext).
 

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 6fc0980ac84277f04ecfcbc46642d93db984f4d1..3d5b366a1008b7801755686cfb8576eb9603a3b8 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -37,7 +37,7 @@ Midi_stream::operator << (String str)
 {
   Byte * b = str.byte_l();
   for (int sz = str.length_i (); sz--;)
-    *os_p_ << *b;
+    *os_p_ << *b ++;
   return *this;
 }
 
@@ -59,10 +59,12 @@ Midi_stream::operator << (Midi_item const& midi_c_r)
        i = str.index_i ("0a");
       }
     }
-
-  Byte * b = str.byte_l();
-  for (int sz = str.length_i (); sz--;)
-    *os_p_ << *b;
+  else
+    {
+      Byte * b = str.byte_l();
+      for (int sz = str.length_i (); sz--;)
+       *os_p_ << *b++;
+    }
   
   return *this;
 }

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 7b631f98343849613789fbded830a8d264ade560..647551589a6c9b9598fee28ae2de600d9f808703 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -78,9 +78,13 @@
        (font-family . roman)
        (font-relative-size . -1)
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
+       (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
+       (self-alignment-X . 1)
+       (extra-offset . (1.3 . 0))
        (meta .
              ((interfaces . (side-position-interface
                              text-interface
+                             self-alignment-interface
                              font-interface break-aligned-interface))))
 
             ))