From 8707ba7b1a9f85b3e1e10cf681dd723e169264bf Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 17 Mar 2002 19:34:16 +0100 Subject: [PATCH] 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 --- ChangeLog | 11 ++++++++++- VERSION | 2 +- input/baerenreiter-sarabande.ly | 2 +- ps/music-drawing-routines.ps | 6 ++++++ scm/ps.scm | 19 +++++++++++++++++-- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7cbe72887..2af4fc24a7 100644 --- 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 + + * 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 diff --git a/VERSION b/VERSION index af8bc5f65b..9a1d0c5cbf 100644 --- 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 5b62551dc6..175735eef1 100644 --- 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 a4c8311465..93e82f9aaf 100644 --- 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 496bc521e6..e002e8b23c 100644 --- 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) -- 2.39.2