Merge branch 'loops' into custom-font

Author: QuLogic

scripts/fonts.py

@@ -22,9 +22,8 @@
 }
 
 text = "The quick brown fox jumps over the lazy dog"
-for i, variant in enumerate(variants.keys()):
-    ax.text(1, y, text, size=9, va="center",
-            font=Path(variants[variant]).resolve())
+for i, (variant, file) in enumerate(variants.items()):
+    ax.text(1, y, text, size=9, va="center", font=Path(file).resolve())
 
     ax.text(39, y, variant,
             color="0.25", va="center", ha="right",
@@ -55,12 +54,11 @@
     "Source Code Pro" : "monospace" }
 
 text = "The quick brown fox jumps over the lazy dog"
-for i, family in enumerate(families):
+for i, (family, label) in enumerate(families.items()):
     ax.text(1, y, text,
             va="center", size=9, family=family, weight="regular")
 
-    ax.text(39, y,
-            "%s" % (families[family]),
+    ax.text(39, y, label,
             color="0.25", va="center", ha="right",
             size="small", family="Source Code Pro", weight=400)
     y += 1.65
@@ -83,7 +81,7 @@
     ax.text(1, y, text, size=9,
             va="center", family="Source Sans Pro", weight=weight)
 
-    ax.text(39, y, "%s (%d)" % (weight, weights[weight]),
+    ax.text(39, y, f"{weight} ({weights[weight]:d})",
             color="0.25", va="center", ha="right",
             size="small", family="Source Code Pro", weight=400)
     y += 1.65
@@ -99,11 +97,11 @@
           "xx-large" : 1.728 }
 
 text = "The quick brown fox"
-for i, size in enumerate(sizes.keys()):
+for i, (size, scaling) in enumerate(sizes.items()):
     ax.text(1, y, text, size=size,
             ha="left", va="center", family="Source Sans Pro", weight="light")
 
-    ax.text(39, y, "%s (%.2f)" % (size, sizes[size]),
+    ax.text(39, y, f"{size} ({scaling:.2f})",
             color="0.25", va="center", ha="right",
             size="small", family="Source Code Pro", weight=400)
     y += 1.65* max(sizes[size], sizes["small"])

scripts/tip-hatched.py

@@ -20,14 +20,14 @@
 x2, y2 = x1+1, np.random.randint(25, 75, 2)
 
 ax.bar(x1, y1, color=color2)
-for i in range(len(x1)):
-    plt.annotate("%d%%" % y1[i], (x1[i], y1[i]), xytext=(0, 1),
+for x, y in zip(x1, y1):
+    plt.annotate(f"{y:d}%", (x, y), xytext=(0, 1),
                  fontsize="x-small", color=color2,
                  textcoords="offset points", va="bottom", ha="center")
 
 ax.bar(x2, y2, color=color2, hatch="/" )
-for i in range(len(x2)):
-    plt.annotate("%d%%" % y2[i], (x2[i], y2[i]), xytext=(0, 1),
+for x, y in zip(x2, y2):
+    plt.annotate(f"{y:d}%", (x, y), xytext=(0, 1),
                  fontsize="x-small", color=color2,
                  textcoords="offset points", va="bottom", ha="center")