* lily/include/audio-column.hh: remove unused variables.

(patch by Michael Welsh Duggan)

* flower/include/axes.hh (other_axis): inline Axes function
(thanks to David Brandon).

diff --git a/ChangeLog b/ChangeLog
index ff81165783ae78ebb0697008b2aab27aa5bdee83..cb24329e76423b9ecb90ece3d0b6045615823241 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-02  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * lily/include/audio-column.hh: remove unused variables.
+       (patch by Michael Welsh Duggan)
+
+       * flower/include/axes.hh (other_axis): inline Axes function
+       (thanks to David Brandon).
+
 2004-05-02  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/mknetrel: Install image links (backportme).

diff --git a/flower/axis.cc b/flower/axis.cc
index 7b264c2da905c4156e408d619b1da1b3799f4263..d28657aabe0175e75649e48d813dbd0b68a4035b 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -16,30 +16,3 @@ axis_name_string (Axis a)
   return to_string (char (a + 'x'));
 }
 
-
-Axis
-other_axis (Axis a)
-{
-  return a ==  Y_AXIS ? X_AXIS : Y_AXIS;
-}
-
-/*
-  TODO inline these.
- */
-Axis
-post_incr (Axis &a)
-{
-  assert (a < NO_AXES);
-  Axis b= a;
-  a = Axis (int (a) + 1);
-  return b;
-}
-
-Axis
-incr (Axis &a)
-{
-  assert (a < NO_AXES);
-  a = Axis (int (a) + 1);
-  return a;
-}
-

diff --git a/flower/include/axes.hh b/flower/include/axes.hh
index b01ef9915fcb452bfeb23f03691aaddc0ed0d7d4..d2d57e0fbf6cfcb0c37f6d37225c7fce0fd4d789 100644 (file)
--- a/flower/include/axes.hh
+++ b/flower/include/axes.hh
@@ -10,26 +10,28 @@
 #ifndef AXES_HH
 #define AXES_HH
 
+#include <assert.h>
+
 enum Axis {
     X_AXIS =0,
     Y_AXIS =1,
     NO_AXES=2,
 };
 
-
-class String;
-
-String axis_name_string (Axis);
-
-
-/**
-  the operator ++ for Axis. 
- */
-Axis other_axis (Axis); 
-Axis post_incr (Axis &);
-Axis incr (Axis &);
-//Axis operator++ (Axis);
-
-
+static inline
+Axis
+incr (Axis &a)
+{
+  assert (a < NO_AXES);
+  a = Axis (int (a) + 1);
+  return a;
+}
+
+static inline
+Axis
+other_axis (Axis a)
+{
+  return a ==  Y_AXIS ? X_AXIS : Y_AXIS;
+}
 
 #endif // AXES_HH

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index b7fea1313abe0909026ccc12693e41c7bb592afb..3622c7be41384178ca6ecaec3ec30bcac82f873e 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -11,6 +11,7 @@
 #include "real.hh"
 #include "axes.hh"
 #include "arithmetic-operator.hh"
+#include "string.hh"
 
 Offset complex_multiply (Offset, Offset);
 Offset complex_divide (Offset, Offset);

diff --git a/lily/audio-column.cc b/lily/audio-column.cc
index 5bec2f0dbf7ff79a9c3ae73823b52883a8e51cab..549f0f153de3255c337a67430123e2e0507bdcb1 100644 (file)
--- a/lily/audio-column.cc
+++ b/lily/audio-column.cc
@@ -13,7 +13,6 @@
 Audio_column::Audio_column (Moment at_mom)
 {
   at_mom_ = at_mom;
-  performance_ = 0;
 }
 
 void

diff --git a/lily/box.cc b/lily/box.cc
index 5ec4a9f03949234f7ce87d003b2f6f157b8a0eb9..97bbbb905bb9c6018b684152231c9e0e35dc56fb 100644 (file)
--- a/lily/box.cc
+++ b/lily/box.cc
@@ -8,6 +8,7 @@
 
 #include "box.hh"
 #include "array.hh"
+#include "axes.hh"
 
 void
 Box::translate (Offset o)

diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh
index 05fe7e161b0f0de1dc0afe1f0102b6c874aaca14..457629455fff9750491a20be6aa07c5814e5e105 100644 (file)
--- a/lily/include/align-interface.hh
+++ b/lily/include/align-interface.hh
@@ -10,7 +10,6 @@
 #ifndef ALIGN_INTERFACE_HH
 #define ALIGN_INTERFACE_HH
 
