patch::: 1.3.130.jcn3

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

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 3d543bb01ad69899942f1644a22bd5eec9e80b0f..af12beda0bf3df4edcbb57a2e70743c59bd5dad9 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -18,34 +18,27 @@ 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>);
 
-extern Sources* source_global_l;
+/* options */
+extern bool dependency_global_b;
+extern Array<String> dump_header_fieldnames_global;
 extern bool no_paper_global_b;
-extern bool safe_global_b;
 extern bool no_timestamps_global_b;
-extern bool find_old_relative_b;
-
-extern int exit_status_i_;
-extern bool experimental_features_global_b;
-extern bool dependency_global_b;
+extern String output_format_global;
+extern String output_name_global;
+extern bool safe_global_b;
 extern bool verbose_global_b;
 
-
-extern Array<String> get_inclusion_names ();
-extern void set_inclusion_names (Array<String>);
-
-extern File_path global_path;
-
-/*
-  names of header fields to be dumped to a separate file.
-*/
-extern Array<String> global_dumped_header_fieldnames;
-
-extern String outname_global;
-extern String outext_global;
-extern int default_count_global;
+/* misc */
 extern All_font_metrics *all_fonts_global_p;
+extern int exit_status_global;
+extern File_path global_path;
+extern int score_count_global;
+extern Sources* source_global_l;
 
 class ostream;
 void print_lilypond_versions (ostream &os);
-#endif
+
+#endif /* MAIN_HH */