From: John Mandereau <john.mandereau@gmail.com>
Date: Fri, 29 Feb 2008 16:18:13 +0000 (+0100)
Subject: Merge branch 'master' into dev/jmandereau
X-Git-Tag: release/2.11.42-1~7^2~15^2~8
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=76c76ae6a8328b0ad69f183cc7c36e166f15bd05;p=lilypond.git

Merge branch 'master' into dev/jmandereau

* master:
  Re-enable @version macro.
  add reminder.
  Minor policy update.
  Small updates.
  Updates from Ralph.
  MusicXML: Add double-dotted notes to duration test
  MusicXML: Change time signature in duration test file, so it looks better
  MusicXML: Add support for longa and breve notes, fix error messages
  Fix alignment problem with text crescendi
  Typo in comment
  move ignore-collision to note-column-interface
  Update from Trevor.

Conflicts:

	Documentation/user/writing-texinfo.txt
---

76c76ae6a8328b0ad69f183cc7c36e166f15bd05
diff --cc stepmake/stepmake/texinfo-vars.make
index 4ee7cefa47,b9642e8aca..bd620ab56c
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@@ -7,9 -7,9 +7,10 @@@ TEXINFO_SOURCES = $(TEXI_FILES
  
  OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
  
+ TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)'
  GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location $(webdir)/$(tree-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
  
 +TEXI2PDF_FLAGS += --command '@set version $(TOPLEVEL_VERSION)'
  TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
  
  MAKEINFO_FLAGS = --enable-encoding -D 'version $(TOPLEVEL_VERSION)'