Merge branch 'translation' into staging

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

diff --git a/Documentation/snippets/new/fretted-headword.ly b/Documentation/snippets/new/fretted-headword.ly
index 0bede7ca79b33b03538baca93f8771e4fe8123d4..b11037081b535ce32b152077dcd5be1bdf009637 100644 (file)
--- a/Documentation/snippets/new/fretted-headword.ly
+++ b/Documentation/snippets/new/fretted-headword.ly
@@ -3,16 +3,10 @@
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.12.0"
-
-#(set-global-staff-size 15)
-\paper {
-  line-width = 17\cm
-  indent = 0\cm
-}
+\version "2.15.18"
 
 \header {
-  lsrtags = "headwords"
+  lsrtags = "headword"
   texidoc = ""
   doctitle = "headword"
 }
@@ -22,8 +16,6 @@
   \context {
     \Score
     \remove "Bar_number_engraver"
-    \override PaperColumn #'keep-inside-line = ##t
-    \override NonMusicalPaperColumn #'keep-inside-line = ##t
   }
 }
 
@@ -43,12 +35,12 @@ ssnor = \set stringNumberOrientations = #'(right)
 % define fingering offset
 FO = #(define-music-function (parser location offsetX offsetY) (number? number?)
 #{
-  \once \override Voice.Fingering #'extra-offset = #(cons $offsetX $offsetY)
+  \once \override Voice.Fingering #'extra-offset = #(cons offsetX offsetY)
 #})
 
 % 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.")))
@@ -109,14 +101,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