X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=e699156fc914fd109b898c2fdd9a7d53e566caea;hb=a58143ffd322981ea22351c44a0d5929f18892e5;hp=0967358f1f8b6d6c95ba4a5184656ad7fc8bd4b2;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 0967358f1f..e699156fc9 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,21 +3,25 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <cstdlib>
 #include <cstdio>
 #include <cstring>
+using namespace std;
 
+#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"
 
 char *
 pfb2pfa (Byte const *pfb, int length)
 {
-  char *out = new char[1];
+  char *out = (char*) malloc(sizeof(char));
   int olen = 0;
 
   Byte const *p = pfb;
@@ -55,52 +59,14 @@ pfb2pfa (Byte const *pfb, int length)
 	      sprintf (outp, "%02x", *p++);
 	      outp += 2;
 	      if (! (i % 32))
-		{
-		  *outp++ = '\n';
-		}
+		*outp++ = '\n';
 	    }
 
 	  olen = outp - out;
 	}
-
     }
   out[olen] = 0;
 
   return out;
 }
 
-LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->pfa",
-	   1, 0, 0, (SCM pfb_file_name),
-	   "Convert the contents of a PFB file to PFA.")
-{
-  SCM_ASSERT_TYPE (scm_is_string (pfb_file_name), pfb_file_name,
-		   SCM_ARG1, __FUNCTION__, "string");
-
-  String file_name = ly_scm2string (pfb_file_name);
-  int len;
-  char *str = gulp_file (file_name, &len);
-  char *pfa = pfb2pfa ((Byte *)str, len);
-
-  SCM pfa_scm = scm_makfrom0str (pfa);
-  free (pfa);
-  delete str;
-  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);
-
-  Memory_out_stream stream;
-  create_type42 (file_name.to_str0 (), stream.get_file ());
-  SCM asscm = scm_from_locale_stringn (stream.get_string (),
-				       stream.get_length ());
-
-  return asscm;
-}