From: Han-Wen Nienhuys Date: Mon, 17 Oct 2005 15:59:36 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.7.13~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7ba314d34db2c69e7b87bb926705863c80aeb99f;p=lilypond.git *** empty log message *** --- diff --git a/lily/grob-array-scheme.cc b/lily/grob-array-scheme.cc index 89aba0afb9..e408a39b36 100644 --- a/lily/grob-array-scheme.cc +++ b/lily/grob-array-scheme.cc @@ -33,7 +33,7 @@ LY_DEFINE (ly_grob_array_ref, "ly:grob-array-ref", int i = scm_to_int (index); if (i < 0 || i >= me->size ()) { - scm_out_of_range (NULL, scm_from_size_t (i)); + scm_out_of_range (NULL, scm_from_int (i)); } return me->grob (i)->self_scm (); diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 5b8d2fefcf..5013e406df 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -283,8 +283,8 @@ Line_spanner::print (SCM smob) { Axis ax = (Axis)a; dxy[ax] - = + bound[RIGHT]->extent (common[X_AXIS], ax).center () - - bound[LEFT]->extent (common[X_AXIS], ax).center (); + = + robust_relative_extent (bound[RIGHT], common[X_AXIS], ax).center () + - robust_relative_extent (bound[LEFT], common[X_AXIS], ax).center (); my_off[ax] = me->relative_coordinate (common[a], ax); his_off[ax] = bound[LEFT]->relative_coordinate (common[a], ax); diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index fd23168585..14a2015655 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -629,7 +629,7 @@ (GridLine . ( - (callbacks . (stencil . ,Grid_line_interface::print)) + (callbacks . ((stencil . ,Grid_line_interface::print))) (X-extent-callback . ,Grid_line_interface::width_callback) (self-alignment-X . ,CENTER) (X-offset-callbacks . (,Self_alignment_interface::aligned_on_self diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm index 95c89a8480..58d7eea429 100644 --- a/scm/define-music-properties.scm +++ b/scm/define-music-properties.scm @@ -60,6 +60,7 @@ descend in the context tree.") (length-callback ,procedure? "How to compute the duration of this music. This property can only be defined as initializer in @file{define-music-types.scm}.") (name ,symbol? "Name of this music object") + (no-continuation ,boolean? "If set, disallow continuation lines") (numerator ,integer? "numerator of a time signature") (once ,boolean? "Apply this operation only during one time step?") (octavation ,integer?