Imported Upstream version 2.18.0

[lilypond.git] / input / regression / tuplet-properties.ly

diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index 3b6d8d98888af0dcc17167ee172bf7dc280d38df..4af8ddd23ce5cf769813464453e1ae705a4d7a70 100644 (file)
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.17.30"
 
 \header {
   texidoc = "Tuplet bracket formatting supports numerous options,
@@ -8,31 +8,31 @@ for instance, bracketed (B) and non-bracketed (NB).
 
 \context Voice \relative c'' {
 
-  \times 2/3 { c'8 c,, c }
-  \times 2/3 { c'8 c'' c,, }
+  \tuplet 3/2 { c'8 c,, c }
+  \tuplet 3/2 { c'8 c'' c,, }
 
-  \times 2/3 { c8[^"NB" c c] }
+  \tuplet 3/2 { c8[^"NB" c c] }
 
-  \times 2/3 { c8^"B"  c[ c] }
-  \times 2/4 { r8_"B"  c,[ c'] r8 }
+  \tuplet 3/2 { c8^"B"  c[ c] }
+  \tuplet 4/2 { r8_"B"  c,[ c'] r8 }
 
-  \override TupletBracket #'bracket-visibility = #'if-no-beam  
-  \times 2/3 { c8[ c c] }
+  \override TupletBracket.bracket-visibility = #'if-no-beam  
+  \tuplet 3/2 { c8[ c c] }
 
   \tupletUp
-  \override TupletNumber #'stencil = ##f
-  \times 2/3 { c8^""^""^"up, no digit" c[ c] }
-  \revert TupletNumber #'stencil
-
-  \override TupletBracket #'bracket-visibility = ##t
-  \override TupletBracket #'edge-height = #'(0 . 0)
-  \override TupletBracket #'shorten-pair = #'(2.0 . 2.0)
-  \times 4/6 { c_"shorter, no edges" f b  b f c}       
-  \revert TupletBracket #'edge-height
-  \revert TupletBracket #'shorten-pair
-
-  \override TupletBracket #'bracket-flare = #'(0.5 . 0.5)
-  \times 2/3 { b^""^""^"angled edges" b b }
+  \omit TupletNumber
+  \tuplet 3/2 { c8^"up, no digit" c[ c] }
+  \undo \omit TupletNumber
+
+  \override TupletBracket.bracket-visibility = ##t
+  \override TupletBracket.edge-height = #'(0 . 0)
+  \override TupletBracket.shorten-pair = #'(2.0 . 2.0)
+  \tuplet 6/4 { c_"shorter, no edges" f b  b f c}      
+  \revert TupletBracket.edge-height
+  \revert TupletBracket.shorten-pair
+
+  \override TupletBracket.bracket-flare = #'(0.5 . 0.5)
+  \tuplet 3/2 { b^"angled edges" b b }
   \tupletNeutral
-  \times 2/3 { b b b }
+  \tuplet 3/2 { b b b }
 }