From 1c5660c741b979658e6f41cb2832c8a2f4c7f3bf Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 20 May 2006 19:54:42 +0000 Subject: [PATCH] (register_stencil_head): opps, append to cdr of static SCM object. Backportme. --- ChangeLog | 5 +++++ lily/beam.cc | 7 +++---- lily/glissando-engraver.cc | 3 ++- lily/stencil-expression.cc | 2 +- scm/output-socket.scm | 1 + 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee3afe6695..fedb1c577c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-20 Han-Wen Nienhuys + + * lily/stencil-expression.cc (register_stencil_head): opps, append + to cdr of static SCM object. Backportme. + 2006-05-19 Graham Percival * Documentation/user/README.txt, lilypond.tely, macros.itexi: diff --git a/lily/beam.cc b/lily/beam.cc index 8089cb8270..1a4e0e3661 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -820,7 +820,7 @@ Beam::calc_least_squares_positions (SCM smob, SCM posns) Interval pos (0,0); if (count < 1) return ly_interval2scm (pos); - + vector x_posns; extract_grob_set (me, "stems", stems); Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS); @@ -832,7 +832,7 @@ Beam::calc_least_squares_positions (SCM smob, SCM posns) Grob *lvs = last_visible_stem (me); Interval ideal (Stem::get_stem_info (fvs).ideal_y_ - + fvs->relative_coordinate (commony, Y_AXIS) -my_y, + + fvs->relative_coordinate (commony, Y_AXIS) - my_y, Stem::get_stem_info (lvs).ideal_y_ + lvs->relative_coordinate (commony, Y_AXIS) - my_y); @@ -1157,8 +1157,7 @@ Beam::set_stem_lengths (SCM smob) bool gap = false; Real thick = 0.0; - if (scm_is_number (me->get_property ("gap-count")) - && scm_to_int (me->get_property ("gap-count"))) + if (robust_scm2int (me->get_property ("gap-count"), 0)) { gap = true; thick = get_thickness (me); diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 1219ac6573..f5b0527bd1 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -24,8 +24,9 @@ public: protected: DECLARE_ACKNOWLEDGER (rhythmic_head); virtual void finalize (); - void stop_translation_timestep (); virtual bool try_music (Music *); + + void stop_translation_timestep (); void process_music (); private: Spanner *line_; diff --git a/lily/stencil-expression.cc b/lily/stencil-expression.cc index ae9127cfbb..6e51ec9b9d 100644 --- a/lily/stencil-expression.cc +++ b/lily/stencil-expression.cc @@ -17,7 +17,7 @@ void register_stencil_head (SCM symbol) heads = scm_permanent_object (scm_cons (SCM_EOL, SCM_EOL)); scm_set_object_property_x (symbol, ly_symbol2scm ("stencil-head?"), SCM_BOOL_T); - scm_set_cdr_x (heads, scm_cons (symbol, heads)); + scm_set_cdr_x (heads, scm_cons (symbol, scm_cdr (heads))); } bool diff --git a/scm/output-socket.scm b/scm/output-socket.scm index df37302650..c8a0fac3c7 100644 --- a/scm/output-socket.scm +++ b/scm/output-socket.scm @@ -11,6 +11,7 @@ (define (dummy . rest) "") +(display (ly:all-stencil-expressions)) (for-each (lambda (x) (module-define! (current-module) -- 2.39.2