* 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.

diff --git a/ChangeLog b/ChangeLog
index 0ced3569a33133140c287d780c47abf0546e9714..6ab95979063c79ac40558146b3f35a478f4a9192 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
 2006-08-19  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * 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 2e8039816ee538868a0028648d68671d26d41c74..49e9e0524a2c41d99b6530270ae9b95e58c471aa 100644 (file)
--- 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 (file)
index 0000000..e67486c
--- /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 575a3fc792051ba5af3367590e3bc3209484433a..871b87a95dd3cad5729f5eac3ead83850efe7998 100644 (file)
--- 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 281296c506157dc570f3cb93d95fc5d9cb649f2a..5f74e457235031ea77bda9839be04d84d7d484bf 100644 (file)
--- 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));