little endian in EOT header

Changed files (5)

• modified src/EotWriter.vala
• modified src/ExportTool.vala
• modified src/OpenFontFormatReader.vala
• modified src/OpenFontFormatWriter.vala
• modified src/VersionList.vala

Diff

diff --git a/src/EotWriter.vala b/src/EotWriter.valaindex 9e3d595..5da1b94 100644--- a/src/EotWriter.vala+++ b/src/EotWriter.vala@@ -41,6 +41,8 @@ class EotWriter { 		DataOutputStream os; 		uint8* data; 		uint32 l;+		NameTable names;+		string tn; 		 		ttf_file = File.new_for_path (ttf_file_name); 		@@ -59,8 +61,6 @@ class EotWriter { 		os = new DataOutputStream(eot_file.create (FileCreateFlags.REPLACE_DESTINATION));  		file_info = ttf_file.query_info ("*", FileQueryInfoFlags.NONE);-		stdout.printf ("File size: %lld bytes\n", file_info.get_size ());- 		ttf_length = (uint32) file_info.get_size (); 		  		if (ttf_length == 0) {@@ -74,67 +74,83 @@ class EotWriter { 		// parse file to find head checksum 		input = new OpenFontFormatReader (); 		input.parse_index (ttf_file_name);-			-		fd.add_ulong (0); // table length-		fd.add_ulong (ttf_length);+ +		names = input.directory_table.name_table;+		+		fd.add_littleendian_u32 (0); // table length+		fd.add_littleendian_u32 (ttf_length); 	-		fd.add_ulong (0x00010000); // table format version-		fd.add_ulong (0); // flags+		fd.add_littleendian_u32 (0x00020001); // table format version+		fd.add_littleendian_u32 (0); // flags 		 		// panose 		for (int i = 0; i < 10; i++) { 			fd.add (0); 		} 		-		fd.add (1 << 6); // italic set to regular		-		fd.add_ulong (400); // weight-		fd.add_ushort (0); // 0 drm, designer must be notified-		fd.add_ushort (0x504C); // magic number- 	+		// according to specification should charset and italic be added the +		// other way around, but it does not work+				+		fd.add (1); // default charset+		fd.add (0); // italic set to regular+				+		fd.add_littleendian_u32 (400); // weight+		fd.add_littleendian_u16 (0); // 0 drm, designer must know that notified+		fd.add_littleendian_u16 (0x504C); // magic number+ 		// FIXA: 		// unicode ranges -		fd.add_ulong (1);-		fd.add_ulong (0);-		fd.add_ulong (0);-		fd.add_ulong (0);+		fd.add_littleendian_u32 (0);+		fd.add_littleendian_u32 (0);+		fd.add_littleendian_u32 (0);+		fd.add_littleendian_u32 (0); 		 		// FIXA: 		// code page range-		fd.add_ulong (1);-		fd.add_ulong (0);+		fd.add_littleendian_u32 (0);+		fd.add_littleendian_u32 (0); 		-		fd.add_ulong (input.get_head_checksum ()); // head checksum adjustment+		fd.add_littleendian_u32 (input.get_head_checksum ()); // head checksum adjustment 		 		// reserved-		fd.add_ulong (0);-		fd.add_ulong (0);-		fd.add_ulong (0);-		fd.add_ulong (0);+		fd.add_littleendian_u32 (0);+		fd.add_littleendian_u32 (0);+		fd.add_littleendian_u32 (0);+		fd.add_littleendian_u32 (0); 	-		// padding-		fd.add_ulong (0);+		fd.add_littleendian_u16 (0); // padding 		-		fd.add_ushort ((uint16) (2 * "TEST".char_count ())); // strlen of family name-		fd.add_str_utf16 ("TEST");+		tn = names.get_name (names.FONT_NAME);+		fd.add_littleendian_u16 ((uint16) (2 * tn.char_count ())); // strlen of family name+		fd.add_str_littleendian_utf16 (tn); 		-		fd.add_ushort (0); // padding+		fd.add_littleendian_u16 (0); // padding+		+		tn = names.get_name (names.SUBFAMILY_NAME);+		fd.add_littleendian_u16 ((uint16) (2 * tn.char_count ())); // strlen of family name+		fd.add_str_littleendian_utf16 (tn);++		fd.add_littleendian_u16 (0); // padding 		-		fd.add_ushort ((uint16) (2 * "Regular".char_count ())); // strlen of style name-		fd.add_str_utf16 ("Regular");+		// FIXA version or name + version+		tn = names.get_name (names.VERSION);+		fd.add_littleendian_u16 ((uint16) (2 * tn.char_count ())); // strlen of family name+		fd.add_str_littleendian_utf16 (tn); 		-		fd.add_ushort (0); // padding+		fd.add_littleendian_u16 (0); // padding 		-		fd.add_ushort ((uint16) (2 * "Version 1.0".char_count ()));-		fd.add_str_utf16 ("Version 1.0");+		tn = names.get_name (names.FULL_FONT_NAME);+		fd.add_littleendian_u16 ((uint16) (2 * tn.char_count ())); // strlen of family name+		fd.add_str_littleendian_utf16 (tn); 		-		fd.add_ushort (0); // padding+		fd.add_littleendian_u16 (0); // padding 		-		fd.add_ushort ((uint16) (2 * "TEST-Regular".char_count ()));-		fd.add_str_utf16 ("TEST-Regular");+		fd.add_littleendian_u16 (0); // length of root string+		// the root string goes here. 		 		// update length of this table 		fd.seek (0);-		fd.add_ulong (fd.length () + ttf_length);+		fd.add_littleendian_u32 (fd.length () + ttf_length); 		 		l = fd.length_with_padding (); 		data = fd.table_data;diff --git a/src/ExportTool.vala b/src/ExportTool.valaindex ed43eef..9b9a783 100644--- a/src/ExportTool.vala+++ b/src/ExportTool.vala@@ -205,7 +205,13 @@ os.put_string ( 			src: url('""");     os.put_string (@"$(name).ttf"); os.put_string ("""') format('truetype'); 		} """); -os.put_string ("""	+	os.put_string ("""+		@font-face {+			font-family: '"""); os.put_string (@"$(name)");              os.put_string ("""EOT';+			src: url('""");     os.put_string (@"$(name).eot"); os.put_string ("""');+		} """);+		+	os.put_string ("""	 		h1 { 			font-weight:normal; 			margin: 0 0 5px 0;@@ -241,9 +247,13 @@ os.put_string (""" 		 		div { 			font-family: """);-			 + 			os.put_string ("'"); 			os.put_string (@"$(name)");+			os.put_string ("EOT'");+			+			os.put_string (", '");+			os.put_string (@"$(name)"); 			os.put_string ("SVG'"); 			 			os.put_string (", '");diff --git a/src/OpenFontFormatReader.vala b/src/OpenFontFormatReader.valaindex 7bc73b2..6119c95 100644--- a/src/OpenFontFormatReader.vala+++ b/src/OpenFontFormatReader.vala@@ -48,7 +48,7 @@ errordomain BadFormat {  class OpenFontFormatReader : Object { 	-	DirectoryTable directory_table;+	public DirectoryTable directory_table; 	 	OtfInputStream dis; 	File file;diff --git a/src/OpenFontFormatWriter.vala b/src/OpenFontFormatWriter.valaindex 3a33c02..9136108 100644--- a/src/OpenFontFormatWriter.vala+++ b/src/OpenFontFormatWriter.vala@@ -326,11 +326,11 @@ class FontData : Object { 	public void add_ushort (uint16 d) throws Error {
 		add_u16 (d);
 	}
-	
+		
 	public void add_ulong (uint32 d) throws Error {
 		add_u32 (d);
 	}
-
+		
 	public void add_byte (uint8 b) throws Error {
 		add (b);
 	}
@@ -358,7 +358,12 @@ class FontData : Object { 				
 		wp++;
 	}
-	
+
+	public void add_littleendian_u16 (uint32 i) {
+		add ((int8) (i & 0x00FF));
+		add ((int8) ((i & 0xFF00) >> 8));
+	}
+		
 	public void add_u16 (uint16 d) {
 		uint16 n = d >> 8;
 		add ((uint8)n);
@@ -371,7 +376,14 @@ class FontData : Object { 		add ((uint8) s);
 		add ((uint8) (i - (s << 8)));
 	}
-	
+
+	public void add_littleendian_u32 (uint32 i) {
+		add ((int8) (i & 0x000000FF));
+		add ((int8) ((i & 0x0000FF00) >> 8));
+		add ((int8) ((i & 0x00FF0000) >> 16));
+		add ((int8) ((i & 0xFF000000) >> 24));
+	}
+		
 	public void add_u32 (uint32 i) {
 		uint32 s = (uint16) (i >> 16);
 		
@@ -400,7 +412,11 @@ class FontData : Object { 		add_u32 ((int32)(i - (s << 32)));		
 	}
 	
-	public void add_str_utf16 (string s) {
+	public void add_str_littleendian_utf16 (string s) {
+		add_str_utf16 (s, true);
+	}
+	
+	public void add_str_utf16 (string s, bool little_endian = false) {
 		int index = 0;
 		unichar c;
 		uint8 c0;
@@ -410,8 +426,15 @@ class FontData : Object { 		while (s.get_next_char (ref index, out c)) {
 			c0 = (uint8) (c >> 8);
 			c1 = (uint8) (c - (c0 << 8));
-			add (c0);
-			add (c1);
+			
+			if (little_endian) {
+				add (c1);
+				add (c0);
+			} else {
+				add (c0);
+				add (c1);
+			}
+			
 			l += 2;
 		}
 				
@@ -2619,21 +2642,36 @@ class OffsetTable : Table { 
 class NameTable : Table {
 
-	static const uint16 COPYRIGHT_NOTICE = 0;
-	static const uint16 FONT_NAME = 1;
-	static const uint16 SUBFAMILY_NAME = 2;
-	static const uint16 UNIQUE_IDENTIFIER = 3;
-	static const uint16 FULL_FONT_NAME = 4; // name + subfamily
-	static const uint16 VERSION = 5;
-	static const uint16 DESCRIPTION = 10;
-	static const uint16 PREFERED_FAMILY = 16;
-	static const uint16 PREFERED_SUB_FAMILY = 17;
-	
+	public static const uint16 COPYRIGHT_NOTICE = 0;
+	public static const uint16 FONT_NAME = 1;
+	public static const uint16 SUBFAMILY_NAME = 2;
+	public static const uint16 UNIQUE_IDENTIFIER = 3;
+	public static const uint16 FULL_FONT_NAME = 4; // name + subfamily
+	public static const uint16 VERSION = 5;
+	public static const uint16 DESCRIPTION = 10;
+	public static const uint16 PREFERED_FAMILY = 16;
+	public static const uint16 PREFERED_SUB_FAMILY = 17;
+	
+	List<uint16> identifiers;
 	List<string> text;
 			
 	public NameTable () {
 		id = "name";
 		text = new List<string> ();
+		identifiers = new List<uint16> ();
+	}
+	
+	public string get_name (uint16 identifier) {
+		int i = 0;
+		
+		foreach (uint16 n in identifiers) {
+			if (n == identifier) {
+				return text.nth (i).data;
+			}
+			i++;
+		}
+		
+		return "";
 	}
 
 	public void print_all () {
@@ -2687,6 +2725,8 @@ class NameTable : Table { 			name_id.append (dis.read_ushort ());
 			strlen.append (dis.read_ushort ());
 			off.append (dis.read_ushort ());
+			
+			identifiers.append (name_id.last ().data);	
 		}
 
 		int plat;
@@ -2766,9 +2806,7 @@ class NameTable : Table { 		
 		text.append ("Regular");
 		type.append (PREFERED_SUB_FAMILY);
--
-						
+			
 		num_records = (uint16) text.length ();
 		
 		fd.add_ushort (0); // format 1
@@ -2868,6 +2906,7 @@ class Os2Table : Table { 		fd.add (0); 
 		fd.add (0); 
 
+		// FIXA:
 		fd.add_u32 (0); // ulUnicodeRange1 Bits 0-31
 		fd.add_u32 (0); // ULONG ulUnicodeRange2 Bits 32-63
 		fd.add_u32 (0); // ULONG ulUnicodeRange3 Bits 64-95
@@ -2890,6 +2929,7 @@ class Os2Table : Table { 		fd.add_u16 (ascender); // USHORT usWinAscent
 		fd.add_u16 (descender); // USHORT usWinDescent
 
+		// FIXA:
 		fd.add_u32 (0); // ULONG ulCodePageRange1 Bits 0-31
 		fd.add_u32 (0); // ULONG ulCodePageRange2 Bits 32-63
 
diff --git a/src/VersionList.vala b/src/VersionList.valaindex a5b68ab..ed18032 100644--- a/src/VersionList.vala+++ b/src/VersionList.vala@@ -63,7 +63,6 @@ class VersionList : DropMenu { 	} 	 	private void set_selected_item (MenuAction ma) {-		Glyph g = get_current (); 		int i = ma.index; 		 		return_if_fail (0 <= i < glyphs.length ());