* lily/beam.cc (get_default_dir): take extreme note head as input

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index bb48a4572db7fa08ab7ed702a2cc301b6115b044..d47efc5a7875b80ec12506bd67d721e8871be60f 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -100,12 +100,6 @@ Beam::get_beam_count (Grob *me)
 }
 
 
-/* After pre-processing all directions should be set.
-   Several post-processing routines (stem, slur, script) need stem/beam
-   direction.
-   Currenly, this means that beam has set all stem's directions.
-   [Alternatively, stems could set its own directions, according to
-   their beam, during 'final-pre-processing'.] */
 MAKE_SCHEME_CALLBACK (Beam, calc_direction, 1);
 SCM
 Beam::calc_direction (SCM smob)
@@ -143,7 +137,11 @@ Beam::calc_direction (SCM smob)
       else 
        {
          Grob *stem = first_visible_stem (me);
-         d = to_dir (stem->get_property ("default-direction"));
+
+         /*
+           ugh: stems[0] case happens for chord tremolo.
+         */
+         d = to_dir ((stem ? stem : stems[0])->get_property ("default-direction"));
        }
     }
 
@@ -330,7 +328,7 @@ Beam::print (SCM grob)
   Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
 
   Stencil the_beam;
-  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
 
   for (vsize i = 0; i <= stems.size (); i++)
     {
@@ -348,9 +346,9 @@ Beam::print (SCM grob)
       SCM left = (i > 0) ? scm_cdr (last_beaming) : SCM_EOL;
       SCM right = stem ? scm_car (this_beaming) : SCM_EOL;
 
-      std::vector<int> full_beams;
-      std::vector<int> lfliebertjes;
-      std::vector<int> rfliebertjes;
+      vector<int> full_beams;
+      vector<int> lfliebertjes;
+      vector<int> rfliebertjes;
 
       for (SCM s = left;
           scm_is_pair (s); s = scm_cdr (s))
@@ -387,7 +385,7 @@ Beam::print (SCM grob)
       if (stem)
        w += stem_width / 2;
 
-      Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+      Real blot = me->layout ()->get_dimension (ly_symbol2scm ("blot-diameter"));
       Stencil whole = Lookup::beam (slope, w, thick, blot);
       Stencil gapped;
 
@@ -397,9 +395,9 @@ Beam::print (SCM grob)
          gap_count = scm_to_int (me->get_property ("gap-count"));
          gapped = Lookup::beam (slope, w - 2 * gap_length, thick, blot);
 
-         full_beams.sort (default_compare);
+         vector_sort (full_beams, default_compare);
          if (stem_dir == UP)
-           full_beams.reverse ();
+           reverse (full_beams);
        }
 
       int k = 0;
@@ -502,7 +500,7 @@ Beam::print (SCM grob)
        should be switchable for those who want to twiddle with the
        parameters.
       */
-      std::string str;
+      string str;
       SCM properties = Font_interface::text_font_alist_chain (me);
 
       Direction stem_dir = stems.size () ? to_dir (stems[0]->get_property ("direction")) : UP;
@@ -518,16 +516,34 @@ Beam::print (SCM grob)
   return the_beam.smobbed_copy ();
 }
 
+#define iterof(i,s) typeof((s).begin()) i((s).begin())
+
 Direction
 Beam::get_default_dir (Grob *me)
 {
-  Drul_array<int> total;
-  total[UP] = total[DOWN] = 0;
-  Drul_array<int> count;
-  count[UP] = count[DOWN] = 0;
-
   extract_grob_set (me, "stems", stems);
 
+  Drul_array<Real> extremes (0.0, 0.0);
+  for (iterof (s, stems); s != stems.end (); s++)
+    {
+      Interval positions = Stem::head_positions (*s);
+      Direction d = DOWN;
+      do
+       {
+         if (sign (positions[d]) == d)
+           extremes[d] = d * max (d * positions[d], d * extremes[d]);
+       }
+      while (flip (&d) != DOWN);
+    }
+
+  if (extremes[UP] > extremes[DOWN])
+    return DOWN;
+  else if (extremes[UP] < extremes[DOWN])
+    return UP;
+
+  Drul_array<int> total (0, 0);
+  Drul_array<int> count (0, 0);
+ 
   for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *s = stems[i];
@@ -610,7 +626,7 @@ Beam::consider_auto_knees (Grob *me)
   Grob *common = common_refpoint_of_array (stems, me, Y_AXIS);
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
-  std::vector<Interval> head_extents_array;
+  vector<Interval> head_extents_array;
   for (vsize i = 0; i < stems.size (); i++)
     {
       Grob *stem = stems[i];
@@ -781,7 +797,7 @@ Beam::calc_least_squares_positions (SCM smob, SCM posns)
   if (count < 1)
     return ly_interval2scm (pos);
   
-  std::vector<Real> x_posns;
+  vector<Real> x_posns;
   extract_grob_set (me, "stems", stems);
   Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
   Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
@@ -841,7 +857,7 @@ Beam::calc_least_squares_positions (SCM smob, SCM posns)
     }
   else
     {
-      std::vector<Offset> ideals;
+      vector<Offset> ideals;
       for (vsize i = 0; i < stems.size (); i++)
        {
          Grob *s = stems[i];
@@ -887,7 +903,7 @@ Beam::shift_region_to_valid (SCM grob, SCM posns)
   /*
     Code dup.
   */
-  std::vector<Real> x_posns;
+  vector<Real> x_posns;
   extract_grob_set (me, "stems", stems);
   Grob *commonx = common_refpoint_of_array (stems, me, X_AXIS);
   Grob *commony = common_refpoint_of_array (stems, me, Y_AXIS);
@@ -1171,11 +1187,11 @@ Beam::set_beaming (Grob *me, Beaming_info_list const *beaming)
          if (beaming_prop == SCM_EOL
              || index_get_cell (beaming_prop, d) == SCM_EOL)
            {
-             int b = beaming->infos_.elem (i).beams_i_drul_[d];
+             int b = beaming->infos_.at (i).beams_i_drul_[d];
              if (i > 0
                  && i < stems.size () -1
                  && Stem::is_invisible (stem))
-               b = min (b, beaming->infos_.elem (i).beams_i_drul_[-d]);
+               b = min (b, beaming->infos_.at (i).beams_i_drul_[-d]);
 
              Stem::set_beaming (stem, b, d);
            }