Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / Documentation / snippets / new / incipit.ly

diff --git a/Documentation/snippets/new/incipit.ly b/Documentation/snippets/new/incipit.ly
index 75e96d86d9109b636f77b127d3e256d24b169123..09f50ff56e6d5169398400e6f5b7a0fa4a5dd1fc 100644 (file)
--- a/Documentation/snippets/new/incipit.ly
+++ b/Documentation/snippets/new/incipit.ly
@@ -1,7 +1,7 @@
-\version "2.15.42"
+\version "2.17.30"
 
 \header {
-  lsrtags = "staff-notation, ancient-notation"
+  lsrtags = "staff-notation, ancient-notation, really-cool"
   texidoc = "
 Incipits can be added using the instrument name grob, but keeping
 separate the instrument name definition and the incipit definition.
@@ -12,13 +12,13 @@ separate the instrument name definition and the incipit definition.
 incipit =
 #(define-music-function (parser location incipit-music) (ly:music?)
   #{
-    \once \override Staff.InstrumentName #'self-alignment-X = #RIGHT
-    \once \override Staff.InstrumentName #'self-alignment-Y = #UP
-    \once \override Staff.InstrumentName #'Y-offset =
+    \once \override Staff.InstrumentName.self-alignment-X = #RIGHT
+    \once \override Staff.InstrumentName.self-alignment-Y = #UP
+    \once \override Staff.InstrumentName.Y-offset =
       #(lambda (grob)
          (+ 4 (system-start-text::calc-y-offset grob)))
-    \once \override Staff.InstrumentName #'padding = #0.3
-    \once \override Staff.InstrumentName #'stencil =
+    \once \override Staff.InstrumentName.padding = #0.3
+    \once \override Staff.InstrumentName.stencil =
       #(lambda (grob)
         (let* ((instrument-name (ly:grob-property grob 'long-text)))
           (set! (ly:grob-property grob 'long-text)
@@ -27,8 +27,7 @@ incipit =
                         {
                           { \context MensuralStaff \with {
                                instrumentName = #instrument-name
-                               \override VerticalAxisGroup
-                                #'Y-extent = #'(-4 . 4)
+                               \override VerticalAxisGroup.Y-extent = #'(-4 . 4)
                             } $incipit-music
                           }
                           \layout { $(ly:grob-layout grob)
@@ -38,7 +37,7 @@ incipit =
                                % escaping lexical closure and evaluating
                                % everything respective to (current-module).
                                     #(primitive-eval
-                                       '(or (false-if-exception (- indent (* mm incipit-width)))
+                                       '(or (false-if-exception (- indent incipit-width))
                                            (* 0.5 indent)))
                                     ragged-right = ##f
                                     ragged-last = ##f
@@ -59,7 +58,7 @@ global = {
   \skip 1*8
 
   % let finis bar go through all staves
-  \override Staff.BarLine #'transparent = ##f
+  \override Staff.BarLine.transparent = ##f
 
   % finis bar
   \bar "|."
@@ -86,7 +85,7 @@ discantusNotes = {
     c'4 e'4.( d'8 c' b |
     a4) b a2 |
     b4.( c'8 d'4) c'4 |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     c'1 |
     b\breve |
   }
@@ -123,7 +122,7 @@ altusNotes = {
     a2 g4 e |
     fis g4.( fis16 e fis4) |
     g1 |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     g1 |
     g\breve |
   }
@@ -161,7 +160,7 @@ tenorNotes = {
     R1 |
     % two measures
     r2 d'2. d'4 b e' |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     e'1 |
     d'\breve |
   }
@@ -197,7 +196,7 @@ bassusNotes = {
     R1 |
     R1 |
     g2. e4 |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     e1 |
     g\breve |
   }
@@ -246,7 +245,7 @@ bassusLyrics = \lyricmode {
     \context {
       \Score
       %% no bar lines in staves or lyrics
-      \override BarLine #'transparent = ##t
+      \hide BarLine
     }
     %% the next two instructions keep the lyrics between the bar lines
     \context {
@@ -257,7 +256,7 @@ bassusLyrics = \lyricmode {
     \context {
       \Voice
       %% no slurs
-      \override Slur #'transparent = ##t
+      \hide Slur
       %% Comment in the below "\remove" command to allow line
       %% breaking also at those bar lines where a note overlaps
       %% into the next measure.  The command is commented out in this