beam: knee_b fix

(get_original, get_system, get_broken_into):
Move scheme funcs from grob.cc and spanner.cc.

diff --git a/ChangeLog b/ChangeLog
index 2ee7626c74ae8e1acf9a759df45e3aca56266ea4..8374f5c1310fb8ea230395f9c640f56bbbc13dce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-07-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/grob-scheme.cc (get_original, get_system, get_broken_into):
+       Move scheme funcs from grob.cc and spanner.cc.
+
        * lily, flower: Ran buildscripts/ontgaar.py.  See also
        http://lilypond.org/wiki/?CodingStandards.
        

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index ca76123c663bca074215d7af6b379e752bfaa66a..3242db1603645dcecf4709a58b938a425e6d7ce6 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -103,3 +103,52 @@ for the Y-axis.")
   return par ? par->self_scm() : SCM_EOL;
 }
 
+/* ly prefix? */
+LY_DEFINE (get_system,
+          "get-system",
+          1, 0, 0, (SCM grob),
+          "
+Return the System Grob of @var{grob}.
+")
+{
+  Grob *me = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
+  
+  if (Grob *g = me->get_system ())
+    return g->self_scm ();
+    
+  return SCM_EOL;
+}
+
+/* ly prefix? */
+LY_DEFINE (get_original,
+          "get-original",
+          1, 0, 0, (SCM grob),
+          "
+Return the original Grob of @var{grob}
+")
+{
+  Grob *me = unsmob_grob (grob);
+  SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
+  return me->original_ ? me->original_->self_scm () : me->self_scm ();
+}
+
+
+/* ly prefix? spanner in name? */
+LY_DEFINE (get_broken_into,
+         "get-broken-into", 1, 0, 0, (SCM spanner),
+          "
+Return broken-into list for @var{spanner}.
+"
+)
+{
+  ///  Spanner *me = unsmob_spanner (spanner);
+  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (spanner));
+  SCM_ASSERT_TYPE (me, spanner, SCM_ARG1, __FUNCTION__, "spanner");
+
+  SCM s = SCM_EOL;
+  for (int i = me->broken_intos_.size (); i; i--)
+    s = gh_cons (me->broken_intos_[i-1]->self_scm (), s);
+  return s;
+}
+

diff --git a/lily/grob.cc b/lily/grob.cc
index 9d4707c97e7473ea5107547826335f6749c6f56e..61f48a6aff5f00609a431372a3c5c603495ed8d3 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -243,6 +243,7 @@ Grob::get_molecule ()  const
   
   return unsmob_molecule (mol);  
 }
+
 SCM
 Grob::get_uncached_molecule ()const
 {
@@ -297,45 +298,12 @@ Grob::do_break_processing ()
 {
 }
 
-
-
-
-
-
 System *
 Grob::get_system () const
 {
   return 0;
 }
 
-LY_DEFINE (get_system,
-          "get-system",
-          1, 0, 0, (SCM grob),
-          "
-Return the System Grob of @var{grob}.
-")
-{
-  Grob *me = unsmob_grob (grob);
-  SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
-  
-  if (Grob *g = me->get_system ())
-    return g->self_scm ();
-    
-  return SCM_EOL;
-}
-
-LY_DEFINE (get_original,
-          "get-original",
-          1, 0, 0, (SCM grob),
-          "
-Return the original Grob of @var{grob}
-")
-{
-  Grob *me = unsmob_grob (grob);
-  SCM_ASSERT_TYPE (me, grob, SCM_ARG1, __FUNCTION__, "grob");
-  return me->original_ ? me->original_->self_scm () : me->self_scm ();
-}
-
 void
 Grob::add_dependency (Grob*e)
 {
@@ -348,7 +316,6 @@ Grob::add_dependency (Grob*e)
 }
 
 
-
 void
 Grob::handle_broken_dependencies ()
 {

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 09f2367acaa6ee7f98208b40f5716c47c5bd91a3..8e4b060774c45a55762733c9d184683d76781870 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -19,24 +19,6 @@
 #include "system.hh"
 #include "group-interface.hh"
 
-/* spanner in name? */
-LY_DEFINE (get_broken_into,
-         "get-broken-into", 1, 0, 0, (SCM spanner),
-          "
-Return broken-into list for @var{spanner}.
-"
-)
-{
-  ///  Spanner *me = unsmob_spanner (spanner);
-  Spanner *me = dynamic_cast<Spanner*> (unsmob_grob (spanner));
-  SCM_ASSERT_TYPE (me, spanner, SCM_ARG1, __FUNCTION__, "spanner");
-
-  SCM s = SCM_EOL;
-  for (int i = me->broken_intos_.size (); i; i--)
-    s = gh_cons (me->broken_intos_[i-1]->self_scm (), s);
-  return s;
-}
-
 void
 Spanner::do_break_processing ()
 {