Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / Documentation / snippets / flamenco-notation.ly

diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index eeede2855cd59bfb3a48f6944d722a275eb76142..db142cd9d2ab90cb9dd68d9c0da9380927a7ca17 100644 (file)
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -4,7 +4,7 @@
 %% and then run scripts/auxiliar/makelsr.py
 %%
 %% This file is in the public domain.
-\version "2.16.0"
+\version "2.17.30"
 
 \header {
   lsrtags = "fretted-strings, specific-notation, stylesheet, version-specific"
@@ -97,30 +97,30 @@ xDown = \markup { \column { \small x \line { \strokeDown } } }
 
 % Just handy :)
 tupletOff = {
-  \once \override TupletNumber #'stencil = ##f
-  \once \override TupletBracket #'stencil = ##f
+  \once \omit TupletNumber
+  \once \omit TupletBracket
 }
 
 tupletsOff = {
-  \override TupletNumber #'stencil = ##f
-  \override TupletBracket #'bracket-visibility = #'if-no-beam
+  \omit TupletNumber
+  \override TupletBracket.bracket-visibility = #'if-no-beam
 }
 
 tupletsOn = {
-  \override TupletBracket #'bracket-visibility = #'default
-  \revert TupletNumber #'stencil
+  \override TupletBracket.bracket-visibility = #'default
+  \undo \omit TupletNumber
 }
 
 headsOff = {
-  \override TabNoteHead #'transparent = ##t
-  \override NoteHead #'transparent = ##t
-  \override NoteHead #'no-ledgers = ##t
+  \hide TabNoteHead
+  \hide NoteHead
+  \override NoteHead.no-ledgers = ##t
 }
 
 headsOn = {
-  \override TabNoteHead #'transparent = ##f
-  \override NoteHead #'transparent = ##f
-  \override NoteHead #'no-ledgers = ##f
+  \override TabNoteHead.transparent = ##f
+  \override NoteHead.transparent = ##f
+  \override NoteHead.no-ledgers = ##f
 }
 
 %%%%%%%  Cut here ----- End 'flamenco.ly'
@@ -148,7 +148,7 @@ part = \relative c' {
   r4
 
   \tupletOff
-  \times 4/5 {
+  \tuplet 5/4 {
     <a e' a cis e>16^\xUp
     \headsOff
     <a e' a cis e>^\aUp
@@ -161,7 +161,7 @@ part = \relative c' {
   r4
 
   \tupletsOff
-  \times 2/3 {
+  \tuplet 3/2 {
     <a e' a cis e>8^\pDown
     \headsOff
     <a e' a cis e>^\xUp
@@ -169,7 +169,7 @@ part = \relative c' {
     \headsOn
   }
 
-  \times 2/3 {
+  \tuplet 3/2 {
     <a e' a cis e>8^\pDown
     \headsOff
     <a e' a cis e>^\xUp
@@ -177,14 +177,14 @@ part = \relative c' {
     \headsOn
   }
 
-  \times 2/3 {
+  \tuplet 3/2 {
     <a e' a cis e>8^\pDown
     \headsOff
     <a e' a cis e>^\xUp
     <a e' a cis e>^\iUp
     \headsOn
   }
-  \times 2/3 {
+  \tuplet 3/2 {
     <a e' a cis e>8^\pDown
     \headsOff
     <a e' a cis e>^\xUp
@@ -193,30 +193,30 @@ part = \relative c' {
   }
 
   \tupletsOff
-  \override Beam #'positions = #'(2 . 2)
-  \times 2/3 {
+  \override Beam.positions = #'(2 . 2)
+  \tuplet 3/2 {
     a8^\markup{ \small p }
     <e' a>^\strokeUpGolpe
     <e a>^\strokeDown
   }
-  \times 2/3 {
+  \tuplet 3/2 {
     a,8^\markup{ \small p }
     <e' a>^\strokeUpGolpe
     <e a>^\strokeDown
   }
-  \times 2/3 {
+  \tuplet 3/2 {
     a,8^\markup{ \small p }
     <e' a>^\strokeUpGolpe
     <e a>^\strokeDown
   }
-  \times 2/3 {
+  \tuplet 3/2 {
     a,8^\markup{ \small p }
     <e' a>^\strokeUpGolpe
     <e a>^\strokeDown
   }
   \tupletsOn
 
-  \once \override TextScript #'extra-offset = #'(0 . -1)
+  \once \override TextScript.extra-offset = #'(0 . -1)
   <g, b f'>1_\golpe^\mUp
   \bar "|."
 }