]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 446feb6)
*** empty log message ***
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 28 Mar 2005 16:27:00 +0000 (16:27 +0000)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Mon, 28 Mar 2005 16:27:00 +0000 (16:27 +0000)
ChangeLog patch | blob | history
Documentation/topdocs/NEWS.tely patch | blob | history
GNUmakefile.in patch | blob | history
config.hh.in patch | blob | history
lily/font-config.cc patch | blob | history
scm/define-grob-interfaces.scm patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index fb0ac3a46e9576044bba6d62c1ac811f751dcd33..d44605a2f3878cc2c909ab786e95b1b9ee597b52 100644 (file)
--- 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 4efe1e1f9eeed4fd9b0a1d65cf40a71b7629fdd5..a15fbca195a7b729227b7dfa94cca9ae2668f9e9 100644 (file)
--- 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 0cccc3a10868b22f3cccf75860102547441ce063..d28279a5f67ceb4b7686ce31aab38d99fd820495 100644 (file)
--- 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 01c1c18ffa6509d7d2b021a60aaf8cdc180fcdd8..ee0ee4976a62d0b8956a467d2529254f9d0e388d 100644 (file)
--- 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 ca6253fc997e01b819d2028f49d4717a186fa79c..e75561942fe67b4e790f784ffe997488dd40024b 100644 (file)
--- 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 33b198d1abb07b1c4247d41a11460058962633d2..21dddeb6bc1161f219f5a8eb95e6e638ac7653ae 100644 (file)
--- 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"
Debian packaging of lilypond