*** empty log message ***

[lilypond.git] / lily / ottava-bracket.cc

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index 2e991f7ec0924802105a4a68d9cf9413c3b7523e..985fa41120e16d7c09f722812f5e246fc80b6f2e 100644 (file)
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -7,50 +7,44 @@
 
  */
 
-#include "molecule.hh"
 #include "text-item.hh"
-#include "text-spanner.hh"
 #include "line-spanner.hh"
 #include "spanner.hh"
 #include "font-interface.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "warn.hh"
 #include "paper-column.hh"
 #include "staff-symbol-referencer.hh"
 #include "note-column.hh"
 #include "directional-element-interface.hh"
 #include "tuplet-bracket.hh"
+#include "rhythmic-head.hh"
 
 struct Ottava_bracket
 {
-  DECLARE_SCHEME_CALLBACK (brew_molecule, (SCM));
+  DECLARE_SCHEME_CALLBACK (print, (SCM));
   static bool has_interface (Grob*);
 };
 
 
 /*
   TODO: the string for ottava shoudl depend on the available space, ie.
-
   
   Long: 15ma        Short: 15ma    Empty: 15
          8va                8va            8
          8va bassa          8ba            8
 
 */
-
-MAKE_SCHEME_CALLBACK (Ottava_bracket, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Ottava_bracket, print, 1);
 SCM
-Ottava_bracket::brew_molecule (SCM smob)
+Ottava_bracket::print (SCM smob)
 {
   Spanner*me  = dynamic_cast<Spanner*> (unsmob_grob (smob));
-  
-  
   Interval span_points;
   
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Paper_def * paper = me->get_paper();
-
+  Output_def * layout = me->get_layout ();
   
   Drul_array<bool> broken;
   Direction d = LEFT;
@@ -61,19 +55,27 @@ Ottava_bracket::brew_molecule (SCM smob)
 
       if (Note_column::has_interface (b))
        {
-         common = common_refpoint_of_list (b->get_grob_property ("heads"), common, X_AXIS);
+         SCM heads = b->get_property ("note-heads");
+         common = common_refpoint_of_list (heads, common, X_AXIS);
+         for (SCM s = heads; scm_is_pair (s); s = scm_cdr (s))
+           {
+             Grob * h = unsmob_grob (scm_car (s));
+             Grob * dots = Rhythmic_head::get_dots (h);
+             if (dots)
+               common = dots->common_refpoint (common, X_AXIS);
+           }
        }
     }
   while (flip (&d) != LEFT);
 
-  SCM properties = Font_interface::font_alist_chain (me);
-  SCM markup = me->get_grob_property ("text");
-  Molecule text;
-  if (Text_item::markup_p (markup)) 
-    text = *unsmob_molecule (Text_item::interpret_markup (paper->self_scm (), properties, markup));
+  SCM properties = Font_interface::text_font_alist_chain (me);
+  SCM markup = me->get_property ("text");
+  Stencil text;
+  if (Text_interface::markup_p (markup)) 
+    text = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, markup));
 
 
-  Drul_array<Real> shorten = robust_scm2interval (me->get_grob_property ("shorten-pair"),
+  Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
                                                  Interval (0,0));
 
 
@@ -88,17 +90,32 @@ Ottava_bracket::brew_molecule (SCM smob)
       Interval ext;
       if (Note_column::has_interface (b))
        {
-         for (SCM s = b->get_grob_property ("note-heads"); gh_pair_p (s); s =gh_cdr (s))
-           ext.unite (unsmob_grob (gh_car (s))->extent (common, X_AXIS));
+         for (SCM s = b->get_property ("note-heads"); scm_is_pair (s); s = scm_cdr (s))
+           {
+             Grob * h = unsmob_grob (scm_car (s));
+             ext.unite (h->extent (common, X_AXIS));
+             Grob * dots = Rhythmic_head::get_dots (h);
+
+             if (dots && d == RIGHT)
+               {
+                 ext.unite (dots->extent (common, X_AXIS));  
+               }
+           }
        }
-
-      if (ext.is_empty ())
-       ext = Interval (0,0);
       
-      span_points[d] =  (broken [d]) ? b->extent (common, X_AXIS)[-d] : ext[d];
+      if (ext.is_empty ())
+       {
+         ext = robust_relative_extent (b, common, X_AXIS);
+       }
 
       if (broken[d])
-       shorten [d] = 0.0; 
+       {
+         span_points[d] = b->extent (common, X_AXIS)[RIGHT];
+         shorten[d] = 0.;
+       }
+           
+      else
+       span_points[d] = ext[d];
     }
   while (flip (&d) != LEFT);
 
@@ -111,16 +128,16 @@ Ottava_bracket::brew_molecule (SCM smob)
   
   span_points[LEFT] = span_points[LEFT]
     <? (span_points[RIGHT] - text_size
-       - robust_scm2double (me->get_grob_property ("minimum-length"), -1.0)); 
+       - robust_scm2double (me->get_property ("minimum-length"), -1.0)); 
   
   Interval bracket_span_points = span_points;
   bracket_span_points[LEFT] += text_size;
   
-  Drul_array<Real> edge_height = robust_scm2interval (me->get_grob_property ("edge-height"),
+  Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
                                                      Interval (1.0, 1.0));
 
   
-  Drul_array<Real> flare = robust_scm2interval (me->get_grob_property ("bracket-flare"),
+  Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
                                                Interval (0,0));
 
 
@@ -130,12 +147,13 @@ Ottava_bracket::brew_molecule (SCM smob)
   if (broken[RIGHT])
     edge_height[RIGHT] = 0.0;
   
-  Molecule b;
+  Stencil b;
+  Interval empty;
   if (!bracket_span_points.is_empty () && bracket_span_points.length () > 0.001)
     b = Tuplet_bracket::make_bracket (me,
                                      Y_AXIS, Offset (bracket_span_points.length (), 0),
                                       edge_height,
-                                     0.0,
+                                     empty,
                                      flare, shorten);
 
   /*
@@ -146,16 +164,21 @@ Ottava_bracket::brew_molecule (SCM smob)
        |
        |
        
-   */
+
+    Just a small amount, yes.  In tight situations, it is even
+    possible to center the `8' directly below the note, dropping the
+    ottava line completely...
+
+  */
   
-  b = Molecule (Box (b.extent (X_AXIS),
+  b = Stencil (Box (b.extent (X_AXIS),
                     Interval (0.1,0.1)),
-               b.get_expr ());
+               b.expr ());
   
   b.translate_axis (bracket_span_points[LEFT], X_AXIS);
   text.translate_axis (span_points[LEFT], X_AXIS);
   text.align_to (Y_AXIS, CENTER);
-  b.add_molecule (text);
+  b.add_stencil (text);
   
   b.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);