release: 1.3.61

[lilypond.git] / lily / paper-outputter.cc

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 92e5180e11546467c87e2cacab913dd27e3c70c4..832905198153213e79695361adfd1da07473e6e8 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -153,27 +153,20 @@ Paper_outputter::output_scope (Scope *scope, String prefix)
     {
       SCM k = gh_caar (s);
       SCM v = gh_cdar (s);
-
-      Identifier * id = unsmob_identifier (v);
       String s = ly_symbol2string (k);
 
-      if (dynamic_cast<String_identifier*> (id))
+      
+      if (gh_string_p (v))
        {
-         String val = *id->access_content_String (false);
-         
-         output_String_def (prefix + s, val);
+         output_String_def (prefix + s, ly_scm2string (v));
        }
-      else if(dynamic_cast<Real_identifier*> (id))
+      else if (scm_integer_p (v) == SCM_BOOL_T)
        {
-         Real val  = *id->access_content_Real (false);
-
-         output_Real_def (prefix + s, val);      
+         output_int_def (prefix + s, gh_scm2int (v));    
        }
-      else if (dynamic_cast<int_identifier*> (id))
+      else if (gh_number_p (v))
        {
-         int val  = *id->access_content_int (false);     
-         
-         output_int_def (prefix + s, val);       
+         output_Real_def (prefix + s, gh_scm2double (v));        
        }
     }
 }