CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/05 20:16:55
Modified files:
. : ChangeLog VERSION
Documentation/topdocs: NEWS.tely
input : GNUmakefile proportional.ly
lily : tuplet-bracket.cc
scm : define-grobs.scm
Log message:
* input/proportional.ly (staffKind): bugfix.
(staffKind): updates by Trevor Baca.
* scm/define-grobs.scm (all-grob-descriptions): remove arrows as
default layout.
* lily/tuplet-bracket.cc (print): check whether edge-text is a
pair.
* Documentation/topdocs/NEWS.tely (Top): add Nicolas as
contributor.
* 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.3971&tr2=1.3972&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.650&tr2=1.651&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.60&tr2=1.61&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/GNUmakefile.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/proportional.ly.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tuplet-bracket.cc.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.219&tr2=1.220&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3971 lilypond/ChangeLog:1.3972
--- lilypond/ChangeLog:1.3971 Fri Aug 5 19:37:14 2005
+++ lilypond/ChangeLog Fri Aug 5 20:16:55 2005
@@ -1,5 +1,14 @@
2005-08-05 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * input/proportional.ly (staffKind): bugfix.
+ (staffKind): updates by Trevor Baca.
+
+ * scm/define-grobs.scm (all-grob-descriptions): remove arrows as
+ default layout.
+
+ * lily/tuplet-bracket.cc (print): check whether edge-text is a
+ pair.
+
* lily/beam.cc (rest_collision_callback): call position_beam() if
necessary.
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.60
lilypond/Documentation/topdocs/NEWS.tely:1.61
--- lilypond/Documentation/topdocs/NEWS.tely:1.60 Fri Aug 5 16:38:50 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Fri Aug 5 20:16:55 2005
@@ -108,9 +108,14 @@
This feature was sponsored by Trevor Baca.
@item
-Tuplet brackets get arrows when they are broken across a line.
+Endings of broken tuplet brackets can be tuned. For example, you can
+add arrows to the brackets,
@lilypond[fragment,raggedright,relative=2]
+\override TupletBracket
+ #'edge-text = #(cons
+ (markup #:arrow-head X LEFT #f)
+ (markup #:arrow-head X RIGHT #f))
\times 4/5 {
c c c \bar "empty" \break c c
}
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.650 lilypond/VERSION:1.651
--- lilypond/VERSION:1.650 Tue Jul 26 22:24:30 2005
+++ lilypond/VERSION Fri Aug 5 20:16:55 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=7
-PATCH_LEVEL=4
+PATCH_LEVEL=5
MY_PATCH_LEVEL=
Index: lilypond/input/GNUmakefile
diff -u lilypond/input/GNUmakefile:1.51 lilypond/input/GNUmakefile:1.52
--- lilypond/input/GNUmakefile:1.51 Fri Aug 5 17:17:28 2005
+++ lilypond/input/GNUmakefile Fri Aug 5 20:16:55 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/input/proportional.ly
diff -u lilypond/input/proportional.ly:1.5 lilypond/input/proportional.ly:1.6
--- lilypond/input/proportional.ly:1.5 Fri Aug 5 19:37:15 2005
+++ lilypond/input/proportional.ly Fri Aug 5 20:16:55 2005
@@ -1,36 +1,37 @@
+\version "2.7.4"
+
\header
{
title = "Proportional notation"
+ copyright = "© 2005 Trevor BaÄa"
}
-\version "2.7.4"
-
-%% RhythmicStaff broken with 32nd rests ?
-
\layout
{
- indent = #0.0
- \context {
- \Voice
- \remove "Forbid_line_break_engraver"
- tupletNumberFormatFunction = #fraction-tuplet-formatter
- tupletFullLength = ##t
- allowBeamBreak = ##t
- }
- \context {
- \Score
- \override SpacingSpanner #'uniform-stretching = ##t
- \override SpacingSpanner #'strict-note-spacing = ##t
- proportionalNotationDuration = #(ly:make-moment 1 64)
- \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"
- }
+ indent = #0.0
+ \context {
+ \Voice
+ \remove "Forbid_line_break_engraver"
+ tupletNumberFormatFunction = #fraction-tuplet-formatter
+ tupletFullLength = ##t
+ allowBeamBreak = ##t
+ }
+ \context {
+ \Score
+ \override TupletBracket #'edge-text = #(cons
+ (markup #:arrow-head X LEFT #f)
+ (markup #:arrow-head X RIGHT #f))
+ \override SpacingSpanner #'uniform-stretching = ##t
+ \override SpacingSpanner #'strict-note-spacing = ##t
+ proportionalNotationDuration = #(ly:make-moment 1 64)
+ \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"
+ }
}
staffKind = "RhythmicStaff"
@@ -39,102 +40,87 @@
\relative c''
\new StaffGroup <<
- \new \staffKind \new Voice <<
- {
- \skip 2
- \skip 2
- \break \time 4/8
-
- \skip 1 \break \time 4/8
- \skip 2 \time 1/8
- }
-
- {
- \time 4/8
-
- \times 7/9 {
- \times 4/6 {
- r8 r32[ c c c c c c c] r4
- r32[ c32 c16 }
- \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.
- }
+ \new \staffKind <<
+ {
+ \skip 2
+ \skip 2
+ \break \time 4/8
+ \skip 1 \break \time 4/8
+ \skip 1 \break \time 4/8
}
- %{
- \times 10/12 {
- \times 7/6 {
- r32[ c32. c16 c16.] r4
- r16[ c16 c16. c32
- }
- \times 5/8 {
- c16 c c16. c32] r8 c8[ c] r4
- }
- }
- %}
- \times 4/7 {
- r8
- r16[ c16
- \times 5/4 {
- c16 r16 c8 c c
- }
- }
-
- \times 3/4 {
- c8]
- r16[ c
- \times 2/3 {
- c16 r16]
- r4 }
- }
- }
- >>
- \new \staffKind \new Voice
- <<
- {
- \times 9/5 {
- r8. c16[ c c
- \grace {
- \stemDown
- c32[ c32]
- \stemNeutral
- }
- c16 c c
- c
- }
- \times 4/7 {
- c16 c c c ]
- \times 5/4 {
- c16[ c32 c32]
- r4
- c32[ c c16
- }
+ {
+ \time 4/8
+
+ \times 7/9 {
+ \times 4/6 {
+ r8 c32[ c c c c c c c] r4
+ c32[ c32 c16 }
+ \times 5/4 {
+ c16 c c] c32[ c32 c16 c] r8 }
+ }
+
+\times 10/12 {
+ \times 7/6 {
+ c32[ c32 c8 c16] r4
+ c16[ c16 c16. c32
}
- \times 10/12 {
- \times 7/10 {
- c16 c16 c8] r8 r4
- r8.[ c32 c16 c r8 c16 c16
- }
- c16 c32 c32]
- r4.
- r16.[
- c32
+ \times 5/8 {
+ c16 c16 c16. c32] r8 c8[ c8] r4.
}
- c16 r16]
+}
- }
- { \skip 2 * 6 } % filler space.
- >>
->>
+ \times 4/7 {
+ r8
+ c16[ c16
+ \times 5/4 {
+ c16 r16 c8 c c
+ }
+ }
+
+ \times 3/4 {
+ c8]
+ c16[ c
+ \times 2/3 {
+ c16 c16]
+ r4 }
+ }
+ }
+ >>
+ \new \staffKind
+ <<
+ {
+ \times 9/5 {
+ r8. c16[ c c
+ \grace {
+ \stemDown
+ c32[ c32]
+ \stemNeutral
+ }
+ c16 c c
+ c
+ }
+ \times 4/7 {
+ c16 c c c ]
+ \times 5/4 {
+ c16[ c32 c32]
+ r4
+ c32[ c c16
+ }
+ }
+ \times 10/12 {
+ \times 7/10 {
+ c16 c16 c8] r4 c4
+ c16[ c8 c16 c16 r8 c16
+ }
+ c16 c32 c32]
+ r4.
+ c16.[
+ c32
+ }
+ c16 c16]
-
-
-
+ }
+ { \skip 2 * 6 } % filler space.
+ >>
+>>
Index: lilypond/lily/tuplet-bracket.cc
diff -u lilypond/lily/tuplet-bracket.cc:1.96
lilypond/lily/tuplet-bracket.cc:1.97
--- lilypond/lily/tuplet-bracket.cc:1.96 Fri Aug 5 14:11:13 2005
+++ lilypond/lily/tuplet-bracket.cc Fri Aug 5 20:16:55 2005
@@ -261,19 +261,22 @@
height[d] = 0.0;
flare[d] = 0.0;
shorten[d] = 0.0;
-
- SCM properties = Font_interface::text_font_alist_chain (me);
+
SCM edge_text = me->get_property ("edge-text");
- SCM text = index_get_cell (edge_text, d);
- if (Text_interface::is_markup (text))
+ if (scm_is_pair (edge_text))
{
- SCM t = Text_interface::interpret_markup (pap->self_scm (),
properties,
- text);
+ SCM properties = Font_interface::text_font_alist_chain (me);
+ SCM text = index_get_cell (edge_text, d);
+ if (Text_interface::is_markup (text))
+ {
+ SCM t = Text_interface::interpret_markup (pap->self_scm
(), properties,
+ text);
- Stencil *edge_text = unsmob_stencil (t);
- edge_text->translate_axis (x_span[d] - x_span[LEFT], X_AXIS);
- edge_stencils[d] = *edge_text;
+ Stencil *edge_text = unsmob_stencil (t);
+ edge_text->translate_axis (x_span[d] - x_span[LEFT],
X_AXIS);
+ edge_stencils[d] = *edge_text;
+ }
}
}
}
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.219 lilypond/scm/define-grobs.scm:1.220
--- lilypond/scm/define-grobs.scm:1.219 Fri Aug 5 10:42:22 2005
+++ lilypond/scm/define-grobs.scm Fri Aug 5 20:16:55 2005
@@ -1485,8 +1485,6 @@
(thickness . 1.6)
(edge-height . (0.7 . 0.7))
(shorten-pair . (-0.2 . -0.2))
- (edge-text . ,(cons (markup #:arrow-head 0 -1 #f)
- (markup #:arrow-head 0 1 #f)))
(before-line-breaking-callback . ,Tuplet_bracket::before_line_breaking)
(after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking)
(print-function . ,Tuplet_bracket::print)
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
