CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/21 21:43:36
Modified files:
. : ChangeLog
ly : music-functions-init.ly
make : mutopia-rules.make
scm : lily.scm ps-to-png.scm
ttftool : parse.c
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3801&tr2=1.3802&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/music-functions-init.ly.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/mutopia-rules.make.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.366&tr2=1.367&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/ps-to-png.scm.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/parse.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3801 lilypond/ChangeLog:1.3802
--- lilypond/ChangeLog:1.3801 Sun Jun 19 14:52:31 2005
+++ lilypond/ChangeLog Tue Jun 21 21:43:35 2005
@@ -1,5 +1,12 @@
+2005-06-20 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * ly/music-functions-init.ly (musicMap): new music function
+ musicMap.
+
2005-06-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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 <[EMAIL PROTECTED]>
* 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 <[EMAIL PROTECTED]>
Index: lilypond/ly/music-functions-init.ly
diff -u lilypond/ly/music-functions-init.ly:1.25
lilypond/ly/music-functions-init.ly:1.26
--- lilypond/ly/music-functions-init.ly:1.25 Wed May 25 09:04:08 2005
+++ lilypond/ly/music-functions-init.ly Tue Jun 21 21:43:35 2005
@@ -26,6 +26,9 @@
'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)
Index: lilypond/make/mutopia-rules.make
diff -u lilypond/make/mutopia-rules.make:1.29
lilypond/make/mutopia-rules.make:1.30
--- lilypond/make/mutopia-rules.make:1.29 Thu Jun 16 11:13:02 2005
+++ lilypond/make/mutopia-rules.make Tue Jun 21 21:43:36 2005
@@ -15,7 +15,7 @@
# 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
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.366 lilypond/scm/lily.scm:1.367
--- lilypond/scm/lily.scm:1.366 Sun Jun 19 14:52:33 2005
+++ lilypond/scm/lily.scm Tue Jun 21 21:43:36 2005
@@ -19,11 +19,8 @@
"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.")
Index: lilypond/scm/ps-to-png.scm
diff -u lilypond/scm/ps-to-png.scm:1.11 lilypond/scm/ps-to-png.scm:1.12
--- lilypond/scm/ps-to-png.scm:1.11 Sun Jun 19 14:52:33 2005
+++ lilypond/scm/ps-to-png.scm Tue Jun 21 21:43:36 2005
@@ -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)
))
Index: lilypond/ttftool/parse.c
diff -u lilypond/ttftool/parse.c:1.8 lilypond/ttftool/parse.c:1.9
--- lilypond/ttftool/parse.c:1.8 Sun Jun 12 16:33:21 2005
+++ lilypond/ttftool/parse.c Tue Jun 21 21:43:36 2005
@@ -149,10 +149,10 @@
}
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 @@
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);
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
