lilypond-0.0.70pre

diff --git a/lily/include/script.hh b/lily/include/script.hh
index b48ea8ebd6f98d6671d1b413fd48a24363ff099e..f6d41a2c2ff470446641fdcaef595b4bea1c2595 100644 (file)
--- a/lily/include/script.hh
+++ b/lily/include/script.hh
@@ -8,7 +8,6 @@
 #define SCRIPT_HH
 
 #include "staff-side.hh"
-#include "script-def.hh"
 #include "item.hh"
   
 /**
@@ -18,12 +17,13 @@ class Script : public Item, public Staff_side {
     
     int pos_i_;
     
-    General_script_def *specs_l_;
     Stem *stem_l_;
 
     /* *************** */
 protected:
     Molecule *brew_molecule_p()const;
+    virtual void do_substitute_dependency(Score_elem*,Score_elem*);
+    virtual void do_print() const;
     virtual void do_post_processing();
     virtual void do_pre_processing();
     virtual Interval do_width() const;
@@ -33,8 +33,10 @@ private:
     void set_default_index();
     Symbol symbol()const;
 public:
+    General_script_def *specs_l_;
+    
     static int compare(Script  *const&, Script *const&) ;
-    Script(Script_req*);
+    Script();
     void set_stem(Stem*);
     NAME_MEMBERS();
 

diff --git a/lily/score-elem.cc b/lily/score-elem.cc
index 868dc3e176340ffec850aa1e5782fc8ed20f0e5a..f22a67d004043663468c030f2e19df8d4d614407 100644 (file)
--- a/lily/score-elem.cc
+++ b/lily/score-elem.cc
@@ -50,12 +50,21 @@ Score_elem::TeX_string() const
     assert( status > POSTCALCED);
     if (transparent_b_ )
        return "";
-    String s("\\placebox{%}{%}{%}");
+    String s( "\\placebox{%}{%}{%}");
     Array<String> a;
     a.push(print_dimen(offset_.y));
     a.push(print_dimen(offset_.x));
-    a.push( output->TeX_string());
-    return substitute_args(s, a);
+    String t = output->TeX_string();
+    if (t == "")
+       return t;
+
+    a.push( t);
+    String r;
+    if (check_debug)
+       r = String("\n%start: ") + name() + "\n";
+    r += substitute_args(s, a);;
+    return r;
+    
 }
 
 
@@ -165,7 +174,11 @@ Score_elem::print()const
 #ifndef NPRINT
     mtor << name() << "{\n";
     mtor << "dets: " << dependent_size() << "dependencies: " << 
-       dependency_size() << "\n";
+       dependency_size();
+    if (offset_.x || offset_.y)
+       mtor << "offset (" << offset_.x << ", " << offset_.y <<")";
+    mtor << "\n";
+
     do_print();
     if (output)
        output->print();
@@ -341,7 +354,7 @@ Score_elem::line_l()const
     return 0;
 }
 
-/********************
+/*
   DEPENDENCIES
  */