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

[lilypond.git] / Documentation / ly-examples / cary.ly

diff --git a/Documentation/ly-examples/cary.ly b/Documentation/ly-examples/cary.ly
index 1c96edd1bcd03bea59099b567229609098c4b5d0..1e1d98d461de612fa0f34cd475c86495256787c1 100644 (file)
--- a/Documentation/ly-examples/cary.ly
+++ b/Documentation/ly-examples/cary.ly
@@ -1,4 +1,4 @@
-\version "2.17.6"
+\version "2.17.30"
 % the example header file caused the head to be chopped off
 %\include "example-header.ily"
 
@@ -57,15 +57,15 @@
                        } {
 
                                % measure 6
-                               \fraction \times 5/3 {
-                                       \times 4/5 {
+                               \fraction \tuplet 3/5 {
+                                       \tuplet 5/4 {
                                                a'64 [ % 36
                                                cs''64 % 37
                                                f''64 % 38
                                                cs''64 % 39
                                                ef'''64 ] % 40
                                        }
-                                       \times 4/5 {
+                                       \tuplet 5/4 {
                                                g''64 [ % 41
                                                c''64 % 42
                                                e''64 % 43
@@ -77,7 +77,7 @@
 
                                % measure 7
                                r8 % 47
-                               \times 4/5 {
+                               \tuplet 5/4 {
                                        d''32 [ % 48
                                        af''32 % 49
                                        e'32 % 50
@@ -95,7 +95,7 @@
                >>
 
                \new Staff \with {
-                       \override Clef.transparent = ##t
+                       \hide Clef
                        \override StaffSymbol.line-positions = #'(-4 -2   2 4)
                        \override Stem.direction = #down
                        \override TupletBracket.staff-padding = #5
@@ -107,15 +107,15 @@
                                \override Stem.direction = #up
                                \override Flag.stroke-style = #"grace"
                                \override Stem.font-size = #-3
-                               \override Rest.transparent = ##t
+                               \hide Rest
                                \override NoteHead.no-ledgers = ##t
-                               \override Dots.transparent = ##t
-                               \override TupletBracket.transparent = ##t
-                               \override TupletNumber.transparent = ##t
+                               \hide Dots
+                               \hide TupletBracket
+                               \hide TupletNumber
                        } {
 
                                % measure 6
-                               \fraction \times 5/3 {
+                               \fraction \tuplet 3/5 {
                                        \square f''16 * 1/8 % 40
                                        \square f''16 * 1/8 % 41
                                        \square f''16 * 1/8 % 42
@@ -124,11 +124,11 @@
                                        \square f''16 * 1/8 % 45
                                        \square f''16 * 1/8 % 46
                                        \square f''16 * 1/8 % 47
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \square f''16 % 48
                                                \square f''16 * 1/2 % 49
                                        }
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \square f''16 * 1/4 % 50
                                                \square f''16 * 1/4 % 51
                                                \square f''16 * 1/4 % 52
@@ -143,7 +143,7 @@
                                \square g''16 * 2/1 % 57
                                \square g''16 % 58
                                \square g''16 % 59
-                               \times 8/9 {
+                               \tuplet 9/8 {
                                        s16 % 60
                                        f''16 * 1/4 % 61
                                        f''16 * 1/4 % 62
@@ -153,8 +153,8 @@
                                }
 
                                % measure 8
-                               \times 4/5 {
-                                       \times 4/7 {
+                               \tuplet 5/4 {
+                                       \tuplet 7/4 {
                                                s4 % 66
                                                \triangle a''16 % 67
                                                \triangle a''16 % 68
@@ -175,18 +175,17 @@
 
                        \new Voice \with {
                                \remove "Forbid_line_break_engraver"
-                               \override Stem.transparent = ##t
-                               \override Flag.transparent = ##t
-                               \override Rest.transparent = ##t
+                               \hide Stem
+                               \hide Rest
                                \override Rest.staff-position = #-0.5
-                               \override Dots.transparent = ##t
-                               \override Beam.transparent = ##t
-                               \override TupletBracket.transparent = ##t
-                               \override TupletNumber.transparent = ##t
+                               \hide Dots
+                               \hide Beam
+                               \hide TupletBracket
+                               \hide TupletNumber
                        } {
 
                                % measure 6
-                               \fraction \times 5/3 {
+                               \fraction \tuplet 3/5 {
                                        \blackdiamond f'128 [ % 40
                                        \blackdiamond f'128 % 41
                                        \blackdiamond f'128 % 42
@@ -195,11 +194,11 @@
                                        \blackdiamond f'128 % 45
                                        \blackdiamond f'128 % 46
                                        \blackdiamond f'128 ] % 47
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \blackdiamond f'16 % 48
                                                \blackdiamond f'32 % 49
                                        }
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \blackdiamond f'64 % 50
                                                \blackdiamond f'64 % 51
                                                \blackdiamond f'64 % 52
@@ -214,7 +213,7 @@
                                \harmonic a'8 \glissando % 57
                                \harmonic a'16 \glissando % 58
                                \blackdiamond a'16 % 59
-                               \times 8/9 {
+                               \tuplet 9/8 {
                                        s16 % 60
                                        \harmonic g'64 \glissando % 61
                                        \harmonic g'64 \glissando % 62
@@ -224,8 +223,8 @@
                                }
 
                                % measure 8
-                               \times 4/5 {
-                                       \times 4/7 {
+                               \tuplet 5/4 {
+                                       \tuplet 7/4 {
                                                s4 % 66
                                                \blackdiamond f'16 % 67
                                                \blackdiamond f'16 % 68
@@ -249,15 +248,15 @@
                                \override Stem.direction = #down
                                \override Stem.font-size = #-3
                                \override Flag.stroke-style = #"grace"
-                               \override Rest.transparent = ##t
+                               \hide Rest
                                \override NoteHead.no-ledgers = ##t
-                               \override Dots.transparent = ##t
-                               \override TupletBracket.transparent = ##t
-                               \override TupletNumber.transparent = ##t
+                               \hide Dots
+                               \hide TupletBracket
+                               \hide TupletNumber
                        } {
 
                                % measure 6
-                               \fraction \times 5/3 {
+                               \fraction \tuplet 3/5 {
                                        s128 % 40
                                        s128 % 41
                                        s128 % 42
@@ -266,11 +265,11 @@
                                        s128 % 45
                                        s128 % 46
                                        s128 % 47
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \semicircle a16 % 48
                                                \semicircle a16 * 1/2 % 49
                                        }
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \semicircle a16 * 1/4 % 50
                                                \semicircle a16 * 1/4 % 51
                                                \semicircle a16 * 1/4 % 52
@@ -285,7 +284,7 @@
                                s8 % 57
                                s16 % 58
                                \triangle a16 % 59
-                               \times 8/9 {
+                               \tuplet 9/8 {
                                        s16 % 60
                                        s64 % 61
                                        s64 % 62
@@ -295,8 +294,8 @@
                                }
 
                                % measure 8
-                               \times 4/5 {
-                                       \times 4/7 {
+                               \tuplet 5/4 {
+                                       \tuplet 7/4 {
                                                s4 % 66
                                                \semicircle a16 % 67
                                                \semicircle a16 % 68
@@ -318,7 +317,7 @@
                        \new Voice \with {
                                \remove "Forbid_line_break_engraver"
                                \override Stem.direction = #down
-                               \override NoteHead.transparent = ##t
+                               \hide NoteHead
                                \override NoteHead.no-ledgers = ##t
                                \override Rest.staff-position = #-18
                                \override Stem.length = #10
@@ -333,7 +332,7 @@
                        } {
 
                                % measure 6
-                               \fraction \times 5/3 {
+                               \fraction \tuplet 3/5 {
                                        \beam #0 #5 g,128 \sffp \< [ % 40
                                        \beam #5 #5 g,128 % 41
                                        \beam #5 #5 g,128 % 42
@@ -342,11 +341,11 @@
                                        \beam #5 #5 g,128 % 45
                                        \beam #5 #5 g,128 % 46
                                        \beam #5 #1 g,128 % 47
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \beam #1 #2 g,16 % 48
                                                \beam #3 #1 g,32 \fX % 49
                                        }
-                                       \times 2/3 {
+                                       \tuplet 3/2 {
                                                \beam #1 #4 g,64 \sffp \< % 50
                                                \beam #4 #4 g,64 % 51
                                                \beam #4 #4 g,64 % 52
@@ -361,7 +360,7 @@
                                g,8 \sf \< [ % 57
                                g,16 % 58
                                \beam #2 #0 g,16 \ffX ] % 59
-                               \times 8/9 {
+                               \tuplet 9/8 {
                                        r16 % 60
                                        \beam #4 #4 g,64 \sfp \< [ % 61
                                        \beam #4 #4 g,64 % 62
@@ -371,8 +370,8 @@
                                }
 
                                % measure 8
-                               \times 4/5 {
-                                       \times 4/7 {
+                               \tuplet 5/4 {
+                                       \tuplet 7/4 {
                                                r4 % 66
                                                \beam #2 #2 g,16 \fX [ % 67
                                                \beam #2 #2 g,16 \f % 68