CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/09 10:26:19
Modified files:
. : ChangeLog
lily : note-heads-engraver.cc parser.yy
lily/include : lily-proto.hh
Log message:
* lily/include/lily-proto.hh: add Context_def. This fixes FC4
compile.
* lily/parser.yy (Repeated_music): remove >?
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3745&tr2=1.3746&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-heads-engraver.cc.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.472&tr2=1.473&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/include/lily-proto.hh.diff?tr1=1.125&tr2=1.126&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3745 lilypond/ChangeLog:1.3746
--- lilypond/ChangeLog:1.3745 Thu Jun 9 10:14:31 2005
+++ lilypond/ChangeLog Thu Jun 9 10:26:19 2005
@@ -1,5 +1,10 @@
2005-06-09 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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.
Index: lilypond/lily/include/lily-proto.hh
diff -u lilypond/lily/include/lily-proto.hh:1.125
lilypond/lily/include/lily-proto.hh:1.126
--- lilypond/lily/include/lily-proto.hh:1.125 Wed Mar 16 19:19:15 2005
+++ lilypond/lily/include/lily-proto.hh Thu Jun 9 10:26:19 2005
@@ -42,6 +42,7 @@
class Cluster_engraver;
class Column_x_positions;
class Context;
+class Context_def;
class Context_specced_music;
class Engraver;
class Engraver;
Index: lilypond/lily/note-heads-engraver.cc
diff -u lilypond/lily/note-heads-engraver.cc:1.100
lilypond/lily/note-heads-engraver.cc:1.101
--- lilypond/lily/note-heads-engraver.cc:1.100 Tue May 3 12:13:28 2005
+++ lilypond/lily/note-heads-engraver.cc Thu Jun 9 10:26:19 2005
@@ -74,10 +74,17 @@
}
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))
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.472 lilypond/lily/parser.yy:1.473
--- lilypond/lily/parser.yy:1.472 Tue Jun 7 15:13:06 2005
+++ lilypond/lily/parser.yy Thu Jun 9 10:26:19 2005
@@ -994,7 +994,7 @@
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"))) {
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
