X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fpfb-scheme.cc;h=37e44da8b05ed7fd1eff145b6c138b40c03c77ea;hb=926115ff42def8bc1ce767029e4f03c8072994ba;hp=29cbe15b4f2835f5b8080f2d632ef52339a276f2;hpb=92918346012f79ef9109ef0c391947af2d3165ca;p=lilypond.git

diff --git a/lily/pfb-scheme.cc b/lily/pfb-scheme.cc
index 29cbe15b4f..37e44da8b0 100644
--- a/lily/pfb-scheme.cc
+++ b/lily/pfb-scheme.cc
@@ -1,4 +1,5 @@
 
+#include "international.hh"
 #include "program-option.hh"
 #include "source-file.hh"
 #include "memory-stream.hh"
@@ -6,48 +7,86 @@
 #include "main.hh"
 #include "warn.hh"
 
-LY_DEFINE (ly_pfb_2_pfa, "ly:pfb->pfa",
-	   1, 0, 0, (SCM pfb_file_name),
-	   "Convert the contents of a PFB file to PFA.")
+LY_DEFINE (ly_type1_2_pfa, "ly:type1->pfa",
+           1, 0, 0, (SCM type1_file_name),
+           "Convert the contents of a Type@tie{}1 font in PFB format"
+           " to PFA format.  If the file is already in PFA format,"
+           " pass through it.")
 {
-  LY_ASSERT_FIRST_TYPE(scm_is_string, pfb_file_name);
+  LY_ASSERT_TYPE (scm_is_string, type1_file_name, 1);
 
-  string file_name = ly_scm2string (pfb_file_name);
+  string file_name = ly_scm2string (type1_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 ());
-  
-  SCM pfa_scm = scm_from_locale_string (pfa);
-  free (pfa);
+  debug_output ("[" + file_name); // start message on a new line
 
-  if (be_verbose_global)
-    progress_indication ("]");
+  vector<char> type1_string = gulp_file (file_name, 0);
+  SCM pfa_scm;
+
+  if ((Byte) type1_string[0] == 0x80)
+    {
+      /* The file is in PFB format. Convert it to PFA format. */
+      vector<char> pfa = pfb2pfa (type1_string);
+      pfa_scm = scm_from_latin1_stringn (&pfa[0], pfa.size ());
+    }
+  else
+    {
+      /* The file is in PFA format. Pass it through. */
+      pfa_scm = scm_from_latin1_stringn (&type1_string[0],
+                                         type1_string.size ());
+    }
+
+  debug_output ("]", false);
 
   return pfa_scm;
 }
 
 LY_DEFINE (ly_otf_2_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.")
+           1, 1, 0, (SCM otf_file_name, SCM idx),
+           "Convert the contents of an OTF file to a CFF file,"
+           " returning it as a string.  The optional"
+           " @var{idx} argument is useful for OpenType/CFF collections (OTC)"
+           " only; it specifies the font index within the OTC.  The default"
+           " value of @var{idx} is@tie{}0.")
 {
-  LY_ASSERT_FIRST_TYPE(scm_is_string, otf_file_name);
+  LY_ASSERT_TYPE (scm_is_string, otf_file_name, 1);
+
+  int i = 0;
+  if (!SCM_UNBNDP (idx))
+    {
+      LY_ASSERT_TYPE (scm_is_integer, idx, 2);
+      i = scm_to_int (idx);
+      if (i < 0)
+        {
+          warning (_ ("font index must be non-negative, using index 0"));
+          i = 0;
+        }
+    }
 
   string file_name = ly_scm2string (otf_file_name);
-  if (be_verbose_global)
-    progress_indication ("[" + file_name);
+  debug_output ("[" + file_name); // start message on a new line
+
+  FT_Face face;
+  /* check whether font index is valid */
+  if (i > 0)
+    {
+      face = open_ft_face (file_name, -1);
+      if (i >= face->num_faces)
+        {
+          warning (_f ("font index %d too large for font `%s', using index 0",
+                       i, file_name.c_str ()));
+          i = 0;
+        }
+      FT_Done_Face (face);
+    }
 
-  FT_Face face = open_ft_face (file_name);
+  face = open_ft_face (file_name, i);
   string table = get_otf_table (face, "CFF ");
 
-  SCM asscm = scm_from_locale_stringn ((char *) table.data (),
-				       table.length ());
+  SCM asscm = scm_from_latin1_stringn ((char *) table.data (),
+                                       table.length ());
+  FT_Done_Face (face);
 
-  if (be_verbose_global)
-    progress_indication ("]");
+  debug_output ("]", false);
 
   return asscm;
 }