(Lilypond_snippet.__init__):

only process options fi they're there.
(write_file_map): add version-seen? to snippet-map.ly

diff --git a/make/ly-rules.make b/make/ly-rules.make
index 6198c7879909674e97c44a98b274479c3eca87cb..391fcd84edf2fec6d0754bf2bea5c36180f20707 100644 (file)
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -35,7 +35,8 @@ $(outdir)/%-book.ps: $(outdir)/%.ps
 
 $(outdir)/%.pdf: $(outdir)/%.dvi
        dvips $(DVIPS_FLAGS)  -o $@.pdfps -t $(DVIPS_PAPERSIZE)  $<
-       ps2pdf -sPAPERSIZE=$(DVIPS_PAPERSIZE) $@.pdfps $@
+# without -dSAFER
+       gs -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$@ -dCompatibilityLevel=1.2 -sPAPERSIZE=a4 -c .setpdfwrite -f $@.pdfps
 
 $(outdir)/%.html.omf: %.tely
        $(call GENERATE_OMF,html)

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index f43f6bccca949349c6475ad6e0a528ef3c9c8055..16894d385e0deea1e7211c849e4c4f754ed32b98 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -1270,7 +1270,7 @@ def write_file_map (lys, name):
 #(ly:add-file-name-alist '(
 """)
        for ly in lys:
-               snippet_map.write ('("%s.ly" . "%s:%d (%s.ly)")\n' \
+               snippet_map.write ('("%s.ly" . "%s:%d (%s.ly)")\n'
                                   % (ly.basename (),
                                      name,
                                      ly.line_number,