X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcustos.cc;h=5ef96c58683261633e54fd949fa8e98b87c34738;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=121357c476c63f973035422f5c986fdd74f4ff00;hpb=366ac5a9c6dfb5a32111c8dd6ba40e49334402c3;p=lilypond.git

diff --git a/lily/custos.cc b/lily/custos.cc
index 121357c476..5ef96c5868 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -3,68 +3,57 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000--2003 Juergen Reuter <reuter@ipd.uka.de>
+  (c) 2000--2008 Juergen Reuter <reuter@ipd.uka.de>
 */
 
 /* TODO:
 
- - do not show if a clef change immediately follows in the next line
-
- - decide: do or do not print custos if the next line starts with a rest
+- do not show if a clef change immediately follows in the next line
 
+- decide: do or do not print custos if the next line starts with a rest
 */
 
+#include <cstdio>
+#include <cmath> // rint
+using namespace std;
 
-#include <stdio.h>
+#include "custos.hh"
 #include "direction.hh"
+#include "font-interface.hh"
+#include "international.hh"
+#include "item.hh"
+#include "note-head.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");
-  String style;
-  if (gh_symbol_p (scm_style))
-    {
-      style = ly_symbol2string (scm_style);
-    }
+  SCM scm_style = me->get_property ("style");
+  string style;
+  if (scm_is_symbol (scm_style))
+    style = ly_symbol2string (scm_style);
   else
-    {
-      style = "mensural";
-    }
+    style = "mensural";
 
   /*
    * Shall we use a common custos font character regardless if on
    * 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;
 
-  Direction neutral_direction =
-    to_dir (me->get_grob_property ("neutral-direction"));
+  int neutral_pos = robust_scm2int (me->get_property ("neutral-position"), 0);
+  Direction neutral_direction
+    = to_dir (me->get_property ("neutral-direction"));
 
-  int pos = (int)rint (Staff_symbol_referencer::get_position (me));
-  int sz = Staff_symbol_referencer::line_count (me)-1;
+  int pos = Staff_symbol_referencer::get_rounded_position (me);
+  int sz = Staff_symbol_referencer::line_count (me) - 1;
 
-  String font_char = "custodes-" + style + "-";
+  string font_char = "custodes." + style + ".";
   if (pos < neutral_pos)
     font_char += "u";
   else if (pos > neutral_pos)
@@ -77,37 +66,28 @@ Custos::brew_molecule (SCM smob)
     font_char += "d";
 
   if (adjust)
-    {
-      font_char += (((pos ^ sz) & 0x1) == 0) ? "1" : "0";
-    }
+    font_char += (((pos ^ sz) & 0x1) == 0) ? "1" : "0";
   else
-    {
-      font_char += "2";
-    }
+    font_char += "2";
 
-  Molecule molecule
+  Stencil stencil
     = Font_interface::get_default_font (me)->find_by_name (font_char);
-  if (molecule.is_empty ())
+  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");
+ADD_INTERFACE (Custos,
+	       "A custos object.  @code{style} can have four valid values:"
+	       " @code{mensural}, @code{vaticana}, @code{medicaea}, and"
+	       " @code{hufnagel}.  @code{mensural} is the default style.",
+
+	       /* properties */
+	       "style "
+	       "neutral-position "
+	       "neutral-direction "
+	       );