From: Han-Wen Nienhuys Date: Tue, 8 Nov 2005 14:40:59 +0000 (+0000) Subject: * accidentals-below-notes.ly (reportedin): simplify. X-Git-Tag: release/2.7.17~44 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eff7bc2d30efe0ba1d6506c6a71488a8a873d687;p=lilypond.git * accidentals-below-notes.ly (reportedin): simplify. * lily/tuplet-bracket.cc (print): change check: remove bracket if less then 1/5th of total length. (print): use gap too. Fixes tupletUp-single-bracket.ly * lily/grob-closure.cc (add_offset_callback): bugfix: properly add offset callbacks. This fixes alignment for Fingering objects. --- diff --git a/ChangeLog b/ChangeLog index 0e4bf972ca..ef5bb843d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2005-11-08 Han-Wen Nienhuys + * lily/tuplet-bracket.cc (print): change check: remove bracket if + less then 1/5th of total length. + (print): use gap too. Fixes tupletUp-single-bracket.ly + * scm/music-functions.scm (glue-mm-rest-texts): also put other - events into EventChord. This fixes textspanners on mm rests. + events into EventChord. This fixes textspanners on mm rests. Fixes spanner-rest.ly * lily/side-position-interface.cc (get_axis): read side-axis (set_axis): set side-axis. @@ -11,7 +15,7 @@ * lily/spacing-spanner.cc (breakable_column_spacing): add average-spacing-wishes. Take maximum if not set. - (musical_column_spacing): idem. + (musical_column_spacing): idem. Fixes: spacing-keysig-note.ly * scm/define-grobs.scm (all-grob-descriptions): add average-spacing-wishes. @@ -27,11 +31,12 @@ to key sig. * lily/dynamic-engraver.cc (acknowledge_stem_tremolo): new function. - + Fixes: c-tremolo-script.ly. + * lily/text-engraver.cc (acknowledge_stem_tremolo): new function. * lily/script-engraver.cc (acknowledge_stem_tremolo): new function. - + * scm/define-grobs.scm (all-grob-descriptions): remove self-X-offset. Fixes alignment of octavate-8. diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 297e6a4bea..400dd9713a 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -223,20 +223,19 @@ Tuplet_bracket::print (SCM smob) /* No bracket when it would be smaller than the number. - - TODO: should use GAP in calculation too. */ - if (bracket_visibility && number_visibility - && mol.extent (X_AXIS).length () > w) - bracket_visibility = false; - - if (bracket_visibility) + Real gap = 0.; + if (bracket_visibility && number_visibility) { - Real gap = 0.; - if (!num.extent (X_AXIS).is_empty ()) gap = num.extent (X_AXIS).length () + 1.0; + + if (w - gap < w / 4.0) + bracket_visibility = false; + } + if (bracket_visibility) + { Drul_array zero (0, 0); Real ss = Staff_symbol_referencer::staff_space (me); Drul_array height