X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmain.hh;h=5369507628be787f6216590bff99c8895df420ff;hb=d840dc8416a22e73636526a9415ae041af40570b;hp=a26d7f372c3af0f5583d7f3b62501f594998756e;hpb=e87d9c881c1ac0dc5d243c7a0f62cb41a02bb3b8;p=lilypond.git

diff --git a/lily/include/main.hh b/lily/include/main.hh
index a26d7f372c..5369507628 100644
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -3,43 +3,65 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 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 ();
+vector<string> get_inclusion_names ();
+void set_inclusion_names (vector<string>);
 
-Array<String> get_inclusion_names ();
-void set_inclusion_names (Array<String>);
-
-
-extern String init_name_global;
+extern string init_name_global;
 
 /* options */
-extern Array<String> dump_header_fieldnames_global;
-extern bool no_paper_global_b;
-extern String output_format_global;
-extern String output_name_global;
-extern bool safe_global_b;
-extern bool verbose_global_b;
-extern bool store_locations_global_b;
-extern bool internal_type_checking_global_b;
+extern vector<string> dump_header_fieldnames_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 bool point_and_click_global;
+extern string prefix_directory;
+extern bool use_object_keys;
+extern bool strict_infinity_checking;
+/*
+  todo: collect in Output_option struct?
+*/
+extern string output_format_global;
 
+extern bool make_preview;
+extern bool make_print;
 
 /* 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: switch on
+
+  Cannot switch on -DNDEBUG, because it causes weird errors if you mix
+  DNDEBUG and normal builds.
+*/
+
+#define DEBUG_SLUR_SCORING 1
+#define DEBUG_TIE_SCORING 1
+#define DEBUG_BEAM_SCORING 1
 
 #endif /* MAIN_HH */