(do_chroot_jail): paranoia security for webserver

[lilypond.git] / lily / ottava-bracket.cc

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index dac41046659fe9cd0e5f719fde43d62dcb9bfc61..25de958243775ffacffb8bb1aa37597c0e9a2e29 100644 (file)
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
  */
 
-#include "stencil.hh"
 #include "text-item.hh"
 #include "line-spanner.hh"
 #include "spanner.hh"
@@ -45,7 +44,7 @@ Ottava_bracket::print (SCM smob)
   Interval span_points;
   
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
-  Output_def * paper = me->get_paper ();
+  Output_def * layout = me->get_layout ();
   
   Drul_array<bool> broken;
   Direction d = LEFT;
@@ -58,7 +57,7 @@ Ottava_bracket::print (SCM smob)
        {
          SCM heads = b->get_property ("note-heads");
          common = common_refpoint_of_list (heads, common, X_AXIS);
-         for (SCM s = heads; scm_is_pair (s); s =scm_cdr (s))
+         for (SCM s = heads; scm_is_pair (s); s = scm_cdr (s))
            {
              Grob * h = unsmob_grob (scm_car (s));
              Grob * dots = Rhythmic_head::get_dots (h);
@@ -73,11 +72,11 @@ Ottava_bracket::print (SCM smob)
   SCM markup = me->get_property ("text");
   Stencil text;
   if (Text_interface::markup_p (markup)) 
-    text = *unsmob_stencil (Text_interface::interpret_markup (paper->self_scm (), properties, markup));
+    text = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, markup));
 
 
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
-                                                 Interval (0,0));
+                                                 Interval (0, 0));
 
 
   /*
@@ -91,7 +90,7 @@ Ottava_bracket::print (SCM smob)
       Interval ext;
       if (Note_column::has_interface (b))
        {
-         for (SCM s = b->get_property ("note-heads"); scm_is_pair (s); s =scm_cdr (s))
+         for (SCM s = b->get_property ("note-heads"); scm_is_pair (s); s = scm_cdr (s))
            {
              Grob * h = unsmob_grob (scm_car (s));
              ext.unite (h->extent (common, X_AXIS));
@@ -139,7 +138,7 @@ Ottava_bracket::print (SCM smob)
 
   
   Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
-                                               Interval (0,0));
+                                               Interval (0, 0));
 
 
 
@@ -173,7 +172,7 @@ Ottava_bracket::print (SCM smob)
   */
   
   b = Stencil (Box (b.extent (X_AXIS),
-                    Interval (0.1,0.1)),
+                    Interval (0.1, 0.1)),
                b.expr ());
   
   b.translate_axis (bracket_span_points[LEFT], X_AXIS);