Doc-es: various updates.

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

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index 5dda5112b22eef285dd3a12a3e1111e5cd13a382..5da4dff74ec6107c242754e6c60b2eddefa90848 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -32,7 +32,7 @@ class Grob : public Smob<Grob>
 public:
   int print_smob (SCM, scm_print_state *) const;
   SCM mark_smob () const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   virtual ~Grob ();
 private:
   DECLARE_CLASSNAME (Grob);
@@ -102,7 +102,7 @@ public:
   bool is_live () const;
 
   /* naming. */
-  std::string name () const;
+  string name () const;
 
   /* Properties */
   SCM get_property_alist_chain (SCM) const;
@@ -118,8 +118,8 @@ public:
   void internal_set_property (SCM sym, SCM val);
 
   /* messages */
-  void warning (const std::string&) const;
-  void programming_error (const std::string&) const;
+  void warning (const string&) const;
+  void programming_error (const string&) const;
 
   /* class hierarchy */
   virtual System *get_system () const;
@@ -141,6 +141,7 @@ public:
   /* offsets */
   void translate_axis (Real, Axis);
   Real relative_coordinate (Grob const *refp, Axis) const;
+  Real parent_relative (Grob const *refp, Axis) const;
   Real pure_relative_y_coordinate (Grob const *refp, int start, int end);
   Real maybe_pure_coordinate (Grob const *refp, Axis a, bool pure, int start, int end);
 
@@ -181,12 +182,12 @@ inline bool has_interface(Grob *g)
 }
 
 /* unification */
-void uniquify (std::vector <Grob *> &);
+void uniquify (vector <Grob *> &);
 
 /* refpoints */
 Grob *common_refpoint_of_list (SCM elt_list, Grob *, Axis a);
-Grob *common_refpoint_of_array (std::vector<Grob *> const &, Grob *, Axis a);
-Grob *common_refpoint_of_array (std::set<Grob *> const &, Grob *, Axis a);
+Grob *common_refpoint_of_array (vector<Grob *> const &, Grob *, Axis a);
+Grob *common_refpoint_of_array (set<Grob *> const &, Grob *, Axis a);
 System *get_root_system (Grob *me);
 
 /* extents */