mformat 2: Convert all builtin libraries

This mostly involves deleting (enables us to delete) various size
specifications which can be inferred from the SVGs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/library/cards-oxymoron.toml b/library/cards-oxymoron.toml
index 0ee713ce288c59d13c2f3935065686e153a8d94c..fafcd4196bb3c1dc9e06737c89fbad1141db7106 100644 (file)
--- a/library/cards-oxymoron.toml
+++ b/library/cards-oxymoron.toml
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR CC-BY-SA-3.0
 # There is NO WARRANTY.
 
+format=2
+
 [scraper]
 method = "cards-oxymoron"
 spdx = "GPL-2.0-or-later"
@@ -11,9 +13,7 @@ filename_suffix = ".gif"
 [group.clubs]
 item_prefix = "card-oxymoron-"
 outline = "Rect"
-size = [73, 97]
-centre = [36.5, 48.5]
-scale = 0.25
+size = [18.25, 24.25]
 
 item_suffix = "-c"
 sort = "card-playing-c_s"

diff --git a/library/edited.toml b/library/edited.toml
index e2b5411c51bcb0f07cb9dc34e1c70e2c512a1fe2..90828a295ece8eac03fa6a7f1ea24147a66fc4e1 100644 (file)
--- a/library/edited.toml
+++ b/library/edited.toml
@@ -2,11 +2,12 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR CC-BY-SA-3.0
 # There is NO WARRANTY.
 
+format=2
+
 [scraper]
 method = "none"
 
 [group.chess-board]
-size = [242, 246]
 scale = 0.38
 outline = "Rect"
 files = """
@@ -14,8 +15,7 @@ chess-board   -       the chessboard
 """
 
 [group.chess-misc]
-size = [32]
-scale = 0.38
+size = [12]
 item_prefix = "chess-"
 outline = "Circle"
 files = """

diff --git a/library/wikimedia.toml b/library/wikimedia.toml
index 6ec1ea423254400ff7073a3febec305357334af5..1f99ed21c07c3cff217960b8e13b1a7a40e11000 100644 (file)
--- a/library/wikimedia.toml
+++ b/library/wikimedia.toml
@@ -2,6 +2,8 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later OR CC-BY-SA-3.0
 # There is NO WARRANTY.
 
+format=2
+
 [scraper]
 method = "wikimedia"
 site-title = "Wikimedia"
@@ -17,7 +19,6 @@ data_url_hashprefix = true
 [group.chess]
 outline = "Circle"
 scale = 0.20
-size = [45]
 item_prefix = "chess-"
 stem_prefix = "Chess_"
 occulted.method = "ByColour"
@@ -63,7 +64,6 @@ map = { "#ffffff" = "#888888" }
 
 [group.chess-26]
 inherit = "chess"
-size = [26]
 scale = 0.3461
 files = """
 _c-siege-engine        tlt26   a _colour siege engine piece
@@ -113,7 +113,6 @@ files = """
 
 [group.misc]
 outline = "Rect"
-size = [448,326]
 centre = [224, 163]
 scale = 0.025
 files = """
@@ -122,9 +121,7 @@ mgmt-library-load-marker   Box_with_polygons        a library load area marker
 
 [group.card-backs]
 outline = "Rect"
-size = [73, 97] # size to match cards-oxymoron:
-scale = 0.25
-orig_size = [208, 303]
+size = [18.25, 24.25] # size to match cards-oxymoron:
 
 files = """
 card-stripe-back-red   Card_back_03a   a card with a red-striped back
@@ -146,9 +143,8 @@ card-rainbow                Card_back_13    a rainbow card
 
 [group.cards-bellot]
 outline = "Rect"
-size = [73, 97] # size to match cards-oxymoron:
-scale = 0.25
-orig_size = [167, 243]
+size = [18.25, 24.25] # size to match cards-oxymoron:
+
 back.type = "Alias"
 back.target = "card-back"
 occulted.method = "ByBack"