From a2b44b35df1110681fcb096ae1df74c2a47150f1 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 21 Jun 2005 23:18:25 +0000 Subject: [PATCH] (MODULE_INCLUDES): remove ttftool --- ChangeLog | 2 ++ lily/GNUmakefile | 4 ++-- lily/pfb.cc | 28 ---------------------------- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index ccb5387d98..4082c00e32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-06-22 Han-Wen Nienhuys + * lily/GNUmakefile (MODULE_INCLUDES): remove ttftool + * ttftool/*: remove ttftool subdirectory. * GNUmakefile.in (SUBDIRS): remove ttftool subdirectory. diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 29a5133f50..6bf022fc80 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -4,8 +4,8 @@ depth = .. NAME = lilypond SUBDIRS = include -MODULE_LIBS= $(depth)/ttftool $(depth)/flower $(depth)/kpath-guile -MODULE_INCLUDES= $(depth)/flower/include $(depth)/ttftool/include +MODULE_LIBS= $(depth)/flower $(depth)/kpath-guile +MODULE_INCLUDES= $(depth)/flower/include MODULE_CXXFLAGS= HELP2MAN_EXECS = lilypond diff --git a/lily/pfb.cc b/lily/pfb.cc index cc93d4a23a..56fc6beeba 100644 --- a/lily/pfb.cc +++ b/lily/pfb.cc @@ -13,7 +13,6 @@ #include "program-option.hh" #include "source-file.hh" #include "memory-stream.hh" -#include "ttftool.h" #include "open-type-font.hh" #include "main.hh" #include "warn.hh" @@ -98,33 +97,6 @@ LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->pfa", return pfa_scm; } -LY_DEFINE (ly_ttf_to_pfa, "ly:ttf->pfa", - 1, 0, 0, (SCM ttf_file_name), - "Convert the contents of a TTF file to Type42 PFA, returning it as " - " a string.") -{ - SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name, - SCM_ARG1, __FUNCTION__, "string"); - - String file_name = ly_scm2string (ttf_file_name); - if (be_verbose_global) - progress_indication ("[" + file_name); - - - Memory_out_stream stream; - ttf_verbosity = - robust_scm2int (ly_get_option (ly_symbol2scm ("ttf-verbosity")), 0); - - create_type42 (file_name.to_str0 (), (void*) &stream); - SCM asscm = scm_from_locale_stringn (stream.get_string (), - stream.get_length ()); - - if (be_verbose_global) - progress_indication ("]"); - - return asscm; -} - LY_DEFINE (ly_otf_to_cff, "ly:otf->cff", -- 2.39.2