doc patch by Graham Percival

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

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 1549cf727c2e0c505be70cb7b79722c439dfbf47..926dfc6110bc826c7a35f0bdd77e9e3e2d518263 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -8,7 +8,7 @@
  */
 
 #include "multi-measure-rest.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-def.hh"
 #include "paper-column.hh" // urg
 #include "font-interface.hh"
@@ -21,11 +21,6 @@
 #include "percent-repeat-item.hh"
 #include "lookup.hh"
 
-bool
-Multi_measure_rest::has_interface (Grob*me)
-{
-  return me->has_interface (ly_symbol2scm ("multi-measure-rest-interface"));
-}
 
 MAKE_SCHEME_CALLBACK (Multi_measure_rest,percent,1);
 SCM
@@ -42,7 +37,7 @@ Multi_measure_rest::percent (SCM smob)
   Direction d = LEFT;
   do
     {
-      Item * col = sp->get_bound (d)->column_l ();
+      Item * col = sp->get_bound (d)->get_column ();
 
       Interval coldim = col->extent (0, X_AXIS);
 
@@ -89,7 +84,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
   Grob *common = sp->get_bound (LEFT)->common_refpoint (sp->get_bound (RIGHT), X_AXIS);
   do
     {
-      Item * col = sp->get_bound (d)->column_l ();
+      Item * col = sp->get_bound (d)->get_column ();
 
       Interval coldim = col->extent (common, X_AXIS);
 
@@ -117,15 +112,16 @@ Multi_measure_rest::brew_molecule (SCM smob)
       measures = gh_scm2int (m);
     }
 
-  if (measures > 1)
+  SCM s = me->get_grob_property ("number-threshold");
+  if (measures > gh_scm2int (s))
     {
       Molecule s = Text_item::text2molecule (me,
-                                            ly_str02scm (to_str (measures).ch_C ()),
+                                            scm_makfrom0str (to_string (measures).to_str0 ()),
                                             alist_chain);
 
-      
       s.align_to (X_AXIS, CENTER);
-      s.translate_axis (3.0, Y_AXIS);
+      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);
@@ -144,12 +140,11 @@ Multi_measure_rest::symbol_molecule (Grob *me, Real space)
     {
       measures = gh_scm2int (m);
     }
-  
-
-  SCM limit = me->get_grob_property ("expand-limit");
   if (measures <= 0)
     return Molecule();
+  
 
+  SCM limit = me->get_grob_property ("expand-limit");
   if (measures > gh_scm2int (limit))
     {
       Real padding = 0.15;  
@@ -168,19 +163,32 @@ Multi_measure_rest::symbol_molecule (Grob *me, Real space)
   Font_metric *musfont
     = Font_interface::get_font (me,style_chain);
 
+  SCM sml = me->get_grob_property ("use-breve-rest");
+
   if (measures == 1)
     {
-      Molecule s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
+      if (sml == SCM_BOOL_T)
+       {
+         Molecule s = musfont->find_by_name (Rest::glyph_name (me, -1, ""));
+
+         s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS);
+      
+         return s ;
+       }
+      else
+       {
+         Molecule s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
 
-      /*
-       ugh.
-       */
-      if (Staff_symbol_referencer::position_f (me) == 0.0)
-       s.translate_axis (staff_space, Y_AXIS);
+         /*
+           ugh.
+          */
+         if (Staff_symbol_referencer::get_position (me) == 0.0)
+           s.translate_axis (staff_space, Y_AXIS);
 
-      s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS);
+         s.translate_axis ((space - s.extent (X_AXIS).length ())/2, X_AXIS);
       
-      return s ;
+         return s ;
+        }
     }
   else
     {
@@ -196,7 +204,7 @@ Multi_measure_rest::big_rest (Grob *me, Real width)
   Real thick = gh_scm2double (me->get_grob_property ("thickness"));
   Real ss = Staff_symbol_referencer::staff_space (me);
   
-  Real slt = me->paper_l ()->get_var ("stafflinethickness");
+  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;
@@ -227,40 +235,69 @@ Multi_measure_rest::church_rest (Grob*me, Font_metric *musfont, int measures,
   int l = measures;
   int count = 0;
   Real symbols_width = 0.0;
+
+  SCM sml = me->get_grob_property ("use-breve-rest");
+
   while (l)
     {
-      int k;
-      if (l >= 4)
+      if (sml == SCM_BOOL_T)
        {
-         l-=4;
-         k = -2;
+         int k;
+         if (l >= 2)
+           {
+             l-=2;
+             k = -2;
+           }
+         else
+           {
+             l -= 1;
+             k = -1;
+           }
+
+         Molecule r (musfont->find_by_name ("rests-" + to_string (k)));
+         symbols_width += r.extent (X_AXIS).length ();
+         mols = gh_cons (r.smobbed_copy (), mols);
        }
-      else if (l>= 2)
+       else
        {
-         l -= 2;
-         k = -1;
+         int k;
+         if (l >= 4)
+           {
+             l-=4;
+             k = -2;
+           }
+         else if (l>= 2)
+           {
+             l -= 2;
+             k = -1;
+           }
+         else
+           {
+             k = 0;
+             l --;
+           }
+
+         Molecule r (musfont->find_by_name ("rests-" + to_string (k)));
+         if (k == 0)
+           {
+             Real staff_space = Staff_symbol_referencer::staff_space (me);
+             r.translate_axis (staff_space, Y_AXIS);
+           }
+         symbols_width += r.extent (X_AXIS).length ();
+         mols = gh_cons (r.smobbed_copy (), mols);
        }
-      else
-       {
-         k = 0;
-         l --;
-       }
-
-      Molecule r (musfont->find_by_name ("rests-" + to_str (k)));
-      if (k == 0)
-       {
-         Real staff_space = Staff_symbol_referencer::staff_space (me);
-         r.translate_axis (staff_space, Y_AXIS);
-       }
-      symbols_width += r.extent (X_AXIS).length ();
-      mols = gh_cons (r.smobbed_copy (), mols);
       count ++;
     }
 
+  
 
   Real outer_padding_factor = 1.5; //     make outer padding this much bigger.
   Real inner_padding = (space - symbols_width) / (2 * outer_padding_factor + (count-1)); 
-
+  if (inner_padding < 0)
+    {
+      inner_padding = 1.0;
+    }
+  
   Molecule mol; 
   for (SCM  s = mols; gh_pair_p (s); s = gh_cdr(s))
     {
@@ -295,13 +332,15 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
       return SCM_UNSPECIFIED;
     }
 
-  Item * l = sp->get_bound (LEFT)->column_l ();
-  Item * r = sp->get_bound (RIGHT)->column_l ();
+  Item * l = sp->get_bound (LEFT)->get_column ();
+  Item * r = sp->get_bound (RIGHT)->get_column ();
   Item * lb = l->find_prebroken_piece (RIGHT);
   Item * rb = r->find_prebroken_piece (LEFT);      
   
   Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
-  Real staff_space = Staff_symbol_referencer::staff_space (me);
+
+  Real sym_width = symbol_molecule (me, 0.0).extent (X_AXIS).length ();
+  
   for (int i=0; i < 4; i++)
     {
       Item * l =  combinations[i][0];
@@ -313,8 +352,10 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
       Rod rod;
       rod.item_l_drul_[LEFT] = l;
       rod.item_l_drul_[RIGHT] = r;
-      rod.distance_f_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
-       + 4.0;                  // magic!
+
+      
+      rod.distance_ = l->extent (l, X_AXIS)[BIGGER] - r->extent (r, X_AXIS)[SMALLER]
+       + sym_width  + 2.0;                     // 2.0 = magic!
   
       rod.add_to_cols ();
     }
@@ -329,4 +370,4 @@ numbers, fields from font-interface may be used.
 
 
 ",
-  "thickness measure-count expand-limit");
+  "expand-limit measure-count number-threshold padding thickness use-breve-rest");