* lily/include/lily-proto.hh: add Context_def. This fixes FC4

compile.

* lily/parser.yy (Repeated_music): remove >?

diff --git a/ChangeLog b/ChangeLog
index 8376ca3468e928026ee78364ad59989ef1859a21..41a0e326a7d956cfaa884f92aa0366b2156d411f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-06-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/include/lily-proto.hh: add Context_def. This fixes FC4
+       compile.
+
+       * lily/parser.yy (Repeated_music): remove >? 
+
        * scm/framework-ps.scm (write-preamble): Support for -d
        gs-font-load=1: read fonts via ghostscript. 
        

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index 9aa20c071cba8726f7d106ae795eb0f7ede10c43..bed9339056d58f9fd64e7d591fda4503615637e0 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -42,6 +42,7 @@ class Chord_tremolo_iterator;
 class Cluster_engraver;
 class Column_x_positions;
 class Context;
+class Context_def;
 class Context_specced_music;
 class Engraver;
 class Engraver;

diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc
index 4d9c630b3dda560c39c30f1be1a1e6e2bd487acf..8bcd41237ca11017b3d2e9a9390fc6638aae23fb 100644 (file)
--- a/lily/note-heads-engraver.cc
+++ b/lily/note-heads-engraver.cc
@@ -74,10 +74,17 @@ Note_heads_engraver::process_music ()
        }
 
       Pitch *pit = unsmob_pitch (ev->get_property ("pitch"));
+
+#if 0
+      /*
+       TODO: should have a mechanism to switch off these warnings.
+       */
       if (!pit)
        {
          ev->origin ()->warning (_ ("NoteEvent without pitch"));
        }
+#endif
+      
       int pos = pit ? pit->steps () : 0;
       SCM c0 = get_property ("middleCPosition");
       if (scm_is_number (c0))

diff --git a/lily/parser.yy b/lily/parser.yy
index 9afd1e5be4f0cc2b8332fec6998bf84db1359e2c..7b2b22b3620117de898927037925dfa022424696 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -994,7 +994,7 @@ Repeated_music:
                        r-> set_property ("element", beg->self_scm ());
                        scm_gc_unprotect_object (beg->self_scm ());
                        }
-               r->set_property ("repeat-count", scm_int2num (times >? 1));
+               r->set_property ("repeat-count", scm_int2num (max (times, 1)));
 
                r-> set_property ("elements",alts);
                if (ly_c_equal_p ($2, scm_makfrom0str ("tremolo"))) {