Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

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

diff --git a/Documentation/snippets/pitches-headword.ly b/Documentation/snippets/pitches-headword.ly
index 5e7799b4df897ac029e7388631853e978c2bf23c..1bc6489db9634953e531dc7a5102e9b57d50f481 100644 (file)
--- a/Documentation/snippets/pitches-headword.ly
+++ b/Documentation/snippets/pitches-headword.ly
@@ -1,21 +1,17 @@
-% Do not edit this file; it is automatically
+% DO NOT EDIT this file manually; it is automatically
 % generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
 % This file is in the public domain.
-%% Note: this file works from version 2.12.0
-\version "2.13.10"
+%% Note: this file works from version 2.14.0
+\version "2.14.0"
 \include "english.ly"
 #(set-global-staff-size 15)
-\paper{
-  ragged-right=##t
-  line-width=17\cm
-  indent=0\cm
-}
-
-\layout {
-  \context { \Score
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
-  }
+\paper {
+  ragged-right = ##t
+  line-width = 17\cm
+  indent = 0\cm
 }
 
 % NR 1.1 Pitches
@@ -34,122 +30,122 @@
 
 \new PianoStaff <<
 
-   % RH Staff
-   \new Staff <<
-
-      % RH Voice 1
-      \new Voice {
-         \set Score.currentBarNumber = #34
-         \voiceOne
-         gs''2 ( ^ \markup \italic { dolce e molto ligato }
-         fs''4
-         e''4
-         |
-         ds''2
-         cs''2 )
-         |
-         ds''2 (
-         e''4
-         fs''4
-         |
-         <gs'' e''>2
-         <fs'' ds''>2 )
-         |
-         \oneVoice
-         \clef bass
-         <gs' e' b>2 (
-         <fs' ds' a>4
-         <e' cs' gs>4
-         |
-         <ds' bs fs>2
-         <cs' a e>2 )
-         |
-         \voiceOne
-         b2 %(
-         cs'4
-         ds'4
-         |
-         \clef treble
-         <e' gs>4 %)
-         r4 r2
-      }
+  % RH Staff
+  \new Staff <<
 
-      % RH Voice 2
-      \new Voice {
-         \voiceTwo
-         \override Staff.DynamicLineSpanner #'staff-padding = #2.5
-         <e'' b'>2 \p
-         <ds'' a'>4
-         <cs'' gs'>4
-         |
-         <bs' fs'>2
-         e'2
-         |
-         \once \override TextScript #'staff-padding = #2.5
-         <b'! a'>2 _ \markup \italic { cresc. }
-         b'4
-         <e'' cs''>4
-         |
-         b'2. ( \sf \>
-         a'4 )
-         \clef bass
-         | \break
-         s1 \p
-         |
-         s1
-         |
-         <gs e>4 (
-         <a fs>2. )
-         |
-         s4
-         r4 r2
-      }
-
-   >>
-
-   % LH Staff
-   \new Staff {
-      \override Staff.SustainPedalLineSpanner #'staff-padding = #5
-      <gs' e'>2 ( \sustainOn
-      <fs' ds' b>4 \sustainOff
-      <e' cs'>4
+    % RH Voice 1
+    \new Voice {
+      \set Score.currentBarNumber = #34
+      \voiceOne
+      gs''2 ( ^ \markup \italic { dolce e molto ligato }
+      fs''4
+      e''4
+      |
+      ds''2
+      cs''2 )
       |
-      <ds' bs gs>2
-      <cs' a>2 ) \sustainOn
+      ds''2 (
+      e''4
+      fs''4
       |
+      <gs'' e''>2
+      <fs'' ds''>2 )
+      |
+      \oneVoice
       \clef bass
-      \slurDown
-      <ds' b! a fs>2 ( \sustainOff
-      <e' b gs>4
-      <fs' cs' a>4 \sustainOn
+      <gs' e' b>2 (
+      <fs' ds' a>4
+      <e' cs' gs>4
+      |
+      <ds' bs fs>2
+      <cs' a e>2 )
       |
-      \clef treble
       \voiceOne
-      <<
-         {
-            <gs' e'>2
-            <fs' ds'>2 )
-         }
-         \new Voice {
-            \voiceTwo
-            b1 \sustainOff
-         }
-      >>
-      \oneVoice
+      b2 %(
+      cs'4
+      ds'4
+      |
+      \clef treble
+      <e' gs>4 %)
+      r4 r2
+    }
+
+    % RH Voice 2
+    \new Voice {
+      \voiceTwo
+      \override Staff.DynamicLineSpanner #'staff-padding = #2.5
+      <e'' b'>2 \p
+      <ds'' a'>4
+      <cs'' gs'>4
+      |
+      <bs' fs'>2
+      e'2
       |
-      %\break
+      \once \override TextScript #'staff-padding = #2.5
+      <b'! a'>2 _ \markup \italic { cresc. }
+      b'4
+      <e'' cs''>4
+      |
+      b'2. ( \sf \>
+      a'4 )
       \clef bass
-      <gs e>2 (
-      <fs ds b,>4
-      <e cs>4
+      | \break
+      s1 \p
       |
-      <ds bs, gs,>2
-      <cs a,>2 ) \sustainOn
+      s1
       |
-      <b,! b,,!>1 ( \sustainOff
+      <gs e>4 (
+      <a fs>2. )
       |
-      <e e,>4 )
+      s4
       r4 r2
-   }
+    }
+
+  >>
+
+  % LH Staff
+  \new Staff {
+    \override Staff.SustainPedalLineSpanner #'staff-padding = #5
+    <gs' e'>2 ( \sustainOn
+    <fs' ds' b>4 \sustainOff
+    <e' cs'>4
+    |
+    <ds' bs gs>2
+    <cs' a>2 ) \sustainOn
+    |
+    \clef bass
+    \slurDown
+    <ds' b! a fs>2 ( \sustainOff
+    <e' b gs>4
+    <fs' cs' a>4 \sustainOn
+    |
+    \clef treble
+    \voiceOne
+    <<
+      {
+        <gs' e'>2
+        <fs' ds'>2 )
+      }
+      \new Voice {
+        \voiceTwo
+        b1 \sustainOff
+      }
+    >>
+    \oneVoice
+    |
+    %\break
+    \clef bass
+    <gs e>2 (
+    <fs ds b,>4
+    <e cs>4
+    |
+    <ds bs, gs,>2
+    <cs a,>2 ) \sustainOn
+    |
+    <b,! b,,!>1 ( \sustainOff
+    |
+    <e e,>4 )
+    r4 r2
+  }
 
 >>