From: jan <jan>
Date: Thu, 30 May 2002 17:02:53 +0000 (+0000)
Subject: (calc_stem_info): Take multiplicity into account
X-Git-Tag: release/1.5.59~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f318a8c79481267d6f7b6435db746914c4a56392;p=lilypond.git

(calc_stem_info): Take multiplicity into account
for shortest_y too.
---

diff --git a/ChangeLog b/ChangeLog
index 97960c0c58..f6ca3cb0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-30  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* lily/stem.cc (calc_stem_info): Take multiplicity into account
+	for shortest_y too.
+
 	* input/bugs/melisma-tie-rest.ly: New file.
 
 2002-05-30  Han-Wen  <hanwen@cs.uu.nl>
diff --git a/lily/beam.cc b/lily/beam.cc
index 47e156a3a9..026340b2fe 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -588,7 +588,9 @@ Beam::score_stem_lengths (Link_array<Grob>stems,
       Stem_info info = stem_infos[i];
       Direction d = info.dir_;
 
-      demerit_score += pen * ( 0 >? (info.dir_ *(info.shortest_y_ - current_y)));
+      demerit_score += pen
+	* ( 0 >? (info.dir_ * (info.shortest_y_ - current_y)));
+      
       demerit_score += STEM_LENGTH_DEMERIT_FACTOR
 	* shrink_extra_weight (d * current_y  - info.dir_ * info.ideal_y_);
     }
diff --git a/lily/stem.cc b/lily/stem.cc
index 2d7ef7a81c..b2ffe3e86e 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -797,13 +797,11 @@ Stem::calc_stem_info (Grob*me)
     a.push (gh_scm2double (ly_car (q)));
 
   Real stem_length =  a[multiplicity <? (a.size () - 1)] * staff_space;
-  Real shortest_y = ideal_y; 
 
   if (multiplicity)
-    {
-      ideal_y += thick + (multiplicity - 1) * interbeam_f;
-    }
+    ideal_y += thick + (multiplicity - 1) * interbeam_f;
 
+  Real shortest_y = ideal_y; 
 
   ideal_y += stem_length;
   shortest_y += minimum_length;
@@ -847,7 +845,6 @@ Stem::calc_stem_info (Grob*me)
   ideal_y += interstaff_f;
   shortest_y += interstaff_f;
 
-
   ideal_y *= mydir;
   shortest_y *= mydir;