* input/proportional.ly (staffKind): bugfix.

[lilypond.git] / input / proportional.ly

diff --git a/input/proportional.ly b/input/proportional.ly
index 2415f25a1bae9e78f09cf11d9fd04f8a0937137e..ab2a20cc0e8d1e6d1cf3dcc2aedce4508c2d72bc 100644 (file)
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -1,36 +1,37 @@
+\version "2.7.4"
+
 \header
 {
   title  = "Proportional notation"
+  copyright = "© 2005 Trevor Bača"
 }
 
-\version "2.7.4"
-
-%% 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"
+   tupletNumberFormatFunction = #fraction-tuplet-formatter
+   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)
+ }
+ \context {
+   % we want over print if necessary.
+   \RhythmicStaff
+   \remove "Separating_line_group_engraver"
+ }
 }
 
 staffKind = "RhythmicStaff"
@@ -39,102 +40,87 @@ staffKind = "RhythmicStaff"
 
 \relative c''
 \new StaffGroup <<
-  \new \staffKind \new Voice <<
-    {
-      \skip 2
-      \skip 2
-      \break \time 4/8
-      
-      \skip 1 \break \time 4/8
-      \skip 2 \time 1/8
-    }
-    
-    {
-    \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
+   }
 
-    \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[ c16. c32 c16.] r4
-          r16[ c16 c16. c32
-     }
-     \times 5/8 {
-          c16 c16 c16. c32] r8 c8[ c8] r4.
+   {
+   \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 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 4/7 {
-      r8
-      r16[ c16
-       \times 5/4 {
-         c16 r16 c8 c c
-       }
-    }
-      
-    \times 3/4 {
-      c8]
-      r16[ c
-          \times  2/3 {
-            c16 r16]
-          r4 }
+\times 10/12 {
+    \times 7/6 {
+         c32[ c32 c8 c16] r4
+         c16[ c16 c16. c32
     }
-  }  
-    >>
-  \new \staffKind \new Voice
-  <<
-  {
-    \times 9/5 {
-      r8. c16[ c c
-              \grace {
-                \stemDown
-                c32[ c32]
-                \stemNeutral 
-              }
-              c16 c c
-      c 
+    \times 5/8 {
+         c16 c16 c16. c32] r8 c8[ c8] r4.
     }
-    \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] r8 r4
-        r8.[ c32 c16 c r8 c16 c16 
-      }
-      c16 c32 c32]
-      r4.
-      r16.[
-      c32 
-    }
-    c16 r16]
+}
 
-  }
-  { \skip 2 * 6 } % filler space. 
-  >>
->>
+   \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]
 
-                
-    
-  
+ }
+ { \skip 2 * 6 } % filler space.
+ >>
+>>