Doc-hu: Updated macros for web

[lilypond.git] / lily / constrained-breaking.cc

diff --git a/lily/constrained-breaking.cc b/lily/constrained-breaking.cc
index dcef2208e336e619396ab7103d255b52fd071289..fdcd64586600f5c3c50cfc66c2f169f390393e54 100644 (file)
--- a/lily/constrained-breaking.cc
+++ b/lily/constrained-breaking.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2010 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2006--2011 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -398,13 +398,13 @@ Constrained_breaking::initialize ()
 
   Page_layout_problem::read_spacing_spec (spacing_spec,
                                          &system_system_space_,
-                                         ly_symbol2scm ("space"));
+                                         ly_symbol2scm ("basic-distance"));
   Page_layout_problem::read_spacing_spec (page_breaking_spacing_spec,
                                          &system_system_space_,
-                                         ly_symbol2scm ("space"));
+                                         ly_symbol2scm ("basic-distance"));
   Page_layout_problem::read_spacing_spec (title_spec,
                                          &system_markup_space_,
-                                         ly_symbol2scm ("space"));
+                                         ly_symbol2scm ("basic-distance"));
 
   Page_layout_problem::read_spacing_spec (spacing_spec,
                                          &system_system_padding_,
@@ -543,8 +543,8 @@ Line_details::Line_details (Prob *pb, Output_def *paper)
   title_min_distance_ = 0;
   space_ = 0;
   title_space_ = 0;
-  Page_layout_problem::read_spacing_spec (spec, &space_, ly_symbol2scm ("space"));
-  Page_layout_problem::read_spacing_spec (title_spec, &title_space_, ly_symbol2scm ("space"));
+  Page_layout_problem::read_spacing_spec (spec, &space_, ly_symbol2scm ("basic-distance"));
+  Page_layout_problem::read_spacing_spec (title_spec, &title_space_, ly_symbol2scm ("basic-distance"));
   Page_layout_problem::read_spacing_spec (spec, &padding_, ly_symbol2scm ("padding"));
   Page_layout_problem::read_spacing_spec (title_spec, &title_padding_, ly_symbol2scm ("padding"));
   Page_layout_problem::read_spacing_spec (spec, &min_distance_, ly_symbol2scm ("minimum-distance"));
@@ -589,6 +589,18 @@ Line_details::tallness () const
   return tallness_;
 }
 
+Real
+Line_details::spring_length (Line_details const &next_line) const
+{
+  // space_ measures the spring which goes from the bottom refpoint
+  // of this to the top refpoint of next_line. We want to return
+  // the stretchable space between the bottom of this's extent to
+  // the top of next_line's extent.
+  Real refpoint_dist = tallness_ + refpoint_extent_[DOWN] - next_line.refpoint_extent_[UP];
+  Real space = next_line.title_ ? title_space_ : space_;
+  return max (0.0, space - refpoint_dist);
+}
+
 Line_shape::Line_shape (Interval begin, Interval rest)
 {
   begin_ = begin;