Merge master into nested-bookparts

[lilypond.git] / input / proportional.ly

diff --git a/input/proportional.ly b/input/proportional.ly
index db3aecdaf9f2a029e3dc7b5aebcf56d7ca362da5..8f3d806ee743e551a21825488c1d4eee0b8ee52e 100644 (file)
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -1,4 +1,4 @@
-\version "2.7.4"
+\version "2.11.61"
 
 \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
@@ -28,7 +28,6 @@
    \override Beam #'break-overshoot = #'(-0.5 . 1.0)
    \override TupletBracket #'break-overshoot = #'(-0.5 . 1.0)
    \override TupletBracket #'staff-padding = #3.5
-   \override PaperColumn #'used = ##t 
  }
  \context {
    % we want over print if necessary.