Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/program-option-scheme.cc b/lily/program-option-scheme.cc
index 4b47d9b5b9016938a0e72c369ee11712bd3ea197..b636948fa84c8490cb556ebf559a6204fc9dafd6 100644 (file)
--- a/lily/program-option-scheme.cc
+++ b/lily/program-option-scheme.cc
@@ -20,6 +20,8 @@ using namespace std;
 #include "warn.hh"
 
 bool debug_skylines;
+bool debug_property_callbacks;
+bool debug_page_breaking_scoring;
 
 /*
   Backwards compatibility.
@@ -88,20 +90,20 @@ void internal_set_option (SCM var, SCM val)
       debug_skylines = to_boolean (val);
       val = scm_from_bool (to_boolean (val));
     }
+  else if (var == ly_symbol2scm ("debug-property-callbacks"))
+    {
+      debug_property_callbacks = to_boolean (val);
+      val = scm_from_bool (to_boolean (val));
+    }
+  else if (var == ly_symbol2scm ("debug-page-breaking-scoring"))
+    {
+      debug_page_breaking_scoring = to_boolean (val);
+      val = scm_from_bool (to_boolean (val));
+    }
 }
 
 
 
-
-bool
-get_program_option (const char *s)
-{
-  SCM sym = ly_symbol2scm (s);
-
-  return to_boolean (ly_get_option (sym));
-}
-
-
 ssize const HELP_INDENT = 30;
 ssize const INDENT = 2;
 ssize const SEPARATION = 5;
@@ -174,8 +176,8 @@ LY_DEFINE (ly_add_option, "ly:add-option", 3, 0, 0,
     {
       option_hash = scm_permanent_object (scm_c_make_hash_table (11));
     }
-  LY_ASSERT_FIRST_TYPE (ly_is_symbol, sym);
-  LY_ASSERT_TYPE (scm_is_string, 3);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 1);
+  LY_ASSERT_TYPE (scm_is_string, description, 3);
 
   internal_set_option (sym, val);
 
@@ -188,7 +190,7 @@ LY_DEFINE (ly_add_option, "ly:add-option", 3, 0, 0,
 LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
           "Set a program option.")
 {
-  LY_ASSERT_FIRST_TYPE(ly_is_symbol, var);
+  LY_ASSERT_TYPE (ly_is_symbol, var, 1);
 
   if (val == SCM_UNDEFINED)
     val = SCM_BOOL_T;
@@ -239,6 +241,8 @@ LY_DEFINE (ly_all_options, "ly:all-options",
 LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
           "Get a global option setting.")
 {
-  LY_ASSERT_FIRST_TYPE(ly_is_symbol, var);
+  LY_ASSERT_TYPE (ly_is_symbol, var, 1);
   return scm_hashq_ref (option_hash, var, SCM_BOOL_F);
 }
+
+