Completely separate printing of glyphs

timhoffm · timhoffm · commit 2a8ef8a73bd0 · 2018-12-09T17:49:15.000+01:00
diff --git a/examples/text_labels_and_annotations/font_table.py b/examples/text_labels_and_annotations/font_table.py
@@ -21,8 +21,20 @@
 import matplotlib.pyplot as plt
 
 
-def print_glyphs(font):
-    """Print the all the glyphs in the given FT2Font font to stdout."""
+def print_glyphs(path):
+    """
+    Print the all glyphs in the given font file to stdout.
+
+    Parameters
+    ----------
+    path : str or None
+        The path to the font file.  If None, use Matplotlib's default font.
+    """
+    if path is None:
+        path = fm.findfont(fm.FontProperties())  # The default font.
+
+    font = FT2Font(path)
+
     charmap = font.get_charmap()
     max_indices_len = len(str(max(charmap.values())))
 
@@ -35,25 +47,19 @@ def print_glyphs(font):
         print(f"{glyph_index:>{max_indices_len}} {char} {name}")
 
 
-def draw_font_table(path, print_all=False):
+def draw_font_table(path):
     """
     Draw a font table of the first 255 chars of the given font.
 
     Parameters
     ----------
     path : str or None
         The path to the font file.  If None, use Matplotlib's default font.
-    print_all : bool
-        Additionally print all chars to stdout.
     """
-
     if path is None:
         path = fm.findfont(fm.FontProperties())  # The default font.
 
     font = FT2Font(path)
-    if print_all:
-        print_glyphs(font)
-
     # A charmap is a mapping of "character codes" (in the sense of a character
     # encoding, e.g. latin-1) to glyph indices (i.e. the internal storage table
     # of the font face).
@@ -109,4 +115,6 @@ def draw_font_table(path, print_all=False):
                         help="Additionally, print all chars to stdout.")
     args = parser.parse_args()
 
-    draw_font_table(args.path, args.print_all)
+    if args.print_all:
+        print_glyphs(args.path)
+    draw_font_table(args.path)
