X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fpfb.cc;h=11ee5d90c545c1159789f6b3ab81475586ab8be1;hb=a69eb3b3dfed77344ffd4d54580fa8985c27568e;hp=db45a994aa8cfa9f24949b1f376acae1105b368e;hpb=ab9f7a342f17a9b5ad1d54527c36bfc552f7179c;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index db45a994aa..11ee5d90c5 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,17 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 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)
@@ -56,14 +59,11 @@ 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;
 
@@ -77,42 +77,22 @@ LY_DEFINE (ly_pfb_to_pfa, "ly:pfb->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 (pfb_file_name);
 
-  String file_name = ly_scm2string (ttf_file_name);
   if (be_verbose_global)
     progress_indication ("[" + file_name);
   
+  vector<char> pfb_string = gulp_file (file_name, 0);
+  char *pfa = pfb2pfa ((Byte *) &pfb_string[0], pfb_string.size ());
   
-  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 ());
+  SCM pfa_scm = scm_from_locale_string (pfa);
+  free (pfa);
 
   if (be_verbose_global)
     progress_indication ("]");
-  
-  return asscm;
-}
-
 
+  return pfa_scm;
+}
 
 LY_DEFINE (ly_otf_to_cff, "ly:otf->cff",
 	   1, 0, 0, (SCM otf_file_name),
@@ -122,18 +102,19 @@ LY_DEFINE (ly_otf_to_cff, "ly:otf->cff",
   SCM_ASSERT_TYPE (scm_is_string (otf_file_name), otf_file_name,
 		   SCM_ARG1, __FUNCTION__, "string");
 
-  String file_name = ly_scm2string (otf_file_name);
+  string file_name = ly_scm2string (otf_file_name);
   if (be_verbose_global)
     progress_indication ("[" + file_name);
 
   FT_Face face = open_ft_face (file_name);
-  String table = get_otf_table (face, "CFF ");
+  string table = get_otf_table (face, "CFF ");
 
-  SCM asscm = scm_from_locale_stringn ((char*) table.get_bytes (),
+  SCM asscm = scm_from_locale_stringn ((char *) table.data (),
 				       table.length ());
 
   if (be_verbose_global)
     progress_indication ("]");
-  
+
   return asscm;
-}	   
+}
+