CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/05 14:04:53
Modified files:
. : ChangeLog
Documentation/topdocs: NEWS.tely
input : GNUmakefile
lily : tuplet-bracket.cc
Added files:
input : proportional.ly
Log message:
* input/proportional.ly: new file.
* lily/tuplet-bracket.cc (after_line_breaking): don't suicide if
columns is empty
* lily/tuplet-bracket.cc (print): on the left, the overshoot is
relative to the right edge of the prefatory matter.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3965&tr2=1.3966&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/proportional.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/GNUmakefile.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tuplet-bracket.cc.diff?tr1=1.94&tr2=1.95&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3965 lilypond/ChangeLog:1.3966
--- lilypond/ChangeLog:1.3965 Fri Aug 5 13:44:35 2005
+++ lilypond/ChangeLog Fri Aug 5 14:04:53 2005
@@ -1,5 +1,7 @@
2005-08-05 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * input/proportional.ly: new file.
+
* lily/tuplet-bracket.cc (after_line_breaking): don't suicide if
columns is empty
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.56
lilypond/Documentation/topdocs/NEWS.tely:1.57
--- lilypond/Documentation/topdocs/NEWS.tely:1.56 Fri Aug 5 13:53:14 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Fri Aug 5 14:04:53 2005
@@ -43,6 +43,7 @@
allowBeamBreak = ##t
}
{
+ \set Score.proportionalNotationDuration = #(ly:make-moment 1 32)
\set tupletFullLength = ##t
\times 2/3 { c8[ c c] }
c4
@@ -55,7 +56,7 @@
When @code{strict-note-spacing} is set, note are spaced without regard
for clefs, bar lines and grace notes. For example,
[EMAIL PROTECTED],verbatim,relative=2]
[EMAIL PROTECTED],relative=2]
\override Score.SpacingSpanner #'strict-note-spacing = ##t
\new Staff { c8[ c \clef alto c \grace { c16[ c] } c8 c c] c32[ c32] }
@end lilypond
@@ -65,7 +66,7 @@
@item
Beams support the @code{break-overshoot} property, for example
[EMAIL PROTECTED],fragment,verbatim]
[EMAIL PROTECTED],fragment]
\set allowBeamBreak = ##t
\override Beam #'break-overshoot = #'(1.0 . 2.0)
c2.. c8[ \break c]
@@ -78,7 +79,7 @@
to their time-difference, by assigning a duration. to
@code{proportionalNotationDuration}. For example,
[EMAIL PROTECTED],relative=2,fragment,raggedright]
[EMAIL PROTECTED],fragment,raggedright]
<<
\set Score.proportionalNotationDuration = #(ly:make-moment 1 16)
\new Staff { c8[ c c c c c] c4 c2 r2 }
@@ -94,7 +95,7 @@
@code{SpacingSpanner} grob is set,
[EMAIL PROTECTED],relative=2,fragment]
[EMAIL PROTECTED],fragment]
<<
\override Score.SpacingSpanner #'uniform-stretching = ##t
\new Staff { c16[ c c c c c c c c c16] }
@@ -110,7 +111,7 @@
@item
Tuplet brackets get arrows when they are broken across a line.
[EMAIL PROTECTED],raggedright,verbatim,relative=2]
[EMAIL PROTECTED],raggedright,relative=2]
\times 4/5 {
c c c \bar "empty" \break c c
}
@@ -137,7 +138,7 @@
@item
Nested tuplets are automatically positioned,
[EMAIL PROTECTED],raggedright,verbatim,relative=2]
[EMAIL PROTECTED],raggedright,relative=2]
\set tupletNumberFormatFunction = #fraction-tuplet-formatter
\times 4/6 {
a4 a
Index: lilypond/input/GNUmakefile
diff -u lilypond/input/GNUmakefile:1.49 lilypond/input/GNUmakefile:1.50
--- lilypond/input/GNUmakefile:1.49 Sun Mar 27 19:08:11 2005
+++ lilypond/input/GNUmakefile Fri Aug 5 14:04:53 2005
@@ -2,7 +2,7 @@
SUBDIRS = test regression tutorial no-notation mutopia
-examples = typography-demo les-nereides puer-fragment wilhelmus sakura-sakura
+examples = typography-demo les-nereides puer-fragment wilhelmus sakura-sakura
proportional
#xiao-haizi-guai-guai
LOCALSTEPMAKE_TEMPLATES=ly mutopia
Index: lilypond/lily/tuplet-bracket.cc
diff -u lilypond/lily/tuplet-bracket.cc:1.94
lilypond/lily/tuplet-bracket.cc:1.95
--- lilypond/lily/tuplet-bracket.cc:1.94 Fri Aug 5 13:44:36 2005
+++ lilypond/lily/tuplet-bracket.cc Fri Aug 5 14:04:53 2005
@@ -175,9 +175,10 @@
{
x_span[d] = robust_relative_extent (bounds[d], commonx, X_AXIS)[d];
Direction break_dir = bounds[d]->break_status_dir ();
+ Spanner *orig_spanner = dynamic_cast<Spanner*> (me->original_);
connect_to_other[d]
= (break_dir
- && (me->get_break_index() - break_dir < me->broken_intos_.size()));
+ && (me->get_break_index() - break_dir <
orig_spanner->broken_intos_.size()));
if (connect_to_other[d])
{
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
