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

[lilypond.git] / lily / system.cc

diff --git a/lily/system.cc b/lily/system.cc
index 8c9ad1ff16e89dda86b39ba019fb5a5833f4ad3d..5fce3e22998e8de4711b0ab3f9b5cb76af9e64f3 100644 (file)
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "input-smob.hh"
@@ -18,7 +18,7 @@
 #include "string.hh"
 #include "warn.hh"
 #include "dimensions.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #include "all-font-metrics.hh"
 #include "spacing-interface.hh"
 #include "staff-symbol-referencer.hh"
@@ -114,7 +114,7 @@ System::typeset_grob (Grob * elem)
     programming_error ("Adding element twice.");
   
   elem->pscore_ = pscore_;
-  Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"),elem);
+  Pointer_group_interface::add_grob (this, ly_symbol2scm ("all-elements"), elem);
   scm_gc_unprotect_object (elem->self_scm ());
 }
 
@@ -336,7 +336,7 @@ System::break_into_pieces (Array<Column_x_positions> const &breaking)
 }
 
 void
-System::output_molecule (SCM expr, Offset o)
+System::output_stencil (SCM expr, Offset o)
 {
   while (1)
     {
@@ -360,14 +360,14 @@ System::output_molecule (SCM expr, Offset o)
          pscore_->outputter_->output_scheme (scm_list_n (head, SCM_UNDEFINED));
          expr = ly_cadr (expr);
        }
-      else if (head == ly_symbol2scm ("translate-molecule"))
+      else if (head == ly_symbol2scm ("translate-stencil"))
        {
          o += ly_scm2offset (ly_cadr (expr));
          expr = ly_caddr (expr);
        }
-      else if (head == ly_symbol2scm ("combine-molecule"))
+      else if (head == ly_symbol2scm ("combine-stencil"))
        {
-         output_molecule (ly_cadr (expr), o);
+         output_stencil (ly_cadr (expr), o);
          expr = ly_caddr (expr);
        }
       else
@@ -465,7 +465,7 @@ System::post_processing (bool last_line)
     }
 
   /*
-    generate all molecules  to trigger all font loads.
+    generate all stencils  to trigger all font loads.
 
     (ugh. This is not very memory efficient.)  */
 
@@ -475,14 +475,14 @@ System::post_processing (bool last_line)
   /*
     triger font loads first.
 
-    This might seem inefficient, but Molecules are cached per grob
+    This might seem inefficient, but Stencils are cached per grob
     anyway.
     */
-  this->get_molecule();
+  this->get_stencil();
   for (SCM s = all; gh_pair_p (s); s = ly_cdr (s))
     {
       Grob * g = unsmob_grob (ly_car (s));
-      g->get_molecule ();
+      g->get_stencil ();
     }
   
   /*
@@ -507,9 +507,9 @@ System::post_processing (bool last_line)
   /* Output elements in three layers, 0, 1, 2.
      The default layer is 1. */
   {
-    Molecule *m = this->get_molecule();
+    Stencil *m = this->get_stencil();
     if (m)
-      output_molecule (m->get_expr (), Offset(0,0));
+      output_stencil (m->get_expr (), Offset(0,0));
   }
   
   for (int i = 0; i < 3; i++)
@@ -517,7 +517,7 @@ System::post_processing (bool last_line)
         s = ly_cdr (s))
       {
        Grob *sc = unsmob_grob (ly_car (s));
-       Molecule *m = sc->get_molecule ();
+       Stencil *m = sc->get_stencil ();
        if (!m)
          continue;
        
@@ -538,7 +538,7 @@ System::post_processing (bool last_line)
            o += z;
          }
        
-       output_molecule (m->get_expr (), o);
+       output_stencil (m->get_expr (), o);
       }
 
   
@@ -602,7 +602,7 @@ System::columns ()const
        seem empty. We need to retain breakable columns, in case
        someone forced a breakpoint.
       */
-      if (!bfound || !Paper_column::used_b (acs[i]))
+      if (!bfound || !Paper_column::is_used (acs[i]))
        acs.del (i);
     }
   return acs;