From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 7 Jul 2008 14:10:33 +0000 (+0200)
Subject: Merge branch 'master' into dev/texi2html
X-Git-Tag: release/2.11.58-1~32^2~132
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=edf17353d89f4f6bd831466262402bb9151a26ca;hp=-c;p=lilypond.git

Merge branch 'master' into dev/texi2html
---

edf17353d89f4f6bd831466262402bb9151a26ca
diff --combined GNUmakefile.in
index ef3f12f25a,0cd13623ca..a26a8695ef
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@@ -82,7 -82,7 +82,7 @@@ final-install
  # For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
  WEB_TARGETS = offline
  
 -local-WWW-post:
 +WWW-post:
  # need UTF8 setting in case this is hosted on a website. 
  	echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
  	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
@@@ -217,7 -217,7 +217,7 @@@ test-baseline
  	$(MAKE) test
  	$(MAKE) out=test -C input/regression/ local-test-baseline
  	$(MAKE) out=test -C input/regression/musicxml local-test-baseline
- 	rm -rf out/lybook-testdb/
+ 	$(MAKE) test-snippets-clean
  
  
  local-check: test
@@@ -234,8 -234,11 +234,11 @@@ test-redo
  	done
  	$(MAKE) check
  
- test-clean: snippets-clean
+ test-clean: test-snippets-clean
  	$(MAKE) -C input/regression/ out=test clean
  
  snippets-clean:
  	rm -rf out/lybook-db
+ 
+ test-snippets-clean:
+ 	rm -rf out/lybook-testdb
diff --combined configure.in
index b7475b7ba9,8a193d0c6a..325dfe2ddd
--- a/configure.in
+++ b/configure.in
@@@ -126,15 -126,14 +126,15 @@@ AC_MSG_RESULT(Must have patched GUILE r
  CPPFLAGS="$save_CPPFLAGS"
  
  
 -STEPMAKE_MAKEINFO(REQUIRED, 4.11)
 +# We check for makeinfo below, too. Really duplicate that check?
 +## STEPMAKE_MAKEINFO(REQUIRED, 4.11)
  STEPMAKE_PYTHON_DEVEL(REQUIRED)
  
  STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
  
  STEPMAKE_PATH_PROG(FONTFORGE, fontforge, REQUIRED, 20050624)
  
- AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h])
+ AC_CHECK_HEADERS([assert.h grp.h libio.h pwd.h sys/stat.h wchar.h fpu_control.h])
  AC_LANG_PUSH(C++)
  AC_CHECK_HEADERS([sstream boost/lambda/lambda.hpp])
  AC_LANG_POP(C++)
@@@ -175,7 -174,6 +175,7 @@@ STEPMAKE_GUILE(OPTIONAL
  STEPMAKE_PERL(OPTIONAL)
  
  STEPMAKE_PROGS(MAKEINFO, makeinfo, REQUIRED, 4.11)
 +STEPMAKE_PROGS(TEXI2HTML, texi2html, REQUIRED, 1.79)
  
  AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
  
diff --combined input/lsr/lilypond-snippets.tely
index 5031983a22,dad9d6a4ac..564e33a818
--- a/input/lsr/lilypond-snippets.tely
+++ b/input/lsr/lilypond-snippets.tely
@@@ -16,7 -16,7 +16,7 @@@
  @include version.itexi
  
  @macro lydoctitle{TEXT}
- @section \TEXT\
+ @unnumberedsec \TEXT\
  @end macro
  
  @ifnottex
@@@ -84,7 -84,7 +84,7 @@@ or figure for each example to see the c
  
  @ifnottex
  @node Top
- @top LilyPond examples
+ @top LilyPond Snippet List
  
  This document shows a selected set of LilyPond snippets from the
  @uref{http://lsr@/.dsi@/.unimi@/.it,LilyPond Snippet Repository}
@@@ -124,6 -124,7 +124,7 @@@ Specialist notatio
  * Unfretted strings::
  * Winds::
  * Ancient notation::
+ * World music::
  
  Other collections
  * Contexts and engravers::
@@@ -135,8 -136,6 +136,8 @@@
  * Templates::
  @end menu
  
 +@contents
 +
  
  @c Please take care of naming every .itely
  @c with an existing tag name.
@@@ -158,6 -157,7 +159,7 @@@
  @include unfretted-strings.itely
  @include winds.itely
  @include ancient-notation.itely
+ @include world-music.itely
  
  @include contexts-and-engravers.itely
  @include tweaks-and-overrides.itely