From: Joe Neeman <joeneeman@gmail.com>
Date: Mon, 4 Sep 2006 05:51:14 +0000 (+0000)
Subject: The last commit was an accident. Revert 3 files that shouldn't have been
X-Git-Tag: cvs/HEAD~101
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=97759ace2c13860488de4e9498607adac8d20963;p=lilypond.git

The last commit was an accident. Revert 3 files that shouldn't have been
committed. (And here's the missing commit log):

	* lily/simple-spacer.cc (get_line_forces): Ignore loose columns
	unless they are breakable. This fixes discrepancies between the forces
	calculated here and the forces calculated in get_line_configuration.

	* lily/grob.cc (pure_relative_y_coordinate): fix some
	mis-estimation that was happening with piano staves.

	* lily/constrained-breaking.cc (resize): don't choke if we get a
	measure that won't fit on a line.
	(combine_demerits): don't consider uniformity when ragged

	* lily/page-spacing.cc (solve): why the f* were there two of these?
	(calc_subproblem): properly handle the case where a system is taller
	than the page.

	* lily/system.cc (get_paper_system): ensure that all the permissions
	and penalties are passed to the paper systems.

	* lily/page-breaking.cc (create_system_list): support system-count.

	* scm/define-grobs.scm (pure-print-callbacks): add
	ly:script-interface::print

	* lily/page-spacing.cc (min_page_count): fix calculation of min
	pages if we are ragged and there are non-zero springs.

	* scm/layout-page-layout.scm: if the pure-height estimates are under
	the real height, allow space-systems to ignore padding if it is
	needed in order to fit the systems on one page

	* lily/optimal-page-breaking.cc (try_page_spacing): fix reading
	ragged properties
	(solve): fix performance problem. Make sure we always get at least
	one solution

	* lily/page-breaking.cc (make_pages): include write-page-breaks
	and page-stencil

	* lily/paper-score.cc (calc_breaking): remove Gourlay breaker

	* scm/define-grobs.scm: add the new slur-callback
	fix pure-relevant to not exclude grobs whose extent is already
	calculated

	* ly/paper-defaults.ly: make ly:optimal-breaking the new default
	page breaker

	* lily/slur.cc (pure_height): new callback to estimate the height
	of a slur
---

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 8700da3e54..1d509f04d1 100644
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -145,14 +145,7 @@ Axis_group_interface::relative_pure_height (Grob *me,
 	{
 	  Interval dims = elts[i]->pure_height (common, start, end);
 	  if (!dims.is_empty ())
-	    {
-	      r.unite (dims);
-	      /*
-	      message (_f ("axis-group (%d-%d) %s has child %s with height (%.2f,%.2f), my height is now (%.2f,%.2f)",
-			   start, end,
-			   me->name ().c_str (), elts[i]->name ().c_str (), dims[DOWN], dims[UP], r[DOWN], r[UP]));
-	      */
-	    }
+	    r.unite (dims);
 	}
     }
   return r;
diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index a0ac54bda7..23b3c64785 100644
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -117,7 +117,9 @@ inline SCM ly_append4 (SCM x1, SCM x2, SCM x3, SCM x4)
 /*
   display and print newline.
 */
-void ly_display_scm (void *s);
+extern "C" {
+  void ly_display_scm (SCM s);
+}
 
 void read_lily_scm_file (string);
 void ly_c_init_guile ();
diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 064ed54fab..971063e54e 100644
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -114,12 +114,15 @@ gulp_file_to_string (string fn, bool must_exist, int size)
   return result;
 }
 
-void
-ly_display_scm (void *s)
-{
-  scm_display ((SCM)s, scm_current_output_port ());
-  scm_newline (scm_current_output_port ());
-}
+extern "C" {
+  // maybe gdb 5.0 becomes quicker if it doesn't do fancy C++ typing?
+  void
+  ly_display_scm (SCM s)
+  {
+    scm_display (s, scm_current_output_port ());
+    scm_newline (scm_current_output_port ());
+  }
+};
 
 string
 ly_scm2string (SCM str)