Merge branch 'issue4357' into HEAD

[lilypond.git] / lily / output-def-scheme.cc

diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 552ccbe36b3283f65bf7bd568ab4bdf6e172aaf3..3c4ee413e7cc1a099b9f0501b5d99e2449c00ed4 100644 (file)
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.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
@@ -36,9 +36,9 @@ LY_DEFINE (ly_output_def_lookup, "ly:output-def-lookup",
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   SCM answer = op->lookup_variable (sym);
-  if (answer == SCM_UNDEFINED)
+  if (SCM_UNBNDP (answer))
     {
-      if (val == SCM_UNDEFINED)
+      if (SCM_UNBNDP (val))
        val = SCM_EOL;
 
       answer = val;
@@ -131,13 +131,8 @@ LY_DEFINE (ly_output_find_context_def, "ly:output-find-context-def",
   return ell;
 }
 
-
-LY_DEFINE (ly_output_def_p, "ly:output-def?",
-          1, 0, 0, (SCM def),
-          "Is @var{def} an output definition?")
-{
-  return ly_bool2scm (Output_def::unsmob (def));
-}
+const char
+Output_def::type_p_name_[] = "ly:output-def?";
 
 LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",
           1, 0, 0, (SCM def),
@@ -192,7 +187,7 @@ LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
   SCM tab2 = b->lookup_variable (ly_symbol2scm ("pango-fonts"));
 
   SCM alist1 = SCM_EOL;
-  if (scm_hash_table_p (tab1) == SCM_BOOL_T)
+  if (to_boolean (scm_hash_table_p (tab1)))
     {
       alist1 = scm_append (ly_alist_vals (ly_hash2alist (tab1)));