From 13422c315188075f2fdbe20543610239150cf347 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Tue, 17 Jan 2017 00:33:16 +0100
Subject: GRAPHICS: More work on FOND loading

---
 graphics/fonts/macfont.h | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

(limited to 'graphics/fonts/macfont.h')

diff --git a/graphics/fonts/macfont.h b/graphics/fonts/macfont.h
index e006fee0d1..40a54f2087 100644
--- a/graphics/fonts/macfont.h
+++ b/graphics/fonts/macfont.h
@@ -28,20 +28,6 @@
 
 namespace Graphics {
 
-struct AsscEntry {
-	uint16 _fontSize;
-	uint16 _fontStyle;
-	uint16 _fontID;
-};
-
-struct BBoxEntry {
-	uint16 _style;
-	uint16 _left;
-	uint16 _bottom;
-	uint16 _right;
-	uint16 _top;
-};
-
 /**
  * Processing of Mac FONT/NFNT rResources
  */
@@ -90,15 +76,44 @@ private:
 	uint16 _ffIntl[2];
 	uint16 _ffVersion;
 
+	struct AsscEntry {
+		uint16 _fontSize;
+		uint16 _fontStyle;
+		uint16 _fontID;
+	};
+
 	uint16 _ffNumAssoc;
 	Common::Array<AsscEntry> _ffAssocEntries;
 
 	uint16 _ffNumOffsets;
 	uint32 *_ffOffsets;
 
+	struct BBoxEntry {
+		uint16 _style;
+		uint16 _left;
+		uint16 _bottom;
+		uint16 _right;
+		uint16 _top;
+	};
+
 	uint16 _ffNumBBoxes;
 	Common::Array<BBoxEntry> _ffBBoxes;
 
+	struct KernPair {
+		byte _firstChar;
+		byte _secondChar;
+		uint16 _distance;
+	};
+
+	struct KernEntry {
+		uint16 _style;
+		uint16 _entryLength;
+		Common::Array<KernPair> _kernPairs;
+	};
+
+	uint16 _ffNumKerns;
+	Common::Array<KernEntry> _ffKernEntries;
+
 	byte *_bitImage;
 
 	struct Glyph {
-- 
cgit v1.2.3