CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/05 19:37:15
Modified files:
. : ChangeLog
input : proportional.ly
lily : beam.cc
Log message:
* lily/beam.cc (rest_collision_callback): call position_beam() if
necessary.
* input/proportional.ly: new file.
* lily/beam.cc (print): read break-overshoot to determine where to
stop/start broken beams.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3970&tr2=1.3971&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/proportional.ly.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam.cc.diff?tr1=1.307&tr2=1.308&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3970 lilypond/ChangeLog:1.3971
--- lilypond/ChangeLog:1.3970 Fri Aug 5 18:18:15 2005
+++ lilypond/ChangeLog Fri Aug 5 19:37:14 2005
@@ -1,5 +1,8 @@
2005-08-05 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/beam.cc (rest_collision_callback): call position_beam() if
+ necessary.
+
* input/regression/spacing-uniform-stretching.ly: new file.
* lily/spacing-loose-columns.cc (set_loose_columns): use
robust_relative_extent().
Index: lilypond/input/proportional.ly
diff -u lilypond/input/proportional.ly:1.4 lilypond/input/proportional.ly:1.5
--- lilypond/input/proportional.ly:1.4 Fri Aug 5 18:16:46 2005
+++ lilypond/input/proportional.ly Fri Aug 5 19:37:15 2005
@@ -39,7 +39,7 @@
\relative c''
\new StaffGroup <<
- \new \staffKind <<
+ \new \staffKind \new Voice <<
{
\skip 2
\skip 2
@@ -59,6 +59,16 @@
\times 5/4 {
c16 c c] r32[ c32 c16 c] r8 }
}
+ \times 10/12 {
+ \times 7/6 {
+ r32[ c16. c32 c16.] r4
+ r16[ c16 c16. c32
+ }
+ \times 5/8 {
+ c16 c16 c16. c32] r8 c8[ c8] r4.
+ }
+ }
+ %{
\times 10/12 {
\times 7/6 {
r32[ c32. c16 c16.] r4
@@ -68,6 +78,7 @@
c16 c c16. c32] r8 c8[ c] r4
}
}
+ %}
\times 4/7 {
r8
@@ -86,7 +97,7 @@
}
}
>>
- \new \staffKind
+ \new \staffKind \new Voice
<<
{
\times 9/5 {
@@ -108,7 +119,7 @@
}
}
\times 10/12 {
- \times 7/9 {
+ \times 7/10 {
c16 c16 c8] r8 r4
r8.[ c32 c16 c r8 c16 c16
}
Index: lilypond/lily/beam.cc
diff -u lilypond/lily/beam.cc:1.307 lilypond/lily/beam.cc:1.308
--- lilypond/lily/beam.cc:1.307 Fri Aug 5 10:42:22 2005
+++ lilypond/lily/beam.cc Fri Aug 5 19:37:15 2005
@@ -1299,6 +1299,15 @@
SCM s = beam->get_property ("positions");
if (scm_is_pair (s) && scm_is_number (scm_car (s)))
pos = ly_scm2interval (s);
+ else
+ {
+ /*
+ UGH. TODO: fix dependency tracking.
+ */
+ position_beam (beam);
+ pos = ly_scm2interval (beam->get_property ("positions"));
+ }
+
Real staff_space = Staff_symbol_referencer::staff_space (rest);
scale_drul (&pos, staff_space);
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
