* lily/midi-item.cc (to_string): use to_int() iso. int cast.

* lily/staff-performer.cc (initialize): add tempo/name to
audio_staff_

diff --git a/ChangeLog b/ChangeLog
index 455e247cb8f3603e0f409ed0551e1f1756f000a7..58037d40f587257d91650139ea56cd0c124dc666 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/midi-item.cc (to_string): use to_int() iso. int cast.
+
+       * lily/staff-performer.cc (initialize): add tempo/name to
+       audio_staff_
+
+
 2005-08-26  Graham Percival  <gpermus@gmail.com>
 
        * Documentation/user/advanced.itely: add text-only example.

diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely
index fced60c528fdd5eff92a4b7511c5193343a74118..1fef780d486586484d9eb1693d11b5c858edf783 100644 (file)
--- a/Documentation/topdocs/NEWS.tely
+++ b/Documentation/topdocs/NEWS.tely
@@ -53,7 +53,7 @@ the appropriate @code{spacing-procedure} property is set.
 
 @lilypond[relative=2,fragment,raggedright]
 \override MultiMeasureRestText #'spacing-procedure
-  = #Multi_measure_rest::set_spacing_rods
+  = #Multi_measure_rest::set_text_rods
 c1 R1 R1^"Very long long long text" 
 @end lilypond
 

diff --git a/flower/rational.cc b/flower/rational.cc
index 5bcf7b39609396fe56908822e8190d209c12db31..133187ef99f3d1c02ed848addd30463dd9ffabc9 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -286,7 +286,7 @@ Rational::to_string () const
 int
 Rational::to_int () const
 {
-  return num () / den ();
+  return (int) num () / den ();
 }
 
 int

diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index 7514ed43cd63c654923a6eee24f92df91fb7d7c7..486eba714445c29690375fda0f85afd87f3a9587 100644 (file)
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -23,7 +23,7 @@ measures stretch to accomodate wide texts.
   R2.*3_\markup { \roman "a1b2c3" }
   R2.*10^"inner"^"top"_"inner"_"bot"
   \override MultiMeasureRestText #'spacing-procedure
-    = #Multi_measure_rest::set_spacing_rods
+    = #Multi_measure_rest::set_text_rods
 
   R2.^"very very very very very very long text"
   c'2.

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 350bb283320a0d827cf6698315b71dd58c167deb..3e13665a36567702c030e8117ba1616d6daf9e9c 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -72,9 +72,11 @@ Midi_chunk::to_string () const
   String length_string = String_convert::int2hex (dat.length ()
                                                  + footer_string_.length (), 8, '0');
   length_string = String_convert::hex2bin (length_string);
+
   str += length_string;
   str += dat;
   str += footer_string_;
+
   return str;
 }
 
@@ -103,7 +105,7 @@ Midi_event::to_string () const
 {
   Rational rat_dt = (delta_mom_.main_part_ * Rational (384)
                     + delta_mom_.grace_part_ * Rational (100)) * Rational (4);
-  int delta_i = int (rat_dt);
+  int delta_i = rat_dt.to_int ();
 
   String delta_string = Midi_item::i2varint_string (delta_i);
   String midi_string = midi_->to_string ();

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index 7de516cccc416289b06078bd4bf98f3f1bade4ed..c560e5b135e722f708cf9192f9f5bf45c31f4334 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -63,12 +63,14 @@ void
 Staff_performer::initialize ()
 {
   audio_staff_ = new Audio_staff;
-  announce_element (Audio_element_info (audio_staff_, 0));
-
   name_ = new Audio_text (Audio_text::TRACK_NAME, context ()->id_string ());
-  announce_element (Audio_element_info (name_, 0));
-
   tempo_ = new Audio_tempo (get_tempo ());
+
+  audio_staff_->add_audio_item (name_);
+  audio_staff_->add_audio_item (tempo_);
+  
+  announce_element (Audio_element_info (audio_staff_, 0));
+  announce_element (Audio_element_info (name_, 0));
   announce_element (Audio_element_info (tempo_, 0));
 }
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index ccf5006c1fdfb65c2a20361d94b93a0eb1a7fcc2..e20ee9fdb06aa369ff054d134cf87384d083e18d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -818,6 +818,7 @@
     (MultiMeasureRestNumber
      . (
        (print-function . ,Text_interface::print)
+       (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
@@ -836,7 +837,6 @@
     (MultiMeasureRestText
      . (
        (print-function . ,Text_interface::print)
-       (spacing-procedure . ,Multi_measure_rest::set_text_rods)
        (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self
                               ,Self_alignment_interface::centered_on_other_axis_parent))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))