1.002update4

misc/scripts/kernsample.py

@@ -12,7 +12,7 @@
 
 def mapGroups(groups):  # => { glyphname => set(groupname, ...), ... }
   m = OrderedDict()
-  for groupname, glyphnames in groups.iteritems():
+  for groupname, glyphnames in groups.items():
     for glyphname in glyphnames:
       m.setdefault(glyphname, set()).add(groupname)
   return m
@@ -53,7 +53,7 @@ def printPairs(font, baseSide, baseSideGlyph, otherSideNames, args):
       suffix_lc = args.suffix
     else:
       if args.prefix and len(args.prefix) > 0:
-        s = unicode(args.prefix)
+        s = str(args.prefix)
         if s[0].isupper():
           prefix_uc = args.prefix
           prefix_lc = args.prefix.lower()
@@ -62,7 +62,7 @@ def printPairs(font, baseSide, baseSideGlyph, otherSideNames, args):
           prefix_lc = args.prefix
 
       if args.suffix and len(args.suffix) > 0:
-        s = unicode(args.suffix)
+        s = str(args.suffix)
         if s[0].isupper():
           suffix_uc = args.suffix
           suffix_lc = args.suffix.lower()
@@ -77,7 +77,7 @@ def printPairs(font, baseSide, baseSideGlyph, otherSideNames, args):
           otherGlyph = font[otherName]
         prefix = prefix_lc
         suffix = suffix_lc
-        if unicode(otherName[0]).isupper():
+        if str(otherName[0]).isupper():
           prefix = prefix_uc
           suffix = suffix_uc
         if baseSide == LEFT:
@@ -110,7 +110,7 @@ def samplesForGlyphnameR(font, groups, groupmap, kerning, glyphname, args):
 
 def _addLeftnames(groups, kerning, glyphname, leftnames, includeAll=True):
   # kerning : { leftName => {rightName => kernVal} }
-  for leftname, kern in kerning.iteritems():
+  for leftname, kern in kerning.items():
     if glyphname in kern:
       if leftname[0] == '@':
         for leftname2 in groups[leftname]:
@@ -206,8 +206,12 @@ def main():
   groupsFilename = os.path.join(args.fontPath, 'groups.plist')
   kerningFilename = os.path.join(args.fontPath, 'kerning.plist')
 
-  groups = plistlib.readPlist(groupsFilename)   # { groupName => [glyphName] }
-  kerning = plistlib.readPlist(kerningFilename) # { leftName => {rightName => kernVal} }
+  with open(groupsFilename, 'rb') as groupsFile:
+    groups = plistlib.load(groupsFile)   # { groupName => [glyphName] }
+
+  with open(kerningFilename, 'rb') as kerningFile:
+    kerning = plistlib.load(kerningFile) # { leftName => {rightName => kernVal} }
+
   groupmap = mapGroups(groups) # { glyphname => set(groupname, ...), ... }
 
   if not args.asLeft and not args.asRight:

src/NovaGothic.glyphspackage/UIState.plist

@@ -1,5 +1,6 @@
 {
 displayStrings = (
-AIJSASKNIJOVNLAS
+July,
+"AẦ"
 );
 }

src/NovaGothic.glyphspackage/fontinfo.plist

@@ -377,8 +377,12 @@ m01 = {
 "@MMK_L_A" = {
 "@MMK_R_O" = -30;
 "@MMK_R_V" = -100;
+"@MMK_R_t" = -20;
 "@MMK_R_v" = -80;
 };
+"@MMK_L_H" = {
+"@MMK_R_v" = -20;
+};
 "@MMK_L_O" = {
 "@MMK_R_A" = -30;
 "@MMK_R_V" = -60;
@@ -422,14 +426,24 @@ p = -30;
 "@MMK_L_x" = {
 "@MMK_R_o" = -30;
 };
+B = {
+"@MMK_R_A" = -20;
+};
+F = {
+"@MMK_R_A" = -40;
+};
 K = {
 "@MMK_R_O" = -60;
 };
+L = {
+U = -30;
+};
 R = {
 "@MMK_R_o" = -40;
 };
 U = {
 "@MMK_R_A" = -40;
+"@MMK_R_H" = 20;
 };
 a = {
 "@MMK_R_v" = -30;
@@ -443,11 +457,15 @@ m002 = {
 "@MMK_L_A" = {
 "@MMK_R_O" = -50;
 "@MMK_R_V" = -130;
+"@MMK_R_t" = -40;
 "@MMK_R_v" = -100;
 J = -40;
 S = -20;
 U = -40;
 };
+"@MMK_L_H" = {
+"@MMK_R_v" = -30;
+};
 "@MMK_L_O" = {
 "@MMK_R_A" = -50;
 "@MMK_R_V" = -50;
@@ -471,6 +489,9 @@ S = -40;
 "@MMK_R_v" = -50;
 "@MMK_R_x" = -40;
 };
+"@MMK_L_r" = {
+"@MMK_R_o" = -20;
+};
 "@MMK_L_t" = {
 "@MMK_R_o" = -10;
 };
@@ -481,12 +502,18 @@ p = -20;
 "@MMK_L_x" = {
 "@MMK_R_o" = -40;
 };
+B = {
+"@MMK_R_A" = -30;
+};
 C = {
 "@MMK_R_V" = -20;
 };
 F = {
 "@MMK_R_A" = -30;
 };
+L = {
+U = -40;
+};
 R = {
 "@MMK_R_o" = -20;
 };
@@ -496,6 +523,7 @@ S = {
 };
 U = {
 "@MMK_R_A" = -40;
+"@MMK_R_H" = 20;
 };
 k = {
 "@MMK_R_o" = -60;

src/NovaGothic.glyphspackage/glyphs/B_dotbelow.glyph

@@ -25,7 +25,7 @@ ref = B;
 ref = dotbelowcomb;
 }
 );
-width = 610;
+width = 620;
 }
 );
 unicode = 7684;

src/NovaGothic.glyphspackage/glyphs/B_eta.glyph

@@ -17,7 +17,7 @@ shapes = (
 ref = B;
 }
 );
