* 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
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)'