formatting cleanups, rename

[lilypond.git] / flower / axis.cc

diff --git a/flower/axis.cc b/flower/axis.cc
index ab80403e025c403c65e59af5e382e5311cc3fe27..61cb194118110efbd8940ba433025d3ca3fc74aa 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -3,35 +3,43 @@
 
 
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <assert.h>
 #include "axes.hh"
+#include "string.hh"
 
 String
-axis_name_str (Axis a)
+axis_name_string (Axis a)
 {
-  return to_str (char(a + 'x'));
+  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)
+post_incr (Axis &a)
 {
-  assert(a < NO_AXES);
+  assert (a < NO_AXES);
   Axis b= a;
-  a = Axis(int(a) + 1);
+  a = Axis (int (a) + 1);
   return b;
 }
 
 Axis
-incr(Axis &a)
+incr (Axis &a)
 {
-  assert(a < NO_AXES);
-  a = Axis(int(a) + 1);
+  assert (a < NO_AXES);
+  a = Axis (int (a) + 1);
   return a;
 }