* stepmake/stepmake/metafont-rules.make ($(outdir)/%.pfb

$(outdir)/%.svg $(outdir)/%.pfa): add --simplify.

* GNUmakefile.in: create .htaccess.

diff --git a/ChangeLog b/ChangeLog
index 56c2adafc3f2455f8920a2cb5564a43affc1537a..1e79238bcf1a03b2ed9c2a951d97476b044e7922 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-03-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * stepmake/stepmake/metafont-rules.make ($(outdir)/%.pfb
+       $(outdir)/%.svg $(outdir)/%.pfa): add --simplify.
+
+       * scm/output-svg.scm (dashed-line): new  function body.
+       
        * GNUmakefile.in: create .htaccess.
 
 2005-03-11  Jan Nieuwenhuizen  <janneke@gnu.org>

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 896371532d5b3f5655b51729ee7888879147238f..8dbe2c092d1c75098bd8681b3126a35cb1fac548 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -73,11 +73,7 @@ footifymail = MAILADDRESS=bug-lilypond@gnu.org
 
 local-WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
-       echo 'AddDefaultCharset utf-8\
-AddCharset utf-8 .html\
-AddCharset utf-8 .en\
-AddCharset utf-8 .nl\
-AddCharset utf-8 .txt' > $(builddir)/.htaccess 
+       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)

diff --git a/mf/aybabtu.pe.in b/mf/aybabtu.pe.in
index a8b67e40d826583dcca4827cb078dcf71fd13383..ed04d9ddc54a325cdbf24d62b0a1ec6673e0358e 100644 (file)
--- a/mf/aybabtu.pe.in
+++ b/mf/aybabtu.pe.in
@@ -54,19 +54,7 @@ MergeFonts("feta-braces-g.scale.pfa");
 MergeFonts("feta-braces-h.scale.pfa");
 MergeFonts("feta-braces-i.scale.pfa");
 
-
-
-SetFontNames("aybabtu", "aybabtu", "aybabtu", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
-
-MergeFonts("feta-braces-a.pfa");
-MergeFonts("feta-braces-b.pfa");
-MergeFonts("feta-braces-c.pfa");
-MergeFonts("feta-braces-d.pfa");
-MergeFonts("feta-braces-e.pfa");
-MergeFonts("feta-braces-f.pfa");
-MergeFonts("feta-braces-g.pfa");
-MergeFonts("feta-braces-h.pfa");
-MergeFonts("feta-braces-i.pfa");
+SetFontNames("aybabtu-Regular", "aybabtu", "aybabtu Regular", "Regular", "GNU GPL", "@TOPLEVEL_VERSION@");
 
 i = 0;
 while (i < CharCnt())
@@ -92,6 +80,8 @@ LoadTableFromFile("LILF", "aybabtu.subfonts")
 LoadTableFromFile("LILC", "aybabtu.otf-table")
 LoadTableFromFile("LILY", "aybabtu.otf-gtable")
 
+MergeFonts ("feta-alphabet20.pfa");
+
 Generate("aybabtu.otf");
 Generate("aybabtu.cff");
 Generate("aybabtu.svg");

diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make
index d1bbc418d56fa56790e9aca225bd2f56b6e27d3d..585da6669f63955e0a5fc76455800e87e7e11f6a 100644 (file)
--- a/stepmake/stepmake/metafont-rules.make
+++ b/stepmake/stepmake/metafont-rules.make
@@ -31,7 +31,7 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf
 
 MFTRACE_FORMATS = pfa pfb svg
 $(outdir)/%.pfb $(outdir)/%.svg $(outdir)/%.pfa: %.mf
-       $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
+       $(MFTRACE) $(MFTRACE_FLAGS) --simplify -I $(outdir)/ --formats=pfa,pfb,svg $(basename $(@F))
 #      -mv $(MFTRACE_FORMATS:%=$(basename $(@F).%)) $(outdir)
        -mv $(basename $(@F)).pfa $(outdir)
        -mv $(basename $(@F)).pfb $(outdir)