Fix off-by-one error in constrained-breaking.

[lilypond.git] / lily / include / context-def.hh

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index df69f257dd6f1a62bfec6ab46a2901bc22cbb087..ac7b776208f0e45772b1aa57c8ac258201c01137 100644 (file)
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -13,12 +13,14 @@
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "input.hh"
+#include "virtual-methods.hh"
+
 
 /*
   The definition of a interpretation context as given in the
   input. The lists are stored in order of definition.
 */
-struct Context_def : public Input
+struct Context_def
 {
 private:
   /*
@@ -32,8 +34,9 @@ private:
   SCM context_aliases_;
   SCM translator_group_type_;
   SCM default_child_;
-
+  SCM input_location_;
 public:
+  Input *origin () const;
   void add_context_mod (SCM);
   SCM get_default_child (SCM user_mods) const;
   SCM get_context_name () const { return context_name_; }
@@ -43,6 +46,8 @@ public:
   SCM get_translator_group_type () const { return translator_group_type_; }
   void set_acceptor (SCM accepts, bool add);
 
+  VIRTUAL_COPY_CONSTRUCTOR(Context_def, Context_def);
+
   vector<Context_def*> path_to_acceptable_context (SCM type_string,
                                                      Output_def *) const;
   Context *instantiate (SCM extra_ops, Object_key const *);
@@ -50,11 +55,10 @@ public:
   SCM to_alist () const;
   static SCM make_scm ();
 
-  SCM clone_scm () const;
   void apply_default_property_operations (Context *);
 
 private:
-  DECLARE_SMOBS (Context_def, foo);
+  DECLARE_SMOBS (Context_def);
   Context_def ();
   Context_def (Context_def const &);
 };