CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/27 11:03:20
Modified files:
. : ChangeLog
scm : lily.scm
scripts : lilypond-book.py
Log message:
(main): make sure --psfonts warning is correct.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3666&tr2=1.3667&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.345&tr2=1.346&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/lilypond-book.py.diff?tr1=1.258&tr2=1.259&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3666 lilypond/ChangeLog:1.3667
--- lilypond/ChangeLog:1.3666 Thu May 26 19:57:34 2005
+++ lilypond/ChangeLog Fri May 27 11:03:14 2005
@@ -1,3 +1,7 @@
+2005-05-27 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * scripts/lilypond-book.py (main): make sure --psfonts warning is
correct.
+
2005-05-26 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/lilypond.tely, advanced-notation.itely,
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.345 lilypond/scm/lily.scm:1.346
--- lilypond/scm/lily.scm:1.345 Tue May 24 21:25:14 2005
+++ lilypond/scm/lily.scm Fri May 27 11:03:15 2005
@@ -405,6 +405,7 @@
(exit 1))
(exit 0)))))
+
(define (gui-no-files-handler)
(let* ((ly (string-append (ly:effective-prefix) "/ly/"))
;; FIXME: soft-code, localize
Index: lilypond/scripts/lilypond-book.py
diff -u lilypond/scripts/lilypond-book.py:1.258
lilypond/scripts/lilypond-book.py:1.259
--- lilypond/scripts/lilypond-book.py:1.258 Sun May 22 23:30:46 2005
+++ lilypond/scripts/lilypond-book.py Fri May 27 11:03:20 2005
@@ -1583,14 +1583,16 @@
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')
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
