* mf/merge.pe.in: Set font names, version, license GPL.

[lilypond.git] / lily / custos.cc

diff --git a/lily/custos.cc b/lily/custos.cc
index c14597e20ca2ff5c9020f8f663411cdf473517f0..bdc155fb891b4c00e9f63ecdd48e67d7c7a611fe 100644 (file)
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
- (C) 2000, 2002 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2004 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 /* TODO:
@@ -14,27 +14,26 @@
 
 */
 
+#include <cstdio>
+#include <math.h> // rint
 
-#include <stdio.h>
+#include "custos.hh"
 #include "direction.hh"
 #include "staff-symbol-referencer.hh"
-#include "custos.hh"
-#include "molecule.hh"
 #include "warn.hh"
 #include "note-head.hh"
 #include "item.hh"
 #include "font-interface.hh"
-#include "math.h" // rint
 
-MAKE_SCHEME_CALLBACK (Custos,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Custos,print,1);
 SCM
-Custos::brew_molecule (SCM smob)
+Custos::print (SCM smob)
 {
   Item *me = (Item *)unsmob_grob (smob);
 
-  SCM scm_style = me->get_grob_property ("style");
+  SCM scm_style = me->get_property ("style");
   String style;
-  if (gh_symbol_p (scm_style))
+  if (scm_is_symbol (scm_style))
     {
       style = ly_symbol2string (scm_style);
     }
@@ -48,20 +47,13 @@ Custos::brew_molecule (SCM smob)
    * staffline or not, or shall we use individual font characters
    * for both cases?
    */
-  bool adjust =
-    to_boolean (me->get_grob_property ("adjust-if-on-staffline"));
-
-  int neutral_pos;
-  SCM ntr_pos = me->get_grob_property ("neutral-position");
-  if (gh_number_p (ntr_pos))
-    neutral_pos = gh_scm2int (ntr_pos);
-  else
-    neutral_pos = 0;
+  bool adjust = true; 
 
+  int neutral_pos = robust_scm2int (me->get_property ("neutral-position"), 0);
   Direction neutral_direction =
-    to_dir (me->get_grob_property ("neutral-direction"));
+    to_dir (me->get_property ("neutral-direction"));
 
-  int pos = (int)rint (Staff_symbol_referencer::get_position (me));
+  int pos = Staff_symbol_referencer::get_rounded_position (me);
   int sz = Staff_symbol_referencer::line_count (me)-1;
 
   String font_char = "custodes-" + style + "-";
@@ -85,29 +77,17 @@ Custos::brew_molecule (SCM smob)
       font_char += "2";
     }
 
-  Molecule molecule
+  Stencil stencil
     = Font_interface::get_default_font (me)->find_by_name (font_char);
-  if (molecule.empty_b ())
+  if (stencil.is_empty ())
     {
       me->warning (_f ("custos `%s' not found", font_char));
       return SCM_EOL;
     }
-  else
-    {
-      // add ledger lines
-      int pos = (int)rint (Staff_symbol_referencer::get_position (me));
-      int interspaces = Staff_symbol_referencer::line_count (me)-1;
-      if (abs (pos) - interspaces > 1)
-       {
-         Molecule ledger_lines =
-           Note_head::brew_ledger_lines (me, pos, interspaces,
-                                         molecule.extent (X_AXIS), true);
-         molecule.add_molecule (ledger_lines);
-       }
-      return molecule.smobbed_copy ();
-    }
+
+  return stencil.smobbed_copy ();
 }
 
 ADD_INTERFACE (Custos, "custos-interface",
-  "Engrave custodes",
-  "style adjust-if-on-staffline neutral-direction neutral-position");
+  "A custos object.",
+  "style neutral-position neutral-direction");