Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / grob.cc

diff --git a/lily/grob.cc b/lily/grob.cc
index 402f9dfc87499f033c466f92005d4812cb2aa4ca..15eb1f9212b80da980ffbdcd8707e09de6a789e1 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -10,27 +10,19 @@
 
 #include <cstring>
 
-#include "main.hh"
 #include "input-smob.hh"
-#include "warn.hh"
-#include "pointer-group-interface.hh"
-#include "misc.hh"
-#include "paper-score.hh"
-#include "stencil.hh"
-#include "warn.hh"
-#include "system.hh"
+#include "international.hh"
 #include "item.hh"
-#include "stencil.hh"
+#include "main.hh"
 #include "misc.hh"
 #include "music.hh"
-#include "item.hh"
-#include "paper-score.hh"
-#include "ly-smobs.icc"
 #include "output-def.hh"
+#include "pointer-group-interface.hh"
+#include "stencil.hh"
+#include "system.hh"
+#include "warn.hh"
 
-
-
-
+#include "ly-smobs.icc"
 
 Grob *
 Grob::clone (int count) const
@@ -122,12 +114,20 @@ Grob::get_print_stencil () const
       else
        {
          SCM expr = m->expr ();
-         if (point_and_click_global)
-           expr = scm_list_3 (ly_symbol2scm ("grob-cause"),
-                              self_scm (), expr);
+         expr = scm_list_3 (ly_symbol2scm ("grob-cause"),
+                            self_scm (), expr);
 
          retval = Stencil (m->extent_box (), expr);
        }
+      SCM rot = get_property ("rotation");
+      if (scm_is_pair (rot))
+       {
+         Real angle = scm_to_double (scm_car (rot));
+         Real x = scm_to_double (scm_cadr (rot));
+         Real y = scm_to_double (scm_caddr (rot));
+
+         retval.rotate (angle, Offset (x, y));
+       }
 
       /* color support... see interpret_stencil_expression () for more... */
       SCM color = get_property ("color");
@@ -438,7 +438,7 @@ Grob::fixup_refpoint ()
   MESSAGES
 ****************************************************************/
 void
-Grob::warning (String s) const
+Grob::warning (string s) const
 {
   SCM cause = self_scm ();
   while (Grob *g = unsmob_grob (cause))
@@ -451,7 +451,7 @@ Grob::warning (String s) const
 }
 
 
-String
+string
 Grob::name () const
 {
   SCM meta = get_property ("meta");
@@ -461,7 +461,7 @@ Grob::name () const
 }
 
 void
-Grob::programming_error (String s) const
+Grob::programming_error (string s) const
 {
   SCM cause = self_scm ();
   while (Grob *g = unsmob_grob (cause))
@@ -530,6 +530,7 @@ ADD_INTERFACE (Grob, "grob-interface",
               "meta "
               "minimum-X-extent "
               "minimum-Y-extent "
+              "rotation "
               "springs-and-rods "
               "staff-symbol "
               "stencil "
@@ -616,9 +617,9 @@ common_refpoint_of_list (SCM elist, Grob *common, Axis a)
 }
 
 Grob *
-common_refpoint_of_array (Link_array<Grob> const &arr, Grob *common, Axis a)
+common_refpoint_of_array (vector<Grob*> const &arr, Grob *common, Axis a)
 {
-  for (int i = arr.size (); i--;)
+  for (vsize i = arr.size (); i--;)
     if (Grob *s = arr[i])
       {
        if (common)