patch::: 1.5.41.jcn4

	* scm/ps.scm (bezier-sandwich): Draw circles at slur ends.

---
Generated by janneke@gnu.org,
From = lilypond-1.5.41.jcn3, To = lilypond-1.5.41.jcn4

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.41.jcn4.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/ChangeLog b/ChangeLog
index d7cbe72887fde9c573edce96acbe7c66b7d5c9d7..2af4fc24a7550e4759bb7a3a9c7d86e14cb8be9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
---- ../lilypond-1.5.41.jcn2/ChangeLog  Sun Mar 17 01:40:33 2002
+--- ../lilypond-1.5.41.jcn3/ChangeLog  Sun Mar 17 16:14:23 2002
+++ b/ChangeLog Sun Mar 17 19:34:16 2002
+@@ -1,5 +1,7 @@
+ 2002-03-17  Jan Nieuwenhuizen  <janneke@gnu.org>
+ 
+       * scm/ps.scm (bezier-sandwich): Draw circles at slur ends.
+
+       * lily/beam.cc (score_stem_lengths): new quanting stuff
+       (score_forbidden_quants): Second and third beam quant stuff.
+ --- ../lilypond-1.5.41.jcn2/ChangeLog Sun Mar 17 01:40:33 2002
 ++ b/ChangeLog Sun Mar 17 16:14:23 2002
 @@ -1,6 +1,7 @@
  2002-03-17  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/VERSION b/VERSION
index af8bc5f65b3fa90173761a5097a3206624bb2123..9a1d0c5cbf1fa5eaed4ff546406a390197cb9850 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=41
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/baerenreiter-sarabande.ly b/input/baerenreiter-sarabande.ly
index 5b62551dc68124ffa439e973669ff4b39e57e387..175735eef1798d96378819f88d08e621a60e07c4 100644 (file)
--- a/input/baerenreiter-sarabande.ly
+++ b/input/baerenreiter-sarabande.ly
@@ -90,7 +90,7 @@ sarabandeA =  \context Voice \notes \relative c {
   \stemUp
   d4 d,16 a'( b cis d e f )g |
   \stemBoth
-%  \break
+  \break
   %%25
   < { a16(b c)b c4. b16()a |
       b cis d cis d4. e16()f | }

diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps
index a4c83114657fef3a603c0d53be2981c1b0a50466..93e82f9aaff2d689546feffac159a5cd4a2cdd6d 100644 (file)
--- a/ps/music-drawing-routines.ps
+++ b/ps/music-drawing-routines.ps
@@ -232,6 +232,12 @@
        stroke 
 } bind def 
 
+/draw_dot % x1 y2 R
+{
+%      0 360 arc fill stroke
+       0 360 arc closepath fill stroke
+} bind def
+
 /draw_dashed_line % dash thickness dx dy
 { 
        1 setlinecap 

diff --git a/scm/ps.scm b/scm/ps.scm
index 496bc521e602bf9d6d1af2a5aacb3e95047b427f..e002e8b23c0f3de21cb7c5c2e55e024b5d0405b3 100644 (file)
--- a/scm/ps.scm
+++ b/scm/ps.scm
@@ -203,8 +203,23 @@
 (define (bezier-sandwich l thick)
   (string-append 
    (apply string-append (map control->string l))
-   (ly-number->string  thick)
-   " draw_bezier_sandwich"))
+   (ly-number->string thick)
+   " draw_bezier_sandwich "
+   (bezier-ending (list-ref l 3) (list-ref l 0) (list-ref l 5))
+   (bezier-ending (list-ref l 7) (list-ref l 0) (list-ref l 5))))
+
+(define (bezier-ending z0 z1 z2)
+  (let ((x0 (car z0))
+       (y0 (cdr z0))
+       (x1 (car z1))
+       (y1 (cdr z1))
+       (x2 (car z2))
+       (y2 (cdr z2)))
+    (string-append " "
+     (numbers->string
+      (list x0 y0
+           (/ (sqrt (+ (* (- x1 x2) (- x1 x2)) (* (- y1 y2) (- y1 y2)))) 2)))
+     " draw_dot")))
 
                                        ; TODO: use HEIGHT argument
 (define (start-line height)