X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fproportional.ly;h=fed31ed8e313e31ae0fad075b419e24bbc876854;hb=d81358c40ff5cb07b9af253896b69d563c397eaf;hp=65eb3f211b6f6488219db5c4d202db27b9ba2f2a;hpb=7fba6ff598a8aedf39d67809593848ad8a90f668;p=lilypond.git

diff --git a/input/proportional.ly b/input/proportional.ly
index 65eb3f211b..fed31ed8e3 100644
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -1,4 +1,4 @@
-\version "2.7.4"
+\version "2.11.51"
 
 \header
 {
@@ -12,9 +12,9 @@
  \context {
    \Voice
    \remove "Forbid_line_break_engraver"
-   tupletNumberFormatFunction = #fraction-tuplet-formatter
+  \override  TupletNumber #'text = #tuplet-number::calc-fraction-text
    tupletFullLength = ##t
-   allowBeamBreak = ##t
+   \override Beam #'breakable = ##t
  }
  \context {
    \Score
@@ -27,8 +27,7 @@
    \override TimeSignature #'break-visibility = #end-of-line-invisible
    \override Beam #'break-overshoot = #'(-0.5 . 1.0)
    \override TupletBracket #'break-overshoot = #'(-0.5 . 1.0)
-   \override TupletBracket #'staff-padding = #4
-   \override PaperColumn #'used = ##t 
+   \override TupletBracket #'staff-padding = #3.5
  }
  \context {
    % we want over print if necessary.
@@ -43,87 +42,86 @@ staffKind = "RhythmicStaff"
 
 \relative c''
 \new StaffGroup <<
- \new \staffKind <<
-   {
-     \skip 2
-     \skip 2
-     \break \time 4/8
-     \skip 1 \break \time 4/8
-     \skip 1 \break \time 4/8
-   }
+  \new \staffKind <<
+    {
+      \skip 2
+      \skip 2
+      \break \time 4/8
+      \skip 1 \break \time 4/8
+      \skip 1 \break \time 4/8
+    }
 
-   {
-   \time 4/8
+    {
+      \time 4/8
 
-   \times 7/9 {
-     \times 4/6 {
-       r8 c32[ c c c c c c c] r4
-       c32[ c32 c16 }
-       \times 5/4 {
-         c16 c c] c32[ c32 c16 c] r8 }
-     }
+      \times 7/9 {
+	\times 4/6 {
+	  r8 c32[ c c c c c c c] r4
+	  c32[ c32 c16 }
+	  \times 5/4 {
+	    c16 c c] c32[ c32 c16 c] r8 }
+      }
 
-\times 10/12 {
-    \times 7/6 {
-         c32[ c32 c8 c16] r4
-         c16[ c16 c16. c32
-    }
-    \times 5/8 {
-         c16 c16 c16. c32] r8 c8[ c8] r4.
-    }
-}
+      \times 10/12 {
+	\times 7/6 {
+	  c32[ c32 c8 c16] r4
+	  c16[ c16 c16. c32
+	     }
+	  \times 5/8 {
+	    c16 c16 c16. c32] r8 c8[ c8] r4.
+	}
+      }
 
-   \times 4/7 {
-     r8
-     c16[ c16
-       \times 5/4 {
-         c16 r16 c8 c c
-       }
-   }
+      \times 4/7 {
+	r8
+	c16[ c16
+	     \times 5/4 {
+	       c16 r16 c8 c c
+	     }
+	   }
 
-   \times 3/4 {
-     c8]
-     c16[ c
-          \times  2/3 {
-            c16 c16]
-          r4 }
-   }
- }
-   >>
- \new \staffKind
- <<
- {
-   \times 9/5 {
-     r8. c16[ c c
-              \grace {
-                \stemDown
-                c32[ c32]
-                \stemNeutral
-              }
-              c16 c c
-     c
-   }
-   \times 4/7 {
-     c16 c c c ]
-     \times 5/4 {
-       c16[ c32 c32]
-       r4
-       c32[ c c16
-     }
-   }
-   \times 10/12 {
-     \times 7/10 {
-       c16 c16 c8] r4 c4
-       c16[ c8 c16 c16 r8 c16
-     }
-     c16 c32 c32]
-     r4.
-     c16.[
-     c32
-   }
-   c16 c16]
+	\times 3/4 {
+	  c8]
+	c16[ c
+	     \times  2/3 {
+	       c16 c16]
+	     r4 }
+      }
+    }
+  >>
+  \new \staffKind
+  <<
+    {
+      \times 9/5 {
+	r8. c16[ c c
+		 \grace {
+		   \stemDown
+		   c32[ c32]
+		   \stemNeutral
+		 }
+		 c16 c c
+		 c
+	       }
+	\times 4/7 {
+	  c16 c c c ]
+	\times 5/4 {
+	  c16[ c32 c32]
+	  r4
+	  c32[ c c16
+	     }
+	}
+	\times 10/12 {
+	  \times 7/10 {
+	    c16 c16 c8] r4 c4
+	  c16[ c8 c16 c16 r8 c16
+	     }
+	  c16 c32 c32]
+	r4.
+	c16.[
+	  c32
+	}
+	c16 c16]
 
- }
- { \skip 2 * 6 } % filler space.
- >>
+    }
+  >>
 >>