2003 -> 2004

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 6cb5c2f48d79c5ad4b350f89628140c15874d3c8..60fd60a59f1b59b369624d234154f58bf2ba9f77 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--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "moment.hh"
@@ -16,28 +16,27 @@
 #include "text-item.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
-
+#include "paper-def.hh"
 
 
 
 
 ADD_INTERFACE (Paper_column, "paper-column-interface",
-  "  Paper_columns form the top-most item parent. (The Paper_columns X
-  parent is System, which is a spanner.)
-
-  Paper_columns form the units for the spacing engine. They are
-  numbered, the first (leftmost) is column 0. Numbering happens before
-  line-breaking, and columns are not renumbered after line breaking.
-
-  Since many columns go unused, you should only use the rank field to
-  get ordering information.  Two adjacent columns may have
-  non-adjacent numbers.
-
-  Don't be confused by right-items: each spacing wish can also contain
-  a number of items, with which a spacing constraint may be kept. It's
-  a little baroque, but it might come in handy later on?
-
-",
+  "  Paper_columns form the top-most item parent. (The Paper_columns X\n"
+"  parent is System, which is a spanner.)\n"
+"\n"
+"  Paper_columns form the units for the spacing engine. 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"
+"\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"
+"\n"
+"  Don't be confused by right-items: each spacing wish can also contain\n"
+"  a number of items, with which a spacing constraint may be kept. It's\n"
+"  a little baroque, but it might come in handy later on?\n"
+"\n",
   "between-cols between-system-string when bounded-by-me shortest-playing-duration shortest-starter-duration");
 
 
@@ -50,9 +49,9 @@ Paper_column::do_break_processing ()
 
 
 int
-Paper_column::rank_i (Grob*me) 
+Paper_column::get_rank (Grob*me) 
 {
-  return dynamic_cast<Paper_column*> (me)->rank_i_;
+  return dynamic_cast<Paper_column*> (me)->rank_;
 }
 
 System*
@@ -62,7 +61,7 @@ Paper_column::get_system () const
 }
 
 Paper_column*
-Paper_column::column_l () const
+Paper_column::get_column () const
 {
   return (Paper_column*) (this);
 }
@@ -71,7 +70,7 @@ Paper_column::Paper_column (SCM l)
   : Item (l)           // guh.?
 {
   system_=0;
-  rank_i_ = -1;
+  rank_ = -1;
 }
 
 Moment
@@ -118,15 +117,17 @@ Paper_column::brew_molecule (SCM p)
 {
   Grob *me = unsmob_grob (p);
 
-  String r = to_str (Paper_column::rank_i (me));
+  String r = to_string (Paper_column::get_rank (me));
   SCM properties = Font_interface::font_alist_chain (me);
-  
-  Molecule t = Text_item::text2molecule (me, ly_str02scm (r.ch_C()),
-                                        properties);
+
+  SCM scm_mol = Text_item::interpret_markup (me->get_paper ()->self_scm (),
+                                            properties,
+                                            scm_makfrom0str (r.to_str0 ()));
+  Molecule t = *unsmob_molecule (scm_mol);
   t.align_to (X_AXIS, CENTER);
   t.align_to (Y_AXIS, DOWN);
   
-  Molecule l = Lookup::filledbox (Box (Interval (-0.01, 0.01),
+  Molecule l = Lookup::filled_box (Box (Interval (-0.01, 0.01),
                                       Interval (-2, -1)));
 
   t.add_molecule (l);