From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 9 Jun 2005 10:26:19 +0000 (+0000)
Subject: * lily/include/lily-proto.hh: add Context_def. This fixes FC4
X-Git-Tag: release/2.5.30~20
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3a7af0847953fbc5b4ed838537cb9ab826fd4185;p=lilypond.git

* 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 8376ca3468..41a0e326a7 100644
--- 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 9aa20c071c..bed9339056 100644
--- 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 4d9c630b3d..8bcd41237c 100644
--- 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 9afd1e5be4..7b2b22b362 100644
--- 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"))) {