X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstaff-symbol.cc;h=3b0eef00b5f278e1c52000b3adc2a730d9a24007;hb=5d19ffa19f6c98aa6ba3bb95641b6759d6b1cb51;hp=f80a5c57741dfc1c2523f403fa809149c370d8d3;hpb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;p=lilypond.git

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index f80a5c5774..3b0eef00b5 100644
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #include "lookup.hh"
 #include "dimensions.hh"
 #include "output-def.hh"
+#include "paper-column.hh"
 #include "warn.hh"
 #include "item.hh"
 #include "staff-symbol-referencer.hh"
@@ -49,8 +50,7 @@ Staff_symbol::print (SCM smob)
   Real t = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
 
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       SCM width_scm = me->get_property ("width");
       if (d == RIGHT && scm_is_number (width_scm))
@@ -66,64 +66,190 @@ Staff_symbol::print (SCM smob)
         {
           Item *x = sp->get_bound (d);
 
-          span_points[d] = x->relative_coordinate (common, X_AXIS);
-          if (!x->break_status_dir ()
-              && !x->extent (x, X_AXIS).is_empty ())
-            span_points[d] += x->extent (x, X_AXIS)[d];
+          span_points[d] = ((!x->break_status_dir ()
+                             && !x->extent (x, X_AXIS).is_empty ())
+                            ? Paper_column::break_align_width (x, ly_symbol2scm ("break-alignment"))[d]
+                            : x->relative_coordinate (common, X_AXIS));
         }
 
       span_points[d] -= d * t / 2;
     }
-  while (flip (&d) != LEFT);
 
   Stencil m;
 
-  SCM line_positions = me->get_property ("line-positions");
+  vector<Real> line_positions = Staff_symbol::line_positions (me);
+
   Stencil line
     = Lookup::horizontal_line (span_points
                                - me->relative_coordinate (common, X_AXIS),
                                t);
 
   Real space = staff_space (me);
+  for (vector<Real>::const_iterator i = line_positions.begin (),
+       e = line_positions.end ();
+       i != e;
+       ++i)
+    {
+      Stencil b (line);
+      b.translate_axis (*i * 0.5 * space, Y_AXIS);
+      m.add_stencil (b);
+    }
+  return m.smobbed_copy ();
+}
+
+vector<Real>
+Staff_symbol::line_positions (Grob *me)
+{
+  SCM line_positions = me->get_property ("line-positions");
   if (scm_is_pair (line_positions))
     {
+      int line_count = scm_ilength (line_positions);
+      vector<Real> values (line_count);
+      int i = 0;
       for (SCM s = line_positions; scm_is_pair (s);
            s = scm_cdr (s))
         {
-          Stencil b (line);
-          b.translate_axis (scm_to_double (scm_car (s))
-                            * 0.5 * space, Y_AXIS);
-          m.add_stencil (b);
+          values[i++] = scm_to_double (scm_car (s));
         }
+      return values;
     }
   else
     {
-      int l = Staff_symbol::line_count (me);
-      Real height = (l - 1) * staff_space (me) / 2;
-      for (int i = 0; i < l; i++)
+      int line_count = Staff_symbol::line_count (me);
+      Real height = line_count - 1;
+      vector<Real> values (line_count);
+      for (int i = 0; i < line_count; i++)
         {
-          Stencil b (line);
-          b.translate_axis (height - i * space, Y_AXIS);
-          m.add_stencil (b);
+          values[i] = height - i * 2;
         }
+      return values;
     }
-  return m.smobbed_copy ();
 }
 
