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 "lily-proto.hh"
#include "request.hh"
#include "duration.hh"
-
+#include "musical-pitch.hh"
/**
A request which is coupled to a #Request_chord#
*/
class Musical_req : public virtual Request {
public:
-
- virtual Lyric_req* lreq_l() { return 0; }
- virtual Note_req *note() { return 0;}
- virtual Stem_req *stem() { return 0;}
- virtual Melodic_req *melodic() { return 0; }
- virtual Slur_req *slur() { return 0 ; }
- virtual Beam_req *beam() { return 0 ; }
- virtual Abbreviation_beam_req* abbrev_beam() { return 0 ; }
- virtual Rhythmic_req*rhythmic() { return 0; }
- virtual Musical_script_req*musicalscript() { return 0; }
- virtual Text_req*text() { return 0; }
- virtual Rest_req *rest() { return 0; }
- virtual Skip_req* skip() { return 0; }
- virtual Dynamic_req* dynamic() { return 0; }
- virtual Absolute_dynamic_req * absdynamic() { return 0; }
- virtual Tie_req * tie() { return 0; }
- virtual Plet_req* plet() { return 0; }
- virtual Span_dynamic_req * span_dynamic() { return 0; }
- virtual Abbreviation_req* abbrev() { return 0; }
- virtual Multi_measure_rest_req* multi_measure() { return 0; }
- REQUESTMETHODS(Musical_req, musical);
+
+ DEFAULTACCESSOR(Lyric_req)
+ DEFAULTACCESSOR(Note_req )
+ DEFAULTACCESSOR(Stem_req )
+ DEFAULTACCESSOR(Melodic_req )
+ DEFAULTACCESSOR(Slur_req )
+ DEFAULTACCESSOR(Beam_req )
+ DEFAULTACCESSOR(Abbreviation_beam_req)
+ DEFAULTACCESSOR(Rhythmic_req)
+ DEFAULTACCESSOR(Musical_script_req)
+ DEFAULTACCESSOR(Text_req)
+ DEFAULTACCESSOR(Rest_req )
+ DEFAULTACCESSOR(Skip_req)
+ DEFAULTACCESSOR(Dynamic_req)
+ DEFAULTACCESSOR(Absolute_dynamic_req )
+ DEFAULTACCESSOR(Tie_req )
+ DEFAULTACCESSOR(Plet_req)
+ DEFAULTACCESSOR(Span_dynamic_req )
+ DEFAULTACCESSOR(Abbreviation_req)
+ DEFAULTACCESSOR(Multi_measure_rest_req)
+ REQUESTMETHODS(Musical_req);
};
virtual Moment duration() const;
Rhythmic_req();
static int compare (Rhythmic_req const&,Rhythmic_req const&);
- REQUESTMETHODS(Rhythmic_req, rhythmic);
+ REQUESTMETHODS(Rhythmic_req);
};
class Skip_req : public Rhythmic_req {
public:
- REQUESTMETHODS(Skip_req, skip);
+ REQUESTMETHODS(Skip_req);
};
struct Spacing_req :virtual Request {
Real strength;
/* *************** */
Spacing_req();
- REQUESTMETHODS(Spacing_req, spacing);
+ REQUESTMETHODS(Spacing_req);
};
struct Abbreviation_req : public Musical_req {
- REQUESTMETHODS (Abbreviation_req, abbrev);
+ REQUESTMETHODS (Abbreviation_req);
Abbreviation_req ();
int type_i_;
};
class Blank_req : public Spacing_req, Rhythmic_req {
public:
- REQUESTMETHODS(Spacing_req, spacing);
+ REQUESTMETHODS(Spacing_req);
};
/// Put a text above or below (?) this staff.
~Text_req();
Text_req (Text_req const&);
- REQUESTMETHODS(Text_req,text);
+ REQUESTMETHODS(Text_req);
};
-/** Put a text in lyric_staff
- @see Lyric_staff
+/** a syllable or lyric is a string with rhythm.
*/
-class Lyric_req : public Rhythmic_req, public Text_req {
+class Lyric_req : public Rhythmic_req {
public:
- Lyric_req (Text_def* t_p);
- REQUESTMETHODS(Lyric_req, lreq_l);
+ String text_str_;
+ REQUESTMETHODS(Lyric_req);
};
+
+
/// request which has some kind of pitch
struct Melodic_req :virtual Musical_req
{
- /// 0 is c, 6 is b
- int notename_i_;
- /// 0 is central c
- int octave_i_;
-
- /// 0 natural, 1 sharp, etc
- int accidental_i_;
-
- /// return height from central c (in halflines)
- int height() const;
-
+ Musical_pitch pitch_;
/// transpose. #delta# is relative to central c.
- virtual void transpose (Melodic_req const *delta);
- /// return pitch from central c (in halfnotes)
- int pitch() const;
+ virtual void transpose (Musical_pitch delta);
Melodic_req();
bool do_equal_b (Request*) const;
static int compare (Melodic_req const&,Melodic_req const&);
- REQUESTMETHODS(Melodic_req,melodic);
+ REQUESTMETHODS(Melodic_req);
};
/// Put a note of specified type, height, and with accidental on the staff.
bool forceacc_b_;
Note_req();
bool do_equal_b (Request*) const;
- Rhythmic_req* rhythmic() { return Rhythmic_req::rhythmic (); }
- REQUESTMETHODS(Note_req, note);
+ Rhythmic_req* access_Rhythmic_req () { return Rhythmic_req::access_Rhythmic_req (); }
+ REQUESTMETHODS(Note_req);
};
/**
*/
class Rest_req : public Rhythmic_req {
public:
- REQUESTMETHODS(Rest_req,rest);
+ REQUESTMETHODS(Rest_req);
};
/**
*/
class Multi_measure_rest_req : public Rhythmic_req {
public:
- REQUESTMETHODS(Multi_measure_rest_req, multi_measure);
+ REQUESTMETHODS(Multi_measure_rest_req);
};
NOSPAN, START, STOP
} spantype;
bool do_equal_b (Request*) const;
- REQUESTMETHODS(Span_req,span);
+ REQUESTMETHODS(Span_req);
Span_req();
class Beam_req : public Span_req {
public:
/* *************** */
- REQUESTMETHODS(Beam_req,beam);
+ REQUESTMETHODS(Beam_req);
Beam_req();
};
*/
class Abbreviation_beam_req : public Span_req {
public:
- REQUESTMETHODS (Abbreviation_beam_req, abbrev_beam);
+ REQUESTMETHODS (Abbreviation_beam_req);
Abbreviation_beam_req ();
};
/**
- Start a tie at this voice element, end it at the next
+ Start a tie at this note, end it at the next
*/
class Tie_req : public Musical_req {
public:
- REQUESTMETHODS(Tie_req, tie);
+ REQUESTMETHODS(Tie_req);
};
/// a slur
class Slur_req : public Span_req {
public:
- REQUESTMETHODS(Slur_req,slur);
+ REQUESTMETHODS(Slur_req);
};
public:
int plet_i_;
- REQUESTMETHODS(Plet_req,plet);
-
+ REQUESTMETHODS(Plet_req);
Plet_req ();
};
class Musical_script_req : public Musical_req, public Script_req {
public:
- REQUESTMETHODS(Musical_script_req, musicalscript);
+ REQUESTMETHODS(Musical_script_req);
};
FFF, FF, F, MF, MP, P, PP, PPP, FP, SF, SFZ
};
static String loudness_static_str (Loudness);
- REQUESTMETHODS(Dynamic_req, dynamic);
+ REQUESTMETHODS(Dynamic_req);
};
class Absolute_dynamic_req : public Dynamic_req {
virtual bool do_equal_b (Request*) const;
String loudness_str () const;
Absolute_dynamic_req();
- REQUESTMETHODS(Absolute_dynamic_req, absdynamic);
+ REQUESTMETHODS(Absolute_dynamic_req);
};
class Span_dynamic_req : public Dynamic_req, public Span_req {
public:
+ virtual bool do_equal_b (Request*) const;
/// Grow or shrink the volume: 1=cresc, -1 = decresc
Direction dynamic_dir_;
Span_dynamic_req();
- REQUESTMETHODS(Span_dynamic_req, span_dynamic);
+ REQUESTMETHODS(Span_dynamic_req);
};
#endif // MUSICALREQUESTS_HH
projects / lilypond.git / blobdiff