* The grand 2005-2006 replace.

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index ce29a2011a1ce3539f9ec8360087ff8e777c3e23..f7cd30334c1a5eed226e03c4d78e39e154c638d0 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "paper-column.hh"
@@ -26,29 +26,6 @@ Paper_column::clone (int count) const
   return new Paper_column (*this, count);
 }
 
-ADD_INTERFACE (Paper_column, "paper-column-interface",
-              "@code{Paper_column} objects form the top-most X-parents for items."
-              "  The 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-positions of these objects."
-              
-              "\n\n"
-              "They are\n"
-              "  numbered, the first (leftmost) is column 0. Numbering happens before\n"
-              "  line-breaking, and columns are not renumbered after line breaking.\n"
-              "  Since many columns go unused, you should only use the rank field to\n"
-              "  get ordering information.  Two adjacent columns may have\n"
-              "  non-adjacent numbers.\n",
-              
-              
-              "between-cols "
-              "bounded-by-me "
-              "page-penalty "
-              "shortest-playing-duration "
-              "shortest-starter-duration "
-              "used "
-              "when ");
-
 void
 Paper_column::do_break_processing ()
 {
@@ -143,10 +120,10 @@ Paper_column::print (SCM p)
 
   SCM properties = Font_interface::text_font_alist_chain (me);
 
-  SCM scm_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (),
+  SCM scm_mol = Text_interface::interpret_markup (me->layout ()->self_scm (),
                                                  properties,
                                                  scm_makfrom0str (r.to_str0 ()));
-  SCM when_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (),
+  SCM when_mol = Text_interface::interpret_markup (me->layout ()->self_scm (),
                                                   properties,
                                                   scm_makfrom0str (when.to_str0 ()));
   Stencil t = *unsmob_stencil (scm_mol);
@@ -194,3 +171,32 @@ Paper_column::before_line_breaking (SCM grob)
 
   return SCM_UNSPECIFIED;
 }
+
+
+ADD_INTERFACE (Paper_column,
+
+              "paper-column-interface",
+              "@code{Paper_column} objects form the top-most X-parents for items."
+              "  The 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-positions of these objects."
+              
+              "\n\n"
+              "They are\n"
+              "  numbered, the first (leftmost) is column 0. Numbering happens before\n"
+              "  line-breaking, and columns are not renumbered after line breaking.\n"
+              "  Since many columns go unused, you should only use the rank field to\n"
+              "  get ordering information.  Two adjacent columns may have\n"
+              "  non-adjacent numbers.\n",
+              
+
+              /* properties */
+              "between-cols "
+              "bounded-by-me "
+              "line-break-system-details "
+              "page-penalty "
+              "shortest-playing-duration "
+              "shortest-starter-duration "
+              "used "
+              "when ");
+