Merge remote-tracking branch 'origin/translation' into staging

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

diff --git a/Documentation/snippets/simultaneous-headword.ly b/Documentation/snippets/simultaneous-headword.ly
index cf5460e6dc01e1cacc50ec37815d9d6b0ba1eabd..3afcc2a30ffc31804ac24d7dc12b2b21623bf672 100644 (file)
--- a/Documentation/snippets/simultaneous-headword.ly
+++ b/Documentation/snippets/simultaneous-headword.ly
@@ -1,31 +1,22 @@
-% Do not edit this file; it is automatically
-% generated from Documentation/snippets/new
-% This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.29"
-\include "english.ly"
-#(set-global-staff-size 15)
-\paper {
-  ragged-right = ##t
-  line-width = 17\cm
-  indent = 0\cm
-}
+%% DO NOT EDIT this file manually; it is automatically
+%% generated from LSR http://lsr.dsi.unimi.it
+%% Make any changes in LSR itself, or in Documentation/snippets/new/ ,
+%% and then run scripts/auxiliar/makelsr.py
+%%
+%% This file is in the public domain.
+\version "2.19.2"
 
-\layout {
-  \context {
-    \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
-}
+\header {
+  lsrtags = "headword"
 
+  texidoc = "
+Simultaneous notes
 
-\header {
-  lsrtags = "headwords"
-  texidoc = ""
-  doctitle = "headword"
+"
+  doctitle = "Simultaneous headword"
 } % begin verbatim
 
+\include "english.ly"
 
 % NR 1.5 Simultaneous notes
 
@@ -37,15 +28,15 @@
 \layout {
   \context {
     \Score
-    \override SpacingSpanner #'base-shortest-duration =
-    #(ly:make-moment 1 18)
-    \override NonMusicalPaperColumn #'line-break-system-details =
+    \override SpacingSpanner.base-shortest-duration =
+    #(ly:make-moment 1/18)
+    \override NonMusicalPaperColumn.line-break-system-details =
     #'((alignment-distances . (12)))
   }
 }
 
 trillFlat =
-\once \override TrillSpanner #'(bound-details left text) = \markup {
+\once \override TrillSpanner.bound-details.left.text = \markup {
   \concat {
     \musicglyph #"scripts.trill"
     \translate #'(-0.5 . 1.9)
@@ -66,152 +57,48 @@ trillFlat =
 
     % RH voice 1
     \new Voice {
-
       \voiceOne
-      s4.
-      s8.
-
-      |
-
-      s4.
-      a''8 \p \> [ (
-      g''16 ] )
-
-      |
-
-      g''4.
-      af''8 [ (
-      g''16 ] )
-
-      |
-
-      g''8. [
-      g''8.
-      g''8. \pp ]
-
-      |
-
-      g''8. [
-      af''8.
-      af''8. ]
-
-      |
-
-      af''8. [
-      af''8.
-      af''8. ]
-
-      |
-      \break
-
+      s4. s8. |
+      s4. a''8[( \p \> g''16]) |
+      g''4. af''8[( g''16]) |
+      g''8.[ g''8. g''8.] \pp |
+      g''8.[ af''8.af''8.] |
+      af''8.[ af''8.af''8.] |
       \trillFlat
-      af''4. \startTrillSpan
-      ~
-      af''8.
-      ~
-
-      |
-
-      af''4.
-      ~
-      af''8.
-      ~
-
-      |
-
+      af''4.~ \startTrillSpan
+      af''8.~ |
+      4.~ 8.~ |
       \oneVoice
-      <af'' d''>8. [
-      a''8. \p \<
-      bf''8. ]
-      ~
-
-      |
-
-      bf''8. [
-      b''8.
-      c'''8. ]
-      ~
-
+      <af'' d''>8.[ a''8. \p \< bf''8.]~ |
+      8.[ b''8. c'''8.]~
       \bar "||"
-
       \key ef \major
-      c'''8. [
-      cs'''8. \f ] \stopTrillSpan
+      c'''8.[ cs'''8.] \f \stopTrillSpan
       r8.
-
     }
 
     % RH voice 2
     \new Voice {
       \voiceTwo
-      \override Voice.TrillSpanner #'direction = #DOWN
-      d''4. \f \startTrillSpan
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''8. \stopTrillSpan
+      \override Voice.TrillSpanner.direction = #DOWN
+      d''4.~ \f \startTrillSpan
+      d''8.~ |
+      4.~ 8.~ |
+      8. \stopTrillSpan
       \trillFlat
-      d''4. \startTrillSpan
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8. \stopTrillSpan
-      ~
-
-      |
-
+      d''4.~ \startTrillSpan |
+      d''4.~ 8.~ |
+      4.~ 8.~ |
+      4.~ 8.~ \stopTrillSpan |
       \trillFlat
-      d''4. \startTrillSpan
-      ~
-      d''8.
-      ~
-
-      |
-
-      d''4.
-      ~
-      d''8.
-      ~
-
-      |
-
-      \once \override NoteColumn #'ignore-collision = ##t
+      d''4.~ \startTrillSpan
+      d''8. ~ |
+      4.~ 8.~ |
+      \once \override NoteColumn.ignore-collision = ##t
       \hideNotes
       d''8. \stopTrillSpan
-      s4.
-
-      |
-
-      s8.
-      s8.
-
+      s4. |
+      s8. s8.
     }
 
   >>
@@ -221,108 +108,41 @@ trillFlat =
     \clef bass
     \key c \major
     \time 9/16
-
-    r8.
-    r8.
-    <c! c,!>8 [ (
-    <g, g,,>16 ] )
-
-    |
-
+    r8. r8. <c! c,!>8[( <g, g,,>16]) |
     <g, g,,>4.
     \clef treble
-    c''8 [ (
-    b'16 ] )
-
-    |
-
-    b'4.
-    c''8 [ (
-    b'16 ] )
-
-    |
-
-    b'8. [
-    b'8.
-    b'8. ]
-
-    |
-
-    b'8. [
-    bf'8. ]
+    c''8[( b'16]) |
+    b'4. c''8[( b'16]) |
+    b'8.[ b'8. b'8.] |
+    b'8.[ bf'8.]
     \clef bass
-    <f f,>8 [ (
-    <bf, bf,,>16 ] )
-
-    |
-
+    <f f,>8[( <bf, bf,,>16]) |
     <bf, bf,,>4.
     \clef treble
-    f'8 [ (
-    bf16 ] )
-
-    |
-
+    f'8[( bf16]) |
     <<
-
       \new Voice {
         \voiceOne
-        \override Voice.TrillSpanner #'direction = #UP
-        f'4. \startTrillSpan
-        ~
-        f'8.
-        ~
-
-        |
-
-        f'4.
-        ~
-        f'8.
-        ~
-
-        |
-
-        f'8. \stopTrillSpan
+        \override Voice.TrillSpanner.direction = #UP
+        f'4.~ \startTrillSpan
+        f'8.~ |
+        4.~ 8.~ |
+        8. \stopTrillSpan
       }
-
       \new Voice {
         \voiceTwo
-        \override Voice.TrillSpanner #'direction = #DOWN
-        bf8. [
-        bf8.
-        bf8. ]
-
-        |
-
-        bf8. [
-        bf8.
-        bf8. ]
-
-        |
-
+        \override Voice.TrillSpanner.direction = #DOWN
+        bf8.[ bf8. bf8.] |
+        bf8.[ bf8. bf8.] |
         bf8.
       }
-
     >>
-
     \oneVoice
-    r8.
-    r8.
-
-    |
-
-    r8.
-    r8.
-    r8.
+    r8. r8. |
+    r8. r8. r8.
     \clef bass
-
     |
-
     \key ef \major
-    r8.
-    r8.
-    r8.
-
+    r8. r8. r8.
   }
-
 >>