OS/2 ascender and descender values

Changed files (3)

• modified src/GlyphCollection.vala
• modified src/OpenFontFormatWriter.vala
• modified src/Preview.vala

Diff

diff --git a/src/GlyphCollection.vala b/src/GlyphCollection.valaindex e5a50ad..55e944d 100644--- a/src/GlyphCollection.vala+++ b/src/GlyphCollection.vala@@ -38,9 +38,7 @@ class GlyphCollection : GLib.Object { 	} 	 	public void insert_glyph (Glyph g, bool selected) {-		versions.add_glyph (g, selected);-		-		print (@"insert $(g.get_name ()) at $(versions.glyphs.length ())\n");+		versions.add_glyph (g, selected);		 		assert (versions.glyphs.length () > 0); 	} 	diff --git a/src/OpenFontFormatWriter.vala b/src/OpenFontFormatWriter.valaindex 478a815..d0948d8 100644--- a/src/OpenFontFormatWriter.vala+++ b/src/OpenFontFormatWriter.vala@@ -2918,12 +2918,8 @@ class Os2Table : Table { 		fd.add_u16 (glyf_table.get_first_char ()); // USHORT usFirstCharIndex
 		fd.add_u16 (glyf_table.get_last_char ()); // USHORT usLastCharIndex
 
-		// DELETE
-		//ascender = (int16) (-1 * (font.top_position - font.base_line)* UNITS);
-		//descender = (int16) (-font.bottom_position * UNITS);
-
-		ascender = (int16) (-font.top_position * UNITS);
-		descender = (int16) (-font.bottom_position * UNITS);
+		ascender = (int16) (glyf_table.xmax + font.base_line * UNITS);
+		descender = (int16) (-glyf_table.xmin  + font.base_line * UNITS);
 		
 		fd.add_16 (ascender); // SHORT sTypoAscender
 		fd.add_16 (descender); // SHORT sTypoDescender
diff --git a/src/Preview.vala b/src/Preview.valaindex 5911c77..d9305a2 100644--- a/src/Preview.vala+++ b/src/Preview.vala@@ -35,6 +35,7 @@ class Preview : FontDisplay { 	public override void selected_canvas () { 		ExportTool.export_all (); 		string uri = get_uri ();+		MainWindow.get_webview ().reload_bypass_cache (); 		MainWindow.get_webview ().load_uri (uri); 	}