Revert "Uses special X alignment for instrument names."

[lilypond.git] / scm / output-lib.scm

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 4ce2cd667f342e3cee7633f1137e9f6744919f89..4533cf2a965a8c95eb22b3dcf84d21dc2e5ad8f7 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -1146,20 +1146,6 @@ and draws the stencil based on its coordinates.
           0.0))))
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; stanza-number
-
-(define-public (stanza-number::calc-x-offset grob)
-  "We want @code{StanzaNumbers} to side-align to lyrics.
-Sometimes, however, this is not possible, as the lyrics
-they align to are hara-kiri'd. In this case, we self-align
-them to the right and tack on any padding."
-  (if (null? (ly:grob-object grob 'side-support-elements))
-      (+ (ly:self-alignment-interface::x-aligned-on-self grob)
-         (* (ly:grob-property grob 'direction LEFT)
-            (ly:grob-property grob 'padding 0.0)))
-      (ly:side-position-interface::x-aligned-side grob)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; instrument names
 
@@ -1191,8 +1177,6 @@ them to the right and tack on any padding."
         (common (ly:grob-common-refpoint-of-array system elements X))
         (total-ext empty-interval)
         (align-x (ly:grob-property grob 'self-alignment-X 0))
-         (my-padding (ly:grob-property grob 'padding 0))
-         (ss (ly:staff-symbol-staff-space grob))
         (padding (min 0 (- (interval-length my-extent) indent)))
         (right-padding (- padding
                           (/ (* padding (1+ align-x)) 2))))
@@ -1211,15 +1195,14 @@ them to the right and tack on any padding."
            (unite-delims (1- l)))))
 
     (+
-     (- (interval-length my-extent))
-     (* -1 my-padding ss)
+     (ly:side-position-interface::x-aligned-side grob)
      right-padding
      (- (interval-length total-ext)))))
 
 (define-public (system-start-text::calc-y-offset grob)
 
   (define (live-elements-list me)
-    (let ((elements (ly:grob-object me 'system-start-text-alignment-elements)))
+    (let ((elements (ly:grob-object me 'elements)))
 
       (filter! grob::is-live?
                (ly:grob-array->list elements))))