(ly_parse_scm): add line/col/file

[lilypond.git] / lily / include / spanner.hh

diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh
index ecc90465cccff35b996e0faf3735a694fa9ad3d4..1dcc0b3c0e67a20c44131275d1206265e7638fcc 100644 (file)
--- a/lily/include/spanner.hh
+++ b/lily/include/spanner.hh
@@ -33,9 +33,9 @@ class Spanner : public  Grob {
   Drul_array<Item*> spanned_drul_;
 
 public:
-  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM ));
+  DECLARE_SCHEME_CALLBACK (set_spacing_rods, (SCM));
   
-  Link_array<Spanner> broken_into_l_arr_;
+  Link_array<Spanner> broken_intos_;
 
   // todo: move to somewhere else.
   Real get_broken_left_end_align () const;
@@ -54,17 +54,17 @@ public:
   static int compare (Spanner * const &,Spanner * const &);
   virtual Grob* find_broken_piece (System*) const;
   virtual SCM do_derived_mark ();
-    static bool has_interface (Grob*);
+  static bool has_interface (Grob*);
 protected:
   void set_my_columns ();
 
   VIRTUAL_COPY_CONS (Grob);
   virtual void do_break_processing ();
-  virtual System*line_l () const;
+  virtual System *get_system () const;
 };
 
 
 void add_bound_item (Spanner*, Grob*);
-
+///DECLARE_UNSMOB (Spanner, spanner);
 
 #endif