Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / prob.cc

diff --git a/lily/prob.cc b/lily/prob.cc
index 4dbd2858ababb7b9921bf7ed3c6c0dea4ce4cff8..5a1caca15508fe0e6cc0a5ce7ed86da6eba782f3 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -1,5 +1,5 @@
 /*
-  paper-system.cc -- implement Paper_system
+  prob.cc -- implement Prob
 
   source file of the GNU LilyPond music typesetter
 
@@ -16,11 +16,12 @@ IMPLEMENT_SMOBS (Prob);
 IMPLEMENT_TYPE_P (Prob, "ly:prob?");
 IMPLEMENT_DEFAULT_EQUAL_P (Prob);
 
-Prob::Prob (SCM immutable_init)
+Prob::Prob (SCM type, SCM immutable_init)
 {
   self_scm_ = SCM_EOL;
   mutable_property_alist_ = SCM_EOL;
   immutable_property_alist_ = immutable_init;
+  type_ = type;
   smobify_self ();
 }
 
@@ -33,6 +34,7 @@ Prob::Prob (Prob const &src)
   immutable_property_alist_ = src.immutable_property_alist_;
   mutable_property_alist_ = SCM_EOL;
   self_scm_ = SCM_EOL;
+  type_ = src.type_;
 
   /* First we smobify_self, then we copy over the stuff.  If we don't,
      stack vars that hold the copy might be optimized away, meaning
@@ -69,8 +71,8 @@ Prob::print_smob (SCM smob, SCM port, scm_print_state*)
   Prob *p = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_puts ("#<", port);
   scm_puts ("Prob: ", port);
-
-  
+  scm_display (p->type_, port);
+  scm_puts (" C++: ", port);
   scm_puts (p->class_name (), port);
   scm_display (p->mutable_property_alist_, port);
   scm_display (p->immutable_property_alist_, port);
@@ -117,7 +119,7 @@ Prob::get_property_alist (bool m) const
   return (m) ? mutable_property_alist_ : immutable_property_alist_;
 }
 
-String
+string
 Prob::name () const
 {
   SCM nm = get_property ("name");