Improve catalog update process and script, including tests

.github/workflows/python.yml

@@ -30,7 +30,7 @@ jobs:
           cd dist
           sdist=$(ls pygambit-*.tar.gz)
           pip install -v "${sdist}[test,doc]"
-          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.0"
+          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.1"
       - name: Run tests
         run: pytest --run-tutorials
 
@@ -53,7 +53,7 @@ jobs:
       - name: Build extension
         run: |
           python -m pip install -v .[test,doc]
-          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.0"
+          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.1"
       - name: Run tests
         run: pytest --run-tutorials
 
@@ -76,7 +76,7 @@ jobs:
       - name: Build extension
         run: |
           python -m pip install -v .[test,doc]
-          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.0"
+          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.1"
       - name: Run tests
         run: pytest --run-tutorials
 
@@ -99,6 +99,6 @@ jobs:
       - name: Build extension
         run: |
           python -m pip install -v .[test,doc]
-          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.0"
+          pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.1"
       - name: Run tests
         run: pytest --run-tutorials

.readthedocs.yml

@@ -17,7 +17,7 @@ build:
     - pdf2svg
   jobs:
     post_install:
-      - pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.0"
+      - pip install "draw-tree @ git+https://github.com/gambitproject/draw_tree.git@v0.9.1"
       # Create RST for catalog table in docs
       - $READTHEDOCS_VIRTUALENV_PATH/bin/python build_support/catalog/update.py
 

Makefile.am

@@ -22,6 +22,8 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+include build_support/catalog/catalog.am
+
 EXTRA_DIST = \
     build_support/msw/gambit.wxs.in \
 	build_support/osx/Info.plist.in \
@@ -205,32 +207,7 @@ EXTRA_DIST = \
 	contrib/games/yamamoto.nfg \
 	contrib/games/zero.nfg \
 	src/README.rst \
-	catalog/bagwell1995.efg \
-	catalog/gilboa1997/fig1.efg \
-	catalog/gilboa1997/fig2.efg \
-	catalog/jakobsen2016/fig1a.efg \
-	catalog/jakobsen2016/fig1b.efg \
-	catalog/jakobsen2016/fig1c.efg \
-	catalog/jakobsen2016/fig3.efg \
-	catalog/myerson1991/fig2_1.efg \
-	catalog/myerson1991/fig4_2.efg \
-	catalog/nau2004/sec3.nfg \
-	catalog/nau2004/sec4.nfg \
-	catalog/nau2004/sec5.nfg \
-	catalog/nau2004/sec6.nfg \
-	catalog/reiley2008/fig1.efg \
-	catalog/selten1975/fig1.efg \
-	catalog/selten1975/fig2.efg \
-	catalog/selten1975/fig3.efg \
-	catalog/vonstengel2022/fig10.1.efg \
-	catalog/vonstengel2022/fig10.12.efg \
-	catalog/vonstengel2022/fig10.5.efg \
-	catalog/vonstengel2022/fig10.7.efg \
-	catalog/vonstengelforges2008/fig1.efg \
-	catalog/vonstengelforges2008/fig6.efg \
-	catalog/vonstengelforges2008/fig9.efg \
-	catalog/watson2013/exercise29_6.efg \
-	catalog/watson2013/fig29_1.efg
+	$(CATALOG_FILES)
 
 core_SOURCES = \
     src/core/core.h \

build_support/catalog/catalog.am

@@ -0,0 +1,29 @@
+CATALOG_FILES = \
+	catalog/bagwell1995.efg \
+	catalog/gilboa1997/fig1.efg \
+	catalog/gilboa1997/fig2.efg \
+	catalog/jakobsen2016/fig1a.efg \
+	catalog/jakobsen2016/fig1b.efg \
+	catalog/jakobsen2016/fig1c.efg \
+	catalog/jakobsen2016/fig3.efg \
+	catalog/myerson1991/fig2_1.efg \
+	catalog/myerson1991/fig4_2.efg \
+	catalog/nau2004/sec3.nfg \
+	catalog/nau2004/sec4.nfg \
+	catalog/nau2004/sec5.nfg \
+	catalog/nau2004/sec6.nfg \
+	catalog/reiley2008/fig1.efg \
+	catalog/selten1975/fig1.efg \
+	catalog/selten1975/fig2.efg \
+	catalog/selten1975/fig3.efg \
+	catalog/vonstengel2022/fig10.1.efg \
+	catalog/vonstengel2022/fig10.12.efg \
+	catalog/vonstengel2022/fig10.5.efg \
+	catalog/vonstengel2022/fig10.7.efg \
+	catalog/vonstengelforges2008/fig1.efg \
+	catalog/vonstengelforges2008/fig6.efg \
+	catalog/vonstengelforges2008/fig6__Original_Layout.ef \
+	catalog/vonstengelforges2008/fig9.efg \
+	catalog/vonstengelforges2008/fig9__Original_Layout.ef \
+	catalog/watson2013/exercise29_6.efg \
+	catalog/watson2013/fig29_1.efg

build_support/catalog/draw_tree_settings.yaml

@@ -0,0 +1,33 @@
+# Default draw_tree settings applied to all catalog games.
+defaults:
+  color_scheme: gambit
+  font_family: sffamily
+  font_italic: true
+  shared_terminal_depth: true
+  sublevel_scaling: 0
+
+# Per-game overrides. Keys are slug prefixes or exact slugs.
+# For a given game, all matching keys are applied shortest-first,
+# so more specific entries (longer keys) override more general ones.
+# A key matches if slug == key or slug starts with key + "/".
+# Consult https://www.gambit-project.org/draw_tree/ for available settings.
+overrides:
+  bagwell1995:
+    sublevel_scaling: 1
+  watson2013:
+    sublevel_scaling: 1
+  selten1975:
+    shared_terminal_depth: false
+  myerson1991/fig2_1:
+    action_label_position: 0.4
+  reiley2008/fig1:
+    action_label_position: 0.4
+  vonstengel2022/fig10.1:
+    sublevel_scaling: 0.75
+    shared_terminal_depth: false
+  vonstengelforges2008/fig1:
+    sublevel_scaling: 1
+  vonstengelforges2008/fig9:
+    sublevel_scaling: 0.5
+  gilboa1997/fig1:
+    action_label_dist: 5.0