X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=1cd2b2986035b7445c0a63d0030234c80b02b333;hb=e62c1e205cd619afcc43fd8c8a9a2c5a093b508e;hp=7869d2ed1d25e887e8c306e23ae59209e1a6618b;hpb=9087de1c637fc042ae3cbda8174a4ee9131cc523;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 7869d2ed1d..1cd2b29860 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -1,18 +1,30 @@
 /*
-  pfb.cc -- implement pfb conversion.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #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"
@@ -20,7 +32,7 @@
 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;
@@ -58,91 +70,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;
-
-  if (be_verbose_global)
-    progress_indication ("[" + file_name);
-
-  char *str = gulp_file (file_name, &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.")
-{
-  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;
-  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",
-	   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 (otf_file_name), otf_file_name,
-		   SCM_ARG1, __FUNCTION__, "string");
-
-  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.get_bytes (),
-				       table.length ());
-
-  if (be_verbose_global)
-    progress_indication ("]");
-  
-  return asscm;
-}