-int
-Staff_symbol::get_steps (Grob *me)
+vector<Real>
+Staff_symbol::ledger_positions (Grob *me, int pos)
 {
-  return line_count (me) * 2;
+  SCM ledger_positions = me->get_property ("ledger-positions");
+  Real ledger_extra = robust_scm2double (me->get_property ("ledger-extra"), 0);
+  vector<Real> line_positions = Staff_symbol::line_positions (me);
+  vector<Real> values;
+
+  if (line_positions.empty ())
+    return values;
+
+  // find the staff line nearest to note position
+  Real nearest_line = line_positions[0];
+  Real line_dist = abs (line_positions[0] - pos);
+  for (vector<Real>::const_iterator i = line_positions.begin (),
+       e = line_positions.end ();
+       i != e;
+       ++i)
+    {
+      if (abs (*i - pos) < line_dist)
+        {
+          nearest_line = *i;
+          line_dist = abs (*i - pos);
+        }
+    }
+
+  if (line_dist < .5)
+    return values;
+
+  Direction dir = (Direction)sign (pos - nearest_line);
+
+  if (scm_is_pair (ledger_positions))
+    // custom ledger line positions
+    {
+      Real min_pos = HUGE_VAL;
+      Real max_pos = -HUGE_VAL;
+      SCM s2;
+
+      // find the extent of the ledger pattern
+      for (SCM s = ledger_positions; scm_is_pair (s); s = scm_cdr (s))
+        {
+          s2 = scm_car (s);
+          if (!scm_is_number (s2))
+            s2 = scm_car (s2);
+          Real current_ledger = scm_to_double (s2);
+          if (current_ledger > max_pos)
+            max_pos = current_ledger;
+          if (current_ledger < min_pos)
+            min_pos = current_ledger;
+        }
+
+      Real cycle = max_pos - min_pos;
+
+      Interval ledger_fill;
+      ledger_fill.add_point (nearest_line + 0.5 * dir);
+      ledger_fill.add_point (pos + 0.5 * dir + ledger_extra * dir);
+
+      // fill the Interval ledger_fill with ledger lines
+      int n = (int) floor ((ledger_fill[DOWN] - min_pos) / cycle);
+      Real current;
+      SCM s = scm_cdr (ledger_positions);
+      if (!scm_is_pair (s) || cycle < 0.1)
+        return values;
+      do
+        {
+          s2 = scm_car (s);
+          if (scm_is_number (s2))
+            {
+              current = scm_to_double (s2) + n * cycle;
+              if (ledger_fill.contains (current))
+                values.push_back (current);
+            }
+          else
+            // grouped ledger lines, either add all or none
+            {
+              do
+                {
+                  current = scm_to_double (scm_car (s2)) + n * cycle;
+                  if (ledger_fill.contains (current))
+                    {
+                      s2 = scm_car (s);
+                      do
+                        {
+                          current = scm_to_double (scm_car (s2)) + n * cycle;
+                          values.push_back (current);
+                          s2 = scm_cdr (s2);
+                        }
+                      while (scm_is_pair (s2));
+                    }
+                  else
+                    s2 = scm_cdr (s2);
+                }
+              while (scm_is_pair (s2));
+            }
+          s = scm_cdr (s);
+          if (!scm_is_pair (s))
+            {
+              s = scm_cdr (ledger_positions);
+              n++;
+            }
+        }
+      while (current <= ledger_fill[UP]);
+    }
+  else
+    // normal ledger lines
+    {
+      int ledger_count = (int) floor ((abs (nearest_line - pos) + ledger_extra) / 2);
+      values.resize (ledger_count);
+      for (int i = 0; i < ledger_count; i++)
+        {
+          values[i] = nearest_line + dir * (ledger_count - i) * 2;
+        }
+    }
+  return values;
 }
 
 int
 Staff_symbol::line_count (Grob *me)
 {
-  SCM c = me->get_property ("line-count");
-  if (scm_is_number (c))
-    return scm_to_int (c);
+  SCM line_positions = me->get_property ("line-positions");
+  if (scm_is_pair (line_positions))
+    return scm_ilength (line_positions);
   else
-    return 0;
+    return robust_scm2int (me->get_property ("line-count"), 0);
 }
 
 Real
@@ -178,7 +304,7 @@ Staff_symbol::height (SCM smob)
 }
 
 bool
-Staff_symbol::on_line (Grob *me, int pos)
+Staff_symbol::on_line (Grob *me, int pos, bool allow_ledger)
 {
   SCM line_positions = me->get_property ("line-positions");
   if (scm_is_pair (line_positions))
@@ -196,15 +322,27 @@ Staff_symbol::on_line (Grob *me, int pos)
             min_line = current_line;
 
         }
-      if (pos < min_line)
-        return (( (int) (rint (pos - min_line)) % 2) == 0);
-      if (pos > max_line)
-        return (( (int) (rint (pos - max_line)) % 2) == 0);
+
+      if (allow_ledger)
+        {
+          if (pos < min_line)
+            return (( (int) (rint (pos - min_line)) % 2) == 0);
+          if (pos > max_line)
+            return (( (int) (rint (pos - max_line)) % 2) == 0);
+        }
 
       return false;
     }
   else
-    return ((abs (pos + line_count (me)) % 2) == 1);
+    {
+      int const line_cnt = line_count (me);
+      bool result = abs (pos + line_cnt) % 2 == 1;
+      if (result && !allow_ledger)
+        {
+          result = -line_cnt < pos && pos < line_cnt;
+        }
+      return result;
+    }
 }
 
 Interval
@@ -234,7 +372,9 @@ ADD_INTERFACE (Staff_symbol,
                " @code{width} property.",
 
                /* properties */
+               "ledger-extra "
                "ledger-line-thickness "
+               "ledger-positions "
                "line-count "
                "line-positions "
                "staff-space "