From 0117107a9c8e48ce500dd7d5422bf58d673f101b Mon Sep 17 00:00:00 2001 From: jan Date: Sun, 21 Jul 2002 23:14:57 +0000 Subject: [PATCH] (make_pixmap): Don't use quiet_system, ie, don't redirect PNG output to /dev/null. Fixes lys-to-tely documents. --- ChangeLog | 4 ++++ make/ly-rules.make | 2 +- scripts/lilypond-book.py | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a75b3b51e..c37fee0484 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-07-22 Jan Nieuwenhuizen + * scripts/lilypond-book.py (make_pixmap): Don't use quiet_system, + ie, don't redirect PNG output to /dev/null. Fixes lys-to-tely + documents. + * input/test/mark.ly: * Documentation/user/refman.itely: Re-enable \mark #'() example. diff --git a/make/ly-rules.make b/make/ly-rules.make index e409630ef1..4d5590f2da 100644 --- a/make/ly-rules.make +++ b/make/ly-rules.make @@ -20,7 +20,7 @@ $(outdir)/%.texi: %.tely $(outdir)/%.texi: $(outdir)/%.tely rm -f $@ set|egrep '(TEX|LILY)' # ugh, what's this? - $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi $(LILYPOND_BOOK_FLAGS) $< + $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --dependencies --outdir=$(outdir) --format=texi --verbose $(LILYPOND_BOOK_FLAGS) $< rm -f $< chmod -w $@ diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index a922177558..46c9092f09 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1041,7 +1041,7 @@ def make_pixmap (name): cmd = cmd % (x, y, res, name + '.trans.eps', name + '.eps',name + '.png') status = 0 try: - status = quiet_system (cmd, 'gs') + status = system (cmd) except: status = -1 @@ -1056,7 +1056,7 @@ def compile_all_files (chunks): png = [] for c in chunks: - if c[0] <> 'lilypond': + if c[0] != 'lilypond': continue base = c[4] exts = c[3] @@ -1075,7 +1075,7 @@ def compile_all_files (chunks): if tex: # fixme: be sys-independent. def incl_opt (x): - if g_outdir and x[0] <> '/' : + if g_outdir and x[0] != '/' : x = os.path.join (g_here_dir, x) return ' -I %s' % x @@ -1270,7 +1270,7 @@ def check_texidoc (chunks): def fix_epswidth (chunks): newchunks = [] for c in chunks: - if c[0] <> 'lilypond' or 'eps' not in c[2]: + if c[0] != 'lilypond' or 'eps' not in c[2]: newchunks.append (c) continue -- 2.39.5