CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/16 14:28:39
Modified files:
input : les-nereides.ly
lily : beam.cc fingering-engraver.cc note-head.cc
span-bar.cc stem.cc
Log message:
* lily/beam.cc: use length-fraction too.
* lily/beam.cc: remove flag-width-function
* lily/stem.cc (calc_length): multiply with length_fraction. Makes
for easier grace tweaks.
* lily/beam.cc: remove dir-function.
* lily/note-head.cc (calc_stem_attachment): new function.
(internal_print): use callback to get glyph-name.
* lily/stem.cc (calc_stem_end_position): new function.
(calc_length): new function.
document details for stem.
remove Stem::get_direction()
* lily/stem.cc (height): idem.
* lily/beam.cc (calc_direction): use pseudo-property for beam
direction callback.
(calc_positions): use callback
* lily/stem.cc (calc_stem_end_position): use callback.
(calc_positioning_done): idem.
(calc_direction): idem.
(calc_stem_end_position): idem
(calc_stem_info): idem.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/les-nereides.ly.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/beam.cc.diff?tr1=1.319&tr2=1.320&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/fingering-engraver.cc.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-head.cc.diff?tr1=1.157&tr2=1.158&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/span-bar.cc.diff?tr1=1.111&tr2=1.112&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/stem.cc.diff?tr1=1.283&tr2=1.284&r1=text&r2=text
Patches:
Index: lilypond/input/les-nereides.ly
diff -u lilypond/input/les-nereides.ly:1.81 lilypond/input/les-nereides.ly:1.82
--- lilypond/input/les-nereides.ly:1.81 Tue Aug 23 03:04:09 2005
+++ lilypond/input/les-nereides.ly Sun Oct 16 14:28:39 2005
@@ -56,7 +56,7 @@
cis''''4^\markup { \small \italic "m.g." }\arpeggio~
\grace {
cis8
- \override Stem #'direction = #CENTER
+ \revert Stem #'direction
a16[-5_( fis dis]
#(set-octavation 0)
Index: lilypond/lily/beam.cc
diff -u lilypond/lily/beam.cc:1.319 lilypond/lily/beam.cc:1.320
--- lilypond/lily/beam.cc:1.319 Sun Oct 16 14:20:44 2005
+++ lilypond/lily/beam.cc Sun Oct 16 14:28:39 2005
@@ -1390,6 +1390,5 @@
"positions "
"quant-score "
"shorten "
- "space-function "
"thickness "
);
Index: lilypond/lily/fingering-engraver.cc
diff -u lilypond/lily/fingering-engraver.cc:1.54
lilypond/lily/fingering-engraver.cc:1.55
--- lilypond/lily/fingering-engraver.cc:1.54 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/fingering-engraver.cc Sun Oct 16 14:28:39 2005
@@ -106,7 +106,7 @@
fingering->set_property ("script-priority", scm_from_int (priority));
- if (!is_direction (fingering->get_property ("direction")))
+ if (!is_direction (fingering->get_property_data (ly_symbol2scm
("direction"))))
{
if (d)
fingering->set_property ("direction", scm_from_int (d));
Index: lilypond/lily/note-head.cc
diff -u lilypond/lily/note-head.cc:1.157 lilypond/lily/note-head.cc:1.158
--- lilypond/lily/note-head.cc:1.157 Sun Oct 16 14:09:30 2005
+++ lilypond/lily/note-head.cc Sun Oct 16 14:28:39 2005
@@ -152,7 +152,6 @@
/* properties */
"note-names "
- "glyph-name-procedure "
"accidental-grob "
"stem-attachment "
"style "
Index: lilypond/lily/span-bar.cc
diff -u lilypond/lily/span-bar.cc:1.111 lilypond/lily/span-bar.cc:1.112
--- lilypond/lily/span-bar.cc:1.111 Sun Oct 16 12:29:40 2005
+++ lilypond/lily/span-bar.cc Sun Oct 16 14:28:39 2005
@@ -109,18 +109,22 @@
MAKE_SCHEME_CALLBACK (Span_bar, width_callback, 2);
SCM
-Span_bar::width_callback (SCM element_smob, SCM scm_axis)
+Span_bar::width_callback (SCM smob, SCM scm_axis)
{
- Grob *se = unsmob_grob (element_smob);
+ Grob *me = unsmob_grob (smob);
(void) scm_axis;
assert ((Axis) scm_to_int (scm_axis) == X_AXIS);
- String gl = ly_scm2string (se->get_property ("glyph-name"));
+ SCM gn = me->get_property ("glyph-name");
+ if (!me->is_live ())
+ return ly_interval2scm (Interval ());
+
+ String gl = ly_scm2string (gn);
/*
urg.
*/
- Stencil m = Bar_line::compound_barline (se, gl, 40 PT, false);
+ Stencil m = Bar_line::compound_barline (me, gl, 40 PT, false);
return ly_interval2scm (m.extent (X_AXIS));
}
Index: lilypond/lily/stem.cc
diff -u lilypond/lily/stem.cc:1.283 lilypond/lily/stem.cc:1.284
--- lilypond/lily/stem.cc:1.283 Sun Oct 16 14:09:30 2005
+++ lilypond/lily/stem.cc Sun Oct 16 14:28:39 2005
@@ -375,6 +375,13 @@
Real thick = thickness (me);
Grob *hed = support_head (me);
+ if (!dir)
+ {
+ programming_error ("Stem dir must be up or down.");
+ dir = UP;
+ set_grob_direction (me, dir);
+ }
+
Real w = hed->extent (hed, X_AXIS)[dir];
for (int i = 0; i < heads.size (); i++)
heads[i]->translate_axis (w - heads[i]->extent (heads[i], X_AXIS)[dir],
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
