Imported Upstream version 2.18.0

[lilypond.git] / input / regression / incipit.ly

diff --git a/input/regression/incipit.ly b/input/regression/incipit.ly
index 7e8ea62a77ad1074cc6ac6923b8772ce6bb3d5cc..a5545558e8611f9d0bbc8a109663fe61fe7cebd4 100644 (file)
--- a/input/regression/incipit.ly
+++ b/input/regression/incipit.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.17.10"
 
 \header {
   texidoc = "Incipits can be printed using an @code{InstrumentName}
@@ -19,10 +19,10 @@ grob."
 \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 #'padding = #0
-    \override Staff.InstrumentName #'stencil =
+    \override Staff.InstrumentName.music = ##{ \clef "petrucci-c1" c'4 d' e' f' #}
+    \override Staff.InstrumentName.self-alignment-X = #RIGHT
+    \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)))
@@ -37,13 +37,10 @@ grob."
                                '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))
+                (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)