(setup_paths): Bugfix: pangorc is not pango.modules.

diff --git a/ChangeLog b/ChangeLog
index 2070dfc8890afa80105bd46533c59ab41e70e725..87904101784584b88283b595626b4c09d61fbf81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-18  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/main.cc (setup_paths): Bugfix: pangorc is not pango.modules.
+
 2005-05-17  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/tutorial.itely, basic-notation.itely,
@@ -10,6 +14,9 @@
 
 2005-05-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * scm/backend-library.scm (postscript->pdf): Remove (useless) .ps
+       when running-from-gui.
+
        * scm/editor.scm (get-editor): Add platform defaults.
 
        * scm/backend-library.scm (postscript->pdf): Typo.

diff --git a/lily/main.cc b/lily/main.cc
index f2415d1fec3acf8cf64205e94ca0073cbaeff2cc..50ea991b82cfa233b393a4aa56c4ce7167eb9246 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -308,7 +308,7 @@ setup_paths (char const* argv0)
       prepend_env_path ("GUILE_LOAD_PATH", datadir
                        + to_string ("/guile/%d.%d",
                                     SCM_MAJOR_VERSION, SCM_MINOR_VERSION));
-      sane_putenv ("PANGO_RC_FILE", sysconfdir + "/pango/pango.modules", false);
+      sane_putenv ("PANGO_RC_FILE", sysconfdir + "/pango/pangorc", false);
       prepend_env_path ("PATH", bindir);
     }
 #endif /* ARGV0_RELOCATION */

diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index e200b2dd4ad8a0f715d126f73546863a893ca9ca..47b6a208955361e5688864ac4efa8c8c694d7212 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -60,7 +60,8 @@
 
     (ly:message (_ "Converting to `~a'...") pdf-name)
     (ly:progress "\n")
-    (ly:system cmd)))
+    (ly:system cmd)
+    (if (running-from-gui?) (delete-file name))))
 
 (define-public (postscript->png resolution papersizename name)
   (let* ((prefix (ly:effective-prefix))