X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fbeam-quant-standard.ly;h=d562aa6bd2ad2821553f29db28b2635a3e32ceda;hb=9ff4029627f34267fc9f040c703d568b1dfd10b1;hp=3c627d3af6349643060e74082c751710b1bbdf34;hpb=384418d15b6559a2cc5faf059e24084e774dea96;p=lilypond.git

diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly
index 3c627d3af6..d562aa6bd2 100644
--- a/input/regression/beam-quant-standard.ly
+++ b/input/regression/beam-quant-standard.ly
@@ -1,86 +1,147 @@
 \header {
 
-    texidoc = "This file tests a few standard beam quants."
-    
+  texidoc = "This file tests a few standard beam quants, taken from
+    Ted Ross' book. If LilyPond finds another quant, the correct quant
+    is printed over the beam."
+
 }
+%% FIXME: This file should actually NOT produce any warnings!
+#(ly:set-option 'warning-as-error #f)
 
-\version "2.3.6"
+\version "2.14.0"
 
+\layout  {
+  ragged-right = ##t
+  #(define debug-beam-quanting #t)
+}
+
+filler = \new Voice \relative c' {
+  \hideNotes
+  e4 e
+}
 %
-% todo: make the check-quant function throw an error for incorrect quants
-%
 
-\paper  { raggedright = ##t }
-
-filler = \relative { e4 e }
-% 
-#(ly:set-option 'debug-beam #t)
-
-
-
-primes = \relative {
-    \assertBeamQuant #'(0 . 0)  #'(0 . 0)
-    c8[ c]
-    \filler
-    \assertBeamQuant #'(1 . -1)  #'(1 . -1)
-    d8[ d]
-     
-    \filler
-     
-    \assertBeamQuant #'(1 . 0)  #'(1 . 0)
-    e8[ e]
-    \filler
-     
-     
-    \assertBeamQuant #'(2 . -1)  #'(2 . -1)
-    f8[ f]
-    \filler
-     
-     
-    \assertBeamQuant #'(2 . 0)  #'(2 . 0)
-    g8[ g]
-    \filler
-     
-     
-    \assertBeamQuant #'(2 . 1)  #'(2 . 1)
-    a8[ a]
-    \filler
-      
-    \once \override Beam #'inspect-quants = #'(2.2 . 2.2)
-    a8[ a]
-    \filler
+%%
+%% Ross p108--112
+primes = \relative c' {
+  \time 3/4
+  \assertBeamQuant #'(0 . 0)  #'(0 . 0)
+  c8[ c]
+  \filler
+  \assertBeamQuant #'(1 . -1)  #'(1 . -1)
+  d8[ d]
+
+  \filler
+
+  \assertBeamQuant #'(1 . 0)  #'(1 . 0)
+  e8[ e]
+  \filler
+
+
+  \assertBeamQuant #'(2 . -1)  #'(2 . -1)
+  f8[ f]
+  \filler
+
+
+  \assertBeamQuant #'(2 . 0)  #'(2 . 0)
+  g8[ g]
+  \filler
+
+
+  \assertBeamQuant #'(2 . 1)  #'(2 . 1)
+  a8[ a]
+  \filler
+
+%{
+  \once \override Beam #'inspect-quants = #'(2.2 . 2.2)
+  \assertBeamQuant
+  a8[ a]
+  \filler
+
+%}
+
 }
 
-seconds = \relative {
-    \assertBeamQuant #'(0 . 1)  #'(0 . 1)
-    c8[ d]
-    \filler
-     
-    \assertBeamQuant #'(1 . -1)  #'(1 . 0)
-    d8[ e]
-    \filler
-     
-     
-    \assertBeamQuant #'(1 . 0)  #'(1 . 1)
-    e8[ f]
-    \filler
-     
-     
-    \assertBeamQuant #'(2 . -1)  #'(2 . 0)
-    f8[ g]
-    \filler
-     
-     
-    \assertBeamQuant #'(2 . 0)  #'(2 . 1)
-    g8[ a]
-    \filler
-
-    \assertBeamQuant #'(3 . -1)  #'(3 . 0)
-    a8[ b]
-    \filler
+
+seconds = \relative c' {
+
+  \assertBeamQuant #'(0 . 0)  #'(0 . 1)
+  a8[ b]
+  \filler
+
+
+  \assertBeamQuant #'(0 . 0)  #'(0 . 1)
+  b8[ c]
+  \filler
+
+
+  \assertBeamQuant #'(0 . 0)  #'(0 . 1)
+  c8[ d]
+  \filler
+
+  \assertBeamQuant #'(1 . -1)  #'(1 . 0)
+  d8[ e]
+  \filler
+
+
+  \assertBeamQuant #'(1 . 0)  #'(1 . 1)
+  e8[ f]
+  \filler
+
+
+  \assertBeamQuant #'(2 . -1)  #'(2 . 0)
+  f8[ g]
+  \filler
+
+
+  \assertBeamQuant #'(2 . 0)  #'(2 . 1)
+  g8[ a]
+  \filler
+
+  \assertBeamQuant #'(3 . -1)  #'(3 . 0)
+  a8[ b]
+  \filler
+}
+
+filler = \new Voice \relative c' {
+  \hideNotes
+  e4 e4.
 }
 
+% Ross, p122
+primeSixteenths = \relative c' {
+  \stemUp
+  \assertBeamQuant #'(0 . -1)  #'(0 . -1)
+  g16[ g]
+  \filler
+  \assertBeamQuant #'(0 . -1)  #'(0 . -1)
+  a16[ a]
+  \filler
+  \assertBeamQuant #'(0 . -1)  #'(0 . -1)
+  b16[ b]
+  \filler
+  \assertBeamQuant #'(0 . 0)  #'(0 . 0)
+  c16[ c]
+  \filler
+  \assertBeamQuant #'(1 . -1)  #'(1 . -1)
+  d16[ d]
+  \filler
+  \assertBeamQuant #'(1 . 0)  #'(1 . 0)
+  e16[ e]
+  \filler
+  \assertBeamQuant #'(2 .  -1)  #'(2 . -1)
+  f16[ f]
+  \filler
+  \assertBeamQuant #'(2 . 0)  #'(2 . 0)
+  g16[ g]
+  \filler
+  \assertBeamQuant #'(3 . -1)  #'(3 . -1)
+  a16[ a]
+  \filler
+  \assertBeamQuant #'(3 . 0)  #'(3 . 0)
+  b16[ b]
+  \filler
+}
 
-{ \primes \seconds }
+\new Voice { \primes \seconds \primeSixteenths }
 
-#(ly:set-option 'debug-beam #f)