X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fprob.hh;h=9f6ad9609a080e5c7567944c39607781edcb88a7;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=0b82c4629eb68912e2847366028d004e5c1eae91;hpb=0c5bcc9f980e3dc40b53543a957bbf353d7c2308;p=lilypond.git

diff --git a/lily/include/prob.hh b/lily/include/prob.hh
index 0b82c4629e..9f6ad9609a 100644
--- a/lily/include/prob.hh
+++ b/lily/include/prob.hh
@@ -1,15 +1,27 @@
 /*
-  property-object.hh -- declare Property_object
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2015  Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2004--2006  Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef PROPERTY_OBJECT_HH
 #define PROPERTY_OBJECT_HH
 
 #include "stencil.hh"
+#include "virtual-methods.hh"
 
 /*
   A formatted "system" (A block of titling also is a Property_object)
@@ -18,37 +30,43 @@
   formatted content of the grob is put into a
   Property_object. Page-breaking handles Property_object objects.
 */
-class Prob
+
+class Prob : public Smob<Prob>
 {
-  DECLARE_SMOBS (Prob,);
-  DECLARE_CLASSNAME(Prob);
+public:
+  int print_smob (SCM, scm_print_state *);
+  SCM mark_smob ();
+  static SCM equal_p (SCM, SCM);
+  static const char type_p_name_[];
+  virtual ~Prob ();
+private:
+  DECLARE_CLASSNAME (Prob);
 
   void init_vars ();
 protected:
   SCM mutable_property_alist_;
   SCM immutable_property_alist_;
   SCM type_;
-  
+
   virtual void derived_mark () const;
   virtual SCM copy_mutable_properties () const;
-  virtual void type_check_assignment (SCM,SCM) const;
-  
+  virtual void type_check_assignment (SCM, SCM) const;
+
 public:
   Prob (SCM, SCM);
   Prob (Prob const &);
   virtual string name () const;
   SCM type () const { return type_; }
-  SCM get_property_alist (bool mutble) const;
+  SCM get_property_alist (bool _mutable) const;
   SCM internal_get_property (SCM sym) const;
-
-#ifndef NDEBUG
-  void internal_set_property (SCM sym, SCM val, const char *file, int line, char const *fun);
-#else
+  void instrumented_set_property (SCM, SCM, const char *, int, const char *);
   void internal_set_property (SCM sym, SCM val);
-#endif
 };
-DECLARE_UNSMOB(Prob,prob);
+
+
 SCM ly_prob_set_property_x (SCM system, SCM sym, SCM value);
-SCM ly_prob_property (SCM system, SCM sym, SCM dfault);
+SCM ly_prob_property (SCM prob, SCM sym, SCM val);
+
+SCM ly_prob_type_p (SCM obj, SCM sym);
 
 #endif /* PROPERTY_OBJECT_HH */