release: 1.1.24

[lilypond.git] / lily / general-script-def.cc

diff --git a/lily/general-script-def.cc b/lily/general-script-def.cc
index 688e9cdd36c933c537b60eb8cca3b07f4c042dfc..3ce45fbf5c6271d3cb05983d49db88807c9328e0 100644 (file)
--- a/lily/general-script-def.cc
+++ b/lily/general-script-def.cc
@@ -3,57 +3,56 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #include "general-script-def.hh"
 #include "debug.hh"
-#include "symbol.hh"
-int
-General_script_def::staff_dir_i()const
+#include "atom.hh"
+
+Direction
+General_script_def::staff_dir() const
 {
-    return -1;
+  return DOWN;
 }
-int
-General_script_def::rel_stem_dir_i()const
+
+Direction
+General_script_def::rel_stem_dir() const
 {
-    return 0;
+  return CENTER;
 }
 int
-General_script_def::priority_i()const
+General_script_def::priority_i() const
 {
-    return 1000;
+  return 1000;
 }
 
 bool
-General_script_def::inside_b()const
+General_script_def::inside_b() const
 {
-    return false;
+  return false;
 }
 
 bool
-General_script_def::equal_b(General_script_def const&g)const
+General_script_def::equal_b (General_script_def const&g) const
 {
-    if (name() != g.name())
-       return false;
-
-    return do_equal_b(g);
+  return do_equal_b (&g);
 }
 
 bool
-General_script_def::do_equal_b(General_script_def const&)const
+General_script_def::do_equal_b (General_script_def const*) const
 {
-    return true;
+  return true;
 }
 
 
 void
 General_script_def::print() const
 {
-    mtor << name() << "{";
-    do_print();
-    mtor << "}";
+  DOUT << classname(this) << "{";
+  do_print();
+  DOUT << "}";
 }
 
 void
@@ -62,10 +61,18 @@ General_script_def::do_print() const
 }
 
 Atom
-General_script_def::get_atom(Paper_def*, int)const
+General_script_def::get_atom (Paper_def*, Direction) const
+{
+  Atom s;
+  return Atom (s);
+}
+
+
+
+
+Interval
+General_script_def::width (Paper_def*) const
 {
-    Symbol s;
-    return Atom(s);
+  Interval t;
+  return t;
 }
-IMPLEMENT_STATIC_NAME(General_script_def);
-IMPLEMENT_IS_TYPE_B(General_script_def);