($(outdir)/%.pdf): add DVIPS_FLAGS. This will

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

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 5373d06f341796d28e7d4d29265da292361d207c..af2469199941743b690c33b9f83a375518e11e42 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"
@@ -12,32 +12,31 @@
 #include "warn.hh"
 #include "axis-group-interface.hh"
 #include "spaceable-grob.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #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");
 
 
@@ -87,7 +86,7 @@ Paper_column::when_mom (Grob*me)
 }
 
 bool
-Paper_column::musical_b (Grob *me)
+Paper_column::is_musical (Grob *me)
 {
   SCM m = me->get_grob_property ("shortest-starter-duration");
   Moment s (0);
@@ -96,12 +95,11 @@ Paper_column::musical_b (Grob *me)
       s = *unsmob_moment (m);
     }
   return s != Moment (0);
-  
 }
   
 
 bool
-Paper_column::used_b (Grob*me)
+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"))
@@ -112,24 +110,26 @@ Paper_column::used_b (Grob*me)
   Print a vertical line and  the rank number, to aid debugging.  
  */
 
-MAKE_SCHEME_CALLBACK(Paper_column,brew_molecule,1);
+MAKE_SCHEME_CALLBACK(Paper_column,print,1);
 SCM
-Paper_column::brew_molecule (SCM p)
+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);
-  
-  Molecule t = Text_item::text2molecule (me, ly_str02scm (r.to_str0 ()),
-                                        properties);
+
+  SCM scm_mol = Text_item::interpret_markup (me->get_paper ()->self_scm (),
+                                            properties,
+                                            scm_makfrom0str (r.to_str0 ()));
+  Stencil t = *unsmob_stencil (scm_mol);
   t.align_to (X_AXIS, CENTER);
   t.align_to (Y_AXIS, DOWN);
   
-  Molecule l = Lookup::filledbox (Box (Interval (-0.01, 0.01),
+  Stencil l = Lookup::filled_box (Box (Interval (-0.01, 0.01),
                                       Interval (-2, -1)));
 
-  t.add_molecule (l);
+  t.add_stencil (l);
   return t.smobbed_copy ();                                            
 }