release: 1.3.0

[lilypond.git] / lily / tuplet-spanner.cc

diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc
index 0d415a9dc1c783b579ee97d1aa931150a15bb101..234a4f982ac9d02be0e51e9df54e0a9690a29cb3 100644 (file)
--- a/lily/tuplet-spanner.cc
+++ b/lily/tuplet-spanner.cc
@@ -1,96 +1,163 @@
 /*
-  plet-spanner.cc -- implement Plet_spanner
+  plet-spanner.cc -- implement Tuplet_spanner
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "atom.hh"
+#include "beam.hh"
 #include "box.hh"
 #include "debug.hh"
 #include "lookup.hh"
 #include "molecule.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 #include "paper-def.hh"
 #include "tuplet-spanner.hh"
 #include "stem.hh"
-#include "text-def.hh"
 #include "note-column.hh"
+#include "dimensions.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";
+Tuplet_spanner::Tuplet_spanner ()
+{
+  parallel_beam_b_ = false;
 }
 
+/*
+  TODO. 
+ */
 Molecule*
-Plet_spanner::brew_molecule_p () const
+Tuplet_spanner::do_brew_molecule_p () const
 {
   Molecule* mol_p = new Molecule;
 
+  // Default behaviour: number always, bracket when no beam!
+  bool bracket_visibility = !parallel_beam_b_;
+  bool number_visibility = true;
+  SCM visibility_sym =get_elt_property (tuplet_visibility_scm_sym);
+  if (visibility_sym != SCM_BOOL_F)
+    {
+      /*
+       ARG. Fixme.
+       */
+      
+      /* Property values:
+        0       show nothing
+        1       show number
+        2       show (number and bracket)-if-no-beam
+        3       show number, and bracket-if-no-beam
+        4       show number, and bracket
+      */
+      int value = gh_scm2int (SCM_CDR(visibility_sym));
+      bracket_visibility = (value == 4 || (value > 1 && !parallel_beam_b_));
+      number_visibility = (value > 2 || value == 1 || 
+                          (value == 2 && !parallel_beam_b_));
+    }
+  
   if (column_arr_.size ()){
-    Real w = width ().length ();
+    Real ncw = column_arr_.top ()->extent (X_AXIS).length ();
+    Real w = extent (X_AXIS).length () + ncw;
+    Molecule num (lookup_l ()->text ("italic",
+                                    number_str_, paper_l ()));
+    num.align_to (X_AXIS, CENTER);
+    num.translate_axis (w/2, X_AXIS);
+    Real interline = paper_l ()->get_realvar (interline_scm_sym);
     Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_]
       - column_arr_[0]->extent (Y_AXIS) [dir_];
+    num.align_to (Y_AXIS, CENTER);
+    num.translate_axis (dir_ * interline, Y_AXIS);
+       
+    num.translate_axis (dy/2, Y_AXIS);
+    
+    Real thick = paper_l ()->get_realvar (tuplet_thick_scm_sym);
+    if (bracket_visibility)      
+      {
+       Real gap = paper_l () -> get_var ("tuplet_spanner_gap");
+       
+       mol_p->add_molecule (lookup_l ()->tuplet_bracket (dy, w, thick, gap, interline, 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_));
+    if (number_visibility)
+      {
+       mol_p->add_molecule (num);
+      }
+    mol_p->translate_axis (dir_ * interline, Y_AXIS);
   }
   return mol_p;
 }
   
 void
-Plet_spanner::do_add_processing ()
+Tuplet_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 ()
+Tuplet_spanner::do_post_processing ()
 {
-    if (column_arr_.size())
-       translate_axis (column_arr_[0]->extent (Y_AXIS)[dir_], Y_AXIS);
+  if (column_arr_.size())
+    translate_axis (column_arr_[0]->extent (Y_AXIS)[dir_], Y_AXIS);
+
+  if (beam_l_arr_.size () == 1)
+    {
+      Beam * beam_l = beam_l_arr_[0];
+      if (!broken_b () 
+         && spanned_drul_[LEFT]->column_l () == beam_l->spanned_drul_[LEFT]->column_l ()
+         && spanned_drul_[RIGHT]->column_l () == beam_l->spanned_drul_[RIGHT]->column_l ())
+       parallel_beam_b_ = true;
+    }
+
+  //  if (column_arr_.size () == 1)
+  //    bracket_visibility_b_ = false;
 }
 
 void
-Plet_spanner::do_substitute_dependency (Score_element* o, Score_element* n)
+Tuplet_spanner::do_substitute_element_pointer (Score_element* o, Score_element* n)
 {
   if (Note_column *onc = dynamic_cast <Note_column *> (o))
     column_arr_.substitute (onc, dynamic_cast<Note_column*> (n));
+  else if (Beam * b = dynamic_cast<Beam* > (o))
+    {
+      beam_l_arr_.substitute (b,  dynamic_cast<Beam*> (n));
+    }
 }
-  
-void
-Plet_spanner::set_default_dir ()
+
+Direction
+Tuplet_spanner::get_default_dir () const
 {
-  dir_ = UP;
+  Direction d = UP;
+  SCM dir_sym =get_elt_property (dir_forced_scm_sym);
+  if (dir_sym != SCM_BOOL_F) {
+    d= (Direction) gh_scm2int (SCM_CDR(dir_sym));
+    if (d != CENTER)
+      return d;
+  }
+
   for (int i=0; i < column_arr_.size (); i ++) 
     {
-      if (column_arr_[i]->dir_ < 0) 
+      if (column_arr_[i]->dir () < 0) 
        {
-         dir_ = DOWN;
+         d = DOWN;
          break;
        }
     }
+  return d;
 }
 
+void
+Tuplet_spanner::add_beam (Beam *b)
+{
+  add_dependency (b);
+  beam_l_arr_.push (b);
+}
 
 void
-Plet_spanner::add_column (Note_column*n)
+Tuplet_spanner::add_column (Note_column*n)
 {
   column_arr_.push (n);
   add_dependency (n);