X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusical-request.hh;h=5fb7299a69cbfc8c4730ce39a97a44e15116e9b0;hb=8ecd09ad7514d57630fb611d38c161f3c3c708db;hp=f6bb89cec550bbb5959444a51fbd243aaface993;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index f6bb89cec5..5fb7299a69 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ @@ -14,115 +14,101 @@ #include "request.hh" #include "duration.hh" #include "musical-pitch.hh" - -/** - A request which is coupled to a #Request_chord# - Base class only - */ -class Musical_req : public virtual Request { -public: - - 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); -}; - - +#include "array.hh" /** a request with a duration. - This request is used only a base class. + This request is used only used as a base class. */ -class Rhythmic_req : public virtual Musical_req { +class Rhythmic_req : public virtual Request { public: Duration duration_; - - /* *************** */ - void set_duration (Duration); - bool do_equal_b (Request*) const; - virtual Moment duration() const; - Rhythmic_req(); + + + bool do_equal_b (Request const*) const; + void compress (Moment); + virtual Moment length_mom () const; static int compare (Rhythmic_req const&,Rhythmic_req const&); - REQUESTMETHODS(Rhythmic_req); + VIRTUAL_COPY_CONS(Music); }; class Skip_req : public Rhythmic_req { public: - REQUESTMETHODS(Skip_req); + VIRTUAL_COPY_CONS(Music); }; -struct Spacing_req :virtual Request { - Moment next; - Real distance; - Real strength; - /* *************** */ - Spacing_req(); - REQUESTMETHODS(Spacing_req); -}; -struct Abbreviation_req : public Musical_req { - REQUESTMETHODS (Abbreviation_req); - Abbreviation_req (); +struct Tremolo_req : public Request { + VIRTUAL_COPY_CONS (Music); + Tremolo_req (); int type_i_; -}; -class Blank_req : public Spacing_req, Rhythmic_req { -public: - REQUESTMETHODS(Spacing_req); }; -/// Put a text above or below (?) this staff. -class Text_req : public virtual Musical_req { -public: - /// preferred position (above/below) - Direction dir_; - /// the characteristics of the text - Text_def *tdef_p_; - /* *************** */ - Text_req (int d, Text_def*); - ~Text_req(); - Text_req (Text_req const&); - - REQUESTMETHODS(Text_req); +/** + a syllable or lyric is a string with rhythm. + */ +class Lyric_req : public Rhythmic_req +{ +protected: + VIRTUAL_COPY_CONS (Music); }; -/** a syllable or lyric is a string with rhythm. - */ -class Lyric_req : public Rhythmic_req { + +class Articulation_req : public Script_req +{ public: - String text_str_; - REQUESTMETHODS(Lyric_req); + String articulation_str_; +protected: + virtual bool do_equal_b (Request const*) const; + + VIRTUAL_COPY_CONS(Music); }; +class Text_script_req : public Script_req +{ +protected: + VIRTUAL_COPY_CONS (Music); + virtual bool do_equal_b (Request const*) const; +}; +class Dynamic_script_req : public Script_req +{ +protected: + VIRTUAL_COPY_CONS (Music); +}; /// request which has some kind of pitch -struct Melodic_req :virtual Musical_req +struct Melodic_req :virtual Request { Musical_pitch pitch_; + + static int compare (Melodic_req const&,Melodic_req const&); + +protected: /// transpose. #delta# is relative to central c. 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); + virtual bool do_equal_b (Request const*) const; + + VIRTUAL_COPY_CONS(Music); +}; + +/// specify tonic of a chord +struct Tonic_req : public Melodic_req +{ + VIRTUAL_COPY_CONS (Music); +}; + +/// specify inversion of a chord +struct Inversion_req : public Melodic_req +{ + VIRTUAL_COPY_CONS (Music); +}; + +/// specify bass of a chord +struct Bass_req : public Melodic_req +{ + VIRTUAL_COPY_CONS (Music); }; /// Put a note of specified type, height, and with accidental on the staff. @@ -131,10 +117,13 @@ public: /// force/supress printing of accidental. bool forceacc_b_; + /// Cautionary, i.e. parenthesized accidental. + bool cautionary_b_; Note_req(); - bool do_equal_b (Request*) const; - Rhythmic_req* access_Rhythmic_req () { return Rhythmic_req::access_Rhythmic_req (); } - REQUESTMETHODS(Note_req); +protected: + + bool do_equal_b (Request const*) const; + VIRTUAL_COPY_CONS(Music); }; /** @@ -142,118 +131,55 @@ Put a rest on the staff. Why a request? It might be a good idea to not typeset t */ class Rest_req : public Rhythmic_req { public: - REQUESTMETHODS(Rest_req); + VIRTUAL_COPY_CONS(Music); }; -/** - Part: typeset a measure with the number of measures rest - Score: typeset all individual measures ass full rests - */ -class Multi_measure_rest_req : public Rhythmic_req { -public: - REQUESTMETHODS(Multi_measure_rest_req); - -}; -/** - Requests to start or stop something. - This type of request typically results in the creation of a #Spanner# -*/ -class Span_req : public virtual Musical_req { +/// an extender line +class Extender_req : public Request { public: - /// should the spanner start or stop, or is it unwanted? - enum Spantype { - NOSPAN, START, STOP - } spantype; - bool do_equal_b (Request*) const; - REQUESTMETHODS(Span_req); - - Span_req(); - + VIRTUAL_COPY_CONS(Music); }; -/** Start / stop a beam at this note */ -class Beam_req : public Span_req { +/// a centred hyphen +class Hyphen_req : public Request { public: - /* *************** */ - REQUESTMETHODS(Beam_req); - - Beam_req(); + VIRTUAL_COPY_CONS(Music); }; -/** - Start / stop an abbreviation beam at this note. +/** is anyone playing a note? + Used for communication between Music & Lyrics */ -class Abbreviation_beam_req : public Span_req { -public: - REQUESTMETHODS (Abbreviation_beam_req); - - Abbreviation_beam_req (); - - int type_i_; -}; - -/** - Start a tie at this voice element, end it at the next - */ -class Tie_req : public Musical_req { -public: - REQUESTMETHODS(Tie_req); -}; - -/// a slur -class Slur_req : public Span_req { +class Busy_playing_req : public Request +{ public: - REQUESTMETHODS(Slur_req); - + VIRTUAL_COPY_CONS (Music); }; -/// a plet (bracket with) number -class Plet_req : public Span_req { -public: - int plet_i_; - REQUESTMETHODS(Plet_req); - Plet_req (); -}; -class Musical_script_req : public Musical_req, public Script_req { +/** + instruct lyric context to alter typesetting (unimplemented). */ +class Melisma_req : public Span_req +{ public: - REQUESTMETHODS(Musical_script_req); + VIRTUAL_COPY_CONS(Music); }; -class Dynamic_req : public virtual Musical_req { -public: - /** - for absolute dynamics - - This sux. We'd want increasing numbers for FFF till PPP, but not - for FP, SF, SFZ (FP is *not* louder than FFF) - */ - enum Loudness { - FFF, FF, F, MF, MP, P, PP, PPP, FP, SF, SFZ - }; - static String loudness_static_str (Loudness); - REQUESTMETHODS(Dynamic_req); -}; - -class Absolute_dynamic_req : public Dynamic_req { +/** + Helping req to signal start of a melisma from within a context, and + to */ +class Melisma_playing_req : public Request +{ public: - Loudness loudness_; - virtual bool do_equal_b (Request*) const; - String loudness_str () const; - Absolute_dynamic_req(); - REQUESTMETHODS(Absolute_dynamic_req); + VIRTUAL_COPY_CONS (Music); }; -class Span_dynamic_req : public Dynamic_req, public Span_req { +class Arpeggio_req : public Request +{ 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); + VIRTUAL_COPY_CONS (Music); }; #endif // MUSICALREQUESTS_HH