lilypond-1.3.107

diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index 6f7adf1c022f7813917a5372e2e20b572fbbc083..3689d3e7d9777b50299640c9abec85c9c48e06d0 100644 (file)
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -22,11 +22,11 @@ property is listed in parentheses after the property name.
     Currently, the standard layout @code{""} and mensural notation
     @code{"mensural"} are available. Mensural rests of duration
     32 or shorter are not available.
-@mudela[verbatim]
+@lilypond[verbatim]
 r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
 \property Staff.restStyle = "mensural"
 r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
-@end mudela
+@end lilypond
 
   @item @code{transposing}@indexcode{transposing} @propertytype{integer}
     Transpose the MIDI output.  Set this property to the number of
@@ -90,7 +90,7 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
     The different time signature characters are shown below with its
     names:
 
-@mudela[center,verbatim]
+@lilypond[center,verbatim]
 
       \score {
         \notes\relative c'' {
@@ -125,7 +125,7 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
         }
       }
     
-@end mudela
+@end lilypond
 
 
 @end table

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 579b15848499188cc571036b73a7c6ba232f36f1..cc852ca5d70b814b20bf3bbfdc6e3b346af7e002 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -17,10 +17,12 @@
 
 class Timing_translator : public virtual Translator
 {
+
+  SCM last_time_sig_;
 public:
   VIRTUAL_COPY_CONS(Translator);
   Timing_translator ();
-  Link_array<Timing_req> timing_req_l_arr_;
+  Music *check_;
 
 protected: 
   virtual void do_creation_processing ();
@@ -32,6 +34,6 @@ protected:
 public:
   Moment measure_position () const;
   Moment measure_length () const;  
-  void set_time_signature (int, int);
+  void set_time_signature ();
 };
 #endif // TIMING_TRANSLATOR_HH

diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc
index 05b4fbfc207768b58ae774c5e2c3e1d643736af0..7643a2cfa71018ca1bef21054533e7b54907a611 100644 (file)
--- a/lily/timing-engraver.cc
+++ b/lily/timing-engraver.cc
@@ -19,11 +19,8 @@
  */
 class Timing_engraver : public Timing_translator, public Engraver
 {   
-  Bar_req * bar_req_l_;
 protected:
-  virtual bool do_try_music (Music * );
   virtual void do_post_move_processing ();
-  virtual void do_process_music ();
   virtual void do_pre_move_processing ();
 public:
   VIRTUAL_COPY_CONS(Translator);
@@ -34,7 +31,6 @@ ADD_THIS_TRANSLATOR(Timing_engraver);
 void
 Timing_engraver::do_post_move_processing( )
 {
-  bar_req_l_ = 0;
   Timing_translator::do_post_move_processing ();
 
   SCM nonauto = get_property ("barNonAuto");
@@ -63,23 +59,5 @@ Timing_engraver::do_pre_move_processing ()
   daddy_trans_l_->set_property ("whichBar", SCM_EOL);  
 }
 
-bool
-Timing_engraver::do_try_music (Music*m)
-{
-  if (0) // 
-    {
-      Bar_req  * b= dynamic_cast <Bar_req *> (m);
-      if (bar_req_l_ && !bar_req_l_->equal_b (b)) 
-       return false;
-      
-      bar_req_l_ = b;
-      return true;
-    }
-  
-  return Timing_translator::do_try_music (m);
-}
 
-void
-Timing_engraver::do_process_music ()
-{
-}
+