lilypond-1.0.1

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index 0dd977dca95f2dfafd44efaecba3168acbe02c5a..04e187130503187385a04f6b63e876ef997da694 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,12 +11,12 @@
 #define MY_LILY_PARSER_HH
 #include "lily-proto.hh"
 #include "string.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "lily-proto.hh"
 #include "lily-proto.hh"
 #include "duration.hh"
 #include "string.hh"
-#include "varray.hh"
+#include "array.hh"
 #include "input.hh"
 
 class My_lily_parser {
@@ -27,8 +27,8 @@ class My_lily_parser {
   void add_requests (Chord*v);
 
   Chord * get_note_element (Note_req * ,Duration *);
-  Chord* get_rest_element (String,Duration *);
-  Chord* get_word_element (Text_def*, Duration*);
+  Chord* get_rest_element (String, Duration *);
+  Chord* get_word_element (String, Duration*);
   Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes);
   String notename_str (Melodic_req* melodic);
   void set_last_duration (Duration const *);
@@ -37,12 +37,11 @@ class My_lily_parser {
 
 public:
   int abbrev_beam_type_i_;
-  int default_octave_i_;
+  int default_abbrev_i_;
   Duration default_duration_;
   Plet plet_;
   Header *default_header_p_;
     
-  String textstyle_str_;
   bool first_b_;
 
   Array<Request*> pre_reqs, post_reqs;

diff --git a/lily/request-iterator.cc b/lily/request-iterator.cc
index 19be49a8d374b7b98d04cd83b1a883b2035d7fbd..81b7fd26865d6cb25759dbd5e5604c8f69d40159 100644 (file)
--- a/lily/request-iterator.cc
+++ b/lily/request-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "translator-group.hh"
@@ -53,6 +53,7 @@ Request_chord_iterator::do_print() const
   DOUT << "duration: " << elt_duration_;
 #endif
 }
+
 void
 Request_chord_iterator::process_and_next (Moment mom)
 {
@@ -64,8 +65,7 @@ Request_chord_iterator::process_and_next (Moment mom)
          Request * req_l = (Request*)i.ptr();
          bool gotcha = report_to_l()->try_request (req_l);
          if (!gotcha)
-           req_l->warning (_("Junking request: ") + String (req_l->name()));
-
+           req_l->warning (_f ("junking request: `%s\'", req_l->name()));
        }
       first_b_ = false;
     }