* lily/break-substitution.cc (fast_fubstitute_grob_list): use

realloc()

* lily/dynamic-engraver.cc (process_music): don't use SCM_UNDEFINED

diff --git a/ChangeLog b/ChangeLog
index b90ccc4d3995cd6c273c851334d7f67c3b4ac8f1..6adf4ed88cd685a681ddb0d8c1516d18d09d3bbd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-18  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/break-substitution.cc (fast_fubstitute_grob_list): use
+       realloc()
+
+       * lily/dynamic-engraver.cc (process_music): don't use SCM_UNDEFINED
+
        * Documentation/user/tutorial.itely: fixes by Graham Percival.
 
 2002-08-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>

diff --git a/input/regression/spacing-individual-tuning.ly b/input/regression/spacing-individual-tuning.ly
index 524f72bd4e5058d13fddb6acc59d8b9881a616e6..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/input/regression/spacing-individual-tuning.ly
+++ b/input/regression/spacing-individual-tuning.ly
@@ -1,23 +1 @@
-\version "1.5.68"
-\header {
 
-texidoc = "
-
-You can tune spacing of individual notes
-by setting @code{space-factor} in @code{NoteSpacing}.
-
-"
-}
-
-\score { \notes {
-\relative c'' { 
-c8 c8
-\property Voice.NoteSpacing \set #'space-factor = #0.7
- c8 c8
-\property Voice.NoteSpacing \set #'space-factor = #1.4
- c8 c8
-\property Voice.NoteSpacing \set #'space-factor = #1.0
- c8 c8 
-} }
-\paper { linewidth = -1. }
-}

diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc
index 44fcea0fbc48f038e0dfa9cb3c016aac0585926f..fe3b1ea182cbbdc17c37604bb0d8cbbd2e530dc0 100644 (file)
--- a/lily/break-substitution.cc
+++ b/lily/break-substitution.cc
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 #include  "grob.hh"
 #include "item.hh"
@@ -343,7 +344,7 @@ Spanner::fast_fubstitute_grob_list (SCM sym,
 
   if (vec_room < len)
     {
-      vec = (Substitution_entry*) scm_realloc (vec, sizeof (Substitution_entry) * len);
+      vec = (Substitution_entry*) realloc (vec, sizeof (Substitution_entry) * len);
       vec_room = len;
     }
   

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index d0d79edab98578e759de67ff184d3a809629a5cc..5c97d814decb24af1e62d05ac1eaab7cc741ee92 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -246,7 +246,7 @@ Dynamic_engraver::process_music ()
              cresc_  = new Spanner (get_property ("TextSpanner"));
              cresc_->set_grob_property ("type", s);
              daddy_trans_->set_property ((start_type
-                                           + "Spanner").to_str0 (), SCM_UNDEFINED);
+                                           + "Spanner").to_str0 (), SCM_EOL);
              s = get_property ((start_type + "Text").to_str0 ());
              /*
                FIXME: use get_markup () to check type.
@@ -412,6 +412,11 @@ Dynamic_engraver::acknowledge_grob (Grob_info i)
     {
       SCM p = i.grob_->get_grob_property ("script-priority");
 
+      /*
+       UGH.
+
+       DynamicText doesn't really have a script-priority field.
+       */
       if (gh_number_p (p)
          && gh_scm2int (p) < gh_scm2int (script_->get_grob_property ("script-priority")))
        {

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index f6829adbca15ebe1b493126a0d9eb8d44968ce4b..5894a55a53ed611e57567ade5c5fe917c6a5c5cc 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -301,7 +301,7 @@
        (font-family . dynamic)
        (font-shape . italic)
        (self-alignment-Y . 0)
-       (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface item-interface ))))
+       (meta . ((interfaces . (font-interface text-interface self-alignment-interface  dynamic-interface script-interface item-interface ))))
        ))
 
     (DynamicLineSpanner