[font] reorder fields to better group variable tables

go-text · Apr 3, 2024 · cb52840 · cb52840
1 parent e398ddb
commit cb52840
Showing 1 changed file with 9 additions and 9 deletions.
diff --git 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