CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch: lilypond_2_6
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/07/10 11:23:23
Modified files:
. : ChangeLog
lily : music-wrapper.cc
Log message:
(Music_wrapper): use start_callback_proc
(not length_callback_proc) for start_callback_. This fixes grace
notes at the start of music wrappers.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?only_with_tag=lilypond_2_6&tr1=1.3836.2.2&tr2=1.3836.2.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/music-wrapper.cc.diff?only_with_tag=lilypond_2_6&tr1=1.40&tr2=1.40.2.1&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3836.2.2 lilypond/ChangeLog:1.3836.2.3
--- lilypond/ChangeLog:1.3836.2.2 Fri Jul 8 19:27:58 2005
+++ lilypond/ChangeLog Sun Jul 10 11:23:22 2005
@@ -1,3 +1,9 @@
+2005-07-10 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/music-wrapper.cc (Music_wrapper): use start_callback_proc
+ (not length_callback_proc) for start_callback_. This fixes grace
+ notes at the start of music wrappers.
+
2005-07-08 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* po/{de,fr}.po: update.
Index: lilypond/lily/music-wrapper.cc
diff -u /dev/null lilypond/lily/music-wrapper.cc:1.40.2.1
--- /dev/null Sun Jul 10 11:23:23 2005
+++ lilypond/lily/music-wrapper.cc Sun Jul 10 11:23:23 2005
@@ -0,0 +1,45 @@
+/*
+ music-wrapper.cc -- implement Music_wrapper
+
+ source file of the GNU LilyPond music typesetter
+
+ (c) 1998--2005 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+*/
+
+#include "music-wrapper.hh"
+
+Music_wrapper::Music_wrapper (SCM x)
+ : Music (x)
+{
+ if (!ly_c_procedure_p (length_callback_))
+ length_callback_ = length_callback_proc;
+ if (!ly_c_procedure_p (start_callback_))
+ start_callback_ = start_callback_proc;
+}
+
+MAKE_SCHEME_CALLBACK (Music_wrapper, start_callback, 1);
+SCM
+Music_wrapper::start_callback (SCM m)
+{
+ Music *me = unsmob_music (m);
+ Music *elt = unsmob_music (me->get_property ("element"));
+ return elt->start_mom ().smobbed_copy ();
+}
+
+MAKE_SCHEME_CALLBACK (Music_wrapper, length_callback, 1);
+SCM
+Music_wrapper::length_callback (SCM m)
+{
+ Music *me = unsmob_music (m);
+ Music *elt = unsmob_music (me->get_property ("element"));
+ return elt->get_length ().smobbed_copy ();
+}
+
+Music *
+Music_wrapper::element () const
+{
+ return unsmob_music (get_property ("element"));
+}
+
+ADD_MUSIC (Music_wrapper);
+
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
