use glyph indexing for glyph name .notdef

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

diff --git a/lily/program-option.cc b/lily/program-option.cc
index 4ec7b2d3e411179a008124d848285c992d7d20a1..9ec4901c857bbadcfd8d7673d8ed944232dd0ada 100644 (file)
--- a/lily/program-option.cc
+++ b/lily/program-option.cc
@@ -32,6 +32,8 @@ 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,12 +58,12 @@ 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));
@@ -78,6 +80,11 @@ 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));
+    }
 }
 
 ssize const HELP_INDENT = 30;
@@ -126,7 +133,7 @@ get_help_string ()
     }
 
   string help ("Options supported by ly:set-option\n\n");
-  vector_sort (opts, string_compare);
+  vector_sort (opts, less<string> ());
   for (vsize i = 0; i < opts.size (); i++)
     help += opts[i];