CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/05 17:17:28
Modified files:
. : ChangeLog
input : GNUmakefile proportional.ly
lily : spacing-loose-columns.cc
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3968&tr2=1.3969&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/GNUmakefile.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/proportional.ly.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/spacing-loose-columns.cc.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3968 lilypond/ChangeLog:1.3969
--- lilypond/ChangeLog:1.3968 Fri Aug 5 16:04:39 2005
+++ lilypond/ChangeLog Fri Aug 5 17:17:28 2005
@@ -1,5 +1,7 @@
2005-08-05 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/spacing-loose-columns.cc (set_loose_columns): use
robust_relative_extent().
+
* Documentation/topdocs/NEWS.tely (Top): add Nicolas as
contributor.
Index: lilypond/input/GNUmakefile
diff -u lilypond/input/GNUmakefile:1.50 lilypond/input/GNUmakefile:1.51
--- lilypond/input/GNUmakefile:1.50 Fri Aug 5 14:04:53 2005
+++ lilypond/input/GNUmakefile Fri Aug 5 17:17:28 2005
@@ -2,7 +2,7 @@
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
Index: lilypond/input/proportional.ly
diff -u lilypond/input/proportional.ly:1.2 lilypond/input/proportional.ly:1.3
--- lilypond/input/proportional.ly:1.2 Fri Aug 5 15:28:15 2005
+++ lilypond/input/proportional.ly Fri Aug 5 17:17:28 2005
@@ -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 @@
\break \time 4/8
\skip 1 \break \time 4/8
+ \skip 2 \time 1/8
}
{
@@ -79,10 +85,16 @@
}
}
>>
- \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 @@
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.
+ >>
>>
Index: lilypond/lily/spacing-loose-columns.cc
diff -u lilypond/lily/spacing-loose-columns.cc:1.7
lilypond/lily/spacing-loose-columns.cc:1.8
--- lilypond/lily/spacing-loose-columns.cc:1.7 Fri Aug 5 13:44:36 2005
+++ lilypond/lily/spacing-loose-columns.cc Fri Aug 5 17:17:28 2005
@@ -129,9 +129,9 @@
}
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;
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
