X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpaper-column.cc;h=78f2786ef89b34f41cefcb63cc8d8e4c352a9bbf;hb=6421a3ea12cf519b165afc3700a86058bdcc381d;hp=8f392bb930474d520f8084fdaf3b8d5717812675;hpb=3cfcd0df1125efe0eddc1f361f9bf24243ed12b7;p=lilypond.git

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 8f392bb930..78f2786ef8 100644
--- a/lily/paper-column.cc
+++ b/lily/paper-column.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
@@ -27,6 +27,7 @@
 #include "lookup.hh"
 #include "lookup.hh"
 #include "moment.hh"
+#include "note-head.hh"
 #include "output-def.hh"
 #include "paper-score.hh"
 #include "pointer-group-interface.hh"
@@ -123,12 +124,6 @@ Paper_column::when_mom (Grob *me)
   return Moment (0);
 }
 
-bool
-Paper_column::is_loose (Grob *g)
-{
-  return (scm_is_pair (g->get_object ("between-cols")));
-}
-
 bool
 Paper_column::is_musical (Grob *me)
 {
@@ -174,14 +169,12 @@ 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
+  for (LEFT_and_RIGHT (d))
     {
       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));
 
@@ -226,6 +219,7 @@ Paper_column::break_align_width (Grob *me, SCM align_sym)
   return align->extent (p, X_AXIS);
 }
 
+
 /*
   Print a vertical line and  the rank number, to aid debugging.
 */