X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmain.hh;h=fb1d94b5934ca8f42df965c2aadd2add6ecb5e95;hb=f5817f0eb5066fde9b0cb2b87b05ba8e776bd18b;hp=8d12c49adbcc10360018ab40cbb0b3b2698145af;hpb=a9a00e58b6c2b0a1e384a42ea6e3325addb6815e;p=lilypond.git

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 8d12c49adb..fb1d94b593 100644
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -3,58 +3,66 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef MAIN_HH
 #define MAIN_HH
 
 #include "lily-proto.hh"
-#include "array.hh"
+#include "std-vector.hh"
+#include "std-string.hh"
 
 void debug_init ();
 void set_debug (bool);
 void do_scores ();
 void clear_scores ();
-void add_score (Score* s);
-void set_default_output (String s);
-String find_file (String);
+void add_score (Score *s);
+void set_default_output (string s);
+string find_file (string);
 void call_constructors ();
-Array<String> get_inclusion_names ();
-void set_inclusion_names (Array<String>);
+vector<string> get_inclusion_names ();
+void set_inclusion_names (vector<string>);
 
-
-extern String init_name_global;
+extern string init_name_global;
 
 /* options */
-extern Array<String> dump_header_fieldnames_global;
-extern String output_backend_global;
-extern String output_name_global;
+extern vector<string> dump_header_fieldnames_global;
+extern vector<string> start_environment_global;
+extern string output_backend_global;
+extern string output_name_global;
 extern bool be_safe_global;
 extern bool be_verbose_global;
 extern bool do_internal_type_checking_global;
 extern bool is_pango_format_global;
 extern bool is_TeX_format_global;
-extern String prefix_directory;
+extern bool point_and_click_global;
+extern string lilypond_datadir;
+extern bool use_object_keys;
+extern bool strict_infinity_checking;
+extern string init_scheme_code_global;
+extern string init_scheme_variables_global;
 
 /*
-  todo: collect in Output_option struct? 
- */
-extern String output_format_global;
-
-extern bool make_preview;
-extern bool make_pages;
+  todo: collect in Output_option struct?
+*/
+extern string output_format_global;
 
 /* misc */
-extern Array<String> failed_files;
+extern vector<string> failed_files;
 extern int exit_status_global;
 extern File_path global_path;
+extern const char *LILYPOND_DATADIR;
+
 
 /*
-  Debugging options
- */
+  Debugging options: switch on
+
+  Cannot switch on -DNDEBUG, because it causes weird errors if you mix
+  DNDEBUG and normal builds.
+*/
 
-#ifndef NDEBUG
 #define DEBUG_SLUR_SCORING 1
-#endif
+#define DEBUG_TIE_SCORING 1
+#define DEBUG_BEAM_SCORING 1
 
 #endif /* MAIN_HH */