partial: 1.1.6.jcn

diff --git a/lily/include/plet-spanner.hh b/lily/include/plet-spanner.hh
deleted file mode 100644 (file)
index 39e7cac..0000000
--- a/lily/include/plet-spanner.hh
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-  plet-spanner.hh -- part of GNU LilyPond
-
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
-*/
-
-#ifndef PLET_SPANNER_HH
-#define PLET_SPANNER_HH
-
-#include "bow.hh"
-
-/** supportable plet: triplets, eentweetjes, ottava, etc.  */
-
-class Plet_spanner : public Bow
-{
-public:
-
-  Plet_spanner ();
-  virtual ~Plet_spanner ();
- 
-  void set_stem (Direction, Stem*);
- 
-  Text_def* tdef_p_;
-  Drul_array<Stem *> stem_l_drul_;
-  int visibility_i_;
- 
-protected:
-  virtual Molecule* brew_molecule_p () const;
- 
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  SCORE_ELEMENT_CLONE(Plet_spanner);
-
-  virtual void do_add_processing ();
-  virtual void do_post_processing ();
-  virtual void set_default_dir ();
-  virtual void do_substitute_dependency (Score_element*,Score_element*);
-  Plet_spanner (Plet_spanner const&);
-};
-
-#endif // PLET_SPANNER_HH
-

diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh
new file mode 100644 (file)
index 0000000..1a41440
--- /dev/null
+++ b/lily/include/tuplet-spanner.hh
@@ -0,0 +1,37 @@
+/*
+  plet-spanner.hh -- part of GNU LilyPond
+
+  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#ifndef PLET_SPANNER_HH
+#define PLET_SPANNER_HH
+#include "text-def.hh"
+#include "pointer.hh"
+#include "directional-spanner.hh"
+
+/** supportable plet: triplets, eentweetjes, ottava, etc.  */
+
+class Plet_spanner : public Directional_spanner
+{
+public:
+  Plet_spanner ();
+ 
+  void add_column (Note_column*);
+ 
+  P<Text_def>  tdef_p_;
+  Link_array<Note_column> column_arr_;
+  int visibility_i_;
+ 
+protected:
+  virtual Molecule* brew_molecule_p () const;
+  VIRTUAL_COPY_CONS(Score_element);
+
+  virtual void do_add_processing ();
+  virtual void do_post_processing ();
+  virtual void set_default_dir ();
+  virtual void do_substitute_dependency (Score_element*,Score_element*);
+};
+
+#endif // PLET_SPANNER_HH
+

diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc
new file mode 100644 (file)
index 0000000..0d415a9
--- /dev/null
+++ b/lily/tuplet-spanner.cc
@@ -0,0 +1,98 @@
+/*
+  plet-spanner.cc -- implement Plet_spanner
+
+  source file of the GNU LilyPond music typesetter
+
+  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
+
+#include "atom.hh"
+#include "box.hh"
+#include "debug.hh"
+#include "lookup.hh"
+#include "molecule.hh"
+#include "p-col.hh"
+#include "paper-def.hh"
+#include "tuplet-spanner.hh"
+#include "stem.hh"
+#include "text-def.hh"
+#include "note-column.hh"
+
+Plet_spanner::Plet_spanner ()
+{
+  visibility_i_ = 3;
+
+  tdef_p_.set_p(new Text_def);
+  tdef_p_->align_dir_ = CENTER;
+  tdef_p_->style_str_ = "italic";
+}
+
+Molecule*
+Plet_spanner::brew_molecule_p () const
+{
+  Molecule* mol_p = new Molecule;
+
+  if (column_arr_.size ()){
+    Real w = width ().length ();
+    Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_]
+      - column_arr_[0]->extent (Y_AXIS) [dir_];
+
+  
+    Atom num (tdef_p_->get_atom (paper (), CENTER));
+    num.translate (Offset (w/2, dy/2));
+
+    if (visibility_i_ >= 1)
+      mol_p->add_atom (num);
+
+    mol_p->add_atom (lookup_l ()->plet (dy, w, dir_));
+  }
+  return mol_p;
+}
+  
+void
+Plet_spanner::do_add_processing ()
+{
+  if (column_arr_.size ())
+    {
+      
+      set_bounds (LEFT, column_arr_[0]);
+      set_bounds (RIGHT, column_arr_.top ());  
+    }
+}
+  
+void
+Plet_spanner::do_post_processing ()
+{
+    if (column_arr_.size())
+       translate_axis (column_arr_[0]->extent (Y_AXIS)[dir_], Y_AXIS);
+}
+
+void
+Plet_spanner::do_substitute_dependency (Score_element* o, Score_element* n)
+{
+  if (Note_column *onc = dynamic_cast <Note_column *> (o))
+    column_arr_.substitute (onc, dynamic_cast<Note_column*> (n));
+}
+  
+void
+Plet_spanner::set_default_dir ()
+{
+  dir_ = UP;
+  for (int i=0; i < column_arr_.size (); i ++) 
+    {
+      if (column_arr_[i]->dir_ < 0) 
+       {
+         dir_ = DOWN;
+         break;
+       }
+    }
+}
+
+
+void
+Plet_spanner::add_column (Note_column*n)
+{
+  column_arr_.push (n);
+  add_dependency (n);
+}
+