new file, move from

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 6ca95c712ec885bf1f9441ddb7f23c2d186e7288..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"
 
 
 
@@ -35,7 +35,7 @@ ADD_INTERFACE (Paper_column, "paper-column-interface",
               "  non-adjacent numbers.\n"
               "\n"
               ,
-              "between-cols between-system-string when bounded-by-me "
+              "between-cols when bounded-by-me "
               "shortest-playing-duration shortest-starter-duration");
 
 void
@@ -74,7 +74,7 @@ Paper_column::Paper_column (SCM l)
 Moment
 Paper_column::when_mom (Grob*me)
 {
-  SCM m = me->get_grob_property ("when");
+  SCM m = me->get_property ("when");
   Moment s (0);
   if (unsmob_moment (m))
     {
@@ -86,7 +86,7 @@ Paper_column::when_mom (Grob*me)
 bool
 Paper_column::is_musical (Grob *me)
 {
-  SCM m = me->get_grob_property ("shortest-starter-duration");
+  SCM m = me->get_property ("shortest-starter-duration");
   Moment s (0);
   if (unsmob_moment (m))
     {
@@ -99,8 +99,8 @@ Paper_column::is_musical (Grob *me)
 bool
 Paper_column::is_used (Grob*me)
 {
-  return gh_pair_p (me->get_grob_property ("elements")) ||  Item::is_breakable (me)
-    || gh_pair_p (me->get_grob_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"))
     ;
 }
 
@@ -108,14 +108,14 @@ Paper_column::is_used (Grob*me)
   Print a vertical line and  the rank number, to aid debugging.  
  */
 
-MAKE_SCHEME_CALLBACK(Paper_column,print,1);
+MAKE_SCHEME_CALLBACK (Paper_column,print,1);
 SCM
 Paper_column::print (SCM p)
 {
   Grob *me = unsmob_grob (p);
 
   String r = to_string (Paper_column::get_rank (me));
-  SCM properties = Font_interface::font_alist_chain (me);
+  SCM properties = Font_interface::text_font_alist_chain (me);
 
   SCM scm_mol = Text_item::interpret_markup (me->get_paper ()->self_scm (),
                                             properties,
@@ -138,22 +138,22 @@ Paper_column::print (SCM p)
 
   THIS IS BROKEN KLUDGE. WE SHOULD INVENT SOMETHING BETTER. 
  */
-MAKE_SCHEME_CALLBACK(Paper_column,before_line_breaking,1);
+MAKE_SCHEME_CALLBACK (Paper_column,before_line_breaking,1);
 SCM
 Paper_column::before_line_breaking (SCM grob)
 {
   Grob *me = unsmob_grob (grob);
 
-  SCM c = me->get_grob_property ("bounded-by-me");
+  SCM c = me->get_property ("bounded-by-me");
   SCM *ptrptr = &c;
 
-  while (gh_pair_p (*ptrptr))
+  while (ly_c_pair_p (*ptrptr))
     {
-      Grob * g = unsmob_grob (gh_car (*ptrptr));
+      Grob * g = unsmob_grob (ly_car (*ptrptr));
 
       if (!g || !g->live ())
        {
-         *ptrptr = gh_cdr (*ptrptr);
+         *ptrptr = ly_cdr (*ptrptr);
        }
       else
        {
@@ -161,6 +161,6 @@ Paper_column::before_line_breaking (SCM grob)
        }
     }
 
-  me->set_grob_property ("bounded-by-me", c);
+  me->set_property ("bounded-by-me", c);
   return SCM_UNSPECIFIED;
 }