2003 -> 2004

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index eab3671d1a64a31bf36bb50cf7baead695c4f2fb..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--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "moment.hh"
@@ -16,7 +16,7 @@
 #include "text-item.hh"
 #include "lookup.hh"
 #include "font-interface.hh"
-
+#include "paper-def.hh"
 
 
 
@@ -119,13 +119,15 @@ Paper_column::brew_molecule (SCM p)
 
   String r = to_string (Paper_column::get_rank (me));
   SCM properties = Font_interface::font_alist_chain (me);
-  
-  Molecule t = Text_item::text2molecule (me, scm_makfrom0str (r.to_str0 ()),
-                                        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);