From 53e0ed5c2c0692beec14a1a27112bc48b017d0ce Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 19 Aug 2006 21:35:57 +0000 Subject: [PATCH] * input/regression/stencil-color-rotation.ly: new file. * lily/include/translator.hh (struct Acknowledge_information): revert: don't use Protected_scm in global objects, as GUILE can't handle gc_unprotect from automated destructors. --- ChangeLog | 8 +++++++- THANKS | 3 +++ input/regression/stencil-color-rotation.ly | 10 ++++++++++ lily/include/translator.hh | 2 +- lily/lyric-extender.cc | 6 +++--- 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 input/regression/stencil-color-rotation.ly diff --git a/ChangeLog b/ChangeLog index 0ced3569a3..6ab9597906 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,14 @@ 2006-08-19 Han-Wen Nienhuys + * input/regression/stencil-color-rotation.ly: new file. + + * lily/include/translator.hh (struct Acknowledge_information): + revert: don't use Protected_scm in global objects, as GUILE can't + handle gc_unprotect from automated destructors. + * lily/grob.cc (get_print_stencil): use retval.expr() as base for color, not the original stencil. Fixes combinations of - color/transparency/rotation + color/transparency/rotation. Backportme. * scripts/lilypond-book.py (main): add --formats=eps for texinfo/latex. diff --git a/THANKS b/THANKS index 2e8039816e..49e9e0524a 100644 --- a/THANKS +++ b/THANKS @@ -52,9 +52,11 @@ Christian Hitz Christopher Ellis Claude Routhier Colin Wilding +Daniel Tonda Castillo David Rogers Francisco Vila Harald Wellmann +Johannes Schindelin J. Leung Karim Haddad Karl Hammar @@ -63,6 +65,7 @@ Kieren MacMillian Lee T. Wilkirson Mark Dewey Markus Schneider +Matti Aaltonen Michael Meixner Michael Welsh Duggan Orm Finnendahl diff --git a/input/regression/stencil-color-rotation.ly b/input/regression/stencil-color-rotation.ly new file mode 100644 index 0000000000..e67486c5d7 --- /dev/null +++ b/input/regression/stencil-color-rotation.ly @@ -0,0 +1,10 @@ +\header{ + texidoc = "Combinations of rotation and color do work." +} + +\version "2.9.15" +\relative c'{ + \override Hairpin #'rotation = #'(20 -1 0) + \override Hairpin #'color = #(x11-color 'LimeGreen) + g4\< b d f'\! +} diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 575a3fc792..871b87a95d 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -20,7 +20,7 @@ struct Acknowledge_information { - Protected_scm symbol_; + SCM symbol_; Engraver_void_function_engraver_grob_info function_; }; diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 281296c506..5f74e45723 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -16,8 +16,8 @@ #include "note-head.hh" #include "pointer-group-interface.hh" -MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1) - SCM +MAKE_SCHEME_CALLBACK (Lyric_extender, print, 1); +SCM Lyric_extender::print (SCM smob) { Spanner *me = unsmob_spanner (smob); @@ -60,7 +60,7 @@ Lyric_extender::print (SCM smob) right_point = max (right_point, heads.back ()->extent (common, X_AXIS)[RIGHT]); Real h = sl * robust_scm2double (me->get_property ("thickness"), 0); - Real pad = 2* h; + Real pad = 2 * h; if (right_text) right_point = min (right_point, (robust_relative_extent (right_text, common, X_AXIS)[LEFT] - pad)); -- 2.39.2