Run `make grand-replace'.

[lilypond.git] / lily / pfb.cc

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 375429cdd56f23e6f2322678cc0092652445dbdd..e699156fc914fd109b898c2fdd9a7d53e566caea 100644 (file)
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -3,25 +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;
@@ -59,95 +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;
-
-  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;
-  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",
-          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;
-}         
-