From 0764cd81a5c1962f17718f8c608d7fad6cf6d315 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:31:28 +0000 Subject: [PATCH] lilypond-0.0.31 --- hdr/inputcommand.hh | 2 +- hdr/inputcommands.hh | 1 - hdr/notehead.hh | 2 +- hdr/request.hh | 20 +++++++------------- hdr/sourcefile.hh | 3 ++- src/notehead.cc | 5 +---- 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/hdr/inputcommand.hh b/hdr/inputcommand.hh index d937f9ab8a..8437454d9a 100644 --- a/hdr/inputcommand.hh +++ b/hdr/inputcommand.hh @@ -10,7 +10,7 @@ #include "scalar.hh" #include "varray.hh" #include "moment.hh" - +/// command without time assoced struct Input_command { /// analogous to argv[] Array args; diff --git a/hdr/inputcommands.hh b/hdr/inputcommands.hh index d40885407a..94d94c4202 100644 --- a/hdr/inputcommands.hh +++ b/hdr/inputcommands.hh @@ -7,7 +7,6 @@ #ifndef INPUTCOMMANDS_HH #define INPUTCOMMANDS_HH -//#include "pcursor.hh" #include "proto.hh" #include "plist.hh" #include "real.hh" diff --git a/hdr/notehead.hh b/hdr/notehead.hh index b3b7d3ad23..febbe4d955 100644 --- a/hdr/notehead.hh +++ b/hdr/notehead.hh @@ -19,7 +19,7 @@ takes care of: struct Notehead : Item { const char * name() const; - const char* defined_ch_c_l_m; //sorry, trying to find error in martien.ly + int position; /// -1 = lowest, 0 = inside, 1 = top int extremal; diff --git a/hdr/request.hh b/hdr/request.hh index d07bbd3469..b533a3fbb5 100644 --- a/hdr/request.hh +++ b/hdr/request.hh @@ -124,7 +124,7 @@ struct Lyric_req : public Rhythmic_req, Text_req { REQUESTMETHODS(Lyric_req, lreq_l); }; - +/// request which has some kind of pitch struct Melodic_req :virtual Request { /// 0 is c @@ -244,21 +244,15 @@ struct Staff_command_req : Request { #if 0 -///Put a lyric above or below (?) this staff. -struct Lyric_req : Request { - String text; -}; - - ///Draw a (Guitar) chord above or below this ``note'' -struct Chord : Request { - // don't know how this looks. -}; /** Why a request? Because everything else is done in requests. */ +struct Chord : Request { + // don't know how this looks. +}; /// for absolute dynamics @@ -268,13 +262,13 @@ enum Loudness { ///Start / stop a slur or a bracket. -struct Bracket_req : Span_req { - int nplet; // print a number over the beam. -}; /** Start/stop a bracket at this note. if #nplet# is set, the staff will try to put an appropriate number over the bracket */ +struct Bracket_req : Span_req { + int nplet; // print a number over the beam. +}; struct Subtle_req { Moment subtime; diff --git a/hdr/sourcefile.hh b/hdr/sourcefile.hh index 38a420248b..f92631dbe0 100644 --- a/hdr/sourcefile.hh +++ b/hdr/sourcefile.hh @@ -1,11 +1,12 @@ // -// sourcefile.hh -- part of LilyPond +// sourcefile.hh -- declare Source_file // // copyright 1997 Jan Nieuwenhuizen #ifndef SOURCE_FILE_HH #define SOURCE_FILE_HH +/// class for reading and mapping a file. class Source_file { public: diff --git a/src/notehead.cc b/src/notehead.cc index d96b4d0599..2eabd2ff73 100644 --- a/src/notehead.cc +++ b/src/notehead.cc @@ -2,7 +2,7 @@ #include "notehead.hh" #include "dimen.hh" #include "debug.hh" -#include "paper.hh" +#include "paperdef.hh" #include "lookup.hh" #include "molecule.hh" #include "request.hh" @@ -17,7 +17,6 @@ Notehead::Notehead(int ss) balltype = 0; dots = 0; extremal = 0; - defined_ch_c_l_m = 0; } void @@ -25,8 +24,6 @@ Notehead::set_rhythmic(Rhythmic_req*r_req_l) { balltype = r_req_l->balltype; dots = r_req_l->dots; - if ( r_req_l->defined_ch_c_l_m ) - defined_ch_c_l_m = r_req_l->defined_ch_c_l_m; } void -- 2.39.5