From 06db95f35e0a3d3e89381d47a55ce8651e56c043 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Wed, 1 Mar 2000 18:04:06 +0100 Subject: [PATCH] patch::: 1.3.28.jcn1 1.3.28.jcn1 =========== * Bugfix: don't make almost flat slurs, change in de-uglyfy slur. * Bugfix: midi2ly put out recent version (ugh). --- CHANGES | 7 +++++++ VERSION | 2 +- lily/bezier-bow.cc | 11 +---------- mf/as5.af | 6 ++++++ mf/as9.af | 10 ++++++++++ midi2ly/mudela-stream.cc | 2 +- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/CHANGES b/CHANGES index 2f2baa38ed..cab708ae46 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +1.3.28.jcn1 +=========== + +* Bugfix: don't make almost flat slurs, change in de-uglyfy slur. + +* Bugfix: midi2ly put out recent version (ugh). + 1.3.28 ====== diff --git a/VERSION b/VERSION index eccd0728c3..dfcdb19883 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=28 -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/lily/bezier-bow.cc b/lily/bezier-bow.cc index 3565cddb31..aa276f3043 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -83,21 +83,12 @@ Bezier_bow::de_uglyfy () Real h = curve_.control_[i][Y_AXIS] * ff / len; // ugh. Unhardcode this -#if 0 - // Too crude. - if (h > 4 * ind) - { - h = 4* ind; - } -#else Real f = default_height (len) / len; if (h > 2.0 * f) { h = 2.0 * f; } -#endif - - if (h > 0.8 + -2 * ind) + else if (h > 0.8 + -2 * ind) { h = 0.8 - 2 *ind; } diff --git a/mf/as5.af b/mf/as5.af index a8fd2500e3..72159223f0 100644 --- a/mf/as5.af +++ b/mf/as5.af @@ -4,6 +4,12 @@ Comment (c) 2000 Jan Nieuwenhuizen + Comment Thanks go to out to participants in discussions on + Comment alt.ascii-art and rec.music.compose + + Comment noteheads-0 by llizard/ejm + Comment and Shaun Mead + Comment Lines that start with TAB or FF make up the .afm Comment TABs are comments Comment `Comment' is the afm comment prefix diff --git a/mf/as9.af b/mf/as9.af index c2597e9935..60af874e37 100644 --- a/mf/as9.af +++ b/mf/as9.af @@ -3,6 +3,16 @@ Comment part of LilyPond's [ascii music font] Comment (c) 2000 Jan Nieuwenhuizen + + Comment Thanks go to out to participants in discussions on + Comment alt.ascii-art and rec.music.compose + + Comment first noteheads-2 (although erroneously named) by + Comment Wesley Clifford + Comment rests-2 by Ben Norwood + Comment accidentals--1 and suggestions for noteheads by + Comment Ben Norwood + Comment Lines that start with TAB or FF make up the .afm Comment TABs are comments diff --git a/midi2ly/mudela-stream.cc b/midi2ly/mudela-stream.cc index 1ec52fc4a1..b185a9bbcd 100644 --- a/midi2ly/mudela-stream.cc +++ b/midi2ly/mudela-stream.cc @@ -100,7 +100,7 @@ Mudela_stream::header() *os_p_ << filename_str_g; *os_p_ << "\n\n"; // ugh - *os_p_ << "\\version \"1.2.7\";\n"; + *os_p_ << "\\version \"1.3.4\";\n"; } void -- 2.39.5