X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fttf.cc;h=869cdbaed19898d49517d5656c3c78dbf3f99073;hb=7ee8350606adbc387625e8a1b272a9837a73b73b;hp=9cbfd730fc36e9bec8f6bc2f9305c92e688bf74a;hpb=8a719f6eec1bd84269a55d1ec99adb3f17c04e64;p=lilypond.git

diff --git a/lily/ttf.cc b/lily/ttf.cc
index 9cbfd730fc..869cdbaed1 100644
--- a/lily/ttf.cc
+++ b/lily/ttf.cc
@@ -3,18 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "freetype.hh"
 
 #include <freetype/tttables.h>
 
-#include "lily-proto.hh"
 #include "memory-stream.hh"
 #include "warn.hh"
 #include "lily-guile.hh"
 #include "main.hh"
+#include "open-type-font.hh"
+
+
+Index_to_charcode_map
+make_index_to_charcode_map (FT_Face face)
+{
+  Index_to_charcode_map m;
+  FT_ULong charcode;
+  FT_UInt gindex;
+
+  FT_CharMap current_cmap = face->charmap;
+  FT_Select_Charmap (face, FT_ENCODING_UNICODE);
+
+  int j = 0;
+  for (charcode = FT_Get_First_Char (face, &gindex); gindex != 0;
+       charcode = FT_Get_Next_Char (face, charcode, &gindex))
+    {
+      m[gindex] = charcode;
+      j++;
+    }
+  FT_Set_Charmap (face, current_cmap);
+
+  
+  return m;
+}
 
 /*
   Based on ttfps by Juliusz Chroboczek
@@ -28,7 +52,7 @@ print_header (void *out, FT_Face face)
     = (TT_Postscript *) FT_Get_Sfnt_Table (face, ft_sfnt_post);
 
   if (pt->maxMemType42)
-    lily_cookie_fprintf (out, "%%%%VMUsage: %ld %ld\n", 0, 0);
+    lily_cookie_fprintf (out, "%%%%VMUsage: %d %d\n", 0, 0);
 
   lily_cookie_fprintf (out, "%d dict begin\n", 11);
   lily_cookie_fprintf (out, "/FontName /%s def\n",
@@ -50,8 +74,8 @@ print_header (void *out, FT_Face face)
   lily_cookie_fprintf (out, "/FontType 42 def\n");
   lily_cookie_fprintf (out, "/FontInfo 8 dict dup begin\n");
   lily_cookie_fprintf (out, "/version (%d.%d) def\n",
-		       (ht->Font_Revision >> 16),
-		       (ht->Font_Revision &((1 << 16) -1)));
+		       int (ht->Font_Revision >> 16),
+		       int (ht->Font_Revision &((1 << 16) -1)));
 
 #if 0
   if (strings[0])
@@ -86,7 +110,7 @@ print_header (void *out, FT_Face face)
 #define CHUNKSIZE 65534
 
 static void
-print_body (void *out, String name)
+print_body (void *out, string name)
 {
   FILE *fd = fopen (name.c_str (), "rb");
 
@@ -132,27 +156,58 @@ print_trailer (void *out,
 
   lily_cookie_fprintf (out, "/CharStrings %d dict dup begin\n", mp->numGlyphs);
 
+  Index_to_charcode_map ic_map (make_index_to_charcode_map (face));
 
-  if (face->face_flags & FT_FACE_FLAG_GLYPH_NAMES)
-    for (int i = 0; i < mp->numGlyphs; i++)
-      {
-	FT_Error error = FT_Get_Glyph_Name (face, i, glyph_name,
-					    GLYPH_NAME_LEN);
-	if (error)
-	  programming_error ("print_trailer(): FT_Get_Glyph_Name() returned error");
-	else
-	  lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
+  int output_count = 0;
+  for (int i = 0; i < mp->numGlyphs; i++)
+    {
+      glyph_name[0] = 0;
+      if (face->face_flags & FT_FACE_FLAG_GLYPH_NAMES)
+	{
+	  FT_Error error = FT_Get_Glyph_Name (face, i, glyph_name,
+					      GLYPH_NAME_LEN);
+	  if (error)
+	    {
+	      programming_error ("FT_Get_Glyph_Name (): error.");
+	      glyph_name[0] = 0;
+	    }
+	}
+
+      if (!glyph_name[0] && ic_map.find (i) != ic_map.end ())
+	{
+	  FT_ULong ucode = ic_map[i];
+	  get_unicode_name (glyph_name, ucode);
+	}
 
-	if (! (i % 5))
-	  lily_cookie_fprintf (out, "\n");
-      }
+      if (glyph_name == string (".notdef"))
+	glyph_name[0] = '\0';
+
+      
+      if (!glyph_name[0])
+	{
+	  get_glyph_index_name (glyph_name, i);
+	}
+      
+      if (glyph_name[0])
+	{
+	  lily_cookie_fprintf (out, "/%s %d def ", glyph_name, i);
+	  output_count ++;
+	}
+      else
+	{
+	  programming_error (to_string ("no name for glyph %d", i));
+	}
+			     
+      if (! (output_count % 5))
+	lily_cookie_fprintf (out, "\n");
+    }
 
   lily_cookie_fprintf (out, "end readonly def\n");
   lily_cookie_fprintf (out, "FontName currentdict end definefont pop\n");
 }
 
 static void
-create_type42_font (void *out, String name)
+create_type42_font (void *out, string name)
 {
   FT_Face face = open_ft_face (name);
 
@@ -168,15 +223,14 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name",
 	   1, 0, 0, (SCM ttf_file_name),
 	   "Extract the PostScript name from a TrueType font.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (ttf_file_name), ttf_file_name,
-		   SCM_ARG1, __FUNCTION__, "string");
-  String file_name = ly_scm2string (ttf_file_name);
+  LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1);
+  string file_name = ly_scm2string (ttf_file_name);
   if (be_verbose_global)
     progress_indication ("[" + file_name);
 
   FT_Face face = open_ft_face (file_name);
   char const *ps_name_str0 = FT_Get_Postscript_Name (face);
-  SCM ps_name = scm_makfrom0str (ps_name_str0 ? ps_name_str0 : "");
+  SCM ps_name = scm_from_locale_string (ps_name_str0 ? ps_name_str0 : "");
   
   FT_Done_Face (face);
   
@@ -188,15 +242,14 @@ LY_DEFINE (ly_ttf_ps_name, "ly:ttf-ps-name",
 
 
 
-LY_DEFINE (ly_ttf_to_pfa, "ly:ttf->pfa",
+LY_DEFINE (ly_ttf_2_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");
+  LY_ASSERT_TYPE (scm_is_string, ttf_file_name, 1);
 
-  String file_name = ly_scm2string (ttf_file_name);
+  string file_name = ly_scm2string (ttf_file_name);
   if (be_verbose_global)
     progress_indication ("[" + file_name);