X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb.cc;h=c971024548087c547c826da0d323dfa5a37c972c;hb=ee6212f6538384b0730ba0754bd8a31c2b2ebda3;hp=5ca2341a119200bfb3d9ce3416c74437d0bc5925;hpb=6e9040684ec18353e138194d7a1d557acf791748;p=lilypond.git

diff --git a/lily/pfb.cc b/lily/pfb.cc
index 5ca2341a11..c971024548 100644
--- a/lily/pfb.cc
+++ b/lily/pfb.cc
@@ -1,113 +1,83 @@
-/* 
-  pfb.cc --  implement pfb conversion.
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2004--2015 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"
 
 char *
-pfb2pfa (Byte const * pfb, int length)
+pfb2pfa (Byte const *pfb, int length)
 {
-  char * out = new char[1];
-  int olen = 0;
-  
-  Byte const * p = pfb;
-  while (p  < pfb + length)  
+  char *out = (char *) malloc (sizeof (char));
+  long olen = 0;
+
+  Byte const *p = pfb;
+  while (p < pfb + length)
     {
-      if (*p++ != 128) 
-	break;
+      if (*p++ != 128)
+        break;
 
       Byte type = *p++;
       if (type == 3)
-	break ;
+        break;
 
-      unsigned seglen =
-	p[0] | (p[1] << 8)
-	| (p[2] << 16) | (p[3] << 24);
+      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 ;
-	  memcpy (outp, p, seglen);
-	  olen += seglen; 
-	  p += seglen;
-	}
+        {
+          out = (char *)realloc (out, olen + seglen + 1);
+          char *outp = out + olen;
+          memcpy (outp, p, seglen);
+          olen += seglen;
+          p += seglen;
+        }
       else if (type == 2)
-	{
-	  unsigned outlength =  (seglen * 2) + (seglen / 32) + 2;
-
-	  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';
-		}
-	    }
-
-	  olen = outp - out;
-	}
-      
+        {
+          unsigned outlength = (seglen * 2) + (seglen / 32) + 2;
+
+          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';
+            }
+
+          olen = outp - out;
+        }
     }
   out[olen] = 0;
 
   return out;
 }
 
-LY_DEFINE(ly_pfb_to_pfa, "ly:pfb->pfa",
-	  1, 0, 0, (SCM pfb_path),
-	  "Convert the contents of a PFB file to PFA."
-	  )
-{
-  SCM_ASSERT_TYPE(scm_is_string (pfb_path), pfb_path,
-		  SCM_ARG1, __FUNCTION__, "string");
-
-  String path = ly_scm2string (pfb_path);
-  int len ; 
-  char *str = gulp_file (path, &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_path),
-	  "Convert the contents of a TTF file to Type42 PFA, returning it as "
-	  " a string."
-	  )
-{
-  SCM_ASSERT_TYPE(scm_is_string (ttf_path), ttf_path,
-		  SCM_ARG1, __FUNCTION__, "string");
-
-  String path = ly_scm2string (ttf_path);
-
-  Memory_out_stream stream;
-  create_type42(path.to_str0 (),
-		stream.get_file());
-  SCM asscm = scm_from_locale_stringn (stream.get_string (),
-				       stream.get_length ());
-
-  return asscm;
-}
-	  
-