X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Fmain.hh;h=bd71147357061c070f5c3ab7e80d3656544c9b55;hb=f4ff2e488239d66830ac8b3ae5771358a917b58f;hp=86d578a53616df02febdcf9a53881bcb33418cd5;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 86d578a536..bd71147357 100644
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -19,17 +19,16 @@ 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>);
 
-/* FIXME: in warn.cc */
-void progress_indication (String);
+Array<String> get_inclusion_names ();
+void set_inclusion_names (Array<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 bool no_layout_global_b;
 extern String output_format_global;
 extern String output_name_global;
 extern bool safe_global_b;
@@ -37,12 +36,26 @@ extern bool verbose_global_b;
 extern bool store_locations_global_b;
 extern bool internal_type_checking_global_b;
 
+/*
+  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;
+extern bool make_preview;
+extern bool make_pages;
 
 /* misc */
-extern All_font_metrics *all_fonts_global;
 extern Array<String> failed_files;
 extern int exit_status_global;
 extern File_path global_path;
-extern int score_count_global;
+
+/*
+  Debugging options
+ */
+
+#define DEBUG_SLUR_SCORING 1
 
 #endif /* MAIN_HH */