@@ -109,15 +109,14 @@ def __init__(self, groups=None, kerning=None, option_dissolve=False):
109109 self .groups = self ._remap_groups (used_groups )
110110 self .kerning = self ._remap_kerning (sanitized_kerning )
111111
112+ self .group_order = sorted (self .groups .keys ())
112113 self .grouped_left = self ._get_grouped_glyphs (left = True )
113114 self .grouped_right = self ._get_grouped_glyphs (left = False )
114115 self .rtl_glyphs = self ._get_rtl_glyphs (self .groups )
115116
116117 self ._find_exceptions ()
117118
118- if self .kerning and len (self .kerning .keys ()):
119- self .group_order = sorted (
120- [gr_name for gr_name in self .groups ])
119+ if self .kerning :
121120 self ._sanityCheck ()
122121
123122 def sanitize_kerning (self , groups , kerning ):
@@ -621,11 +620,7 @@ def __init__(self, font, args=None):
621620 print ('ERROR: The font has no kerning!' )
622621 return
623622
624- self .kerning = self .f .kerning
625- self .groups = self .f .groups
626- self .group_order = sorted (self .groups .keys ())
627-
628- fea_data = self ._make_fea_data (args )
623+ fea_data = self ._make_fea_data ()
629624 if fea_data :
630625 self .header = self .make_header (args )
631626 output_dir = os .path .abspath (os .path .dirname (self .f .path ))
@@ -704,13 +699,13 @@ def _build_st_output(self, st_list, comment, rtl=False):
704699 print ('%s subtables created' % self .num_subtables )
705700 return st_output
706701
707- def _make_fea_data (self , args ):
702+ def _make_fea_data (self ):
708703 # Build the output data.
709704
710705 output = []
711706 kp = KernProcessor (
712- self .groups ,
713- self .kerning ,
707+ self .f . groups ,
708+ self .f . kerning ,
714709 self .dissolve_single
715710 )
716711
0 commit comments