don't include config.hh

diff --git a/ChangeLog b/ChangeLog
index c46afb8051249dcb18000de1779261911159cbd6..f8d8788624cc1439e0e5ba1fdc32428731417a76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * flower/include/std-vector.hh: don't include config.hh
+
 2006-02-15  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * flower/include/std-vector.hh: Better wrapper compatibility with

diff --git a/flower/include/std-vector.hh b/flower/include/std-vector.hh
index 8c31e664aa23f26835db10f6d69b1e6b5d8db40c..5269af6e209d2fb9aa70325bf2434b3ca9ae4391 100644 (file)
--- a/flower/include/std-vector.hh
+++ b/flower/include/std-vector.hh
@@ -42,7 +42,6 @@ int default_compare (T *const &a, T *const &b)
 }
 
 #include "compare.hh"
-#include "config.hh"
 
 #ifndef VSIZE
 #define VSIZE

diff --git a/lily/book.cc b/lily/book.cc
index edfca69fcf740914e94dd730316525163b487a07..87df4efe841e33cf9b7d9317b7df960cb112aadb 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -125,10 +125,9 @@ Book::process (Output_def *default_paper,
                paper_book->add_performance (perf->self_scm ());
              else if (Paper_score *pscore = dynamic_cast<Paper_score *> (output))
                {
-                 SCM systems = pscore->get_paper_systems ();
                  if (ly_is_module (score->header_))
                    paper_book->add_score (score->header_);
-                 paper_book->add_score (systems);
+                 paper_book->add_score (pscore->self_scm ());
                }
 
              outputs = scm_cdr (outputs);

diff --git a/lily/cluster.cc b/lily/cluster.cc
index d4cb47eb0bf1ebed370dc1e94b9ee5ced9c7f6e2..6cb0060e67cc33c28f2ed624d3f03f0ee6881420 100644 (file)
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -9,10 +9,6 @@
 */
 
 #include "cluster.hh"
-
-#include <cstdio>
-using namespace std;
-
 #include "international.hh"
 #include "item.hh"
 #include "lookup.hh"
@@ -25,7 +21,7 @@ using namespace std;
 
 /*
   TODO: Add support for cubic spline segments.
-*/
+ */
 Stencil
 brew_cluster_piece (Grob *me, vector<Offset> bottom_points, vector<Offset> top_points)
 {

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index c84fbe1c1c0fe83003c3ac0f348bcc34da854cee..ca1de4560f66a91ee1742cb2cf694ef8223f21c2 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -9,11 +9,8 @@
 #define PAPER_BOOK_HH
 
 #include "std-vector.hh"
-#include "protected-scm.hh"
 #include "smobs.hh"
-
-class Output_def;
-class Stencil;
+#include "lily-proto.hh"
 
 /** Paper_book collects headers, systems (Paper_system) and texts, and
     exports them to the output backend, either as systems or as

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index a431fc464882dc1f435e48eb6d1b3a6b2c3f14ad..8eca04af59bcefdc81e272d06c218ec93f4aed7f 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -254,6 +254,14 @@ Paper_book::add_score_title (SCM header)
     }
 }
 
+#if  0
+SCM
+Paper_book::system_specs ()
+{
+  
+}
+#endif
+
 SCM
 Paper_book::systems ()
 {
@@ -308,6 +316,7 @@ Paper_book::systems ()
        }
       else if (scm_is_vector (scm_car (s)))
        {
+         programming_error ("Vector case?");
          /*
            UGH. code dup.
          */

diff --git a/lily/relocate.cc b/lily/relocate.cc
index e5f27f7332d58419454824e946c991d98d9e120f..214e488f46339739400b6333a092e8ae42b4a9f2 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -27,7 +27,7 @@
 #include "version.hh"
 #include "warn.hh"
 
-const char * FRAMEWORKDIR = "..";
+#define FRAMEWORKDIR ".."
 
 
 int

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 5e24008e69a3c6c1fc2e488cddcd87086b1d24dc..2e3510f86afe978730c62c14007c7edfe8746a9a 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -129,7 +129,7 @@ broken_trend_y (Slur_score_state const &state, Direction hdir)
     {
       vsize k = broken_spanner_index (state.slur_);
       int j = int (k) + hdir;
-      if (j < 0 || j >= mother->broken_intos_.size ())
+      if (j < 0 || vsize (j) >= mother->broken_intos_.size ())
        return by;
 
       Grob *neighbor = mother->broken_intos_[j];
@@ -139,7 +139,7 @@ broken_trend_y (Slur_score_state const &state, Direction hdir)
        = broken_spanner_index (dynamic_cast<Spanner *> (state.common_[Y_AXIS]));
       int common_j = common_k + hdir;
 
-      if (common_j < 0 || common_j >= common_mother->broken_intos_.size ())
+      if (common_j < 0 || vsize (common_j) >= common_mother->broken_intos_.size ())
        return by;
 
       Grob *common_next_system = common_mother->broken_intos_[common_j];
@@ -163,9 +163,8 @@ Slur_score_state::set_next_direction ()
 
   if (Spanner *mother = dynamic_cast<Spanner *> (slur_->original ()))
     {
-      vsize k = broken_spanner_index (slur_);
-      vsize j = k + 1;
-      if (j < 0 || j >= mother->broken_intos_.size ())
+      vsize j = 1 + broken_spanner_index (slur_);
+      if (j >= mother->broken_intos_.size ())
        return;
 
       Grob *neighbor = mother->broken_intos_[j];

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 00b4ab156d8d93d858abf1b11f7905b453a0c85a..be9fa38515c16e52348408b42d71ed2d11de8092 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -67,7 +67,7 @@ Tab_note_heads_engraver::try_music (Music *m)
 void
 Tab_note_heads_engraver::process_music ()
 {
-  int j = 0;
+  vsize j = 0;
   for (vsize i = 0; i < note_events_.size (); i++)
     {
       SCM stringTunings = get_property ("stringTunings");

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 97b1e7c3eceb5b1e07c723a0e0c3764437aae2f9..0288939987958511468c5dbf6e327799f905ee02 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -435,11 +435,11 @@ void
 Tuplet_bracket::get_bounds (Grob *me, Grob **left, Grob **right)
 {
   extract_grob_set (me, "note-columns", columns);
-  int l = 0;
+  vsize l = 0;
   while (l < columns.size () && Note_column::has_rests (columns[l]))
     l++;
 
-  int r = columns.size () - 1;
+  vsize r = columns.size () - 1;
   while (r >= l && Note_column::has_rests (columns[r]))
     r--;