release: 1.1.47

[lilypond.git] / lily / abbrev.cc

diff --git a/lily/abbrev.cc b/lily/abbrev.cc
index d91899c75656fea84879e996c1f4da3f36e30f8e..dd17851d1ee596e46ee3d7ef775ca901e4474a9c 100644 (file)
--- a/lily/abbrev.cc
+++ b/lily/abbrev.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,7 +13,7 @@
 #include "paper-def.hh"
 #include "lookup.hh"
 #include "stem.hh"
-#include "dimen.hh"
+#include "offset.hh"
 
 Abbreviation::Abbreviation ()
 {
@@ -28,66 +28,81 @@ Abbreviation::do_print () const
 }
 
 Molecule*
-Abbreviation::brew_molecule_p () const
+Abbreviation::do_brew_molecule_p () const
 {
-  Real dy = paper ()->interbeam_f ();
-  Real w = 1.5 * paper ()->lookup_l ()->ball (2).dim_.x ().length ();
-  Real interline_f = paper ()->interline_f ();
-  Real beamdy = interline_f/2;
+  Beam * b = stem_l_->beam_l_;
+  int mult =0;
+  if (b)
+    {
+      Stem_info i = b->get_stem_info (stem_l_);
+      mult = i.mult_i_;
+    }
+  
+  Real interbeam_f = paper_l ()->interbeam_f (mult);
+  Real w = 1.5 * lookup_l ()->notehead (2, "").dim_[X_AXIS].length ();
+  Real space = stem_l_->staff_line_leading_f ();
+  Real internote_f = space/2;
+  
+  Real beam_f = paper_l ()->beam_thickness_f ();
 
   int beams_i = 0;
-  Real slope_f = paper ()->internote_f () / 4;
+  Real slope_f = internote_f / 4 / internote_f;        // HUH?
 
   if (stem_l_ && stem_l_->beam_l_) {
-    // huh?
-    slope_f = 2 * stem_l_->beam_l_->slope_f_;
+    slope_f = stem_l_->beam_l_->slope_f_;
     // ugh, rather calc from Abbreviation_req
-    beams_i = stem_l_->beams_right_i_ >? stem_l_->beams_left_i_;
-  }
-  paper ()->lookup_l ()->beam (slope_f, 20 PT, 1 PT);
+    beams_i = stem_l_->beams_i_drul_[RIGHT] >? stem_l_->beams_i_drul_[LEFT];
+  } 
+  Real sl = slope_f * internote_f;
 
-  Atom a (paper ()->lookup_l ()->beam (slope_f, w, .48 * interline_f));
+  Molecule a (lookup_l ()->beam (sl, w, beam_f));
   a.translate (Offset (-w/2, w / 2 * slope_f));
 
   Molecule *beams= new Molecule; 
   for (int i = 0; i < abbrev_flags_i_; i++)
     {
-      Atom b (a);
-      b.translate_axis (dy * i, Y_AXIS);
-      beams->add (b);
+      Molecule b (a);
+      b.translate_axis (interbeam_f * i, Y_AXIS);
+      beams->add_molecule (b);
     }
   beams->translate_axis (-beams->extent ()[Y_AXIS].center (), Y_AXIS);
 
   if (stem_l_)
-    {
-      /* Try to be in the middle of the open part of the stem and
-        between on the staff.
-
-        (urgh)
-      */
-      Direction sd  = stem_l_->dir_;
-      Interval empty_stem (stem_l_->chord_start_f () * sd ,
-                          (stem_l_->stem_end_f ()* sd) - beams_i * dy);
-      empty_stem *= sd;
-      
-      Interval instaff = empty_stem;
-      instaff.intersect (interline_f * Interval (-2,2));
-      if (instaff.empty_b ())
-       instaff = empty_stem;
+    { 
+      if (stem_l_->beam_l_)
+        {
+         beams->translate (Offset(stem_l_->hpos_f () - hpos_f (),
+           stem_l_->stem_end_f () * internote_f - 
+           stem_l_->beam_l_->dir_ * beams_i * interbeam_f));
+       }
+      else
+       {  
+         /*
+           Beams should intersect one beamthickness below staff end
+          */
+         Real dy = - beams->extent ()[Y_AXIS].length () / 2 * stem_l_->dir_;
+         dy /= internote_f;
+         dy += stem_l_->stem_end_f ();
+         dy *= internote_f;
+// urg: can't: stem should be stetched first
+//       dy -= paper_l ()->beam_thickness_f () * stem_l_->dir_;
+         beams->translate (Offset(stem_l_->hpos_f () - hpos_f (), dy));
+       }
 
-      instaff.print (); 
-      beams->translate (Offset(stem_l_->hpos_f () - hpos_f (),
-                         instaff.center ()));
+      /*
+       there used to be half a page of code that was long commented out.
+       Removed in 1.1.35
+       */
     }
   
   return beams;
 }
 
 void
-Abbreviation::do_substitute_dependent (Score_elem*o, Score_elem*n)
+Abbreviation::do_substitute_element_pointer (Score_element*o, Score_element*n)
 {
   if (stem_l_ == o)
-    stem_l_ = n ? (Stem*)n->item () : 0;
+    stem_l_ = dynamic_cast<Stem*> (n);
 }