* lily/spacing-loose-columns.cc (set_loose_columns): use robust_relative_extent().

* input/proportional.ly: new file.

* lily/spacing-loose-columns.cc (set_loose_columns): space a whole
clique of loose columns, eg. a set of grace notes in strict
notespacing.

diff --git a/ChangeLog b/ChangeLog
index 5461b097276364243010ceb6369509b2979bd42b..b331bda9bff94785ee32096d339e1a443509c112 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-08-05  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/spacing-loose-columns.cc (set_loose_columns): use robust_relative_extent().
+
        * Documentation/topdocs/NEWS.tely (Top): add Nicolas as
        contributor.
 

diff --git a/input/GNUmakefile b/input/GNUmakefile
index 3de1c77c97aa5ef5786a19102176f7bfb7e328b9..a05252c6980228295db058cc6ae56847e16d6294 100644 (file)
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -2,7 +2,7 @@ depth = ..
 
 SUBDIRS = test regression tutorial no-notation mutopia 
 
-examples = typography-demo les-nereides puer-fragment wilhelmus sakura-sakura proportional
+examples = typography-demo les-nereides puer-fragment wilhelmus sakura-sakura 
 #xiao-haizi-guai-guai
 
 LOCALSTEPMAKE_TEMPLATES=ly mutopia

diff --git a/input/proportional.ly b/input/proportional.ly
index beaedbcf072ff04865119aaeeb1e15bcfd5d8bc8..787a63c0d2fabb109e84f6ad1203931d35030349 100644 (file)
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -21,9 +21,14 @@
     \override SpacingSpanner #'uniform-stretching = ##t
     \override SpacingSpanner #'strict-note-spacing = ##t
     proportionalNotationDuration = #(ly:make-moment 1 64)
-    \override TimeSignature #'break-visibility = #begin-of-line-visible
+    \override TimeSignature #'break-visibility = #end-of-line-invisible
     \override Beam #'break-overshoot = #'(-0.5 . 1.0)
-    
+  }
+  \context {
+
+    % we want over print if necessary.
+    \RhythmicStaff
+    \remove "Separating_line_group_engraver"
   }
 }
 
@@ -40,6 +45,7 @@ staffKind = "RhythmicStaff"
       \break \time 4/8
       
       \skip 1 \break \time 4/8
+      \skip 2 \time 1/8
     }
     
     {
@@ -79,10 +85,16 @@ staffKind = "RhythmicStaff"
     }
   }  
     >>
-  \new \staffKind {
+  \new \staffKind
+  <<
+  {
     \times 9/5 {
       r8. c16[ c c
-              \grace { c32[ c32] }
+              \grace {
+                \stemDown
+                c32[ c32]
+                \stemNeutral 
+              }
               c16 c c
       c 
     }
@@ -94,15 +106,21 @@ staffKind = "RhythmicStaff"
        c32[ c c16
       }
     }
-    c16 c16 c8] r8 r4
     \times 10/12 {
       \times 7/9 {
+       c16 c16 c8] r8 r4
         r8.[ c32 c16 c r8 c16 c16 
       }
       c16 c32 c32]
-      r4 r16
+      r4.
+      r16.[
+      c32 
     }
-  }  
+    c16 r16]
+
+  }
+  { \skip 2 * 6 } % filler space. 
+  >>
 >>
 
                 

diff --git a/lily/spacing-loose-columns.cc b/lily/spacing-loose-columns.cc
index 9eda23b1a1dff2379b0deadd41cd094fd01bb0e5..90e573667765134d5dfc1e7ceb786c7cbf493db9 100644 (file)
--- a/lily/spacing-loose-columns.cc
+++ b/lily/spacing-loose-columns.cc
@@ -129,9 +129,9 @@ set_loose_columns (System *which, Column_x_positions const *posns)
            }
          else
            {
-             Interval my_extent = col->extent (col, X_AXIS);
+             Interval my_extent = robust_relative_extent (col, col, X_AXIS);
              distance_to_next = my_extent[RIGHT] + default_padding;
-             right_point = finished_right_column->extent (common, X_AXIS)[LEFT];
+             right_point = robust_relative_extent (finished_right_column, common, X_AXIS)[LEFT];
            }
 
          Real my_offset = right_point - distance_to_next;