release: 1.3.29

[lilypond.git] / lily / local-key-item.cc

diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc
index a04237bd95fb13f47bcfad85b3b0829942abb86a..249abd0743389dd843a477ec07924803cff7e359 100644 (file)
--- a/lily/local-key-item.cc
+++ b/lily/local-key-item.cc
@@ -3,56 +3,72 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "local-key-item.hh"
 #include "molecule.hh"
-#include "scalar.hh"
+#include "staff-symbol-referencer.hh"
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "musical-request.hh"
 #include "note-head.hh"
 #include "misc.hh"
 
-Local_key_item::Local_key_item ()
-{
-  c0_position_i_ = 0;
-}
-
-void
-Local_key_item::add_support (Item*head_l)
-{
-  if (support_items_.find_l(head_l))
-    return ;
-  support_items_.push (head_l);
-  add_dependency (head_l);
-}
 
 void
-Local_key_item::add_pitch (Musical_pitch p, bool cautionary)
+Local_key_item::add_pitch (Musical_pitch p, bool cautionary, bool natural)
 {
   for (int i=0; i< accidental_arr_.size(); i++)
     if (!Musical_pitch::compare (p, accidental_arr_[i].pitch_))
       return;
+         /* maybe natural (and cautionary) should be modif. nonetheless? */
 
   Local_key_cautionary_tuple t;
   t.pitch_ = p;
   t.cautionary_b_ = cautionary;
+  t.natural_b_ = natural;
   accidental_arr_.push (t);
 }
 
+
+
 void
 Local_key_item::do_pre_processing()
 {
   accidental_arr_.sort (Local_key_cautionary_tuple::compare);
 }
 
-Molecule*
-Local_key_item::do_brew_molecule_p() const
+Molecule
+Local_key_item::accidental (int j, bool cautionary, bool natural) const
 {
-  Molecule*output = new Molecule;
-  Real note_distance = staff_line_leading_f ()/2;
-  Molecule *octave_mol_p = 0;
+  Molecule m (lookup_l ()->afm_find (String ("accidentals-") + to_str (j)));
+  if (natural)
+    {
+      Molecule prefix = lookup_l ()->afm_find (String ("accidentals-0"));
+      m.add_at_edge(X_AXIS, LEFT, Molecule(prefix), 0);
+    }
+  if (cautionary) 
+    {
+      Molecule open = lookup_l ()->afm_find (String ("accidentals-("));
+      Molecule close = lookup_l ()->afm_find (String ("accidentals-)"));
+      m.add_at_edge(X_AXIS, LEFT, Molecule(open), 0);
+      m.add_at_edge(X_AXIS, RIGHT, Molecule(close), 0);
+    }
+  
+  return m;
+}
+
+/*
+  UGH. clean me up
+ */
+Molecule 
+Local_key_item::do_brew_molecule() const
+{
+  Molecule mol;
+  Staff_symbol_referencer_interface si (this);
+  Real note_distance = si.staff_space ()/2;
+  Molecule octave_mol;
+  bool oct_b = false;
   int lastoct = -100;
   
   for  (int i = 0; i <  accidental_arr_.size(); i++) 
@@ -61,67 +77,60 @@ Local_key_item::do_brew_molecule_p() const
       // do one octave
       if (p.octave_i_ != lastoct) 
        {
-         if (octave_mol_p)
+         if (oct_b)
            {
              Real dy =lastoct*7* note_distance;
-             octave_mol_p->translate_axis (dy, Y_AXIS);
-             output->add_molecule (*octave_mol_p);
-             delete octave_mol_p;
+             octave_mol.translate_axis (dy, Y_AXIS);
+             mol.add_molecule (octave_mol);
+             octave_mol = Molecule ();
            }
-         octave_mol_p= new Molecule;
+         oct_b = true; 
        }
       
       lastoct = p.octave_i_;
-      Real dy =
-       (c0_position_i_ + p.notename_i_)
+
+      SCM c0 =  get_elt_property ("c0-position");
+      Real dy = (gh_number_p (c0) ? gh_scm2int (c0) : 0 + p.notename_i_)
        * note_distance;
-      Molecule m (lookup_l ()->accidental (p.accidental_i_, 
-                                          accidental_arr_[i].cautionary_b_));
+      
+      Molecule m (accidental (p.accidental_i_,
+                             accidental_arr_[i].cautionary_b_,
+                             accidental_arr_[i].natural_b_));
 
       m.translate_axis (dy, Y_AXIS);
-      octave_mol_p->add_at_edge (X_AXIS, RIGHT, m, 0);
+      octave_mol.add_at_edge (X_AXIS, RIGHT, m, 0);
     }
 
-  if (octave_mol_p)
+  if (oct_b)
     {
       Real dy =lastoct*7*note_distance;
-      octave_mol_p->translate_axis (dy, Y_AXIS);
-      output->add_molecule (*octave_mol_p);
-      delete octave_mol_p;
+      octave_mol.translate_axis (dy, Y_AXIS);
+      mol.add_molecule (octave_mol);
+      octave_mol = Molecule ();
     }
   
  if (accidental_arr_.size()) 
     {
-      Box b(Interval (0, 0.6 * note_distance), Interval (0,0));
-      Molecule m (lookup_l ()->fill (b));
-      output->add_at_edge (X_AXIS, RIGHT, m, 0);
-    }
-
-  Interval x_int;
-  for (int i=0; i < support_items_.size(); i++) 
-    {
-      Dimension_cache *common = 
-       common_group (support_items_[i], X_AXIS);
-
-      Real x = support_items_[i]->relative_coordinate (common, X_AXIS)
-       - relative_coordinate (common, X_AXIS);
-
-      x_int.unite (x + support_items_[i]->extent (X_AXIS));
+      Drul_array<SCM> pads;
+
+      /*
+       Use a cons?
+       */
+      pads[RIGHT] = get_elt_property ("right-padding");
+      pads[LEFT] = get_elt_property ("left-padding");
+
+      Direction d = LEFT;
+      do {
+       if (!gh_number_p (pads[d]))
+         continue;
+
+       Box b(Interval (0, gh_scm2double (pads[d]) * note_distance),
+             Interval (0,0));
+       Molecule m (lookup_l ()->fill (b));
+       mol.add_at_edge (X_AXIS, d, m, 0);
+      } while ( flip (&d)!= LEFT);
     }
 
-  if (x_int.empty_b ())
-    x_int = Interval(0,0);
-  
-  output->translate_axis (-output->extent()[X_AXIS][RIGHT] + x_int[LEFT], X_AXIS);
-  
-  return output;
+  return mol;
 }
 
-
-
-void
-Local_key_item::do_substitute_element_pointer (Score_element*o,Score_element*n)
-{
-  if (Item* o_l = dynamic_cast <Item *> (o))
-    support_items_.substitute (o_l,dynamic_cast <Item *> (n));
-}