Issue 5167/7: markup-partial regtest: use \markup function assignment

[lilypond.git] / Documentation / snippets / simultaneous-headword.ly

diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly
index a76294f671f1ebaef14363f129fc5849a3d11fdc..b8462ffabaf850ec8072e68fe96d74fa2d3ac2c5 100644 (file)
--- a/Documentation/snippets/simultaneous-headword.ly
+++ b/Documentation/snippets/simultaneous-headword.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.19.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "headword"
@@ -16,6 +16,9 @@ Simultaneous notes
   doctitle = "Simultaneous headword"
 } % begin verbatim
 
+%% http://lsr.di.unimi.it/LSR/Item?id=825
+%% see also http://lilypond.org/doc/v2.18/Documentation/notation/simultaneous-notes
+
 \include "english.ly"
 
 % NR 1.5 Simultaneous notes
@@ -67,10 +70,10 @@ trillFlat =
       \trillFlat
       af''4.~ \startTrillSpan
       af''8.~ |
-      4.~ 8.~ |
+      af''4.~ af''8.~ |
       \oneVoice
       <af'' d''>8.[ a''8. \p \< bf''8.]~ |
-      8.[ b''8. c'''8.]~
+      bf''8.[ b''8. c'''8.]~
       \bar "||"
       \key ef \major
       c'''8.[ cs'''8.] \f \stopTrillSpan
@@ -83,17 +86,17 @@ trillFlat =
       \override Voice.TrillSpanner.direction = #DOWN
       d''4.~ \f \startTrillSpan
       d''8.~ |
-      4.~ 8.~ |
-      8. \stopTrillSpan
+      d''4.~ d''8.~ |
+      d''8. \stopTrillSpan
       \trillFlat
       d''4.~ \startTrillSpan |
-      d''4.~ 8.~ |
-      4.~ 8.~ |
-      4.~ 8.~ \stopTrillSpan |
+      d''4.~ d''8.~ |
+      d''4.~ d''8.~ |
+      d''4.~ d''8.~ \stopTrillSpan |
       \trillFlat
       d''4.~ \startTrillSpan
       d''8. ~ |
-      4.~ 8.~ |
+      d''4.~ d''8.~ |
       \once \override NoteColumn.ignore-collision = ##t
       \hideNotes
       d''8. \stopTrillSpan
@@ -126,8 +129,8 @@ trillFlat =
         \override Voice.TrillSpanner.direction = #UP
         f'4.~ \startTrillSpan
         f'8.~ |
-        4.~ 8.~ |
-        8. \stopTrillSpan
+        f'4.~ f'8.~ |
+        f'8. \stopTrillSpan
       }
       \new Voice {
         \voiceTwo