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

Conflicts:

	input/lsr/GNUmakefile

diff --cc input/lsr/GNUmakefile
index aae334bda0cfd113d6a35f40e8859633479cab9f,df45b7322251c9787f0644a178f6701c80e3c748..1ca2cbbf522039e1f7854647bcd263819ad48302
--- 1/input/lsr/GNUmakefile
--- 2/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@@ -12,7 -12,7 +12,7 @@@ IN_ITELY_FILES = $(call src-wildcard,*-
  GENERATED_ITELY_FILES = $(IN_ITELY_FILES:%-intro.itely=$(outdir)/%.itely)
  
  $(outdir)/%.itely: %-intro.itely %.snippet-list
-       xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$@ --template=$< < $(filter %.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) $<