From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 16 Feb 2006 02:17:51 +0000 (+0000)
Subject: * scm/layout-page-layout.scm (optimal-page-breaks): only consider
X-Git-Tag: release/2.7.35~22
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=3e7b0379a6d0e741be2049e2947a2f8af07b5005;p=lilypond.git

* scm/layout-page-layout.scm (optimal-page-breaks): only consider
the force=10000 case if we don't have a current-best.

* lily/tuplet-bracket.cc (get_bounds): don't do (size() - 1) for
vsize

* flower/include/flower-proto.hh: remove outdated templates.

* scm/page.scm: use annotate-spacing
---

diff --git a/ChangeLog b/ChangeLog
index c5ac748e00..bf63a5424f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-02-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* scm/layout-page-layout.scm (optimal-page-breaks): only consider
+	the force=10000 case if we don't have a current-best. 
+
+	* lily/tuplet-bracket.cc (get_bounds): don't do (size() - 1) for
+	vsize 
+
+	* flower/include/flower-proto.hh: remove outdated templates.
+
+	* scm/page.scm: use annotate-spacing
+
 2006-02-15  Graham Percival  <gpermus@gmail.com>
 
 	* scm/translation-functions.scm: circle patch from Erlend, thanks!
diff --git a/flower/include/flower-proto.hh b/flower/include/flower-proto.hh
index 1e14a5b10c..cb8cb71bae 100644
--- a/flower/include/flower-proto.hh
+++ b/flower/include/flower-proto.hh
@@ -9,10 +9,6 @@
 
 char const *flower_version_str0 ();
 
-template<class T, class K> struct Assoc;
-template<class K, class V> struct Hash_table;
-template<class K, class V> struct Hash_table_iter;
-
 typedef unsigned char Byte;
 struct String_convert;
 
@@ -22,7 +18,6 @@ using namespace std;
 
 #include "real.hh"
 
-template<class T> struct Link_list;
 template<class T> struct Interval_t;
 template<class T> struct PQueue;
 
diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 8246f400f9..a0f6ab8588 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -438,16 +438,16 @@ Tuplet_bracket::get_bounds (Grob *me, Grob **left, Grob **right)
   while (l < columns.size () && Note_column::has_rests (columns[l]))
     l++;
 
-  vsize r = columns.size () - 1;
-  while (r >= l && Note_column::has_rests (columns[r]))
+  vsize r = columns.size ();
+  while (r > l && Note_column::has_rests (columns[r-1]))
     r--;
 
   *left = *right = 0;
 
-  if (l <= r)
+  if (l < r)
     {
       *left = columns[l];
-      *right = columns[r];
+      *right = columns[r-1];
     }
 }
 
diff --git a/python/convertrules.py b/python/convertrules.py
index 4f27a3c353..ad4ab9ae1d 100644
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2726,7 +2726,8 @@ def conv (str):
 		('ledgerlinethickness', 'ledger-line-thickness'),
 		('blotdiameter', 'blot-diameter'),
 		('staffheight', 'staff-height'),
-		('linewidth', 'line-width')
+		('linewidth', 'line-width'),
+		('annotatespacing', 'annotate-spacing')
 		]
 	
 	for (a,b)  in identifier_subs:
diff --git a/scm/layout-page-layout.scm b/scm/layout-page-layout.scm
index 8970bc1e3b..8370ea8a40 100644
--- a/scm/layout-page-layout.scm
+++ b/scm/layout-page-layout.scm
@@ -359,10 +359,12 @@ CURRENT-BEST is the best result sofar, or #f."
                            force user-penalty
 			   best-paths))
 
-           (better? (or
-                     (not current-best)
-                     (< total-penalty (page-penalty current-best))))
-           (new-best (if better?
+           (is-better (or
+		       (not current-best)
+		       (and
+			satisfied-constraints
+			(< total-penalty (page-penalty current-best)))))
+           (new-best (if is-better
 			 (begin
 			   (map
 			    (lambda (x)
@@ -387,7 +389,7 @@ CURRENT-BEST is the best result sofar, or #f."
             "\nuser pen " user-penalty
 	    "\nsatisfied-constraints" satisfied-constraints
 	    "\nlast? " last? "ragged?" ragged?
-            "\nbetter? " better? " total-penalty " total-penalty "\n"
+            "\nis-better " is-better " total-penalty " total-penalty "\n"
 	    "\nconfig " positions
             "\nforce " force
 	    "\nlines: " current-lines "\n")))
diff --git a/scm/page.scm b/scm/page.scm
index 653c373085..9274eef3fd 100644
--- a/scm/page.scm
+++ b/scm/page.scm
@@ -32,7 +32,7 @@
 
 
 (define (annotate? layout)
-  (eq? #t (ly:output-def-lookup layout 'annotatespacing)))
+  (eq? #t (ly:output-def-lookup layout 'annotate-spacing)))
 
 
 (define page-module (current-module))