release: 0.1.45

[lilypond.git] / lily / lookup.cc

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 8fa26797224dc7681ccbd027b072523c598f1a80..da4083afe6466b48b184662db60bfe071df2283b 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -8,7 +8,7 @@
   TODO
   This doth suck. We should have PS output, and read spacing info from TFMs
 
-  Glissando, bracket
+  Glissando, 
 
 */
 
@@ -157,17 +157,18 @@ Lookup::streepje (int type) const
 }
 
 Atom
-Lookup::hairpin (Real &wid, bool decresc) const
+Lookup::hairpin (Real &wid, bool decresc, bool continued) const
 {
   bool embedded_b = postscript_global_b;
   String embed;
   Atom ret;  
   if (embedded_b)
     {
-      Real height = 2 PT;
+      Real height = paper_l_->get_var ("barsize") / 6;
       embed = "\\embeddedps{\n" ;
       embed += String (wid) + " " 
-       + String (height)
+       + String (height) + " " 
+       + String (continued ? height/2 : 0) + 
        + " draw_"  + String(decresc ? "de" : "") + "cresc}\n";
       ret.tex_ = embed;
     }
@@ -191,6 +192,7 @@ Lookup::hairpin (Real &wid, bool decresc) const
     }
   
   ret.dim_.x() = Interval (0,wid);
+  // ret.translate_axis (-ret.dim_[Y_AXIS][DOWN], Y_AXIS);
   return ret;
 }
 
@@ -236,7 +238,7 @@ Lookup::vbrace (Real &y) const
   Interval ydims = brace.dim_[Y_AXIS];
   Real min_y = ydims[LEFT];
   Real max_y = ydims[RIGHT];
-  Real step = 2.0 PT;
+  Real step = 1.0 PT;
  
   if (y < min_y)
     {