From: Han-Wen Nienhuys Date: Fri, 20 Feb 2004 10:29:23 +0000 (+0000) Subject: (music_property_def): oops. SCM_UNDEFINED X-Git-Tag: release/2.1.26~13 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=557c7f26f0c62bca9eb620a782e6a8e5bef9103e;p=lilypond.git (music_property_def): oops. SCM_UNDEFINED forgotten with scm_list_n. Fixes spurious coredumps. --- diff --git a/ChangeLog b/ChangeLog index a9acbd35e8..d8aedc4d71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-02-20 Han-Wen Nienhuys + * lily/parser.yy (music_property_def): oops. SCM_UNDEFINED + forgotten with scm_list_n. Fixes spurious coredumps. + * lily/accidental-engraver.cc (stop_translation_timestep): move update of localKeySignature to stop_translation_timestep (). This makes sure that all ties are noticed at the right moment. diff --git a/THANKS b/THANKS index 666b400d1a..b787a1e729 100644 --- a/THANKS +++ b/THANKS @@ -43,6 +43,7 @@ Reuben Thomas Rob V Stef Epardaud Thomas Willhalm +Thomas Scharkowski Tom Bäckström Werner Lemberg Will Oram diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 011662e0d4..e5fe3d64a3 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -247,18 +247,18 @@ leftb = \notes \transpose c cis { \override PianoStaff.InstrumentName #'font-shape = #'italic \override PianoStaff.InstrumentName #'font-magnification = #3 - \set PianoStaff.instrument = "2. " + \set PianoStaff.instrument = " 2." \context Staff = up { \override Staff.DynamicLineSpanner #'direction = #-1 \clef G <<\global \context Voice=upv \righta >> } \context Staff = mid { - \override Staff.InstrumentName #'font-size = #0 - \override Staff.InstrumentName #'font-shape = #'upright - \override Staff.InstrumentName #'font-magnification = #1 - \override Staff.InstrumentName #'extra-offset = #'(0 . 6) + \override Staff.InstrumentName #'font-size = #0 + \override Staff.InstrumentName #'font-shape = #'upright + \override Staff.InstrumentName #'font-magnification = #1 + \override Staff.InstrumentName #'extra-offset = #'(0 . 6) % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" - \set Staff.instrument = \markup { \column < Rechte Hand > } + \set Staff.instrument = \markup { \column < Rechte Hand > \hspace #2 } \clef F <<\global \context Voice=midv \rightb>> } \context Staff = down { diff --git a/lily/parser.yy b/lily/parser.yy index 358895ea78..0aa5803a0a 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1199,7 +1199,7 @@ music_property_def: | UNSET context_prop_spec { $$ = property_op_to_music (scm_list_n ( ly_symbol2scm ("unset"), - gh_cadr ($2))); + gh_cadr ($2), SCM_UNDEFINED)); $$= context_spec_music (gh_car ($2), SCM_UNDEFINED, $$, SCM_EOL); } | ONCE music_property_def { diff --git a/lily/system.cc b/lily/system.cc index b6d7c70d04..be67c1cb6c 100644 --- a/lily/system.cc +++ b/lily/system.cc @@ -102,7 +102,7 @@ uniquify_list (SCM l) } SCM_SETCDR(s, SCM_EOL); - delete arr; + delete[] arr; return l; } diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index e72ee69694..da534bce97 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -851,7 +851,6 @@ (X-extent-callback . ,Span_bar::width_callback) (Y-extent-callback . ()) (breakable . #t) - (glyph . "|") (before-line-breaking-callback . ,Span_bar::before_line_breaking) ;; ugh duplication! diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm index 590cb1fceb..297153fef4 100644 --- a/scm/part-combiner.scm +++ b/scm/part-combiner.scm @@ -485,7 +485,7 @@ the mark when there are no spanners active." (soln (length solo-notes)) (siln (length silent-notes))) - (display (list "trying " type " at " (when now-state) solo-state silent-state "\n")) +; (display (list "trying " type " at " (when now-state) solo-state silent-state "\n")) (cond ((not (equal? (configuration now-state) 'apart)) current-idx) @@ -521,7 +521,7 @@ the mark when there are no spanners active." (n1 (length notes1)) (n2 (length notes2)) ) - (display (list "analyzing step " ri " moment " (when now-state) vs1 vs2 "\n")) +; (display (list "analyzing step " ri " moment " (when now-state) vs1 vs2 "\n")) (max ; we should always increase. @@ -566,7 +566,7 @@ the mark when there are no spanners active." (analyse-a2 0) ; (display result) (analyse-solo12 0) - (display result) +; (display result) (set! result (map (lambda (x) (cons (when x) (configuration x)))