]> 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: 5dab6cf)
*** empty log message ***
authorJan Nieuwenhuizen <janneke@gnu.org>
Thu, 31 Mar 2005 12:34:33 +0000 (12:34 +0000)
committerJan Nieuwenhuizen <janneke@gnu.org>
Thu, 31 Mar 2005 12:34:33 +0000 (12:34 +0000)
ChangeLog patch | blob | history
Documentation/user/lilypond.tely patch | blob | history
GNUmakefile.in patch | blob | history
scm/backend-library.scm patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 765695319a2769d2dcb42142f04b573f795f7b02..44b5b97e2aa740b873ddfeb797b332708e6cecb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 
 2005-03-31  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * GNUmakefile.in (local-WWW-post): Restore .htaccess and .html
+       additions to website.
+
+       * Documentation/user/lilypond.tely: Remove reference to ps.gz.
+
        * Documentation/user/macros.itexi: Fix @usermanref html links in
        split documents: use @inforef.
 
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 5b4a769f9b2f696a27f67dfcff96927dfc82ae7b..e67c7a59a7e3f3732cddaef68e01c8dd13707dda 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -160,8 +160,7 @@ HINTS FOR STYLE
 @end ignore
 
 @ifhtml
-This document is also available in @uref{../lilypond.ps.gz,gzipped
-PostScript} and @uref{../lilypond.pdf,PDF}.
+This document is also available in @uref{../lilypond.pdf,PDF}.
 @end ifhtml
 
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 57d9f011361c89fe1ad9ebd7698d1cdadc4cbb2d..d1e6726279195b6c1781243a77a0739700af02e7 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -72,6 +72,8 @@ 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
@@ -80,6 +82,7 @@ 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 -)
 
 share-prefix = $(builddir)/share
diff --git a/scm/backend-library.scm b/scm/backend-library.scm
index fa2a37bfb364aa1b87983be59be8694cc0234c0b..f162ea97d76717310da8fd17db00f3c12de5ff86 100644 (file)
--- a/scm/backend-library.scm
+++ b/scm/backend-library.scm
@@ -42,6 +42,7 @@
        (delete-file pdf-name))
 
     (format (current-error-port) (_ "Converting to `~a'...") pdf-name)
+    (newline (current-error-port))
     (ly:system cmd)))
 
 (define-public (postscript->png resolution papersizename name)
Debian packaging of lilypond