Figure.pygmtlogo: Improve positioning of vertical wordmark for circular PyGMT logo (#4637)

Author: seisman

pygmt/src/pygmtlogo.py

@@ -85,10 +85,19 @@ def _create_logo(  # noqa: PLR0915
     pheight = 0.739  # Height of letter "P"
     plsb = 0.076  # Left side bearing of letter "P"
     pstroke = 0.0735  # Stroke thickness of letter "P"
+    pygmtwidth = 3.262  # Full width of "PyGMT"
 
     match wordmark:
         case "vertical":
-            args_wordmark = {"x": 0, "y": -4.5, "justify": "CT", "font": f"2.4c,{font}"}
+            # Ensure the same width for the visual logo and wordmark
+            fontsize = size * 2.0 / pygmtwidth
+            args_wordmark = {
+                "x": -size - fontsize * plsb,
+                "y": -size * 1.375,  # Center of the wordmark.
+                "justify": "ML",
+                "font": f"{fontsize}c,{font}",
+                "no_clip": True,  # Needed because x<xmin.
+            }
         case "horizontal":
             # The stroke width matches the outline thickness.
             # The left edge of "P" is aligned at y=size * 1.25.
@@ -257,6 +266,8 @@ def _compass_lines():
             halfheight = pheight / 2.0 * fontsize
             fig.hlines(y=[-halfheight, halfheight], xmin=size, pen=pen)
             fig.vlines(x=[size * 1.25, size * 1.25 + pstroke * fontsize], pen=pen)
+        elif wordmark == "vertical":
+            fig.hlines(y=-size * 1.375, pen=pen)
 
     if figname:
         fig.savefig(fname=figname)

pygmt/tests/baseline/test_pygmtlogo_design_circle-vertical.png.dvc

@@ -1,5 +1,5 @@
 outs:
-- md5: 5ee82660f20bc8424f3051af4f9fb9ac
-  size: 173671
+- md5: 4b7c27283350dd435d7e5d3c94767a2c
+  size: 174973
   hash: md5
   path: test_pygmtlogo_design_circle-vertical.png

pygmt/tests/baseline/test_pygmtlogo_wordmark_vertical_circle.png.dvc

@@ -0,0 +1,5 @@
+outs:
+- md5: 3e001517210b78b2dfdd2c1fce8b104a
+  size: 40772
+  hash: md5
+  path: test_pygmtlogo_wordmark_vertical_circle.png

pygmt/tests/test_pygmtlogo.py

@@ -78,3 +78,32 @@ def test_pygmtlogo_wordmark_horizontal(shape):
             wordmark="horizontal",
         )
     return fig
+
+
+@pytest.mark.mpl_image_compare
+@pytest.mark.parametrize("shape", ["circle"])
+def test_pygmtlogo_wordmark_vertical(shape):
+    """
+    Test the PyGMT logo with a vertical wordmark, including both light/dark themes,
+    and colored/black-and-white versions.
+    """
+    fig = Figure()
+    fig.basemap(
+        region=[-0.5, 5.0, -0.5, 5.5],
+        projection="x1c",
+        frame=Frame(fill="gray", axis=Axis(grid=0.5)),
+    )
+    for (x, y), theme, color in [
+        ((1.0, 4.0), "light", True),
+        ((3.5, 4.0), "dark", True),
+        ((1.0, 1.0), "light", False),
+        ((3.5, 1.0), "dark", False),
+    ]:
+        fig.pygmtlogo(
+            position=Position((x, y), anchor="CM", cstype="mapcoords"),
+            theme=theme,
+            color=color,
+            shape=shape,
+            wordmark="vertical",
+        )
+    return fig