Merge branch 'master' into jneeman

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

diff --git a/lily/include/main.hh b/lily/include/main.hh
index bd396a16f771ad6e7c64b3784df00472dac07dd1..fb1d94b5934ca8f42df965c2aadd2add6ecb5e95 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef MAIN_HH
 #define MAIN_HH
@@ -27,6 +27,7 @@ extern string init_name_global;
 
 /* options */
 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;
@@ -35,17 +36,17 @@ 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 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_print;
-
 /* misc */
 extern vector<string> failed_files;
 extern int exit_status_global;
@@ -61,5 +62,7 @@ extern const char *LILYPOND_DATADIR;
 */
 
 #define DEBUG_SLUR_SCORING 1
+#define DEBUG_TIE_SCORING 1
+#define DEBUG_BEAM_SCORING 1
 
 #endif /* MAIN_HH */