* lily/spacing-spanner.cc (calc_common_shortest_duration): use

callback to compute common shortest duration.

* lily/spacing-determine-loose-columns.cc (is_loose_column):
support float_grace_columns_.

* lily/spacing-options.cc (init_from_grob): new file.

* Documentation/topdocs/NEWS.tely (Top): doc tupletFullLengthNote.

* Documentation/topdocs/NEWS.tely (Top): document new feature.

diff --git a/ChangeLog b/ChangeLog
index 0d6ae510196fba5e7f81ddb8056a9b6b4e192366..7c50dca33880b16222149615f42f61e9ca8be313 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-20  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * lily/spacing-spanner.cc (calc_common_shortest_duration): use
+       callback to compute common shortest duration.
+
        * scm/define-grob-properties.scm (all-user-grob-properties): add
        strict-grace-spacing.
 

diff --git a/lily/include/moment.hh b/lily/include/moment.hh
index f0c6fbb21b79b418f11b65e0a74ac3c72c0bbf56..ac895e99eb07176f0d59411e1be35be7484cc8a1 100644 (file)
--- a/lily/include/moment.hh
+++ b/lily/include/moment.hh
@@ -50,6 +50,7 @@ public:
   static int compare (Moment const &, Moment const &);
   SCM as_scheme () const;
 };
+
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, +);
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, -);
 IMPLEMENT_ARITHMETIC_OPERATOR (Moment, /);

diff --git a/lily/spacing-options.cc b/lily/spacing-options.cc
index 7a038eb25b38fdd7da6fc85c47af952b5d64acc5..917980f5f81baab78ab0840fd81c72789eae5f7c 100644 (file)
--- a/lily/spacing-options.cc
+++ b/lily/spacing-options.cc
@@ -26,12 +26,13 @@ Spacing_options::init_from_grob (Grob *me)
 
 Spacing_options::Spacing_options ()
 {
-  increment_ = 1.2;
   packed_ = false;
   stretch_uniformly_ = false;
   float_nonmusical_columns_ = false;
   float_grace_columns_ = false;
+
   shortest_duration_space_ = 2.0;
+  increment_ = 1.2;
 
   global_shortest_ = Rational (1, 8);
 }

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 55e2a6ca3aab37b1017b5046988dcb71c9e8eaa3..77f3f07f3a2614347d6c350f168b67e950ca7faa 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -55,7 +55,7 @@ Spacing_spanner::set_springs (SCM smob)
   Spacing_options options;
   options.init_from_grob (me);
   options.global_shortest_ = robust_scm2moment (me->get_property ("common-shortest-duration"),
-                                               Moment (1,8)).main_part_;
+                                               Moment (Rational (1,8)).main_part_;
 
   prune_loose_columns (me, &all, &options);
   set_implicit_neighbor_columns (all);

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index f9f73c46061199cc4529066417bc08558d12c101..e0db11afd09c29156920550d8c293d3ab0eccb4d 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1355,6 +1355,7 @@
     (SpacingSpanner
      . (
        (springs-and-rods . ,ly:spacing-spanner::set-springs)
+       (common-shortest-duration , ly:spacing-spanner::calc-common-shortest-duration)
        (average-spacing-wishes . #t)
        (grace-space-factor . 0.6)
        (shortest-duration-space . 2.0)