CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/28 23:12:13
Modified files:
. : ChangeLog
lily : midi-def.cc tempo-performer.cc
scm : define-grobs.scm
Log message:
* lily/tempo-performer.cc (process_music): idem.
* lily/midi-def.cc (get_tempo): Rational to int conversion bug.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4093&tr2=1.4094&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/midi-def.cc.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tempo-performer.cc.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.234&tr2=1.235&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4093 lilypond/ChangeLog:1.4094
--- lilypond/ChangeLog:1.4093 Sat Aug 27 20:49:04 2005
+++ lilypond/ChangeLog Sun Aug 28 23:12:12 2005
@@ -1,3 +1,9 @@
+2005-08-29 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/tempo-performer.cc (process_music): idem.
+
+ * lily/midi-def.cc (get_tempo): Rational to int conversion bug.
+
2005-08-27 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* Documentation/user/advanced-notation.itely (Text markup): not a
@@ -54,7 +60,7 @@
* scm/define-markup-commands.scm (wordwrap-string): use
text-direction
(wordwrap-stencils): idem.
- (line): idem..
+ (line): idem.
(fill-line): idem.
(wordwrap-stencils): translate last line to right for
text-direction = LEFT.
Index: lilypond/lily/midi-def.cc
diff -u lilypond/lily/midi-def.cc:1.47 lilypond/lily/midi-def.cc:1.48
--- lilypond/lily/midi-def.cc:1.47 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/midi-def.cc Sun Aug 28 23:12:13 2005
@@ -30,8 +30,8 @@
else
wholes_per_min /= *w;
- int beats_per_min = int ((wholes_per_min / one_beat_mom).main_part_);
- return int (beats_per_min);
+ Rational beats_per_min = (wholes_per_min / one_beat_mom).main_part_;
+ return beats_per_min.to_int ();
}
void
Index: lilypond/lily/tempo-performer.cc
diff -u lilypond/lily/tempo-performer.cc:1.41
lilypond/lily/tempo-performer.cc:1.42
--- lilypond/lily/tempo-performer.cc:1.41 Sat Aug 20 23:20:18 2005
+++ lilypond/lily/tempo-performer.cc Sun Aug 28 23:12:13 2005
@@ -49,7 +49,7 @@
Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment
(scm_to_int (met))).main_part_;
- audio_ = new Audio_tempo (int (r));
+ audio_ = new Audio_tempo (r.to_int ());
Audio_element_info info (audio_, tempo_event_);
announce_element (info);
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.234 lilypond/scm/define-grobs.scm:1.235
--- lilypond/scm/define-grobs.scm:1.234 Sat Aug 27 20:05:58 2005
+++ lilypond/scm/define-grobs.scm Sun Aug 28 23:12:13 2005
@@ -908,7 +908,8 @@
. (
(self-alignment-X . 0)
(break-visibility . ,begin-of-line-visible)
- (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
,Self_alignment_interface::aligned_on_self))
+ (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent
+ ,Self_alignment_interface::aligned_on_self))
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(print-function . ,Text_interface::print)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
