From 20cb138422bdaef64d2505967e58ed2fba3c0e9d Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 21:27:36 +0000 Subject: [PATCH] lilypond-1.0.16 --- lily/include/command-request.hh | 2 +- lily/include/music.hh | 19 ++++++++++++------- lily/include/musical-request.hh | 2 +- lily/include/request.hh | 9 +++++---- lily/include/translator-change.hh | 3 +++ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index a76a351861..a0afdc8f5e 100644 --- a/lily/include/command-request.hh +++ b/lily/include/command-request.hh @@ -16,7 +16,7 @@ #include "musical-pitch.hh" /** Request which are assumed to be "happening" before the - musical requests. */ + musical requests. Not coupled to a note or rest. */ class Command_req : public virtual Request { public: REQUESTMETHODS(Command_req); diff --git a/lily/include/music.hh b/lily/include/music.hh index b05bc0db19..efb2f712ee 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -17,8 +17,8 @@ #include "lily-proto.hh" #include "string.hh" -/** - Anything which has length or pitch. +/** Music is anything that has duration and supports both time compression and + transposition. In Lily, everything that can be thought to have a length and a pitch (which has a duration which can be transposed) is considered "music", @@ -31,23 +31,28 @@ class Music:public Input { public: - /** The kind of iterator needed to walk this music. This doesn't + /** The kind of translation needed for this music. This doesn't make sense for simple (ie non-list) music, but it does no harm here. Yes, it did harm Music_sequence: you can forget to copy it. */ String translator_type_str_; - /// what name (or look for this name) + /// what identification for the translation unit String translator_id_str_; virtual Musical_pitch to_relative_octave (Musical_pitch); - virtual Moment duration () const; + + /// The duration of this piece of music + virtual Moment duration () const; virtual ~Music(){} void print() const; - virtual void transpose (Musical_pitch ); - virtual void compress (Moment); + /// Transpose, with the interval central C to #p# + virtual void transpose (Musical_pitch p); + + /// Scale the music in time by #factor#. + virtual void compress (Moment factor); VIRTUAL_COPY_CONS(Music,Music); DECLARE_MY_RUNTIME_TYPEINFO; Music(); diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 70e6467542..2f3c3f599c 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -16,7 +16,7 @@ #include "musical-pitch.hh" /** - A request which is coupled to a #Request_chord# + A request which is coupled to a note (that has duration). Base class only */ class Musical_req : public virtual Request { diff --git a/lily/include/request.hh b/lily/include/request.hh index c45d5905e1..7d976a648e 100644 --- a/lily/include/request.hh +++ b/lily/include/request.hh @@ -20,10 +20,11 @@ #define DEFAULTACCESSOR(T) virtual T *access_ ## T () { return 0; } -/** - An atom of musical information . - Hungarian postfix: req - @see lilygut manpage +/** An atom of musical information. This is an abstract class for any + piece of music that does not contain other Music. + + Hungarian postfix: req + */ class Request : public Music { diff --git a/lily/include/translator-change.hh b/lily/include/translator-change.hh index 8de7b806c5..f9d626524d 100644 --- a/lily/include/translator-change.hh +++ b/lily/include/translator-change.hh @@ -10,6 +10,9 @@ #ifndef TRANSLATOR_CHANGE_HH #define TRANSLATOR_CHANGE_HH +/** Change the nesting of the current translation. Uses the type_str_ + and id_str_ differently. + */ class Translator_change : public Music { -- 2.39.5