*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 683ea3c586ba34203f8466af15bfb3c89a5f07c0..8d67369665408caa51d00424650caf8059668e51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2005-06-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * ly/music-functions-init.ly (musicMap): new music function
+       musicMap. 
+       
 2005-06-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * make/mutopia-rules.make: anti-alias-factor = 2
+
        * scm/ps-to-png.scm (make-ps-images): cleanup multipage vs. single
        page switch.
 
@@ -10,15 +17,13 @@
        (my-system): new function.
        (make-ps-images): blow up GS resolution by anti-alias-factor,
        scale down image by anti-alias-factor.  This improves appearance
-       of
-       (make-ps-images): remove showpage. Fixes spurious empty png at end.
+       of bitmaps
+       (make-ps-images): remove showpage. Fixes spurious empty png at
+       end.
 
        * scm/framework-ps.scm (write-preamble): downcase filename before
        string-matching. Should fix .TTF files (as opposed to ttf files)  
 
-       * scm/lily.scm (lambda): default resolution 116 (8 pixels per
-       space).
-
        * Documentation/user/tutorial.itely (Running LilyPond for the
        first time): separate subsections for windows, macos and unix.  
 
@@ -28,7 +33,7 @@
 2005-06-18  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * Documentation/user/introduction.itely (Engraving): don't include
-       file, add file directly. 
+       file optical-spacing, add directly.
 
        * lily/paper-outputter.cc (file): open file in binary mode. This
        fixes OTF embedding on windows.
@@ -41,7 +46,7 @@
 
        * mf/GNUmakefile ($(outdir)/fonts.cache-1): create font cache for
        outdir.
-       (install-fc-cache): insatll font cache in installation directories.
+       (install-fc-cache): install font cache in installation directories.
 
 2005-06-17  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly
index 74ebf1f8e507a70ce4905197818c411856b29387..f42bdd50d6542d7a8e58dc2b25cf2713827059b9 100644 (file)
--- a/ly/music-functions-init.ly
+++ b/ly/music-functions-init.ly
@@ -26,6 +26,9 @@ applycontext = #(def-music-function (parser location proc) (procedure?)
                    'origin location
                    'procedure proc))
 
+musicMap = #(def-music-function (parser location proc mus) (procedure? ly:music?)
+            (music-map proc mus))
+
 displayMusic = #(def-music-function (parser location music) (ly:music?)
                 (display-scheme-music music)
                 music)

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index a4c287cb82c2f452dfe06c8f6b2ab512639e736d..fd3507113139616691eea3cca1955d188deb1b9c 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -15,7 +15,7 @@ $(outdir)/%.ly: %.abc
 
 # hmm. notdir builds srcdir builds? 
 $(outdir)/%.png $(outdir)/%.pdf $(outdir)/%.ly $(outdir)/%.ps: $(outdir)/%.ly
-       cd $(outdir); $(LILYPOND) --pdf --png -ddelete-intermediate-files -dno-point-and-click -I $(shell pwd)/ $(notdir $<)
+       cd $(outdir); $(LILYPOND) --pdf --png -danti-alias-factor=2 -ddelete-intermediate-files -dno-point-and-click -I $(shell pwd)/ $(notdir $<)
        touch $(outdir)/$(basename $(notdir $<)).png
 
 $(outdir)/%.ly: %.ly

diff --git a/scm/lily.scm b/scm/lily.scm
index 06e41889fcab969527384dcf206f0f81c5601648..d73b883b515ce795d105364447f513409666000b 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -19,11 +19,8 @@ on errors, and print a stack trace.")
                          "relative for simultaneous music works
 similar to chord syntax")
 
-           ;; at 101.178, a staff space is exactly 7 pixels.
-           ;; 115.63 = 8 pixels
-           ;; 86  = 6 pixels
-           (resolution 90 "resolution for generating bitmaps")
-           (anti-alias-factor 1 "blow up resolution and scale to prevent jaggies in PNG")
+           (resolution 101 "resolution for generating bitmaps")
+           (anti-alias-factor 1 "render at higher resolution and scale down result\nto prevent jaggies in PNG")
            (preview-include-book-title #t "include book-titles in preview images.")
            (gs-font-load #f
                          "load fonts via Ghostscript.")

diff --git a/scm/ps-to-png.scm b/scm/ps-to-png.scm
index 83f91603859b8c8c85554eb93e7c94c3ed314bdf..dfcb9551b08bb942e2b170ee03f6edf705cd2dd9 100644 (file)
--- a/scm/ps-to-png.scm
+++ b/scm/ps-to-png.scm
@@ -107,7 +107,7 @@
   (rename-file file old)
   (my-system be-verbose
             #t
-            (format #f "convert -scale '~a%' ~a ~a" percentage old file))
+            (format #f "convert -scale \"~a%\" ~a ~a" percentage old file))
   (delete-file old)
   ))
 

diff --git a/ttftool/parse.c b/ttftool/parse.c
index d198475c4b82e49eec511bc20e092722987e7b0b..cf43152b073f9437c5fa3ebea41a76870f50e797 100644 (file)
--- a/ttftool/parse.c
+++ b/ttftool/parse.c
@@ -149,10 +149,10 @@ readHeadTable (FILE *fd, struct HeadTable *ht)
 }
 
 int
-readPostTable (FILE *fd, int nglyphs, struct PostTable *pt,
+readPostTable (FILE *fd, int root_nglyphs, struct PostTable *pt,
               struct GlyphName **gt)
 {
-  USHORT nglyphspost;
+  USHORT nglyphs;
   USHORT *glyphNameIndex;
   struct GlyphName *glyphNames;
   char **glyphNamesTemp;
@@ -172,10 +172,20 @@ readPostTable (FILE *fd, int nglyphs, struct PostTable *pt,
     case 2:
       if (pt->formatType.fraction != 0)
        ttf_error ("Unsupported `post' table format");
-      surely_read (fd, &nglyphspost, sizeof (USHORT));
-      FIX_UH (nglyphspost);
-      if (nglyphspost != nglyphs)
-       ttf_error ("Inconsistency between `maxp' and `nglyphs' tables!");
+      surely_read (fd, &nglyphs, sizeof (USHORT));
+
+      /*from freetype2:
+       */
+      /*
+       UNDOCUMENTED!  The number of glyphs in this table can be smaller
+       than the value in the maxp table (cf. cyberbit.ttf).             
+       */
+      FIX_UH (nglyphs);
+      if (nglyphs > root_nglyphs)
+       {
+         fprintf (stderr, "More glyphs in 'post' table than in 'maxp' table");
+       }
+      
       if (ttf_verbosity >= 2)
        fprintf (stderr, "  %d glyphs\n", nglyphs);
       glyphNameIndex = mymalloc (sizeof (USHORT) * nglyphs);