(make_pixmap): Don't use quiet_system,

ie, don't redirect PNG output to /dev/null.  Fixes lys-to-tely
documents.

diff --git a/ChangeLog b/ChangeLog
index 2a75b3b51e1f04b294e351d66f55d347c5203c29..c37fee04841b0db0d40a66c99b8d4da43093985b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-07-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * 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 e409630ef1adf2c1c1088ef01332f05f3179fa85..4d5590f2dadd23755dfa2454141b6a743c560ffd 100644 (file)
--- 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 a922177558a1588a2dd56732a739929c2a77149f..46c9092f091f03a6661eb5823b96fac1959491d6 100644 (file)
--- 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