CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/06/21 23:25:40
Modified files:
. : VERSION
lily : ttf.cc
Removed files:
ttftool/include: GNUmakefile proto.h ttftool.h types.h
Log message:
* lily/GNUmakefile (MODULE_INCLUDES): remove ttftool
* GNUmakefile.in (SUBDIRS): remove ttftool subdirectory.
* lily/ttf.cc (print_header): new file. Convert to type42, using
FreeType to parse the TTF.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.643&tr2=1.644&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ttf.cc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.643 lilypond/VERSION:1.644
--- lilypond/VERSION:1.643 Mon Jun 13 13:13:46 2005
+++ lilypond/VERSION Tue Jun 21 23:25:40 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=5
-PATCH_LEVEL=31
+PATCH_LEVEL=32
MY_PATCH_LEVEL=
Index: lilypond/lily/ttf.cc
diff -u lilypond/lily/ttf.cc:1.1 lilypond/lily/ttf.cc:1.2
--- lilypond/lily/ttf.cc:1.1 Tue Jun 21 23:16:34 2005
+++ lilypond/lily/ttf.cc Tue Jun 21 23:25:40 2005
@@ -9,7 +9,6 @@
#include "freetype.hh"
-
#include <freetype/tttables.h>
#include "lily-proto.hh"
@@ -18,7 +17,7 @@
#include "lily-guile.hh"
#include "main.hh"
-void
+static void
print_header (void *out, FT_Face face)
{
lily_cookie_fprintf (out, "%%!PS-TrueTypeFont\n");
@@ -86,7 +85,7 @@
#define CHUNKSIZE 65534
-void
+static void
print_body (void *out, String name)
{
FILE *fd = fopen (name.to_str0 (), "rb");
@@ -121,7 +120,7 @@
fclose (fd);
}
-void
+static void
print_trailer (void *out,
FT_Face face)
{
@@ -148,7 +147,8 @@
lily_cookie_fprintf (out, "FontName currentdict end definefont pop\n");
}
-void print_ps_font (void *out, String name)
+static void
+create_type42_font (void *out, String name)
{
FT_Face face = open_ft_face (name);
@@ -172,7 +172,7 @@
Memory_out_stream stream;
- print_ps_font (&stream, file_name);
+ create_type42_font (&stream, file_name);
SCM asscm = scm_from_locale_stringn (stream.get_string (),
stream.get_length ());
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
