(grob-cause): don't add cwd if path starts

[lilypond.git] / lily / separation-item.cc

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 49469946d988728b1916cf2a8d161bf2c20f8b08..0cf923a2d04a56768939dce54b3b30f7a76698c4 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -1,28 +1,28 @@
-/*   
-     separation-item.cc --  implement Separation_item
-  
+/*
+  separation-item.cc -- implement Separation_item
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
 
 #include "separation-item.hh"
+
 #include "paper-column.hh"
 #include "warn.hh"
 #include "group-interface.hh"
 #include "accidental-placement.hh"
 
 void
-Separation_item::add_item (Grob*s,Item* i)
+Separation_item::add_item (Grob *s, Item *i)
 {
   assert (i);
-  Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"),i);
+  Pointer_group_interface::add_grob (s, ly_symbol2scm ("elements"), i);
   s->add_dependency (i);
 }
 
 void
-Separation_item::add_conditional_item (Grob* me , Grob *e)
+Separation_item::add_conditional_item (Grob *me, Grob *e)
 {
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("conditional-elements"), e);
 }
@@ -30,28 +30,27 @@ Separation_item::add_conditional_item (Grob* me , Grob *e)
 /*
   Return the width of ME given that we are considering the object on
   the LEFT.
- */
+*/
 Interval
-Separation_item::conditional_width (Grob * me, Grob * left)
+Separation_item::conditional_width (Grob *me, Grob *left)
 {
   Interval w = width (me);
-  
-  Item *item = dynamic_cast<Item*> (me);
-  Paper_column * pc = item->get_column ();
-  
-  
-  for (SCM s =  me->get_property ("conditional-elements"); scm_is_pair (s); s = scm_cdr (s))
+
+  Item *item = dynamic_cast<Item *> (me);
+  Paper_column *pc = item->get_column ();
+
+  for (SCM s = me->get_property ("conditional-elements"); scm_is_pair (s); s = scm_cdr (s))
     {
       SCM elt = scm_car (s);
       if (!unsmob_grob (elt))
        continue;
-      
+
       Item *il = unsmob_item (elt);
       if (pc != il->get_column ())
        {
          /* this shouldn't happen, but let's continue anyway. */
          programming_error (_ ("Separation_item:  I've been drinking too much"));
-         continue;             /*UGH UGH*/ 
+         continue;             /*UGH UGH*/
        }
 
       if (to_boolean (il->get_property ("no-spacing-rods")))
@@ -80,11 +79,11 @@ Separation_item::width (Grob *me)
       return ly_scm2interval (sw);
     }
 
-  Item *item = dynamic_cast<Item*> (me);
-  Paper_column * pc = item->get_column ();
+  Item *item = dynamic_cast<Item *> (me);
+  Paper_column *pc = item->get_column ();
   Interval w;
-  
-  for (SCM s =  me->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
+
+  for (SCM s = me->get_property ("elements"); scm_is_pair (s); s = scm_cdr (s))
     {
       SCM elt = scm_car (s);
       if (!unsmob_grob (elt))
@@ -95,7 +94,7 @@ Separation_item::width (Grob *me)
        {
          /* this shouldn't happen, but let's continue anyway. */
          programming_error (_ ("Separation_item:  I've been drinking too much"));
-         continue;             /*UGH UGH*/ 
+         continue;             /*UGH UGH*/
        }
 
       if (to_boolean (il->get_property ("no-spacing-rods")))
@@ -115,35 +114,34 @@ Separation_item::width (Grob *me)
   w.widen (robust_scm2double (pad, 0.0));
 
   me->set_property ("X-extent", ly_interval2scm (w));
-  
+
   return w;
 }
 
 Interval
-Separation_item::relative_width (Grob * me, Grob * common)
+Separation_item::relative_width (Grob *me, Grob *common)
 {
   Interval iv = width (me);
 
-  return dynamic_cast<Item*>(me)->get_column ()->relative_coordinate (common, X_AXIS) + iv ;
+  return dynamic_cast<Item *> (me)->get_column ()->relative_coordinate (common, X_AXIS) + iv;
 }
 
-
 /*
   Try to find the break-aligned symbol in SEPARATION_ITEM that is
   sticking out at direction D. The x size is put in LAST_EXT
 */
-Grob*
+Grob *
 Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d,
-                                           Interval * last_ext)
+                                             Interval *last_ext)
 {
-  Grob *col = dynamic_cast<Item*> (separation_item)->get_column ();
+  Grob *col = dynamic_cast<Item *> (separation_item)->get_column ();
   last_ext->set_empty ();
   Grob *last_grob = 0;
   for (SCM s = separation_item->get_property ("elements");
        scm_is_pair (s); s = scm_cdr (s))
     {
-      Grob * break_item = unsmob_grob (scm_car (s));
-      
+      Grob *break_item = unsmob_grob (scm_car (s));
+
       if (!scm_is_symbol (break_item->get_property ("break-align-symbol")))
        continue;
 
@@ -152,24 +150,17 @@ Separation_item::extremal_break_aligned_grob (Grob *separation_item, Direction d
       if (ext.is_empty ())
        continue;
       if (!last_grob
-         || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0) )
+         || (last_grob && d * (ext[d]- (*last_ext)[d]) > 0))
        {
          *last_ext = ext;
-         last_grob = break_item; 
+         last_grob = break_item;
        }
     }
 
-  return last_grob;  
+  return last_grob;
 }
 
-
-
-
-
-ADD_INTERFACE (Separation_item,"separation-item-interface",
+ADD_INTERFACE (Separation_item, "separation-item-interface",
               "Item that computes widths to generate spacing rods. "
-              "This is done in concert with @ref{separation-spanner-interface}."
-              
-              ,
-
+              "This is done in concert with @ref{separation-spanner-interface}.",
               "padding X-extent conditional-elements elements");