From: Han-Wen Nienhuys <hanwen@xs4all.nl> Date: Mon, 28 Mar 2005 16:27:00 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release/2.5.17~14 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6c5092b041d68c9e33c4221a1a21bd29165ae901;p=lilypond.git *** empty log message *** --- diff --git a/ChangeLog b/ChangeLog index fb0ac3a46e..d44605a2f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ 2005-03-28 Han-Wen Nienhuys <hanwen@xs4all.nl> + * GNUmakefile.in (local-WWW-post): remove UTF8 .htaccess. + + * config.hh.in: add HAVE_FONTCONFIG. + * Documentation/user/instrument-notation.itely (String number indications): new node. diff --git a/Documentation/topdocs/NEWS.tely b/Documentation/topdocs/NEWS.tely index 4efe1e1f9e..a15fbca195 100644 --- a/Documentation/topdocs/NEWS.tely +++ b/Documentation/topdocs/NEWS.tely @@ -21,6 +21,8 @@ See user manual, \NAME\ @end ifnothtml +@documentencoding utf-8 +@documentlanguage en @node Top, , , @top @@ -31,7 +33,7 @@ See user manual, \NAME\ @item String numbers are now printed on chords as well, -@lilypond[relative,relative=1,raggedright,fragment] +@lilypond[relative,relative=1,raggedright,fragment,verbatim] <c\1 e\2 g\3> @end lilypond diff --git a/GNUmakefile.in b/GNUmakefile.in index 0cccc3a108..d28279a5f6 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -72,9 +72,6 @@ footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) -- footifymail = MAILADDRESS=bug-lilypond@gnu.org local-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' > $(builddir)/.htaccess - $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./ cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) cd $(builddir) && find . -name \*.html~ -print | xargs rm -f @@ -83,7 +80,6 @@ local-WWW-post: > $(outdir)/weblist echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/out-www/index.html">' > $(builddir)/index.html echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(builddir)/index.html - cd $(builddir) && ls .htaccess *.html >> $(outdir)/weblist cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz -T -) tree-prefix = $(builddir)/share/lilypond/$(TOPLEVEL_VERSION) diff --git a/config.hh.in b/config.hh.in index 01c1c18ffa..ee0ee4976a 100644 --- a/config.hh.in +++ b/config.hh.in @@ -82,6 +82,9 @@ /* define if you have pango 1.6 */ #define HAVE_PANGO16 0 +/* define if you have fontconfig */ +#define HAVE_FONTCONFIG 0 + /* define if you have pango FT2 binding */ #define HAVE_PANGO_FT2 0 diff --git a/lily/font-config.cc b/lily/font-config.cc index ca6253fc99..e75561942f 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -8,7 +8,7 @@ #include "config.hh" -#ifdef HAVE_PANGO_FT2 +#ifdef HAVE_FONTCONFIG #include <fontconfig/fontconfig.h> diff --git a/scm/define-grob-interfaces.scm b/scm/define-grob-interfaces.scm index 33b198d1ab..21dddeb6bc 100644 --- a/scm/define-grob-interfaces.scm +++ b/scm/define-grob-interfaces.scm @@ -22,6 +22,12 @@ '() ) +(ly:add-interface + 'string-number-interface + "A string number instruction" + '() + ) + (ly:add-interface 'fret-diagram-interface "A fret diagram"