* lily/include/pango-font.hh: new file.

[lilypond.git] / flower / axis.cc

diff --git a/flower/axis.cc b/flower/axis.cc
index b4446bed5f309b4b9c27ba92427da5bcf5c334e5..340a9f7d7be81410202b09c2eecd56d73387ef31 100644 (file)
--- a/flower/axis.cc
+++ b/flower/axis.cc
@@ -3,35 +3,15 @@
 
 
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <assert.h>
 #include "axes.hh"
 
-String
-axis_name_str (Axis a)
-{
-  return to_str (char(a + 'x'));
-}
+#include "string.hh"
 
-/*
-  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)
+String
+axis_name_string (Axis a)
 {
-  assert(a < NO_AXES);
-  a = Axis(int(a) + 1);
-  return a;
+  return to_string (char (a + 'x'));
 }
-