X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmain.hh;h=5e6192d1fb7113730af5732d4cbaf693dedce75e;hb=087a4bf794b39cbfd99eb032183101013386f475;hp=902cccc0c2ee06fb49540e477c8bbb193ae9a291;hpb=a0c5f43a69fc72f878d7b3f635030f67f1a535db;p=lilypond.git

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 902cccc0c2..5e6192d1fb 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--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #ifndef MAIN_HH
 #define MAIN_HH
@@ -15,38 +15,35 @@ 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 ();
 Array<String> get_inclusion_names ();
 void set_inclusion_names (Array<String>);
 
-
 extern String init_name_global;
 
 /* options */
 extern Array<String> dump_header_fieldnames_global;
-extern bool no_layout_global_b;
 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 bool make_png;
-extern bool make_dvi;
-extern bool make_ps;
-extern bool make_pdf;
-extern bool make_tex;
+  todo: collect in Output_option struct?
+*/
 extern String output_format_global;
 
 extern bool make_preview;
-extern bool make_pages;
+extern bool make_print;
 
 /* misc */
 extern Array<String> failed_files;
@@ -54,9 +51,11 @@ extern int exit_status_global;
 extern File_path global_path;
 
 /*
-  Debugging options
- */
+  Debugging options: switch on
+*/
 
+#ifndef NDEBUG
 #define DEBUG_SLUR_SCORING 1
+#endif
 
 #endif /* MAIN_HH */