lilypond-1.4.3

diff --git a/lily/grob.cc b/lily/grob.cc
index db504faa814e9d4a371417d63ad2eae0e79bde4c..f6c84bc079e0df7650fc0a1d45e2e76f282e1aff 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -347,7 +347,7 @@ Grob::add_dependency (Grob*e)
       representing the break direction. Do not modify SRC.
 */
 SCM
-Grob::handle_broken_smobs (SCM src, SCM criterion)
+Grob::handle_broken_grobs (SCM src, SCM criterion)
 {
  again:
   Grob *sc = unsmob_grob (src);
@@ -393,7 +393,7 @@ Grob::handle_broken_smobs (SCM src, SCM criterion)
       /*
        UGH! breaks on circular lists.
       */
-      SCM newcar = handle_broken_smobs (oldcar, criterion);
+      SCM newcar = handle_broken_grobs (oldcar, criterion);
       SCM oldcdr = gh_cdr (src);
       
       if (newcar == SCM_UNDEFINED
@@ -402,7 +402,7 @@ Grob::handle_broken_smobs (SCM src, SCM criterion)
          /*
            This is tail-recursion, ie. 
            
-           return handle_broken_smobs (cdr, criterion);
+           return handle_broken_grobs (cdr, criterion);
 
            We don't want to rely on the compiler to do this.  Without
            tail-recursion, this easily crashes with a stack overflow.  */
@@ -410,7 +410,7 @@ Grob::handle_broken_smobs (SCM src, SCM criterion)
          goto again;
        }
 
-      SCM newcdr = handle_broken_smobs (oldcdr, criterion);
+      SCM newcdr = handle_broken_grobs (oldcdr, criterion);
       return gh_cons (newcar, newcdr);
     }
   else
@@ -433,7 +433,7 @@ Grob::handle_broken_dependencies ()
          Grob * sc = s->broken_into_l_arr_[i];
          Line_of_score * l = sc->line_l ();
          sc->mutable_property_alist_ =
-           handle_broken_smobs (mutable_property_alist_,
+           handle_broken_grobs (mutable_property_alist_,
                                 l ? l->self_scm () : SCM_UNDEFINED);
        }
     }
