From: hanwen Date: Thu, 18 Aug 2005 12:54:26 +0000 (+0000) Subject: (get_spacing): remove kludge for EOL wide X-Git-Tag: release/2.6.4~17^2~49 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6a2d70f3e075e6bc271d567e9098cdf7a3b741ca;p=lilypond.git (get_spacing): remove kludge for EOL wide time sigs and related stuff. --- diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc index 2bc95d7650..8f55664c33 100644 --- a/lily/note-spacing.cc +++ b/lily/note-spacing.cc @@ -144,6 +144,12 @@ Note_spacing::get_spacing (Grob *me, Item *right_col, */ *space = (base_space - increment) + *fixed; +#if 0 + /* + The below situation is now handled by the "sticks out a lot" case + above. However we keep around the code for a few releases before + we drop it. + */ if (!extents[RIGHT].is_empty () && (Item::is_breakable (right_col) || right_col->original_)) @@ -161,7 +167,8 @@ Note_spacing::get_spacing (Grob *me, Item *right_col, *space += -extents[RIGHT][LEFT] / 2; *fixed += -extents[RIGHT][LEFT] / 2; } - +#endif + stem_dir_correction (me, right_col, increment, space, fixed); } diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 6ae304dfa3..4c78ab8240 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -56,21 +56,22 @@ Spaceable_grob::add_rod (Grob *me, Grob *p, Real d) } void -Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength) +Spaceable_grob::add_spring (Grob *me, Grob *other, + Real distance, Real inverse_strength) { - if (d <= 0.0 || inverse_strength < 0.0) + if (distance <= 0.0 || inverse_strength < 0.0) { programming_error ("adding reverse spring, setting to unit"); - d = 1.0; + distance = 1.0; inverse_strength = 1.0; } - if (isinf (d) || isnan (d) + if (isinf (distance) || isnan (distance) || isnan (inverse_strength)) { /* strength == INF is possible. It means fixed distance. */ programming_error ("insane distance found"); - d = 1.0; + distance = 1.0; inverse_strength = 1.0; } @@ -79,7 +80,7 @@ Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength) for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s)) { Spring_smob *sp = unsmob_spring (scm_car (s)); - if (sp->other_ == p) + if (sp->other_ == other) { programming_error ("already have that spring"); return; @@ -89,8 +90,8 @@ Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength) Spring_smob spring; spring.inverse_strength_ = inverse_strength; - spring.distance_ = d; - spring.other_ = p; + spring.distance_ = distance; + spring.other_ = other; SCM ideal = me->get_object ("ideal-distances"); ideal = scm_cons (spring.smobbed_copy (), ideal); diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 4bf6d551d8..783889d3c8 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -24,7 +24,8 @@ #include "spacing-interface.hh" Rational -Spacing_spanner::effective_shortest_duration (Grob *me, Link_array const &all) +Spacing_spanner::effective_shortest_duration (Grob *me, + Link_array const &all) { SCM preset_shortest = me->get_property ("common-shortest-duration"); Rational global_shortest; diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index ebda368827..b46432122f 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "2.5.18" +\version "2.7.6" \context { \name Global @@ -11,7 +11,7 @@ } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name Staff \consists "Output_property_engraver" @@ -63,7 +63,7 @@ \context { \Staff - \type "Engraver_group_engraver" + \type "Engraver_group" \name DrumStaff \alias Staff \remove "Accidental_engraver" @@ -85,7 +85,7 @@ \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name InnerChoirStaff \consists "System_start_delimiter_engraver" systemStartDelimiter = #'SystemStartBracket @@ -114,7 +114,7 @@ contained staves are not connected vertically." \context{ - \type "Engraver_group_engraver" + \type "Engraver_group" minimumVerticalExtent = ##f extraVerticalExtent = ##f @@ -160,7 +160,7 @@ contained staves are not connected vertically." \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name Voice \description " @@ -255,7 +255,7 @@ contained staves are not connected vertically." } \context{ - \type "Engraver_group_engraver" + \type "Engraver_group" \name GrandStaff localKeySignature = #'() @@ -292,7 +292,7 @@ contained staves are not connected vertically." } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name InnerStaffGroup \consists "Span_bar_engraver" @@ -331,7 +331,7 @@ connected vertically. " \context{ - \type "Engraver_group_engraver" + \type "Engraver_group" minimumVerticalExtent = #'(-1.2 . 2.4) extraVerticalExtent = ##f verticalExtent = ##f @@ -354,7 +354,7 @@ printing of a single line of lyrics. " } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name NoteNames \consists "Axis_group_engraver" @@ -371,7 +371,7 @@ printing of a single line of lyrics. " } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name ChordNames \description "Typesets chord names." @@ -592,7 +592,7 @@ AncientRemoveEmptyStaffContext = \context { \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name FiguredBass \consists "Figured_bass_engraver" @@ -606,7 +606,7 @@ AncientRemoveEmptyStaffContext = \context { \context { \name "Devnull" - \type "Engraver_group_engraver" + \type "Engraver_group" %% don't want to route anything out of here: \alias "Staff" diff --git a/ly/performer-init.ly b/ly/performer-init.ly index fdbe39372f..7d58354344 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,10 +1,10 @@ -\version "2.6.0" +\version "2.7.6" % % setup for Request->Element conversion. Guru-only % \context { - \type "Performer_group_performer" + \type "Performer_group" \name Staff \accepts Voice @@ -26,7 +26,7 @@ } \context { - \type "Performer_group_performer" + \type "Performer_group" \name Voice % The order of the dynamic performers is significant: absolute dynamic events must override crescendo events in midi. \consists "Span_dynamic_performer" @@ -53,38 +53,38 @@ } \context { - \type "Performer_group_performer" + \type "Performer_group" \name FiguredBass \consists "Swallow_performer" } \context { - \type "Performer_group_performer" + \type "Performer_group" \name GrandStaff \accepts RhythmicStaff \accepts Staff } \context { - \type "Performer_group_performer" + \type "Performer_group" \name "PianoStaff" \accepts Staff \accepts DrumStaff } \context { - \type "Performer_group_performer" + \type "Performer_group" \name "TabVoice" \consists "Swallow_performer" } \context { - \type "Performer_group_performer" + \type "Performer_group" \name "Devnull" \consists "Swallow_performer" } \context { - \type "Performer_group_performer" + \type "Performer_group" \name "TabStaff" \accepts "TabVoice" } @@ -120,8 +120,8 @@ \context { - \type "Performer_group_performer" - \consists "Staff_performer" % Performer_group_performer ? + \type "Performer_group" + \consists "Staff_performer" % Performer_group ? \consists "Lyric_performer" \name Lyrics \consists "Time_signature_performer" @@ -129,7 +129,7 @@ } \context{ - \type "Performer_group_performer" + \type "Performer_group" \name ChoirStaff \accepts Staff \accepts DrumStaff @@ -137,20 +137,20 @@ \context { - \type "Performer_group_performer" + \type "Performer_group" \consists "Staff_performer" \accepts ChordNameVoice \name ChordNames } \context { - \type "Performer_group_performer" + \type "Performer_group" \consists "Note_performer" \name ChordNameVoice } \context { - \type "Performer_group_performer" + \type "Performer_group" \name StaffGroup \accepts Staff diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index c1df9d2044..401b3d3fc2 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -949,7 +949,7 @@ (X-extent-callback . ,Axis_group_interface::group_extent_callback) ;; debugging - ;; (print-function . ,Paper_column::print) (font-size . -6) (font-name . "sans") (Y-extent-callback . #f) + (print-function . ,Paper_column::print) (font-size . -6) (font-name . "sans") (Y-extent-callback . #f) (meta . ((class . Paper_column) (interfaces . (paper-column-interface axis-group-interface @@ -976,7 +976,7 @@ (breakable . #t) ;; debugging stuff: print column number. - ;; (print-function . ,Paper_column::print) (font-size . -6) (font-name . "sans") (Y-extent-callback . #f) + (print-function . ,Paper_column::print) (font-size . -6) (font-name . "sans") (Y-extent-callback . #f) (meta . ((class . Paper_column) (interfaces . (paper-column-interface