Various updates to reduce make doc output

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 5f04dc880cf1297f4f37d1297e2ff161344313a5..d798d3ce85230f42973d5e1a2155924360aac00f 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -280,8 +280,7 @@ $(outdir)/ly-grammar.txt: $(top-src-dir)/lily/parser.yy
 # compilation during install, which is a bad thing (tm).
 
 $(outdir)/internals.texi: $(LILYPOND_BINARY)
-       cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
-
+       cd $(outdir) && $(buildscript-dir)/run-and-check "$(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation" "generate-documentation.log"
 
 ###############################################
 #  Documentation and translations maintenance #

diff --git a/Documentation/de/extending/scheme-tutorial.itely b/Documentation/de/extending/scheme-tutorial.itely
index 11a42bd60c9b67f494f52e3f3fcd09a8fb00d777..a4c5d1e4c6702fa631a36a2ce92cbe7f26d92349 100644 (file)
--- a/Documentation/de/extending/scheme-tutorial.itely
+++ b/Documentation/de/extending/scheme-tutorial.itely
@@ -761,9 +761,6 @@ Variable @code{twice} importiert:
 @lilypond[verbatim]
 traLaLa = { c'4 d'4 }
 
-%% dummy action to deal with parser lookahead
-#(display "this needs to be here, sorry!")
-
 #(define newLa (map ly:music-deep-copy
   (list traLaLa traLaLa)))
 #(define twice

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2d22f9f378202c703591eb6d7c0c50a3b89d290e..0ad3c6e30b409ecd6647e2ff91392399cf196d39 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -120,10 +120,6 @@ WEB_TARGETS = offline
 
 WEB_ROOT_FILES = $(WEB_TARGETS:%=$(outdir)/%-root/index.html)
 
