*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index ee0ded65eb263d6e5ee31d5e31c9948da44d56f7..58582948a2be83102867d9c35d0ad29a59389b41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-01  Erlend Aasland  <erlenda@gmail.com>
+
+       * tex/lilyponddefs.tex: use color instead of xcolor
+       * scm/output-tex.scm: minor editing
+
 2005-04-02  Nicolas Sceaux  <nicolas.sceaux@free.fr>
 
        * scm/music-functions.scm (display-scheme-music): pretty printer

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 67152e5f05a63f03df6c3784a45f558a06358c0c..0dccb785d22c9096ac5471076d5a78b80e4fb77d 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -73,7 +73,7 @@ footifymail = MAILADDRESS=bug-lilypond@gnu.org
 
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
-       $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
+       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
        cd $(builddir) && find Documentation input \

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index aec0f203571cf35ab5f20f810a5e426a6f348368..4246aa2cb5e2b871cc9378ab28a04850276f8687 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -181,7 +181,7 @@
 ;; during setcolor and restores it during resetcolor.
 ;; We don't do that here.
 (define (resetcolor)
-  (string-append "\\color[rgb]{0,0,0}"))
+  (string-append "\\color[rgb]{0,0,0}\n"))
 
 (define (polygon points blotdiameter)
   (embedded-ps (list 'polygon `(quote ,points) blotdiameter)))

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 9746d707aa4cba87e388bf74fe0c3744ff44fbce..7ebe94c53417a0cb1b2297f809dabaab1a5b3baa 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -203,7 +203,7 @@
        \fi
        \pagestyle{empty}
 
-       \usepackage{xcolor}
+       \usepackage{color}
 
        \lilypondifundefined{lilypondclassic}
          {%% If not in `classic' mode, undo LaTeX's page layout settings