lilypond-0.0.65

diff --git a/lily/include/break.hh b/lily/include/break.hh
index 343903313fd7a0da0d5a39d1849b664911660167..85b5ef01450b3716959de5f22de73a939e71f6c8 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 c62b70e6546f6ce065a1afbbc50aa251c7e9bfdd..a1407366eaf6833a7dffba62cf3ad57c66f4f336 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -7,7 +7,7 @@
 #ifndef COLHPOS_HH
 #define COLHPOS_HH
 #include "varray.hh"
-#include "proto.hh"
+#include "lily-proto.hh"
 
 typedef Array<PCol*>  Line_of_cols;
 

diff --git a/lily/include/debug.hh b/lily/include/debug.hh
index 00f0a38e82ecb7dc79210de5ec38aa83f4e2de56..18055e067f2f247739a59602229fa87f9987079d 100644 (file)
--- a/lily/include/debug.hh
+++ b/lily/include/debug.hh
@@ -9,7 +9,7 @@
 #include <iostream.h>
 #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 7b8bb557d4e2db9555bdf76afadd6f6490ec15c8..3bb2fe7601872729e8196e5a75e33180053775c6 100644 (file)
--- a/lily/include/glob.hh
+++ b/lily/include/glob.hh
@@ -4,6 +4,6 @@
 #include <math.h>
 #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 6b6f40c01a82d526e2443aa819af09a9cf3434cd..72124521c0588f217dbd887a99f52a9ceece3b19 100644 (file)
--- 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 49c7b954db0c86b4daedb71492f4fbc03c341a5b..1a413cfef4210faabf630bca0c8e8ad6692e613d 100644 (file)
--- 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 df490367b45d98c0bc22ccbec53b0ab4fbe1c887..52fb65435259015e738c5898944d251a9aa06003 100644 (file)
--- 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 2ba2c8c2e343c5a2d57cbd97a2aa0ef0b18d97ec..74cfa7acf5c5698541569c44de3270cf76c0b189 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 edc29919246791102dd9facf64ab34baf59364f7..4cf819876fd79b33a6cb74f99b2a8bfd758e3681 100644 (file)
--- 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 10fc7c3f47251c665de35f8a2ebc7308fcde4bb8..334777183dbe03e23728ff6c8122d549fbe55231 100644 (file)
--- 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 1aaf181d279df8028bfbd830f358fe53d8fae0a2..2467318e463a780ab8758b7220bf7b9779293494 100644 (file)
--- 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 <jan@digicash.com>
 
 #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 30ad18fe901c8cfcfa55ca06c520cbdf1015d706..2eac3747d600cd35f1a7a291ae5ccee9372f90fd 100644 (file)
--- 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 00b742076e3cb1c6fab555d5a47f468a27654c10..8ba5e10b78c53e5291b79a79160198105514228a 100644 (file)
--- 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 f69b7e0fb4f2feeda5da61730a37e144afca04db..b214366e7e1fbbc996954d4fd8db3ea3cfb5feb9 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -12,7 +12,7 @@
 #include <FlexLexer.h>
 
 #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 6fef2311fffad027b840522adff0c668078a3634..feb3301b00f4baed964523c625ef20a2ecc567ec 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 9eb94245d5d9f915bdbeef5ce278ddb210ce3465..1c067669e94634683a832e6529a91c677d680fbe 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 711f555865804e16e47b61855cb5fb26e39badb6..4bab4e9083456c2b1ac83d80920df6c6bda037ab 100644 (file)
--- 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 9d26d9798ad5bbd6c5f3e896befc0602c99ae8c6..085a0a3ff6bd166fcb9205198d1c4e9dafcce9ab 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 9f01f4419e1f39627dcb4937c15b13a40e721c1e..fd388d143e1e16f466ac360506d2434b6d6a6b68 100644 (file)
--- 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 <hanwen@stack.nl>
 
@@ -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 9f2e33c6b51e316ebbf350f2baa22738d14b91a2..4d6fc17af7550c0690c3fdc880046ce2518a8eca 100644 (file)
--- 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 fc4a554f4524b50a6a487acc6a7a4dc9731847df..ca19c0f9426bf107683193abe6db078519426995 100644 (file)
--- 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 <hanwen@stack.nl>
 
@@ -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 da38be4b410a506e344a27b4a626a8ded8c40be9..364146883750a5042a82e3e6b83cf57f0cc4600b 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 fb0d098e07c4767acced302cc81fe22b622b9cf6..e46f0a8fb02a5b1dfe54f4f517ff9db0f86c5b01 100644 (file)
--- 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 ef9f3c196f523583b38ae3803592f205ed9f28d7..8eb28bc235cf2efb15cad82809f8eed9f3313208 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 c166fa5bcfd67576637f15c6cc8faeae7eef78e4..6e04d049cff068a9ec34244e5ef4af096236494b 100644 (file)
--- 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 c7b241c23d120ab126ffb3f274f8d919540468f4..0d792590c68f59a8235049d82fa6fc13cb88e9b9 100644 (file)
--- 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 75210c21d04c2e913abe700d3e1e83f3143315b0..00e72618c14127b66417edfb884f9035e86947b5 100644 (file)
--- 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 <hanwen@stack.nl>
 */
@@ -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 a0aeddf796d3ef6fcc93f0c98ecc6372362b6dad..85c41f72f68d55bd4bcc34f4be130732951e9201 100644 (file)
--- 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"