From 64bb1e8b17f8223de4277881f4d9ba61481325aa Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 2 Apr 2005 16:28:17 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ GNUmakefile.in | 2 +- scm/output-tex.scm | 2 +- tex/lilyponddefs.tex | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee0ded65eb..58582948a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-01 Erlend Aasland + + * tex/lilyponddefs.tex: use color instead of xcolor + * scm/output-tex.scm: minor editing + 2005-04-02 Nicolas Sceaux * scm/music-functions.scm (display-scheme-music): pretty printer diff --git a/GNUmakefile.in b/GNUmakefile.in index 67152e5f05..0dccb785d2 100644 --- 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 aec0f20357..4246aa2cb5 100644 --- 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 9746d707aa..7ebe94c534 100644 --- 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 -- 2.39.2