stb_truetype: GPOS handling formatting changes

Was using 4-character spaces and otherwise formatted unlike the
rest of the code, fix this. Also get rid of the outer switch in
GetGlyphGPOSInfoAdvance with just one case; just use an if.
No behavioral changes.

stb_truetype.h

@@ -2386,7 +2386,7 @@ static int  stbtt__GetGlyphKernInfoAdvance(const stbtt_fontinfo *info, int glyph
 static stbtt_int32 stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyph)
 {
    stbtt_uint16 coverageFormat = ttUSHORT(coverageTable);
-    switch(coverageFormat) {
+   switch (coverageFormat) {
       case 1: {
          stbtt_uint16 glyphCount = ttUSHORT(coverageTable + 2);
 
@@ -2407,7 +2407,8 @@ static stbtt_int32  stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyp
                return m;
             }
          }
-        } break;
+         break;
+      }
 
       case 2: {
          stbtt_uint16 rangeCount = ttUSHORT(coverageTable + 2);
@@ -2431,12 +2432,10 @@ static stbtt_int32  stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyp
                return startCoverageIndex + glyph - strawStart;
             }
          }
-        } break;
+         break;
+      }
 
-        default: {
+      default: return -1; // unsupported
-            // There are no other cases.
-            STBTT_assert(0);
-        } break;
    }
 
    return -1;
@@ -2445,7 +2444,7 @@ static stbtt_int32  stbtt__GetCoverageIndex(stbtt_uint8 *coverageTable, int glyp
 static stbtt_int32  stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph)
 {
    stbtt_uint16 classDefFormat = ttUSHORT(classDefTable);
-    switch(classDefFormat)
+   switch (classDefFormat)
    {
       case 1: {
          stbtt_uint16 startGlyphID = ttUSHORT(classDefTable + 2);
@@ -2454,7 +2453,8 @@ static stbtt_int32  stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph)
 
          if (glyph >= startGlyphID && glyph < startGlyphID + glyphCount)
             return (stbtt_int32)ttUSHORT(classDef1ValueArray + 2 * (glyph - startGlyphID));
-        } break;
+         break;
+      }
 
       case 2: {
          stbtt_uint16 classRangeCount = ttUSHORT(classDefTable + 2);
@@ -2476,12 +2476,11 @@ static stbtt_int32  stbtt__GetGlyphClass(stbtt_uint8 *classDefTable, int glyph)
             else
                return (stbtt_int32)ttUSHORT(classRangeRecord + 4);
          }
-        } break;
+         break;
+      }
 
-        default: {
+      default:
-            // Unsupported defition type; return an error.
+         return -1; // Unsupported definition type, return an error.
-            return -1;
-        } break;
    }
 
    // "All glyphs not assigned to a class fall into class 0". (OpenType spec)
@@ -2497,7 +2496,7 @@ static stbtt_int32  stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, i
    stbtt_uint8 *lookupList;
    stbtt_uint16 lookupCount;
    stbtt_uint8 *data;
-    stbtt_int32 i;
+   stbtt_int32 i, sti;
 
    if (!info->gpos) return 0;
 
@@ -2517,9 +2516,9 @@ static stbtt_int32  stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, i
       stbtt_uint16 lookupType = ttUSHORT(lookupTable);
       stbtt_uint16 subTableCount = ttUSHORT(lookupTable + 4);
       stbtt_uint8 *subTableOffsets = lookupTable + 6;
-        switch(lookupType) {
+      if (lookupType != 2) // Pair Adjustment Positioning Subtable
-            case 2: { // Pair Adjustment Positioning Subtable
+         continue;
-                stbtt_int32 sti;
+
       for (sti=0; sti<subTableCount; sti++) {
          stbtt_uint16 subtableOffset = ttUSHORT(subTableOffsets + 2 * sti);
          stbtt_uint8 *table = lookupTable + subtableOffset;
@@ -2567,7 +2566,8 @@ static stbtt_int32  stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, i
                   }
                } else
                   return 0;
-                        } break;
+               break;
+            }
 
             case 2: {
                stbtt_uint16 valueFormat1 = ttUSHORT(table + 4);
@@ -2590,21 +2590,12 @@ static stbtt_int32  stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, i
                   return xAdvance;
                } else
                   return 0;
-                        } break;
-
-                        default: {
-                            // Unsupported definition type
-                            return 0;
                break;
-                        };
-                    }
             }
-                break;
-            };
 
             default:
-                // TODO: Implement other stuff.
+               return 0; // Unsupported position format
-                break;
+         }
       }
    }