Imported Upstream version 2.18.0

[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 f71af0f147f4b0c422c1a5a6f12d8044fa1dcd8f..24fe6e20e406e0f63d23fe9c4eaaa418789b87ac 100644 (file)
--- a/Documentation/snippets/new/fretted-headword.ly
+++ b/Documentation/snippets/new/fretted-headword.ly
@@ -3,7 +3,7 @@
 % on melodies from Bellini's "Norma"                              %
 %*****************************************************************%
 
-\version "2.16.0"
+\version "2.17.30"
 
 \header {
   lsrtags = "headword"
@@ -35,7 +35,7 @@ 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
@@ -73,22 +73,22 @@ melody = \relative c {
   R1 % m. 5
 
   e'4^\benmarcato e8. d16-4
-  d4-4 \times 2/3 { \sfou \FO #'-0.3 #'0.6 <c-2>4 b8 } | % end of m. 6
+  d4-4 \tuplet 3/2 { \sfou \FO #'-0.3 #'0.6 <c-2>4 b8 } | % end of m. 6
 
   \FO #'-0.3 #'0.3
-  <a-3>4 \times 2/3 { c4 b8 } a4 e'8. e16 | % m. 7
+  <a-3>4 \tuplet 3/2 { c4 b8 } a4 e'8. e16 | % m. 7
 
   \FO #'-0.3 #'0.3
-  <g-4>4 \times 2/3 { \sfol \FO #'0.3 #'0.0 <f-1>4 e8 } e4  % beg of m. 8
-  \times 2/3 { \sfou <d-4>4 c8 } | % end of m. 8
+  <g-4>4 \tuplet 3/2 { \sfol \FO #'0.3 #'0.0 <f-1>4 e8 } e4  % beg of m. 8
+  \tuplet 3/2 { \sfou <d-4>4 c8 } | % end of m. 8
 
-  b4 \times 2/3 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 <b-0>4 e | % end of m. 9
+  b4 \tuplet 3/2 { d4-4 c8 } \sfou \FO #'-1.7 #'-1.5 <b-0>4 e | % end of m. 9
 
-  e4 e8. d16-4 d4 \times 2/3 { c4 b8 } | % m. 10
+  e4 e8. d16-4 d4 \tuplet 3/2 { c4 b8 } | % m. 10
 
-  \times 2/3 { a4 a8 b4 c8 } % beg of m. 11
+  \tuplet 3/2 { a4 a8 b4 c8 } % beg of m. 11
   \sfou \FO #'-0.3 #'0.3
-  <d-4>4^\< \times 2/3 { e4 <d f>8\! } | % end of m. 11
+  <d-4>4^\< \tuplet 3/2 { e4 <d f>8\! } | % end of m. 11
 }
 
 bass = \relative c {
@@ -107,22 +107,22 @@ bass = \relative c {
 
   %% new section starts here in A minor
   \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
+  \once \override TextScript.staff-padding = #1.7
+  \tuplet 3/2 { a8\p^\andantino e' a c a e a, e' a c a e } | % m. 5
 
-  \times 2/3 { a,8\pdolce e' a c a e } % beg m. 6
-  \times 2/3 { e,8 \sfou <e'-3> <gis-1> c gis e } | % end m. 6
+  \tuplet 3/2 { a,8\pdolce e' a c a e } % beg m. 6
+  \tuplet 3/2 { e,8 \sfou <e'-3> <gis-1> c gis e } | % end m. 6
 
-  \times 2/3 { a,8 <e'-2> a c e, b' a, e' a c a e } | % m. 7
+  \tuplet 3/2 { a,8 <e'-2> a c e, b' a, e' a c a e } | % m. 7
 
-  \times 2/3 { f,8 f' a \sfol \FO #'0.3 #'-0.5 <d-4> a f fis, d' a' d a d, } | % m. 8
+  \tuplet 3/2 { f,8 f' a \sfol \FO #'0.3 #'-0.5 <d-4> a f fis, d' a' d a d, } | % m. 8
 
-  \times 2/3 { <g,-3>8 d' g d' g, d % beg m. 9
+  \tuplet 3/2 { <g,-3>8 d' g d' g, d % beg m. 9
     \sfod \FO #'0.0 #'-2.0 <gis,-4> \sfou <e'-2> <gis-1> b gis e } | % end m. 9
 
-  \times 2/3 { a,8 e' a c a e e, e' gis c gis e } | % m. 10
+  \tuplet 3/2 { a,8 e' a c a e e, e' gis c gis e } | % m. 10
 
-  \times 2/3 { a,8 e' a b a e f, f' a d a f } | % m. 11
+  \tuplet 3/2 { a,8 e' a b a e f, f' a d a f } | % m. 11
 }
 
 \score {
@@ -133,9 +133,9 @@ bass = \relative c {
   \layout {
     \context {
       \Score
-      \override Fingering #'staff-padding = #'()
-      \override TupletNumber #'stencil = ##f
-      \override TupletBracket #'bracket-visibility = ##f
+      \override Fingering.staff-padding = #'()
+      \omit TupletNumber
+      \override TupletBracket.bracket-visibility = ##f
     }
   }
   \midi { }