* lily/vaticana-ligature-engraver.cc: bugfix: another few

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

diff --git a/lily/scm-option.cc b/lily/scm-option.cc
index 14c069e4b6fd7fe332c4167cfb7a3bbcfc9f0ed7..7e6dbccaf97f623d776b36e65e1ca6376bab467d 100644 (file)
--- a/lily/scm-option.cc
+++ b/lily/scm-option.cc
@@ -3,15 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2004  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2005  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
  */
-#include <stdio.h>
 
-#include "parse-scm.hh"
-#include "string.hh"
-#include "lily-guile.hh"
 #include "scm-option.hh"
+
+#include <cstdio>
+
+#include "parse-scm.hh"
 #include "warn.hh"
 #include "main.hh"
 
@@ -47,7 +47,7 @@ bool lily_1_8_compatibility_used = false;
 /*
   crash if internally the wrong type is used for a grob property.
  */
-bool internal_type_checking_global_b;
+bool do_internal_type_checking_global;
 
 
 /*
@@ -74,10 +74,10 @@ LY_DEFINE (ly_option_usage, "ly:option-usage", 0, 0, 0, (SCM),
 
 /* Add these as well:
 
-@item -T,--no-timestamps
+@item -T, --no-timestamps
 don't timestamp the output
 
-@item -t,--test
+@item -t, --test
 Switch on any experimental features.  Not for general public use.
 
 */
@@ -118,7 +118,7 @@ LY_DEFINE (ly_set_option, "ly:set-option", 1, 1, 0, (SCM var, SCM val),
   else if (var == ly_symbol2scm ("parse-protect" ))
     parse_protect_global = to_boolean (val);
   else if (var == ly_symbol2scm ("internal-type-checking"))
-    internal_type_checking_global_b = to_boolean (val);
+    do_internal_type_checking_global = to_boolean (val);
   else if (var == ly_symbol2scm ("old-relative"))
     {
       lily_1_8_relative = true;
@@ -156,13 +156,13 @@ LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
   SCM o = SCM_UNSPECIFIED;
   
   if (var == ly_symbol2scm ("safe")) // heavily used; put in front. 
-    o = ly_bool2scm (safe_global_b);
+    o = ly_bool2scm (be_safe_global);
   else  if (var == ly_symbol2scm ("old-relative-used"))
     o = ly_bool2scm (lily_1_8_compatibility_used);
   else if (var == ly_symbol2scm ("old-relative"))
     o = ly_bool2scm (lily_1_8_relative);
   else if (var == ly_symbol2scm ("verbose"))
-    o = ly_bool2scm (verbose_global_b);
+    o = ly_bool2scm (be_verbose_global);
   else if ( var == ly_symbol2scm ("resolution"))
     o = scm_from_int (preview_resolution_global);
   else