From 6e272a116fe402adc5e4f572688d02d1adda66f2 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 19 Jul 2003 10:00:21 +0000 Subject: [PATCH 1/1] * lily/separation-item.cc: add padding property. * input/test/*.ly: various fixes, remove solo-a2.ly --- ChangeLog | 4 ++++ input/test/solo-a2.ly | 29 ----------------------------- lily/separation-item.cc | 10 +++------- 3 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 input/test/solo-a2.ly diff --git a/ChangeLog b/ChangeLog index 0e7422cf20..4f301be3e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-07-19 Han-Wen Nienhuys + * lily/separation-item.cc: add padding property. + + * input/test/*.ly: various fixes, remove solo-a2.ly + * scm/new-markup.scm (brew-new-markup-molecule): arg order bugfix. Fixes old-style markup compatibility. diff --git a/input/test/solo-a2.ly b/input/test/solo-a2.ly deleted file mode 100644 index cb3a488bec..0000000000 --- a/input/test/solo-a2.ly +++ /dev/null @@ -1,29 +0,0 @@ -\version "1.7.18" -%rename to partcobine- something. -gp - -\header {texidoc = "@cindex Partcombine something. " - -% FIXMEsoon. -} - -\score{ - \context Staff = one < - \context Voice=one { \skip 1 } - \context Voice=two { \skip 1 } - - \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' - { - e \property Voice.soloADue = ##f e - } - \context Thread=two \notes\relative c'' - { - e \property Voice.soloADue = ##f e - } - > - \paper{ -% linewidth = 100.\mm - raggedright=##t - } -} - diff --git a/lily/separation-item.cc b/lily/separation-item.cc index 0b8776eead..5255b65c02 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -122,12 +122,9 @@ Separation_item::width (Grob *me) w[LEFT] -= gh_scm2double (pad)/2; } - me->set_grob_property ("X-extent", ly_interval2scm (w)); - return w; - // add this->offset_ ? this-> relative_coordinate ()? } @@ -137,7 +134,6 @@ Separation_item::width (Grob *me) ADD_INTERFACE (Separation_item,"separation-item-interface", "Item that computes widths to generate spacing rods.\n" "\n" -"Calc dimensions for the Separating_group_spanner; this has to be " -"an item to get dependencies correct. It can't be an grob_group " -"since these usually are in a different X_group ", - "X-extent conditional-elements elements"); +"Calculate dimensions for the Separating_group_spanner; this has to be " +"an item to get dependencies correct. " + "padding X-extent conditional-elements elements"); -- 2.39.2