Merge branch 'stable/2.16' into staging

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

diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index 148fda13db1113b9452e1f422d17d0d16960c97b..3b6d8d98888af0dcc17167ee172bf7dc280d38df 100644 (file)
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -1,45 +1,38 @@
+\version "2.16.0"
 
 \header {
-texidoc = "Tuplet bracket formatting supports numerous options:
-NB should have no bracket, B should have bracket.
+  texidoc = "Tuplet bracket formatting supports numerous options,
+for instance, bracketed (B) and non-bracketed (NB).
 "
 }
- 
-
-\version "2.1.22"
-
-
-\score { 
-    \context Voice \notes\relative c'' {
-
-       \times 2/3 { c'8 c,, c }
-       \times 2/3 { c'8 c'' c,, }
-
-       
-       \times 2/3 {  c8[^"NB" c c]  }
-       
-       \times 2/3 { c8^"B"  c[ c]  }
-       \times 2/4 { r8_"B"  c,[ c'] r8 }
-       
-       \override TupletBracket  #'bracket-visibility = #'if-no-beam  
-       \times 2/3 {  c8[ c c]  }
-       
-       \override TupletBracket  #'direction = #1
-       \override TupletBracket  #'number-visibility = ##f
-       \times 2/3 { c8^""^""^"up, no digit"  c[ c]  }
-       \revert TupletBracket #'number-visibility
-
-       \override TupletBracket  #'bracket-visibility = ##t
-       \override TupletBracket  #'edge-height = #'(0.0 . 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 }
-       \revert TupletBracket #'direction
-       \times 2/3 { b b b }
-
-    }
-}
 
+\context Voice \relative c'' {
+
+  \times 2/3 { c'8 c,, c }
+  \times 2/3 { c'8 c'' c,, }
+
+  \times 2/3 { c8[^"NB" c c] }
+
+  \times 2/3 { c8^"B"  c[ c] }
+  \times 2/4 { r8_"B"  c,[ c'] r8 }
+
+  \override TupletBracket #'bracket-visibility = #'if-no-beam  
+  \times 2/3 { 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 }
+  \tupletNeutral
+  \times 2/3 { b b b }
+}