From: Han-Wen Nienhuys Date: Mon, 31 Jul 2006 13:10:29 +0000 (+0000) Subject: * input/regression/tuplet-full-length-note.ly: add file. X-Git-Tag: cvs/HEAD~198 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cd8d085d0ca2487e965483554850234931156e9a;p=lilypond.git * input/regression/tuplet-full-length-note.ly: add file. * lily/instrument-name-engraver.cc (acknowledge_axis_group): always store axis group. --- diff --git a/ChangeLog b/ChangeLog index e1c3ed326f..10f437ce34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-07-31 Han-Wen Nienhuys + + * input/regression/tuplet-full-length-note.ly: add file. + + * lily/instrument-name-engraver.cc (acknowledge_axis_group): + always store axis group. + 2006-07-27 Han-Wen Nienhuys * input/regression/instrument-switch.ly: new file. diff --git a/input/regression/tuplet-full-length-note.ly b/input/regression/tuplet-full-length-note.ly new file mode 100644 index 0000000000..ac001bf60c --- /dev/null +++ b/input/regression/tuplet-full-length-note.ly @@ -0,0 +1,24 @@ +\header { + + + texidoc = "tuplet can be made to run to prefatory matter or +the next note, by setting @code{tupletFullLengthNote}." + + } + +\version "2.9.12" + +\new RhythmicStaff { + \set tupletFullLength = ##t + \time 4/4 + \times 4/5 { + c'4 c'1 + } + \set tupletFullLengthNote = ##t + \time 2/4 + \times 2/3 { + c4 c c + } + \time 3/4 + c'4 c'4 c'4 +} diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 4746d4a09d..000058d629 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -97,8 +97,7 @@ Instrument_name_engraver::start_spanner () void Instrument_name_engraver::acknowledge_axis_group (Grob_info info) { - if (text_spanner_ - && dynamic_cast (info.grob ()) + if (dynamic_cast (info.grob ()) && Axis_group_interface::has_axis (info.grob (), Y_AXIS) && (!Align_interface::has_interface (info.grob ()))) {