From cb528402326a7f05508c3abc3e2b2fda9bc3a511 Mon Sep 17 00:00:00 2001
From: Benoit KUGLER <benoit.kugler@gmail.com>
Date: Wed, 3 Apr 2024 16:10:55 +0200
Subject: [PATCH] [font] reorder fields to better group variable tables

---
 font/font.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/font/font.go b/font/font.go
index 52685c2..7079c4a 100644
--- a/font/font.go
+++ b/font/font.go
@@ -148,15 +148,6 @@ type Font struct {
 	post post         // optional
 	svg  svg          // optional
 
-	// Optional, only present in variable fonts
-
-	fvar fvar         // optional
-	hvar *tables.HVAR // optional
-	vvar *tables.VVAR // optional
-	avar tables.Avar
-	mvar mvar
-	gvar gvar
-
 	glyf   tables.Glyf
 	hmtx   tables.Hmtx
 	vmtx   tables.Vmtx
@@ -167,6 +158,15 @@ type Font struct {
 	names tables.Name
 	head  tables.Head
 
+	// Optional, only present in variable fonts
+
+	fvar fvar         // optional
+	hvar *tables.HVAR // optional
+	vvar *tables.VVAR // optional
+	avar tables.Avar
+	mvar mvar
+	gvar gvar
+
 	// Advanced layout tables.
 
 	GDEF tables.GDEF // An absent table has a nil GlyphClassDef