From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 29 Oct 2004 01:02:20 +0000 (+0000)
Subject: add 'resolution to ly:get-option argument
X-Git-Tag: release/2.3.25
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=77d57deeda3d823072e877601f6a7fac07b0a65a;p=lilypond.git

add 'resolution to ly:get-option argument
list.
---

diff --git a/lily/scm-option.cc b/lily/scm-option.cc
index 6118d561d0..14c069e4b6 100644
--- 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 f4752253b6..630356591c 100644
--- 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 671eca81b8..048dc3f996 100644
--- 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 65be2c56d1..174ae3b0b8 100644
--- 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 "
 	       " ")