Merge with master

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

diff --git a/lily/output-def-scheme.cc b/lily/output-def-scheme.cc
index 8bf702c6ffb0a10f9bc7c1d5ee692c24a119f911..e7533eed16597c2d68a1595dd16abfc660bffb97 100644 (file)
--- a/lily/output-def-scheme.cc
+++ b/lily/output-def-scheme.cc
@@ -3,15 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "font-metric.hh"
+#include "output-def.hh"
+
 #include "pango-font.hh"
 #include "modified-font-metric.hh"
-#include "output-def.hh"
 #include "ly-module.hh"
 #include "context-def.hh"
+#include "lily-parser.hh"
 
 LY_DEFINE (ly_layout_lookup, "ly:output-def-lookup",
           2, 1, 0, (SCM pap, SCM sym, SCM def),
@@ -70,7 +71,6 @@ LY_DEFINE (ly_output_description, "ly:output-description",
   Output_def *id = unsmob_output_def (output_def);
 
   SCM al = ly_module2alist (id->scope_);
-
   SCM ell = SCM_EOL;
   for (SCM s = al; scm_is_pair (s); s = scm_cdr (s))
     {
@@ -82,7 +82,7 @@ LY_DEFINE (ly_output_description, "ly:output-description",
   return ell;
 }
 
-LY_DEFINE (ly_layout_def_p, "ly:layout-def?",
+LY_DEFINE (ly_output_def_p, "ly:output-def?",
           1, 0, 0, (SCM def),
           "Is @var{def} a layout definition?")
 {
@@ -91,7 +91,7 @@ LY_DEFINE (ly_layout_def_p, "ly:layout-def?",
 
 LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",
           1, 0, 0, (SCM bp),
-          "Get outputscale for BP.")
+          "Get output-scale for BP.")
 {
   Output_def *b = unsmob_output_def (bp);
   SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");