release: 1.3.39

[lilypond.git] / lily / my-lily-parser.cc

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 854f846c1b898735f66ddbdae2686fae3acc8e7e..0991ef79fcbc39f54ddd4c6d0c1d6d965589857e 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -25,10 +25,9 @@
 
 My_lily_parser::My_lily_parser (Sources * source_l)
 {
-  first_b_ = true;
   source_l_ = source_l;
   lexer_p_ = 0;
-  abbrev_beam_type_i_ = 0;
+  chord_tremolo_type_i_ = 0;
   default_duration_.durlog_i_ = 2;
   error_level_i_ = 0;
 
@@ -52,12 +51,11 @@ void
 My_lily_parser::parse_file (String init, String s)
 {
   lexer_p_ = new My_lily_lexer;
-  init_str_ = init;
+
   lexer_p_->main_input_str_ = s;
 
   progress_indication (_("Parsing..."));
 
-  init_parse_b_ = false;
   set_yydebug (flower_dstream &&!flower_dstream->silent_b ("Parser"));
   lexer_p_->new_input (init, source_l_);
   do_yyparse ();
@@ -102,9 +100,9 @@ My_lily_parser::set_last_duration (Duration const *d)
 }
 
 void
-My_lily_parser::set_abbrev_beam (int type_i)
+My_lily_parser::set_chord_tremolo (int type_i)
 {
-  abbrev_beam_type_i_ = type_i;
+  chord_tremolo_type_i_ = type_i;
 }
 
 
@@ -112,7 +110,12 @@ My_lily_parser::set_abbrev_beam (int type_i)
 
 // junk me
 Simultaneous_music *
-My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Musical_pitch* bass_p, Duration d)
+My_lily_parser::get_chord (Musical_pitch tonic,
+                          Array<Musical_pitch>* add_arr_p,
+                          Array<Musical_pitch>* sub_arr_p,
+                          Musical_pitch* inversion_p,
+                          Musical_pitch* bass_p,
+                          Duration d)
 {
   Simultaneous_music*v = new Request_chord;
   v->set_spot (here_input ());
@@ -171,17 +174,5 @@ My_lily_parser::here_input() const
   return  lexer_p_->here_input ();
 }
 
-Paper_def*
-My_lily_parser::default_paper_p ()
-{
-  Identifier *id = lexer_p_->lookup_identifier ("$defaultpaper");
-  return id ? id->access_content_Paper_def (true) : new Paper_def ;
-}
 
-Midi_def*
-My_lily_parser::default_midi_p ()
-{
-  Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi");
-  return id ? id->access_content_Midi_def (true) : new Midi_def ;
-}