X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fincipit.ly;h=ad25f3a7cf299396a6eaf9f7554f89242db0f26b;hb=e2b40e567fec0a6799919271dba9b8df6a593bcf;hp=d0073bd31e742dae9c577ef189ad1f7a936ab48c;hpb=1ccb67e72fee6b6a47bfa71250c3988a5eba77dd;p=lilypond.git

diff --git a/input/regression/incipit.ly b/input/regression/incipit.ly
index d0073bd31e..ad25f3a7cf 100644
--- a/input/regression/incipit.ly
+++ b/input/regression/incipit.ly
@@ -1,56 +1,62 @@
-\header {
-
-  texidoc = "Incipit can be printed using an InstrumentName grob."
+\version "2.14.0"
 
+\header {
+  texidoc = "Incipits can be printed using an @code{InstrumentName}
+grob."
 }
 
-\version "2.11.39"
-
-%% to avoid warnings:
+%% to prevent warnings/programming errors:
 #(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 = #UP
-    \override Staff.InstrumentName #'Y-offset = #4
     \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-music 'SequentialMusic
-                      'elements (list (make-music 'ContextSpeccedMusic
-                                        'context-type 'MensuralStaff
-                                        'element (make-music 'PropertySet
-                                                   'symbol 'instrumentName
-                                                   'value instrument-name))
-                                      (ly:grob-property grob 'music))))
-              (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))
-         (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)
-         (set! (ly:grob-property grob 'long-text)
-               (markup #:score score))
-         (ly:system-start-text::print grob)))
+    \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))))
+                (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))
+           (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)
+           (set! (ly:grob-property grob 'long-text)
+                 (markup #:score score))
+           (system-start-text::print grob)))
 
     %% the instrument name definition is separated:
-    \set Staff.instrumentName = \markup Instrument
-    c'4 d' e' f' g'1
+    \set Staff.instrumentName = #"Instrument"
+    c'4 d' e' f'
+    g'1
   }
   \layout {
-    ragged-right = ##t
     indent = 5\cm
-    incipit-width = 3 \cm
+    incipit-width = 3\cm
   }
 }
\ No newline at end of file