@@ -444,12 +444,12 @@ Grob::handle_broken_dependencies ()
   if (line && common_refpoint (line, X_AXIS) && common_refpoint (line, Y_AXIS))
     {
       mutable_property_alist_
-       = handle_broken_smobs (mutable_property_alist_,
+       = handle_broken_grobs (mutable_property_alist_,
                               line ? line->self_scm () : SCM_UNDEFINED);
     }
   else if (dynamic_cast <Line_of_score*> (this))
     {
-      mutable_property_alist_ = handle_broken_smobs (mutable_property_alist_,
+      mutable_property_alist_ = handle_broken_grobs (mutable_property_alist_,
                                            SCM_UNDEFINED);
     }
   else

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index dc95ba514311b805fad570ffea75c3bf1ead75b7..2de2b88fc2e11e073f8cb9bac96d50e3c5262e59 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -96,7 +96,7 @@ public:
      #funcptr# is the function to call to update this element.
    */
   void calculate_dependencies (int final, int busy, SCM funcname);
-  static SCM handle_broken_smobs (SCM, SCM criterion);
+  static SCM handle_broken_grobs(SCM, SCM criterion);
 
   virtual void do_break_processing ();
   virtual Grob *find_broken_piece (Line_of_score*) const;

diff --git a/lily/item.cc b/lily/item.cc
index 6eeaf775031891d37060fd7aea09ff0cbc6ecbbb..52f647f732f1bf40f7cda60fe34187193d4cf9ef 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -143,7 +143,7 @@ Item::handle_prebroken_dependencies ()
   if (original_l_)
     {
       mutable_property_alist_
-       = handle_broken_smobs (original_l_->mutable_property_alist_,
+       = handle_broken_grobs(original_l_->mutable_property_alist_,
                               gh_int2scm (break_status_dir ()));
     }
   

diff --git a/lily/main.cc b/lily/main.cc
index 703655df754a453718218a72649f450fe7233b86..85a447ed203096798cc12bd9993e60b5c0077adf 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -332,20 +332,22 @@ main_prog (int, char**)
   gh_eval_str ((char *)init_scheme_code_string.ch_C());
   
   int p=0;
-  const char *arg ;
-  while ((arg = oparser_p_static->get_next_arg ()) || p == 0)
+  const char *arg  = oparser_p_static->get_next_arg ();
+
+  if (!arg)
+    usage ();
+  else
+    do 
     {
-      String infile;
-      
-      if (arg)
-       infile = arg;
-      else
-       infile = "-";
-       
-      // What/when was this supposed to do?
-      // It looks like it reset the outname_str_global for every new
-      // file, but only if user didn't specify a outname?  Huh?
-      // if (outname_str_global == "")
+      String infile (arg);
+       
+      /* What/when was this supposed to do?
+       It looks like it reset the outname_str_global for every new
+       file, but only if user didn't specify a outname?  Huh?
+
+       // if (outname_str_global == "")
+
+      */
       {
        Midi_def::reset_score_count ();
        Paper_def::reset_score_count ();
@@ -381,8 +383,11 @@ main_prog (int, char**)
       output_name_global = save_output_name_global;
       
       p++;
-    }
+
+      oparser_p_static->get_next_arg ();      
+    } while ((arg  = oparser_p_static->get_next_arg ()));
   delete oparser_p_static;
+  oparser_p_static = 0;
   exit (exit_status_global);
 }
 

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 890c0d1562901f24928140aea8ccd0361ce30ce0..9870a13a883dcfc7bf28ec01b1419c42e6616114 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -42,8 +42,6 @@ Multi_measure_rest::percent (SCM smob)
   Grob *me = unsmob_grob (smob);
   Spanner *sp = dynamic_cast<Spanner*> (me);
   
-  Font_metric *musfont = Font_interface::get_default_font (me);
-                       
   Molecule r = Percent_repeat_item_interface::x_percent (me, 1,  0.75, 1.6);
 
   // ugh copy & paste.

diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc
index 994288da6406d9f4def48db2467390392af9e4c0..cd11b6a89d5d4d1be779272f699c8a44870dfaee 100644 (file)
--- a/lily/percent-repeat-engraver.cc
+++ b/lily/percent-repeat-engraver.cc
@@ -65,7 +65,6 @@ protected:
 protected:
   virtual void finalize ();
   virtual bool try_music (Music*);
-  virtual void acknowledge_grob (Grob_info);
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
   virtual void process_music ();
@@ -220,11 +219,6 @@ Percent_repeat_engraver::typeset_perc ()
 }
 
 
-void
-Percent_repeat_engraver::acknowledge_grob (Grob_info info)
-{
-
-}
 
 
 void

diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index db88dad85db10cae87686a0d2cc3c87dde5b1daa..5d4b0a5e0109cc1aecdf241d69d867a3f5f43342 100644 (file)
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -46,8 +46,11 @@ Stanza_number_engraver::acknowledge_grob (Grob_info i)
       
       if (now_mom () > Moment (0))
        s = get_property ("stz");
-  
+
+
+      // TODO
       if (gh_string_p (s))
+       
 
        /*
          if (i.elem_l_->has_interface (symbol ("lyric-syllable-interface")))

diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc
index 94859cf81946dec02d8765cc7b4831a846a5f6ea..7a8d460f99c933b672028507c5e23e1c414faa7f 100644 (file)
--- a/lily/voice-devnull-engraver.cc
+++ b/lily/voice-devnull-engraver.cc
@@ -58,7 +58,7 @@ Voice_devnull_engraver::try_music (Music *m)
            }
        }
       /* Ugh.  Should eat other requests, script etc. too. */  
-      else if (Tie_req *t = dynamic_cast<Tie_req*> (m))
+      else if (dynamic_cast<Tie_req*> (m))
        return true;
     }
   return false;