bump version

[lilypond.git] / lily / program-option.cc

diff --git a/lily/program-option.cc b/lily/program-option.cc
index 894f9d0db9dc0260bdf16670660ac5325869885a..02213e4c71a68d1cfdddc2276e7e1b35580f36bd 100644 (file)
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -21,6 +21,7 @@ using namespace std;
 /* Write midi as formatted ascii stream? */
 bool do_midi_debugging_global;
 bool use_object_keys;
+bool debug_skylines;
 
 /*
   Backwards compatibility.
@@ -32,6 +33,7 @@ bool profile_property_accesses = false;
   crash if internally the wrong type is used for a grob property.
 */
 bool do_internal_type_checking_global;
+bool strict_infinity_checking = false; 
 
 static SCM option_hash;
 
@@ -46,7 +48,7 @@ void internal_set_option (SCM var, SCM val)
       profile_property_accesses = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
     }
-  else if (var == ly_symbol2scm ("midi-debug"))
+  else if (var == ly_symbol2scm ("debug-midi"))
     {
       do_midi_debugging_global = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
@@ -56,16 +58,21 @@ void internal_set_option (SCM var, SCM val)
       point_and_click_global = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
     }
-  else if (var == ly_symbol2scm ("parse-protect"))
+  else if (var == ly_symbol2scm ("protected-scheme-parsing"))
     {
       parse_protect_global = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
     }
-  else if (var == ly_symbol2scm ("internal-type-checking"))
+  else if (var == ly_symbol2scm ("check-internal-types"))
     {
       do_internal_type_checking_global = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
     }
+  else if (var == ly_symbol2scm ("debug-gc-assert-parsed-dead"))
+    {
+      parsed_objects_should_be_dead = to_boolean (val);
+      val = scm_from_bool (parsed_objects_should_be_dead);
+    }
   else if (var == ly_symbol2scm ("old-relative"))
     {
       lily_1_8_relative = to_boolean (val);
@@ -78,6 +85,16 @@ void internal_set_option (SCM var, SCM val)
       use_object_keys = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
     }
+  else if (var == ly_symbol2scm ("strict-infinity-checking"))
+    {
+      strict_infinity_checking = to_boolean (val);
+      val = scm_from_bool (to_boolean (val));
+    }
+  else if (var == ly_symbol2scm ("debug-skylines"))
+    {
+      debug_skylines = to_boolean (val);
+      val = scm_from_bool (to_boolean (val));
+    }
 }
 
 ssize const HELP_INDENT = 30;
@@ -87,19 +104,19 @@ ssize const SEPARATION = 5;
 /*
   Hmmm. should do in SCM / C++  ?
 */
-static std::string
+static string
 get_help_string ()
 {
   SCM alist = ly_hash2alist (option_hash);
   SCM convertor = ly_lily_module_constant ("scm->string");
 
-  Array<std::string> opts;
+  vector<string> opts;
 
   for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM sym = scm_caar (s);
       SCM val = scm_cdar (s);
-      std::string opt_spec
+      string opt_spec
        = String_convert::char_string (' ', INDENT)
        + ly_symbol2string (sym)
        + " ("
@@ -116,28 +133,28 @@ get_help_string ()
 
       SCM opt_help_scm
        = scm_object_property (sym, ly_symbol2scm ("program-option-documentation"));
-      std::string opt_help = ly_scm2string (opt_help_scm);
+      string opt_help = ly_scm2string (opt_help_scm);
       replace_all (opt_help,
-                  std::string ("\n"),
-                  std::string ("\n")
+                  string ("\n"),
+                  string ("\n")
                   + String_convert::char_string (' ', HELP_INDENT));
 
-      opts.push (opt_spec + opt_help + "\n");
+      opts.push_back (opt_spec + opt_help + "\n");
     }
 
-  std::string help ("Options supported by ly:set-option\n\n");
-  opts.sort (string_compare);
-  for (int i = 0; i < opts.size (); i++)
+  string help ("Options supported by ly:set-option\n\n");
+  vector_sort (opts, less<string> ());
+  for (vsize i = 0; i < opts.size (); i++)
     help += opts[i];
 
-  help += std::string ("\n");
+  help += string ("\n");
   return help;
 }
 
 LY_DEFINE (ly_option_usage, "ly:option-usage", 0, 0, 0, (),
           "Print ly:set-option usage")
 {
-  std::string help = get_help_string ();
+  string help = get_help_string ();
   fputs (help.c_str (), stdout);
 
   exit (0);
@@ -176,10 +193,10 @@ LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
   if (val == SCM_UNDEFINED)
     val = SCM_BOOL_T;
 
-  std::string varstr = ly_scm2string (scm_symbol_to_string (var));
-  if (varstr.substr (0, 3) == std::string ("no-"))
+  string varstr = ly_scm2string (scm_symbol_to_string (var));
+  if (varstr.substr (0, 3) == string ("no-"))
     {
-      var = ly_symbol2scm (varstr.substr (3).c_str ());
+      var = ly_symbol2scm (varstr.substr (3, varstr.length () -3).c_str ());
       val = scm_from_bool (!to_boolean (val));
     }
 
@@ -197,6 +214,9 @@ LY_DEFINE (ly_command_line_verbose_p, "ly:command-line-verbose?", 0, 0, 0, (),
   return scm_from_bool (be_verbose_global);
 }
 
+
+
+
 LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
           "Get a global option setting.")
 {
@@ -204,3 +224,12 @@ LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
                   SCM_ARG1, __FUNCTION__, "symbol");
   return scm_hashq_ref (option_hash, var, SCM_BOOL_F);
 }
+
+
+bool
+get_program_option (const char *s)
+{
+  SCM sym = ly_symbol2scm (s);
+
+  return to_boolean (ly_get_option (sym));
+}