-WEB_EXAMPLE_FILES = $(wildcard input/$(outdir)/*.ly) \
-                    $(wildcard input/*/$(outdir)/*.ly) \
-                    $(wildcard input/*/*/$(outdir)/*.ly)
-
 WEB_TRACKED_FILES = $(filter-out $(outdir)/index.html, \
                     $(shell bash -O nullglob -c "echo $(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")) \
                     $(shell bash -O nullglob -c "echo input/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \

diff --git a/make/abc-rules.make b/make/abc-rules.make
index 876d54e4b59bea74d72e83562e53ebe056e77a6f..39ca43b17022d0b77c62bd32834e255cfeb0a2ef 100644 (file)
--- a/make/abc-rules.make
+++ b/make/abc-rules.make
@@ -1,4 +1,4 @@
 .SUFFIXES: .abc
 
 $(outdir)/%.ly:  %.abc
-       $(PYTHON) $(ABC2LY) -o $@ $<
+       $(PYTHON) $(ABC2LY) --quiet -o $@ $<

diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index b0cf7663b158b43c687b6749c9b0988c1bd9c223..946e5a4759c61887101adf4bb8b7a6815b4b0611 100644 (file)
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -26,7 +26,7 @@ $(outdir)/%.tex:  %.latex
 # Add the tex => pdf rule only if we have pdflatex
 ifeq (,$(findstring pdflatex,$(MISSING_OPTIONAL)))
 $(outdir)/%.pdf:  $(outdir)/%.tex
-       cd $(outdir) && $(PDFLATEX) $(notdir $<)
+       cd $(outdir) && $(buildscript-dir)/run-and-check "$(PDFLATEX) -halt-on-error $(notdir $<)" "$*.pdflatex.log"
 endif
 
 ############## Texinfo ######################

diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make
index 001148aec2bd8ef09f83f8dd507e27fb976b66bb..11248f503083bec6336ad8a1a6b2b69416a0c598 100644 (file)
--- a/make/lysdoc-rules.make
+++ b/make/lysdoc-rules.make
@@ -3,7 +3,6 @@
 # Split it up into 10 300-element chunks, and one chunk containing the rest
 # if we have more than 3000 elements.
 $(outdir)/collated-files.list: $(COLLATED_FILES)
-       echo "(Re-)Generating $@"
        @echo $(wordlist    1, 299,$^)>$@
        @echo $(wordlist  300, 599,$^)>>$@
        @echo $(wordlist  600, 899,$^)>>$@

diff --git a/make/midi-rules.make b/make/midi-rules.make
index 7b3f149d9643832dc72e02e23d6a27b286ddbc13..18dcc17246829927afa44ed886a5899b84602fc9 100644 (file)
--- a/make/midi-rules.make
+++ b/make/midi-rules.make
@@ -1,7 +1,7 @@
 .SUFFIXES: .midi
 
 $(outdir)/%.ly:  %.midi
-       $(PYTHON) $(MIDI2LY) -o $(outdir) $<
+       $(PYTHON) $(MIDI2LY) --quiet -o $(outdir) $<
 
 $(outdir)/%.midi: %.ly $(LILYPOND_BINARY)
        touch $(foreach f, $(HEADER_FIELDS), $(outdir)/$*.$f)
@@ -10,7 +10,7 @@ $(outdir)/%.midi: %.ly $(LILYPOND_BINARY)
 
 $(outdir)/%-midi.ly: $(outdir)/%.midi $(MIDI2LY)
        (echo '\header {'; for f in $(HEADER_FIELDS); do echo -n $$f'="'; cat $(outdir)/$*.$$f; echo '"'; done; echo '}') > $(outdir)/$*.header
-       $(PYTHON) $(MIDI2LY) $(shell cat $(outdir)/$*.options) --include-header=$(outdir)/$*.header -o $(outdir) $<
+       $(PYTHON) $(MIDI2LY) $(shell cat $(outdir)/$*.options) --quiet --include-header=$(outdir)/$*.header -o $(outdir) $<
 
 $(outdir)/%.diff: %.ly $(outdir)/%-midi.ly
        $(DIFF) -puN $(MIDI2LY_IGNORE_RES) $^ > $@ || cat $@

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 3a0aeaedabe7776a610acbc087b358a80bab3e90..d04068fa31cdaa25a51aef3d902ac3a36a1951ec 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1313,8 +1313,9 @@ def parse_file (fn):
     select_voice('default', '')
     global lineno
     lineno = 0
-    sys.stderr.write ("Line ... ")
-    sys.stderr.flush ()
+    if not global_options.quiet:
+        sys.stderr.write ("Line ... ")
+        sys.stderr.flush ()
     __main__.state = state_list[current_voice_idx]
 
     for ln in ls:
@@ -1360,7 +1361,8 @@ def parse_file (fn):
 
 
 def identify():
-    sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))
+    if not global_options.quiet:
+        sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version))
 
 authors = """
 Written by Han-Wen Nienhuys <hanwen@xs4all.nl>, Laura Conrad
@@ -1381,16 +1383,21 @@ def get_option_parser ():
     p.add_option("--version",
                  action="version",
                  help=_ ("show version number and exit"))
-
     p.add_option("-h", "--help",
                  action="help",
                  help=_ ("show this help and exit"))
-    p.add_option ('-o', '--output', metavar='FILE',
-                  help=_ ("write output to FILE"),
-                  action='store')
-    p.add_option ('-s', '--strict', help=_ ("be strict about success"),
-                  action='store_true')
-    p.add_option ('-b', '--beams', help=_ ("preserve ABC's notion of beams"), action="store_true")
+    p.add_option ("-o", "--output", metavar='FILE',
+                  action="store",
+                  help=_ ("write output to FILE"))
+    p.add_option ("-s", "--strict",
+                  action="store_true",
+                  help=_ ("be strict about success"))
+    p.add_option ('-b', '--beams',
+                  action="store_true",
+                  help=_ ("preserve ABC's notion of beams"))
+    p.add_option ('-q', '--quiet',
+                  action="store_true",
+                  help=_ ("suppress progress messages"))
     p.add_option_group ('',
                         description=(
             _ ('Report bugs via %s')
@@ -1410,12 +1417,14 @@ for f in files:
     if f == '-':
         f = ''
 
-    sys.stderr.write ('Parsing `%s\'...\n' % f)
+    if not global_options.quiet:
+        sys.stderr.write ('Parsing `%s\'...\n' % f)
     parse_file (f)
 
     if not global_options.output:
         global_options.output = os.path.basename (os.path.splitext (f)[0]) + ".ly"
-    sys.stderr.write ('lilypond output to: `%s\'...' % global_options.output)
+    if not global_options.quiet:
+        sys.stderr.write ('lilypond output to: `%s\'...' % global_options.output)
     outf = open (global_options.output, 'w')
 
 # don't substitute @VERSION@. We want this to reflect
@@ -1428,4 +1437,5 @@ for f in files:
     dump_voices (outf)
     dump_score (outf)
     dump_lyrics (outf)
-    sys.stderr.write ('\n')
+    if not global_options.quiet:
+        sys.stderr.write ('\n')

diff --git a/scripts/build/lys-to-tely.py b/scripts/build/lys-to-tely.py
index a3bc4b576bdc8e08f4bc9ff0f9e2dbbe42147c53..7a8684f1949b9cf50849ea65dcc2436d030319f7 100644 (file)
--- a/scripts/build/lys-to-tely.py
+++ b/scripts/build/lys-to-tely.py
@@ -163,11 +163,9 @@ if files:
     s = "\n".join (map (name2line, files))
     s = template.replace (include_snippets, s, 1)
     f = "%s/%s" % (dir, name)
-    sys.stderr.write ("%s: writing %s..." % (program_name, f))
     h = open (f, "w")
     h.write (s)
     h.close ()
-    sys.stderr.write ('\n')
 else:
     # not Unix philosophy, but hey, at least we notice when
     # we don't distribute any .ly files.

diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py
index 3a434193b083130344aa0c2f321600b0e79a000b..bf9f09f26e7f6b64a3549c4cd34bbd32974d2e1f 100644 (file)
--- a/scripts/midi2ly.py
+++ b/scripts/midi2ly.py
@@ -831,7 +831,8 @@ def dump_track (track, n):
                 if vl:
                     s += '  \\voice' + vl + '\n'
                 else:
-                    warning (_ ('found more than 5 voices on a staff, expect bad output'))
+                    if not global_options.quiet:
+                        warning (_ ('found more than 5 voices on a staff, expect bad output'))
             s += '  ' + dump_voice (voice, skip)
             s += '}\n\n'
             v += 1
@@ -1027,7 +1028,8 @@ def convert_midi (in_file, out_file):
 }
 '''
 
-    progress (_ ("%s output to `%s'...") % ('LY', out_file))
+    if not global_options.quiet:
+        progress (_ ("%s output to `%s'...") % ('LY', out_file))
 
     if out_file == '-':
         handle = sys.stdout
@@ -1050,27 +1052,30 @@ def get_option_parser ():
            metavar=_ ('DUR'),
            help=_ ('quantise note durations on DUR'))
     p.add_option ('-D', '--debug',
-                  action='store_true',
-                  help=_ ('debug printing'))
+           action='store_true',
+           help=_ ('debug printing'))
     p.add_option ('-e', '--explicit-durations',
            action='store_true',
            help=_ ('print explicit durations'))
     p.add_option('-h', '--help',
-                 action='help',
-                 help=_ ('show this help and exit'))
+           action='help',
+           help=_ ('show this help and exit'))
     p.add_option('-i', '--include-header',
-                 help=_ ('prepend FILE to output'),
-                 action='append',
-                 default=[],
-                 metavar=_ ('FILE'))
+           help=_ ('prepend FILE to output'),
+           action='append',
+           default=[],
+           metavar=_ ('FILE'))
     p.add_option('-k', '--key', help=_ ('set key: ALT=+sharps|-flats; MINOR=1'),
-          metavar=_ ('ALT[:MINOR]'),
-          default=None),
+           metavar=_ ('ALT[:MINOR]'),
+           default=None),
     p.add_option ('-o', '--output', help=_ ('write output to FILE'),
            metavar=_ ('FILE'),
            action='store')
     p.add_option ('-p', '--preview', help=_ ('preview of first 4 bars'),
            action='store_true')
+    p.add_option ('-q', '--quiet',
+           action="store_true",
+           help=_ ("suppress progress messages and warnings about excess voices"))
     p.add_option ('-s', '--start-quant',help= _ ('quantise note starts on DUR'),
            metavar=_ ('DUR'))
     p.add_option ('-S', '--skip',
@@ -1083,15 +1088,13 @@ def get_option_parser ():
            help=_ ('allow tuplet durations DUR*NUM/DEN'),
            default=[])
     p.add_option ('-V', '--verbose', help=_ ('be verbose'),
-           action='store_true'
-           ),
+           action='store_true')
     p.version = 'midi2ly (LilyPond) @TOPLEVEL_VERSION@'
     p.add_option ('--version',
                  action='version',
                  help=_ ('show version number and exit'))
     p.add_option ('-w', '--warranty', help=_ ('show warranty and copyright'),
-           action='store_true',
-           ),
+           action='store_true',)
     p.add_option ('-x', '--text-lyrics', help=_ ('treat every text as a lyric'),
            action='store_true')