Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	input/lsr/GNUmakefile

diff --git a/VERSION b/VERSION
index ed6b49a95c16f5ca18a15fb5a18680bf134b3851..97b9b012e15a177ea276561694cbe5ec47ca2060 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=11
-PATCH_LEVEL=36
+PATCH_LEVEL=37
 MY_PATCH_LEVEL=
 

diff --git a/input/lsr/GNUmakefile b/input/lsr/GNUmakefile
index df45b7322251c9787f0644a178f6701c80e3c748..1ca2cbbf522039e1f7854647bcd263819ad48302 100644 (file)
--- a/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@ -4,7 +4,7 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-EXTRA_DIST_FILES=README
+EXTRA_DIST_FILES += README $(call src-wildcard,*.snippet-list)
 
 include $(depth)/make/stepmake.make
 
@@ -12,7 +12,7 @@ IN_ITELY_FILES = $(call src-wildcard,*-intro.itely)
 GENERATED_ITELY_FILES = $(IN_ITELY_FILES:%-intro.itely=$(outdir)/%.itely)
 
 $(outdir)/%.itely: %-intro.itely %.snippet-list
-       xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $*.snippet-list
+       xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
 
 $(outdir)/snippets.texi: snippets.tely $(GENERATED_ITELY_FILES)
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BINARY) $(LILYPOND_BOOK_INCLUDES)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
@@ -20,7 +20,6 @@ $(outdir)/snippets.texi: snippets.tely $(GENERATED_ITELY_FILES)
 $(outdir)/snippets-big-page.html: $(outdir)/snippets.texi $(OUT_PNG_IMAGES)
        $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
-
 $(outdir)/snippets/index.html: $(outdir)/snippets.texi $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES)
        mkdir -p $(dir $@)
        $(MAKEINFO) -I$(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<

diff --git a/input/regression/backend-svg.ly b/input/regression/backend-svg.ly
index 823016e85bcce00c2607d69591ffbd5ecc8f195e..0380912a89728d7d97d761b8993c87213fda1c83 100644 (file)
--- a/input/regression/backend-svg.ly
+++ b/input/regression/backend-svg.ly
@@ -1,4 +1,4 @@
-
+%{
 #(ly:set-option 'backend 'svg)
 #(set! output-count 1)
 
@@ -17,7 +17,11 @@
 %% LD_LIBRARY_PATH is necesssary, otherwise, it doesn't build in GUB.
 %% LD_LIBRARY_PATH is part of the start-environment but should be switched off
 %% for external inkscape.
-#(ly:system (format #f "LD_LIBRARY_PATH= inkscape -T -E ~a-inkscape.eps ~a-1.svg" outname outname)
+#(let*
+  ((cmd (format #f
+       "LD_LIBRARY_PATH= inkscape --without-gui --export-text-to-path --export-eps ~a-inkscape.eps ~a-1.svg" outname outname)))
+  (ly:progress "Running ~a" cmd)
+  (ly:system cmd)
   (cons
    (format #f "FONTCONFIG_FILE=~a/fonts/fonts.conf" (ly:effective-prefix))
    (ly:start-environment)))
@@ -40,3 +44,4 @@
     }
   }
 }
+%}

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 59e22f850f45558692efeb2845e23cd32be9ad4a..b57930a3b08aac3ced558f24e1a305a2fb53f9f5 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -8,7 +8,7 @@ include $(depth)/make/stepmake.make
 
 MFTRACE_FLAGS=  --simplify
 
-EXTRA_DIST_FILES += README 
+EXTRA_DIST_FILES += README mf2pt1.mp
 
 # We don't use $(MF_FILES), because there's more .mf cruft here
 FETA_MF_FILES = $(call src-wildcard,feta[0-9]*.mf)\