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

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

diff --git a/Documentation/snippets/fretted-headword.ly b/Documentation/snippets/fretted-headword.ly
index 85cce9a03f5293765c35b08c36e20c9c1b250783..186483797e6b28a3148ed85080b3e30aba4e72a9 100644 (file)
--- a/Documentation/snippets/fretted-headword.ly
+++ b/Documentation/snippets/fretted-headword.ly
@@ -1,13 +1,16 @@
-% 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
+%% Note: this file works from version 2.14.0
 % INSPIRATIONAL HEADER FOR LILYPOND DOCUMENTATION fretted-strings %
 % Passage from Johann Kaspar Mertz "Opern Revue, Op. 8, no. 17"   %
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.13.10"
+\version "2.14.0"
 
 #(set-global-staff-size 15)
 \paper {
@@ -27,8 +30,6 @@
   \context {
     \Score
     \remove "Bar_number_engraver"
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
   }
 }
 
@@ -53,7 +54,7 @@ FO = #(define-music-function (parser location offsetX offsetY) (number? number?)
 
 % markups
 rit = \markup \center-align { \bold { \italic { " rit." } } }
-dim = \markup \center-align { \italic { " dim." } }
+dimin = \markup \center-align { \italic { " dim." } }
 andantino = \markup \left-align { \italic { \bold { \fontsize #2.5 { "Andantino" } } } }
 benmarcato = \markup { \italic { \bold { "il canto ben marcato" } } }
 pdolce = #(make-dynamic-script (markup #:line (#:dynamic "p" #:normal-text #:italic "dol.")))
@@ -114,14 +115,12 @@ bass = \relative c {
   e,,8\fp[ e'] e,[ e'] e, \sfod \FO #'0.2 #'-0.2 <b''-1>  % beg m. 2
   \sfol \FO #'0.3 #'0.0 <e-1> b | % end m. 2
 
-  e,,8 e' gis e e, e' gis_\dim e | % m. 3
+  e,,8 e' gis e e, e' gis_\dimin e | % m. 3
 
   e,1 | % m. 4
 
   %% new section starts here in A minor
-  \overrideBeamSettings #'Score #'(4 . 4) #'end
-    #'((* . (1 1 1 1))
-       ((1 . 12)  . (3 3 3 3)))
+  \set Score.beamExceptions = #'()
   \once \override TextScript #'staff-padding = #1.7
   \times 2/3 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5