-width = 610;
+width = 620;
 }
 );
 unicode = 914;

src/NovaGothic.glyphspackage/glyphs/D_caron.glyph

@@ -21,11 +21,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (0,210);
+pos = (10,210);
 ref = caroncomb;
 }
 );
-width = 690;
+width = 700;
 }
 );
 unicode = 270;

src/NovaGothic.glyphspackage/glyphs/D_circumflexbelow.glyph

@@ -21,11 +21,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (30,0);
+pos = (40,0);
 ref = circumflexbelowcomb;
 }
 );
-width = 690;
+width = 700;
 }
 );
 unicode = 7698;

src/NovaGothic.glyphspackage/glyphs/D_dotbelow.glyph

@@ -21,11 +21,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (30,0);
+pos = (40,0);
 ref = dotbelowcomb;
 }
 );
-width = 690;
+width = 700;
 }
 );
 unicode = 7692;

src/NovaGothic.glyphspackage/glyphs/D_macronbelow.glyph

@@ -21,11 +21,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (30,0);
+pos = (40,0);
 ref = macronbelowcomb;
 }
 );
-width = 690;
+width = 700;
 }
 );
 unicode = 7694;

src/NovaGothic.glyphspackage/glyphs/D_ze-cy.glyph

@@ -17,7 +17,7 @@ shapes = (
 ref = S;
 }
 );
-width = 600;
+width = 614;
 }
 );
 unicode = 1029;

src/NovaGothic.glyphspackage/glyphs/E_acute.glyph

@@ -25,7 +25,7 @@ pos = (0,201);
 ref = acutecomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 201;

src/NovaGothic.glyphspackage/glyphs/E_caron.glyph

@@ -27,7 +27,7 @@ pos = (10,201);
 ref = caroncomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 282;

src/NovaGothic.glyphspackage/glyphs/E_cedilla.glyph

@@ -27,7 +27,7 @@ pos = (13,0);
 ref = cedillacomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 552;

src/NovaGothic.glyphspackage/glyphs/E_circumflex.glyph

@@ -25,7 +25,7 @@ pos = (10,201);
 ref = circumflexcomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 202;

src/NovaGothic.glyphspackage/glyphs/E_circumflexacute.glyph

@@ -25,7 +25,7 @@ pos = (10,201);
 ref = circumflexcomb_acutecomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 7870;

src/NovaGothic.glyphspackage/glyphs/E_circumflexdotbelow.glyph

@@ -33,7 +33,7 @@ pos = (10,201);
 ref = circumflexcomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 7878;

src/NovaGothic.glyphspackage/glyphs/E_circumflexgrave.glyph

@@ -25,7 +25,7 @@ pos = (10,201);
 ref = circumflexcomb_gravecomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 7872;

src/NovaGothic.glyphspackage/glyphs/E_circumflexhookabove.glyph

@@ -25,7 +25,7 @@ pos = (10,201);
 ref = circumflexcomb_hookabovecomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 7874;

src/NovaGothic.glyphspackage/glyphs/E_circumflextilde.glyph

@@ -25,7 +25,7 @@ pos = (10,201);
 ref = circumflexcomb_tildecomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 7876;

src/NovaGothic.glyphspackage/glyphs/E_dieresis.glyph

@@ -27,7 +27,7 @@ pos = (10,201);
 ref = dieresiscomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 203;

src/NovaGothic.glyphspackage/glyphs/E_dotaccent.glyph

@@ -27,7 +27,7 @@ pos = (10,201);
 ref = dotaccentcomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 278;

src/NovaGothic.glyphspackage/glyphs/E_dotbelow.glyph

@@ -25,7 +25,7 @@ pos = (10,0);
 ref = dotbelowcomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 7864;

src/NovaGothic.glyphspackage/glyphs/E_grave.glyph

@@ -25,7 +25,7 @@ pos = (20,201);
 ref = gravecomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 200;

src/NovaGothic.glyphspackage/glyphs/E_hookabove.glyph

@@ -25,7 +25,7 @@ pos = (-15,201);
 ref = hookabovecomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 7866;

src/NovaGothic.glyphspackage/glyphs/E_macron.glyph

@@ -27,7 +27,7 @@ pos = (10,201);
 ref = macroncomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 274;

src/NovaGothic.glyphspackage/glyphs/E_ogonek.glyph

@@ -25,7 +25,7 @@ pos = (190,0);
 ref = ogonekcomb;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 280;

src/NovaGothic.glyphspackage/glyphs/E_psilon.glyph

@@ -29,7 +29,7 @@ shapes = (
 ref = E;
 }
 );
-width = 590;
+width = 570;
 }
 );
 unicode = 917;