From fa5be50330bc3a12a74f2ecc8445e96977b26957 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:43:53 +0000 Subject: [PATCH] lilypond-0.0.65 --- lily/include/break.hh | 4 ++-- lily/include/colhpos.hh | 4 ++-- lily/include/debug.hh | 2 +- lily/include/glob.hh | 2 +- lily/include/idealspacing.hh | 4 ++-- lily/include/identifier.hh | 4 ++-- lily/include/input-music.hh | 4 ++-- lily/include/input-register.hh | 4 ++-- lily/include/input-staff.hh | 2 +- lily/include/main.hh | 2 +- lily/include/midi-item.hh | 4 ++-- lily/include/midi-walker.hh | 2 +- lily/include/misc.hh | 2 +- lily/include/my-lily-lexer.hh | 4 ++-- lily/include/my-lily-parser.hh | 6 +++--- lily/include/paper-def.hh | 8 ++++---- lily/include/parseconstruct.hh | 4 ++-- lily/include/pulk-voice.hh | 4 ++-- lily/include/pulk-voices.hh | 4 ++-- lily/include/score-column.hh | 4 ++-- lily/include/score-walker.hh | 4 ++-- lily/include/score.hh | 4 ++-- lily/include/staff-walker.hh | 2 +- lily/include/staffeleminfo.hh | 4 ++-- lily/include/symbol.hh | 2 +- lily/include/text-def.hh | 4 ++-- lily/include/voice-element.hh | 4 ++-- lily/include/voice.hh | 2 +- 28 files changed, 50 insertions(+), 50 deletions(-) diff --git a/lily/include/break.hh b/lily/include/break.hh index 343903313f..85b5ef0145 100644 --- a/lily/include/break.hh +++ b/lily/include/break.hh @@ -1,7 +1,7 @@ /* break.hh -- declare Break_algorithm - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1996, 1997 Han-Wen Nienhuys */ @@ -10,7 +10,7 @@ #ifndef BREAK_HH #define BREAK_HH #include "varray.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "colhpos.hh" /** Class representation of an algorithm which decides where to put diff --git a/lily/include/colhpos.hh b/lily/include/colhpos.hh index c62b70e654..a1407366ea 100644 --- a/lily/include/colhpos.hh +++ b/lily/include/colhpos.hh @@ -1,5 +1,5 @@ /* - colhpos.hh -- part of LilyPond + colhpos.hh -- part of GNU LilyPond (c) 1997 Han-Wen Nienhuys */ @@ -7,7 +7,7 @@ #ifndef COLHPOS_HH #define COLHPOS_HH #include "varray.hh" -#include "proto.hh" +#include "lily-proto.hh" typedef Array Line_of_cols; diff --git a/lily/include/debug.hh b/lily/include/debug.hh index 00f0a38e82..18055e067f 100644 --- a/lily/include/debug.hh +++ b/lily/include/debug.hh @@ -9,7 +9,7 @@ #include #include "dstream.hh" #include "real.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "warn.hh" void error_t(const String& s, Time_description const & t_tdes); diff --git a/lily/include/glob.hh b/lily/include/glob.hh index 7b8bb557d4..3bb2fe7601 100644 --- a/lily/include/glob.hh +++ b/lily/include/glob.hh @@ -4,6 +4,6 @@ #include #include "real.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "const.hh" #endif diff --git a/lily/include/idealspacing.hh b/lily/include/idealspacing.hh index 6b6f40c01a..72124521c0 100644 --- a/lily/include/idealspacing.hh +++ b/lily/include/idealspacing.hh @@ -1,12 +1,12 @@ /* - idealspacing.hh -- part of LilyPond + idealspacing.hh -- part of GNU LilyPond (c) 1996,97 Han-Wen Nienhuys */ #ifndef IDEALSPACING_HH #define IDEALSPACING_HH -#include "proto.hh" +#include "lily-proto.hh" /// ideal spacing between two columns struct Idealspacing { diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh index 49c7b954db..1a413cfef4 100644 --- a/lily/include/identifier.hh +++ b/lily/include/identifier.hh @@ -1,5 +1,5 @@ /* - identifier.hh -- part of LilyPond + identifier.hh -- part of GNU LilyPond (c) 1996,97 Han-Wen Nienhuys */ @@ -7,7 +7,7 @@ #ifndef IDENTIFIER_HH #define IDENTIFIER_HH -#include "proto.hh" +#include "lily-proto.hh" #include "string.hh" #include "input.hh" diff --git a/lily/include/input-music.hh b/lily/include/input-music.hh index df490367b4..52fb654352 100644 --- a/lily/include/input-music.hh +++ b/lily/include/input-music.hh @@ -1,5 +1,5 @@ /* - input-music.hh -- part of LilyPond + input-music.hh -- part of GNU LilyPond (c) 1996,97 Han-Wen Nienhuys */ @@ -8,7 +8,7 @@ #define INPUTMUSIC_HH #include "plist.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "voice.hh" #include "moment.hh" diff --git a/lily/include/input-register.hh b/lily/include/input-register.hh index 2ba2c8c2e3..74cfa7acf5 100644 --- a/lily/include/input-register.hh +++ b/lily/include/input-register.hh @@ -1,7 +1,7 @@ /* input-register.hh -- declare Input_register - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -12,7 +12,7 @@ #include "plist.hh" #include "string.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "input.hh" struct Input_register : Input { diff --git a/lily/include/input-staff.hh b/lily/include/input-staff.hh index edc2991924..4cf819876f 100644 --- a/lily/include/input-staff.hh +++ b/lily/include/input-staff.hh @@ -10,7 +10,7 @@ #include "string.hh" #include "plist.hh" #include "varray.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "input.hh" class Input_staff:public Input { diff --git a/lily/include/main.hh b/lily/include/main.hh index 10fc7c3f47..334777183d 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -1,6 +1,6 @@ #ifndef MAIN_HH #define MAIN_HH -#include "proto.hh" +#include "lily-proto.hh" void debug_init(); void set_debug(bool); diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh index 1aaf181d27..2467318e46 100644 --- a/lily/include/midi-item.hh +++ b/lily/include/midi-item.hh @@ -1,12 +1,12 @@ // -// midiitem.hh -- part of LilyPond +// midiitem.hh -- part of GNU LilyPond // // copyright 1997 Jan Nieuwenhuizen #ifndef MIDI_ITEM_HH #define MIDI_ITEM_HH #include "string.hh" -#include "proto.hh" +#include "lily-proto.hh" struct Midi_item { /* *************** */ diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh index 30ad18fe90..2eac3747d6 100644 --- a/lily/include/midi-walker.hh +++ b/lily/include/midi-walker.hh @@ -7,7 +7,7 @@ #ifndef MIDIWALKER_HH #define MIDIWALKER_HH -#include "proto.hh" +#include "lily-proto.hh" #include "grouping.hh" #include "staff-walker.hh" #include "pcursor.hh" diff --git a/lily/include/misc.hh b/lily/include/misc.hh index 00b742076e..8ba5e10b78 100644 --- a/lily/include/misc.hh +++ b/lily/include/misc.hh @@ -1,7 +1,7 @@ #ifndef MISC_HH #define MISC_HH -#include "proto.hh" +#include "lily-proto.hh" #include "real.hh" #include "moment.hh" #include "scalar.hh" diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index f69b7e0fb4..b214366e7e 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -1,7 +1,7 @@ /* lexer.hh -- declare My_lily_lexer - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -12,7 +12,7 @@ #include #include "lily-proto.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "fproto.hh" #include "varray.hh" #include "string.hh" diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index 6fef2311ff..feb3301b00 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -1,7 +1,7 @@ /* my-lily-parser.hh -- declare My_lily_parser - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -9,12 +9,12 @@ #ifndef MY_LILY_PARSER_HH #define MY_LILY_PARSER_HH -#include "proto.hh" +#include "lily-proto.hh" #include "duration.hh" #include "string.hh" #include "varray.hh" #include "lily-proto.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "duration.hh" #include "string.hh" #include "varray.hh" diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index 9eb94245d5..1c067669e9 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -1,7 +1,7 @@ /* paper-def.hh -- declare Paper_def - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1996,1997 Han-Wen Nienhuys */ @@ -9,7 +9,7 @@ paper-def.hh -- declare Paper_def #ifndef PAPER_DEF_HH #define PAPER_DEF_HH -#include "proto.hh" +#include "lily-proto.hh" #include "real.hh" #include "string.hh" #include "moment.hh" @@ -51,9 +51,9 @@ public: /** The distance between lines */ - Real interline()const; + Real interline_f()const; /// half the distance between lines - Real internote()const; + Real internote_f()const; /// thickness of the standard line Real rule_thickness()const; diff --git a/lily/include/parseconstruct.hh b/lily/include/parseconstruct.hh index 711f555865..4bab4e9083 100644 --- a/lily/include/parseconstruct.hh +++ b/lily/include/parseconstruct.hh @@ -1,5 +1,5 @@ /* - parseconstruct.hh -- part of LilyPond + parseconstruct.hh -- part of GNU LilyPond (c) 1996,97 Han-Wen Nienhuys */ @@ -7,7 +7,7 @@ #ifndef PARSECONSTRUCT_HH #define PARSECONSTRUCT_HH -#include "proto.hh" +#include "lily-proto.hh" String * get_scriptdef(char c); Request* get_script_req(char); diff --git a/lily/include/pulk-voice.hh b/lily/include/pulk-voice.hh index 9d26d9798a..085a0a3ff6 100644 --- a/lily/include/pulk-voice.hh +++ b/lily/include/pulk-voice.hh @@ -1,7 +1,7 @@ /* pulk-voice.hh -- declare Pulk_voice - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -10,7 +10,7 @@ #ifndef PULK_VOICE_HH #define PULK_VOICE_HH -#include "proto.hh" +#include "lily-proto.hh" #include "lily-proto.hh" #include "moment.hh" #include "priorities.hh" diff --git a/lily/include/pulk-voices.hh b/lily/include/pulk-voices.hh index 9f01f4419e..fd388d143e 100644 --- a/lily/include/pulk-voices.hh +++ b/lily/include/pulk-voices.hh @@ -1,7 +1,7 @@ /* pulk-voices.hh -- declare Pulk_voices - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys @@ -16,7 +16,7 @@ #include "pqueue.hh" #include "plist.hh" #include "moment.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "lily-proto.hh" #include "voice.hh" #include "time-description.hh" diff --git a/lily/include/score-column.hh b/lily/include/score-column.hh index 9f2e33c6b5..4d6fc17af7 100644 --- a/lily/include/score-column.hh +++ b/lily/include/score-column.hh @@ -1,12 +1,12 @@ /* - sccol.hh -- part of LilyPond + sccol.hh -- part of GNU LilyPond (c) 1996,97 Han-Wen Nienhuys */ #ifndef SCCOL_HH #define SCCOL_HH -#include "proto.hh" +#include "lily-proto.hh" #include "varray.hh" #include "moment.hh" diff --git a/lily/include/score-walker.hh b/lily/include/score-walker.hh index fc4a554f45..ca19c0f942 100644 --- a/lily/include/score-walker.hh +++ b/lily/include/score-walker.hh @@ -1,7 +1,7 @@ /* score-walker.hh -- declare Score_walker - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys @@ -12,7 +12,7 @@ #ifndef SCOREWALKER_HH #define SCOREWALKER_HH #include "pcursor.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "varray.hh" diff --git a/lily/include/score.hh b/lily/include/score.hh index da38be4b41..3641468837 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -1,7 +1,7 @@ /* score.hh -- declare Score - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -11,7 +11,7 @@ #define SCORE_HH #include "varray.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "plist.hh" #include "moment.hh" #include "assoc.hh" diff --git a/lily/include/staff-walker.hh b/lily/include/staff-walker.hh index fb0d098e07..e46f0a8fb0 100644 --- a/lily/include/staff-walker.hh +++ b/lily/include/staff-walker.hh @@ -7,7 +7,7 @@ #ifndef STAFFWALKER_HH #define STAFFWALKER_HH -#include "proto.hh" +#include "lily-proto.hh" #include "time-description.hh" #include "pcursor.hh" diff --git a/lily/include/staffeleminfo.hh b/lily/include/staffeleminfo.hh index ef9f3c196f..8eb28bc235 100644 --- a/lily/include/staffeleminfo.hh +++ b/lily/include/staffeleminfo.hh @@ -1,7 +1,7 @@ /* staffeleminfo.hh -- declare Score_elem_info - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -10,7 +10,7 @@ #ifndef STAFFELEMINFO_HH #define STAFFELEMINFO_HH -#include "proto.hh" +#include "lily-proto.hh" /// data container. struct Score_elem_info { diff --git a/lily/include/symbol.hh b/lily/include/symbol.hh index c166fa5bcf..6e04d049cf 100644 --- a/lily/include/symbol.hh +++ b/lily/include/symbol.hh @@ -3,7 +3,7 @@ #include "string.hh" #include "boxes.hh" -#include "proto.hh" +#include "lily-proto.hh" struct Symbol { String tex; diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh index c7b241c23d..0d792590c6 100644 --- a/lily/include/text-def.hh +++ b/lily/include/text-def.hh @@ -1,5 +1,5 @@ /* - text-def.hh -- part of LilyPond + text-def.hh -- part of GNU LilyPond (c) 1996,97 Han-Wen Nienhuys */ @@ -8,7 +8,7 @@ #define TEXT_DEF_HH #include "string.hh" -#include "proto.hh" +#include "lily-proto.hh" #include "input.hh" class Text_def : public Input { diff --git a/lily/include/voice-element.hh b/lily/include/voice-element.hh index 75210c21d0..00e72618c1 100644 --- a/lily/include/voice-element.hh +++ b/lily/include/voice-element.hh @@ -1,7 +1,7 @@ /* voice-element.hh -- declare Voice_element - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter (c) 1997 Han-Wen Nienhuys */ @@ -10,7 +10,7 @@ #ifndef VOICE_ELEMENT_HH #define VOICE_ELEMENT_HH -#include "proto.hh" +#include "lily-proto.hh" #include "plist.hh" #include "moment.hh" #include "input.hh" diff --git a/lily/include/voice.hh b/lily/include/voice.hh index a0aeddf796..85c41f72f6 100644 --- a/lily/include/voice.hh +++ b/lily/include/voice.hh @@ -1,7 +1,7 @@ #ifndef VOICE_HH #define VOICE_HH -#include "proto.hh" +#include "lily-proto.hh" #include "plist.hh" #include "moment.hh" -- 2.39.5