* lily/parser.yy (command_element): move clef stuff into Scheme.

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

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 74cd96acc5ef763f00b2d6cf154006c188c9dedb..76c21ce2ae2d89cef8d85b62ad42417166df1b48 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -22,7 +22,9 @@
 #include "scm-hash.hh"
 #include "lily-version.hh"
 #include "paper-def.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
+#include "ly-modules.hh"
+
 
 
 /*
@@ -92,9 +94,12 @@ Paper_outputter::output_scheme (SCM scm)
 }
 
 void
-Paper_outputter::output_scope (Scheme_hash_table *scope, String prefix)
+Paper_outputter::output_scope (SCM mod, String prefix)
 {
-  SCM al = scope->to_alist ();
+  if (!SCM_MODULEP (mod))
+    return ;
+  
+  SCM al = ly_module_to_alist (mod);
   for (SCM s = al ; gh_pair_p (s); s = ly_cdr (s))
     {
       SCM k = ly_caar (s);
@@ -170,11 +175,12 @@ Paper_outputter::write_header_field_to_file (String filename, SCM key, SCM value
 }
 
 void
-Paper_outputter::write_header_fields_to_file (Scheme_hash_table * header)
+Paper_outputter::write_header_fields_to_file (SCM mod)
 {
-  if (dump_header_fieldnames_global.size ())
+  if (ly_module_p (mod)&&
+      dump_header_fieldnames_global.size ())
     {
-      SCM fields = header->to_alist ();
+      SCM fields = ly_module_to_alist (mod);
       for (int i = 0; i < dump_header_fieldnames_global.size (); i++)
        {
          String key = dump_header_fieldnames_global[i];