* stepmake/aclocal.m4: do NDEBUG for optimizing builds.

* lily/include/beam.hh (DEBUG_QUANTING): performance: only switch
on BEAMQUANTING for non-NDEBUG builds.

* lily/stem.cc (head_count): performance: avoid String::String()
inside oft called function.

diff --git a/ChangeLog b/ChangeLog
index a38c57d07d5500f5bb609e66466667b29a038b92..26c28781d101eaf7192e195ae4396769e45a4d19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-01-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * stepmake/aclocal.m4: do NDEBUG for optimizing builds.
+
+       * lily/include/beam.hh (DEBUG_QUANTING): performance: only switch
+       on BEAMQUANTING for non-NDEBUG builds.
+
+       * lily/stem.cc (head_count): performance: avoid String::String()
+       inside oft called function.
+
 2005-01-09  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/examles.itely: attempted fix for broken

diff --git a/VERSION b/VERSION
index c01296d01fbeb1a46559683abd1dc766a1cc2713..05a322e8217a6359589eb32890b6c6c18a8f6526 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=7
+PATCH_LEVEL=8
 MY_PATCH_LEVEL=
 

diff --git a/flower/rational.cc b/flower/rational.cc
index 2d3195514a555f2b0fc10d8da67cd49cb76eb4ff..4f6678f1c7f3b4b66df1c76e0ac8b1e6c93166df 100644 (file)
--- a/flower/rational.cc
+++ b/flower/rational.cc
@@ -56,7 +56,7 @@ Rational::Rational (int n)
   den_= 1;
 }
 
-static
+static inline
 int gcd (int a, int b)
 {
   int t;
@@ -68,13 +68,6 @@ int gcd (int a, int b)
   return b;
 }
 
-#if 0
-static
-int lcm (int a, int b)
-{
-  return abs (a*b / gcd (a,b));
-}
-#endif
 
 void
 Rational::set_infinite (int s)

diff --git a/lily/global-context-scheme.cc b/lily/global-context-scheme.cc
index 375af3645ec893cb09abdad06ceb1b8c1071680b..f26b0b19f72a10dd4c72de5d99dc66bdf9922e96 100644 (file)
--- a/lily/global-context-scheme.cc
+++ b/lily/global-context-scheme.cc
@@ -19,7 +19,7 @@
 
 LY_DEFINE (ly_format_output, "ly:format-output",
           2, 0, 0, (SCM context, SCM outname),
-          "Given a Score context in its final state,"
+          "Given a Global context in its final state, "
            "process it and return the (rendered) result.")
 {
   Global_context *g = dynamic_cast<Global_context*> (unsmob_context (context));

diff --git a/lily/group-interface.cc b/lily/group-interface.cc
index 14cdbc52771abeec0cb1498cd52d70d1a3e73772..90dfdebd91158831807dab95ec3fedd4941bc582 100644 (file)
--- a/lily/group-interface.cc
+++ b/lily/group-interface.cc
@@ -16,16 +16,10 @@ Group_interface::add_thing (Grob*me, SCM sym, SCM thing)
 }
 
 
-void
-Group_interface::add_thing (Grob*me, String name, SCM thing)
-{
-  add_thing (me, ly_symbol2scm (name.to_str0 ()), thing);
-}
-
 int
-Group_interface::count (Grob *me, String name)
+Group_interface::count (Grob *me, SCM sym)
 {
-  return scm_ilength (me->get_property (name.to_str0 ()));
+  return scm_ilength (me->internal_get_property (sym));
 }
 
 

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index e7594f5a4d745032e12d00b608d26a5c09eb6e41..cf4740b349d025f6bbd2bcf5bfb1c66a2da90eca 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -74,7 +74,9 @@ private:
 
 const int REGION_SIZE = 2;
 
+#ifndef NDEBUG
 #define DEBUG_QUANTING 1
+#endif
 
 #endif /* BEAM_HH */
 

diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh
index 6d544f27ee6ed398464a2e096d510530853b77ce..3cdcfedf361a54ab3b8780548d5c72310813c45c 100644 (file)
--- a/lily/include/group-interface.hh
+++ b/lily/include/group-interface.hh
@@ -23,9 +23,8 @@
 struct Group_interface
 {
 public:
-  static int count (Grob*  , String);
+  static int count (Grob*, SCM);
   static void add_thing (Grob*, SCM, SCM);
-  static void add_thing (Grob*, String nm, SCM);
 };
 
 struct Pointer_group_interface : public Group_interface {

diff --git a/lily/stem.cc b/lily/stem.cc
index b098b38af794f77a38fb428eb185d0c09cd7e4d4..6a1e2070912f60b828ec3ba81571b5a91f62079f 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -141,7 +141,7 @@ Stem::support_head (Grob *me)
 int
 Stem::head_count (Grob *me)
 {
-  return Pointer_group_interface::count (me, "note-heads");
+  return Pointer_group_interface::count (me, ly_symbol2scm ("note-heads"));
 }
 
 /* The note head which forms one end of the stem.

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 16279f4f60036609e640f89451896fa24615edda..4f47e190b44d5608859954cb1957274010dc05cb 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -28,7 +28,7 @@ Tie_column::add_tie (Grob*me,Grob *s)
       && Tie_column::has_interface (s->get_parent (Y_AXIS)))
     return ;
   
-  if (!  Pointer_group_interface::count (me, "ties"))
+  if (!Pointer_group_interface::count (me, ly_symbol2scm ("ties")))
     {
       dynamic_cast<Spanner*> (me)->set_bound (LEFT, Tie::head (s,LEFT));
       dynamic_cast<Spanner*> (me)->set_bound (RIGHT, Tie::head (s,RIGHT));

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 393d6a372d3446d80c177900f0200bb5c685ae81..6836383bc79041362951bbe58c4d5d4293dd98e6 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -77,9 +77,6 @@ linethickness := 0.5pt#;
 increment := 0.5pt#;
 y := 10pt#;
 
-
-
-
 for i := 0 step 1 until font_count:
 
   %% We can't store more than 64 (65?) height dimensions in a TFM

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 3d8cc6f15925916666ff11c8248ab5d36da5326b..d8cf86f060070cc7efbd374efc350e82955f1ade 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -169,16 +169,11 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     CFLAGS=${CFLAGS-""}
     CXXFLAGS=${CXXFLAGS-$CFLAGS}
     LDFLAGS=${LDFLAGS-""}
-    checking_b=yes
     optimise_b=yes
     profile_b=no
     debug_b=yes
     pipe_b=yes
 
-    AC_ARG_ENABLE(checking,
-    [  --enable-checking       set runtime checks (assert calls).  Default: on],
-    [checking_b=$enableval] )
-
     AC_ARG_ENABLE(debugging,
     [  --enable-debugging      compile with debugging info.  Default: on],
     [debug_b=$enableval])
@@ -195,13 +190,9 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     [  --enable-pipe           compile with -pipe.  Default: on],
     [pipe_b=$enableval])
 
-    if test "$checking_b" = no; then
-       # ugh
+    if test "$optimise_b" = yes; then
        AC_DEFINE(NDEBUG)
        DEFINES="$DEFINES -DNDEBUG"
-    fi
-
-    if test "$optimise_b" = yes; then
        OPTIMIZE="-O2 -finline-functions"
     fi