X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=3308cf251cc65a55aaf2302780a4b5abb8b323c3;hb=16b127866a6dc83392db2c2ad00a5fffd467b7e6;hp=0eb40d1b97a48c8297ff378de172d65de6cd5072;hpb=eda0b8d4348f476fd54738dcc9ac3c2e85675ab3;p=lilypond.git

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 0eb40d1b97..3308cf251c 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -18,6 +18,7 @@
 #include "output-def.hh"
 #include "paper-score.hh"
 #include "pointer-group-interface.hh"
+#include "rhythmic-head.hh"
 #include "separation-item.hh"
 #include "skyline-pair.hh"
 #include "spaceable-grob.hh"
@@ -313,13 +314,40 @@ 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@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"
+	       " for items.  There are two types of columns: musical and"
+	       " non-musical, to which musical and non-musical objects are"
+	       " attached respectively.  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"
@@ -331,11 +359,13 @@ ADD_INTERFACE (Paper_column,
 	       /* properties */
 	       "between-cols "
 	       "bounded-by-me "
+	       "full-measure-extra-space "
 	       "grace-spacing "
 	       "labels "
 	       "line-break-system-details "
 	       "line-break-penalty "
 	       "line-break-permission "
+	       "maybe-loose "
 	       "page-break-penalty "
 	       "page-break-permission "
 	       "page-turn-penalty "