patch::: 1.3.23.jcn1

1.3.23.jcn1
===========

* Made quanting lists in scm/paper.scm comply with actual quantise_iv
  algorithm: period = quants.top () - quants[0].  This fixes beam
  vertical quanting problems.  Beam quanting should now actually be
  better than 1.2.17, which has a symmetry problem as revealed by the
  new input/test/beam-pos.ly.

diff --git a/CHANGES b/CHANGES
index 075a01b1e1525a3d9a4aa318052c51dd7b28cc09..da40977b30891795f95a2269fd9e7124ddc8d003 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+1.3.23.jcn1
+===========
+
+* Made quanting lists in scm/paper.scm comply with actual quantise_iv
+  algorithm: period = quants.top () - quants[0].  This fixes beam
+  vertical quanting problems.  Beam quanting should now actually be
+  better than 1.2.17, which has a symmetry problem as revealed by the
+  new input/test/beam-pos.ly.
+
 1.3.22.hwn2
 ===========
 

diff --git a/VERSION b/VERSION
index 8135fdaa697a5570031190a61859e3e7fc4ab9fc..36db9aa7b46385bfae9d379dac07e7c6d2f0b0d6 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=23
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly
index 2d6dcdfc1fe1c230bf48e9afd0aced7c0e49214a..0e21966204a900af6b5a947a0e08d27d14bc6fd1 100644 (file)
--- a/input/test/beam-pos.ly
+++ b/input/test/beam-pos.ly
@@ -1,17 +1,29 @@
-\version "1.3.5";
+\header{
+filename =      "beam-pos.ly";
+composer =      "jcn";
+enteredby =     "jcn";
+copyright =     "PD";
 
-\score{
-       \notes\transpose c''{
-               % \property Score.beamQuantisation = 'test
+TestedFeatures =        "beam quant positions";
+}
 
-               [c8 c] [c c] [c c] [c c]
-               [a' a'] [a' a'] [a' a'] [a' a']
-               [c16 c] [c c] [c c] [c c]
-               [a' a'] [a' a'] [a' a'] [a' a']
+\score{
+       \notes\relative c' { 
+               [c8 c] [a'' a]
+               [a, a] [c c]
+               [d,8 d] [g' g]
+               [g, g] [d' d]
+               [c,16 c c c] [a'' a a a]
+               [a, a a a] [c c c c]
+               \break
+               [c,32 c c c c c c c] [a'' a a a a a a a]
+               [f, f f f f f f f] [e' e e e e e e e]
+               \break
+               [c,8 d] [a'' g]
+               [g, f] [d' e]
+               \break
        }
        \paper{
-               castingalgorithm = \Wordwrap;
-               linewidth = 60.0\mm;
        }
 }
 

diff --git a/scm/paper.scm b/scm/paper.scm
index eed1093b7f075a3acf97577fa50a35b91784e44e..36ccac9622234ae7f5f7dd0b48a674de0bcfe6b3 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -27,28 +27,33 @@
 (define beam-sit (/ (+ beam-thickness staff-line) 2))
 (define beam-hang (- 1 (/ (- beam-thickness staff-line) 2)))
 
+;; Note: quanting period is take as quants.top () - quants[0], 
+;; which should be 1 (== 1 interline)
+
 (define beam-normal-dy-quants
   (list 0 (/ (+ beam-thickness staff-line) 2) (+ beam-thickness staff-line) 1))
 
 ;; two popular veritcal beam quantings
 ;; see params.ly: #'beam-vertical-quants
 (define (beam-normal-y-quants multiplicity dy)
-  (let ((quants (list beam-hang 1)))
+  (let ((quants (list beam-hang)))
     (if (or (<= multiplicity 1) (>= (abs dy) (/ staff-line 2)))
        (set! quants (cons beam-sit quants)))
     (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
        (set! quants (cons beam-straddle quants)))
-    quants))
+    ;; period: 1 (interline)
+    (append quants (list (+ 1 (car quants))))))
 
 (define (beam-traditional-y-quants multiplicity dy)
-  (let ((quants '(1)))
+  (let ((quants '()))
     (if (>= dy (/ staff-line -2))
        (set! quants (cons beam-hang quants)))
     (if (and (<= multiplicity 1) (<= dy (/ staff-line 2)))
        (set! quants (cons beam-sit quants)))
     (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
        (set! quants (cons beam-straddle quants)))
-    quants))
+    ;; period: 1 (interline)
+    (append quants (list (+ 1 (car quants))))))
 
 
 ;; There are several ways to calculate the direction of a beam