X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=678e480b90f6a693e318bcdb3bf1d76ffd948e00;hb=7697100194a647d04667946bcd0ba35c0554aac0;hp=99495d1b21f6078662b6225d84a5d8e4c3e20bc1;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 99495d1b21..678e480b90 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,16 +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)
@@ -28,17 +32,17 @@ pfb2pfa (Byte const *pfb, int length)
 
       Byte type = *p++;
       if (type == 3)
-	break ;
+	break;
 
-      unsigned seglen =
-	p[0] | (p[1] << 8)
+      unsigned seglen
+	= p[0] | (p[1] << 8)
 	| (p[2] << 16) | (p[3] << 24);
 
       p += 4;
       if (type == 1)
 	{
-	  out = (char*)realloc (out, olen + seglen + 1);
-	  char *outp = out + olen ;
+	  out = (char *)realloc (out, olen + seglen + 1);
+	  char *outp = out + olen;
 	  memcpy (outp, p, seglen);
 	  olen += seglen;
 	  p += seglen;
@@ -47,22 +51,19 @@ pfb2pfa (Byte const *pfb, int length)
 	{
 	  unsigned outlength = (seglen * 2) + (seglen / 32) + 2;
 
-	  out = (char*)realloc (out, olen + outlength + 1);
+	  out = (char *)realloc (out, olen + outlength + 1);
 
 	  char *outp = out + olen;
 	  for (int i = seglen; i--;)
 	    {
 	      sprintf (outp, "%02x", *p++);
 	      outp += 2;
-	      if (!(i % 32))
-		{
-		  *outp ++ = '\n';
-		}
+	      if (! (i % 32))
+		*outp++ = '\n';
 	    }
 
 	  olen = outp - out;
 	}
-
     }
   out[olen] = 0;
 
@@ -71,38 +72,50 @@ pfb2pfa (Byte const *pfb, int length)
 
 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."
-	   )
+	   "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;
+  string file_name = ly_scm2string (pfb_file_name);
+  int len = -1;
+
+  if (be_verbose_global)
+    progress_indication ("[" + file_name);
+  
   char *str = gulp_file (file_name, &len);
-  char *pfa = pfb2pfa ((Byte*)str, len);
+  char *pfa = pfb2pfa ((Byte *)str, len);
 
   SCM pfa_scm = scm_makfrom0str (pfa);
   free (pfa);
   delete str;
+  if (be_verbose_global)
+    progress_indication ("]");
+
   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."
-	   )
+LY_DEFINE (ly_otf_to_cff, "ly:otf->cff",
+	   1, 0, 0, (SCM otf_file_name),
+	   "Convert the contents of a OTF file to CFF file, returning it as "
+	   " a string.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
+  SCM_ASSERT_TYPE (scm_is_string (otf_file_name), otf_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 ());
+  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 ");
+
+  SCM asscm = scm_from_locale_stringn ((char *) table.data (),
+				       table.length ());
+
+  if (be_verbose_global)
+    progress_indication ("]");
 
   return asscm;
 }
+