X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fincipit.ly;h=7a98ab3f75d13cece34efad7b6148bd6c0d2ae19;hb=e6207bad4b2148e2c99ff66c2593ab5cf0b21f4e;hp=166560f811dcdfdc57d1403d003ae6b0de223665;hpb=01df8ad908c92687d0c352e5ad5f067e52809423;p=lilypond.git

diff --git a/input/regression/incipit.ly b/input/regression/incipit.ly
index 166560f811..7a98ab3f75 100644
--- a/input/regression/incipit.ly
+++ b/input/regression/incipit.ly
@@ -1,49 +1,29 @@
-\version "2.17.6"
+\version "2.18.0"
 
 \header {
   texidoc = "Incipits can be printed using an @code{InstrumentName}
 grob."
 }
 
-%% to prevent warnings/programming errors:
-#(begin
-   (set-object-property! 'music 'backend-type? ly:music?)
-   (set-object-property! 'music 'backend-doc "Incipit music")
-   (ly:add-interface 'incipit-interface "An incipit." '(music))
-   (let* ((instrument-def (assoc 'InstrumentName all-grob-descriptions))
-	  (meta-def (assoc 'meta (cdr instrument-def)))
-	  (interfaces-def (assoc 'interfaces (cdr meta-def)))
-	  (interfaces (cdr interfaces-def)))
-     (set-cdr! interfaces-def (cons 'incipit-interface interfaces))))
-
 \score {
   \new Staff {
     %% All this would be shortcuted by an appropriate music function:
-    \override Staff.InstrumentName.music = ##{ \clef "petrucci-c1" c'4 d' e' f' #}
     \override Staff.InstrumentName.self-alignment-X = #RIGHT
+    \override Staff.InstrumentName.self-alignment-Y = ##f
     \override Staff.InstrumentName.padding = #0
     \override Staff.InstrumentName.stencil =
       #(lambda (grob)
          (let* ((instrument-name (ly:grob-property grob 'long-text))
                 (layout (ly:output-def-clone (ly:grob-layout grob)))
-                (music (make-sequential-music
-                        (list (context-spec-music
-                               (make-sequential-music
-                                (list (make-property-set
-                                       'instrumentName instrument-name)
-                                      (make-grob-property-set
-                                       'VerticalAxisGroup
-                                       'Y-extent '(-4 . 4))))
-                               'MensuralStaff)
-                              (ly:grob-property grob 'music))))
+                (music #{ \new MensuralStaff
+			  \with { instrumentName = #instrument-name }
+		          { \clef "petrucci-c1" c'4 d' e' f' }
+			  #})
                 (score (ly:make-score music))
-                (mm (ly:output-def-lookup layout 'mm))
                 (indent (ly:output-def-lookup layout 'indent))
-                (incipit-width (ly:output-def-lookup layout 'incipit-width))
-                (scaled-incipit-width (if (number? incipit-width)
-                                          (* incipit-width mm)
-                                          (* indent 0.5))))
-           (ly:output-def-set-variable! layout 'indent (- indent scaled-incipit-width))
+                (incipit-width (ly:output-def-lookup layout 'incipit-width
+		 (* indent 0.5))))
+           (ly:output-def-set-variable! layout 'indent (- indent incipit-width))
            (ly:output-def-set-variable! layout 'line-width indent)
            (ly:output-def-set-variable! layout 'ragged-right #f)
            (ly:score-add-output-def! score layout)