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).

diff --git a/CHANGES b/CHANGES
index 2f2baa38edc23eb93193a758a15c82af81565bdc..cab708ae46f8e6990f45b5978ab7f520e3edbef0 100644 (file)
--- 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 eccd0728c3044876b33f574749a1002eb194baad..dfcdb1988335e8a2d9d5d657d0189ed3fafee1f4 100644 (file)
--- 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 3565cddb31e60d7a46d058411da3fcc40f75a07e..aa276f3043e59155baf7cc073f5cc024403a8223 100644 (file)
--- 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 a8fd2500e34c9f5f506df45e37a5ba33d3cfe6f1..72159223f04202548426f3038fafb096de85eab7 100644 (file)
--- a/mf/as5.af
+++ b/mf/as5.af
@@ -4,6 +4,12 @@
 
        Comment (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
 
+       Comment Thanks go to out to  participants in discussions on
+       Comment alt.ascii-art and rec.music.compose
+
+       Comment noteheads-0 by llizard/ejm <llizard_ejm@yahoo.com>
+       Comment and Shaun Mead <shaun.mead@ns.sympatico.ca>
+
        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 c2597e99356de8ba66686c18e27ffa00e3b6450f..60af874e3731ce4a370b1c12755c985de70d2c44 100644 (file)
--- 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 <janneke@gnu.org>
+       
+       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 <parallax@apk.net>
+       Comment rests-2 by Ben Norwood <bdn95@aber.ac.uk>
+       Comment accidentals--1 and suggestions for noteheads by
+       Comment   Ben Norwood <bdn95@aber.ac.uk>
+
 
        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 1ec52fc4a11d157453d1cebdc6e4f8ff8aa73eb0..b185a9bbcd5152330f72ac42a644f6aeec220f4b 100644 (file)
--- 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