2003 -> 2004

[lilypond.git] / flower / include / axes.hh

diff --git a/flower/include/axes.hh b/flower/include/axes.hh
index 1b54089c17aa52a1ddeabcadd93901176844fa68..b01ef9915fcb452bfeb23f03691aaddc0ed0d7d4 100644 (file)
--- a/flower/include/axes.hh
+++ b/flower/include/axes.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -16,20 +16,19 @@ enum Axis {
     NO_AXES=2,
 };
 
-#ifndef STANDALONE
 
-#include "string.hh"           // ugh
+class String;
 
-String axis_name_str (Axis);
+String axis_name_string (Axis);
 
-#endif // STANDALONE
 
 /**
   the operator ++ for Axis. 
  */
-Axis post_incr(Axis &);
-Axis incr(Axis &);
-//Axis operator++(Axis);
+Axis other_axis (Axis); 
+Axis post_incr (Axis &);
+Axis incr (Axis &);
+//Axis operator++ (Axis);