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 "my-lily-parser.hh"
#include "musical-request.hh"
#include "command-request.hh"
#include "parser.hh"
-#include "header.hh"
+#include "scope.hh"
#include "file-results.hh"
#include "midi-def.hh"
#include "paper-def.hh"
lexer_p_ = 0;
abbrev_beam_type_i_ = 0;
default_duration_.durlog_i_ = 2;
- default_octave_i_ = 0;
- textstyle_str_="roman"; // in lexer?
+ default_abbrev_i_ = 0;
error_level_i_ = 0;
- last_duration_mode_b_ = true;
fatal_error_i_ = 0;
default_header_p_ =0;
-
- relative_octave_mode_b_ = false;
-
- last_melodic_ = new Melodic_req;
- last_melodic_->octave_i_ = 0; // -1; // huh?
- last_melodic_->notename_i_ = 0;
- last_melodic_->accidental_i_ = 0;
}
My_lily_parser::~My_lily_parser()
}
-void
-My_lily_parser::clear_notenames()
-{
- lexer_p_->clear_notenames();
-}
void
My_lily_parser::set_version_check (bool ig)
init_str_ = init;
lexer_p_->main_input_str_ = s;
- *mlog << _("Parsing ... ");
+ *mlog << _ ("Parsing...");
init_parse_b_ = false;
set_yydebug (!monitor->silent_b ("Parser") && check_debug);
lexer_p_->new_input (init, source_l_);
do_yyparse ();
-
if (!define_spot_array_.empty())
{
- warning (_("Braces don't match."));
+ warning (_ ("braces don't match"));
error_level_i_ = 1;
}
exit_status_i_ = 1;
}
-void
-My_lily_parser::set_duration_mode (String s)
-{
- s = s.upper_str();
- last_duration_mode_b_ = (s== "LAST");
-}
-
-void
-My_lily_parser::set_octave_mode (String s)
-{
- s = s.upper_str();
- if (s == "RELATIVE")
- {
- relative_octave_mode_b_ = true;
- // must reset these
- last_melodic_ = new Melodic_req;
- last_melodic_->octave_i_ = 0; // -1; // huh?
- last_melodic_->notename_i_ = 0;
- last_melodic_->accidental_i_ = 0;
- }
- else
- relative_octave_mode_b_ = false;
-}
-
void
My_lily_parser::set_abbrev_beam (int type_i)
{
abbrev_beam_type_i_ = type_i;
}
-void
-My_lily_parser::set_default_duration (Duration const *d)
-{
- last_duration_mode_b_ = false;
- default_duration_ = *d;
-}
-
void
My_lily_parser::set_last_duration (Duration const *d)
{
- if (last_duration_mode_b_)
- {
- default_duration_ = *d;
- /*
- forget plet part,
- sticky plet factor only within plet brackets
- */
- default_duration_.set_plet (1, 1);
- }
-}
-
-String
-My_lily_parser::notename_str (Melodic_req* melodic)
-{
- // ugh
- String str ((char)('a' + ((melodic->notename_i_ + 2) % 7)));
- int i = melodic->accidental_i_;
- while (i-- > 0)
- str += "is";
- i++;
- while (i++ < 0)
- str += "es";
- return str;
-}
+ default_duration_ = *d;
-Melodic_req*
-My_lily_parser::get_melodic_req (Melodic_req* melodic, int quotes)
-{
- if (relative_octave_mode_b_)
- {
- set_nearest (melodic);
- int d = melodic->pitch () - last_melodic_->pitch ();
- int shift = 0;
- if (quotes && (sign (d) == sign (quotes)))
- shift -= sign (quotes);
- if (!quotes && (abs (d) == 6))
- {
- String str = _("Octave ambiguity; assuming ");
- /*
- [TODO]
- figure this out.
-
- If the distance is exactly*) half an octave, there is
- no nearest pitch. In that case, we'll try to guess what
- composer/ typist meant.
- Firstly, we'll do this by comparing the 'notename distance':
-
- f b' % name-distance: f g a b: 3
-
- is surely a shorter notename distance than
-
- f 'b % name-distance: b c d e f: 4
-
- (should we give a warning at all, or can we safely assume
- this is a positive interval up?)
-
- *) It is conceivable that, musically speaking, the interval
- with the greater pitch-distance is thought to be smaller?
-
- */
-
- int name_delta = melodic->notename_i_ - last_melodic_->notename_i_;
- int name_near = abs (name_delta) % 7;
- int name_wrap = (7 - abs (name_delta)) % 7;
- if (name_near != name_wrap)
- shift = name_near < name_wrap ? sign (name_delta) : -sign (name_delta);
- else if (sign (last_melodic_->accidental_i_)
- != sign (melodic->accidental_i_))
- shift = last_melodic_->accidental_i_ - melodic->accidental_i_;
- else
- shift = -1;
- String name_str = notename_str (melodic);
- str += shift > 0 ? name_str + "'" : "'" + name_str;
- if (sign (d) == sign (shift))
- shift = 0;
- melodic->warning (str);
- }
- melodic->octave_i_ += quotes + shift;
- }
- else
- {
- Melodic_req nearest (*melodic);
- set_nearest (&nearest);
- melodic->octave_i_ += quotes;
-
- if (find_quarts_global_b)
- {
- int e = melodic->pitch () - nearest.pitch ();
- if (e)
- {
- int d = melodic->pitch () - last_melodic_->pitch ();
- String str = _("Interval greater than quart");
- int n = 1 + (abs (d) - 1) / 12;
- String quote_str ('\'', n);
- str += _(", relative: ");
- String name_str = notename_str (melodic);
- str += d < 0 ? quote_str + name_str : name_str + quote_str;
- melodic->warning (str);
- }
- }
- }
- delete last_melodic_;
- last_melodic_ = melodic->clone ()->musical ()->melodic ();
- return melodic;
+ /*
+ forget plet part,
+ but keep sticky plet factor within plet brackets
+ */
+ default_duration_.plet_ = plet_;
}
-void
-My_lily_parser::set_nearest (Melodic_req* melodic)
-{
- melodic->octave_i_ = last_melodic_->octave_i_;
- int d = melodic->pitch () - last_melodic_->pitch ();
- if (abs (d) > 6)
- melodic->octave_i_ -= sign (d);
-}
-Chord*
-My_lily_parser::get_word_element (Text_def* tdef_p, Duration * duration_p)
+Simultaneous_music*
+My_lily_parser::get_word_element (String s, Duration * duration_p)
{
- Chord* velt_p = new Request_chord;
-
- Lyric_req* lreq_p = new Lyric_req (tdef_p);
+ Simultaneous_music* velt_p = new Request_chord;
+ Lyric_req* lreq_p = new Lyric_req;
+ lreq_p ->text_str_ = s;
lreq_p->duration_ = *duration_p;
lreq_p->set_spot (here_input());
- velt_p->add (lreq_p);
+ velt_p->add_music (lreq_p);
delete duration_p;
return velt_p;
}
-Chord *
+Simultaneous_music *
My_lily_parser::get_rest_element (String s, Duration * duration_p)
{
- Chord* velt_p = new Request_chord;
+ Simultaneous_music* velt_p = new Request_chord;
velt_p->set_spot (here_input());
if (s=="s")
skip_p->duration_ = *duration_p;
skip_p->set_spot (here_input());
- velt_p->add (skip_p);
+ velt_p->add_music (skip_p);
}
else
{
rest_req_p->duration_ = *duration_p;
rest_req_p->set_spot (here_input());
- velt_p->add (rest_req_p);
+ velt_p->add_music (rest_req_p);
}
delete duration_p;
return velt_p;
}
-Chord *
+Simultaneous_music *
My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p)
{
- Chord*v = new Request_chord;
+ Simultaneous_music*v = new Request_chord;
v->set_spot (here_input ());
- v->add (rq);
+ v->add_music (rq);
// too bad parser reads (default) duration via member access,
// this hack will do for now..
assert (!duration_p->plet_b ());
duration_p->set_plet (1, 2);
}
- rq->set_duration (*duration_p);
+ rq->duration_ = *duration_p;
rq->set_spot (here_input ());
delete duration_p ;
return v;
switch (t)
{
case BEAMPLET:
- reqs.top ()->span()->spantype = Span_req::START;
+ reqs.top ()->access_Span_req ()->spantype = Span_req::START;
/* fall through */
case '<':
case '>':
case '(':
case '[':
case PLET:
- reqs[0]->span ()->spantype = Span_req::START;
+ reqs[0]->access_Span_req ()->spantype = Span_req::START;
break;
case MAEBTELP:
- reqs.top ()->span()->spantype = Span_req::STOP;
+ reqs.top ()->access_Span_req ()->spantype = Span_req::STOP;
/* fall through */
case '!':
case ')':
case ']':
- reqs[0]->span ()->spantype = Span_req::STOP;
+ reqs[0]->access_Span_req ()->spantype = Span_req::STOP;
break;
default:
}
for (int i = 0; i < reqs.size (); i++)
- if (reqs[i]->musical ()->span_dynamic ())
+ if (reqs[i]->access_Musical_req ()->access_Span_dynamic_req ())
{
- Span_dynamic_req* s_l= (reqs[i]->musical ()->span_dynamic ()) ;
+ Span_dynamic_req* s_l= reqs[i]->access_Musical_req ()->access_Span_dynamic_req ();
s_l->dynamic_dir_ = (t == '<') ? UP:DOWN;
}
}
void
-My_lily_parser::add_requests (Chord*v)
+My_lily_parser::add_requests (Simultaneous_music*v)
{
for (int i = 0; i < pre_reqs.size(); i++)
{
- v->add (pre_reqs[i]);
+ v->add_music (pre_reqs[i]);
}
pre_reqs.clear();
for (int i = 0; i <post_reqs.size(); i++)
{
- v->add (post_reqs[i]);
+ v->add_music (post_reqs[i]);
}
+
post_reqs.clear();
}
}
void
-My_lily_parser::add_notename (String s, Melodic_req * m_p)
+My_lily_parser::add_notename (String s, Musical_pitch p)
{
- lexer_p_->add_notename (s, m_p);
+ lexer_p_->add_notename (s, p);
+
}
Paper_def*
My_lily_parser::default_paper_p ()
{
- Identifier *id = lexer_p_->lookup_identifier ("default_paper");
- return id ? id->paperdef () : new Paper_def ;
+ Identifier *id = lexer_p_->lookup_identifier ("$defaultpaper");
+ return id ? id->access_Paper_def () : new Paper_def ;
}
Midi_def*
My_lily_parser::default_midi_p ()
{
- Identifier *id = lexer_p_->lookup_identifier ("default_midi");
- return id ? id->mididef () : new Midi_def ;
+ Identifier *id = lexer_p_->lookup_identifier ("$defaultmidi");
+ return id ? id->access_Midi_def () : new Midi_def ;
}
projects / lilypond.git / blobdiff