release: 1.1.46

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

diff --git a/lily/key-item.cc b/lily/key-item.cc
index 93abfa0575bd1946e894605a87a40843583d8573..d11424b41edaae8cbdcfcb2e51bd5c711b635626 100644 (file)
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996, 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1996, 1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
   keyplacement by Mats Bengtsson
 */
@@ -14,89 +14,120 @@
 #include "molecule.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-
-#include "key-grav.hh"
+#include "musical-pitch.hh"
 
 const int FLAT_TOP_PITCH=2; /* fes,ges,as and bes typeset in lower octave */
 const int SHARP_TOP_PITCH=4; /*  ais and bis typeset in lower octave */
 
-Key_item::Key_item (int c)
+Key_item::Key_item ()
 {
-  breakable_b_ =true;
-  default_b_ = false;
-  set_c_position (c);
+  multi_octave_b_ = false;
+  set_elt_property (breakable_scm_sym, SCM_BOOL_T);
+  set_c_position (0);
 }
 
-void
-Key_item::read (Key_engraver const & key_grav_r)
+int
+Key_item::get_c_position () const
 {
-  assert (!key_grav_r.key_.multi_octave_b_);
-  const Array<int> &idx_arr =key_grav_r.accidental_idx_arr_; 
-  for (int i = 0 ; i< idx_arr.size(); i++) 
-    {
-      int note = idx_arr[i];
-      int acc = ((Key &) key_grav_r.key_).oct (0).acc (note);
-
-      add (note, acc);
-    }
+  // Find the c in the range -4 through 2
+  int from_bottom_pos = c0_position_ + 4;      
+  from_bottom_pos = from_bottom_pos%7;
+  from_bottom_pos = (from_bottom_pos + 7)%7; // Precaution to get positive.
+  return from_bottom_pos - 4;
 }
 
+
 void 
 Key_item::set_c_position (int c0)
 {
-  int from_bottom_pos = c0 + 4;        // ugh
-  int octaves =(from_bottom_pos / 7) +1 ;
-  from_bottom_pos =(from_bottom_pos + 7*octaves)%7;
-  c_position  = from_bottom_pos - 4;
+  c0_position_ = c0;
 }
 
 
 void
 Key_item::add (int p, int a)
 {
-  if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+c_position>4)) && (p+c_position>1)) 
-      ||
-      (a>0 && ((p>SHARP_TOP_PITCH) || (p+c_position>5)) && (p+c_position>2))) 
+  pitch_arr_.push (p);
+  acc_arr_.push (a);
+}
+
+void
+Key_item::add_old (int p, int a)
+{
+  old_pitch_arr_.push (p);
+  old_acc_arr_.push (a);
+}
+
+
+int
+Key_item::calculate_position(int p, int a) const
+{
+  if (multi_octave_b_) 
     {
-      p -= 7; /* Typeset below c_position */
+      return p + c0_position_;
     }
-  pitch.push (p);
-  acc.push (a);
+  else {
+    if ((a<0 && ((p>FLAT_TOP_PITCH) || (p+get_c_position ()>4)) && (p+get_c_position ()>1)) 
+       ||
+       (a>0 && ((p>SHARP_TOP_PITCH) || (p+get_c_position ()>5)) && (p+get_c_position ()>2))) 
+      {
+       p -= 7; /* Typeset below c_position */
+      }
+    return p + get_c_position ();
+  }
 }
 
-
+/*
+  TODO
+  - space the `natural' signs wider
+  - dehair this
+ */
 Molecule*
-Key_item::brew_molecule_p() const
+Key_item::do_brew_molecule_p() const
 {
   Molecule*output = new Molecule;
-  Real inter = paper()->internote_f ();
+  Real inter = staff_line_leading_f ()/2.0;
   
-  for (int i =0; i < pitch.size(); i++) 
+  int j;
+  if ((break_status_dir () == LEFT || break_status_dir () == CENTER)
+      || old_pitch_arr_.size ())
     {
-      Atom a =paper()->lookup_l ()->accidental (acc[i]);
-      a.translate_axis ((c_position + pitch[i]) * inter, Y_AXIS);
-      Molecule m (a);
-      output->add_at_edge (X_AXIS, RIGHT, m);  
+      for (int i =0; i < old_pitch_arr_.size(); i++) 
+        {
+          for (j =0; (j < pitch_arr_.size())
+                && (old_pitch_arr_[i] != pitch_arr_[j]); j++) 
+           ;
+         
+          if (j == pitch_arr_.size()
+             || (old_pitch_arr_[i] == pitch_arr_[j]
+                 && old_acc_arr_[i] != acc_arr_[j]))
+            {
+              Molecule m =lookup_l ()->accidental (0,false);
+              m.translate_axis (calculate_position(old_pitch_arr_[i], old_acc_arr_[i]) * inter, Y_AXIS);
+              output->add_at_edge (X_AXIS, RIGHT, m,0);        
+            }
+        }
+
+      /*
+       Add half a space between  cancellation and key sig.
+
+       As suggested by [Ross], p.148.
+       */
+      Interval x(0, inter);
+      Interval y(0,0);
+
+      output->add_at_edge (X_AXIS, RIGHT, lookup_l()->fill (Box(x,y)),0);
     }
-  if (pitch.size()) 
+ 
+  for (int i =0; i < pitch_arr_.size(); i++) 
     {
-      Molecule m (paper()->lookup_l ()->fill (Box (
-                                                  Interval (0, paper()->note_width ()),
-                                                  Interval (0,0))));
-
-      output->add_at_edge (X_AXIS, RIGHT, m);
+      Molecule m =lookup_l ()->accidental (acc_arr_[i],false);
+      m.translate_axis (calculate_position(pitch_arr_[i], acc_arr_[i]) * inter, Y_AXIS);
+      output->add_at_edge (X_AXIS, RIGHT, m, 0);
     }
+
   return output;
 }
 
-IMPLEMENT_IS_TYPE_B1(Key_item,Item);
 
-void 
-Key_item::do_pre_processing()
-{
-  if (default_b_) 
-    {
-      transparent_b_ = (break_status_i() != 1);
-      set_empty (transparent_b_);
-    }
-}
+