CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/05/18 09:56:16

Modified files:
        scm            : backend-library.scm 
        lily           : main.cc 
        .              : ChangeLog 

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

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/backend-library.scm.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.253&tr2=1.254&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3627&tr2=1.3628&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3627 lilypond/ChangeLog:1.3628
--- lilypond/ChangeLog:1.3627   Wed May 18 04:36:40 2005
+++ lilypond/ChangeLog  Wed May 18 09:56:15 2005
@@ -1,3 +1,7 @@
+2005-05-18  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * lily/main.cc (setup_paths): Bugfix: pangorc is not pango.modules.
+
 2005-05-17  Graham Percival  <[EMAIL PROTECTED]>
 
        * Documentation/user/tutorial.itely, basic-notation.itely,
@@ -10,6 +14,9 @@
 
 2005-05-17  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
 
+       * 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.
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.253 lilypond/lily/main.cc:1.254
--- lilypond/lily/main.cc:1.253 Tue May 17 14:36:20 2005
+++ lilypond/lily/main.cc       Wed May 18 09:56:15 2005
@@ -308,7 +308,7 @@
       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 */
Index: lilypond/scm/backend-library.scm
diff -u lilypond/scm/backend-library.scm:1.27 
lilypond/scm/backend-library.scm:1.28
--- lilypond/scm/backend-library.scm:1.27       Tue May 17 14:36:19 2005
+++ lilypond/scm/backend-library.scm    Wed May 18 09:56:14 2005
@@ -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))


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to