From: fred <fred>
Date: Tue, 26 Mar 2002 23:32:23 +0000 (+0000)
Subject: lilypond-1.3.36
X-Git-Tag: release/1.5.59~1387
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=266f5cf3d6a46073cc699d41e262fd4d9024ed45;p=lilypond.git

lilypond-1.3.36
---

diff --git a/lily/axis-group-element.cc b/lily/axis-group-element.cc
deleted file mode 100644
index d3235510d4..0000000000
--- a/lily/axis-group-element.cc
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-  axis-group-element.cc -- implement Axis_group_element
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-#include "axis-group-element.hh"
-#include "dimension-cache.hh"
-#include "group-interface.hh"
-
-Link_array<Score_element>
-Axis_group_element::elem_l_arr () const
-{  
-  return
-    Group_interface__extract_elements (this, (Score_element*)0, "elements");
-}
-
-Link_array<Score_element> 
-Axis_group_element::get_children ()
-{
-  Link_array<Score_element> childs;
-  Link_array<Score_element> elems = elem_l_arr ();
-
-  for (int i=0; i < elems.size (); i++) 
-    {
-      Score_element* e = elems[i];
-      childs.push (e) ;
-      Axis_group_element * axis_group= dynamic_cast <Axis_group_element *> (e);
-      if (axis_group)
-      	childs.concat (axis_group->get_children ());      
-    }
-  
-  return childs;
-}
-
-Axis_group_element::Axis_group_element()
-{
-  set_elt_property ("elements", SCM_EOL);
-  set_elt_property ("transparent", SCM_BOOL_T);
-}
-
-void
-Axis_group_element::set_axes (Axis a1, Axis a2)
-{
-  SCM ax = gh_cons (gh_int2scm (a1), SCM_EOL);
-  if (a1 != a2)
-    ax= gh_cons (gh_int2scm (a2), ax);
-
-  
-  set_elt_property ("axes", ax);
-
-  if (a1 != X_AXIS && a2 != X_AXIS)
-    set_empty (X_AXIS);
-  if (a1 != Y_AXIS && a2 != Y_AXIS)
-    set_empty (Y_AXIS);
-  
-  dim_cache_[a1]->set_callback(extent_callback);
-  dim_cache_[a2]->set_callback (extent_callback);
-}
-
-Interval
-Axis_group_element::extent_callback (Dimension_cache const *c) 
-{
-  Axis a = c->axis ();
-  Axis_group_element * me
-    = dynamic_cast<Axis_group_element*> (c->element_l ()); 
-
-  Interval r;
-  for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
-    {
-      SCM e=gh_car (s); 
-      Score_element * se = SMOB_TO_TYPE (Score_element, e);
-
-      Interval dims = se->extent (a);
-      if (!dims.empty_b ())
-	r.unite (dims + se->relative_coordinate (me, a));
-    }
-
-  return r;
-}
-
-
-bool
-Axis_group_element::axis_b (Axis a )const
-{
-  return dim_cache_[a]->extent_callback_l_ == extent_callback;
-}
-
-
-void
-Axis_group_element::add_element (Score_element *e)
-{
-  used_b_ =true;
-  e->used_b_ = true;
-
-  for (SCM ax = get_elt_property ("axes"); ax != SCM_EOL ; ax = gh_cdr (ax))
-    {
-      Axis a = (Axis) gh_scm2int (gh_car (ax));
-      
-      if (!e->parent_l (a))
-	e->set_parent (this, a);
-    }
-  Group_interface gi (this);
-  gi.add_element (e);
-
-  add_dependency (e);
-}
-
diff --git a/lily/directional-element.cc b/lily/directional-element.cc
deleted file mode 100644
index 4cc5ebb52f..0000000000
--- a/lily/directional-element.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-/*   
-  directional-element.cc -- implement Directional_element
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#include "directional-element-interface.hh"
-
-
-Directional_element_interface::Directional_element_interface (Score_element const *s)
-{
-  elt_l_ =  (Score_element*)s;
-}
-
-bool
-Directional_element_interface::has_interface_b () const
-{
-  return isdir_b (elt_l_->get_elt_property ("direction"));
-}
-
-
-  
-
-Direction
-Directional_element_interface::get () const
-{
-  // return dir_;
-  SCM d= elt_l_->get_elt_property ("direction");
-  if (!isdir_b(d))
-    return CENTER;
-      
-  return to_dir (d);
-}
-
-void
-Directional_element_interface::set (Direction d) 
-{
-  elt_l_->set_elt_property ("direction", gh_int2scm (d));
-}
-
-Directional_element_interface
-directional_element (Score_element const*s)
-{
-  return s;
-}
diff --git a/lily/include/axis-group-element.hh b/lily/include/axis-group-element.hh
deleted file mode 100644
index 75cf8d13d9..0000000000
--- a/lily/include/axis-group-element.hh
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-  axis-group-element.hh -- declare Axis_group_element
-
-  source file of the GNU LilyPond music typesetter
-
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-*/
-
-
-#ifndef AXIS_GROUP_ELEMENT_HH
-#define AXIS_GROUP_ELEMENT_HH
-
-#include "score-element.hh"
-
-
-/** 
-  Treat a group of elements a unity in either or both axis sense .
-  This is a wrapper around Axis_group_administration
-
-  FIXME: remove this class, and make interface of it, so we can remove multiple inheritance.
-*/
-class Axis_group_element : public virtual Score_element
-{
-protected:
-  virtual Link_array<Score_element> elem_l_arr() const;
-  static Interval extent_callback (Dimension_cache const*);
-
-public:
-  void add_element (Score_element*);
-  bool axis_b (Axis) const;
-  Axis_group_element ();
-  void set_axes (Axis,Axis);
-
-  Link_array<Score_element> get_children ();
-};
-
-#endif // AXIS_GROUP_ELEMENT_HH