X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmain.hh;h=9bad23f902d9600f84a5f97b219b0f6f843633bd;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=f1ac6bc847f3b896756d7c17eeacd0061dd00592;hpb=3d237c36689f254418cb92351a1976a3fdd300ec;p=lilypond.git

diff --git a/lily/include/main.hh b/lily/include/main.hh
index f1ac6bc847..9bad23f902 100644
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -1,60 +1,72 @@
 /*
-  main.hh -- declare global entry points
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 #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 add_score (Score *s);
 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 store_locations_global;
 extern bool do_internal_type_checking_global;
-extern bool is_pango_format_global;
-extern char const *prefix_directories[];
+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_pages;
+  todo: collect in Output_option struct?
+*/
+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;
 
 /*
-  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
+#define DEBUG_TIE_SCORING 1
+#define DEBUG_BEAM_SCORING 1
 
 #endif /* MAIN_HH */