new file, move from

[lilypond.git] / lily / paper-column.cc

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 6b8d7a43647af9da6ce14d81f0783dbb57a8e556..6f52171db191e6e1e6bea095da00d7329f874aa1 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -16,7 +16,7 @@
 #include "text-item.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 
 
 
@@ -99,8 +99,8 @@ Paper_column::is_musical (Grob *me)
 bool
 Paper_column::is_used (Grob*me)
 {
-  return is_pair (me->get_property ("elements")) ||  Item::is_breakable (me)
-    || is_pair (me->get_property ("bounded-by-me"))
+  return ly_c_pair_p (me->get_property ("elements")) ||  Item::is_breakable (me)
+    || ly_c_pair_p (me->get_property ("bounded-by-me"))
     ;
 }
 
@@ -147,7 +147,7 @@ Paper_column::before_line_breaking (SCM grob)
   SCM c = me->get_property ("bounded-by-me");
   SCM *ptrptr = &c;
 
-  while (is_pair (*ptrptr))
+  while (ly_c_pair_p (*ptrptr))
     {
       Grob * g = unsmob_grob (ly_car (*ptrptr));