X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=c6b7c9c85c1aec0f9f5f9957937bd2b785f6b495;hb=0387f04497978e37b335a8b99eec905499d6ad0f;hp=e3f462894acae72e750eb702083073e59922af83;hpb=8a1a5b054688384ead32745e7f48f7f072fabeb6;p=lilypond.git

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index e3f462894a..c6b7c9c85c 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,26 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
 
-#include "moment.hh"
-#include "paper-score.hh"
-#include "warn.hh"
 #include "axis-group-interface.hh"
-#include "spaceable-grob.hh"
-#include "text-interface.hh"
-#include "lookup.hh"
+#include "break-align-interface.hh"
 #include "font-interface.hh"
+#include "grob-array.hh"
+#include "lookup.hh"
+#include "lookup.hh"
+#include "moment.hh"
 #include "output-def.hh"
+#include "paper-score.hh"
 #include "pointer-group-interface.hh"
-#include "grob-array.hh"
-#include "system.hh"
+#include "rhythmic-head.hh"
+#include "separation-item.hh"
+#include "skyline-pair.hh"
+#include "spaceable-grob.hh"
 #include "spring.hh"
-#include "lookup.hh"
 #include "string-convert.hh"
+#include "system.hh"
+#include "text-interface.hh"
+#include "warn.hh"
 
 Grob *
 Paper_column::clone () const
@@ -136,6 +140,45 @@ Paper_column::is_breakable (Grob *me)
   return scm_is_symbol (me->get_property ("line-break-permission"));
 }
 
+Real
+Paper_column::minimum_distance (Grob *left, Grob *right)
+{
+  Drul_array<Grob*> cols (left, right);
+  Drul_array<Skyline> skys = Drul_array<Skyline> (Skyline (RIGHT), Skyline (LEFT));
+
+  Direction d = LEFT;
+  do
+    {
+      Skyline_pair *sp = Skyline_pair::unsmob (cols[d]->get_property ("horizontal-skylines"));
+      if (sp)
+	skys[d] = (*sp)[-d];
+    }
+  while (flip (&d) != LEFT);
+
+  skys[RIGHT].merge (Separation_item::conditional_skyline (right, left));
+
+  return max (0.0, skys[LEFT].distance (skys[RIGHT]));
+}
+
+Interval
+Paper_column::break_align_width (Grob *me)
+{
+  Grob *p = me->get_parent (X_AXIS);
+
+  if (is_musical (me))
+    {
+      me->programming_error ("tried to get break-align-width of a non-musical column");
+      return Interval (0, 0) + me->relative_coordinate (p, X_AXIS);
+    }
+
+  Grob *align = Pointer_group_interface::find_grob (me, ly_symbol2scm ("elements"),
+						    Break_alignment_interface::has_interface);
+  if (!align)
+    return Interval (0, 0) + me->relative_coordinate (p, X_AXIS);
+
+  return align->extent (p, X_AXIS);
+}
+
 /*
   Print a vertical line and  the rank number, to aid debugging.
 */
@@ -175,8 +218,9 @@ Paper_column::print (SCM p)
   for (SCM s = me->get_object ("ideal-distances");
        scm_is_pair (s); s = scm_cdr (s))
     {
-      Spring *sp = unsmob_spring (scm_car (s));
-      if (!sp->other_->get_system ())
+      Spring *sp = unsmob_spring (scm_caar (s));
+      if (!unsmob_grob (scm_cdar (s))
+	  || !unsmob_grob (scm_cdar (s))->get_system ())
 	continue;
       
       j++;
@@ -270,21 +314,47 @@ Paper_column::before_line_breaking (SCM grob)
   return SCM_UNSPECIFIED;
 }
 
+/* FIXME: This is a hack that we use to identify columns that used to
+   contain note-heads but whose note-heads were moved by one of the ligature
+   engravers. Once the ligature engravers are fixed to behave nicely, this
+   function can be removed.
+*/
+bool
+Paper_column::is_extraneous_column_from_ligature (Grob *me)
+{
+  if (!is_musical (me))
+    return false;
+
+  // If all the note-heads that I think are my children actually belong
+  // to another column, then I am extraneous.
+  extract_grob_set (me, "elements", elts);
+  bool has_notehead = false;
+  for (vsize i = 0; i < elts.size (); i++)
+    {
+      if (Rhythmic_head::has_interface (elts[i]))
+	{
+	  has_notehead = true;
+	  if (dynamic_cast<Item*> (elts[i])->get_column () == me)
+	    return false;
+	}
+    }
+  return has_notehead;
+}
+
 
 ADD_INTERFACE (Paper_column,
-	       "@code{Paper_column} objects form the top-most X-parents for items."
-	       "  The are two types of columns: musical columns, where are attached to, and "
-	       "  non-musical columns, where bar-lines, clefs etc. are attached to. "
-	       "  The spacing engine determines the X-positions of these objects."
-	       
-	       "\n\n"
-	       "They are\n"
-	       "  numbered, the first (leftmost) is column 0. Numbering happens before\n"
-	       "  line-breaking, and columns are not renumbered after line breaking.\n"
-	       "  Since many columns go unused, you should only use the rank field to\n"
-	       "  get ordering information.  Two adjacent columns may have\n"
-	       "  non-adjacent numbers.\n",
-	       
+	       "@code{Paper_column} objects form the top-most X@tie{}parents"
+	       " for items.  There are two types of columns: musical columns,"
+	       " where are attached to, and non-musical columns, where"
+	       " bar-lines, clefs, etc., are attached to.  The spacing engine"
+	       " determines the X@tie{}positions of these objects.\n"
+	       "\n"
+	       "They are numbered, the first (leftmost) is column@tie{}0."
+	       "  Numbering happens before line breaking, and columns are not"
+	       " renumbered after line breaking.  Since many columns go"
+	       " unused, you should only use the rank field to get ordering"
+	       " information.  Two adjacent columns may have non-adjacent"
+	       " numbers.",
 
 	       /* properties */
 	       "between-cols "
@@ -303,5 +373,6 @@ ADD_INTERFACE (Paper_column,
 	       "shortest-starter-duration "
 	       "spacing "
 	       "used "
-	       "when ");
+	       "when "
+	       );