From 5c155701388c04bc6e02c385f94903cf18c243da Mon Sep 17 00:00:00 2001 From: hanwen Date: Fri, 27 May 2005 11:03:20 +0000 Subject: [PATCH] (main): make sure --psfonts warning is correct. --- ChangeLog | 4 ++++ scm/lily.scm | 1 + scripts/lilypond-book.py | 12 +++++++----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f77efccffd..7f7b49da7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-05-27 Han-Wen Nienhuys + + * scripts/lilypond-book.py (main): make sure --psfonts warning is correct. + 2005-05-26 Graham Percival * Documentation/user/lilypond.tely, advanced-notation.itely, diff --git a/scm/lily.scm b/scm/lily.scm index c385f0b809..a956f55073 100644 --- 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 092109df07..8dfaa411df 100644 --- 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') -- 2.39.5