(seconds): print desired

quants when failing.

diff --git a/ChangeLog b/ChangeLog
index 651cf7dd4adcab7cb0d596f104f966d3c20a9083..42291b81896a070b418e6b42f21d0354d154500b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-07  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * input/regression/beam-quant-standard.ly (seconds): print desired
+       quants when failing.
+
 2004-07-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * SConstruct:

diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly
index 8a8d53ec1505ea237f543f34f078b73bbc04abcf..930163781d253659c1d7fb138aee13624b8a4300 100644 (file)
--- a/input/regression/beam-quant-standard.ly
+++ b/input/regression/beam-quant-standard.ly
@@ -12,9 +12,9 @@
 
 \paper  { raggedright = ##t }
 
-
+filler = \relative { e4 e }
 % 
-% #(ly:set-option 'debug-beam #t)
+#(ly:set-option 'debug-beam #t)
 
 assertquant =
 #(def-music-function (location l r) (pair? pair?)
@@ -25,43 +25,73 @@ assertquant =
    #}
    
 ))
-  
 
-\relative {
+
+
+
+primes = \relative {
+    \assertquant #'(0 . 0)  #'(0 . 0)
+    c8[ c]
+    \filler
+    \assertquant #'(1 . -1)  #'(1 . -1)
+    d8[ d]
+     
+    \filler
+     
     \assertquant #'(1 . 0)  #'(1 . 0)
     e8[ e]
-    e4 
-    e4 
+    \filler
+     
+     
     \assertquant #'(2 . -1)  #'(2 . -1)
     f8[ f]
-    e4 
-    e4 
+    \filler
+     
+     
     \assertquant #'(2 . 0)  #'(2 . 0)
     g8[ g]
-    e4 
-    e4 
+    \filler
+     
+     
     \assertquant #'(2 . 1)  #'(2 . 1)
     a8[ a]
-    e4 e4 e4
+    \filler
+      
     \once \override Beam #'inspect-quants = #'(2.2 . 2.2)
     a8[ a]
-    e4 
-    e4 
+    \filler
+}
 
-    \assertquant #'(0 . 1)  #'(1 . 0)
+seconds = \relative {
+    \assertquant #'(0 . 1)  #'(0 . 1)
+    c8[ d]
+    \filler
+     
+    \assertquant #'(1 . -1)  #'(1 . 0)
     d8[ e]
-    e4 
-    e4 
+    \filler
+     
+     
     \assertquant #'(1 . 0)  #'(1 . 1)
     e8[ f]
-    e4 
-    e4 
+    \filler
+     
+     
     \assertquant #'(2 . -1)  #'(2 . 0)
     f8[ g]
-    e4 
-    e4 
+    \filler
+     
+     
     \assertquant #'(2 . 0)  #'(2 . 1)
     g8[ a]
-    e4 
-    e4 
-    }
+    \filler
+
+    \assertquant #'(3 . -1)  #'(3 . 0)
+    a8[ b]
+    \filler
+}
+
+
+{ \primes \seconds }
+
+#(ly:set-option 'debug-beam #f)

diff --git a/scm/beam.scm b/scm/beam.scm
index ab79154115a50b1efca047dc211b4f737441f3e9..858053fdc86c31d4e8c20200674007b73c06807e 100644 (file)
--- a/scm/beam.scm
+++ b/scm/beam.scm
@@ -81,10 +81,17 @@
     
     (if (or (not (almost-equal want-l (car posns)))
            (not (almost-equal want-r (cdr posns))))
-       (ly:warn
-        (format "Error in beam quanting found. Want (~S,~S) found (~S)."
-                want-l want-r posns
-                )))))
+       (begin
+         (ly:warn
+          (format "Error in beam quanting found. Want (~S,~S) found (~S)."
+                  want-l want-r posns
+                  ))
+         (set! (ly:grob-property beam 'quant-score)
+               (format "(~S,~S)" want-l want-r)))
+       (set! (ly:grob-property beam 'quant-score) "")
+
+       
+         )))
                 
 (define-public (check-quant-callbacks l r)
   (list Beam::least_squares

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index d17171b06873aecef7af393a0c093269b6307240..19b7b596c933caf0b3039525780644d5ee4cee9c 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -489,9 +489,6 @@ reading this property.")
 @code{linethickness}.")
      (thickness ,number? "Bar line thickness, measured in
 @code{linethickness}.")
-;;TODO -- change to fret-thickness
-     (thickness ,number? "Thickness of fret and string lines in a fret
-diagram.  Multiplier on bar thickness.")
      (thin-kern ,number? "The space after a hair-line in a bar line.")
      (forced-distance ,ly:dimension? "A fixed distance between object
 reference points in an alignment.")
@@ -636,7 +633,7 @@ entries @code{name} and @code{interfaces}.")
      (chord-tremolo ,boolean? "if set, this beam is a tremolo. ")
      (begin-of-line-visible ,boolean? "Used for marking ChordNames that should only show changes.")
      (head-pair ,pair? "Pair of grob pointers, pointing to the two heads of the tie.")
-     (quant-score ,number? "Beam quanting score -- can be stored for
+     (quant-score ,string? "Beam quanting score -- can be stored for
 debugging")
      (least-squares-dy ,number? 
                       "ideal beam slope, without damping.")

diff --git a/scm/stencil.scm b/scm/stencil.scm
index 153661cc0be769ea315e0a1c409ad4a88b8dc1ca..c8518d76f7d7b125cfa414a3aff81ac99375dc63 100644 (file)
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -1,4 +1,4 @@
-;;;; stenicil.scm -- 
+;;;; stencil.scm -- 
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;