*** empty log message ***

[lilypond.git] / lily / rest.cc

diff --git a/lily/rest.cc b/lily/rest.cc
index 18869230370a1e427e5531d60c2bcdf0c26de254..baab83f5af4f825f685b63fd597a1e4948faf147 100644 (file)
--- a/lily/rest.cc
+++ b/lily/rest.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "rest.hh"
+
 #include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "font-interface.hh"
-#include "rest.hh"
 #include "dots.hh"
 #include "paper-score.hh"
 #include "staff-symbol-referencer.hh"
@@ -21,7 +22,7 @@ SCM
 Rest::after_line_breaking (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  int bt = ly_scm2int (me->get_property ("duration-log"));
+  int bt = scm_to_int (me->get_property ("duration-log"));
   int lc = Staff_symbol_referencer::line_count (me);
   Real ss = Staff_symbol_referencer::staff_space (me);
   if (lc % 2)
@@ -54,11 +55,10 @@ Rest::after_line_breaking (SCM smob)
   make this function easily usable in C++
  */
 String
-Rest::glyph_name (Grob *me, int balltype, String style)
+Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
 {
   bool ledgered_b = false;
-
-  if (balltype == 0 || balltype == 1)
+  if (try_ledgers && (balltype == 0 || balltype == 1))
     {
       Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0;
       Real pos = Staff_symbol_referencer::get_position (me);
@@ -74,7 +74,7 @@ Rest::glyph_name (Grob *me, int balltype, String style)
 
   String actual_style (style.to_str0 ());
 
-  if ((style == "mensural") || (style == "neo_mensural")) {
+  if ((style == "mensural") || (style == "neomensural")) {
 
     /*
       FIXME: Currently, ancient font does not provide ledgered rests;
@@ -85,7 +85,7 @@ Rest::glyph_name (Grob *me, int balltype, String style)
     ledgered_b = 0;
 
     /*
-      There are no 32th/64th/128th mensural/neo_mensural rests.  In
+      There are no 32th/64th/128th mensural/neomensural rests.  In
       these cases, revert back to default style.
     */
     if (balltype > 4)
@@ -108,30 +108,31 @@ Rest::glyph_name (Grob *me, int balltype, String style)
     actual_style = "";
   }
 
-  return ("rests-") + to_string (balltype) + (ledgered_b ? "o" : "") + actual_style;
+  return ("rests." + to_string (balltype) + (ledgered_b ? "o" : "")
+         + actual_style);
 }
 
 
 MAKE_SCHEME_CALLBACK (Rest,print,1);
 
 SCM
-Rest::brew_internal_stencil (SCM smob)
+Rest::brew_internal_stencil (SCM smob, bool ledgered)
 {
   Grob* me = unsmob_grob (smob);
 
   SCM balltype_scm = me->get_property ("duration-log");
-  if (!is_number (balltype_scm))
+  if (!scm_is_number (balltype_scm))
     return Stencil ().smobbed_copy ();
 
-  int balltype = ly_scm2int (balltype_scm);
+  int balltype = scm_to_int (balltype_scm);
   
   String style; 
   SCM style_scm = me->get_property ("style");
-  if (ly_c_symbol_p (style_scm))
+  if (scm_is_symbol (style_scm))
     style = ly_scm2string (scm_symbol_to_string (style_scm));
 
   Font_metric *fm = Font_interface::get_default_font (me);
-  String font_char = glyph_name (me, balltype, style);
+  String font_char = glyph_name (me, balltype, style, ledgered);
   Stencil out = fm->find_by_name (font_char);
   if (out.is_empty ())
     me->warning (_f ("rest `%s' not found", font_char.to_str0 ()));
@@ -142,7 +143,7 @@ Rest::brew_internal_stencil (SCM smob)
 SCM 
 Rest::print (SCM smob) 
 {
-  return brew_internal_stencil (smob);
+  return brew_internal_stencil (smob, true);
 }
 MAKE_SCHEME_CALLBACK (Rest,extent_callback,2);
 /*
@@ -151,8 +152,17 @@ MAKE_SCHEME_CALLBACK (Rest,extent_callback,2);
 SCM
 Rest::extent_callback (SCM smob, SCM ax)
 {
-  Axis a = (Axis) ly_scm2int (ax);
-  SCM m = brew_internal_stencil (smob);
+  Axis a = (Axis) scm_to_int (ax);
+
+  /*
+    Don't want ledgers: ledgers depend on Y position, which depends on
+    rest collision, which depends on stem size which depends on beam
+    slop of opposite note column.
+
+    consequence: we get too small extents and potential collisions
+    with ledgered rests.
+   */
+  SCM m = brew_internal_stencil (smob, a != X_AXIS);
   return ly_interval2scm (unsmob_stencil (m)->extent (a));
 }
 
@@ -161,7 +171,7 @@ SCM
 Rest::polyphonic_offset_callback (SCM smob, SCM)
 {
   Grob* me = unsmob_grob (smob);
-  if (is_number (me->get_property ("staff-position")))
+  if (scm_is_number (me->get_property ("staff-position")))
     return scm_make_real (0);
 
   Direction d = get_grob_direction (me);
@@ -173,5 +183,5 @@ Rest::polyphonic_offset_callback (SCM smob, SCM)
 
 ADD_INTERFACE (Rest,"rest-interface",
   "A rest symbol.",
-  "style minimum-distance");
+  "style direction minimum-distance");