Merge branch 'master' of git+ssh://repo.or.cz/srv/git/lilypond

diff --git a/ChangeLog b/ChangeLog
index 88f2ccac75495277448d768488c3433f3880c8a4..7287810d83c3135a5dbaa4272842b7d6f09d4140 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2006-11-07  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/break-substitution.cc: 
+       * lily/dynamic-text-spanner.cc: 
+       nitpicks.
+
+       * lily/engraver.cc: 
+       * lily/grob-property.cc: 
+       use  SCM_ASSERT_TYPE for graphing functions.
+
+       * lily/cluster.cc: 
+       formatting.
+
+       * lily/all-font-metrics.cc: 
+       excise cmr10
+
+       * input/regression/collision-heads.ly: 
+       trim example.
+
+       * lily/note-collision.cc: 
+       * input/regression/collision-merge-differently-headed.ly: 
+       Examine Stem::duration_log() for preventing merge of quarter and
+       halfnote.  Fixes collision-heads.ly.  Add separate regtest for that.
+
+       * scripts/lilypond-invoke-editor.scm: 
+       don't use guile -e main execution.
+
+       * scm/define-grobs.scm: 
+       use stem::calc-duration-log for rest.
+
+       * scm/define-markup-commands.scm: 
+       another (sign dir) fix for note markup
+
+       * scm/define-markup-commands.scm: 
+       use (sign dir) for computing attachment points.
+
+       * buildscripts/git-update-changelog.py: 
+       run cvs up before patching.
+
+2006-11-06  Han-Wen Nienhuys  <hanwen@lilypond.org>
+
+       * lily/note-head.cc: 
+       trim note-head.cc includes.
+
+       * lily/easy-notation.cc: 
+       * lily/mensural-ligature-engraver.cc: 
+       * lily/note-collision.cc: 
+       * lily/note-head.cc: 
+       * scm/define-grobs.scm: 
+       * scm/output-lib.scm: 
+       use Rhythmic_head::duration_log() iso. Note_head::get_balltype().
+
+       * buildscripts/git-update-changelog.py: 
+       also barf if file doesn't exist.
+
 2006-11-07  Erlend Aasland  <erlenda@gmail.com>
 
        * scm/music-function.scm (add-ballon-text): add FIXME comment.
@@ -29,7 +84,10 @@
        * scm/define-music-types.scm: 
        * scm/output-lib.scm: 
        * lily/balloon-engraver.cc: 
-       rewrite balloon-text support. This is now a separate grob, with itsvictim as the parent. This involves addingBalloon_engraver, AnnotateOutputEvent, annotate-output-event,\balloonText, \balloonGrobText, and modifying Balloon_interface::print.
+       rewrite balloon-text support.  This is now a separate grob, with
+       itsvictim as the parent.  This involves addingBalloon_engraver,
+       AnnotateOutputEvent, annotate-output-event,\balloonText,
+       \balloonGrobText, and modifying Balloon_interface::print.
 
        * lily/paper-score.cc: 
        remove progress again

diff --git a/buildscripts/git-update-changelog.py b/buildscripts/git-update-changelog.py
index d67453ac0352b138822d53bd3bfe30010ba189b4..09f0d16b7afebad8214b9463cef4076fdc5f1301 100644 (file)
--- a/buildscripts/git-update-changelog.py
+++ b/buildscripts/git-update-changelog.py
@@ -54,10 +54,9 @@ class Commit:
 
         if removals == []:
             return True
-
         if not os.path.exists (filename):
             return False
-   
+
         contents = open (filename).read ()
         for r in removals:
             if r not in contents:
@@ -177,16 +176,13 @@ Apply GIT patches and update change log.
 
 Run this file from the CVS directory, with commits from the repository in --git-dir.
 
-
-
-
 """)
     p.add_option ("--start",
                   action='store',
                   default='',
                   metavar="FIRST",
                   dest="start",
-                  help="all commits starting with FIRST.")
+                  help="all commits starting with FIRST (exclusive).")
     
     p.add_option ("--git-dir",
                   action='store',

diff --git a/lily/bezier.cc b/lily/bezier.cc
index f5489e7d40b16825bc18728800073f582895b7a3..77f3949992cbf1fb6eaa380245d190aa3da3ec47 100644 (file)
--- a/lily/bezier.cc
+++ b/lily/bezier.cc
@@ -134,31 +134,28 @@ Bezier::curve_point (Real t) const
 /*
   Cache binom(3,j) t^j (1-t)^{3-j}
 */
-static struct Polynomial bezier_term_cache[4];
-static bool done_cache_init;
+struct Polynomial_cache {
+  Polynomial terms_[4];
+  Polynomial_cache ()
+  {
+    for (int j = 0; j <= 3; j++)
+      terms_[j]
+       = binomial_coefficient_3[j]
+       * Polynomial::power (j, Polynomial (0, 1))
+       * Polynomial::power (3 - j, Polynomial (1, -1));
+  }
+};
 
-void
-init_polynomial_cache ()
-{
-  for (int j = 0; j <= 3; j++)
-    bezier_term_cache[j]
-      = binomial_coefficient_3[j]
-      * Polynomial::power (j, Polynomial (0, 1))
-      * Polynomial::power (3 - j, Polynomial (1, -1));
-  done_cache_init = true;
-}
+static Polynomial_cache poly_cache;
 
 Polynomial
 Bezier::polynomial (Axis a) const
 {
-  if (!done_cache_init)
-    init_polynomial_cache ();
-
   Polynomial p (0.0);
   Polynomial q;
   for (int j = 0; j <= 3; j++)
     {
-      q = bezier_term_cache[j];
+      q = poly_cache.terms_[j];
       q *= control_[j][a];
       p += q;
     }

diff --git a/mf/feta-beum.mf b/mf/feta-beum.mf
deleted file mode 100644 (file)
index ea93815..0000000
--- a/mf/feta-beum.mf
+++ /dev/null
@@ -1,23 +0,0 @@
-% 
-% feta-beum.mf --  implement runtime MF beams
-% 
-% source file of LilyPond's pretty-but-neat music font
-% 
-% (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
-% 
-mode_setup;
-
-def drawbeam(expr widths,slope,thicks) =
-       beginchar(0,0,0,0) "Embedded mf";
-               width#:=widths*1pt#;
-               thick#:=thicks*1pt#;
-               height#:=slope*width#;
-               % do separately, to identify "value too large"
-               define_pixels(height);
-               define_pixels(thick);
-               define_pixels(width);
-               fill (0, - thick/2)--(width,height - thick/2)--(width,height+thick/2)--(0,thick/2)
-                       -- cycle;
-               endchar;
-       enddef;
-