CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/15 13:07:32
Modified files:
. : ChangeLog
input : proportional.ly
lily : paper-column.cc
mf : feta-arrow.mf
scm : define-grob-properties.scm
Log message:
* input/proportional.ly: use #'used property. Set break-overshoot
property.
* mf/feta-arrow.mf: arrow tip sticks out of bbox.
* lily/paper-column.cc: add used property
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4003&tr2=1.4004&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/proportional.ly.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/paper-column.cc.diff?tr1=1.82&tr2=1.83&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-arrow.mf.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4003 lilypond/ChangeLog:1.4004
--- lilypond/ChangeLog:1.4003 Mon Aug 15 11:17:43 2005
+++ lilypond/ChangeLog Mon Aug 15 13:07:32 2005
@@ -1,5 +1,11 @@
2005-08-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * input/proportional.ly: use #'used property. Set break-overshoot
property.
+
+ * mf/feta-arrow.mf: arrow tip sticks out of bbox.
+
+ * lily/paper-column.cc: add used property
+
* lily/mark-engraver.cc (stop_translation_timestep): set grob
array for staves found.
Index: lilypond/input/proportional.ly
diff -u lilypond/input/proportional.ly:1.6 lilypond/input/proportional.ly:1.7
--- lilypond/input/proportional.ly:1.6 Fri Aug 5 20:16:55 2005
+++ lilypond/input/proportional.ly Mon Aug 15 13:07:32 2005
@@ -3,7 +3,7 @@
\header
{
title = "Proportional notation"
- copyright = "© 2005 Trevor BaÄa"
+ copyright = "© 2005 Trevor BaÄa - verbatim reproduction permitted."
}
\layout
@@ -26,6 +26,8 @@
proportionalNotationDuration = #(ly:make-moment 1 64)
\override TimeSignature #'break-visibility = #end-of-line-invisible
\override Beam #'break-overshoot = #'(-0.5 . 1.0)
+ \override TupletBracket #'break-overshoot = #'(-0.5 . 1.0)
+ \override PaperColumn #'used = ##t
}
\context {
% we want over print if necessary.
Index: lilypond/lily/paper-column.cc
diff -u lilypond/lily/paper-column.cc:1.82 lilypond/lily/paper-column.cc:1.83
--- lilypond/lily/paper-column.cc:1.82 Mon Aug 15 11:17:43 2005
+++ lilypond/lily/paper-column.cc Mon Aug 15 13:07:32 2005
@@ -46,6 +46,7 @@
"page-penalty "
"shortest-playing-duration "
"shortest-starter-duration "
+ "used "
"when ");
void
@@ -117,7 +118,12 @@
if (bbm.size ())
return true;
- return Item::is_breakable (me);
+ if (Item::is_breakable (me))
+ return true;
+
+ if (to_boolean (me->get_property ("used")))
+ return true;
+ return false;
}
/*
Index: lilypond/mf/feta-arrow.mf
diff -u lilypond/mf/feta-arrow.mf:1.2 lilypond/mf/feta-arrow.mf:1.3
--- lilypond/mf/feta-arrow.mf:1.2 Thu Aug 4 01:01:13 2005
+++ lilypond/mf/feta-arrow.mf Mon Aug 15 13:07:32 2005
@@ -31,7 +31,7 @@
indent = linethickness/2;
lft x1 = -width;
- rt x2 = 0;
+ x2 = 0;
top y1 = height;
y2 = 0;
@@ -69,7 +69,7 @@
enddef;
fet_beginchar ("open", "open.01");
- set_char_box (staff_space#, 0, 0.5 staff_space#, 0.5 staff_space#);
+ set_char_box (staff_space#, 1.6 linethickness#/2, 0.5 staff_space#, 0.5
staff_space#);
set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
fill open_path;
addto currentpicture also currentpicture yscaled -1;
@@ -78,7 +78,7 @@
fet_endchar;
fet_beginchar ("open", "open.0M1");
- set_char_box (0, staff_space#, 0.5 staff_space#, 0.5 staff_space#);
+ set_char_box ( 1.6 linethickness#/2, staff_space#, 0.5 staff_space#,
0.5 staff_space#);
set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
fill open_path;
addto currentpicture also currentpicture yscaled -1;
@@ -87,7 +87,7 @@
fet_beginchar ("open", "open.11");
set_char_box (.5 staff_space#, .5 staff_space#,
- 1.0 staff_space#, 0.0 staff_space#);
+ 1.0 staff_space#, 1.6 linethickness#/2);
set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
fill open_path;
addto currentpicture also currentpicture yscaled -1;
@@ -96,7 +96,7 @@
fet_beginchar ("open", "open.1M1");
set_char_box (.5 staff_space#, .5 staff_space#,
- 0.0 staff_space#, 1.0 staff_space#);
+ 1.6 linethickness#/2, 1.0 staff_space#);
set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
fill open_path;
addto currentpicture also currentpicture yscaled -1;
Index: lilypond/scm/define-grob-properties.scm
diff -u lilypond/scm/define-grob-properties.scm:1.111
lilypond/scm/define-grob-properties.scm:1.112
--- lilypond/scm/define-grob-properties.scm:1.111 Fri Aug 5 13:44:36 2005
+++ lilypond/scm/define-grob-properties.scm Mon Aug 15 13:07:32 2005
@@ -348,6 +348,10 @@
get stems extending to the middle staff line.")
(number-type ,symbol? "Type of numbers to use in label. Choices
include @code{roman-lower}, @code{roman-upper}, and @code{arabic}.")
+ (number-visibility ,boolean-or-symbol? "Like
[EMAIL PROTECTED], but for the number.")
+
+
(packed-spacing ,boolean? "If set, the notes are spaced as
tightly as possible.")
@@ -472,11 +476,7 @@
this grob, which means that grobs can be erased individually.")
(uniform-stretching ,boolean? "If set, items stretch proportional
to their durations. This looks better in complex polyphonic patterns")
-
- (number-visibility ,boolean-or-symbol? "Like
[EMAIL PROTECTED], but for the number.")
-
-
+ (used ,boolean? "If set, this spacing column is kept in the spacing
problem")
(when ,ly:moment? "Global time step associated with this column
happen?")
(word-space ,ly:dimension? "space to insert between lyrics or
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
