Replacement for #413 (#433)

* Generalize wrapper options
* Refactor spine label & add types option
* Update black pre-commit
The older version of black reformats some nested lists undesirably.
* Major tab design overhaul, with Trajan support
* Improved font setup, with Charlemagne support
* Add Minion Std Black for numeric symbols
* Unify tab text formatting
* Fix set icons and traveller arrows
* Fine-tune coin & debt text
* Match tab layout to actual card metrics
* Clean up TODOs
* Keep centered text inside margins
* Label options need to override all wrapper types.
* Implemented new outline methods
* Refactor & simplify outline modules
* Improve label sheets + debugging
* Allow all --head/--tail combinations
* Align drawText for all panels: body, head, tail
* Rework coin & shadow rendering
* Implement head & tail facing
* Ignore empty & comment lines in cardlists
* Improve banner art alignment
* Improve spine alignment
* Simplify and improve drawTab method
* Normalize card type height offsets
* Help text cleanup
* Improved coin icon for drawCost
* Improved 300x300px coin image from card scans
* Add --spine=blank option

Authored-by: Bradd Szonye <[email protected]>

.gitignore

@@ -11,12 +11,12 @@ dist
 
 .vscode
 
-generated
-src/domdiv/fonts/*.otf
-src/domdiv/fonts/*.ttf
-dominion_dividers.pdf
-dominion_dividers.png
-tools/card_db
+/sumpfork_dividers/
+/src/domdiv/fonts/*.otf
+/src/domdiv/fonts/*.ttf
+/dominion_dividers.pdf
+/dominion_dividers.png
+/tools/card_db
 
 .doit.db*
 .mypy_cache/

.pre-commit-config.yaml

@@ -4,8 +4,8 @@ default_language_version:
     # force all unspecified python hooks to run python3
     python: python3
 repos:
--   repo: https://github.com/ambv/black
-    rev: 22.10.0
+-   repo: https://github.com/psf/black
+    rev: 22.3.0
     hooks:
     - id: black
 -   repo: https://github.com/pre-commit/pre-commit-hooks
@@ -18,6 +18,6 @@ repos:
     rev: 5.0.4
     hooks:
     -   id: flake8
-        args: [--max-line-length=120, '--ignore=E203,W503,E741']
+        args: [--max-line-length=120, '--ignore=E203,W503']
 #    -   id: pretty-format-json
 #        args: [--autofix, --no-sort-keys]

card_db_src/types_db.json

@@ -249,7 +249,7 @@
         ],
         "card_type_image": "ruins.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": 1,
+        "tabCostHeightOffset": -1,
         "tabTextHeightOffset": 0
     },
     {
@@ -350,8 +350,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 0
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     },
     {
         "card_type": [
@@ -500,8 +500,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 16,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 0
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     },
     {
         "card_type": [
@@ -614,7 +614,7 @@
         ],
         "card_type_image": "curse.png",
         "defaultCardCount": 30,
-        "tabCostHeightOffset": -1,
+        "tabCostHeightOffset": 0,
         "tabTextHeightOffset": 3
     },
     {
@@ -644,8 +644,8 @@
         ],
         "card_type_image": "expansion.png",
         "defaultCardCount": 0,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 4
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     },
     {
         "card_type": [
@@ -884,8 +884,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 0
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     },
     {
         "card_type": [
@@ -916,8 +916,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 0
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     },
     {
         "card_type": [
@@ -926,8 +926,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 6,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 0
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     },
     {
         "card_type": [
@@ -956,7 +956,7 @@
         ],
         "card_type_image": "treasure-reaction.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": 1,
+        "tabCostHeightOffset": -1,
         "tabTextHeightOffset": 0
     },
     {
@@ -1027,7 +1027,7 @@
         ],
         "card_type_image": "victory-reaction.png",
         "defaultCardCount": 12,
-        "tabCostHeightOffset": 1,
+        "tabCostHeightOffset": -1,
         "tabTextHeightOffset": 0
     },
     {
@@ -1048,8 +1048,8 @@
         "group_cost": "",
         "group_global_type": "Ways",
         "defaultCardCount": 1,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 0
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     },
     {
         "card_type": [
@@ -1058,7 +1058,7 @@
         "card_type_image": "way.png",
         "group_cost": "",
         "defaultCardCount": 0,
-        "tabCostHeightOffset": -1,
-        "tabTextHeightOffset": 0
+        "tabCostHeightOffset": 0,
+        "tabTextHeightOffset": 3
     }
 ]