Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...

Conflicts:

	buildscripts/add_html_footer.py
	input/lsr/guitar-intro.itely
	input/lsr/piano-music-intro.itely
	input/lsr/strings-intro.itely
	make/doclang-rules.make
	make/doclang-vars.make
	stepmake/stepmake/texinfo-rules.make

diff --cc buildscripts/add_html_footer.py
index 2abb0bf88de0f3271e4cb6bb9441d0d7bfa40315,bd7d8409cee5af622e6792fde092fda347776e0f..addf3c7d7a6c3f5a4114d94ff35d60cda97671e5
--- 1/buildscripts/add_html_footer.py
--- 2/buildscripts/add_html_footer.py
+++ b/buildscripts/add_html_footer.py
@@@ -94,8 -90,6 +94,9 @@@ def source_links_replace (m, source_val
  splitted_docs_re = re.compile ('(input/lsr/out-www/lilypond-snippets|Documentation/user/out-www/(lilypond|music-glossary|lilypond-program|lilypond-learning))/')
  
  snippets_ref_re = re.compile (r'href="(\.\./)?lilypond-snippets')
++# TODO: master has ../lily- !
 +src_href_re = re.compile ('(href|src)="(lily-.*?|.*?[.]png)"')
 +source_link_re = re.compile ('href="source/(.*?)"')
  
  ## Windows does not support symlinks.
  # This function avoids creating symlinks for splitted HTML manuals

diff --cc input/lsr/GNUmakefile
index 768fafc1b9891f5b5b6f693125a7bf2798e04a55,f79adc52914c73282b477dcb18129f6640fab7ab..6103529167235c044e940caf8f4824977fad3826
--- 1/input/lsr/GNUmakefile
--- 2/input/lsr/GNUmakefile
+++ b/input/lsr/GNUmakefile
@@@ -24,19 -24,8 +24,19 @@@ GENERATED_ITELY_FILES = $(IN_ITELY_FILE
  $(outdir)/%.itely: %-intro.itely %.snippet-list
        xargs $(PYTHON) $(buildscript-dir)/lys-to-tely.py -f printfilename,texidoc,verbatim --name=$@ --template=$< < $(filter %.snippet-list, $^)
  
- $(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES)
+ $(outdir)/lilypond-snippets.texi: $(GENERATED_ITELY_FILES) $(LY_FILES)
  
 +source-links = $(outdir)/source $(outdir)/lilypond-snippets/source
 +
 +$(outdir)/source:
 +      @rm -f $(@)
 +      ln -sf $(depth) $(@)
 +
 +$(outdir)/%/source:
 +      @rm -f $(@)
 +      mkdir -p $(dir $@)
 +      ln -sf $(depth)/.. $(@)
 +
  info: $(INFO_FILES)
  
  ifneq ($(out),www)

diff --cc input/lsr/lilypond-snippets.tely
Simple merge

diff --cc make/doclang-rules.make
index 299752090113365deb316f01c7d307c3a065a337,bda2797f7a0892fefe0659cf0ec010b3b58e05dc..c25fd6e786bb0484c01edcb75be7be4ddde22d46
--- 1/make/doclang-rules.make
--- 2/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@@ -1,16 -1,14 +1,16 @@@
 -$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.texi
 +$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.texi
        mkdir -p $(dir $@)
 -      -$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 +      $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
  
 -$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.texi
 -      -$(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
 +$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.texi
 +      $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
  
- $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po
+ $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.texi
        $(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
  
 -$(outdir)/%.pdf: $(outdir)/%.pdftexi
 +$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.texi
        cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
  
  $(outdir)/version.%: $(top-src-dir)/VERSION

diff --cc stepmake/stepmake/texinfo-rules.make
index e4ee4b50b6d3d219997ec586e307710336af14c3,4e562b1821a19d1f59749d10acbcf0f7cc3d3427..ab1f7746a2c75d4c3e5ae2d472b35dab2835c5b5
--- 1/stepmake/stepmake/texinfo-rules.make
--- 2/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@@ -26,19 -26,11 +26,19 @@@ endi
  $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.texi
        $(MAKEINFO) -I$(outdir) --output=$@ $<
  
- 
 +$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.texi
 +      mkdir -p $(dir $@)
 +      $(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 +
  $(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.texi
 -      $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 +      $(TEXI2HTML) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $< 
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 +
+ 
  $(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.texi
 -      $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 +      $(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
  
  $(outdir)/%.html.omf: %.texi
        $(call GENERATE_OMF,html)