(music_property_def): oops. SCM_UNDEFINED

forgotten with scm_list_n. Fixes spurious coredumps.

diff --git a/ChangeLog b/ChangeLog
index a9acbd35e832d0e48db0180536e079ca153c1870..d8aedc4d71eebe1f7d42fd04ede8b7965760eb18 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-02-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * 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 666b400d1aa465c5428a2d7920029338ecc3cdc3..b787a1e72961c2361d7f5e32ac1273a2c8118966 100644 (file)
--- 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 011662e0d49b7683aa879fb7cf0ea0fefe926682..e5fe3d64a3f2ae3a7316328843c125fd868bafc4 100644 (file)
--- 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 358895ea78ddebba454a2f6ccb824efa6758cfe1..0aa5803a0a88e03d7233591aff6bafa024091c89 100644 (file)
--- 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 b6d7c70d04d57365008317f1e69207507ff5b7d8..be67c1cb6c6c25e645a3e7abdde9e0e04e19f184 100644 (file)
--- 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 e72ee69694fdfda54eab19edc13363622d590a72..da534bce97c094e0c34395d340fef5678b43272a 100644 (file)
--- 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 590cb1fceb6266b7cb4797eca521f8a2d5f9da00..297153fef465d84a131fd6e1a82c4961940a6494 100644 (file)
--- 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)))