From 6288ae0c2d5a9e4c6246833cd131906c239b8272 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 18 Aug 2002 01:10:35 +0000 Subject: [PATCH] * lily/break-substitution.cc (fast_fubstitute_grob_list): use realloc() * lily/dynamic-engraver.cc (process_music): don't use SCM_UNDEFINED --- ChangeLog | 5 +++++ input/regression/spacing-individual-tuning.ly | 22 ------------------- lily/break-substitution.cc | 3 ++- lily/dynamic-engraver.cc | 7 +++++- scm/grob-description.scm | 2 +- 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index b90ccc4d39..6adf4ed88c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2002-08-18 Han-Wen Nienhuys + * 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 diff --git a/input/regression/spacing-individual-tuning.ly b/input/regression/spacing-individual-tuning.ly index 524f72bd4e..8b13789179 100644 --- 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 44fcea0fbc..fe3b1ea182 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -1,4 +1,5 @@ #include +#include #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 d0d79edab9..5c97d814de 100644 --- 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 f6829adbca..5894a55a53 100644 --- 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 -- 2.39.5