use generated logo in cheatsheets

jimustafa · jimustafa · commit 9532c72d0107 · 2021-05-17T22:53:51.000-07:00
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -44,7 +44,7 @@ jobs:
           make -C fonts/
           cp -r fonts/ /usr/share/fonts/
           fc-cache
-          make figures cheatsheets handouts
+          make all
       - name: Check layouts
         run: |
           set -x
diff --git a/Makefile b/Makefile
@@ -4,7 +4,11 @@ SRC := $(wildcard *.tex)
 default: all
 
 .PHONY: all
-all: figures cheatsheets
+all: logos figures cheatsheets handouts
+
+.PHONY: logos
+logos:
+	cd logos && python mpl-logos2.py && pdfcrop mpl-logo2.pdf mpl-logo2.pdf
 
 .PHONY: figures
 figures:
@@ -31,6 +35,7 @@ fonts:
 
 .PHONY: clean
 clean: $(SRC)
+	- rm ./logos/mpl-logo2.pdf
 	git clean -f -X ./figures/
 	git clean -f ./scripts/*.pdf
 	latexmk -c $^
diff --git a/cheatsheets.tex b/cheatsheets.tex
@@ -261,7 +261,7 @@
 
 \begin{multicols*}{5}
 
-  \includegraphics[width=\columnwidth]{matplotlib.pdf}
+  \includegraphics[width=\columnwidth]{mpl-logo2.pdf}
   %\textbf{\Large \RobotoCon Matplotlib 3.2 cheat sheet}\\
   %{\ttfamily https://matplotlib.org} \hfill CC-BY 4.0
   % \bigskip
diff --git a/logos/mpl-logos2.py b/logos/mpl-logos2.py
@@ -97,12 +97,27 @@ def create_text_axes(fig, height_px):
     path = TextPath((0, 0), "matplotlib", size=height_px * 0.8,
                     prop=get_font_properties())
 
+    fp = get_font_properties()
+    fp.set_weight('light')
+    path1 = TextPath((80, -13), 'Cheat sheet', size=height_px * 0.12,
+                     prop=fp)
+    path2 = TextPath((310, -13), f'Version {matplotlib. __version__}',
+                     size=height_px * 0.12,
+                     prop=fp)
+
     angle = 4.25  # degrees
     trans = mtrans.Affine2D().skew_deg(angle, 0)
 
     patch = PathPatch(path, transform=trans + ax.transData, color=MPL_BLUE,
                       lw=0)
+    patch1 = PathPatch(path1, transform=trans + ax.transData, color=MPL_BLUE,
+                       lw=0)
+    patch2 = PathPatch(path2, color=MPL_BLUE,
+                       lw=0)
+
     ax.add_patch(patch)
+    ax.add_patch(patch1)
+    ax.add_patch(patch2)
     ax.autoscale()
 
 
@@ -136,6 +151,8 @@ def make_logo(height_px, lw_bars, lw_grid, lw_border, rgrid, with_text=False):
     ax_pos = (0.535, 0.12, .17, 0.75) if with_text else (0.03, 0.03, .94, .94)
     ax = create_icon_axes(fig, ax_pos, lw_bars, lw_grid, lw_border, rgrid)
 
+    fig.savefig('mpl-logo2.pdf')
+
     return fig, ax
 
 ##############################################################################
@@ -154,4 +171,4 @@ def make_logo(height_px, lw_bars, lw_grid, lw_border, rgrid, with_text=False):
 
 make_logo(height_px=110, lw_bars=0.7, lw_grid=0.5, lw_border=1,
           rgrid=[1, 3, 5, 7], with_text=True)
-plt.show()
+# plt.show()
