patch::: 1.1.37.script1

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

diff --git a/lily/general-script-def.cc b/lily/general-script-def.cc
index 2a014cc54205a282802c9ec460833bfe96b41061..a425c9f3873f6c773cc6b25761d9d6e8c59dd965 100644 (file)
--- a/lily/general-script-def.cc
+++ b/lily/general-script-def.cc
@@ -1,15 +1,17 @@
+
 /*
   general-script-def.cc -- implement General_script_def
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
+#include "molecule.hh"
 #include "general-script-def.hh"
 #include "debug.hh"
-#include "atom.hh"
+
+
 Direction
 General_script_def::staff_dir() const
 {
@@ -36,9 +38,6 @@ General_script_def::inside_b() const
 bool
 General_script_def::equal_b (General_script_def const&g) const
 {
-  if (name() != g.name ())
-    return false;
-
   return do_equal_b (&g);
 }
 
@@ -52,7 +51,7 @@ General_script_def::do_equal_b (General_script_def const*) const
 void
 General_script_def::print() const
 {
-  DOUT << name() << "{";
+  DOUT << classname(this) << "{";
   do_print();
   DOUT << "}";
 }
@@ -62,11 +61,14 @@ General_script_def::do_print() const
 {
 }
 
-Atom
-General_script_def::get_atom (Paper_def*, Direction) const
+Molecule
+General_script_def::get_molecule (Paper_def*, Direction) const
 {
-  Atom s;
-  return Atom (s);
+  Molecule s;
+  return Molecule (s);
 }
 
-IMPLEMENT_IS_TYPE_B(General_script_def);
+
+
+
+