-#include "axes.hh"
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 18f51d5bfba764c270cfacb68c7dc6a53586efdb..9b78075c6e6999eb69ce6b49502c2633f6947038 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -23,10 +23,8 @@ public:
 
   void add_audio_item (Audio_item* i);
   Moment at_mom () const;
-  void print () const;
 
   Link_array<Audio_item> audio_items_;
-  Performance * performance_;
 
 private:
   Audio_column (Audio_column const&);

diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh
index 8ab5d48fc3ac50c81d3d55d81022661a097e1974..b4ded08818c95a3147b3127e2f65915bbea8c88d 100644 (file)
--- a/lily/include/bezier.hh
+++ b/lily/include/bezier.hh
@@ -11,7 +11,6 @@
 #include "real.hh"
 #include "drul-array.hh"
 #include "interval.hh"
-#include "axes.hh"
 #include "offset.hh"
 #include "array.hh"
 #include "polynomial.hh"

diff --git a/lily/include/box.hh b/lily/include/box.hh
index 252b695e7bc32e2df24c2db0dd87666075d1100c..a04661fa56a55b0f0d0e1e2f874c318228cbb673 100644 (file)
--- a/lily/include/box.hh
+++ b/lily/include/box.hh
@@ -9,8 +9,6 @@
 #include "real.hh"
 #include "interval.hh"
 #include "offset.hh"
-#include "axes.hh"
-
 
 struct Box
 {

diff --git a/lily/include/stencil.hh b/lily/include/stencil.hh
index 5168dca5efa548a438c40bf564a4134fb01a7250..58d8e566ed27ec4c33ac8627601dbce43f0d2426 100644 (file)
--- a/lily/include/stencil.hh
+++ b/lily/include/stencil.hh
@@ -11,7 +11,6 @@
 #include <stdlib.h>            // size_t
 #include "lily-proto.hh"
 #include "box.hh"
-#include "axes.hh"
 #include "direction.hh"
 #include "lily-guile.hh"
 #include "smobs.hh"

diff --git a/lily/include/translator.hh b/lily/include/translator.hh
index 0c791e51ec9f891e3c2593cd66af1d15605c0555..e4ae2fb3432ee6a232076019d3c6e12ba73ec109 100644 (file)
--- a/lily/include/translator.hh
+++ b/lily/include/translator.hh
@@ -41,7 +41,6 @@ public:
   
   Translator (Translator const &);
 
-  void removal_processing ();
   SCM internal_get_property (SCM symbol) const;
   
   virtual Music_output_def *get_output_def () const;

diff --git a/lily/input-file-results.cc b/lily/input-file-results.cc
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lily/score.cc b/lily/score.cc
index e52c8b581520f626ed36a821e081321b6d381e8d..c5c284b1f1e3fadbcd404bb7a986a63281cd7dd3 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -189,18 +189,21 @@ Score::book_rendering (String outname, Music_output_def *default_def,
   for (int i = 0; !i || i < outdef_count; i++)
     {
       Music_output_def *def = outdef_count ? defs_[i] : default_def;
-      SCM context = ly_run_translator (music_, def->self_scm ());
-      if (Global_context *g = dynamic_cast<Global_context*>
-         (unsmob_context (context)))
+      if (!(no_paper_global_b && dynamic_cast<Paper_def*> (def)))
        {
-         SCM s = ly_format_output (context, out);
-         if (s != SCM_UNDEFINED)
+         SCM context = ly_run_translator (music_, def->self_scm ());
+         if (Global_context *g = dynamic_cast<Global_context*>
+             (unsmob_context (context)))
            {
-             systems = s;
-             /* Ugh. */
-             Music_output *output = g->get_output ();
-             if (Paper_score *ps = dynamic_cast<Paper_score*> (output))
-               *paper = ps->paper_;
+             SCM s = ly_format_output (context, out);
+             if (s != SCM_UNDEFINED)
+               {
+                 systems = s;
+                 /* Ugh. */
+                 Music_output *output = g->get_output ();
+                 if (Paper_score *ps = dynamic_cast<Paper_score*> (output))
+                   *paper = ps->paper_;
+               }
            }
        }
     }