(MODULE_INCLUDES): remove ttftool

diff --git a/ChangeLog b/ChangeLog
index ccb5387d98ffbfb98b1c86b1ad31598b5f4318fc..4082c00e32a5e399ba215be307e2ad75db3c6bdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-06-22  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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 29a5133f5071b89c4ca42d4cf071304bbeb5aa2d..6bf022fc80e57235afaec6de44c70bdbfd83712e 100644 (file)
--- 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 cc93d4a23a0be87fa2621513122f465788e1af7b..56fc6beebaabfa486cccdcfab81ef88dc8d83c52 100644 (file)
--- 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",