make ttf fonts works with firefox

Changed files (4)

• modified src/ExportTool.vala
• modified src/Glyph.vala
• modified src/OpenFontFormatWriter.vala
• modified src/OverView.vala

Diff

diff --git a/src/ExportTool.vala b/src/ExportTool.valaindex 5ce901c..7c2fae5 100644--- a/src/ExportTool.vala+++ b/src/ExportTool.vala@@ -188,11 +188,16 @@ class ExportTool : Tool { 	 	<style type="text/css"> -		@font-face{-			font-family: '"""); os.put_string (@"$(name)");              os.put_string ("""';-			src: url('""");     os.put_string (@"$(name).svg#$(name)");  os.put_string ("""') format('svg'), url('""");     os.put_string (@"$(name).ttf"); os.put_string ("""') format('truetype');+		@font-face {+			font-family: '"""); os.put_string (@"$(name)");              os.put_string ("""SVG';+			src: url('""");     os.put_string (@"$(name).svg#$(name)");  os.put_string ("""') format('svg'); 		} +		@font-face {+			font-family: '"""); os.put_string (@"$(name)");              os.put_string ("""TTF';+			src: url('""");     os.put_string (@"$(name).ttf"); os.put_string ("""') format('truetype');+		}+		 		h1 { 			margin: 0 0 5px 0; 			color: #afafaf;@@ -223,7 +228,7 @@ class ExportTool : Tool { 		} 		 		div {-			font-family: '"""); os.put_string (@"$(name)");              os.put_string ("""';+			font-family: '"""); os.put_string (@"$(name)");  os.put_string ("""SVG', '"""); os.put_string (@"$(name)");  os.put_string ("""TTF'; 			margin: 0 0 30px 0; 		} diff --git a/src/Glyph.vala b/src/Glyph.valaindex 00610e6..4913a69 100644--- a/src/Glyph.vala+++ b/src/Glyph.vala@@ -839,7 +839,6 @@ class Glyph : FontDisplay { 		Path np; 		 		if (active_paths.length () == 0) {-			print ("ADD empty\n"); 			np = new Path (); 			clear_active_paths (); 			active_paths.append (np);@@ -857,7 +856,6 @@ class Glyph : FontDisplay { 		added = false;  		if (new_point_on_path != null) {-			print ("ADD np\n"); 			return_if_fail (active_paths.length () > 0);  			Path p = new Path ();@@ -880,7 +878,6 @@ class Glyph : FontDisplay { 		} 		 		if (!added) {-			print ("ADD a\n"); 			foreach (Path p in paths) { 				if (p.is_open ()) { 					p.add (xt, yt);@@ -893,7 +890,6 @@ class Glyph : FontDisplay { 		}  		if (!added) {-			print ("ADD X\n"); 			foreach (Path p in paths) { 				if (p.is_over (xt, yt)) { 					p.add (xt, yt);@@ -906,7 +902,6 @@ class Glyph : FontDisplay { 		} 		 		if (!added) {-			print ("ADD NEW\n"); 			if (paths.length () > 0 && paths.last ().data.is_open ()) { 				paths.last().data.add (xt, yt); 			}diff --git a/src/OpenFontFormatWriter.vala b/src/OpenFontFormatWriter.valaindex c433cf7..cf16e4c 100644--- a/src/OpenFontFormatWriter.vala+++ b/src/OpenFontFormatWriter.vala@@ -344,9 +344,12 @@ class FontData : Object { 		}
 		
 		table_data[wp] = d;
-		
+
+		if (wp == len) {
+			len++;
+		}
+				
 		wp++;
-		len++;
 	}
 	
 	public void add_u16 (uint16 d) {
@@ -1311,7 +1314,10 @@ class GlyfTable : Table { 		double x, y;
 
 		Font font = Supplement.get_current_font ();
-		int glyph_offset = (int) location_offsets.last ().data;
+		int glyph_offset = (int) fd.length ();
+		
+		uint len; 
+		uint coordinate_length;
 		
 		g.remove_empty_paths ();
 		if (g.path_list.length () == 0) {
@@ -1358,6 +1364,9 @@ class GlyfTable : Table { 		
 		fd.add_u16 (0); // instruction length 
 		
+		uint hl = fd.length ();
+		printd (@"glyf header length: $(hl)\n");
+		
 		// instructions should go here 
 		
 		npoints = (ncontours > 0) ? end_point : 0; // +1?
@@ -1389,6 +1398,8 @@ class GlyfTable : Table { 			warning (@"(nflags != npoints)  ($nflags != $npoints) in glyph $(g.name). ncontours: $ncontours");
 		}
 		assert (nflags == npoints);
+
+		printd (@"flags: $(nflags)\n");
 		
 		// x coordinates
 		double prev = 0;
@@ -1443,6 +1454,11 @@ class GlyfTable : Table { 			}
 		}
 		
+		coordinate_length = fd.length () - nflags - hl;
+		printd (@"coordinate_length: $(coordinate_length)\n");
+		
+		len = fd.length ();
+		
 		fd.seek (glyph_offset + 2); // go to box boundries for this glyf
 		assert (fd.read_short () == 0);
 
@@ -1452,6 +1468,8 @@ class GlyfTable : Table { 		fd.add_16 (tymax);
 		fd.seek_end ();
 
+		assert (len == fd.length ());
+
 		printd (@"\n");
 		printd (@"txmin: $txmin\n");
 		printd (@"tymin: $tymin\n");
@@ -1467,10 +1485,13 @@ class GlyfTable : Table { 		// part of average width calculation for OS/2 table
 		total_width += xmax - xmin;
 		
-		// glyph need padding too for loca table to be correct
+		printd (@"length before padding: $(fd.length ())\n");
+		
+		// all glyphs needs padding for loca table to be correct
 		while (fd.length () % 4 != 0) {
 			fd.add (0);
 		}
+		printd (@"length after padding: $(fd.length ())\n");
 	}
 
 	// necessary in order to have glyphs sorted according to ttf specification
@@ -1514,19 +1535,24 @@ class GlyfTable : Table { 		
 		create_glyph_table ();
 		int i = 0;
+		uint last_len = 0;
 		foreach (Glyph g in glyphs) {
 			// set values for loca table
 			assert (fd.length () % 4 == 0);
 			location_offsets.append (fd.length ());
 			process_glyph (g, fd);
-			
+
+			printd (@"glyf length: $(fd.length () - last_len)\n");
 			printd (@"loca fd.length (): $(fd.length ())\n");
+
+			last_len = fd.length ();
 		}
 
 		location_offsets.append (fd.length ()); // last entry in loca table is special
 		
-		fd.pad ();
-						
+		// every glyph is padded, no padding to be done here
+		assert (fd.length () % 4 == 0);
+
 		font_data = fd;	
 	}
 }
@@ -4492,10 +4518,10 @@ class KernTable : Table { 		fd.add_ushort (HORIZONTAL); // subtable flags
 
 		fd.add_ushort (n_pairs);
-
-		search_range = 2 * largest_pow2 (n_pairs);
-		entry_selector = (uint16) (Math.log (search_range / 2) / Math.log (2));
-		range_shift = 6 * (n_pairs - largest_pow2 (n_pairs));
+		
+		search_range = 6 * largest_pow2 (n_pairs);
+		entry_selector = largest_pow2_exponent (n_pairs);
+		range_shift = 6 * n_pairs - search_range;
 		
 		fd.add_ushort (search_range);
 		fd.add_ushort (entry_selector);
@@ -4940,7 +4966,7 @@ public static uint16 largest_pow2 (uint16 max) { 	uint16 x = 1;
 	uint16 l = 0;
 	
-	while (x < max) {
+	while (x <= max) {
 		l = x;
 		x = x << 1;
 	}
@@ -4948,8 +4974,22 @@ public static uint16 largest_pow2 (uint16 max) { 	return l;
 }
 
+public static uint16 largest_pow2_exponent (uint16 max) {
+	uint16 exp = 0;
+	uint16 l = 0;
+	uint16 x = 0;
+	
+	while (x <= max) {
+		l = exp;
+		exp++;
+		x = 1 << exp;
+	}	
+	
+	return l;
+}
+
 void printd (string s) {
-	//print (s);
+	// print (s);
 }
 
 }
diff --git a/src/OverView.vala b/src/OverView.valaindex 4f95728..04533d6 100644--- a/src/OverView.vala+++ b/src/OverView.vala@@ -1014,7 +1014,6 @@ class OverView : FontDisplay { 		 		// scroll to the selected character 		if (c == "") {-			print (@"No glyph.. \"$c\" move to a\n"); 			c = "a"; 		}