Merge branch 'master' of ssh://jneem@git.sv.gnu.org/srv/git/lilypond into tmp

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

diff --git a/lily/include/main.hh b/lily/include/main.hh
index a54ff5a39d66f732c6b41e46558f58969c30ebfa..fbd2aa3da946db7aa01540988ad396772c776c91 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -3,50 +3,50 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 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 set_default_output (string s);
+string find_file (string);
 void call_constructors ();
-Array<String> get_inclusion_names ();
-void set_inclusion_names (Array<String>);
+vector<string> get_inclusion_names ();
+void set_inclusion_names (vector<string>);
 
-extern String init_name_global;
+extern string init_name_global;
 
 /* options */
-extern Array<String> dump_header_fieldnames_global;
-extern String output_backend_global;
-extern String output_name_global;
+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;
 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 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;
+extern string output_format_global;
 
 /* 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;
@@ -60,5 +60,7 @@ extern const char *LILYPOND_DATADIR;
 */
 
 #define DEBUG_SLUR_SCORING 1
+#define DEBUG_TIE_SCORING 1
+#define DEBUG_BEAM_SCORING 1
 
 #endif /* MAIN_HH */