Merge pull request #34 from jepler/big-metrics

FoamyGuy · web-flow · commit ee455f56d002 · 2021-01-05T19:57:22.000-06:00
pcf: Support vewwy big letters
diff --git a/adafruit_bitmap_font/pcf.py b/adafruit_bitmap_font/pcf.py
@@ -233,7 +233,7 @@ def _read_accelerator_tables(self):
         format_ = self._seek_table(accelerators)
 
         has_inkbounds = format_ & _PCF_ACCEL_W_INKBOUNDS
-        compressed_metrics = False  # format_ & _PCF_COMPRESSED_METRICS
+        compressed_metrics = format_ & _PCF_COMPRESSED_METRICS
 
         (
             no_overlap,
@@ -324,8 +324,8 @@ def load_glyphs(self, code_points):
             6 + self._bitmaps.glyph_count
         )
         metrics_compressed = self.tables[_PCF_METRICS].format & _PCF_COMPRESSED_METRICS
-        first_metric_offset = (
-            self.tables[_PCF_METRICS].offset + 6 if metrics_compressed else 8
+        first_metric_offset = self.tables[_PCF_METRICS].offset + (
+            6 if metrics_compressed else 8
         )
         metrics_size = 5 if metrics_compressed else 12
 

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ def _read_accelerator_tables(self):`
`233`	`233`	`format_ = self._seek_table(accelerators)`
`234`	`234`
`235`	`235`	`has_inkbounds = format_ & _PCF_ACCEL_W_INKBOUNDS`
`236`		`- compressed_metrics = False # format_ & _PCF_COMPRESSED_METRICS`
	`236`	`+ compressed_metrics = format_ & _PCF_COMPRESSED_METRICS`
`237`	`237`
`238`	`238`	`(`
`239`	`239`	`no_overlap,`
`@@ -324,8 +324,8 @@ def load_glyphs(self, code_points):`
`324`	`324`	`6 + self._bitmaps.glyph_count`
`325`	`325`	`)`
`326`	`326`	`metrics_compressed = self.tables[_PCF_METRICS].format & _PCF_COMPRESSED_METRICS`
`327`		`- first_metric_offset = (`
`328`		`- self.tables[_PCF_METRICS].offset + 6 if metrics_compressed else 8`
	`327`	`+ first_metric_offset = self.tables[_PCF_METRICS].offset + (`
	`328`	`+ 6 if metrics_compressed else 8`
`329`	`329`	`)`
`330`	`330`	`metrics_size = 5 if metrics_compressed else 12`
`331`	`331`