Updates.

[lilypond.git] / lily / multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 926dfc6110bc826c7a35f0bdd77e9e3e2d518263..194a23780fe8c8767cdd1ac2c60c83a1a67d7536 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
   
  */
 
@@ -21,7 +21,6 @@
 #include "percent-repeat-item.hh"
 #include "lookup.hh"
 
-
 MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
 SCM
 Multi_measure_rest::percent (SCM smob)
@@ -64,11 +63,6 @@ Multi_measure_rest::percent (SCM smob)
   return r.smobbed_copy ();
 }
 
-
-/*
-   [TODO]                                      17
-   variable-sized multi-measure rest symbol: |====| ??
-*/
 MAKE_SCHEME_CALLBACK (Multi_measure_rest,brew_molecule,1);
 SCM
 Multi_measure_rest::brew_molecule (SCM smob) 
@@ -76,8 +70,6 @@ Multi_measure_rest::brew_molecule (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner * sp = dynamic_cast<Spanner*> (me);
 
-  SCM alist_chain = Font_interface::font_alist_chain (me);
-
   Interval sp_iv;
   Direction d = LEFT;
 
@@ -112,25 +104,12 @@ Multi_measure_rest::brew_molecule (SCM smob)
       measures = gh_scm2int (m);
     }
 
-  SCM s = me->get_grob_property ("number-threshold");
-  if (measures > gh_scm2int (s))
-    {
-      Molecule s = Text_item::text2molecule (me,
-                                            scm_makfrom0str (to_string (measures).to_str0 ()),
-                                            alist_chain);
-
-      s.align_to (X_AXIS, CENTER);
-      s.translate_axis (gh_scm2double (me->get_grob_property ("padding")) + 2,
-                       Y_AXIS);
-
-      s.translate_axis (mol.extent (X_AXIS).center (),  X_AXIS);
-      mol.add_molecule (s);
-    }
   mol.translate_axis (x_off, X_AXIS);
   return mol.smobbed_copy ();
 }
 
 
+
 Molecule
 Multi_measure_rest::symbol_molecule (Grob *me, Real space)
 {
@@ -155,16 +134,11 @@ Multi_measure_rest::symbol_molecule (Grob *me, Real space)
 
   SCM alist_chain = Font_interface::font_alist_chain (me);
 
-  SCM style_chain =
-    Font_interface::add_style (me, ly_symbol2scm ("mmrest-symbol"),
-                              alist_chain);
-
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Font_metric *musfont
-    = Font_interface::get_font (me,style_chain);
+    = Font_interface::get_font (me,alist_chain);
 
   SCM sml = me->get_grob_property ("use-breve-rest");
-
   if (measures == 1)
     {
       if (sml == SCM_BOOL_T)
@@ -201,19 +175,22 @@ Multi_measure_rest::symbol_molecule (Grob *me, Real space)
 Molecule
 Multi_measure_rest::big_rest (Grob *me, Real width)
 {
-  Real thick = gh_scm2double (me->get_grob_property ("thickness"));
+  Real tthick = gh_scm2double (me->get_grob_property ("thick-thickness"));
+  Real hair_thick = gh_scm2double (me->get_grob_property ("hair-thickness"));
+
+
   Real ss = Staff_symbol_referencer::staff_space (me);
   
   Real slt = me->get_paper ()->get_var ("linethickness");
-  Real y = slt * thick/2 * ss;
-  Box b(Interval (0, width), Interval (-y, y));
-  Real ythick = slt * ss;
+  Real y = slt * tthick/2 * ss;
+  Real ythick = hair_thick * slt * ss;
+  Box b(Interval (0, width - 2 * ythick), Interval (-y, y));
   
   Molecule m =  Lookup::filledbox (b);
-  Molecule yb = Lookup::filledbox (Box (Interval (-ythick, ythick), Interval (-ss, ss)));
+  Molecule yb = Lookup::filledbox (Box (Interval (-0.5, 0.5)* ythick, Interval (-ss, ss)));
 
-  m.add_at_edge (X_AXIS, RIGHT, yb, -ythick);
-  m.add_at_edge (X_AXIS, LEFT, yb, -ythick);
+  m.add_at_edge (X_AXIS, RIGHT, yb, 0, 0);
+  m.add_at_edge (X_AXIS, LEFT, yb, 0, 0);
 
   m.align_to (X_AXIS, LEFT);
   
@@ -301,7 +278,7 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures,
   Molecule mol; 
   for (SCM  s = mols; gh_pair_p (s); s = gh_cdr(s))
     {
-      mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding);
+      mol.add_at_edge (X_AXIS, LEFT, *unsmob_molecule (gh_car (s)), inner_padding, 0);
     }
   mol.align_to (X_AXIS, LEFT);
   mol.translate_axis (outer_padding_factor *  inner_padding, X_AXIS);
@@ -317,12 +294,9 @@ Multi_measure_rest::add_column (Grob*me,Item* c)
 
 
 MAKE_SCHEME_CALLBACK (Multi_measure_rest, set_spacing_rods,1);
-
 SCM
 Multi_measure_rest::set_spacing_rods (SCM smob)
 {
-  return SCM_UNSPECIFIED;
-
   Grob*me = unsmob_grob (smob);
 
   Spanner*sp = dynamic_cast<Spanner*> (me);
@@ -357,6 +331,11 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
       rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
        + sym_width  + 2.0;                     // 2.0 = magic!
   
+      Real minlen  =0.0;
+      SCM ml  =me->get_grob_property ("minimum-length");
+      if (gh_number_p (ml)) minlen = gh_scm2double (ml);
+      rod.distance_ = max(rod.distance_,
+                         minlen);
       rod.add_to_cols ();
     }
   return SCM_UNSPECIFIED;
@@ -364,10 +343,8 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
 
 
 
-ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface",
-  "A rest that spans a whole number of measures.  For typesetting the
-numbers, fields from font-interface may be used.
 
+ADD_INTERFACE (Multi_measure_rest,"multi-measure-rest-interface",
+              "A rest that spans a whole number of measures.",
+              "expand-limit measure-count hair-thickness thick-thickness use-breve-rest minimum-length");
 
-",
-  "expand-limit measure-count number-threshold padding thickness use-breve-rest");