The grand \paper -> \layout, \bookpaper -> \paper renaming.

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 9de3eda80e405dfc05968d5176c10e617f79893d..d4d5a03e7eee5fcb568a3785205d5fec06891604 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
@@ -67,14 +67,14 @@ Paper_column::get_column () const
 Paper_column::Paper_column (SCM l)
   : Item (l)           // guh.?
 {
-  system_=0;
+  system_ = 0;
   rank_ = -1;
 }
 
 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::breakable_b (me)
-    || gh_pair_p (me->get_grob_property ("bounded-by-me"))
+  return scm_is_pair (me->get_property ("elements")) ||  Item::is_breakable (me)
+    || scm_is_pair (me->get_property ("bounded-by-me"))
     ;
 }
 
@@ -108,16 +108,16 @@ 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 (),
+  SCM scm_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (),
                                             properties,
                                             scm_makfrom0str (r.to_str0 ()));
   Stencil t = *unsmob_stencil (scm_mol);
@@ -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 (scm_is_pair (*ptrptr))
     {
-      Grob * g = unsmob_grob (gh_car (*ptrptr));
+      Grob * g = unsmob_grob (scm_car (*ptrptr));
 
-      if (!g || !g->live ())
+      if (!g || !g->is_live ())
        {
-         *ptrptr = gh_cdr (*ptrptr);
+         *ptrptr = scm_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;
 }