(main): make sure --psfonts warning is correct.

diff --git a/ChangeLog b/ChangeLog
index f77efccffdf014c97a2106e1ef7079257a4b3311..7f7b49da7a35d9a032f2198ffbc28e13b3654df8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-27  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scripts/lilypond-book.py (main): make sure --psfonts warning is correct.
+
 2005-05-26  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/lilypond.tely, advanced-notation.itely,

diff --git a/scm/lily.scm b/scm/lily.scm
index c385f0b809ea6fe930088b72d5c09eff5d7ca2ce..a956f55073461df5e0efc63e70ff39b4e7ebd6b6 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -405,6 +405,7 @@ The syntax is the same as `define*-public'."
            (exit 1))
          (exit 0)))))
 
+
 (define (gui-no-files-handler)
   (let* ((ly (string-append (ly:effective-prefix) "/ly/"))
         ;; FIXME: soft-code, localize

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 092109df074e6c7491d636e3cb3bc704ac6632f1..8dfaa411dfd1246c0dee93d9e3a47447e9331479 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1583,14 +1583,16 @@ def main ():
                ly.exit (1)
 
        if format == TEXINFO or format == LATEX:
-               psfonts = os.path.join (output_name, psfonts_file)
+               psfonts = 'PSFONTS-FILE'
+               if not psfonts_file:
+                       ly.warning (_ ("option --psfonts=FILE not used"))
+                       ly.warning (_ ("processing with dvips will have no fonts"))
+               else:
+                       psfonts = os.path.join (output_name, psfonts_file)
+                       
                output = os.path.join (output_name,
                                       os.path.splitext (os.path.basename
                                                         (file))[0]) + '.dvi'
-               if not psfonts:
-                       ly.warning (_ ("option --psfonts=FILE not used"))
-                       ly.warning (_ ("processing with dvips will have no fonts"))
-                       psfonts = 'PSFONTS-FILE'
                ly.progress ('\n')
                ly.progress (_ ("DVIPS usage:"))
                ly.progress ('\n')