From fd6877e1c25dd96c30e540a4c6951297b90d6ae4 Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Mon, 27 Aug 2012 17:23:28 -0700 Subject: [PATCH] Remove non-functional extra-X-extent non-functional since commit 31a6650e2b2a5c1cae3237ee47b80cd43d084d53 --- lily/grob.cc | 2 -- ly/gregorian.ly | 19 ++++++++++++------- scm/define-grob-properties.scm | 4 ---- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lily/grob.cc b/lily/grob.cc index 9edf8a2f8a..c515c18616 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -804,8 +804,6 @@ ADD_INTERFACE (Grob, "color " "cross-staff " "id " - "extra-X-extent " - "extra-Y-extent " "extra-offset " "footnote-music " "forced-spacing " diff --git a/ly/gregorian.ly b/ly/gregorian.ly index 9c6bd051a6..fd2460c8ef 100644 --- a/ly/gregorian.ly +++ b/ly/gregorian.ly @@ -83,7 +83,8 @@ virgula = { \once \override BreathingSign #'font-size = #-2 % Workaround: add padding. Correct fix would be spacing engine handle this. - \once \override BreathingSign #'extra-X-extent = #'(-1.0 . 0) + \once \override BreathingSign #'minimum-X-extent = #'(-1.0 . 0.0) + \once \override BreathingSign #'minimum-Y-extent = #'(-2.5 . 2.5) \breathe } @@ -92,7 +93,8 @@ caesura = { \once \override BreathingSign #'font-size = #-2 % Workaround: add padding. Correct fix would be spacing engine handle this. - \once \override BreathingSign #'extra-X-extent = #'(-1.0 . 0) + \once \override BreathingSign #'minimum-X-extent = #'(-1.0 . 0.0) + \once \override BreathingSign #'minimum-Y-extent = #'(-2.5 . 2.5) \breathe } @@ -100,7 +102,8 @@ divisioMinima = { \once \override BreathingSign #'stencil = #ly:breathing-sign::divisio-minima % Workaround: add padding. Correct fix would be spacing engine handle this. - \once \override BreathingSign #'extra-X-extent = #'(-1.0 . 0) + \once \override BreathingSign #'minimum-X-extent = #'(-1.0 . 0.0) + \once \override BreathingSign #'minimum-Y-extent = #'(-2.5 . 2.5) \breathe } @@ -109,7 +112,8 @@ divisioMaior = { \once \override BreathingSign #'Y-offset = #0 % Workaround: add padding. Correct fix would be spacing engine handle this. - \once \override BreathingSign #'extra-X-extent = #'(-1.0 . 0) + \once \override BreathingSign #'minimum-X-extent = #'(-1.0 . 0.0) + \once \override BreathingSign #'minimum-Y-extent = #'(-2.5 . 2.5) \breathe } @@ -118,7 +122,8 @@ divisioMaxima = { \once \override BreathingSign #'Y-offset = #0 % Workaround: add padding. Correct fix would be spacing engine handle this. - \once \override BreathingSign #'extra-X-extent = #'(-1.0 . 0) + \once \override BreathingSign #'minimum-X-extent = #'(-1.0 . 0.0) + \once \override BreathingSign #'minimum-Y-extent = #'(-2.5 . 2.5) \breathe } @@ -127,8 +132,8 @@ finalis = { \once \override BreathingSign #'Y-offset = #0 % Workaround: add padding. Correct fix would be spacing engine handle this. - \once \override BreathingSign #'extra-X-extent = #'(-1.0 . 0) - \once \override BreathingSign #'extra-spacing-height = #'(-0.5 . 0.5) + \once \override BreathingSign #'minimum-X-extent = #'(-1.0 . 0.0) + \once \override BreathingSign #'minimum-Y-extent = #'(-2.5 . 2.5) \breathe } diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index a1417729e9..5083c0e5f1 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -276,10 +276,6 @@ problem, we pad each item by this amount (by adding the @q{car} on the left side of the item and adding the @q{cdr} on the right side of the item). In order to make a grob take up no horizontal space at all, set this to @code{(+inf.0 . -inf.0)}.") - (extra-X-extent ,number-pair? "A grob is enlarged in -X@tie{}dimension by this much.") - (extra-Y-extent ,number-pair? "A grob is enlarged in -Y@tie{}dimension by this much.") ;; -- 2.39.5