add 'resolution to ly:get-option argument

list.

diff --git a/lily/scm-option.cc b/lily/scm-option.cc
index 6118d561d02ac5bcbb843ccf4df3262ccc869984..14c069e4b6fd7fe332c4167cfb7a3bbcfc9f0ed7 100644 (file)
--- a/lily/scm-option.cc
+++ b/lily/scm-option.cc
@@ -163,9 +163,16 @@ LY_DEFINE (ly_get_option, "ly:get-option", 1, 0, 0, (SCM var),
     o = ly_bool2scm (lily_1_8_relative);
   else if (var == ly_symbol2scm ("verbose"))
     o = ly_bool2scm (verbose_global_b);
-  else if ( var == ly_bool2scm ("resolution"))
+  else if ( var == ly_symbol2scm ("resolution"))
     o = scm_from_int (preview_resolution_global);
   else
-    warning (_f ("No such internal option: %s", ly_scm2string (var)));
+    {
+      if (scm_is_symbol (var))
+       var = scm_symbol_to_string (var);
+
+      String s = ly_scm2string (var);
+      
+      warning (_f ("No such internal option: %s", s.to_str0() ));
+    }
   return o;
 }

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index f4752253b6bbeee6a5e4d89920cc1775574b0823..630356591c876e002cac3648e8073da6a820e464 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -291,7 +291,7 @@
 
     (postscript->png (if (number? resolution) resolution
 
-                        (ly:get-option 'preview-resolution))
+                        (ly:get-option 'resolution))
                     name)))
 
 (define-public (convert-to-dvi book name)

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 671eca81b86cafe7eb19e9c7a3daa4f88bc7cd85..048dc3f996a491dcbb9d0f955f8e35b93d23522a 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -269,7 +269,7 @@
     (postscript->png
      (if (number? resolution)
         resolution
-        (ly:get-option 'preview-resolution))b
+        (ly:get-option 'resolution))
      (string-append (basename name ".tex") ".ps"))))
 
 (define-public (convert-to-ps book name)

diff --git a/scm/lily.scm b/scm/lily.scm
index 65be2c56d1b5ffa7a3af538d38e0936abf09a1c8..174ae3b0b8763cfd0ccd486931e84daa3a9bf6fd 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -583,7 +583,7 @@ possibly turned off."
           "ps2png --resolution="
           (if (number? resolution)
               (number->string resolution)
-              "90")
+              "90 ")
           (if (ly:get-option 'verbose)
               "--verbose "
               " ")