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

Conflicts:

	Documentation/GNUmakefile
	Documentation/de/GNUmakefile
	Documentation/es/GNUmakefile
	Documentation/fr/GNUmakefile
	make/doclang-vars.make
	stepmake/stepmake/texinfo-vars.make

diff --cc Documentation/GNUmakefile
index 15b7601905eead940a1bf49f97f8627a6fa392ea,d265a1ee96fc1bc1a3f3c3f576e24c7a1cc5218d..447337efc92a0cd1a11cc3fe7d15d528b7235f2f
--- 1/Documentation/GNUmakefile
--- 2/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@@ -11,9 -11,12 +11,12 @@@ EXTRA_DIST_FILES= texinfo.css TRANSLATI
  
  include $(depth)/make/stepmake.make
  
+ HTML_PAGE_NAMES= index devel translations
+ OUT_HTML_FILES= $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
+ 
  default: local-doc
  
- local-WWW-2: txt-to-html $(outdir)/index.html $(outdir)/devel.html
 -local-WWW: txt-to-html $(OUT_HTML_FILES)
++local-WWW-2: txt-to-html $(OUT_HTML_FILES)
  
  local-WWW-clean: deep-WWW-clean
  

diff --cc make/doc-i18n-root-targets.make
index 0000000000000000000000000000000000000000,4e917c5da066399a5ade18c9957739c3ac5942bb..8afe50af8442ffd541fc05052c3e00fead754aa0
mode 000000,100644..100644
--- /dev/null
--- 2/make/doc-i18n-root-targets.make
+++ b/make/doc-i18n-root-targets.make
@@@ -1,0 -1,4 +1,4 @@@
 -local-WWW: $(OUT_HTML_FILES)
+ default:
+ 
++local-WWW-2: $(OUT_HTML_FILES)
+       $(PYTHON) $(buildscript-dir)/mass-link.py --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/$(outdir) $(HTML_FILES)

diff --cc make/doclang-vars.make
index e0bbdfb57bb87256c7b412708c002cc0a7a9ec55,08d17b919aebe4ce94104e3b6d93256608004d77..f7b25ae284c9888659daf6fe84032cf6baa007f9
--- 1/make/doclang-vars.make
--- 2/make/doclang-vars.make
+++ b/make/doclang-vars.make
@@@ -13,18 -10,12 +13,18 @@@ LILYPOND_BOOK_INCLUDES += $(DOCUMENTATI
  MAKEINFO_FLAGS += --force --enable-encoding $(DOCUMENTATION_INCLUDES)
  MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
  
- TEXI2PDF_FLAGS += --batch $(DOCUMENTATION_INCLUDES)
 +TEXI2HTML_INIT= --init-file=$(top-src-dir)/lilypond-texi2html.init
 +TEXI2HTML_LANG=--lang=$(ISOLANG)
 +TEXI2HTML_FLAGS += $(TEXI2HTML_LANG) $(DOCUMENTATION_INCLUDES)
 +TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
 +
+ TEXI2PDF_FLAGS += -q --batch $(DOCUMENTATION_INCLUDES)
  
 -TELY_FILES = $(call src-wildcard,*.tely)
 -OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)
 -DEEP_HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%/index.html)
 -PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
 +TELY_FILES := $(call src-wildcard,*.tely)
 +MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
 +DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(outdir)/%/index.html)
 +PDF_FILES := $(TELY_FILES:%.tely=$(outdir)/%.pdf)
 +XREF_MAP_FILES := $(TELY_FILES:%.tely=$(outdir)/%.xref-map)
  
  ITELY_FILES := $(call src-wildcard,*.itely)
  ITEXI_FILES := $(call src-wildcard,*.itexi)

diff --cc stepmake/stepmake/texinfo-vars.make
index 3b6a0e5ed336eb0d0ac72a5f3309aab2a00c8be2,d53bd8f7dd650fc86871791a31583ad0bc4ad8a6..d0ffdf90d6f9a3ebd73c7d95630ed1cc219ca5f3
--- 1/stepmake/stepmake/texinfo-vars.make
--- 2/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@@ -13,13 -14,8 +13,15 @@@ TEXINFO_PAPERSIZE_OPTION= $(if $(findst
  MAKEINFO_FLAGS = --enable-encoding
  MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
  
 +ifneq ($(ISOLANG),) 
 +TEXI2HTML_LANG = --lang=$(ISOLANG)
 +endif
 +TEXI2HTML_FLAGS += --css-ref=lilypond.css $(DOCUMENTATION_INCLUDES)
 +TEXI2HTML_INIT = --init-file=$(top-src-dir)/lilypond-texi2html.init
 +TEXI2HTML = $(TEXI2HTML_PROGRAM) $(TEXI2HTML_FLAGS) $(TEXI2HTML_LANG)
 +
+ TEXI2PDF_FLAGS += -q
+ 
  # info stuff
  INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
  INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\