From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 5 Sep 2004 21:48:30 +0000 (+0000)
Subject: * lily/lookup.cc (triangle): translate by interval.
X-Git-Tag: release/2.3.15~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2250af974de9a3b7e4cff2743fe52f2fde1730ed;p=lilypond.git

* lily/lookup.cc (triangle): translate by interval.

* scm/page-layout.scm (ly:optimal-page-breaks): typo.

* input/regression/quote-cyclic.ly (Module): new file.

* input/regression/key-signature-cancellation.ly (Module): new file.
---

diff --git a/ChangeLog b/ChangeLog
index 83b8310c14..7be0283c96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-09-05  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* lily/lookup.cc (triangle): translate by interval.
+
+	* VERSION (PACKAGE_NAME): release 2.3.14
+
 	* Documentation/user/changing-defaults.itely (Page layout): add
 	betweensystempadding
 
diff --git a/lily/lookup.cc b/lily/lookup.cc
index 242260d676..63c37a2c97 100644
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -695,7 +695,9 @@ Lookup::triangle (Interval iv, Real thick, Real protude)
 		      scm_make_real (iv.length ()), 
 		      scm_make_real (protude), SCM_UNDEFINED);
 
-  return Stencil (b, s);
+  Stencil stc (b, s);
+  stc.translate_axis (iv[LEFT], X_AXIS);
+  return stc;  
 }
 
 
diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc
index 96eecb164c..b603c76685 100644
--- a/lily/measure-grouping-spanner.cc
+++ b/lily/measure-grouping-spanner.cc
@@ -20,9 +20,6 @@ Measure_grouping::print (SCM grob)
 {
   Spanner * me = dynamic_cast<Spanner*> (unsmob_grob (grob));
 
-  /*
-    TODO: robustify.
-   */
   SCM which = me->get_property ("style");
   Real height = robust_scm2double (me->get_property ("height"), 1);
 
@@ -30,15 +27,15 @@ Measure_grouping::print (SCM grob)
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT),
 						       X_AXIS);
 
-  Interval rext = me->get_bound (RIGHT)->extent (common, X_AXIS);
-  Real w =robust_relative_extent (me->get_bound (RIGHT),
-				  common, X_AXIS).linear_combination (CENTER);
-    - me->get_bound (LEFT)->relative_coordinate (common, X_AXIS);
+  Real right_point = robust_relative_extent (me->get_bound (RIGHT),
+					     common, X_AXIS).linear_combination (CENTER);
+  Real left_point = me->get_bound (LEFT)->relative_coordinate (common, X_AXIS);
 
-  Interval iv (0,w);
 
+  
+  Interval iv (left_point, right_point);
   Stencil m;
-
+  
   /*
     TODO: use line interface
    */
@@ -52,11 +49,12 @@ Measure_grouping::print (SCM grob)
     }
 
   m.align_to (Y_AXIS, DOWN);
+  m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);
   return m.smobbed_copy ();
 }
 
 ADD_INTERFACE (Measure_grouping,"measure-grouping-interface",
-	       "This objectt indicates groups of beats. "
+	       "This object indicates groups of beats. "
 	       "Valid choices for @code{style} are @code{bracket} and @code{triangle}.",
 	       "thickness style height");
 
diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index 5c2834b478..c083f476d9 100644
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -311,7 +311,7 @@ is what have collected so far, and has ascending page numbers."
 	       (cdr  result)))
 	 )
 
-     (if #t ;; debug.
+     (if #f ;; debug.
 	 (begin
 	   (display (list "\n# systems: " no-systems
 			  "\nreal-ext" real-extents "\nstaff-ext" staff-extents