Merge branch 'remove-test-generator' into 'main'

Remove the dependency on test-generator Closes #924 See merge request GNOME/librsvg!776
author: Marge Bot <marge-bot@gnome.org> 2022-11-28 21:17:22 +0000
committer: Marge Bot <marge-bot@gnome.org> 2022-11-28 21:17:22 +0000
commit: f91634074542b05c37d42d7e3eacfd194b3b02c4 (patch)
tree: 28f86836c75e1ec626fa1ec5899ae522246f6e39
parent: 2a06e2408ebcd8cb438975a906f48be9c570ba3b (diff)
parent: 9b45acb513beacb6eb4601db51842d37f2e73f50 (diff)
download: librsvg-f91634074542b05c37d42d7e3eacfd194b3b02c4.tar.gz
157 files changed, 994 insertions, 245 deletions
diff --git a/Cargo.lock b/Cargo.lock
index dbd032fe..705ec8d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -209,7 +209,7 @@ dependencies = [
  "js-sys",
  "num-integer",
  "num-traits",
- "time 0.1.44",
+ "time 0.1.45",
  "wasm-bindgen",
  "winapi",
 ]
@@ -257,9 +257,9 @@ checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -404,10 +404,10 @@ dependencies = [
  "itoa 0.4.8",
  "matches",
  "phf",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "smallvec",
- "syn 1.0.103",
+ "syn",
 ]
 
 [[package]]
@@ -416,8 +416,8 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e"
 dependencies = [
- "quote 1.0.21",
- "syn 1.0.103",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -463,10 +463,10 @@ dependencies = [
  "cc",
  "codespan-reporting",
  "once_cell",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "scratch",
- "syn 1.0.103",
+ "syn",
 ]
 
 [[package]]
@@ -481,9 +481,9 @@ version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -502,10 +502,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "rustc_version 0.4.0",
- "syn 1.0.103",
+ "syn",
 ]
 
 [[package]]
