X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fproportional.ly;h=ce7545b368226ffaf5572f6fbd4b9d62975444ca;hb=f8747361d9f5c8083bdfb431e12d134ceccdc152;hp=787a63c0d2fabb109e84f6ad1203931d35030349;hpb=761aa0bd91df396265d8be3ca9d616ffc02a8afe;p=lilypond.git

diff --git a/input/proportional.ly b/input/proportional.ly
index 787a63c0d2..ce7545b368 100644
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -1,35 +1,40 @@
+\version "2.9.11"
+
 \header
 {
   title  = "Proportional notation"
+  copyright = "© 2005 Trevor Bača - verbatim reproduction permitted."
 }
 
-
-%% RhythmicStaff broken with 32nd rests ? 
-
 \layout
 {
-  indent = #0.0 
-  \context {
-    \Voice
-    \remove "Forbid_line_break_engraver"
-    tupletNumberFormatFunction = #fraction-tuplet-formatter
-    tupletFullLength = ##t
-    allowBeamBreak = ##t
-  }
-  \context {
-    \Score
-    \override SpacingSpanner #'uniform-stretching = ##t
-    \override SpacingSpanner #'strict-note-spacing = ##t
-    proportionalNotationDuration = #(ly:make-moment 1 64)
-    \override TimeSignature #'break-visibility = #end-of-line-invisible
-    \override Beam #'break-overshoot = #'(-0.5 . 1.0)
-  }
-  \context {
-
-    % we want over print if necessary.
-    \RhythmicStaff
-    \remove "Separating_line_group_engraver"
-  }
+ indent = #0.0
+ \context {
+   \Voice
+   \remove "Forbid_line_break_engraver"
+  \override  TupletNumber #'text = #tuplet-number::calc-fraction-text
+   tupletFullLength = ##t
+   allowBeamBreak = ##t
+ }
+ \context {
+   \Score
+   \override TupletBracket #'edge-text = #(cons
+					   (markup #:arrow-head X LEFT #f)
+					   (markup #:arrow-head X RIGHT #f))
+   \override SpacingSpanner #'uniform-stretching = ##t
+   \override SpacingSpanner #'strict-note-spacing = ##t
+   proportionalNotationDuration = #(ly:make-moment 1 64)
+   \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 = #3.5
+   \override PaperColumn #'used = ##t 
+ }
+ \context {
+   % we want over print if necessary.
+   \RhythmicStaff
+   \remove "Separating_line_group_engraver"
+ }
 }
 
 staffKind = "RhythmicStaff"
@@ -43,86 +48,81 @@ staffKind = "RhythmicStaff"
       \skip 2
       \skip 2
       \break \time 4/8
-      
       \skip 1 \break \time 4/8
-      \skip 2 \time 1/8
+      \skip 1 \break \time 4/8
     }
-    
+
     {
-    \time 4/8 
+      \time 4/8
 
-    \times 7/9 {
-      \times 4/6 {
-	r8 r32[ c c c c c c c] r4
-	r32[ c32 c16 }
-	\times 5/4 {
-	  c16 c c] r32[ c32 c16 c] r8 }
-      }
-    \times 10/12 {
-      \times 7/6 {
-	r32[ c32. c16 c16.] r4
-	r16[ c16 c16. c32
-	   }	   
-	\times 5/8 {
-	  c16 c c16. c32] r8 c8[ c] r4
+      \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 4/7 {
-      r8
-      r16[ c16
-	\times 5/4 {
-	  c16 r16 c8 c c
+      \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 3/4 {
+	  c8]
+	c16[ c
+	     \times  2/3 {
+	       c16 c16]
+	     r4 }
+      }
     }
-      
-    \times 3/4 {
-      c8]
-      r16[ c
-	   \times  2/3 {
-	     c16 r16]
-	   r4 }
-    }
-  }  
-    >>
+  >>
   \new \staffKind
   <<
-  {
-    \times 9/5 {
-      r8. c16[ c c
-	       \grace {
-		 \stemDown
-		 c32[ c32]
-		 \stemNeutral 
+    {
+      \times 9/5 {
+	r8. c16[ c c
+		 \grace {
+		   \stemDown
+		   c32[ c32]
+		   \stemNeutral
+		 }
+		 c16 c c
+		 c
 	       }
-	       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/9 {
-	c16 c16 c8] r8 r4
-        r8.[ c32 c16 c r8 c16 c16 
-      }
-      c16 c32 c32]
-      r4.
-      r16.[
-      c32 
-    }
-    c16 r16]
+	\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. 
+    }
   >>
 >>
-
-		 
-    
-