X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmain.hh;h=a54ff5a39d66f732c6b41e46558f58969c30ebfa;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=5465c3cfd972320d5446f3d357674f9ebbdb1d44;hpb=58285d9a44003dc28d5183daa5c1ae71249440e5;p=lilypond.git

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 5465c3cfd9..a54ff5a39d 100644
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -3,7 +3,7 @@
 
   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
@@ -15,34 +15,50 @@ void debug_init ();
 void set_debug (bool);
 void do_scores ();
 void clear_scores ();
-void add_score (Score* s);
+void add_score (Score *s);
 void set_default_output (String s);
 String find_file (String);
 void call_constructors ();
-extern Array<String> get_inclusion_names ();
-extern void set_inclusion_names (Array<String>);
-extern String init_name_global;
+Array<String> get_inclusion_names ();
+void set_inclusion_names (Array<String>);
 
-/* FIXME: in warn.cc */
-void progress_indication (String);
+extern String init_name_global;
 
 /* options */
-extern bool dependency_global_b;
-extern String dependency_prefix_global;
 extern Array<String> dump_header_fieldnames_global;
-extern bool no_paper_global_b;
-extern String output_format_global;
+extern String output_backend_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 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;
+
+/*
+  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 int exit_status_global;
 extern File_path global_path;
-extern int score_count_global;
+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
 
 #endif /* MAIN_HH */