* The grand 2005-2006 replace.

[lilypond.git] / lily / include / main.hh

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 8f32903433fa11a3970e9a3d2911e997142a372c..a54ff5a39d66f732c6b41e46558f58969c30ebfa 100644 (file)
--- 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,47 +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 ();
 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 skip_layout_global;
 extern String output_backend_global;
 extern String output_name_global;
 extern bool be_safe_global;
 extern bool be_verbose_global;
-extern bool store_locations_global;
 extern bool do_internal_type_checking_global;
 extern bool is_pango_format_global;
-extern char const *prefix_directories[];
+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? 
- */
+  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;
 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
 
 #endif /* MAIN_HH */