@@ -732,9 +732,9 @@ version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -768,9 +768,9 @@ dependencies = [
 
 [[package]]
 name = "gdk-pixbuf"
-version = "0.16.3"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ba3e42776d1466938add08211734738d5c76e863a25b7a8064c4433a74a1a26"
+checksum = "d3094f2b8578136d1929cade4e0fff82f573521b579e96cfc24af2458431f176"
 dependencies = [
  "bitflags",
  "gdk-pixbuf-sys",
@@ -849,9 +849,9 @@ dependencies = [
 
 [[package]]
 name = "glib"
-version = "0.16.3"
+version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50feee2f1e73be50e6634c901bfced69a0937c5e4e4673067ade85e093fa9bd7"
+checksum = "d5204a4217749b385cefbfb7bf3a2fcde83e4ce6d0945f64440a1f5bd4010305"
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -879,9 +879,9 @@ dependencies = [
  "heck",
  "proc-macro-crate",
  "proc-macro-error",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -895,12 +895,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "glob"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
-
-[[package]]
 name = "gobject-sys"
 version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -986,9 +980,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e394faa0efb47f9f227f1cd89978f854542b318a6f64fa695489c9c993056656"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
 dependencies = [
  "libc",
  "windows-sys",
@@ -1109,7 +1103,6 @@ dependencies = [
  "string_cache",
  "system-deps",
  "tempfile",
- "test-generator",
  "tinyvec",
  "url",
  "xml5ever",
@@ -1276,9 +1269,9 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -1533,9 +1526,9 @@ dependencies = [
  "phf_generator 0.8.0",
  "phf_shared 0.8.0",
  "proc-macro-hack",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -1680,9 +1673,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
  "version_check",
 ]
 
@@ -1692,8 +1685,8 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "version_check",
 ]
 
@@ -1705,15 +1698,6 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
 
 [[package]]
 name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "proc-macro2"
 version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
@@ -1755,20 +1739,11 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
-[[package]]
-name = "quote"
 version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
- "proc-macro2 1.0.47",
+ "proc-macro2",
 ]
 
 [[package]]
@@ -2067,9 +2042,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
 dependencies = [
  "serde_derive",
 ]
@@ -2086,13 +2061,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "a55492425aa53521babf6137309e7d34c20bbfbbfcfe2c7f3a047fd1f6b92c0c"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
@@ -2200,11 +2175,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "serde",
  "serde_derive",
- "syn 1.0.103",
+ "syn",
 ]
 
 [[package]]
@@ -2214,13 +2189,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "serde",
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.103",
+ "syn",
 ]
 
 [[package]]
@@ -2251,8 +2226,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
 dependencies = [
  "phf_generator 0.10.0",
  "phf_shared 0.10.0",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
 ]
 
 [[package]]
@@ -2263,23 +2238,12 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "0.15.44"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
+checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce"
 dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
-dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "unicode-ident",
 ]
 
@@ -2337,18 +2301,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
 
 [[package]]
-name = "test-generator"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea97be90349ab3574f6e74d1566e1c5dd3a4bc74b89f4af4cc10ca010af103c0"
-dependencies = [
- "glob",
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
-]
-
-[[package]]
 name = "textwrap"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2372,16 +2324,16 @@ version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "time"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
 dependencies = [
  "libc",
  "wasi 0.10.0+wasi-snapshot-preview1",
@@ -2420,10 +2372,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
+ "proc-macro2",
+ "quote",
  "standback",
- "syn 1.0.103",
+ "syn",
 ]
 
 [[package]]
@@ -2494,12 +2446,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 
 [[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-
-[[package]]
 name = "url"
 version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2585,9 +2531,9 @@ dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -2597,7 +2543,7 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
- "quote 1.0.21",
+ "quote",
  "wasm-bindgen-macro-support",
 ]
 
@@ -2607,9 +2553,9 @@ version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
- "proc-macro2 1.0.47",
- "quote 1.0.21",
- "syn 1.0.103",
+ "proc-macro2",
+ "quote",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2743,7 +2689,7 @@ dependencies = [
  "log",
  "mac",
  "markup5ever",
- "time 0.1.44",
+ "time 0.1.45",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ed4bf8de..360f9937 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,7 +103,6 @@ proptest = "1.0.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tempfile = "3"
-test-generator = "0.3"
 yeslogic-fontconfig-sys = "4.0.1"
 
 [build-dependencies]
diff --git a/tests/api.c b/tests/api.c
index 4b7f747e..f7b01c2e 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -882,7 +882,7 @@ can_draw_to_non_image_surface (void)
 static void
 render_cairo_sub (void)
 {
-    RsvgHandle *handle = load_test_document ("334-element-positions.svg");
+    RsvgHandle *handle = load_test_document ("bug334-element-positions.svg");
 
     cairo_surface_t *surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 200, 200);
     cairo_t *cr = cairo_create (surf);
@@ -1534,14 +1534,14 @@ static DimensionsFixtureData dimensions_fixtures[] =
     },
     {
         "/dimensions/with_viewbox",
-        "dimensions/521-with-viewbox.svg",
+        "dimensions/bug521-with-viewbox.svg",
         "#foo",
         50.0, 60.0, 70.0, 80.0,
         TRUE, TRUE
     },
     {
         "/dimensions/sub/823",
-        "dimensions/823-position-sub.svg",
+        "dimensions/bug823-position-sub.svg",
         "#pad_width",
         444.0, 139.0, 0.0, 0.0,
         TRUE, FALSE
diff --git a/tests/fixtures/api/334-element-positions.svg b/tests/fixtures/api/bug334-element-positions.svg
index 4619e13c..4619e13c 100644
--- a/tests/fixtures/api/334-element-positions.svg
+++ b/tests/fixtures/api/bug334-element-positions.svg
diff --git a/tests/fixtures/cmdline/601-zero-stroke-width-render-only-foo.png b/tests/fixtures/cmdline/bug601-zero-stroke-width-render-only-foo.png
index 1ed070ca..1ed070ca 100644
--- a/tests/fixtures/cmdline/601-zero-stroke-width-render-only-foo.png
+++ b/tests/fixtures/cmdline/bug601-zero-stroke-width-render-only-foo.png
diff --git a/tests/fixtures/cmdline/601-zero-stroke-width.svg b/tests/fixtures/cmdline/bug601-zero-stroke-width.svg
index ee96d474..ee96d474 100644
--- a/tests/fixtures/cmdline/601-zero-stroke-width.svg
+++ b/tests/fixtures/cmdline/bug601-zero-stroke-width.svg
diff --git a/tests/fixtures/cmdline/677-partial-pixel.svg b/tests/fixtures/cmdline/bug677-partial-pixel.svg
index aeac8c30..aeac8c30 100644
--- a/tests/fixtures/cmdline/677-partial-pixel.svg
+++ b/tests/fixtures/cmdline/bug677-partial-pixel.svg
diff --git a/tests/fixtures/crash/335-non-svg-toplevel.svg b/tests/fixtures/crash/bug335-non-svg-toplevel.svg
index f9aefcbe..f9aefcbe 100644
--- a/tests/fixtures/crash/335-non-svg-toplevel.svg
+++ b/tests/fixtures/crash/bug335-non-svg-toplevel.svg
diff --git a/tests/fixtures/crash/336-invalid-css.svg b/tests/fixtures/crash/bug336-invalid-css.svg
index 7486f96d..7486f96d 100644
--- a/tests/fixtures/crash/336-invalid-css.svg
+++ b/tests/fixtures/crash/bug336-invalid-css.svg
diff --git a/tests/fixtures/crash/349-empty-data-uri.svg b/tests/fixtures/crash/bug349-empty-data-uri.svg
index 942df7a1..942df7a1 100644
--- a/tests/fixtures/crash/349-empty-data-uri.svg
+++ b/tests/fixtures/crash/bug349-empty-data-uri.svg
diff --git a/tests/fixtures/crash/349-too-big-image-in-href-data.svg b/tests/fixtures/crash/bug349-too-big-image-in-href-data.svg
index b17bb165..b17bb165 100644
--- a/tests/fixtures/crash/349-too-big-image-in-href-data.svg
+++ b/tests/fixtures/crash/bug349-too-big-image-in-href-data.svg
diff --git a/tests/fixtures/crash/352-feConvolveMatrix-large-allocation.svg b/tests/fixtures/crash/bug352-feConvolveMatrix-large-allocation.svg
index e696f663..e696f663 100644
--- a/tests/fixtures/crash/352-feConvolveMatrix-large-allocation.svg
+++ b/tests/fixtures/crash/bug352-feConvolveMatrix-large-allocation.svg
diff --git a/tests/fixtures/crash/377-xinclude-invalid-xml.svg b/tests/fixtures/crash/bug377-xinclude-invalid-xml.svg
index 4690e404..4690e404 100644
--- a/tests/fixtures/crash/377-xinclude-invalid-xml.svg
+++ b/tests/fixtures/crash/bug377-xinclude-invalid-xml.svg
diff --git a/tests/fixtures/crash/463-characters-outside-first-element.svg b/tests/fixtures/crash/bug463-characters-outside-first-element.svg
index 6367798b..6367798b 100644
--- a/tests/fixtures/crash/463-characters-outside-first-element.svg
+++ b/tests/fixtures/crash/bug463-characters-outside-first-element.svg
diff --git a/tests/fixtures/crash/467-xinclude-without-parent-element.svg b/tests/fixtures/crash/bug467-xinclude-without-parent-element.svg
index ea3c4a1f..ea3c4a1f 100644
--- a/tests/fixtures/crash/467-xinclude-without-parent-element.svg
+++ b/tests/fixtures/crash/bug467-xinclude-without-parent-element.svg
diff --git a/tests/fixtures/crash/524-invalid-stylesheet-href.svg b/tests/fixtures/crash/bug524-invalid-stylesheet-href.svg
index 1c34803b..1c34803b 100644
--- a/tests/fixtures/crash/524-invalid-stylesheet-href.svg
+++ b/tests/fixtures/crash/bug524-invalid-stylesheet-href.svg
diff --git a/tests/fixtures/crash/785276-empty.svg b/tests/fixtures/crash/bug785276-empty.svg
index e69de29b..e69de29b 100644
--- a/tests/fixtures/crash/785276-empty.svg
+++ b/tests/fixtures/crash/bug785276-empty.svg
diff --git a/tests/fixtures/crash/785276-short-file.svg b/tests/fixtures/crash/bug785276-short-file.svg
index 8b137891..8b137891 100644
--- a/tests/fixtures/crash/785276-short-file.svg
+++ b/tests/fixtures/crash/bug785276-short-file.svg
diff --git a/tests/fixtures/crash/800-font-inherit.svg b/tests/fixtures/crash/bug800-font-inherit.svg
index 517af776..517af776 100644
--- a/tests/fixtures/crash/800-font-inherit.svg
+++ b/tests/fixtures/crash/bug800-font-inherit.svg
diff --git a/tests/fixtures/crash/800-marker.svg b/tests/fixtures/crash/bug800-marker.svg
index ac7020fd..ac7020fd 100644
--- a/tests/fixtures/crash/800-marker.svg
+++ b/tests/fixtures/crash/bug800-marker.svg
diff --git a/tests/fixtures/dimensions/347-bamboo-16fg-s-pt.svg b/tests/fixtures/dimensions/bug347-bamboo-16fg-s-pt.svg
index de0237cf..de0237cf 100644
--- a/tests/fixtures/dimensions/347-bamboo-16fg-s-pt.svg
+++ b/tests/fixtures/dimensions/bug347-bamboo-16fg-s-pt.svg
diff --git a/tests/fixtures/dimensions/347-wrapper.svg b/tests/fixtures/dimensions/bug347-wrapper.svg
index cf4717bf..46a01284 100644
--- a/tests/fixtures/dimensions/347-wrapper.svg
+++ b/tests/fixtures/dimensions/bug347-wrapper.svg
@@ -28,5 +28,5 @@
     stroke: #ededed !important;
     fill: #535353 !important;
 }
-.B {   stroke: #729fcf !important;   fill: #729fcf !important; } </style><xi:include href="347-bamboo-16fg-s-pt.svg" /></svg>
+.B {   stroke: #729fcf !important;   fill: #729fcf !important; } </style><xi:include href="bug347-bamboo-16fg-s-pt.svg" /></svg>
 
diff --git a/tests/fixtures/dimensions/521-with-viewbox.svg b/tests/fixtures/dimensions/bug521-with-viewbox.svg
index c3f34e6d..c3f34e6d 100644
--- a/tests/fixtures/dimensions/521-with-viewbox.svg
+++ b/tests/fixtures/dimensions/bug521-with-viewbox.svg
diff --git a/tests/fixtures/dimensions/823-position-sub.svg b/tests/fixtures/dimensions/bug823-position-sub.svg
index 66b47ae3..66b47ae3 100644
--- a/tests/fixtures/dimensions/823-position-sub.svg
+++ b/tests/fixtures/dimensions/bug823-position-sub.svg
diff --git a/tests/fixtures/errors/323-nested-use.svg b/tests/fixtures/errors/bug323-nested-use.svg
index 075b48eb..075b48eb 100644
--- a/tests/fixtures/errors/323-nested-use.svg
+++ b/tests/fixtures/errors/bug323-nested-use.svg
diff --git a/tests/fixtures/errors/515-pattern-billion-laughs.svg b/tests/fixtures/errors/bug515-pattern-billion-laughs.svg
index 1cb6cbe8..1cb6cbe8 100644
--- a/tests/fixtures/errors/515-pattern-billion-laughs.svg
+++ b/tests/fixtures/errors/bug515-pattern-billion-laughs.svg
diff --git a/tests/fixtures/errors/515-too-many-elements.svgz b/tests/fixtures/errors/bug515-too-many-elements.svgz
index a7f7cf67..a7f7cf67 100644
--- a/tests/fixtures/errors/515-too-many-elements.svgz
+++ b/tests/fixtures/errors/bug515-too-many-elements.svgz
diff --git a/tests/fixtures/reftests/483-attribute-selectors-ref.png b/tests/fixtures/reftests/bug483-attribute-selectors-ref.png
index 63f8a370..63f8a370 100644
--- a/tests/fixtures/reftests/483-attribute-selectors-ref.png
+++ b/tests/fixtures/reftests/bug483-attribute-selectors-ref.png
diff --git a/tests/fixtures/reftests/483-attribute-selectors.svg b/tests/fixtures/reftests/bug483-attribute-selectors.svg
index 5b3230c9..5b3230c9 100644
--- a/tests/fixtures/reftests/483-attribute-selectors.svg
+++ b/tests/fixtures/reftests/bug483-attribute-selectors.svg
diff --git a/tests/fixtures/reftests/525-specificity-ref.png b/tests/fixtures/reftests/bug525-specificity-ref.png
index 2eaa94d7..2eaa94d7 100644
--- a/tests/fixtures/reftests/525-specificity-ref.png
+++ b/tests/fixtures/reftests/bug525-specificity-ref.png
diff --git a/tests/fixtures/reftests/525-specificity.svg b/tests/fixtures/reftests/bug525-specificity.svg
index 2fb1c525..2fb1c525 100644
--- a/tests/fixtures/reftests/525-specificity.svg
+++ b/tests/fixtures/reftests/bug525-specificity.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/875-svg-use-width-height-ref.svg b/tests/fixtures/reftests/bugs-reftests/bug875-svg-use-width-height-ref.svg
index a68e5c3a..a68e5c3a 100644
--- a/tests/fixtures/reftests/bugs-reftests/875-svg-use-width-height-ref.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug875-svg-use-width-height-ref.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/875-svg-use-width-height.svg b/tests/fixtures/reftests/bugs-reftests/bug875-svg-use-width-height.svg
index 54da0bc1..54da0bc1 100644
--- a/tests/fixtures/reftests/bugs-reftests/875-svg-use-width-height.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug875-svg-use-width-height.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/880-stroke-wide-line-ref.svg b/tests/fixtures/reftests/bugs-reftests/bug880-stroke-wide-line-ref.svg
index a80e5632..a80e5632 100644
--- a/tests/fixtures/reftests/bugs-reftests/880-stroke-wide-line-ref.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug880-stroke-wide-line-ref.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/880-stroke-wide-line.svg b/tests/fixtures/reftests/bugs-reftests/bug880-stroke-wide-line.svg
index 4e22470f..4e22470f 100644
--- a/tests/fixtures/reftests/bugs-reftests/880-stroke-wide-line.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug880-stroke-wide-line.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/885-vector-effect-non-scaling-stroke-ref.svg b/tests/fixtures/reftests/bugs-reftests/bug885-vector-effect-non-scaling-stroke-ref.svg
index 5fba0ad3..5fba0ad3 100644
--- a/tests/fixtures/reftests/bugs-reftests/885-vector-effect-non-scaling-stroke-ref.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug885-vector-effect-non-scaling-stroke-ref.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/885-vector-effect-non-scaling-stroke.svg b/tests/fixtures/reftests/bugs-reftests/bug885-vector-effect-non-scaling-stroke.svg
index be393703..be393703 100644
--- a/tests/fixtures/reftests/bugs-reftests/885-vector-effect-non-scaling-stroke.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug885-vector-effect-non-scaling-stroke.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/92-symbol-clip-ref.svg b/tests/fixtures/reftests/bugs-reftests/bug92-symbol-clip-ref.svg
index c319e2fa..c319e2fa 100644
--- a/tests/fixtures/reftests/bugs-reftests/92-symbol-clip-ref.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug92-symbol-clip-ref.svg
diff --git a/tests/fixtures/reftests/bugs-reftests/92-symbol-clip.svg b/tests/fixtures/reftests/bugs-reftests/bug92-symbol-clip.svg
index f25b65b2..f25b65b2 100644
--- a/tests/fixtures/reftests/bugs-reftests/92-symbol-clip.svg
+++ b/tests/fixtures/reftests/bugs-reftests/bug92-symbol-clip.svg
diff --git a/tests/fixtures/reftests/bugs/108-font-size-relative-ref.png b/tests/fixtures/reftests/bugs/bug108-font-size-relative-ref.png
index 2b18067b..2b18067b 100644
--- a/tests/fixtures/reftests/bugs/108-font-size-relative-ref.png
+++ b/tests/fixtures/reftests/bugs/bug108-font-size-relative-ref.png
diff --git a/tests/fixtures/reftests/bugs/108-font-size-relative.svg b/tests/fixtures/reftests/bugs/bug108-font-size-relative.svg
index 41fe8a59..41fe8a59 100644
--- a/tests/fixtures/reftests/bugs/108-font-size-relative.svg
+++ b/tests/fixtures/reftests/bugs/bug108-font-size-relative.svg
diff --git a/tests/fixtures/reftests/bugs/112-svg-delayed-attributes-ref.png b/tests/fixtures/reftests/bugs/bug112-svg-delayed-attributes-ref.png
index 7cb3a2c2..7cb3a2c2 100644
--- a/tests/fixtures/reftests/bugs/112-svg-delayed-attributes-ref.png
+++ b/tests/fixtures/reftests/bugs/bug112-svg-delayed-attributes-ref.png
diff --git a/tests/fixtures/reftests/bugs/112-svg-delayed-attributes.svg b/tests/fixtures/reftests/bugs/bug112-svg-delayed-attributes.svg
index 9c494345..9c494345 100644
--- a/tests/fixtures/reftests/bugs/112-svg-delayed-attributes.svg
+++ b/tests/fixtures/reftests/bugs/bug112-svg-delayed-attributes.svg
diff --git a/tests/fixtures/reftests/bugs/165-zero-length-subpath-square-linecap-ref.png b/tests/fixtures/reftests/bugs/bug165-zero-length-subpath-square-linecap-ref.png
index be3c6316..be3c6316 100644
--- a/tests/fixtures/reftests/bugs/165-zero-length-subpath-square-linecap-ref.png
+++ b/tests/fixtures/reftests/bugs/bug165-zero-length-subpath-square-linecap-ref.png
diff --git a/tests/fixtures/reftests/bugs/165-zero-length-subpath-square-linecap.svg b/tests/fixtures/reftests/bugs/bug165-zero-length-subpath-square-linecap.svg
index cb725dec..cb725dec 100644
--- a/tests/fixtures/reftests/bugs/165-zero-length-subpath-square-linecap.svg
+++ b/tests/fixtures/reftests/bugs/bug165-zero-length-subpath-square-linecap.svg
diff --git a/tests/fixtures/reftests/bugs/181-inheritable-attrs-in-svg-ref.png b/tests/fixtures/reftests/bugs/bug181-inheritable-attrs-in-svg-ref.png
index 147134b3..147134b3 100644
--- a/tests/fixtures/reftests/bugs/181-inheritable-attrs-in-svg-ref.png
+++ b/tests/fixtures/reftests/bugs/bug181-inheritable-attrs-in-svg-ref.png
diff --git a/tests/fixtures/reftests/bugs/181-inheritable-attrs-in-svg.svg b/tests/fixtures/reftests/bugs/bug181-inheritable-attrs-in-svg.svg
index cb4fdf04..cb4fdf04 100644
--- a/tests/fixtures/reftests/bugs/181-inheritable-attrs-in-svg.svg
+++ b/tests/fixtures/reftests/bugs/bug181-inheritable-attrs-in-svg.svg
diff --git a/tests/fixtures/reftests/bugs/241-light-source-type-ref.png b/tests/fixtures/reftests/bugs/bug241-light-source-type-ref.png
index f7bd4dac..f7bd4dac 100644
--- a/tests/fixtures/reftests/bugs/241-light-source-type-ref.png
+++ b/tests/fixtures/reftests/bugs/bug241-light-source-type-ref.png
diff --git a/tests/fixtures/reftests/bugs/241-light-source-type.svg b/tests/fixtures/reftests/bugs/bug241-light-source-type.svg
index dcc13cc9..dcc13cc9 100644
--- a/tests/fixtures/reftests/bugs/241-light-source-type.svg
+++ b/tests/fixtures/reftests/bugs/bug241-light-source-type.svg
diff --git a/tests/fixtures/reftests/bugs/245-negative-dashoffset-ref.png b/tests/fixtures/reftests/bugs/bug245-negative-dashoffset-ref.png
index 3c85ae56..3c85ae56 100644
--- a/tests/fixtures/reftests/bugs/245-negative-dashoffset-ref.png
+++ b/tests/fixtures/reftests/bugs/bug245-negative-dashoffset-ref.png
diff --git a/tests/fixtures/reftests/bugs/245-negative-dashoffset.svg b/tests/fixtures/reftests/bugs/bug245-negative-dashoffset.svg
index 48cdaf17..48cdaf17 100644
--- a/tests/fixtures/reftests/bugs/245-negative-dashoffset.svg
+++ b/tests/fixtures/reftests/bugs/bug245-negative-dashoffset.svg
diff --git a/tests/fixtures/reftests/bugs/282-drop-shadow-ref.png b/tests/fixtures/reftests/bugs/bug282-drop-shadow-ref.png
index 18b51189..18b51189 100644
--- a/tests/fixtures/reftests/bugs/282-drop-shadow-ref.png
+++ b/tests/fixtures/reftests/bugs/bug282-drop-shadow-ref.png
diff --git a/tests/fixtures/reftests/bugs/282-drop-shadow.svg b/tests/fixtures/reftests/bugs/bug282-drop-shadow.svg
index 04afae33..04afae33 100644
--- a/tests/fixtures/reftests/bugs/282-drop-shadow.svg
+++ b/tests/fixtures/reftests/bugs/bug282-drop-shadow.svg
diff --git a/tests/fixtures/reftests/bugs/340047-ref.png b/tests/fixtures/reftests/bugs/bug340047-ref.png
index bc69bad6..bc69bad6 100644
--- a/tests/fixtures/reftests/bugs/340047-ref.png
+++ b/tests/fixtures/reftests/bugs/bug340047-ref.png
diff --git a/tests/fixtures/reftests/bugs/340047.svg b/tests/fixtures/reftests/bugs/bug340047.svg
index 954bc7a7..954bc7a7 100644
--- a/tests/fixtures/reftests/bugs/340047.svg
+++ b/tests/fixtures/reftests/bugs/bug340047.svg
diff --git a/tests/fixtures/reftests/bugs/363-missing-space-ref.png b/tests/fixtures/reftests/bugs/bug363-missing-space-ref.png
index be503be4..be503be4 100644
--- a/tests/fixtures/reftests/bugs/363-missing-space-ref.png
+++ b/tests/fixtures/reftests/bugs/bug363-missing-space-ref.png
diff --git a/tests/fixtures/reftests/bugs/363-missing-space.svg b/tests/fixtures/reftests/bugs/bug363-missing-space.svg
index 8203f802..8203f802 100644
--- a/tests/fixtures/reftests/bugs/363-missing-space.svg
+++ b/tests/fixtures/reftests/bugs/bug363-missing-space.svg
diff --git a/tests/fixtures/reftests/bugs/372-small-arcs-ref.png b/tests/fixtures/reftests/bugs/bug372-small-arcs-ref.png
index 1bd1fa8c..1bd1fa8c 100644
--- a/tests/fixtures/reftests/bugs/372-small-arcs-ref.png
+++ b/tests/fixtures/reftests/bugs/bug372-small-arcs-ref.png
diff --git a/tests/fixtures/reftests/bugs/372-small-arcs.svg b/tests/fixtures/reftests/bugs/bug372-small-arcs.svg
index d3ce679f..d3ce679f 100644
--- a/tests/fixtures/reftests/bugs/372-small-arcs.svg
+++ b/tests/fixtures/reftests/bugs/bug372-small-arcs.svg
diff --git a/tests/fixtures/reftests/bugs/373-gradient-userspaceonuse-ref.png b/tests/fixtures/reftests/bugs/bug373-gradient-userspaceonuse-ref.png
index 5d8e4c42..5d8e4c42 100644
--- a/tests/fixtures/reftests/bugs/373-gradient-userspaceonuse-ref.png
+++ b/tests/fixtures/reftests/bugs/bug373-gradient-userspaceonuse-ref.png
diff --git a/tests/fixtures/reftests/bugs/373-gradient-userspaceonuse.svg b/tests/fixtures/reftests/bugs/bug373-gradient-userspaceonuse.svg
index 218e5f79..218e5f79 100644
--- a/tests/fixtures/reftests/bugs/373-gradient-userspaceonuse.svg
+++ b/tests/fixtures/reftests/bugs/bug373-gradient-userspaceonuse.svg
diff --git a/tests/fixtures/reftests/bugs/403357-ref.png b/tests/fixtures/reftests/bugs/bug403357-ref.png
index 6af46402..6af46402 100644
--- a/tests/fixtures/reftests/bugs/403357-ref.png
+++ b/tests/fixtures/reftests/bugs/bug403357-ref.png
diff --git a/tests/fixtures/reftests/bugs/403357.svg b/tests/fixtures/reftests/bugs/bug403357.svg
index 67c72239..67c72239 100644
--- a/tests/fixtures/reftests/bugs/403357.svg
+++ b/tests/fixtures/reftests/bugs/bug403357.svg
diff --git a/tests/fixtures/reftests/bugs/476507-ref.png b/tests/fixtures/reftests/bugs/bug476507-ref.png
index 2a7f1b93..2a7f1b93 100644
--- a/tests/fixtures/reftests/bugs/476507-ref.png
+++ b/tests/fixtures/reftests/bugs/bug476507-ref.png
diff --git a/tests/fixtures/reftests/bugs/476507.svg b/tests/fixtures/reftests/bugs/bug476507.svg
index 26029ea8..26029ea8 100644
--- a/tests/fixtures/reftests/bugs/476507.svg
+++ b/tests/fixtures/reftests/bugs/bug476507.svg
diff --git a/tests/fixtures/reftests/bugs/481-tspan-uses-at-least-first-x-ref.png b/tests/fixtures/reftests/bugs/bug481-tspan-uses-at-least-first-x-ref.png
index b5883094..b5883094 100644
--- a/tests/fixtures/reftests/bugs/481-tspan-uses-at-least-first-x-ref.png
+++ b/tests/fixtures/reftests/bugs/bug481-tspan-uses-at-least-first-x-ref.png
diff --git a/tests/fixtures/reftests/bugs/481-tspan-uses-at-least-first-x.svg b/tests/fixtures/reftests/bugs/bug481-tspan-uses-at-least-first-x.svg
index 7c7ed4a3..7c7ed4a3 100644
--- a/tests/fixtures/reftests/bugs/481-tspan-uses-at-least-first-x.svg
+++ b/tests/fixtures/reftests/bugs/bug481-tspan-uses-at-least-first-x.svg
diff --git a/tests/fixtures/reftests/bugs/494-text-accumulate-dy-ref.png b/tests/fixtures/reftests/bugs/bug494-text-accumulate-dy-ref.png
index 67a52de8..67a52de8 100644
--- a/tests/fixtures/reftests/bugs/494-text-accumulate-dy-ref.png
+++ b/tests/fixtures/reftests/bugs/bug494-text-accumulate-dy-ref.png
diff --git a/tests/fixtures/reftests/bugs/494-text-accumulate-dy.svg b/tests/fixtures/reftests/bugs/bug494-text-accumulate-dy.svg
index 6eea3686..6eea3686 100644
--- a/tests/fixtures/reftests/bugs/494-text-accumulate-dy.svg
+++ b/tests/fixtures/reftests/bugs/bug494-text-accumulate-dy.svg
diff --git a/tests/fixtures/reftests/bugs/506-pattern-fallback-ref.png b/tests/fixtures/reftests/bugs/bug506-pattern-fallback-ref.png
index b9fec4e9..b9fec4e9 100644
--- a/tests/fixtures/reftests/bugs/506-pattern-fallback-ref.png
+++ b/tests/fixtures/reftests/bugs/bug506-pattern-fallback-ref.png
diff --git a/tests/fixtures/reftests/bugs/506-pattern-fallback.svg b/tests/fixtures/reftests/bugs/bug506-pattern-fallback.svg
index 64f71050..64f71050 100644
--- a/tests/fixtures/reftests/bugs/506-pattern-fallback.svg
+++ b/tests/fixtures/reftests/bugs/bug506-pattern-fallback.svg
diff --git a/tests/fixtures/reftests/bugs/510-pattern-fill-opacity-ref.png b/tests/fixtures/reftests/bugs/bug510-pattern-fill-opacity-ref.png
index cad2c3e7..cad2c3e7 100644
--- a/tests/fixtures/reftests/bugs/510-pattern-fill-opacity-ref.png
+++ b/tests/fixtures/reftests/bugs/bug510-pattern-fill-opacity-ref.png
diff --git a/tests/fixtures/reftests/bugs/510-pattern-fill-opacity.svg b/tests/fixtures/reftests/bugs/bug510-pattern-fill-opacity.svg
index 569d8ba4..569d8ba4 100644
--- a/tests/fixtures/reftests/bugs/510-pattern-fill-opacity.svg
+++ b/tests/fixtures/reftests/bugs/bug510-pattern-fill-opacity.svg
diff --git a/tests/fixtures/reftests/bugs/510-pattern-fill-ref.png b/tests/fixtures/reftests/bugs/bug510-pattern-fill-ref.png
index 6fdae2c4..6fdae2c4 100644
--- a/tests/fixtures/reftests/bugs/510-pattern-fill-ref.png
+++ b/tests/fixtures/reftests/bugs/bug510-pattern-fill-ref.png
diff --git a/tests/fixtures/reftests/bugs/510-pattern-fill.svg b/tests/fixtures/reftests/bugs/bug510-pattern-fill.svg
index 9698a03a..9698a03a 100644
--- a/tests/fixtures/reftests/bugs/510-pattern-fill.svg
+++ b/tests/fixtures/reftests/bugs/bug510-pattern-fill.svg
diff --git a/tests/fixtures/reftests/bugs/548-data-url-without-mimetype-ref.png b/tests/fixtures/reftests/bugs/bug548-data-url-without-mimetype-ref.png
index 9008274a..9008274a 100644
--- a/tests/fixtures/reftests/bugs/548-data-url-without-mimetype-ref.png
+++ b/tests/fixtures/reftests/bugs/bug548-data-url-without-mimetype-ref.png
diff --git a/tests/fixtures/reftests/bugs/548-data-url-without-mimetype.svg b/tests/fixtures/reftests/bugs/bug548-data-url-without-mimetype.svg
index f2cd71c7..f2cd71c7 100644
--- a/tests/fixtures/reftests/bugs/548-data-url-without-mimetype.svg
+++ b/tests/fixtures/reftests/bugs/bug548-data-url-without-mimetype.svg
diff --git a/tests/fixtures/reftests/bugs/563933-ref.png b/tests/fixtures/reftests/bugs/bug563933-ref.png
index 1e50f0d6..1e50f0d6 100644
--- a/tests/fixtures/reftests/bugs/563933-ref.png
+++ b/tests/fixtures/reftests/bugs/bug563933-ref.png
diff --git a/tests/fixtures/reftests/bugs/563933.svg b/tests/fixtures/reftests/bugs/bug563933.svg
index dd920ba9..dd920ba9 100644
--- a/tests/fixtures/reftests/bugs/563933.svg
+++ b/tests/fixtures/reftests/bugs/bug563933.svg
diff --git a/tests/fixtures/reftests/bugs/577-multiple-font-families-ref.png b/tests/fixtures/reftests/bugs/bug577-multiple-font-families-ref.png
index 075edd14..075edd14 100644
--- a/tests/fixtures/reftests/bugs/577-multiple-font-families-ref.png
+++ b/tests/fixtures/reftests/bugs/bug577-multiple-font-families-ref.png
diff --git a/tests/fixtures/reftests/bugs/587721-text-transform-ref.png b/tests/fixtures/reftests/bugs/bug587721-text-transform-ref.png
index 798fc6fb..798fc6fb 100644
--- a/tests/fixtures/reftests/bugs/587721-text-transform-ref.png
+++ b/tests/fixtures/reftests/bugs/bug587721-text-transform-ref.png
diff --git a/tests/fixtures/reftests/bugs/587721-text-transform.svg b/tests/fixtures/reftests/bugs/bug587721-text-transform.svg
index d86b6ef7..d86b6ef7 100644
--- a/tests/fixtures/reftests/bugs/587721-text-transform.svg
+++ b/tests/fixtures/reftests/bugs/bug587721-text-transform.svg
diff --git a/tests/fixtures/reftests/bugs/590-mask-units-ref.png b/tests/fixtures/reftests/bugs/bug590-mask-units-ref.png
index 3647c930..3647c930 100644
--- a/tests/fixtures/reftests/bugs/590-mask-units-ref.png
+++ b/tests/fixtures/reftests/bugs/bug590-mask-units-ref.png
diff --git a/tests/fixtures/reftests/bugs/590-mask-units.svg b/tests/fixtures/reftests/bugs/bug590-mask-units.svg
index 14e2e719..14e2e719 100644
--- a/tests/fixtures/reftests/bugs/590-mask-units.svg
+++ b/tests/fixtures/reftests/bugs/bug590-mask-units.svg
diff --git a/tests/fixtures/reftests/bugs/603550-mask-luminance-ref.png b/tests/fixtures/reftests/bugs/bug603550-mask-luminance-ref.png
index 456b1982..456b1982 100644
--- a/tests/fixtures/reftests/bugs/603550-mask-luminance-ref.png
+++ b/tests/fixtures/reftests/bugs/bug603550-mask-luminance-ref.png
diff --git a/tests/fixtures/reftests/bugs/603550-mask-luminance.svg b/tests/fixtures/reftests/bugs/bug603550-mask-luminance.svg
index 19c40b2f..19c40b2f 100644
--- a/tests/fixtures/reftests/bugs/603550-mask-luminance.svg
+++ b/tests/fixtures/reftests/bugs/bug603550-mask-luminance.svg
diff --git a/tests/fixtures/reftests/bugs/609-clippath-transform-ref.png b/tests/fixtures/reftests/bugs/bug609-clippath-transform-ref.png
index 58924a21..58924a21 100644
--- a/tests/fixtures/reftests/bugs/609-clippath-transform-ref.png
+++ b/tests/fixtures/reftests/bugs/bug609-clippath-transform-ref.png
diff --git a/tests/fixtures/reftests/bugs/609-clippath-transform.svg b/tests/fixtures/reftests/bugs/bug609-clippath-transform.svg
index a689a06b..a689a06b 100644
--- a/tests/fixtures/reftests/bugs/609-clippath-transform.svg
+++ b/tests/fixtures/reftests/bugs/bug609-clippath-transform.svg
diff --git a/tests/fixtures/reftests/bugs/634324-blur-negative-transform-ref.png b/tests/fixtures/reftests/bugs/bug634324-blur-negative-transform-ref.png
index b87da96f..b87da96f 100644
--- a/tests/fixtures/reftests/bugs/634324-blur-negative-transform-ref.png
+++ b/tests/fixtures/reftests/bugs/bug634324-blur-negative-transform-ref.png
diff --git a/tests/fixtures/reftests/bugs/634324-blur-negative-transform.svg b/tests/fixtures/reftests/bugs/bug634324-blur-negative-transform.svg
index 8b8278b7..8b8278b7 100644
--- a/tests/fixtures/reftests/bugs/634324-blur-negative-transform.svg
+++ b/tests/fixtures/reftests/bugs/bug634324-blur-negative-transform.svg
diff --git a/tests/fixtures/reftests/bugs/642-nested-tspan-dx-dy-ref.png b/tests/fixtures/reftests/bugs/bug642-nested-tspan-dx-dy-ref.png
index 81887de8..81887de8 100644
--- a/tests/fixtures/reftests/bugs/642-nested-tspan-dx-dy-ref.png
+++ b/tests/fixtures/reftests/bugs/bug642-nested-tspan-dx-dy-ref.png
diff --git a/tests/fixtures/reftests/bugs/642-nested-tspan-dx-dy.svg b/tests/fixtures/reftests/bugs/bug642-nested-tspan-dx-dy.svg
index 175d00c8..175d00c8 100644
--- a/tests/fixtures/reftests/bugs/642-nested-tspan-dx-dy.svg
+++ b/tests/fixtures/reftests/bugs/bug642-nested-tspan-dx-dy.svg
diff --git a/tests/fixtures/reftests/bugs/667-tspan-visibility-ref.png b/tests/fixtures/reftests/bugs/bug667-tspan-visibility-ref.png
index 3b48cb6d..3b48cb6d 100644
--- a/tests/fixtures/reftests/bugs/667-tspan-visibility-ref.png
+++ b/tests/fixtures/reftests/bugs/bug667-tspan-visibility-ref.png
diff --git a/tests/fixtures/reftests/bugs/667-tspan-visibility.svg b/tests/fixtures/reftests/bugs/bug667-tspan-visibility.svg
index 7919fab3..7919fab3 100644
--- a/tests/fixtures/reftests/bugs/667-tspan-visibility.svg
+++ b/tests/fixtures/reftests/bugs/bug667-tspan-visibility.svg
diff --git a/tests/fixtures/reftests/bugs/668-small-caps-ref.png b/tests/fixtures/reftests/bugs/bug668-small-caps-ref.png
index 42de8479..42de8479 100644
--- a/tests/fixtures/reftests/bugs/668-small-caps-ref.png
+++ b/tests/fixtures/reftests/bugs/bug668-small-caps-ref.png
diff --git a/tests/fixtures/reftests/bugs/668-small-caps.svg b/tests/fixtures/reftests/bugs/bug668-small-caps.svg
index a69f52b5..a69f52b5 100644
--- a/tests/fixtures/reftests/bugs/668-small-caps.svg
+++ b/tests/fixtures/reftests/bugs/bug668-small-caps.svg
diff --git a/tests/fixtures/reftests/bugs/689832-unresolved-gradient-ref.png b/tests/fixtures/reftests/bugs/bug689832-unresolved-gradient-ref.png
index 64cbe5c0..64cbe5c0 100644
--- a/tests/fixtures/reftests/bugs/689832-unresolved-gradient-ref.png
+++ b/tests/fixtures/reftests/bugs/bug689832-unresolved-gradient-ref.png
diff --git a/tests/fixtures/reftests/bugs/689832-unresolved-gradient.svg b/tests/fixtures/reftests/bugs/bug689832-unresolved-gradient.svg
index 15413d83..15413d83 100644
--- a/tests/fixtures/reftests/bugs/689832-unresolved-gradient.svg
+++ b/tests/fixtures/reftests/bugs/bug689832-unresolved-gradient.svg
diff --git a/tests/fixtures/reftests/bugs/718-rect-negative-rx-ry-ref.png b/tests/fixtures/reftests/bugs/bug718-rect-negative-rx-ry-ref.png
index 5fd1b8cf..5fd1b8cf 100644
--- a/tests/fixtures/reftests/bugs/718-rect-negative-rx-ry-ref.png
+++ b/tests/fixtures/reftests/bugs/bug718-rect-negative-rx-ry-ref.png
diff --git a/tests/fixtures/reftests/bugs/718-rect-negative-rx-ry.svg b/tests/fixtures/reftests/bugs/bug718-rect-negative-rx-ry.svg
index 1f526d16..1f526d16 100644
--- a/tests/fixtures/reftests/bugs/718-rect-negative-rx-ry.svg
+++ b/tests/fixtures/reftests/bugs/bug718-rect-negative-rx-ry.svg
diff --git a/tests/fixtures/reftests/bugs/730-font-scaling-ref.png b/tests/fixtures/reftests/bugs/bug730-font-scaling-ref.png
index 5fef4bdf..5fef4bdf 100644
--- a/tests/fixtures/reftests/bugs/730-font-scaling-ref.png
+++ b/tests/fixtures/reftests/bugs/bug730-font-scaling-ref.png
diff --git a/tests/fixtures/reftests/bugs/730-font-scaling.svg b/tests/fixtures/reftests/bugs/bug730-font-scaling.svg
index 5a8ea2b8..5a8ea2b8 100644
--- a/tests/fixtures/reftests/bugs/730-font-scaling.svg
+++ b/tests/fixtures/reftests/bugs/bug730-font-scaling.svg
diff --git a/tests/fixtures/reftests/bugs/738367-ref.png b/tests/fixtures/reftests/bugs/bug738367-ref.png
index dd1af4a1..dd1af4a1 100644
--- a/tests/fixtures/reftests/bugs/738367-ref.png
+++ b/tests/fixtures/reftests/bugs/bug738367-ref.png
diff --git a/tests/fixtures/reftests/bugs/738367.svg b/tests/fixtures/reftests/bugs/bug738367.svg
index 00860a44..00860a44 100644
--- a/tests/fixtures/reftests/bugs/738367.svg
+++ b/tests/fixtures/reftests/bugs/bug738367.svg
diff --git a/tests/fixtures/reftests/bugs/749415-ref.png b/tests/fixtures/reftests/bugs/bug749415-ref.png
index b843dcdd..b843dcdd 100644
--- a/tests/fixtures/reftests/bugs/749415-ref.png
+++ b/tests/fixtures/reftests/bugs/bug749415-ref.png
diff --git a/tests/fixtures/reftests/bugs/749415.svg b/tests/fixtures/reftests/bugs/bug749415.svg
index 15865a5a..15865a5a 100644
--- a/tests/fixtures/reftests/bugs/749415.svg
+++ b/tests/fixtures/reftests/bugs/bug749415.svg
diff --git a/tests/fixtures/reftests/bugs/760180-ref.png b/tests/fixtures/reftests/bugs/bug760180-ref.png
index a6838ca4..a6838ca4 100644
--- a/tests/fixtures/reftests/bugs/760180-ref.png
+++ b/tests/fixtures/reftests/bugs/bug760180-ref.png
diff --git a/tests/fixtures/reftests/bugs/760180.svg b/tests/fixtures/reftests/bugs/bug760180.svg
index c1929f81..c1929f81 100644
--- a/tests/fixtures/reftests/bugs/760180.svg
+++ b/tests/fixtures/reftests/bugs/bug760180.svg
diff --git a/tests/fixtures/reftests/bugs/761175-recursive-masks-ref.png b/tests/fixtures/reftests/bugs/bug761175-recursive-masks-ref.png
index aceb5d20..aceb5d20 100644
--- a/tests/fixtures/reftests/bugs/761175-recursive-masks-ref.png
+++ b/tests/fixtures/reftests/bugs/bug761175-recursive-masks-ref.png
diff --git a/tests/fixtures/reftests/bugs/761175-recursive-masks.svg b/tests/fixtures/reftests/bugs/bug761175-recursive-masks.svg
index 22482664..22482664 100644
--- a/tests/fixtures/reftests/bugs/761175-recursive-masks.svg
+++ b/tests/fixtures/reftests/bugs/bug761175-recursive-masks.svg
diff --git a/tests/fixtures/reftests/bugs/761871-reset-reflection-points-ref.png b/tests/fixtures/reftests/bugs/bug761871-reset-reflection-points-ref.png
index e76e47c5..e76e47c5 100644
--- a/tests/fixtures/reftests/bugs/761871-reset-reflection-points-ref.png
+++ b/tests/fixtures/reftests/bugs/bug761871-reset-reflection-points-ref.png
diff --git a/tests/fixtures/reftests/bugs/761871-reset-reflection-points.svg b/tests/fixtures/reftests/bugs/bug761871-reset-reflection-points.svg
index cc3bda9f..cc3bda9f 100644
--- a/tests/fixtures/reftests/bugs/761871-reset-reflection-points.svg
+++ b/tests/fixtures/reftests/bugs/bug761871-reset-reflection-points.svg
diff --git a/tests/fixtures/reftests/bugs/763386-marker-coincident-ref.png b/tests/fixtures/reftests/bugs/bug763386-marker-coincident-ref.png
index 2248fd7b..2248fd7b 100644
--- a/tests/fixtures/reftests/bugs/763386-marker-coincident-ref.png
+++ b/tests/fixtures/reftests/bugs/bug763386-marker-coincident-ref.png
diff --git a/tests/fixtures/reftests/bugs/763386-marker-coincident.svg b/tests/fixtures/reftests/bugs/bug763386-marker-coincident.svg
index 7af4f9e3..7af4f9e3 100644
--- a/tests/fixtures/reftests/bugs/763386-marker-coincident.svg
+++ b/tests/fixtures/reftests/bugs/bug763386-marker-coincident.svg
diff --git a/tests/fixtures/reftests/bugs/776297-marker-on-non-path-elements-ref.png b/tests/fixtures/reftests/bugs/bug776297-marker-on-non-path-elements-ref.png
index 1b5634c1..1b5634c1 100644
--- a/tests/fixtures/reftests/bugs/776297-marker-on-non-path-elements-ref.png
+++ b/tests/fixtures/reftests/bugs/bug776297-marker-on-non-path-elements-ref.png
diff --git a/tests/fixtures/reftests/bugs/776297-marker-on-non-path-elements.svg b/tests/fixtures/reftests/bugs/bug776297-marker-on-non-path-elements.svg
index d8b78f31..d8b78f31 100644
--- a/tests/fixtures/reftests/bugs/776297-marker-on-non-path-elements.svg
+++ b/tests/fixtures/reftests/bugs/bug776297-marker-on-non-path-elements.svg
diff --git a/tests/fixtures/reftests/bugs/786372-default-style-type-ref.png b/tests/fixtures/reftests/bugs/bug786372-default-style-type-ref.png
index f3bf76a8..f3bf76a8 100644
--- a/tests/fixtures/reftests/bugs/786372-default-style-type-ref.png
+++ b/tests/fixtures/reftests/bugs/bug786372-default-style-type-ref.png
diff --git a/tests/fixtures/reftests/bugs/786372-default-style-type.svg b/tests/fixtures/reftests/bugs/bug786372-default-style-type.svg
index 780aac63..780aac63 100644
--- a/tests/fixtures/reftests/bugs/786372-default-style-type.svg
+++ b/tests/fixtures/reftests/bugs/bug786372-default-style-type.svg
diff --git a/tests/fixtures/reftests/bugs/788-inner-svg-viewbox-ref.png b/tests/fixtures/reftests/bugs/bug788-inner-svg-viewbox-ref.png
index 93349f98..93349f98 100644
--- a/tests/fixtures/reftests/bugs/788-inner-svg-viewbox-ref.png
+++ b/tests/fixtures/reftests/bugs/bug788-inner-svg-viewbox-ref.png
diff --git a/tests/fixtures/reftests/bugs/788-inner-svg-viewbox.svg b/tests/fixtures/reftests/bugs/bug788-inner-svg-viewbox.svg
index 25029f61..25029f61 100644
--- a/tests/fixtures/reftests/bugs/788-inner-svg-viewbox.svg
+++ b/tests/fixtures/reftests/bugs/bug788-inner-svg-viewbox.svg
diff --git a/tests/fixtures/reftests/svg2-reftests/913-gaussian-blur-nonpositive-ref.svg b/tests/fixtures/reftests/svg2-reftests/bug913-gaussian-blur-nonpositive-ref.svg
index 859a6973..859a6973 100644
--- a/tests/fixtures/reftests/svg2-reftests/913-gaussian-blur-nonpositive-ref.svg
+++ b/tests/fixtures/reftests/svg2-reftests/bug913-gaussian-blur-nonpositive-ref.svg
diff --git a/tests/fixtures/reftests/svg2-reftests/913-gaussian-blur-nonpositive.svg b/tests/fixtures/reftests/svg2-reftests/bug913-gaussian-blur-nonpositive.svg
index e1a276e3..e1a276e3 100644
--- a/tests/fixtures/reftests/svg2-reftests/913-gaussian-blur-nonpositive.svg
+++ b/tests/fixtures/reftests/svg2-reftests/bug913-gaussian-blur-nonpositive.svg
diff --git a/tests/fixtures/render-crash/187-set-gradient-on-empty-path.svg b/tests/fixtures/render-crash/bug187-set-gradient-on-empty-path.svg
index d6b7f65b..d6b7f65b 100644
--- a/tests/fixtures/render-crash/187-set-gradient-on-empty-path.svg
+++ b/tests/fixtures/render-crash/bug187-set-gradient-on-empty-path.svg
diff --git a/tests/fixtures/render-crash/193-filters-conv-05-f.svg b/tests/fixtures/render-crash/bug193-filters-conv-05-f.svg
index b60f774e..b60f774e 100644
--- a/tests/fixtures/render-crash/193-filters-conv-05-f.svg
+++ b/tests/fixtures/render-crash/bug193-filters-conv-05-f.svg
diff --git a/tests/fixtures/render-crash/227-negative-dasharray-value.svg b/tests/fixtures/render-crash/bug227-negative-dasharray-value.svg
index 3abee723..3abee723 100644
--- a/tests/fixtures/render-crash/227-negative-dasharray-value.svg
+++ b/tests/fixtures/render-crash/bug227-negative-dasharray-value.svg
diff --git a/tests/fixtures/render-crash/266-filters-with-error-attributes.svg b/tests/fixtures/render-crash/bug266-filters-with-error-attributes.svg
index 34654903..34654903 100644
--- a/tests/fixtures/render-crash/266-filters-with-error-attributes.svg
+++ b/tests/fixtures/render-crash/bug266-filters-with-error-attributes.svg
diff --git a/tests/fixtures/render-crash/277-filter-on-empty-group.svg b/tests/fixtures/render-crash/bug277-filter-on-empty-group.svg
index 931d86b5..931d86b5 100644
--- a/tests/fixtures/render-crash/277-filter-on-empty-group.svg
+++ b/tests/fixtures/render-crash/bug277-filter-on-empty-group.svg
diff --git a/tests/fixtures/render-crash/292-clip-empty-group.svg b/tests/fixtures/render-crash/bug292-clip-empty-group.svg
index 5e09d11c..5e09d11c 100644
--- a/tests/fixtures/render-crash/292-clip-empty-group.svg
+++ b/tests/fixtures/render-crash/bug292-clip-empty-group.svg
diff --git a/tests/fixtures/render-crash/293-mask-empty-group.svg b/tests/fixtures/render-crash/bug293-mask-empty-group.svg
index 95b8e39d..95b8e39d 100644
--- a/tests/fixtures/render-crash/293-mask-empty-group.svg
+++ b/tests/fixtures/render-crash/bug293-mask-empty-group.svg
diff --git a/tests/fixtures/render-crash/324-empty-svg.svg b/tests/fixtures/render-crash/bug324-empty-svg.svg
index c36f5108..c36f5108 100644
--- a/tests/fixtures/render-crash/324-empty-svg.svg
+++ b/tests/fixtures/render-crash/bug324-empty-svg.svg
diff --git a/tests/fixtures/render-crash/337-font-ex.svg b/tests/fixtures/render-crash/bug337-font-ex.svg
index 9b517e89..9b517e89 100644
--- a/tests/fixtures/render-crash/337-font-ex.svg
+++ b/tests/fixtures/render-crash/bug337-font-ex.svg
diff --git a/tests/fixtures/render-crash/338-zero-sized-image.svg b/tests/fixtures/render-crash/bug338-zero-sized-image.svg
index 91995450..91995450 100644
--- a/tests/fixtures/render-crash/338-zero-sized-image.svg
+++ b/tests/fixtures/render-crash/bug338-zero-sized-image.svg
diff --git a/tests/fixtures/render-crash/340-marker-with-zero-sized-vbox.svg b/tests/fixtures/render-crash/bug340-marker-with-zero-sized-vbox.svg
index 05c00ab8..05c00ab8 100644
--- a/tests/fixtures/render-crash/340-marker-with-zero-sized-vbox.svg
+++ b/tests/fixtures/render-crash/bug340-marker-with-zero-sized-vbox.svg
diff --git a/tests/fixtures/render-crash/342-use-references-ancestor.svg b/tests/fixtures/render-crash/bug342-use-references-ancestor.svg
index 45f60594..45f60594 100644
--- a/tests/fixtures/render-crash/342-use-references-ancestor.svg
+++ b/tests/fixtures/render-crash/bug342-use-references-ancestor.svg
diff --git a/tests/fixtures/render-crash/343-feComponentTransfer-child-in-error.svg b/tests/fixtures/render-crash/bug343-feComponentTransfer-child-in-error.svg
index e6991a2f..e6991a2f 100644
--- a/tests/fixtures/render-crash/343-feComponentTransfer-child-in-error.svg
+++ b/tests/fixtures/render-crash/bug343-feComponentTransfer-child-in-error.svg
diff --git a/tests/fixtures/render-crash/344-too-large-viewbox.svg b/tests/fixtures/render-crash/bug344-too-large-viewbox.svg
index ff89b5a0..ff89b5a0 100644
--- a/tests/fixtures/render-crash/344-too-large-viewbox.svg
+++ b/tests/fixtures/render-crash/bug344-too-large-viewbox.svg
diff --git a/tests/fixtures/render-crash/345-too-large-size.svg b/tests/fixtures/render-crash/bug345-too-large-size.svg
index bc5cfde2..bc5cfde2 100644
--- a/tests/fixtures/render-crash/345-too-large-size.svg
+++ b/tests/fixtures/render-crash/bug345-too-large-size.svg
diff --git a/tests/fixtures/render-crash/395-feMorphology-negative-scaling.svg b/tests/fixtures/render-crash/bug395-feMorphology-negative-scaling.svg
index 168e3b01..168e3b01 100644
--- a/tests/fixtures/render-crash/395-feMorphology-negative-scaling.svg
+++ b/tests/fixtures/render-crash/bug395-feMorphology-negative-scaling.svg
diff --git a/tests/fixtures/render-crash/497-path-with-all-invalid-commands.svg b/tests/fixtures/render-crash/bug497-path-with-all-invalid-commands.svg
index cdd63316..cdd63316 100644
--- a/tests/fixtures/render-crash/497-path-with-all-invalid-commands.svg
+++ b/tests/fixtures/render-crash/bug497-path-with-all-invalid-commands.svg
diff --git a/tests/fixtures/render-crash/581491-zero-sized-text.svg b/tests/fixtures/render-crash/bug581491-zero-sized-text.svg
index 78793ae3..78793ae3 100644
--- a/tests/fixtures/render-crash/581491-zero-sized-text.svg
+++ b/tests/fixtures/render-crash/bug581491-zero-sized-text.svg
diff --git a/tests/fixtures/render-crash/588-big-viewbox-yields-invalid-transform.svg b/tests/fixtures/render-crash/bug588-big-viewbox-yields-invalid-transform.svg
index 3e29cbe1..3e29cbe1 100644
--- a/tests/fixtures/render-crash/588-big-viewbox-yields-invalid-transform.svg
+++ b/tests/fixtures/render-crash/bug588-big-viewbox-yields-invalid-transform.svg
diff --git a/tests/fixtures/render-crash/591-vbox-overflow.svg b/tests/fixtures/render-crash/bug591-vbox-overflow.svg
index 1cee7759..1cee7759 100644
--- a/tests/fixtures/render-crash/591-vbox-overflow.svg
+++ b/tests/fixtures/render-crash/bug591-vbox-overflow.svg
diff --git a/tests/fixtures/render-crash/593-mask-empty-bbox.svg b/tests/fixtures/render-crash/bug593-mask-empty-bbox.svg
index a2b672ae..a2b672ae 100644
--- a/tests/fixtures/render-crash/593-mask-empty-bbox.svg
+++ b/tests/fixtures/render-crash/bug593-mask-empty-bbox.svg
diff --git a/tests/fixtures/render-crash/721-pattern-cycle-from-child.svg b/tests/fixtures/render-crash/bug721-pattern-cycle-from-child.svg
index 51205148..51205148 100644
--- a/tests/fixtures/render-crash/721-pattern-cycle-from-child.svg
+++ b/tests/fixtures/render-crash/bug721-pattern-cycle-from-child.svg
diff --git a/tests/fixtures/render-crash/721-pattern-cycle-from-other-child.svg b/tests/fixtures/render-crash/bug721-pattern-cycle-from-other-child.svg
index 668c3d35..668c3d35 100644
--- a/tests/fixtures/render-crash/721-pattern-cycle-from-other-child.svg
+++ b/tests/fixtures/render-crash/bug721-pattern-cycle-from-other-child.svg
diff --git a/tests/fixtures/render-crash/777155-zero-sized-pattern.svg b/tests/fixtures/render-crash/bug777155-zero-sized-pattern.svg
index 6303b590..6303b590 100644
--- a/tests/fixtures/render-crash/777155-zero-sized-pattern.svg
+++ b/tests/fixtures/render-crash/bug777155-zero-sized-pattern.svg
diff --git a/tests/fixtures/text/804-tspan-direction-change-ref.svg b/tests/fixtures/text/bug804-tspan-direction-change-ref.svg
index 29a50b04..29a50b04 100644
--- a/tests/fixtures/text/804-tspan-direction-change-ref.svg
+++ b/tests/fixtures/text/bug804-tspan-direction-change-ref.svg
diff --git a/tests/fixtures/text/804-tspan-direction-change.svg b/tests/fixtures/text/bug804-tspan-direction-change.svg
index 1620bd7d..1620bd7d 100644
--- a/tests/fixtures/text/804-tspan-direction-change.svg
+++ b/tests/fixtures/text/bug804-tspan-direction-change.svg
diff --git a/tests/fixtures/text/806-text-anchor-chunk-ref.svg b/tests/fixtures/text/bug806-text-anchor-chunk-ref.svg
index a8abdea4..a8abdea4 100644
--- a/tests/fixtures/text/806-text-anchor-chunk-ref.svg
+++ b/tests/fixtures/text/bug806-text-anchor-chunk-ref.svg
diff --git a/tests/fixtures/text/806-text-anchor-chunk.svg b/tests/fixtures/text/bug806-text-anchor-chunk.svg
index b7a5cfe8..b7a5cfe8 100644
--- a/tests/fixtures/text/806-text-anchor-chunk.svg
+++ b/tests/fixtures/text/bug806-text-anchor-chunk.svg
diff --git a/tests/src/bugs.rs b/tests/src/bugs.rs
index d268b4f2..b5d5ae1e 100644
--- a/tests/src/bugs.rs
+++ b/tests/src/bugs.rs
@@ -1,6 +1,3 @@
-#![cfg(test)]
-use test_generator::test_resources;
-
 use cairo;
 use librsvg::{CairoRenderer, Loader, LoadingError, SvgHandle};
 use matches::matches;
@@ -293,12 +290,12 @@ fn doubly_recursive_use() {
 }
 
 // https://gitlab.gnome.org/GNOME/librsvg/-/issues/347
-#[test_resources("tests/fixtures/dimensions/347-wrapper.svg")]
-fn test_text_bounds(name: &str) {
+#[test]
+fn test_text_bounds() {
     setup_font_map();
 
     let handle = Loader::new()
-        .read_path(name)
+        .read_path("tests/fixtures/dimensions/bug347-wrapper.svg")
         .unwrap_or_else(|e| panic!("could not load: {}", e));
 
     let renderer = CairoRenderer::new(&handle).test_mode(true);
diff --git a/tests/src/cmdline/rsvg_convert.rs b/tests/src/cmdline/rsvg_convert.rs
index abd1a69c..beec016f 100644
--- a/tests/src/cmdline/rsvg_convert.rs
+++ b/tests/src/cmdline/rsvg_convert.rs
@@ -69,7 +69,7 @@ impl RsvgConvert {
 
 #[test]
 fn converts_svg_from_stdin_to_png() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .assert()
         .success()
         .stdout(file::is_png());
@@ -77,7 +77,7 @@ fn converts_svg_from_stdin_to_png() {
 
 #[test]
 fn argument_is_input_filename() {
-    let input = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let input = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     RsvgConvert::new()
         .arg(input)
         .assert()
@@ -87,7 +87,7 @@ fn argument_is_input_filename() {
 
 #[test]
 fn argument_is_url() {
-    let path = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg")
+    let path = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .canonicalize()
         .unwrap();
     let url = Url::from_file_path(path).unwrap();
@@ -103,7 +103,7 @@ fn argument_is_url() {
 
 #[test]
 fn output_format_png() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--format=png")
         .assert()
         .success()
@@ -113,7 +113,7 @@ fn output_format_png() {
 #[cfg(system_deps_have_cairo_ps)]
 #[test]
 fn output_format_ps() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--format=ps")
         .assert()
         .success()
@@ -123,7 +123,7 @@ fn output_format_ps() {
 #[cfg(system_deps_have_cairo_ps)]
 #[test]
 fn output_format_eps() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--format=eps")
         .assert()
         .success()
@@ -133,7 +133,7 @@ fn output_format_eps() {
 #[cfg(system_deps_have_cairo_pdf)]
 #[test]
 fn output_format_pdf() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--format=pdf")
         .assert()
         .success()
@@ -143,7 +143,7 @@ fn output_format_pdf() {
 #[cfg(system_deps_have_cairo_svg)]
 #[test]
 fn output_format_svg_short_option() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("-f")
         .arg("svg")
         .assert()
@@ -154,7 +154,7 @@ fn output_format_svg_short_option() {
 #[cfg(system_deps_have_cairo_svg)]
 #[test]
 fn user_specified_width_and_height() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--format")
         .arg("svg")
         .arg("--width")
@@ -172,7 +172,7 @@ fn user_specified_width_and_height() {
 #[cfg(system_deps_have_cairo_svg)]
 #[test]
 fn user_specified_width_and_height_px_output() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--format")
         .arg("svg")
         .arg("--width")
@@ -190,7 +190,7 @@ fn user_specified_width_and_height_px_output() {
 #[cfg(system_deps_have_cairo_svg)]
 #[test]
 fn user_specified_width_and_height_a4() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--format")
         .arg("svg")
         .arg("--page-width")
@@ -221,7 +221,7 @@ fn output_file_option() {
     };
     assert!(predicates::path::is_file().not().eval(&output));
 
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg(format!("--output={}", output.display()))
         .assert()
         .success()
@@ -239,7 +239,7 @@ fn output_file_short_option() {
     };
     assert!(predicates::path::is_file().not().eval(&output));
 
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("-o")
         .arg(format!("{}", output.display()))
         .assert()
@@ -259,7 +259,7 @@ fn overwrites_existing_output_file() {
     assert!(predicates::path::is_file().not().eval(&output));
 
     for _ in 0..2 {
-        RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+        RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
             .arg(format!("--output={}", output.display()))
             .assert()
             .success()
@@ -291,7 +291,7 @@ fn empty_svg_yields_error() {
 
 #[test]
 fn multiple_input_files_not_allowed_for_png_output() {
-    let one = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let one = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     let two = Path::new("tests/fixtures/dimensions/sub-rect-no-unit.svg");
     RsvgConvert::new()
         .arg(one)
@@ -306,7 +306,7 @@ fn multiple_input_files_not_allowed_for_png_output() {
 #[cfg(system_deps_have_cairo_ps)]
 #[test]
 fn multiple_input_files_accepted_for_eps_output() {
-    let one = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let one = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     let two = Path::new("tests/fixtures/dimensions/sub-rect-no-unit.svg");
     RsvgConvert::new()
         .arg("--format=eps")
@@ -320,7 +320,7 @@ fn multiple_input_files_accepted_for_eps_output() {
 #[cfg(system_deps_have_cairo_ps)]
 #[test]
 fn multiple_input_files_accepted_for_ps_output() {
-    let one = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let one = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     let two = Path::new("tests/fixtures/dimensions/sub-rect-no-unit.svg");
     RsvgConvert::new()
         .arg("--format=ps")
@@ -334,7 +334,7 @@ fn multiple_input_files_accepted_for_ps_output() {
 #[cfg(system_deps_have_cairo_pdf)]
 #[test]
 fn multiple_input_files_create_multi_page_pdf_output() {
-    let one = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let one = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     let two = Path::new("tests/fixtures/dimensions/sub-rect-no-unit.svg");
     let three = Path::new("tests/fixtures/api/example.svg");
     RsvgConvert::new()
@@ -356,7 +356,7 @@ fn multiple_input_files_create_multi_page_pdf_output() {
 #[cfg(system_deps_have_cairo_pdf)]
 #[test]
 fn multiple_input_files_create_multi_page_pdf_output_fixed_size() {
-    let one = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let one = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     let two = Path::new("tests/fixtures/dimensions/sub-rect-no-unit.svg");
     let three = Path::new("tests/fixtures/api/example.svg");
     RsvgConvert::new()
@@ -430,7 +430,7 @@ fn pdf_has_text() {
 #[cfg(system_deps_have_cairo_pdf)]
 #[test]
 fn env_source_data_epoch_controls_pdf_creation_date() {
-    let input = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let input = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     let date = 1581411039; // seconds since epoch
     RsvgConvert::new()
         .env("SOURCE_DATE_EPOCH", format!("{}", date))
@@ -445,7 +445,7 @@ fn env_source_data_epoch_controls_pdf_creation_date() {
 #[test]
 fn env_source_data_epoch_no_digits() {
     // intentionally not testing for the full error string here
-    let input = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let input = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     RsvgConvert::new()
         .env("SOURCE_DATE_EPOCH", "foobar")
         .arg("--format=pdf")
@@ -459,7 +459,7 @@ fn env_source_data_epoch_no_digits() {
 #[test]
 fn env_source_data_epoch_trailing_garbage() {
     // intentionally not testing for the full error string here
-    let input = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let input = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     RsvgConvert::new()
         .arg("--format=pdf")
         .env("SOURCE_DATE_EPOCH", "1234556+")
@@ -473,7 +473,7 @@ fn env_source_data_epoch_trailing_garbage() {
 #[test]
 fn env_source_data_epoch_empty() {
     // intentionally not testing for the full error string here
-    let input = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let input = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     RsvgConvert::new()
         .arg("--format=pdf")
         .env("SOURCE_DATE_EPOCH", "")
@@ -485,7 +485,7 @@ fn env_source_data_epoch_empty() {
 
 #[test]
 fn width_option() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--width=300")
         .assert()
         .success()
@@ -494,7 +494,7 @@ fn width_option() {
 
 #[test]
 fn height_option() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--height=200")
         .assert()
         .success()
@@ -503,7 +503,7 @@ fn height_option() {
 
 #[test]
 fn width_and_height_options() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--width=300")
         .arg("--height=200")
         .assert()
@@ -513,7 +513,7 @@ fn width_and_height_options() {
 
 #[test]
 fn unsupported_unit_in_width_and_height() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--height=200ex")
         .assert()
         .failure()
@@ -522,7 +522,7 @@ fn unsupported_unit_in_width_and_height() {
 
 #[test]
 fn invalid_length() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--page-width=foo")
         .assert()
         .failure()
@@ -531,7 +531,7 @@ fn invalid_length() {
 
 #[test]
 fn zoom_factor() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--zoom=0.8")
         .assert()
         .success()
@@ -540,7 +540,7 @@ fn zoom_factor() {
 
 #[test]
 fn zoom_factor_and_larger_size() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--width=400")
         .arg("--height=200")
         .arg("--zoom=1.5")
@@ -551,7 +551,7 @@ fn zoom_factor_and_larger_size() {
 
 #[test]
 fn zoom_factor_and_smaller_size() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--width=400")
         .arg("--height=200")
         .arg("--zoom=3.5")
@@ -562,7 +562,7 @@ fn zoom_factor_and_smaller_size() {
 
 #[test]
 fn x_zoom_option() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--x-zoom=2")
         .assert()
         .success()
@@ -571,7 +571,7 @@ fn x_zoom_option() {
 
 #[test]
 fn x_short_option() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("-x")
         .arg("2.0")
         .assert()
@@ -581,7 +581,7 @@ fn x_short_option() {
 
 #[test]
 fn y_zoom_option() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--y-zoom=2.0")
         .assert()
         .success()
@@ -590,7 +590,7 @@ fn y_zoom_option() {
 
 #[test]
 fn y_short_option() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("-y")
         .arg("2")
         .assert()
@@ -600,7 +600,7 @@ fn y_short_option() {
 
 #[test]
 fn huge_zoom_factor_yields_error() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--zoom=1000")
         .assert()
         .failure()
@@ -611,7 +611,7 @@ fn huge_zoom_factor_yields_error() {
 
 #[test]
 fn negative_zoom_factor_yields_error() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--zoom=-2")
         .assert()
         .failure()
@@ -620,7 +620,7 @@ fn negative_zoom_factor_yields_error() {
 
 #[test]
 fn invalid_zoom_factor_yields_error() {
-    RsvgConvert::new_with_input("tests/fixtures/dimensions/521-with-viewbox.svg")
+    RsvgConvert::new_with_input("tests/fixtures/dimensions/bug521-with-viewbox.svg")
         .arg("--zoom=foo")
         .assert()
         .failure()
@@ -779,7 +779,7 @@ fn pdf_page_size() {
 #[cfg(system_deps_have_cairo_pdf)]
 #[test]
 fn multiple_input_files_create_multi_page_pdf_size_override() {
-    let one = Path::new("tests/fixtures/dimensions/521-with-viewbox.svg");
+    let one = Path::new("tests/fixtures/dimensions/bug521-with-viewbox.svg");
     let two = Path::new("tests/fixtures/dimensions/sub-rect-no-unit.svg");
     let three = Path::new("tests/fixtures/api/example.svg");
     RsvgConvert::new()
@@ -820,7 +820,7 @@ fn missing_page_size_yields_error() {
 
 #[test]
 fn does_not_clip_partial_coverage_pixels() {
-    RsvgConvert::new_with_input("tests/fixtures/cmdline/677-partial-pixel.svg")
+    RsvgConvert::new_with_input("tests/fixtures/cmdline/bug677-partial-pixel.svg")
         .assert()
         .success()
         .stdout(file::is_png().with_size(2, 2));
@@ -908,13 +908,14 @@ fn export_id_with_zero_stroke_width() {
     // spanned the origin to the actual visible bounds of the rendered object.
     //
     // We can probably test this more cleanly once we have a render tree.
-    RsvgConvert::new_with_input("tests/fixtures/cmdline/601-zero-stroke-width.svg")
+    RsvgConvert::new_with_input("tests/fixtures/cmdline/bug601-zero-stroke-width.svg")
         .arg("--export-id=foo")
         .assert()
         .success()
         .stdout(
-            file::is_png()
-                .with_contents("tests/fixtures/cmdline/601-zero-stroke-width-render-only-foo.png"),
+            file::is_png().with_contents(
+                "tests/fixtures/cmdline/bug601-zero-stroke-width-render-only-foo.png",
+            ),
         );
 }
 
@@ -995,7 +996,7 @@ fn keep_aspect_ratio_short_option() {
 
 #[test]
 fn overflowing_size_is_detected() {
-    RsvgConvert::new_with_input("tests/fixtures/render-crash/591-vbox-overflow.svg")
+    RsvgConvert::new_with_input("tests/fixtures/render-crash/bug591-vbox-overflow.svg")
         .assert()
         .failure()
         .stderr(starts_with(
diff --git a/tests/src/errors.rs b/tests/src/errors.rs
index d98eeb67..5113d623 100644
--- a/tests/src/errors.rs
+++ b/tests/src/errors.rs
@@ -16,7 +16,7 @@ use librsvg::{CairoRenderer, ImplementationLimit, Loader, LoadingError, Renderin
 #[ignore]
 #[test]
 fn too_many_elements() {
-    let name = "tests/fixtures/errors/515-too-many-elements.svgz";
+    let name = "tests/fixtures/errors/bug515-too-many-elements.svgz";
 
     assert!(matches!(
         Loader::new().read_path(name),
@@ -49,11 +49,11 @@ fn rendering_instancing_limit(name: &str) {
 #[ignore]
 #[test]
 fn instancing_limit1() {
-    rendering_instancing_limit("tests/fixtures/errors/323-nested-use.svg");
+    rendering_instancing_limit("tests/fixtures/errors/bug323-nested-use.svg");
 }
 
 #[ignore]
 #[test]
 fn instancing_limit2() {
-    rendering_instancing_limit("tests/fixtures/errors/515-pattern-billion-laughs.svg");
+    rendering_instancing_limit("tests/fixtures/errors/bug515-pattern-billion-laughs.svg");
 }
diff --git a/tests/src/loading_crash.rs b/tests/src/loading_crash.rs
index e053e322..e23e1d10 100644
--- a/tests/src/loading_crash.rs
+++ b/tests/src/loading_crash.rs
@@ -3,13 +3,51 @@
 //! Ensures that loading and parsing (but not rendering) a particular
 //! SVG doesn't crash.
 
-#![cfg(test)]
-use test_generator::test_resources;
-
 use librsvg::Loader;
 
-#[test_resources("tests/fixtures/crash/*.svg")]
-fn loading_crash(path: &str) {
+use std::path::PathBuf;
+
+fn loading_crash(filename: &str) {
+    let mut full_filename = PathBuf::new();
+    full_filename.push("tests/fixtures/crash");
+    full_filename.push(filename);
+
     // We just test for crashes during loading, and don't care about success/error.
-    let _ = Loader::new().read_path(path);
+    let _ = Loader::new().read_path(&full_filename);
+}
+
+macro_rules! t {
+    ($test_name:ident, $filename:expr) => {
+        #[test]
+        fn $test_name() {
+            loading_crash($filename);
+        }
+    };
+}
+
+#[rustfmt::skip]
+mod tests {
+    use super::*;
+
+    t!(bug335_non_svg_toplevel_svg,                  "bug335-non-svg-toplevel.svg");
+    t!(bug336_invalid_css_svg,                       "bug336-invalid-css.svg");
+    t!(bug349_empty_data_uri_svg,                    "bug349-empty-data-uri.svg");
+    t!(bug349_too_big_image_in_href_data_svg,        "bug349-too-big-image-in-href-data.svg");
+    t!(bug352_feconvolvematrix_large_allocation_svg, "bug352-feConvolveMatrix-large-allocation.svg");
+    t!(bug377_xinclude_invalid_xml_svg,              "bug377-xinclude-invalid-xml.svg");
+    t!(bug463_characters_outside_first_element_svg,  "bug463-characters-outside-first-element.svg");
+    t!(bug467_xinclude_without_parent_element_svg,   "bug467-xinclude-without-parent-element.svg");
+    t!(bug524_invalid_stylesheet_href_svg,           "bug524-invalid-stylesheet-href.svg");
+    t!(bug620238_svg,                                "bug620238.svg");
+    t!(bug759084_svg,                                "bug759084.svg");
+    t!(bug785276_empty_svg,                          "bug785276-empty.svg");
+    t!(bug785276_short_file_svg,                     "bug785276-short-file.svg");
+    t!(bug800_font_inherit_svg,                      "bug800-font-inherit.svg");
+    t!(bug800_marker_svg,                            "bug800-marker.svg");
+    t!(feconvolvematrix_empty_kernel_svg,            "feConvolveMatrix-empty-kernel.svg");
+    t!(marker_cycles_svg,                            "marker-cycles.svg");
+    t!(mask_cycles_svg,                              "mask-cycles.svg");
+    t!(pattern_fallback_cycles_svg,                  "pattern-fallback-cycles.svg");
+    t!(xinclude_text_xml_svg,                        "xinclude-text-xml.svg");
+    t!(xml_pi_without_data_svg,                      "xml-pi-without-data.svg");
 }
diff --git a/tests/src/reference.rs b/tests/src/reference.rs
index 2a79efe3..90d5d0ab 100644
--- a/tests/src/reference.rs
+++ b/tests/src/reference.rs
@@ -6,20 +6,17 @@
 //! antialiasing artifacts, floating-point variations, and such.
 //!
 
-#![cfg(test)]
-use crate::test_compare_render_output;
-use test_generator::test_resources;
-
 use cairo;
 use librsvg::{
     surface_utils::shared_surface::{SharedImageSurface, SurfaceType},
     CairoRenderer, IntrinsicDimensions, Length, Loader,
 };
-use std::path::PathBuf;
 
 use crate::reference_utils::{Compare, Evaluate, Reference};
-use crate::test_svg_reference;
 use crate::utils::{load_svg, render_document, setup_font_map, setup_language, SurfaceSize};
+use crate::{test_compare_render_output, test_svg_reference};
+
+use std::path::{Path, PathBuf};
 
 // The original reference images from the SVG1.1 test suite are at 72 DPI.
 const TEST_SUITE_DPI: f64 = 72.0;
@@ -37,11 +34,10 @@ const TEST_SUITE_DPI: f64 = 72.0;
 // offset.
 const FRAME_SIZE: i32 = 47;
 
-fn reference_test(path: &str) {
+fn reference_test(path: &Path) {
     setup_language();
     setup_font_map();
 
-    let path = PathBuf::from(path);
     let path_base_name = path.file_stem().unwrap().to_string_lossy().to_owned();
     if path_base_name.starts_with("ignore") {
         return;
@@ -86,7 +82,7 @@ fn reference_test(path: &str) {
 }
 
 /// Turns `/foo/bar/baz.svg` into `/foo/bar/baz-ref.png`.
-fn reference_path(path: &PathBuf) -> PathBuf {
+fn reference_path(path: &Path) -> PathBuf {
     let basename = path.file_stem().unwrap();
 
     let mut reference_filename = basename.to_string_lossy().into_owned();
@@ -192,29 +188,753 @@ fn normalize(l: &Length, dpi: f64) -> f64 {
     }
 }
 
-#[test_resources("tests/fixtures/reftests/*.svg")]
-fn reftests(name: &str) {
-    reference_test(name);
-}
+fn reftest(filename: &str) {
+    let mut full_filename = PathBuf::new();
+    full_filename.push("tests/fixtures/reftests");
+    full_filename.push(filename);
 
-#[test_resources("tests/fixtures/reftests/adwaita/*.svg")]
-fn adwaita(name: &str) {
-    reference_test(name);
+    reference_test(&full_filename);
 }
 
-#[test_resources("tests/fixtures/reftests/bugs/*.svg")]
-fn bugs(name: &str) {
-    reference_test(name);
+macro_rules! t {
+    ($test_name:ident, $filename:expr) => {
+        #[test]
+        fn $test_name() {
+            reftest($filename);
+        }
+    };
 }
 
-#[test_resources("tests/fixtures/reftests/svg1.1/*.svg")]
-fn svg_1_1(name: &str) {
-    reference_test(name);
-}
+#[rustfmt::skip]
+mod tests {
+    use super::*;
 
-#[test_resources("tests/fixtures/reftests/svg2/*.svg")]
-fn svg_2(name: &str) {
-    reference_test(name);
+    t!(a_pseudo_class_svg,                                          "a-pseudo-class.svg");
+    t!(bug483_attribute_selectors_svg,                              "bug483-attribute-selectors.svg");
+    t!(bug525_specificity_svg,                                      "bug525-specificity.svg");
+    t!(css_import_svg,                                              "css-import.svg");
+    t!(css_import_url_svg,                                          "css-import-url.svg");
+    t!(duplicate_id_svg,                                            "duplicate-id.svg");
+    t!(filter_component_transfer_from_reference_page_svg,           "filter-component-transfer-from-reference-page.svg");
+    t!(filter_conv_bounds_svg,                                      "filter-conv-bounds.svg");
+    t!(filter_conv_divisor_svg,                                     "filter-conv-divisor.svg");
+    t!(filter_effects_region_svg,                                   "filter-effects-region.svg");
+    t!(filter_image_from_reference_page_svg,                        "filter-image-from-reference-page.svg");
+    t!(filter_kernel_unit_length_svg,                               "filter-kernel-unit-length.svg");
+    t!(filter_morphology_from_reference_page_svg,                   "filter-morphology-from-reference-page.svg");
+    t!(filter_offset_svg,                                           "filter-offset.svg");
+    t!(font_shorthand_svg,                                          "font-shorthand.svg");
+    t!(gzip_compressed_svg,                                         "gzip-compressed.svg");
+    t!(hexchat_svg,                                                 "hexchat.svg");
+    t!(ignore_filter_composite_color_interpolation_filters_svg,     "ignore-filter-composite-color-interpolation-filters.svg");
+    t!(include_compressed_svg,                                      "include-compressed.svg");
+    t!(include_fallback_svg,                                        "include-fallback.svg");
+    t!(include_text_svg,                                            "include-text.svg");
+    t!(rtl_tspan_svg,                                               "rtl-tspan.svg");
+    t!(specificity_svg,                                             "specificity.svg");
+    t!(structural_pseudo_classes_svg,                               "structural-pseudo-classes.svg");
+    t!(style_with_xml_comments_svg,                                 "style-with-xml-comments.svg");
+    t!(system_language_de_svg,                                      "system-language-de.svg");
+    t!(system_language_en_svg,                                      "system-language-en.svg");
+    t!(system_language_other_svg,                                   "system-language-other.svg");
+    t!(text_objectboundingbox_svg,                                  "text-objectBoundingBox.svg");
+    t!(xml_lang_css_inherit_svg,                                    "xml-lang-css-inherit.svg");
+    t!(xml_lang_css_svg,                                            "xml-lang-css.svg");
+    t!(adwaita_ac_adapter_symbolic_svg,                             "adwaita/ac-adapter-symbolic.svg");
+    t!(adwaita_accessories_calculator_symbolic_svg,                 "adwaita/accessories-calculator-symbolic.svg");
+    t!(adwaita_accessories_character_map_symbolic_svg,              "adwaita/accessories-character-map-symbolic.svg");
+    t!(adwaita_accessories_dictionary_symbolic_svg,                 "adwaita/accessories-dictionary-symbolic.svg");
+    t!(adwaita_accessories_text_editor_symbolic_svg,                "adwaita/accessories-text-editor-symbolic.svg");
+    t!(adwaita_action_unavailable_symbolic_svg,                     "adwaita/action-unavailable-symbolic.svg");
+    t!(adwaita_address_book_new_symbolic_svg,                       "adwaita/address-book-new-symbolic.svg");
+    t!(adwaita_airplane_mode_symbolic_svg,                          "adwaita/airplane-mode-symbolic.svg");
+    t!(adwaita_alarm_symbolic_svg,                                  "adwaita/alarm-symbolic.svg");
+    t!(adwaita_applets_screenshooter_symbolic_svg,                  "adwaita/applets-screenshooter-symbolic.svg");
+    t!(adwaita_application_certificate_symbolic_svg,                "adwaita/application-certificate-symbolic.svg");
+    t!(adwaita_application_exit_symbolic_svg,                       "adwaita/application-exit-symbolic.svg");
+    t!(adwaita_application_rss_xml_symbolic_svg,                    "adwaita/application-rss-xml-symbolic.svg");
+    t!(adwaita_applications_engineering_symbolic_svg,               "adwaita/applications-engineering-symbolic.svg");
+    t!(adwaita_applications_games_symbolic_svg,                     "adwaita/applications-games-symbolic.svg");
+    t!(adwaita_applications_graphics_symbolic_svg,                  "adwaita/applications-graphics-symbolic.svg");
+    t!(adwaita_applications_multimedia_symbolic_svg,                "adwaita/applications-multimedia-symbolic.svg");
+    t!(adwaita_applications_science_symbolic_svg,                   "adwaita/applications-science-symbolic.svg");
+    t!(adwaita_applications_system_symbolic_svg,                    "adwaita/applications-system-symbolic.svg");
+    t!(adwaita_applications_utilities_symbolic_svg,                 "adwaita/applications-utilities-symbolic.svg");
+    t!(adwaita_application_x_addon_symbolic_svg,                    "adwaita/application-x-addon-symbolic.svg");
+    t!(adwaita_application_x_appliance_symbolic_svg,                "adwaita/application-x-appliance-symbolic.svg");
+    t!(adwaita_application_x_executable_symbolic_svg,               "adwaita/application-x-executable-symbolic.svg");
+    t!(adwaita_application_x_firmware_symbolic_svg,                 "adwaita/application-x-firmware-symbolic.svg");
+    t!(adwaita_appointment_missed_symbolic_svg,                     "adwaita/appointment-missed-symbolic.svg");
+    t!(adwaita_appointment_new_symbolic_svg,                        "adwaita/appointment-new-symbolic.svg");
+    t!(adwaita_appointment_soon_symbolic_svg,                       "adwaita/appointment-soon-symbolic.svg");
+    t!(adwaita_audio_card_symbolic_svg,                             "adwaita/audio-card-symbolic.svg");
+    t!(adwaita_audio_headphones_symbolic_svg,                       "adwaita/audio-headphones-symbolic.svg");
+    t!(adwaita_audio_headset_symbolic_svg,                          "adwaita/audio-headset-symbolic.svg");
+    t!(adwaita_audio_input_microphone_symbolic_svg,                 "adwaita/audio-input-microphone-symbolic.svg");
+    t!(adwaita_audio_speakers_symbolic_svg,                         "adwaita/audio-speakers-symbolic.svg");
+    t!(adwaita_audio_volume_high_symbolic_svg,                      "adwaita/audio-volume-high-symbolic.svg");
+    t!(adwaita_audio_volume_low_symbolic_svg,                       "adwaita/audio-volume-low-symbolic.svg");
+    t!(adwaita_audio_volume_medium_symbolic_svg,                    "adwaita/audio-volume-medium-symbolic.svg");
+    t!(adwaita_audio_volume_muted_symbolic_svg,                     "adwaita/audio-volume-muted-symbolic.svg");
+    t!(adwaita_audio_volume_overamplified_symbolic_svg,             "adwaita/audio-volume-overamplified-symbolic.svg");
+    t!(adwaita_audio_x_generic_symbolic_svg,                        "adwaita/audio-x-generic-symbolic.svg");
+    t!(adwaita_auth_fingerprint_symbolic_svg,                       "adwaita/auth-fingerprint-symbolic.svg");
+    t!(adwaita_auth_smartcard_symbolic_svg,                         "adwaita/auth-smartcard-symbolic.svg");
+    t!(adwaita_avatar_default_symbolic_svg,                         "adwaita/avatar-default-symbolic.svg");
+    t!(adwaita_battery_caution_charging_symbolic_svg,               "adwaita/battery-caution-charging-symbolic.svg");
+    t!(adwaita_battery_caution_symbolic_svg,                        "adwaita/battery-caution-symbolic.svg");
+    t!(adwaita_battery_empty_charging_symbolic_svg,                 "adwaita/battery-empty-charging-symbolic.svg");
+    t!(adwaita_battery_empty_symbolic_svg,                          "adwaita/battery-empty-symbolic.svg");
+    t!(adwaita_battery_full_charged_symbolic_svg,                   "adwaita/battery-full-charged-symbolic.svg");
+    t!(adwaita_battery_full_charging_symbolic_svg,                  "adwaita/battery-full-charging-symbolic.svg");
+    t!(adwaita_battery_full_symbolic_svg,                           "adwaita/battery-full-symbolic.svg");
+    t!(adwaita_battery_good_charging_symbolic_svg,                  "adwaita/battery-good-charging-symbolic.svg");
+    t!(adwaita_battery_good_symbolic_svg,                           "adwaita/battery-good-symbolic.svg");
+    t!(adwaita_battery_low_charging_symbolic_svg,                   "adwaita/battery-low-charging-symbolic.svg");
+    t!(adwaita_battery_low_symbolic_svg,                            "adwaita/battery-low-symbolic.svg");
+    t!(adwaita_battery_missing_symbolic_svg,                        "adwaita/battery-missing-symbolic.svg");
+    t!(adwaita_battery_symbolic_svg,                                "adwaita/battery-symbolic.svg");
+    t!(adwaita_bluetooth_active_symbolic_svg,                       "adwaita/bluetooth-active-symbolic.svg");
+    t!(adwaita_bluetooth_disabled_symbolic_svg,                     "adwaita/bluetooth-disabled-symbolic.svg");
+    t!(adwaita_bluetooth_symbolic_svg,                              "adwaita/bluetooth-symbolic.svg");
+    t!(adwaita_bookmark_new_symbolic_svg,                           "adwaita/bookmark-new-symbolic.svg");
+    t!(adwaita_call_missed_symbolic_svg,                            "adwaita/call-missed-symbolic.svg");
+    t!(adwaita_call_start_symbolic_svg,                             "adwaita/call-start-symbolic.svg");
+    t!(adwaita_call_stop_symbolic_svg,                              "adwaita/call-stop-symbolic.svg");
+    t!(adwaita_camera_photo_symbolic_svg,                           "adwaita/camera-photo-symbolic.svg");
+    t!(adwaita_camera_switch_symbolic_svg,                          "adwaita/camera-switch-symbolic.svg");
+    t!(adwaita_camera_video_symbolic_svg,                           "adwaita/camera-video-symbolic.svg");
+    t!(adwaita_camera_web_symbolic_svg,                             "adwaita/camera-web-symbolic.svg");
+    t!(adwaita_changes_allow_symbolic_svg,                          "adwaita/changes-allow-symbolic.svg");
+    t!(adwaita_changes_prevent_symbolic_svg,                        "adwaita/changes-prevent-symbolic.svg");
+    t!(adwaita_channel_insecure_symbolic_svg,                       "adwaita/channel-insecure-symbolic.svg");
+    t!(adwaita_channel_secure_symbolic_svg,                         "adwaita/channel-secure-symbolic.svg");
+    t!(adwaita_checkbox_checked_symbolic_svg,                       "adwaita/checkbox-checked-symbolic.svg");
+    t!(adwaita_checkbox_mixed_symbolic_svg,                         "adwaita/checkbox-mixed-symbolic.svg");
+    t!(adwaita_checkbox_symbolic_svg,                               "adwaita/checkbox-symbolic.svg");
+    t!(adwaita_colorimeter_colorhug_symbolic_svg,                   "adwaita/colorimeter-colorhug-symbolic.svg");
+    t!(adwaita_color_select_symbolic_svg,                           "adwaita/color-select-symbolic.svg");
+    t!(adwaita_computer_apple_ipad_symbolic_svg,                    "adwaita/computer-apple-ipad-symbolic.svg");
+    t!(adwaita_computer_fail_symbolic_svg,                          "adwaita/computer-fail-symbolic.svg");
+    t!(adwaita_computer_symbolic_svg,                               "adwaita/computer-symbolic.svg");
+    t!(adwaita_contact_new_symbolic_svg,                            "adwaita/contact-new-symbolic.svg");
+    t!(adwaita_content_loading_symbolic_svg,                        "adwaita/content-loading-symbolic.svg");
+    t!(adwaita_daytime_sunrise_symbolic_svg,                        "adwaita/daytime-sunrise-symbolic.svg");
+    t!(adwaita_daytime_sunset_symbolic_svg,                         "adwaita/daytime-sunset-symbolic.svg");
+    t!(adwaita_dialog_error_symbolic_svg,                           "adwaita/dialog-error-symbolic.svg");
+    t!(adwaita_dialog_information_symbolic_svg,                     "adwaita/dialog-information-symbolic.svg");
+    t!(adwaita_dialog_password_symbolic_svg,                        "adwaita/dialog-password-symbolic.svg");
+    t!(adwaita_dialog_question_symbolic_svg,                        "adwaita/dialog-question-symbolic.svg");
+    t!(adwaita_dialog_warning_symbolic_svg,                         "adwaita/dialog-warning-symbolic.svg");
+    t!(adwaita_display_brightness_symbolic_svg,                     "adwaita/display-brightness-symbolic.svg");
+    t!(adwaita_display_projector_symbolic_svg,                      "adwaita/display-projector-symbolic.svg");
+    t!(adwaita_document_edit_symbolic_svg,                          "adwaita/document-edit-symbolic.svg");
+    t!(adwaita_document_new_symbolic_svg,                           "adwaita/document-new-symbolic.svg");
+    t!(adwaita_document_open_recent_symbolic_svg,                   "adwaita/document-open-recent-symbolic.svg");
+    t!(adwaita_document_open_symbolic_svg,                          "adwaita/document-open-symbolic.svg");
+    t!(adwaita_document_page_setup_symbolic_svg,                    "adwaita/document-page-setup-symbolic.svg");
+    t!(adwaita_document_print_preview_symbolic_svg,                 "adwaita/document-print-preview-symbolic.svg");
+    t!(adwaita_document_print_symbolic_svg,                         "adwaita/document-print-symbolic.svg");
+    t!(adwaita_document_properties_symbolic_svg,                    "adwaita/document-properties-symbolic.svg");
+    t!(adwaita_document_revert_symbolic_rtl_svg,                    "adwaita/document-revert-symbolic-rtl.svg");
+    t!(adwaita_document_revert_symbolic_svg,                        "adwaita/document-revert-symbolic.svg");
+    t!(adwaita_document_save_as_symbolic_svg,                       "adwaita/document-save-as-symbolic.svg");
+    t!(adwaita_document_save_symbolic_svg,                          "adwaita/document-save-symbolic.svg");
+    t!(adwaita_document_send_symbolic_svg,                          "adwaita/document-send-symbolic.svg");
+    t!(adwaita_drive_harddisk_ieee1394_symbolic_svg,                "adwaita/drive-harddisk-ieee1394-symbolic.svg");
+    t!(adwaita_drive_harddisk_solidstate_symbolic_svg,              "adwaita/drive-harddisk-solidstate-symbolic.svg");
+    t!(adwaita_drive_harddisk_symbolic_svg,                         "adwaita/drive-harddisk-symbolic.svg");
+    t!(adwaita_drive_harddisk_system_symbolic_svg,                  "adwaita/drive-harddisk-system-symbolic.svg");
+    t!(adwaita_drive_harddisk_usb_symbolic_svg,                     "adwaita/drive-harddisk-usb-symbolic.svg");
+    t!(adwaita_drive_multidisk_symbolic_svg,                        "adwaita/drive-multidisk-symbolic.svg");
+    t!(adwaita_drive_optical_symbolic_svg,                          "adwaita/drive-optical-symbolic.svg");
+    t!(adwaita_drive_removable_media_symbolic_svg,                  "adwaita/drive-removable-media-symbolic.svg");
+    t!(adwaita_edit_clear_all_symbolic_svg,                         "adwaita/edit-clear-all-symbolic.svg");
+    t!(adwaita_edit_clear_symbolic_rtl_svg,                         "adwaita/edit-clear-symbolic-rtl.svg");
+    t!(adwaita_edit_clear_symbolic_svg,                             "adwaita/edit-clear-symbolic.svg");
+    t!(adwaita_edit_copy_symbolic_svg,                              "adwaita/edit-copy-symbolic.svg");
+    t!(adwaita_edit_cut_symbolic_svg,                               "adwaita/edit-cut-symbolic.svg");
+    t!(adwaita_edit_delete_symbolic_svg,                            "adwaita/edit-delete-symbolic.svg");
+    t!(adwaita_edit_find_replace_symbolic_svg,                      "adwaita/edit-find-replace-symbolic.svg");
+    t!(adwaita_edit_find_symbolic_svg,                              "adwaita/edit-find-symbolic.svg");
+    t!(adwaita_edit_paste_symbolic_svg,                             "adwaita/edit-paste-symbolic.svg");
+    t!(adwaita_edit_redo_symbolic_rtl_svg,                          "adwaita/edit-redo-symbolic-rtl.svg");
+    t!(adwaita_edit_redo_symbolic_svg,                              "adwaita/edit-redo-symbolic.svg");
+    t!(adwaita_edit_select_all_symbolic_svg,                        "adwaita/edit-select-all-symbolic.svg");
+    t!(adwaita_edit_select_symbolic_svg,                            "adwaita/edit-select-symbolic.svg");
+    t!(adwaita_edit_undo_symbolic_rtl_svg,                          "adwaita/edit-undo-symbolic-rtl.svg");
+    t!(adwaita_edit_undo_symbolic_svg,                              "adwaita/edit-undo-symbolic.svg");
+    t!(adwaita_emblem_default_symbolic_svg,                         "adwaita/emblem-default-symbolic.svg");
+    t!(adwaita_emblem_documents_symbolic_svg,                       "adwaita/emblem-documents-symbolic.svg");
+    t!(adwaita_emblem_favorite_symbolic_svg,                        "adwaita/emblem-favorite-symbolic.svg");
+    t!(adwaita_emblem_important_symbolic_svg,                       "adwaita/emblem-important-symbolic.svg");
+    t!(adwaita_emblem_music_symbolic_svg,                           "adwaita/emblem-music-symbolic.svg");
+    t!(adwaita_emblem_ok_symbolic_svg,                              "adwaita/emblem-ok-symbolic.svg");
+    t!(adwaita_emblem_photos_symbolic_svg,                          "adwaita/emblem-photos-symbolic.svg");
+    t!(adwaita_emblem_shared_symbolic_svg,                          "adwaita/emblem-shared-symbolic.svg");
+    t!(adwaita_emblem_synchronizing_symbolic_svg,                   "adwaita/emblem-synchronizing-symbolic.svg");
+    t!(adwaita_emblem_system_symbolic_svg,                          "adwaita/emblem-system-symbolic.svg");
+    t!(adwaita_emblem_videos_symbolic_svg,                          "adwaita/emblem-videos-symbolic.svg");
+    t!(adwaita_emoji_activities_symbolic_svg,                       "adwaita/emoji-activities-symbolic.svg");
+    t!(adwaita_emoji_body_symbolic_svg,                             "adwaita/emoji-body-symbolic.svg");
+    t!(adwaita_emoji_flags_symbolic_svg,                            "adwaita/emoji-flags-symbolic.svg");
+    t!(adwaita_emoji_food_symbolic_svg,                             "adwaita/emoji-food-symbolic.svg");
+    t!(adwaita_emoji_nature_symbolic_svg,                           "adwaita/emoji-nature-symbolic.svg");
+    t!(adwaita_emoji_objects_symbolic_svg,                          "adwaita/emoji-objects-symbolic.svg");
+    t!(adwaita_emoji_people_symbolic_svg,                           "adwaita/emoji-people-symbolic.svg");
+    t!(adwaita_emoji_recent_symbolic_svg,                           "adwaita/emoji-recent-symbolic.svg");
+    t!(adwaita_emoji_symbols_symbolic_svg,                          "adwaita/emoji-symbols-symbolic.svg");
+    t!(adwaita_emoji_travel_symbolic_svg,                           "adwaita/emoji-travel-symbolic.svg");
+    t!(adwaita_emote_love_symbolic_svg,                             "adwaita/emote-love-symbolic.svg");
+    t!(adwaita_error_correct_symbolic_svg,                          "adwaita/error-correct-symbolic.svg");
+    t!(adwaita_face_angel_symbolic_svg,                             "adwaita/face-angel-symbolic.svg");
+    t!(adwaita_face_angry_symbolic_svg,                             "adwaita/face-angry-symbolic.svg");
+    t!(adwaita_face_confused_symbolic_svg,                          "adwaita/face-confused-symbolic.svg");
+    t!(adwaita_face_cool_symbolic_svg,                              "adwaita/face-cool-symbolic.svg");
+    t!(adwaita_face_crying_symbolic_svg,                            "adwaita/face-crying-symbolic.svg");
+    t!(adwaita_face_devilish_symbolic_svg,                          "adwaita/face-devilish-symbolic.svg");
+    t!(adwaita_face_embarrassed_symbolic_svg,                       "adwaita/face-embarrassed-symbolic.svg");
+    t!(adwaita_face_glasses_symbolic_svg,                           "adwaita/face-glasses-symbolic.svg");
+    t!(adwaita_face_kiss_symbolic_svg,                              "adwaita/face-kiss-symbolic.svg");
+    t!(adwaita_face_laugh_symbolic_svg,                             "adwaita/face-laugh-symbolic.svg");
+    t!(adwaita_face_monkey_symbolic_svg,                            "adwaita/face-monkey-symbolic.svg");
+    t!(adwaita_face_plain_symbolic_svg,                             "adwaita/face-plain-symbolic.svg");
+    t!(adwaita_face_raspberry_symbolic_svg,                         "adwaita/face-raspberry-symbolic.svg");
+    t!(adwaita_face_sad_symbolic_svg,                               "adwaita/face-sad-symbolic.svg");
+    t!(adwaita_face_shutmouth_symbolic_svg,                         "adwaita/face-shutmouth-symbolic.svg");
+    t!(adwaita_face_sick_symbolic_svg,                              "adwaita/face-sick-symbolic.svg");
+    t!(adwaita_face_smile_big_symbolic_svg,                         "adwaita/face-smile-big-symbolic.svg");
+    t!(adwaita_face_smile_symbolic_svg,                             "adwaita/face-smile-symbolic.svg");
+    t!(adwaita_face_smirk_symbolic_svg,                             "adwaita/face-smirk-symbolic.svg");
+    t!(adwaita_face_surprise_symbolic_svg,                          "adwaita/face-surprise-symbolic.svg");
+    t!(adwaita_face_tired_symbolic_svg,                             "adwaita/face-tired-symbolic.svg");
+    t!(adwaita_face_uncertain_symbolic_svg,                         "adwaita/face-uncertain-symbolic.svg");
+    t!(adwaita_face_wink_symbolic_svg,                              "adwaita/face-wink-symbolic.svg");
+    t!(adwaita_face_worried_symbolic_svg,                           "adwaita/face-worried-symbolic.svg");
+    t!(adwaita_face_yawn_symbolic_svg,                              "adwaita/face-yawn-symbolic.svg");
+    t!(adwaita_find_location_symbolic_svg,                          "adwaita/find-location-symbolic.svg");
+    t!(adwaita_focus_legacy_systray_symbolic_svg,                   "adwaita/focus-legacy-systray-symbolic.svg");
+    t!(adwaita_focus_top_bar_symbolic_svg,                          "adwaita/focus-top-bar-symbolic.svg");
+    t!(adwaita_focus_windows_symbolic_svg,                          "adwaita/focus-windows-symbolic.svg");
+    t!(adwaita_folder_documents_symbolic_svg,                       "adwaita/folder-documents-symbolic.svg");
+    t!(adwaita_folder_download_symbolic_svg,                        "adwaita/folder-download-symbolic.svg");
+    t!(adwaita_folder_drag_accept_symbolic_svg,                     "adwaita/folder-drag-accept-symbolic.svg");
+    t!(adwaita_folder_music_symbolic_svg,                           "adwaita/folder-music-symbolic.svg");
+    t!(adwaita_folder_new_symbolic_svg,                             "adwaita/folder-new-symbolic.svg");
+    t!(adwaita_folder_open_symbolic_svg,                            "adwaita/folder-open-symbolic.svg");
+    t!(adwaita_folder_pictures_symbolic_svg,                        "adwaita/folder-pictures-symbolic.svg");
+    t!(adwaita_folder_publicshare_symbolic_svg,                     "adwaita/folder-publicshare-symbolic.svg");
+    t!(adwaita_folder_remote_symbolic_svg,                          "adwaita/folder-remote-symbolic.svg");
+    t!(adwaita_folder_saved_search_symbolic_svg,                    "adwaita/folder-saved-search-symbolic.svg");
+    t!(adwaita_folder_symbolic_svg,                                 "adwaita/folder-symbolic.svg");
+    t!(adwaita_folder_templates_symbolic_svg,                       "adwaita/folder-templates-symbolic.svg");
+    t!(adwaita_folder_videos_symbolic_svg,                          "adwaita/folder-videos-symbolic.svg");
+    t!(adwaita_folder_visiting_symbolic_svg,                        "adwaita/folder-visiting-symbolic.svg");
+    t!(adwaita_font_select_symbolic_svg,                            "adwaita/font-select-symbolic.svg");
+    t!(adwaita_font_x_generic_symbolic_svg,                         "adwaita/font-x-generic-symbolic.svg");
+    t!(adwaita_format_indent_less_symbolic_rtl_svg,                 "adwaita/format-indent-less-symbolic-rtl.svg");
+    t!(adwaita_format_indent_less_symbolic_svg,                     "adwaita/format-indent-less-symbolic.svg");
+    t!(adwaita_format_indent_more_symbolic_rtl_svg,                 "adwaita/format-indent-more-symbolic-rtl.svg");
+    t!(adwaita_format_indent_more_symbolic_svg,                     "adwaita/format-indent-more-symbolic.svg");
+    t!(adwaita_format_justify_center_symbolic_svg,                  "adwaita/format-justify-center-symbolic.svg");
+    t!(adwaita_format_justify_fill_symbolic_svg,                    "adwaita/format-justify-fill-symbolic.svg");
+    t!(adwaita_format_justify_left_symbolic_svg,                    "adwaita/format-justify-left-symbolic.svg");
+    t!(adwaita_format_justify_right_symbolic_svg,                   "adwaita/format-justify-right-symbolic.svg");
+    t!(adwaita_format_text_bold_symbolic_svg,                       "adwaita/format-text-bold-symbolic.svg");
+    t!(adwaita_format_text_direction_symbolic_rtl_svg,              "adwaita/format-text-direction-symbolic-rtl.svg");
+    t!(adwaita_format_text_direction_symbolic_svg,                  "adwaita/format-text-direction-symbolic.svg");
+    t!(adwaita_format_text_italic_symbolic_svg,                     "adwaita/format-text-italic-symbolic.svg");
+    t!(adwaita_format_text_strikethrough_symbolic_svg,              "adwaita/format-text-strikethrough-symbolic.svg");
+    t!(adwaita_format_text_underline_symbolic_svg,                  "adwaita/format-text-underline-symbolic.svg");
+    t!(adwaita_gnome_power_manager_symbolic_svg,                    "adwaita/gnome-power-manager-symbolic.svg");
+    t!(adwaita_goa_panel_symbolic_svg,                              "adwaita/goa-panel-symbolic.svg");
+    t!(adwaita_go_bottom_symbolic_svg,                              "adwaita/go-bottom-symbolic.svg");
+    t!(adwaita_go_down_symbolic_svg,                                "adwaita/go-down-symbolic.svg");
+    t!(adwaita_go_first_symbolic_rtl_svg,                           "adwaita/go-first-symbolic-rtl.svg");
+    t!(adwaita_go_first_symbolic_svg,                               "adwaita/go-first-symbolic.svg");
+    t!(adwaita_go_home_symbolic_svg,                                "adwaita/go-home-symbolic.svg");
+    t!(adwaita_go_jump_symbolic_svg,                                "adwaita/go-jump-symbolic.svg");
+    t!(adwaita_go_last_symbolic_rtl_svg,                            "adwaita/go-last-symbolic-rtl.svg");
+    t!(adwaita_go_last_symbolic_svg,                                "adwaita/go-last-symbolic.svg");
+    t!(adwaita_go_next_symbolic_rtl_svg,                            "adwaita/go-next-symbolic-rtl.svg");
+    t!(adwaita_go_next_symbolic_svg,                                "adwaita/go-next-symbolic.svg");
+    t!(adwaita_go_previous_symbolic_rtl_svg,                        "adwaita/go-previous-symbolic-rtl.svg");
+    t!(adwaita_go_previous_symbolic_svg,                            "adwaita/go-previous-symbolic.svg");
+    t!(adwaita_go_top_symbolic_svg,                                 "adwaita/go-top-symbolic.svg");
+    t!(adwaita_go_up_symbolic_svg,                                  "adwaita/go-up-symbolic.svg");
+    t!(adwaita_help_about_symbolic_svg,                             "adwaita/help-about-symbolic.svg");
+    t!(adwaita_help_browser_symbolic_svg,                           "adwaita/help-browser-symbolic.svg");
+    t!(adwaita_help_contents_symbolic_svg,                          "adwaita/help-contents-symbolic.svg");
+    t!(adwaita_help_faq_symbolic_svg,                               "adwaita/help-faq-symbolic.svg");
+    t!(adwaita_image_loading_symbolic_svg,                          "adwaita/image-loading-symbolic.svg");
+    t!(adwaita_image_x_generic_symbolic_svg,                        "adwaita/image-x-generic-symbolic.svg");
+    t!(adwaita_inode_directory_symbolic_svg,                        "adwaita/inode-directory-symbolic.svg");
+    t!(adwaita_input_dialpad_symbolic_svg,                          "adwaita/input-dialpad-symbolic.svg");
+    t!(adwaita_input_gaming_symbolic_svg,                           "adwaita/input-gaming-symbolic.svg");
+    t!(adwaita_input_keyboard_symbolic_svg,                         "adwaita/input-keyboard-symbolic.svg");
+    t!(adwaita_input_mouse_symbolic_svg,                            "adwaita/input-mouse-symbolic.svg");
+    t!(adwaita_input_tablet_symbolic_svg,                           "adwaita/input-tablet-symbolic.svg");
+    t!(adwaita_input_touchpad_symbolic_svg,                         "adwaita/input-touchpad-symbolic.svg");
+    t!(adwaita_insert_image_symbolic_svg,                           "adwaita/insert-image-symbolic.svg");
+    t!(adwaita_insert_link_symbolic_svg,                            "adwaita/insert-link-symbolic.svg");
+    t!(adwaita_insert_object_symbolic_svg,                          "adwaita/insert-object-symbolic.svg");
+    t!(adwaita_insert_text_symbolic_svg,                            "adwaita/insert-text-symbolic.svg");
+    t!(adwaita_keyboard_brightness_symbolic_svg,                    "adwaita/keyboard-brightness-symbolic.svg");
+    t!(adwaita_list_add_symbolic_svg,                               "adwaita/list-add-symbolic.svg");
+    t!(adwaita_list_remove_all_symbolic_svg,                        "adwaita/list-remove-all-symbolic.svg");
+    t!(adwaita_list_remove_symbolic_svg,                            "adwaita/list-remove-symbolic.svg");
+    t!(adwaita_mail_attachment_symbolic_svg,                        "adwaita/mail-attachment-symbolic.svg");
+    t!(adwaita_mail_mark_important_symbolic_svg,                    "adwaita/mail-mark-important-symbolic.svg");
+    t!(adwaita_mail_read_symbolic_svg,                              "adwaita/mail-read-symbolic.svg");
+    t!(adwaita_mail_replied_symbolic_svg,                           "adwaita/mail-replied-symbolic.svg");
+    t!(adwaita_mail_send_receive_symbolic_svg,                      "adwaita/mail-send-receive-symbolic.svg");
+    t!(adwaita_mail_send_symbolic_svg,                              "adwaita/mail-send-symbolic.svg");
+    t!(adwaita_mail_unread_symbolic_svg,                            "adwaita/mail-unread-symbolic.svg");
+    t!(adwaita_mark_location_symbolic_svg,                          "adwaita/mark-location-symbolic.svg");
+    t!(adwaita_media_eject_symbolic_svg,                            "adwaita/media-eject-symbolic.svg");
+    t!(adwaita_media_flash_symbolic_svg,                            "adwaita/media-flash-symbolic.svg");
+    t!(adwaita_media_floppy_symbolic_svg,                           "adwaita/media-floppy-symbolic.svg");
+    t!(adwaita_media_optical_bd_symbolic_svg,                       "adwaita/media-optical-bd-symbolic.svg");
+    t!(adwaita_media_optical_cd_audio_symbolic_svg,                 "adwaita/media-optical-cd-audio-symbolic.svg");
+    t!(adwaita_media_optical_dvd_symbolic_svg,                      "adwaita/media-optical-dvd-symbolic.svg");
+    t!(adwaita_media_optical_symbolic_svg,                          "adwaita/media-optical-symbolic.svg");
+    t!(adwaita_media_playback_pause_symbolic_svg,                   "adwaita/media-playback-pause-symbolic.svg");
+    t!(adwaita_media_playback_start_symbolic_rtl_svg,               "adwaita/media-playback-start-symbolic-rtl.svg");
+    t!(adwaita_media_playback_start_symbolic_svg,                   "adwaita/media-playback-start-symbolic.svg");
+    t!(adwaita_media_playback_stop_symbolic_svg,                    "adwaita/media-playback-stop-symbolic.svg");
+    t!(adwaita_media_playlist_consecutive_symbolic_rtl_svg,         "adwaita/media-playlist-consecutive-symbolic-rtl.svg");
+    t!(adwaita_media_playlist_consecutive_symbolic_svg,             "adwaita/media-playlist-consecutive-symbolic.svg");
+    t!(adwaita_media_playlist_repeat_song_symbolic_rtl_svg,         "adwaita/media-playlist-repeat-song-symbolic-rtl.svg");
+    t!(adwaita_media_playlist_repeat_song_symbolic_svg,             "adwaita/media-playlist-repeat-song-symbolic.svg");
+    t!(adwaita_media_playlist_repeat_symbolic_rtl_svg,              "adwaita/media-playlist-repeat-symbolic-rtl.svg");
+    t!(adwaita_media_playlist_repeat_symbolic_svg,                  "adwaita/media-playlist-repeat-symbolic.svg");
+    t!(adwaita_media_playlist_shuffle_symbolic_rtl_svg,             "adwaita/media-playlist-shuffle-symbolic-rtl.svg");
+    t!(adwaita_media_playlist_shuffle_symbolic_svg,                 "adwaita/media-playlist-shuffle-symbolic.svg");
+    t!(adwaita_media_record_symbolic_svg,                           "adwaita/media-record-symbolic.svg");
+    t!(adwaita_media_removable_symbolic_svg,                        "adwaita/media-removable-symbolic.svg");
+    t!(adwaita_media_seek_backward_symbolic_rtl_svg,                "adwaita/media-seek-backward-symbolic-rtl.svg");
+    t!(adwaita_media_seek_backward_symbolic_svg,                    "adwaita/media-seek-backward-symbolic.svg");
+    t!(adwaita_media_seek_forward_symbolic_rtl_svg,                 "adwaita/media-seek-forward-symbolic-rtl.svg");
+    t!(adwaita_media_seek_forward_symbolic_svg,                     "adwaita/media-seek-forward-symbolic.svg");
+    t!(adwaita_media_skip_backward_symbolic_rtl_svg,                "adwaita/media-skip-backward-symbolic-rtl.svg");
+    t!(adwaita_media_skip_backward_symbolic_svg,                    "adwaita/media-skip-backward-symbolic.svg");
+    t!(adwaita_media_skip_forward_symbolic_rtl_svg,                 "adwaita/media-skip-forward-symbolic-rtl.svg");
+    t!(adwaita_media_skip_forward_symbolic_svg,                     "adwaita/media-skip-forward-symbolic.svg");
+    t!(adwaita_media_tape_symbolic_svg,                             "adwaita/media-tape-symbolic.svg");
+    t!(adwaita_media_view_subtitles_symbolic_svg,                   "adwaita/media-view-subtitles-symbolic.svg");
+    t!(adwaita_media_zip_symbolic_svg,                              "adwaita/media-zip-symbolic.svg");
+    t!(adwaita_microphone_sensitivity_high_symbolic_svg,            "adwaita/microphone-sensitivity-high-symbolic.svg");
+    t!(adwaita_microphone_sensitivity_low_symbolic_svg,             "adwaita/microphone-sensitivity-low-symbolic.svg");
+    t!(adwaita_microphone_sensitivity_medium_symbolic_svg,          "adwaita/microphone-sensitivity-medium-symbolic.svg");
+    t!(adwaita_microphone_sensitivity_muted_symbolic_svg,           "adwaita/microphone-sensitivity-muted-symbolic.svg");
+    t!(adwaita_modem_symbolic_svg,                                  "adwaita/modem-symbolic.svg");
+    t!(adwaita_multimedia_player_apple_ipod_touch_symbolic_svg,     "adwaita/multimedia-player-apple-ipod-touch-symbolic.svg");
+    t!(adwaita_multimedia_player_symbolic_svg,                      "adwaita/multimedia-player-symbolic.svg");
+    t!(adwaita_multimedia_volume_control_symbolic_svg,              "adwaita/multimedia-volume-control-symbolic.svg");
+    t!(adwaita_network_cellular_3g_symbolic_svg,                    "adwaita/network-cellular-3g-symbolic.svg");
+    t!(adwaita_network_cellular_4g_symbolic_svg,                    "adwaita/network-cellular-4g-symbolic.svg");
+    t!(adwaita_network_cellular_acquiring_symbolic_svg,             "adwaita/network-cellular-acquiring-symbolic.svg");
+    t!(adwaita_network_cellular_connected_symbolic_svg,             "adwaita/network-cellular-connected-symbolic.svg");
+    t!(adwaita_network_cellular_edge_symbolic_svg,                  "adwaita/network-cellular-edge-symbolic.svg");
+    t!(adwaita_network_cellular_gprs_symbolic_svg,                  "adwaita/network-cellular-gprs-symbolic.svg");
+    t!(adwaita_network_cellular_hspa_symbolic_svg,                  "adwaita/network-cellular-hspa-symbolic.svg");
+    t!(adwaita_network_cellular_no_route_symbolic_svg,              "adwaita/network-cellular-no-route-symbolic.svg");
+    t!(adwaita_network_cellular_offline_symbolic_svg,               "adwaita/network-cellular-offline-symbolic.svg");
+    t!(adwaita_network_cellular_signal_excellent_symbolic_svg,      "adwaita/network-cellular-signal-excellent-symbolic.svg");
+    t!(adwaita_network_cellular_signal_good_symbolic_svg,           "adwaita/network-cellular-signal-good-symbolic.svg");
+    t!(adwaita_network_cellular_signal_none_symbolic_svg,           "adwaita/network-cellular-signal-none-symbolic.svg");
+    t!(adwaita_network_cellular_signal_ok_symbolic_svg,             "adwaita/network-cellular-signal-ok-symbolic.svg");
+    t!(adwaita_network_cellular_signal_weak_symbolic_svg,           "adwaita/network-cellular-signal-weak-symbolic.svg");
+    t!(adwaita_network_error_symbolic_svg,                          "adwaita/network-error-symbolic.svg");
+    t!(adwaita_network_idle_symbolic_svg,                           "adwaita/network-idle-symbolic.svg");
+    t!(adwaita_network_no_route_symbolic_svg,                       "adwaita/network-no-route-symbolic.svg");
+    t!(adwaita_network_offline_symbolic_svg,                        "adwaita/network-offline-symbolic.svg");
+    t!(adwaita_network_receive_symbolic_svg,                        "adwaita/network-receive-symbolic.svg");
+    t!(adwaita_network_server_symbolic_svg,                         "adwaita/network-server-symbolic.svg");
+    t!(adwaita_network_transmit_receive_symbolic_svg,               "adwaita/network-transmit-receive-symbolic.svg");
+    t!(adwaita_network_transmit_symbolic_svg,                       "adwaita/network-transmit-symbolic.svg");
+    t!(adwaita_network_vpn_acquiring_symbolic_svg,                  "adwaita/network-vpn-acquiring-symbolic.svg");
+    t!(adwaita_network_vpn_no_route_symbolic_svg,                   "adwaita/network-vpn-no-route-symbolic.svg");
+    t!(adwaita_network_vpn_symbolic_svg,                            "adwaita/network-vpn-symbolic.svg");
+    t!(adwaita_network_wired_acquiring_symbolic_svg,                "adwaita/network-wired-acquiring-symbolic.svg");
+    t!(adwaita_network_wired_disconnected_symbolic_svg,             "adwaita/network-wired-disconnected-symbolic.svg");
+    t!(adwaita_network_wired_no_route_symbolic_svg,                 "adwaita/network-wired-no-route-symbolic.svg");
+    t!(adwaita_network_wired_offline_symbolic_svg,                  "adwaita/network-wired-offline-symbolic.svg");
+    t!(adwaita_network_wired_symbolic_svg,                          "adwaita/network-wired-symbolic.svg");
+    t!(adwaita_network_wireless_acquiring_symbolic_svg,             "adwaita/network-wireless-acquiring-symbolic.svg");
+    t!(adwaita_network_wireless_connected_symbolic_svg,             "adwaita/network-wireless-connected-symbolic.svg");
+    t!(adwaita_network_wireless_encrypted_symbolic_svg,             "adwaita/network-wireless-encrypted-symbolic.svg");
+    t!(adwaita_network_wireless_hotspot_symbolic_svg,               "adwaita/network-wireless-hotspot-symbolic.svg");
+    t!(adwaita_network_wireless_no_route_symbolic_svg,              "adwaita/network-wireless-no-route-symbolic.svg");
+    t!(adwaita_network_wireless_offline_symbolic_svg,               "adwaita/network-wireless-offline-symbolic.svg");
+    t!(adwaita_network_wireless_signal_excellent_symbolic_svg,      "adwaita/network-wireless-signal-excellent-symbolic.svg");
+    t!(adwaita_network_wireless_signal_good_symbolic_svg,           "adwaita/network-wireless-signal-good-symbolic.svg");
+    t!(adwaita_network_wireless_signal_none_symbolic_svg,           "adwaita/network-wireless-signal-none-symbolic.svg");
+    t!(adwaita_network_wireless_signal_ok_symbolic_svg,             "adwaita/network-wireless-signal-ok-symbolic.svg");
+    t!(adwaita_network_wireless_signal_weak_symbolic_svg,           "adwaita/network-wireless-signal-weak-symbolic.svg");
+    t!(adwaita_network_wireless_symbolic_svg,                       "adwaita/network-wireless-symbolic.svg");
+    t!(adwaita_network_workgroup_symbolic_svg,                      "adwaita/network-workgroup-symbolic.svg");
+    t!(adwaita_night_light_symbolic_svg,                            "adwaita/night-light-symbolic.svg");
+    t!(adwaita_non_starred_symbolic_svg,                            "adwaita/non-starred-symbolic.svg");
+    t!(adwaita_object_flip_horizontal_symbolic_svg,                 "adwaita/object-flip-horizontal-symbolic.svg");
+    t!(adwaita_object_flip_vertical_symbolic_svg,                   "adwaita/object-flip-vertical-symbolic.svg");
+    t!(adwaita_object_rotate_left_symbolic_svg,                     "adwaita/object-rotate-left-symbolic.svg");
+    t!(adwaita_object_rotate_right_symbolic_svg,                    "adwaita/object-rotate-right-symbolic.svg");
+    t!(adwaita_object_select_symbolic_svg,                          "adwaita/object-select-symbolic.svg");
+    t!(adwaita_open_menu_symbolic_svg,                              "adwaita/open-menu-symbolic.svg");
+    t!(adwaita_orientation_landscape_inverse_symbolic_svg,          "adwaita/orientation-landscape-inverse-symbolic.svg");
+    t!(adwaita_orientation_landscape_symbolic_svg,                  "adwaita/orientation-landscape-symbolic.svg");
+    t!(adwaita_orientation_portrait_inverse_symbolic_svg,           "adwaita/orientation-portrait-inverse-symbolic.svg");
+    t!(adwaita_orientation_portrait_symbolic_svg,                   "adwaita/orientation-portrait-symbolic.svg");
+    t!(adwaita_package_x_generic_symbolic_svg,                      "adwaita/package-x-generic-symbolic.svg");
+    t!(adwaita_pan_down_symbolic_svg,                               "adwaita/pan-down-symbolic.svg");
+    t!(adwaita_pan_end_symbolic_rtl_svg,                            "adwaita/pan-end-symbolic-rtl.svg");
+    t!(adwaita_pan_end_symbolic_svg,                                "adwaita/pan-end-symbolic.svg");
+    t!(adwaita_pan_start_symbolic_rtl_svg,                          "adwaita/pan-start-symbolic-rtl.svg");
+    t!(adwaita_pan_start_symbolic_svg,                              "adwaita/pan-start-symbolic.svg");
+    t!(adwaita_pan_up_symbolic_svg,                                 "adwaita/pan-up-symbolic.svg");
+    t!(adwaita_pda_symbolic_svg,                                    "adwaita/pda-symbolic.svg");
+    t!(adwaita_phone_apple_iphone_symbolic_svg,                     "adwaita/phone-apple-iphone-symbolic.svg");
+    t!(adwaita_phone_symbolic_svg,                                  "adwaita/phone-symbolic.svg");
+    t!(adwaita_preferences_color_symbolic_svg,                      "adwaita/preferences-color-symbolic.svg");
+    t!(adwaita_preferences_desktop_accessibility_symbolic_svg,      "adwaita/preferences-desktop-accessibility-symbolic.svg");
+    t!(adwaita_preferences_desktop_display_symbolic_svg,            "adwaita/preferences-desktop-display-symbolic.svg");
+    t!(adwaita_preferences_desktop_font_symbolic_svg,               "adwaita/preferences-desktop-font-symbolic.svg");
+    t!(adwaita_preferences_desktop_keyboard_shortcuts_symbolic_svg, "adwaita/preferences-desktop-keyboard-shortcuts-symbolic.svg");
+    t!(adwaita_preferences_desktop_keyboard_symbolic_svg,           "adwaita/preferences-desktop-keyboard-symbolic.svg");
+    t!(adwaita_preferences_desktop_locale_symbolic_svg,             "adwaita/preferences-desktop-locale-symbolic.svg");
+    t!(adwaita_preferences_desktop_remote_desktop_symbolic_svg,     "adwaita/preferences-desktop-remote-desktop-symbolic.svg");
+    t!(adwaita_preferences_desktop_screensaver_symbolic_svg,        "adwaita/preferences-desktop-screensaver-symbolic.svg");
+    t!(adwaita_preferences_desktop_wallpaper_symbolic_svg,          "adwaita/preferences-desktop-wallpaper-symbolic.svg");
+    t!(adwaita_preferences_other_symbolic_svg,                      "adwaita/preferences-other-symbolic.svg");
+    t!(adwaita_preferences_system_details_symbolic_svg,             "adwaita/preferences-system-details-symbolic.svg");
+    t!(adwaita_preferences_system_devices_symbolic_svg,             "adwaita/preferences-system-devices-symbolic.svg");
+    t!(adwaita_preferences_system_network_proxy_symbolic_svg,       "adwaita/preferences-system-network-proxy-symbolic.svg");
+    t!(adwaita_preferences_system_network_symbolic_svg,             "adwaita/preferences-system-network-symbolic.svg");
+    t!(adwaita_preferences_system_notifications_symbolic_svg,       "adwaita/preferences-system-notifications-symbolic.svg");
+    t!(adwaita_preferences_system_privacy_symbolic_svg,             "adwaita/preferences-system-privacy-symbolic.svg");
+    t!(adwaita_preferences_system_search_symbolic_svg,              "adwaita/preferences-system-search-symbolic.svg");
+    t!(adwaita_preferences_system_sharing_symbolic_svg,             "adwaita/preferences-system-sharing-symbolic.svg");
+    t!(adwaita_preferences_system_symbolic_svg,                     "adwaita/preferences-system-symbolic.svg");
+    t!(adwaita_preferences_system_time_symbolic_svg,                "adwaita/preferences-system-time-symbolic.svg");
+    t!(adwaita_printer_error_symbolic_svg,                          "adwaita/printer-error-symbolic.svg");
+    t!(adwaita_printer_network_symbolic_svg,                        "adwaita/printer-network-symbolic.svg");
+    t!(adwaita_printer_printing_symbolic_svg,                       "adwaita/printer-printing-symbolic.svg");
+    t!(adwaita_printer_symbolic_svg,                                "adwaita/printer-symbolic.svg");
+    t!(adwaita_printer_warning_symbolic_svg,                        "adwaita/printer-warning-symbolic.svg");
+    t!(adwaita_process_stop_symbolic_svg,                           "adwaita/process-stop-symbolic.svg");
+    t!(adwaita_radio_checked_symbolic_svg,                          "adwaita/radio-checked-symbolic.svg");
+    t!(adwaita_radio_mixed_symbolic_svg,                            "adwaita/radio-mixed-symbolic.svg");
+    t!(adwaita_radio_symbolic_svg,                                  "adwaita/radio-symbolic.svg");
+    t!(adwaita_rotation_allowed_symbolic_svg,                       "adwaita/rotation-allowed-symbolic.svg");
+    t!(adwaita_rotation_locked_symbolic_svg,                        "adwaita/rotation-locked-symbolic.svg");
+    t!(adwaita_scanner_symbolic_svg,                                "adwaita/scanner-symbolic.svg");
+    t!(adwaita_security_high_symbolic_svg,                          "adwaita/security-high-symbolic.svg");
+    t!(adwaita_security_low_symbolic_svg,                           "adwaita/security-low-symbolic.svg");
+    t!(adwaita_security_medium_symbolic_svg,                        "adwaita/security-medium-symbolic.svg");
+    t!(adwaita_selection_end_symbolic_rtl_svg,                      "adwaita/selection-end-symbolic-rtl.svg");
+    t!(adwaita_selection_end_symbolic_svg,                          "adwaita/selection-end-symbolic.svg");
+    t!(adwaita_selection_start_symbolic_rtl_svg,                    "adwaita/selection-start-symbolic-rtl.svg");
+    t!(adwaita_selection_start_symbolic_svg,                        "adwaita/selection-start-symbolic.svg");
+    t!(adwaita_semi_starred_symbolic_rtl_svg,                       "adwaita/semi-starred-symbolic-rtl.svg");
+    t!(adwaita_semi_starred_symbolic_svg,                           "adwaita/semi-starred-symbolic.svg");
+    t!(adwaita_send_to_symbolic_svg,                                "adwaita/send-to-symbolic.svg");
+    t!(adwaita_software_update_available_symbolic_svg,              "adwaita/software-update-available-symbolic.svg");
+    t!(adwaita_software_update_urgent_symbolic_svg,                 "adwaita/software-update-urgent-symbolic.svg");
+    t!(adwaita_star_new_symbolic_svg,                               "adwaita/star-new-symbolic.svg");
+    t!(adwaita_starred_symbolic_svg,                                "adwaita/starred-symbolic.svg");
+    t!(adwaita_start_here_symbolic_svg,                             "adwaita/start-here-symbolic.svg");
+    t!(adwaita_system_file_manager_symbolic_svg,                    "adwaita/system-file-manager-symbolic.svg");
+    t!(adwaita_system_help_symbolic_svg,                            "adwaita/system-help-symbolic.svg");
+    t!(adwaita_system_lock_screen_symbolic_svg,                     "adwaita/system-lock-screen-symbolic.svg");
+    t!(adwaita_system_run_symbolic_svg,                             "adwaita/system-run-symbolic.svg");
+    t!(adwaita_system_search_symbolic_svg,                          "adwaita/system-search-symbolic.svg");
+    t!(adwaita_system_shutdown_symbolic_svg,                        "adwaita/system-shutdown-symbolic.svg");
+    t!(adwaita_system_software_install_symbolic_svg,                "adwaita/system-software-install-symbolic.svg");
+    t!(adwaita_system_switch_user_symbolic_svg,                     "adwaita/system-switch-user-symbolic.svg");
+    t!(adwaita_system_users_symbolic_svg,                           "adwaita/system-users-symbolic.svg");
+    t!(adwaita_tab_new_symbolic_svg,                                "adwaita/tab-new-symbolic.svg");
+    t!(adwaita_task_due_symbolic_svg,                               "adwaita/task-due-symbolic.svg");
+    t!(adwaita_task_past_due_symbolic_svg,                          "adwaita/task-past-due-symbolic.svg");
+    t!(adwaita_text_editor_symbolic_svg,                            "adwaita/text-editor-symbolic.svg");
+    t!(adwaita_text_x_generic_symbolic_svg,                         "adwaita/text-x-generic-symbolic.svg");
+    t!(adwaita_thunderbolt_acquiring_symbolic_svg,                  "adwaita/thunderbolt-acquiring-symbolic.svg");
+    t!(adwaita_thunderbolt_symbolic_svg,                            "adwaita/thunderbolt-symbolic.svg");
+    t!(adwaita_tools_check_spelling_symbolic_svg,                   "adwaita/tools-check-spelling-symbolic.svg");
+    t!(adwaita_touchpad_disabled_symbolic_svg,                      "adwaita/touchpad-disabled-symbolic.svg");
+    t!(adwaita_tv_symbolic_svg,                                     "adwaita/tv-symbolic.svg");
+    t!(adwaita_uninterruptible_power_supply_symbolic_svg,           "adwaita/uninterruptible-power-supply-symbolic.svg");
+    t!(adwaita_user_available_symbolic_svg,                         "adwaita/user-available-symbolic.svg");
+    t!(adwaita_user_away_symbolic_svg,                              "adwaita/user-away-symbolic.svg");
+    t!(adwaita_user_bookmarks_symbolic_svg,                         "adwaita/user-bookmarks-symbolic.svg");
+    t!(adwaita_user_busy_symbolic_svg,                              "adwaita/user-busy-symbolic.svg");
+    t!(adwaita_user_desktop_symbolic_svg,                           "adwaita/user-desktop-symbolic.svg");
+    t!(adwaita_user_home_symbolic_svg,                              "adwaita/user-home-symbolic.svg");
+    t!(adwaita_user_idle_symbolic_svg,                              "adwaita/user-idle-symbolic.svg");
+    t!(adwaita_user_info_symbolic_svg,                              "adwaita/user-info-symbolic.svg");
+    t!(adwaita_user_invisible_symbolic_svg,                         "adwaita/user-invisible-symbolic.svg");
+    t!(adwaita_user_not_tracked_symbolic_svg,                       "adwaita/user-not-tracked-symbolic.svg");
+    t!(adwaita_user_offline_symbolic_svg,                           "adwaita/user-offline-symbolic.svg");
+    t!(adwaita_user_status_pending_symbolic_svg,                    "adwaita/user-status-pending-symbolic.svg");
+    t!(adwaita_user_trash_full_symbolic_svg,                        "adwaita/user-trash-full-symbolic.svg");
+    t!(adwaita_user_trash_symbolic_svg,                             "adwaita/user-trash-symbolic.svg");
+    t!(adwaita_utilities_system_monitor_symbolic_svg,               "adwaita/utilities-system-monitor-symbolic.svg");
+    t!(adwaita_utilities_terminal_symbolic_svg,                     "adwaita/utilities-terminal-symbolic.svg");
+    t!(adwaita_video_display_symbolic_svg,                          "adwaita/video-display-symbolic.svg");
+    t!(adwaita_video_joined_displays_symbolic_svg,                  "adwaita/video-joined-displays-symbolic.svg");
+    t!(adwaita_video_single_display_symbolic_svg,                   "adwaita/video-single-display-symbolic.svg");
+    t!(adwaita_video_x_generic_symbolic_svg,                        "adwaita/video-x-generic-symbolic.svg");
+    t!(adwaita_view_app_grid_symbolic_svg,                          "adwaita/view-app-grid-symbolic.svg");
+    t!(adwaita_view_continuous_symbolic_svg,                        "adwaita/view-continuous-symbolic.svg");
+    t!(adwaita_view_dual_symbolic_svg,                              "adwaita/view-dual-symbolic.svg");
+    t!(adwaita_view_fullscreen_symbolic_svg,                        "adwaita/view-fullscreen-symbolic.svg");
+    t!(adwaita_view_grid_symbolic_svg,                              "adwaita/view-grid-symbolic.svg");
+    t!(adwaita_view_list_symbolic_svg,                              "adwaita/view-list-symbolic.svg");
+    t!(adwaita_view_mirror_symbolic_svg,                            "adwaita/view-mirror-symbolic.svg");
+    t!(adwaita_view_more_horizontal_symbolic_svg,                   "adwaita/view-more-horizontal-symbolic.svg");
+    t!(adwaita_view_more_symbolic_svg,                              "adwaita/view-more-symbolic.svg");
+    t!(adwaita_view_paged_symbolic_svg,                             "adwaita/view-paged-symbolic.svg");
+    t!(adwaita_view_pin_symbolic_svg,                               "adwaita/view-pin-symbolic.svg");
+    t!(adwaita_view_refresh_symbolic_svg,                           "adwaita/view-refresh-symbolic.svg");
+    t!(adwaita_view_restore_symbolic_svg,                           "adwaita/view-restore-symbolic.svg");
+    t!(adwaita_view_sort_ascending_symbolic_svg,                    "adwaita/view-sort-ascending-symbolic.svg");
+    t!(adwaita_view_sort_descending_symbolic_svg,                   "adwaita/view-sort-descending-symbolic.svg");
+    t!(adwaita_view_wrapped_symbolic_rtl_svg,                       "adwaita/view-wrapped-symbolic-rtl.svg");
+    t!(adwaita_view_wrapped_symbolic_svg,                           "adwaita/view-wrapped-symbolic.svg");
+    t!(adwaita_weather_clear_night_symbolic_svg,                    "adwaita/weather-clear-night-symbolic.svg");
+    t!(adwaita_weather_clear_symbolic_svg,                          "adwaita/weather-clear-symbolic.svg");
+    t!(adwaita_weather_few_clouds_night_symbolic_svg,               "adwaita/weather-few-clouds-night-symbolic.svg");
+    t!(adwaita_weather_few_clouds_symbolic_svg,                     "adwaita/weather-few-clouds-symbolic.svg");
+    t!(adwaita_weather_fog_symbolic_svg,                            "adwaita/weather-fog-symbolic.svg");
+    t!(adwaita_weather_overcast_symbolic_svg,                       "adwaita/weather-overcast-symbolic.svg");
+    t!(adwaita_weather_severe_alert_symbolic_svg,                   "adwaita/weather-severe-alert-symbolic.svg");
+    t!(adwaita_weather_showers_scattered_symbolic_svg,              "adwaita/weather-showers-scattered-symbolic.svg");
+    t!(adwaita_weather_showers_symbolic_svg,                        "adwaita/weather-showers-symbolic.svg");
+    t!(adwaita_weather_snow_symbolic_svg,                           "adwaita/weather-snow-symbolic.svg");
+    t!(adwaita_weather_storm_symbolic_svg,                          "adwaita/weather-storm-symbolic.svg");
+    t!(adwaita_weather_windy_symbolic_svg,                          "adwaita/weather-windy-symbolic.svg");
+    t!(adwaita_web_browser_symbolic_svg,                            "adwaita/web-browser-symbolic.svg");
+    t!(adwaita_window_close_symbolic_svg,                           "adwaita/window-close-symbolic.svg");
+    t!(adwaita_window_maximize_symbolic_svg,                        "adwaita/window-maximize-symbolic.svg");
+    t!(adwaita_window_minimize_symbolic_svg,                        "adwaita/window-minimize-symbolic.svg");
+    t!(adwaita_window_restore_symbolic_svg,                         "adwaita/window-restore-symbolic.svg");
+    t!(adwaita_x_office_address_book_symbolic_svg,                  "adwaita/x-office-address-book-symbolic.svg");
+    t!(adwaita_x_office_calendar_symbolic_svg,                      "adwaita/x-office-calendar-symbolic.svg");
+    t!(adwaita_x_office_document_symbolic_svg,                      "adwaita/x-office-document-symbolic.svg");
+    t!(adwaita_x_office_drawing_symbolic_svg,                       "adwaita/x-office-drawing-symbolic.svg");
+    t!(adwaita_x_office_presentation_symbolic_svg,                  "adwaita/x-office-presentation-symbolic.svg");
+    t!(adwaita_x_office_spreadsheet_symbolic_svg,                   "adwaita/x-office-spreadsheet-symbolic.svg");
+    t!(adwaita_zoom_fit_best_symbolic_svg,                          "adwaita/zoom-fit-best-symbolic.svg");
+    t!(adwaita_zoom_in_symbolic_svg,                                "adwaita/zoom-in-symbolic.svg");
+    t!(adwaita_zoom_original_symbolic_svg,                          "adwaita/zoom-original-symbolic.svg");
+    t!(adwaita_zoom_out_symbolic_svg,                               "adwaita/zoom-out-symbolic.svg");
+    t!(bugs_a_inside_text_content_738_svg,                          "bugs/a-inside-text-content-738.svg");
+    t!(bugs_a_inside_text_content_pseudo_class_738_svg,             "bugs/a-inside-text-content-pseudo-class-738.svg");
+    t!(bugs_bug108_font_size_relative_svg,                          "bugs/bug108-font-size-relative.svg");
+    t!(bugs_bug112_svg_delayed_attributes_svg,                      "bugs/bug112-svg-delayed-attributes.svg");
+    t!(bugs_bug165_zero_length_subpath_square_linecap_svg,          "bugs/bug165-zero-length-subpath-square-linecap.svg");
+    t!(bugs_bug181_inheritable_attrs_in_svg_svg,                    "bugs/bug181-inheritable-attrs-in-svg.svg");
+    t!(bugs_bug241_light_source_type_svg,                           "bugs/bug241-light-source-type.svg");
+    t!(bugs_bug245_negative_dashoffset_svg,                         "bugs/bug245-negative-dashoffset.svg");
+    t!(bugs_bug282_drop_shadow_svg,                                 "bugs/bug282-drop-shadow.svg");
+    t!(bugs_bug340047_svg,                                          "bugs/bug340047.svg");
+    t!(bugs_bug363_missing_space_svg,                               "bugs/bug363-missing-space.svg");
+    t!(bugs_bug372_small_arcs_svg,                                  "bugs/bug372-small-arcs.svg");
+    t!(bugs_bug373_gradient_userspaceonuse_svg,                     "bugs/bug373-gradient-userspaceonuse.svg");
+    t!(bugs_bug403357_svg,                                          "bugs/bug403357.svg");
+    t!(bugs_bug476507_svg,                                          "bugs/bug476507.svg");
+    t!(bugs_bug481_tspan_uses_at_least_first_x_svg,                 "bugs/bug481-tspan-uses-at-least-first-x.svg");
+    t!(bugs_bug494_text_accumulate_dy_svg,                          "bugs/bug494-text-accumulate-dy.svg");
+    t!(bugs_bug506_pattern_fallback_svg,                            "bugs/bug506-pattern-fallback.svg");
+    t!(bugs_bug510_pattern_fill_opacity_svg,                        "bugs/bug510-pattern-fill-opacity.svg");
+    t!(bugs_bug510_pattern_fill_svg,                                "bugs/bug510-pattern-fill.svg");
+    t!(bugs_bug548_data_url_without_mimetype_svg,                   "bugs/bug548-data-url-without-mimetype.svg");
+    t!(bugs_bug563933_svg,                                          "bugs/bug563933.svg");
+    t!(bugs_bug587721_text_transform_svg,                           "bugs/bug587721-text-transform.svg");
+    t!(bugs_bug590_mask_units_svg,                                  "bugs/bug590-mask-units.svg");
+    t!(bugs_bug603550_mask_luminance_svg,                           "bugs/bug603550-mask-luminance.svg");
+    t!(bugs_bug609_clippath_transform_svg,                          "bugs/bug609-clippath-transform.svg");
+    t!(bugs_bug634324_blur_negative_transform_svg,                  "bugs/bug634324-blur-negative-transform.svg");
+    t!(bugs_bug642_nested_tspan_dx_dy_svg,                          "bugs/bug642-nested-tspan-dx-dy.svg");
+    t!(bugs_bug667_tspan_visibility_svg,                            "bugs/bug667-tspan-visibility.svg");
+    t!(bugs_bug668_small_caps_svg,                                  "bugs/bug668-small-caps.svg");
+    t!(bugs_bug689832_unresolved_gradient_svg,                      "bugs/bug689832-unresolved-gradient.svg");
+    t!(bugs_bug718_rect_negative_rx_ry_svg,                         "bugs/bug718-rect-negative-rx-ry.svg");
+    t!(bugs_bug730_font_scaling_svg,                                "bugs/bug730-font-scaling.svg");
+    t!(bugs_bug738367_svg,                                          "bugs/bug738367.svg");
+    t!(bugs_bug749415_svg,                                          "bugs/bug749415.svg");
+    t!(bugs_bug760180_svg,                                          "bugs/bug760180.svg");
+    t!(bugs_bug761175_recursive_masks_svg,                          "bugs/bug761175-recursive-masks.svg");
+    t!(bugs_bug761871_reset_reflection_points_svg,                  "bugs/bug761871-reset-reflection-points.svg");
+    t!(bugs_bug763386_marker_coincident_svg,                        "bugs/bug763386-marker-coincident.svg");
+    t!(bugs_bug776297_marker_on_non_path_elements_svg,              "bugs/bug776297-marker-on-non-path-elements.svg");
+    t!(bugs_bug786372_default_style_type_svg,                       "bugs/bug786372-default-style-type.svg");
+    t!(bugs_bug788_inner_svg_viewbox_svg,                           "bugs/bug788-inner-svg-viewbox.svg");
+    t!(bugs_ignore_577_multiple_font_families_svg,                  "bugs/ignore-577-multiple-font-families.svg");
+    t!(svg1_1_coords_trans_01_b_svg,                                "svg1.1/coords-trans-01-b.svg");
+    t!(svg1_1_coords_trans_02_t_svg,                                "svg1.1/coords-trans-02-t.svg");
+    t!(svg1_1_coords_trans_03_t_svg,                                "svg1.1/coords-trans-03-t.svg");
+    t!(svg1_1_coords_trans_04_t_svg,                                "svg1.1/coords-trans-04-t.svg");
+    t!(svg1_1_coords_trans_05_t_svg,                                "svg1.1/coords-trans-05-t.svg");
+    t!(svg1_1_coords_trans_06_t_svg,                                "svg1.1/coords-trans-06-t.svg");
+    t!(svg1_1_coords_trans_07_t_svg,                                "svg1.1/coords-trans-07-t.svg");
+    t!(svg1_1_coords_trans_08_t_svg,                                "svg1.1/coords-trans-08-t.svg");
+    t!(svg1_1_coords_trans_09_t_svg,                                "svg1.1/coords-trans-09-t.svg");
+    t!(svg1_1_coords_viewattr_01_b_svg,                             "svg1.1/coords-viewattr-01-b.svg");
+    t!(svg1_1_coords_viewattr_02_b_svg,                             "svg1.1/coords-viewattr-02-b.svg");
+    t!(svg1_1_coords_viewattr_03_b_svg,                             "svg1.1/coords-viewattr-03-b.svg");
+    t!(svg1_1_filters_background_01_f_svg,                          "svg1.1/filters-background-01-f.svg");
+    t!(svg1_1_filters_blend_01_b_svg,                               "svg1.1/filters-blend-01-b.svg");
+    t!(svg1_1_filters_color_01_b_svg,                               "svg1.1/filters-color-01-b.svg");
+    t!(svg1_1_filters_color_02_b_svg,                               "svg1.1/filters-color-02-b.svg");
+    t!(svg1_1_filters_composite_02_b_svg,                           "svg1.1/filters-composite-02-b.svg");
+    t!(svg1_1_filters_composite_03_f_svg,                           "svg1.1/filters-composite-03-f.svg");
+    t!(svg1_1_filters_composite_04_f_svg,                           "svg1.1/filters-composite-04-f.svg");
+    t!(svg1_1_filters_composite_05_f_svg,                           "svg1.1/filters-composite-05-f.svg");
+    t!(svg1_1_filters_comptran_01_b_svg,                            "svg1.1/filters-comptran-01-b.svg");
+    t!(svg1_1_filters_conv_01_f_svg,                                "svg1.1/filters-conv-01-f.svg");
+    t!(svg1_1_filters_conv_02_f_svg,                                "svg1.1/filters-conv-02-f.svg");
+    t!(svg1_1_filters_conv_03_f_svg,                                "svg1.1/filters-conv-03-f.svg");
+    t!(svg1_1_filters_conv_04_f_svg,                                "svg1.1/filters-conv-04-f.svg");
+    t!(svg1_1_filters_conv_05_f_svg,                                "svg1.1/filters-conv-05-f.svg");
+    t!(svg1_1_filters_diffuse_01_f_svg,                             "svg1.1/filters-diffuse-01-f.svg");
+    t!(svg1_1_filters_displace_02_f_svg,                            "svg1.1/filters-displace-02-f.svg");
+    t!(svg1_1_filters_felem_02_f_svg,                               "svg1.1/filters-felem-02-f.svg");
+    t!(svg1_1_filters_gauss_01_b_svg,                               "svg1.1/filters-gauss-01-b.svg");
+    t!(svg1_1_filters_gauss_02_f_svg,                               "svg1.1/filters-gauss-02-f.svg");
+    t!(svg1_1_filters_gauss_03_f_svg,                               "svg1.1/filters-gauss-03-f.svg");
+    t!(svg1_1_filters_image_01_b_svg,                               "svg1.1/filters-image-01-b.svg");
+    t!(svg1_1_filters_image_02_b_svg,                               "svg1.1/filters-image-02-b.svg");
+    t!(svg1_1_filters_image_03_f_svg,                               "svg1.1/filters-image-03-f.svg");
+    t!(svg1_1_filters_image_04_f_svg,                               "svg1.1/filters-image-04-f.svg");
+    t!(svg1_1_filters_image_05_f_svg,                               "svg1.1/filters-image-05-f.svg");
+    t!(svg1_1_filters_light_01_f_svg,                               "svg1.1/filters-light-01-f.svg");
+    t!(svg1_1_filters_light_02_f_svg,                               "svg1.1/filters-light-02-f.svg");
+    t!(svg1_1_filters_light_03_f_svg,                               "svg1.1/filters-light-03-f.svg");
+    t!(svg1_1_filters_light_04_f_svg,                               "svg1.1/filters-light-04-f.svg");
+    t!(svg1_1_filters_light_05_f_svg,                               "svg1.1/filters-light-05-f.svg");
+    t!(svg1_1_filters_morph_01_f_svg,                               "svg1.1/filters-morph-01-f.svg");
+    t!(svg1_1_filters_offset_01_b_svg,                              "svg1.1/filters-offset-01-b.svg");
+    t!(svg1_1_filters_overview_01_b_svg,                            "svg1.1/filters-overview-01-b.svg");
+    t!(svg1_1_filters_overview_02_b_svg,                            "svg1.1/filters-overview-02-b.svg");
+    t!(svg1_1_filters_overview_03_b_svg,                            "svg1.1/filters-overview-03-b.svg");
+    t!(svg1_1_filters_specular_01_f_svg,                            "svg1.1/filters-specular-01-f.svg");
+    t!(svg1_1_filters_tile_01_b_svg,                                "svg1.1/filters-tile-01-b.svg");
+    t!(svg1_1_filters_turb_01_f_svg,                                "svg1.1/filters-turb-01-f.svg");
+    t!(svg1_1_filters_turb_02_f_svg,                                "svg1.1/filters-turb-02-f.svg");
+    t!(svg1_1_ignore_filters_displace_01_f_svg,                     "svg1.1/ignore-filters-displace-01-f.svg");
+    t!(svg1_1_ignore_filters_example_01_b_svg,                      "svg1.1/ignore-filters-example-01-b.svg");
+    t!(svg1_1_ignore_masking_path_07_b_svg,                         "svg1.1/ignore-masking-path-07-b.svg");
+    t!(svg1_1_masking_filter_01_f_svg,                              "svg1.1/masking-filter-01-f.svg");
+    t!(svg1_1_masking_intro_01_f_svg,                               "svg1.1/masking-intro-01-f.svg");
+    t!(svg1_1_masking_mask_01_b_svg,                                "svg1.1/masking-mask-01-b.svg");
+    t!(svg1_1_masking_mask_02_f_svg,                                "svg1.1/masking-mask-02-f.svg");
+    t!(svg1_1_masking_opacity_01_b_svg,                             "svg1.1/masking-opacity-01-b.svg");
+    t!(svg1_1_masking_path_01_b_svg,                                "svg1.1/masking-path-01-b.svg");
+    t!(svg1_1_masking_path_02_b_svg,                                "svg1.1/masking-path-02-b.svg");
+    t!(svg1_1_masking_path_03_b_svg,                                "svg1.1/masking-path-03-b.svg");
+    t!(svg1_1_masking_path_04_b_svg,                                "svg1.1/masking-path-04-b.svg");
+    t!(svg1_1_masking_path_05_f_svg,                                "svg1.1/masking-path-05-f.svg");
+    t!(svg1_1_masking_path_08_b_svg,                                "svg1.1/masking-path-08-b.svg");
+    t!(svg1_1_painting_control_02_f_svg,                            "svg1.1/painting-control-02-f.svg");
+    t!(svg1_1_painting_marker_01_f_svg,                             "svg1.1/painting-marker-01-f.svg");
+    t!(svg1_1_painting_marker_02_f_svg,                             "svg1.1/painting-marker-02-f.svg");
+    t!(svg1_1_painting_marker_03_f_svg,                             "svg1.1/painting-marker-03-f.svg");
+    t!(svg1_1_painting_marker_04_f_svg,                             "svg1.1/painting-marker-04-f.svg");
+    t!(svg1_1_painting_marker_06_f_svg,                             "svg1.1/painting-marker-06-f.svg");
+    t!(svg1_1_painting_marker_07_f_svg,                             "svg1.1/painting-marker-07-f.svg");
+    t!(svg1_1_painting_marker_properties_01_f_svg,                  "svg1.1/painting-marker-properties-01-f.svg");
+    t!(svg1_1_painting_stroke_01_t_svg,                             "svg1.1/painting-stroke-01-t.svg");
+    t!(svg1_1_painting_stroke_02_t_svg,                             "svg1.1/painting-stroke-02-t.svg");
+    t!(svg1_1_painting_stroke_03_t_svg,                             "svg1.1/painting-stroke-03-t.svg");
+    t!(svg1_1_painting_stroke_04_t_svg,                             "svg1.1/painting-stroke-04-t.svg");
+    t!(svg1_1_painting_stroke_05_t_svg,                             "svg1.1/painting-stroke-05-t.svg");
+    t!(svg1_1_painting_stroke_06_t_svg,                             "svg1.1/painting-stroke-06-t.svg");
+    t!(svg1_1_painting_stroke_07_t_svg,                             "svg1.1/painting-stroke-07-t.svg");
+    t!(svg1_1_painting_stroke_08_t_svg,                             "svg1.1/painting-stroke-08-t.svg");
+    t!(svg1_1_painting_stroke_09_t_svg,                             "svg1.1/painting-stroke-09-t.svg");
+    t!(svg1_1_paths_data_01_t_svg,                                  "svg1.1/paths-data-01-t.svg");
+    t!(svg1_1_paths_data_02_t_svg,                                  "svg1.1/paths-data-02-t.svg");
+    t!(svg1_1_paths_data_03_f_svg,                                  "svg1.1/paths-data-03-f.svg");
+    t!(svg1_1_paths_data_04_t_svg,                                  "svg1.1/paths-data-04-t.svg");
+    t!(svg1_1_paths_data_05_t_svg,                                  "svg1.1/paths-data-05-t.svg");
+    t!(svg1_1_paths_data_06_t_svg,                                  "svg1.1/paths-data-06-t.svg");
+    t!(svg1_1_paths_data_07_t_svg,                                  "svg1.1/paths-data-07-t.svg");
+    t!(svg1_1_paths_data_08_t_svg,                                  "svg1.1/paths-data-08-t.svg");
+    t!(svg1_1_paths_data_09_t_svg,                                  "svg1.1/paths-data-09-t.svg");
+    t!(svg1_1_paths_data_10_t_svg,                                  "svg1.1/paths-data-10-t.svg");
+    t!(svg1_1_paths_data_12_t_svg,                                  "svg1.1/paths-data-12-t.svg");
+    t!(svg1_1_paths_data_13_t_svg,                                  "svg1.1/paths-data-13-t.svg");
+    t!(svg1_1_paths_data_14_t_svg,                                  "svg1.1/paths-data-14-t.svg");
+    t!(svg1_1_paths_data_15_t_svg,                                  "svg1.1/paths-data-15-t.svg");
+    t!(svg1_1_paths_data_16_t_svg,                                  "svg1.1/paths-data-16-t.svg");
+    t!(svg1_1_paths_data_17_f_svg,                                  "svg1.1/paths-data-17-f.svg");
+    t!(svg1_1_paths_data_18_f_svg,                                  "svg1.1/paths-data-18-f.svg");
+    t!(svg1_1_paths_data_19_f_svg,                                  "svg1.1/paths-data-19-f.svg");
+    t!(svg1_1_paths_data_20_f_svg,                                  "svg1.1/paths-data-20-f.svg");
+    t!(svg1_1_pservers_grad_01_b_svg,                               "svg1.1/pservers-grad-01-b.svg");
+    t!(svg1_1_pservers_grad_02_b_svg,                               "svg1.1/pservers-grad-02-b.svg");
+    t!(svg1_1_pservers_grad_03_b_svg,                               "svg1.1/pservers-grad-03-b.svg");
+    t!(svg1_1_pservers_grad_04_b_svg,                               "svg1.1/pservers-grad-04-b.svg");
+    t!(svg1_1_pservers_grad_05_b_svg,                               "svg1.1/pservers-grad-05-b.svg");
+    t!(svg1_1_pservers_grad_06_b_svg,                               "svg1.1/pservers-grad-06-b.svg");
+    t!(svg1_1_pservers_grad_07_b_svg,                               "svg1.1/pservers-grad-07-b.svg");
+    t!(svg1_1_pservers_grad_08_b_svg,                               "svg1.1/pservers-grad-08-b.svg");
+    t!(svg1_1_pservers_grad_09_b_svg,                               "svg1.1/pservers-grad-09-b.svg");
+    t!(svg1_1_pservers_grad_10_b_svg,                               "svg1.1/pservers-grad-10-b.svg");
+    t!(svg1_1_pservers_grad_11_b_svg,                               "svg1.1/pservers-grad-11-b.svg");
+    t!(svg1_1_pservers_grad_12_b_svg,                               "svg1.1/pservers-grad-12-b.svg");
+    t!(svg1_1_pservers_grad_14_b_svg,                               "svg1.1/pservers-grad-14-b.svg");
+    t!(svg1_1_pservers_grad_15_b_svg,                               "svg1.1/pservers-grad-15-b.svg");
+    t!(svg1_1_pservers_grad_16_b_svg,                               "svg1.1/pservers-grad-16-b.svg");
+    t!(svg1_1_pservers_grad_18_b_svg,                               "svg1.1/pservers-grad-18-b.svg");
+    t!(svg1_1_pservers_grad_22_b_svg,                               "svg1.1/pservers-grad-22-b.svg");
+    t!(svg1_1_pservers_grad_23_f_svg,                               "svg1.1/pservers-grad-23-f.svg");
+    t!(svg1_1_pservers_grad_24_f_svg,                               "svg1.1/pservers-grad-24-f.svg");
+    t!(svg1_1_pservers_grad_stops_01_f_svg,                         "svg1.1/pservers-grad-stops-01-f.svg");
+    t!(svg1_1_pservers_pattern_01_b_svg,                            "svg1.1/pservers-pattern-01-b.svg");
+    t!(svg1_1_pservers_pattern_02_f_svg,                            "svg1.1/pservers-pattern-02-f.svg");
+    t!(svg1_1_pservers_pattern_03_f_svg,                            "svg1.1/pservers-pattern-03-f.svg");
+    t!(svg1_1_pservers_pattern_04_f_svg,                            "svg1.1/pservers-pattern-04-f.svg");
+    t!(svg1_1_pservers_pattern_05_f_svg,                            "svg1.1/pservers-pattern-05-f.svg");
+    t!(svg1_1_pservers_pattern_06_f_svg,                            "svg1.1/pservers-pattern-06-f.svg");
+    t!(svg1_1_pservers_pattern_07_f_svg,                            "svg1.1/pservers-pattern-07-f.svg");
+    t!(svg1_1_pservers_pattern_08_f_svg,                            "svg1.1/pservers-pattern-08-f.svg");
+    t!(svg1_1_pservers_pattern_09_f_svg,                            "svg1.1/pservers-pattern-09-f.svg");
+    t!(svg1_1_shapes_intro_01_t_svg,                                "svg1.1/shapes-intro-01-t.svg");
+    t!(svg1_1_shapes_intro_02_f_svg,                                "svg1.1/shapes-intro-02-f.svg");
+    t!(svg1_1_struct_cond_01_t_svg,                                 "svg1.1/struct-cond-01-t.svg");
+    t!(svg1_1_struct_cond_03_t_svg,                                 "svg1.1/struct-cond-03-t.svg");
+    t!(svg1_1_struct_group_03_t_svg,                                "svg1.1/struct-group-03-t.svg");
+    t!(svg1_1_struct_svg_03_f_svg,                                  "svg1.1/struct-svg-03-f.svg");
+    t!(svg1_1_struct_symbol_01_b_svg,                               "svg1.1/struct-symbol-01-b.svg");
+    t!(svg1_1_struct_use_01_t_svg,                                  "svg1.1/struct-use-01-t.svg");
+    t!(svg1_1_struct_use_03_t_svg,                                  "svg1.1/struct-use-03-t.svg");
+    t!(svg1_1_struct_use_04_b_svg,                                  "svg1.1/struct-use-04-b.svg");
+    t!(svg1_1_struct_use_09_b_svg,                                  "svg1.1/struct-use-09-b.svg");
+    t!(svg1_1_struct_use_10_f_svg,                                  "svg1.1/struct-use-10-f.svg");
+    t!(svg1_1_styling_css_01_b_svg,                                 "svg1.1/styling-css-01-b.svg");
+    t!(svg1_1_styling_css_02_b_svg,                                 "svg1.1/styling-css-02-b.svg");
+    t!(svg1_1_styling_css_03_b_svg,                                 "svg1.1/styling-css-03-b.svg");
+    t!(svg1_1_styling_css_04_f_svg,                                 "svg1.1/styling-css-04-f.svg");
+    t!(svg1_1_styling_css_07_f_svg,                                 "svg1.1/styling-css-07-f.svg");
+    t!(svg1_1_styling_css_08_f_svg,                                 "svg1.1/styling-css-08-f.svg");
+    t!(svg1_1_text_align_01_b_svg,                                  "svg1.1/text-align-01-b.svg");
+    t!(svg1_1_text_align_02_b_svg,                                  "svg1.1/text-align-02-b.svg");
+    t!(svg1_1_text_align_03_b_svg,                                  "svg1.1/text-align-03-b.svg");
+    t!(svg1_1_text_fonts_02_t_svg,                                  "svg1.1/text-fonts-02-t.svg");
+    t!(svg1_1_text_text_03_b_svg,                                   "svg1.1/text-text-03-b.svg");
+    t!(svg1_1_text_text_08_b_svg,                                   "svg1.1/text-text-08-b.svg");
+    t!(svg1_1_text_text_10_t_svg,                                   "svg1.1/text-text-10-t.svg");
+    t!(svg1_1_text_tref_01_b_svg,                                   "svg1.1/text-tref-01-b.svg");
+    t!(svg1_1_text_tref_02_b_svg,                                   "svg1.1/text-tref-02-b.svg");
+    t!(svg1_1_text_tref_03_b_svg,                                   "svg1.1/text-tref-03-b.svg");
+    t!(svg1_1_types_basic_02_f_svg,                                 "svg1.1/types-basic-02-f.svg");
+    t!(svg2_gradient_01_b_svg,                                      "svg2/gradient-01-b.svg");
+    t!(svg2_mix_blend_mode_svg,                                     "svg2/mix-blend-mode.svg");
+    t!(svg2_multi_filter_svg,                                       "svg2/multi-filter.svg");
+    t!(svg2_paint_order_svg,                                        "svg2/paint-order.svg");
+    t!(svg2_text_paint_order_svg,                                   "svg2/text-paint-order.svg");
 }
 
 test_compare_render_output!(
@@ -398,30 +1118,30 @@ test_svg_reference!(
 
 test_svg_reference!(
     gaussian_blur_nonpositive_913,
-    "tests/fixtures/reftests/svg2-reftests/913-gaussian-blur-nonpositive.svg",
-    "tests/fixtures/reftests/svg2-reftests/913-gaussian-blur-nonpositive-ref.svg"
+    "tests/fixtures/reftests/svg2-reftests/bug913-gaussian-blur-nonpositive.svg",
+    "tests/fixtures/reftests/svg2-reftests/bug913-gaussian-blur-nonpositive-ref.svg"
 );
 
 test_svg_reference!(
     bug_880_horizontal_vertical_stroked_lines,
-    "tests/fixtures/reftests/bugs-reftests/880-stroke-wide-line.svg",
-    "tests/fixtures/reftests/bugs-reftests/880-stroke-wide-line-ref.svg"
+    "tests/fixtures/reftests/bugs-reftests/bug880-stroke-wide-line.svg",
+    "tests/fixtures/reftests/bugs-reftests/bug880-stroke-wide-line-ref.svg"
 );
 
 test_svg_reference!(
     bug_92_symbol_clip,
-    "tests/fixtures/reftests/bugs-reftests/92-symbol-clip.svg",
-    "tests/fixtures/reftests/bugs-reftests/92-symbol-clip-ref.svg"
+    "tests/fixtures/reftests/bugs-reftests/bug92-symbol-clip.svg",
+    "tests/fixtures/reftests/bugs-reftests/bug92-symbol-clip-ref.svg"
 );
 
 test_svg_reference!(
     bug_875_svg_use_width_height,
-    "tests/fixtures/reftests/bugs-reftests/875-svg-use-width-height.svg",
-    "tests/fixtures/reftests/bugs-reftests/875-svg-use-width-height-ref.svg"
+    "tests/fixtures/reftests/bugs-reftests/bug875-svg-use-width-height.svg",
+    "tests/fixtures/reftests/bugs-reftests/bug875-svg-use-width-height-ref.svg"
 );
 
 test_svg_reference!(
     bug_885_vector_effect_non_scaling_stroke,
-    "tests/fixtures/reftests/bugs-reftests/885-vector-effect-non-scaling-stroke.svg",
-    "tests/fixtures/reftests/bugs-reftests/885-vector-effect-non-scaling-stroke-ref.svg"
+    "tests/fixtures/reftests/bugs-reftests/bug885-vector-effect-non-scaling-stroke.svg",
+    "tests/fixtures/reftests/bugs-reftests/bug885-vector-effect-non-scaling-stroke-ref.svg"
 );
diff --git a/tests/src/render_crash.rs b/tests/src/render_crash.rs
index c00e5005..311aa38d 100644
--- a/tests/src/render_crash.rs
+++ b/tests/src/render_crash.rs
@@ -3,16 +3,18 @@
 //! Ensures that redering a particular SVG doesn't crash, but we don't care
 //! about the resulting image or even whether there were errors during rendering.
 
-#![cfg(test)]
-use test_generator::test_resources;
-
 use cairo;
 use librsvg::{CairoRenderer, Loader};
 
-#[test_resources("tests/fixtures/render-crash/*.svg")]
-fn render_crash(path: &str) {
+use std::path::PathBuf;
+
+fn render_crash(filename: &str) {
+    let mut full_filename = PathBuf::new();
+    full_filename.push("tests/fixtures/render-crash");
+    full_filename.push(filename);
+
     let handle = Loader::new()
-        .read_path(path)
+        .read_path(&full_filename)
         .unwrap_or_else(|e| panic!("could not load: {}", e));
 
     let surface = cairo::ImageSurface::create(cairo::Format::ARgb32, 100, 100).unwrap();
@@ -22,3 +24,50 @@ fn render_crash(path: &str) {
     let _ = CairoRenderer::new(&handle)
         .render_document(&cr, &cairo::Rectangle::new(0.0, 0.0, 100.0, 100.0));
 }
+
+macro_rules! t {
+    ($test_name:ident, $filename:expr) => {
+        #[test]
+        fn $test_name() {
+            render_crash($filename);
+        }
+    };
+}
+
+#[rustfmt::skip]
+mod tests {
+    use super::*;
+
+    t!(bug187_set_gradient_on_empty_path_svg,           "bug187-set-gradient-on-empty-path.svg");
+    t!(bug193_filters_conv_05_f_svg,                    "bug193-filters-conv-05-f.svg");
+    t!(bug227_negative_dasharray_value_svg,             "bug227-negative-dasharray-value.svg");
+    t!(bug266_filters_with_error_attributes_svg,        "bug266-filters-with-error-attributes.svg");
+    t!(bug277_filter_on_empty_group_svg,                "bug277-filter-on-empty-group.svg");
+    t!(bug292_clip_empty_group_svg,                     "bug292-clip-empty-group.svg");
+    t!(bug293_mask_empty_group_svg,                     "bug293-mask-empty-group.svg");
+    t!(bug324_empty_svg_svg,                            "bug324-empty-svg.svg");
+    t!(bug337_font_ex_svg,                              "bug337-font-ex.svg");
+    t!(bug338_zero_sized_image_svg,                     "bug338-zero-sized-image.svg");
+    t!(bug340_marker_with_zero_sized_vbox_svg,          "bug340-marker-with-zero-sized-vbox.svg");
+    t!(bug342_use_references_ancestor_svg,              "bug342-use-references-ancestor.svg");
+    t!(bug343_fecomponenttransfer_child_in_error_svg,   "bug343-feComponentTransfer-child-in-error.svg");
+    t!(bug344_too_large_viewbox_svg,                    "bug344-too-large-viewbox.svg");
+    t!(bug345_too_large_size_svg,                       "bug345-too-large-size.svg");
+    t!(bug395_femorphology_negative_scaling_svg,        "bug395-feMorphology-negative-scaling.svg");
+    t!(bug497_path_with_all_invalid_commands_svg,       "bug497-path-with-all-invalid-commands.svg");
+    t!(bug581491_zero_sized_text_svg,                   "bug581491-zero-sized-text.svg");
+    t!(bug588_big_viewbox_yields_invalid_transform_svg, "bug588-big-viewbox-yields-invalid-transform.svg");
+    t!(bug591_vbox_overflow_svg,                        "bug591-vbox-overflow.svg");
+    t!(bug593_mask_empty_bbox_svg,                      "bug593-mask-empty-bbox.svg");
+    t!(bug721_pattern_cycle_from_child_svg,             "bug721-pattern-cycle-from-child.svg");
+    t!(bug721_pattern_cycle_from_other_child_svg,       "bug721-pattern-cycle-from-other-child.svg");
+    t!(bug777155_zero_sized_pattern_svg,                "bug777155-zero-sized-pattern.svg");
+    t!(femerge_color_interpolation_srgb_svg,            "feMerge-color-interpolation-srgb.svg");
+    t!(filters_non_invertible_paffine_svg,              "filters-non-invertible-paffine.svg");
+    t!(gradient_with_empty_bbox_svg,                    "gradient-with-empty-bbox.svg");
+    t!(gradient_with_no_children_svg,                   "gradient-with-no-children.svg");
+    t!(pattern_with_empty_bbox_svg,                     "pattern-with-empty-bbox.svg");
+    t!(pattern_with_no_children_svg,                    "pattern-with-no-children.svg");
+    t!(pixelrectangle_duplicate_crash_svg,              "PixelRectangle-duplicate-crash.svg");
+    t!(recursive_feimage_svg,                           "recursive-feimage.svg");
+}
diff --git a/tests/src/text.rs b/tests/src/text.rs
index 45bb01e2..6f7c7d83 100644
--- a/tests/src/text.rs
+++ b/tests/src/text.rs
@@ -1,7 +1,6 @@
 use cairo;
 use float_cmp::approx_eq;
 use librsvg::{CairoRenderer, Loader};
-use test_generator::test_resources;
 
 use crate::reference_utils::{Compare, Evaluate, Reference};
 use crate::utils::{load_svg, render_document, setup_font_map, SurfaceSize};
@@ -33,8 +32,8 @@ test_compare_render_output!(
 
 test_svg_reference!(
     text_anchor_chunk_806,
-    "tests/fixtures/text/806-text-anchor-chunk.svg",
-    "tests/fixtures/text/806-text-anchor-chunk-ref.svg"
+    "tests/fixtures/text/bug806-text-anchor-chunk.svg",
+    "tests/fixtures/text/bug806-text-anchor-chunk-ref.svg"
 );
 
 test_svg_reference!(
@@ -48,8 +47,8 @@ test_svg_reference!(
 //
 // test_svg_reference!(
 //     tspan_direction_change_804,
-//     "tests/fixtures/text/804-tspan-direction-change.svg",
-//     "tests/fixtures/text/804-tspan-direction-change-ref.svg"
+//     "tests/fixtures/text/bug804-tspan-direction-change.svg",
+//     "tests/fixtures/text/bug804-tspan-direction-change-ref.svg"
 // );
 
 test_svg_reference!(
@@ -96,12 +95,12 @@ fn rectangle_approx_eq(a: &cairo::Rectangle, b: &cairo::Rectangle) -> bool {
 }
 
 // Test that the computed geometry of text layers is as expected.
-#[test_resources("tests/fixtures/text/bounds.svg")]
-fn text_layer_geometry(name: &str) {
+#[test]
+fn test_text_layer_geometry() {
     setup_font_map();
 
     let handle = Loader::new()
-        .read_path(name)
+        .read_path("tests/fixtures/text/bounds.svg")
         .unwrap_or_else(|e| panic!("could not load: {}", e));
 
     let renderer = CairoRenderer::new(&handle).test_mode(true);
author	Marge Bot <marge-bot@gnome.org>	2022-11-28 21:17:22 +0000
committer	Marge Bot <marge-bot@gnome.org>	2022-11-28 21:17:22 +0000
commit	f91634074542b05c37d42d7e3eacfd194b3b02c4 (patch)
tree	28f86836c75e1ec626fa1ec5899ae522246f6e39
parent	2a06e2408ebcd8cb438975a906f48be9c570ba3b (diff)
parent	9b45acb513beacb6eb4601db51842d37f2e73f50 (diff)
download	librsvg-f91634074542b05c37d42d7e3eacfd194b3b02c4.tar.gz