From 3d3bcee7c08edeee507ad564d08a57b180309ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 22 Apr 2021 14:05:44 +0200 Subject: [PATCH 01/13] automatic height closes #323 --- src/plot.js | 16 +++++++++++++++- test/plots/athletes-sport-sex.js | 1 - 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/plot.js b/src/plot.js index be1de74ff7..c51e155b15 100644 --- a/src/plot.js +++ b/src/plot.js @@ -106,7 +106,7 @@ function Dimensions( }, { width = 640, - height = y || fy ? 396 : fx ? 90 : 60, + height = autoHeight(y, fy, fx), facet: { marginTop: facetMarginTop = fxAxis === "top" ? 30 :0, marginRight: facetMarginRight = fyAxis === "right" ? 40 : 0, @@ -136,3 +136,17 @@ function Dimensions( function ScaleFunctions(scales) { return Object.fromEntries(Object.entries(scales).map(([name, {scale}]) => [name, scale])); } + +function autoHeight(y, fy, fx) { + const ny = y && ["ordinal", "point"].includes(y.type) && length(y.domain) || 1; + const nfy = fy && ["ordinal", "point"].includes(fy.type) && length(fy.domain) || 1; + return !!(y || fy) * clamp(ny * nfy * 16, 336, 1200) + !!fx * 30 + 60; +} + +function clamp(x, lo, hi) { + return x < lo ? lo : x > hi ? hi : x; +} + +function length(iterator) { + return Array.from(iterator).length; +} diff --git a/test/plots/athletes-sport-sex.js b/test/plots/athletes-sport-sex.js index 608e3b85d4..a67983e47d 100644 --- a/test/plots/athletes-sport-sex.js +++ b/test/plots/athletes-sport-sex.js @@ -6,7 +6,6 @@ export default async function() { const female = data => d3.mean(data, d => d.sex === "female"); return Plot.plot({ marginLeft: 100, - height: 500, x: { label: "Women (%) →", domain: [0, 100], From 4e21a92c4de4ba8b6f45fcbb670339d193481f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 22 Apr 2021 14:09:51 +0200 Subject: [PATCH 02/13] fix tests --- test/output/athletesSportSex.svg | 138 ++++++++--------- test/output/ballotStatusRace.svg | 104 ++++++------- test/output/caltrain.svg | 16 +- test/output/mobyDickFaceted.svg | 148 +++++++++---------- test/output/penguinMassSexSpecies.svg | 146 +++++++++--------- test/output/penguinSpeciesIslandRelative.svg | 40 ++--- test/output/penguinSpeciesIslandSex.svg | 84 +++++++---- 7 files changed, 352 insertions(+), 324 deletions(-) diff --git a/test/output/athletesSportSex.svg b/test/output/athletesSportSex.svg index 7d4866de9d..1d14c77fda 100644 --- a/test/output/athletesSportSex.svg +++ b/test/output/athletesSportSex.svg @@ -1,164 +1,164 @@ - + - + boxing - + wrestling - + canoe - + cycling - + equestrian - + shooting - + judo - + rowing - + weightlifting - + sailing - + football - + tennis - + athletics - + golf - + rugby sevens - + aquatics - + handball - + archery - + badminton - + basketball - + hockey - + modern pentathlon - + table tennis - + taekwondo - + triathlon - + volleyball - + fencing - + gymnastics - + - 0 + 0 - 10 + 10 - 20 + 20 - 30 + 30 - 40 + 40 - 50 + 50 - 60 + 60 - 70 + 70 - 80 + 80 - 90 + 90 - 100 + 100 Women (%) → - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/ballotStatusRace.svg b/test/output/ballotStatusRace.svg index 3e4c95c108..5d6d460361 100644 --- a/test/output/ballotStatusRace.svg +++ b/test/output/ballotStatusRace.svg @@ -1,172 +1,172 @@ - + - + WHITE - + UNDESIGNATED - + ASIAN - + OTHER - + TWO or MORE RACES - + INDIAN AMERICAN or ALASKA NATIVE - + BLACK or AFRICAN AMERICAN - + NATIVE HAWAIIAN or PACIFIC ISLANDER - + 0 - + 20 - + 40 - + 60 - + Frequency (%) → - + 79.0% - + 0.4% - + 20.5% - + - + - + 78.3% - + 0.6% - + 21.1% - + - + - + 77.9% - + 21.5% - + 0.6% - + - + - + 74.1% - + 0.8% - + 25.1% - + - + - + 73.9% - + 25.3% - + 0.8% - + - + - + 25.5% - + 72.2% - + 2.3% - + - + - + 67.4% - + 31.5% - + 1.1% - + - + - + 41.7% - + 58.3% - + diff --git a/test/output/caltrain.svg b/test/output/caltrain.svg index 63f395f2d3..06e45ceeb4 100644 --- a/test/output/caltrain.svg +++ b/test/output/caltrain.svg @@ -1,11 +1,11 @@ - - Northbound - Southbound - 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a - 010101010105050506061011111116161616162123232324242436363636384141414141415454 - 010101020303030303030312121218181821252525262626263636363838384449495151515757 + + Northbound + Southbound + 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a + 010101010105050506061011111116161616162123232324242436363636384141414141415454 + 010101020303030303030312121218181821252525262626263636363838384449495151515757 - - + + \ No newline at end of file diff --git a/test/output/mobyDickFaceted.svg b/test/output/mobyDickFaceted.svg index cfbfa558ad..c0f92dd178 100644 --- a/test/output/mobyDickFaceted.svg +++ b/test/output/mobyDickFaceted.svg @@ -1,9 +1,9 @@ - + - + lower - + upper @@ -18,70 +18,70 @@ - + 0 - + 200 - + 400 - + 600 - + 800 - + 1,000 - + 1,200 ↑ Frequency - + - + 0 - + 200 - + 400 - + 600 - + 800 - + 1,000 - + 1,200 - + A @@ -163,7 +163,7 @@ - + A @@ -246,78 +246,78 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + diff --git a/test/output/penguinMassSexSpecies.svg b/test/output/penguinMassSexSpecies.svg index c2e8304410..d141c26d17 100644 --- a/test/output/penguinMassSexSpecies.svg +++ b/test/output/penguinMassSexSpecies.svg @@ -1,14 +1,14 @@ - + - + Adelie - + Chinstrap - + Gentoo - species + species @@ -22,65 +22,65 @@ sex - + - + 0 - + 10 - + 20 - + 30 - + 40 ↑ Frequency - + - + 0 - + 10 - + 20 - + 30 - + 40 - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 4,000 @@ -90,7 +90,7 @@ - + 4,000 @@ -100,7 +100,7 @@ - + 4,000 @@ -109,95 +109,95 @@ Body mass (g) → - + - - - + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - + - + - - + + - + diff --git a/test/output/penguinSpeciesIslandRelative.svg b/test/output/penguinSpeciesIslandRelative.svg index 63c23a1102..b7ac9f2545 100644 --- a/test/output/penguinSpeciesIslandRelative.svg +++ b/test/output/penguinSpeciesIslandRelative.svg @@ -1,40 +1,40 @@ - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 - + 60 - + 70 - + 80 - + 90 100 ↑ Frequency (%) - + Adelie @@ -48,28 +48,28 @@ - - - + + + - + - + - + - + - + diff --git a/test/output/penguinSpeciesIslandSex.svg b/test/output/penguinSpeciesIslandSex.svg index 499c779d6c..56567db28f 100644 --- a/test/output/penguinSpeciesIslandSex.svg +++ b/test/output/penguinSpeciesIslandSex.svg @@ -1,34 +1,62 @@ - + - + 0 - + + 5 + + + 10 - + + 15 + + + 20 - + + 25 + + + 30 - + + 35 + + + 40 - + + 45 + + + 50 - + + 55 + + + 60 - + + 65 + + + 70 ↑ Frequency @@ -46,7 +74,7 @@ - + FEMALE @@ -59,7 +87,7 @@ - + FEMALE @@ -72,7 +100,7 @@ - + FEMALE @@ -86,36 +114,36 @@ - - - - - - - - + + + + + + + + - + - - + + - + - - - + + + - + From 764cbdf6940892d3ec8911b6013bb8f6ddbfafaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 22 Apr 2021 14:56:05 +0200 Subject: [PATCH 03/13] if y is not ordinal, give it some more space as if it were or cardinality 6 --- src/plot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plot.js b/src/plot.js index c51e155b15..fe9e736ca9 100644 --- a/src/plot.js +++ b/src/plot.js @@ -138,7 +138,7 @@ function ScaleFunctions(scales) { } function autoHeight(y, fy, fx) { - const ny = y && ["ordinal", "point"].includes(y.type) && length(y.domain) || 1; + const ny = y && ["ordinal", "point"].includes(y.type) && length(y.domain) || 6; const nfy = fy && ["ordinal", "point"].includes(fy.type) && length(fy.domain) || 1; return !!(y || fy) * clamp(ny * nfy * 16, 336, 1200) + !!fx * 30 + 60; } From 85512a5995524b50e4d98c1394c84a510f054c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Fri, 23 Apr 2021 14:36:06 +0200 Subject: [PATCH 04/13] - use the computed domain - y is always either ordinal or quantitative - fy is always ordinal --- src/plot.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/plot.js b/src/plot.js index fe9e736ca9..4b5a3dc655 100644 --- a/src/plot.js +++ b/src/plot.js @@ -138,15 +138,11 @@ function ScaleFunctions(scales) { } function autoHeight(y, fy, fx) { - const ny = y && ["ordinal", "point"].includes(y.type) && length(y.domain) || 6; - const nfy = fy && ["ordinal", "point"].includes(fy.type) && length(fy.domain) || 1; + const ny = y && y.type === "ordinal" && y.scale.domain().length || 6; + const nfy = fy && fy.scale.domain().length || 1; return !!(y || fy) * clamp(ny * nfy * 16, 336, 1200) + !!fx * 30 + 60; } function clamp(x, lo, hi) { return x < lo ? lo : x > hi ? hi : x; } - -function length(iterator) { - return Array.from(iterator).length; -} From c194c9fe2f4f28fca496e4db7035a70e9af2c32b Mon Sep 17 00:00:00 2001 From: Mike Bostock Date: Sat, 1 May 2021 19:30:40 -0700 Subject: [PATCH 05/13] tidy --- src/plot.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/plot.js b/src/plot.js index 4b5a3dc655..ab90df7bd2 100644 --- a/src/plot.js +++ b/src/plot.js @@ -97,7 +97,7 @@ export function plot(options = {}) { } function Dimensions( - {y, fy, fx}, + scales, { x: {axis: xAxis} = {}, y: {axis: yAxis} = {}, @@ -106,7 +106,7 @@ function Dimensions( }, { width = 640, - height = autoHeight(y, fy, fx), + height = autoHeight(scales), facet: { marginTop: facetMarginTop = fxAxis === "top" ? 30 :0, marginRight: facetMarginRight = fyAxis === "right" ? 40 : 0, @@ -137,12 +137,8 @@ function ScaleFunctions(scales) { return Object.fromEntries(Object.entries(scales).map(([name, {scale}]) => [name, scale])); } -function autoHeight(y, fy, fx) { +function autoHeight({y, fy, fx}) { const ny = y && y.type === "ordinal" && y.scale.domain().length || 6; const nfy = fy && fy.scale.domain().length || 1; - return !!(y || fy) * clamp(ny * nfy * 16, 336, 1200) + !!fx * 30 + 60; -} - -function clamp(x, lo, hi) { - return x < lo ? lo : x > hi ? hi : x; + return !!(y || fy) * Math.max(336, Math.min(1200, ny * nfy * 16)) + !!fx * 30 + 60; } From bad4d732e86b99029d6028ed02ea254c819fc8ed Mon Sep 17 00:00:00 2001 From: Mike Bostock Date: Sat, 1 May 2021 19:36:20 -0700 Subject: [PATCH 06/13] tweak autoHeight --- src/plot.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plot.js b/src/plot.js index ab90df7bd2..d709d60c6f 100644 --- a/src/plot.js +++ b/src/plot.js @@ -138,7 +138,7 @@ function ScaleFunctions(scales) { } function autoHeight({y, fy, fx}) { - const ny = y && y.type === "ordinal" && y.scale.domain().length || 6; - const nfy = fy && fy.scale.domain().length || 1; - return !!(y || fy) * Math.max(336, Math.min(1200, ny * nfy * 16)) + !!fx * 30 + 60; + const ny = y && y.type === "ordinal" ? y.scale.domain().length : 6; + const nfy = fy ? fy.scale.domain().length : 1; + return !!(y || fy) * Math.max(1, Math.min(60, ny * nfy)) * 20 + !!fx * 30 + 60; } From 42d95b457ae1a2ab265dada6ea6b51c28a25a6c0 Mon Sep 17 00:00:00 2001 From: Mike Bostock Date: Sat, 1 May 2021 19:43:22 -0700 Subject: [PATCH 07/13] fix non-ordinal autoHeight --- src/plot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plot.js b/src/plot.js index d709d60c6f..6a0b2b9249 100644 --- a/src/plot.js +++ b/src/plot.js @@ -138,7 +138,7 @@ function ScaleFunctions(scales) { } function autoHeight({y, fy, fx}) { - const ny = y && y.type === "ordinal" ? y.scale.domain().length : 6; + const ny = y && y.type === "ordinal" ? y.scale.domain().length : 17; const nfy = fy ? fy.scale.domain().length : 1; return !!(y || fy) * Math.max(1, Math.min(60, ny * nfy)) * 20 + !!fx * 30 + 60; } From 717f7b492ff7fb003d0af8a514dd59c4f7a9dcb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Thu, 22 Apr 2021 14:05:44 +0200 Subject: [PATCH 08/13] automatic height closes #323 --- src/plot.js | 16 +++++++++++++++- test/plots/athletes-sport-sex.js | 1 - 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/plot.js b/src/plot.js index cab7945e85..d14c29aff7 100644 --- a/src/plot.js +++ b/src/plot.js @@ -107,7 +107,7 @@ function Dimensions( }, { width = 640, - height = y || fy ? 396 : fx ? 90 : 60, + height = autoHeight(y, fy, fx), facet: { marginTop: facetMarginTop = fxAxis === "top" ? 30 : 0, marginRight: facetMarginRight = fyAxis === "right" ? 40 : 0, @@ -137,3 +137,17 @@ function Dimensions( function ScaleFunctions(scales) { return Object.fromEntries(Object.entries(scales).map(([name, {scale}]) => [name, scale])); } + +function autoHeight(y, fy, fx) { + const ny = y && ["ordinal", "point"].includes(y.type) && length(y.domain) || 1; + const nfy = fy && ["ordinal", "point"].includes(fy.type) && length(fy.domain) || 1; + return !!(y || fy) * clamp(ny * nfy * 16, 336, 1200) + !!fx * 30 + 60; +} + +function clamp(x, lo, hi) { + return x < lo ? lo : x > hi ? hi : x; +} + +function length(iterator) { + return Array.from(iterator).length; +} diff --git a/test/plots/athletes-sport-sex.js b/test/plots/athletes-sport-sex.js index 608e3b85d4..a67983e47d 100644 --- a/test/plots/athletes-sport-sex.js +++ b/test/plots/athletes-sport-sex.js @@ -6,7 +6,6 @@ export default async function() { const female = data => d3.mean(data, d => d.sex === "female"); return Plot.plot({ marginLeft: 100, - height: 500, x: { label: "Women (%) →", domain: [0, 100], From d1abb341aedf58318caf8852d4a41ed7974fbe54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sun, 2 May 2021 10:30:10 +0200 Subject: [PATCH 09/13] rebase --- test/output/athletesSportSex.svg | 138 ++++++++--------- test/output/ballotStatusRace.svg | 104 ++++++------- test/output/caltrain.svg | 12 ++ test/output/mobyDickFaceted.svg | 148 +++++++++---------- test/output/penguinMassSexSpecies.svg | 146 +++++++++--------- test/output/penguinSpeciesIslandRelative.svg | 40 ++--- test/output/penguinSpeciesIslandSex.svg | 84 +++++++---- 7 files changed, 356 insertions(+), 316 deletions(-) diff --git a/test/output/athletesSportSex.svg b/test/output/athletesSportSex.svg index 7d4866de9d..1d14c77fda 100644 --- a/test/output/athletesSportSex.svg +++ b/test/output/athletesSportSex.svg @@ -1,164 +1,164 @@ - + - + boxing - + wrestling - + canoe - + cycling - + equestrian - + shooting - + judo - + rowing - + weightlifting - + sailing - + football - + tennis - + athletics - + golf - + rugby sevens - + aquatics - + handball - + archery - + badminton - + basketball - + hockey - + modern pentathlon - + table tennis - + taekwondo - + triathlon - + volleyball - + fencing - + gymnastics - + - 0 + 0 - 10 + 10 - 20 + 20 - 30 + 30 - 40 + 40 - 50 + 50 - 60 + 60 - 70 + 70 - 80 + 80 - 90 + 90 - 100 + 100 Women (%) → - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/ballotStatusRace.svg b/test/output/ballotStatusRace.svg index 3e4c95c108..5d6d460361 100644 --- a/test/output/ballotStatusRace.svg +++ b/test/output/ballotStatusRace.svg @@ -1,172 +1,172 @@ - + - + WHITE - + UNDESIGNATED - + ASIAN - + OTHER - + TWO or MORE RACES - + INDIAN AMERICAN or ALASKA NATIVE - + BLACK or AFRICAN AMERICAN - + NATIVE HAWAIIAN or PACIFIC ISLANDER - + 0 - + 20 - + 40 - + 60 - + Frequency (%) → - + 79.0% - + 0.4% - + 20.5% - + - + - + 78.3% - + 0.6% - + 21.1% - + - + - + 77.9% - + 21.5% - + 0.6% - + - + - + 74.1% - + 0.8% - + 25.1% - + - + - + 73.9% - + 25.3% - + 0.8% - + - + - + 25.5% - + 72.2% - + 2.3% - + - + - + 67.4% - + 31.5% - + 1.1% - + - + - + 41.7% - + 58.3% - + diff --git a/test/output/caltrain.svg b/test/output/caltrain.svg index 259d32e916..d64ca2dc0f 100644 --- a/test/output/caltrain.svg +++ b/test/output/caltrain.svg @@ -1,3 +1,4 @@ +<<<<<<< HEAD Northbound Southbound @@ -7,5 +8,16 @@ +======= + + Northbound + Southbound + 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a + 010101010105050506061011111116161616162123232324242436363636384141414141415454 + 010101020303030303030312121218181821252525262626263636363838384449495151515757 + + + +>>>>>>> fix tests \ No newline at end of file diff --git a/test/output/mobyDickFaceted.svg b/test/output/mobyDickFaceted.svg index cfbfa558ad..c0f92dd178 100644 --- a/test/output/mobyDickFaceted.svg +++ b/test/output/mobyDickFaceted.svg @@ -1,9 +1,9 @@ - + - + lower - + upper @@ -18,70 +18,70 @@ - + 0 - + 200 - + 400 - + 600 - + 800 - + 1,000 - + 1,200 ↑ Frequency - + - + 0 - + 200 - + 400 - + 600 - + 800 - + 1,000 - + 1,200 - + A @@ -163,7 +163,7 @@ - + A @@ -246,78 +246,78 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + diff --git a/test/output/penguinMassSexSpecies.svg b/test/output/penguinMassSexSpecies.svg index c2e8304410..d141c26d17 100644 --- a/test/output/penguinMassSexSpecies.svg +++ b/test/output/penguinMassSexSpecies.svg @@ -1,14 +1,14 @@ - + - + Adelie - + Chinstrap - + Gentoo - species + species @@ -22,65 +22,65 @@ sex - + - + 0 - + 10 - + 20 - + 30 - + 40 ↑ Frequency - + - + 0 - + 10 - + 20 - + 30 - + 40 - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 4,000 @@ -90,7 +90,7 @@ - + 4,000 @@ -100,7 +100,7 @@ - + 4,000 @@ -109,95 +109,95 @@ Body mass (g) → - + - - - + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - + - + - - + + - + diff --git a/test/output/penguinSpeciesIslandRelative.svg b/test/output/penguinSpeciesIslandRelative.svg index 63c23a1102..b7ac9f2545 100644 --- a/test/output/penguinSpeciesIslandRelative.svg +++ b/test/output/penguinSpeciesIslandRelative.svg @@ -1,40 +1,40 @@ - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 - + 60 - + 70 - + 80 - + 90 100 ↑ Frequency (%) - + Adelie @@ -48,28 +48,28 @@ - - - + + + - + - + - + - + - + diff --git a/test/output/penguinSpeciesIslandSex.svg b/test/output/penguinSpeciesIslandSex.svg index 499c779d6c..56567db28f 100644 --- a/test/output/penguinSpeciesIslandSex.svg +++ b/test/output/penguinSpeciesIslandSex.svg @@ -1,34 +1,62 @@ - + - + 0 - + + 5 + + + 10 - + + 15 + + + 20 - + + 25 + + + 30 - + + 35 + + + 40 - + + 45 + + + 50 - + + 55 + + + 60 - + + 65 + + + 70 ↑ Frequency @@ -46,7 +74,7 @@ - + FEMALE @@ -59,7 +87,7 @@ - + FEMALE @@ -72,7 +100,7 @@ - + FEMALE @@ -86,36 +114,36 @@ - - - - - - - - + + + + + + + + - + - - + + - + - - - + + + - + From 817051840c72c6522069a89a23ca70d37c344321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sun, 2 May 2021 10:31:13 +0200 Subject: [PATCH 10/13] rebase more --- test/output/caltrain.svg | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/test/output/caltrain.svg b/test/output/caltrain.svg index d64ca2dc0f..c7a0b75bb0 100644 --- a/test/output/caltrain.svg +++ b/test/output/caltrain.svg @@ -1,23 +1,11 @@ -<<<<<<< HEAD - - Northbound - Southbound - 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a - 010101010105050506061011111116161616162123232324242436363636384141414141415454 - 010101020303030303030312121218181821252525262626263636363838384449495151515757 - - - -======= - Northbound - Southbound - 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a - 010101010105050506061011111116161616162123232324242436363636384141414141415454 - 010101020303030303030312121218181821252525262626263636363838384449495151515757 + Northbound + Southbound + 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a + 010101010105050506061011111116161616162123232324242436363636384141414141415454 + 010101020303030303030312121218181821252525262626263636363838384449495151515757 - - ->>>>>>> fix tests + + \ No newline at end of file From 6a4065e03ee457594cc27008863ac1085c2c9b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sun, 2 May 2021 10:34:34 +0200 Subject: [PATCH 11/13] plot outputs --- test/output/aaplCandlestick.svg | 512 +- test/output/aaplChangeVolume.svg | 2568 +++---- test/output/aaplClose.svg | 30 +- test/output/aaplMonthly.svg | 398 +- test/output/aaplVolume.svg | 54 +- test/output/athletesNationality.svg | 96 +- test/output/athletesSexWeight.svg | 130 +- test/output/athletesSportSex.svg | 138 +- test/output/athletesWeight.svg | 168 +- test/output/athletesWeightCumulative.svg | 168 +- test/output/ballotStatusRace.svg | 106 +- test/output/caltrain.svg | 27 +- test/output/carsParcoords.svg | 840 +-- test/output/crimeanWarOverlapped.svg | 178 +- test/output/crimeanWarStacked.svg | 164 +- test/output/empty.svg | 48 +- test/output/figcaption.html | 84 +- test/output/figcaptionHtml.html | 84 +- test/output/fruitSales.svg | 22 +- test/output/fruitSalesDate.svg | 34 +- test/output/gistempAnomaly.svg | 3312 ++++----- test/output/gistempAnomalyMoving.svg | 3314 ++++----- test/output/identityScale.svg | 4 +- test/output/industryUnemployment.svg | 50 +- test/output/industryUnemploymentShare.svg | 54 +- test/output/industryUnemploymentStream.svg | 48 +- test/output/letterFrequencyCloud.svg | 4 +- test/output/letterFrequencyColumn.svg | 84 +- test/output/letterFrequencyLollipop.svg | 134 +- test/output/metroInequality.svg | 450 +- test/output/metroInequalityChange.svg | 844 +-- test/output/metroUnemployment.svg | 114 +- test/output/metroUnemploymentHighlight.svg | 114 +- test/output/metroUnemploymentIndex.svg | 20 +- test/output/metroUnemploymentMoving.svg | 114 +- test/output/metroUnemploymentNormalize.svg | 110 +- test/output/mobyDickFaceted.svg | 196 +- test/output/mobyDickLetterFrequency.svg | 84 +- .../mobyDickLetterRelativeFrequency.svg | 84 +- test/output/morleyBoxplot.svg | 80 +- test/output/moviesProfitByGenre.svg | 6500 ++++++++--------- test/output/musicRevenue.svg | 122 +- test/output/ordinalBar.svg | 32 +- test/output/penguinMass.svg | 42 +- test/output/penguinMassSex.svg | 152 +- test/output/penguinMassSexSpecies.svg | 174 +- test/output/penguinMassSpecies.svg | 58 +- test/output/penguinSex.svg | 30 +- test/output/penguinSpeciesIsland.svg | 32 +- test/output/penguinSpeciesIslandRelative.svg | 40 +- test/output/penguinSpeciesIslandSex.svg | 70 +- test/output/policeDeaths.svg | 14 +- test/output/randomWalk.svg | 32 +- test/output/seattleTemperatureBand.svg | 2942 ++++---- test/output/sfTemperatureBand.svg | 28 +- test/output/sfTemperatureBandArea.svg | 38 +- test/output/simpsonsRatingsDots.svg | 1272 ++-- test/output/stocksIndex.svg | 36 +- test/output/travelersYearOverYear.svg | 44 +- test/output/uniformRandomDifference.svg | 108 +- test/output/usPopulationStateAge.svg | 982 +-- test/output/usRetailSales.svg | 34 +- test/output/wordLengthMobyDick.svg | 54 +- 63 files changed, 14022 insertions(+), 13877 deletions(-) diff --git a/test/output/aaplCandlestick.svg b/test/output/aaplCandlestick.svg index e3f094b21e..dd3e08358e 100644 --- a/test/output/aaplCandlestick.svg +++ b/test/output/aaplCandlestick.svg @@ -1,306 +1,306 @@ - + - + 155 - + 160 - + 165 - + 170 - + 175 - + 180 - + 185 - + 190 ↑ Apple stock price ($) - + - December + December - 2018 + 2018 - February + February - March + March - April + April - May + May - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/aaplChangeVolume.svg b/test/output/aaplChangeVolume.svg index fd2d702fc3..ec07fa6c3b 100644 --- a/test/output/aaplChangeVolume.svg +++ b/test/output/aaplChangeVolume.svg @@ -1,1359 +1,1359 @@ - + - + 7.1 - + 7.2 - + 7.3 - + 7.4 - + 7.5 - + 7.6 - + 7.7 - + 7.8 - + 7.9 - + 8.0 - + 8.1 - + 8.2 - + 8.3 - + 8.4 ↑ Volume (log₁₀) - + - −6 + −6 - −4 + −4 - −2 + −2 - +0 + +0 - +2 + +2 - +4 + +4 - +6 + +6 - +8 + +8 Daily change (%) → - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/aaplClose.svg b/test/output/aaplClose.svg index e6b5663a8a..9ed31e3ee0 100644 --- a/test/output/aaplClose.svg +++ b/test/output/aaplClose.svg @@ -1,47 +1,47 @@ - + - + 0 - + 20 - + 40 - + 60 - + 80 - + 100 - + 120 - + 140 - + 160 - + 180 ↑ Close - + 2014 @@ -59,12 +59,12 @@ - + - + - + \ No newline at end of file diff --git a/test/output/aaplMonthly.svg b/test/output/aaplMonthly.svg index 4ed20a6ce3..c28af133ce 100644 --- a/test/output/aaplMonthly.svg +++ b/test/output/aaplMonthly.svg @@ -1,49 +1,49 @@ - + - + 0 - + 20 - + 40 - + 60 - + 80 - + 100 - + 120 - + 140 - + 160 - + 180 - + 200 - + 220 - + 240 260 ↑ Daily trade volume (millions) - + 2014 @@ -61,195 +61,195 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/aaplVolume.svg b/test/output/aaplVolume.svg index b0c318ee49..d3c5e91ce0 100644 --- a/test/output/aaplVolume.svg +++ b/test/output/aaplVolume.svg @@ -1,43 +1,43 @@ - + - + 0 - + 2 - + 4 - + 6 - + 8 - + 10 - + 12 - + 14 - + 16 ↑ Frequency (%) - + 7.0 @@ -64,23 +64,23 @@ Trade volume (log₁₀) → - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/athletesNationality.svg b/test/output/athletesNationality.svg index 351365a68b..89319fc076 100644 --- a/test/output/athletesNationality.svg +++ b/test/output/athletesNationality.svg @@ -1,112 +1,112 @@ - + - + USA - + BRA - + GER - + AUS - + FRA - + CHN - + GBR - + JPN - + CAN - + ESP - + ITA - + RUS - + NED - + POL - + ARG - + KOR - + NZL - + UKR - + SWE - + COL - + - 0 + 0 - 100 + 100 - 200 + 200 - 300 + 300 - 400 + 400 - 500 + 500 Frequency → - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/athletesSexWeight.svg b/test/output/athletesSexWeight.svg index db585104bd..def56a2ea8 100644 --- a/test/output/athletesSexWeight.svg +++ b/test/output/athletesSexWeight.svg @@ -1,51 +1,51 @@ - + - + 0 - + 100 - + 200 - + 300 - + 400 - + 500 - + 600 - + 700 - + 800 - + 900 - + 1,000 ↑ Frequency - + 40 @@ -69,59 +69,59 @@ weight → - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/athletesSportSex.svg b/test/output/athletesSportSex.svg index 1d14c77fda..3d1a5fffb7 100644 --- a/test/output/athletesSportSex.svg +++ b/test/output/athletesSportSex.svg @@ -1,164 +1,164 @@ - + - + boxing - + wrestling - + canoe - + cycling - + equestrian - + shooting - + judo - + rowing - + weightlifting - + sailing - + football - + tennis - + athletics - + golf - + rugby sevens - + aquatics - + handball - + archery - + badminton - + basketball - + hockey - + modern pentathlon - + table tennis - + taekwondo - + triathlon - + volleyball - + fencing - + gymnastics - + - 0 + 0 - 10 + 10 - 20 + 20 - 30 + 30 - 40 + 40 - 50 + 50 - 60 + 60 - 70 + 70 - 80 + 80 - 90 + 90 - 100 + 100 Women (%) → - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/athletesWeight.svg b/test/output/athletesWeight.svg index 2a99cdc290..64a015a518 100644 --- a/test/output/athletesWeight.svg +++ b/test/output/athletesWeight.svg @@ -1,46 +1,46 @@ - + - + 0 - + 50 - + 100 - + 150 - + 200 - + 250 - + 300 - + 350 - + 400 - + 450 - + 500 - + 550 - + 600 ↑ Frequency - + 40 @@ -64,74 +64,74 @@ weight → - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/athletesWeightCumulative.svg b/test/output/athletesWeightCumulative.svg index f23010d4da..8325d3041c 100644 --- a/test/output/athletesWeightCumulative.svg +++ b/test/output/athletesWeightCumulative.svg @@ -1,40 +1,40 @@ - + - + 0 - + 1,000 - + 2,000 - + 3,000 - + 4,000 - + 5,000 - + 6,000 - + 7,000 - + 8,000 - + 9,000 - + 10,000 ↑ Frequency - + 40 @@ -58,76 +58,76 @@ weight → - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/ballotStatusRace.svg b/test/output/ballotStatusRace.svg index 5d6d460361..6f620e501e 100644 --- a/test/output/ballotStatusRace.svg +++ b/test/output/ballotStatusRace.svg @@ -1,172 +1,172 @@ - + - + WHITE - + UNDESIGNATED - + ASIAN - + OTHER - + TWO or MORE RACES - + INDIAN AMERICAN or ALASKA NATIVE - + BLACK or AFRICAN AMERICAN - + NATIVE HAWAIIAN or PACIFIC ISLANDER - + 0 - + 20 - + 40 - + 60 - + Frequency (%) → - + - + 79.0% - + 0.4% - + 20.5% - + - + - + 78.3% - + 0.6% - + 21.1% - + - + - + 77.9% - + 21.5% - + 0.6% - + - + - + 74.1% - + 0.8% - + 25.1% - + - + - + 73.9% - + 25.3% - + 0.8% - + - + - + 25.5% - + 72.2% - + 2.3% - + - + - + 67.4% - + 31.5% - + 1.1% - + - + - + 41.7% - + 58.3% - + diff --git a/test/output/caltrain.svg b/test/output/caltrain.svg index b47ef289a1..b7ba4437ed 100644 --- a/test/output/caltrain.svg +++ b/test/output/caltrain.svg @@ -1,22 +1,11 @@ - -<<<<<<< HEAD - Northbound - Southbound - 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a - 010101010105050506061011111116161616162123232324242436363636384141414141415454 - 010101020303030303030312121218181821252525262626263636363838384449495151515757 + + Northbound + Southbound + 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a + 010101010105050506061011111116161616162123232324242436363636384141414141415454 + 010101020303030303030312121218181821252525262626263636363838384449495151515757 - - -======= - Northbound - Southbound - 5a8p9p10p11p8a9a5p6p10a11a12p1p2p3p4p6a7a7p12a - 010101010105050506061011111116161616162123232324242436363636384141414141415454 - 010101020303030303030312121218181821252525262626263636363838384449495151515757 - - - ->>>>>>> mbostock/auto-height + + \ No newline at end of file diff --git a/test/output/carsParcoords.svg b/test/output/carsParcoords.svg index 314f0e4b7b..fb6f45a449 100644 --- a/test/output/carsParcoords.svg +++ b/test/output/carsParcoords.svg @@ -1,441 +1,441 @@ - + - + economy (mpg) - + cylinders - + displacement (cc) - + power (hp) - + weight (lb) - + 0-60 mph (s) - + year - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 1015202530354045345678100150200250300350400450608010012014016018020022020002500300035004000450050008101214161820222470727476788082 - 1015202530354045345678100150200250300350400450608010012014016018020022020002500300035004000450050008101214161820222470727476788082 + 1015202530354045345678100150200250300350400450608010012014016018020022020002500300035004000450050008101214161820222470727476788082 + 1015202530354045345678100150200250300350400450608010012014016018020022020002500300035004000450050008101214161820222470727476788082 \ No newline at end of file diff --git a/test/output/crimeanWarOverlapped.svg b/test/output/crimeanWarOverlapped.svg index 66ce25e23c..c7ba706d3b 100644 --- a/test/output/crimeanWarOverlapped.svg +++ b/test/output/crimeanWarOverlapped.svg @@ -1,49 +1,49 @@ - + - + 0 - + 200 - + 400 - + 600 - + 800 - + 1,000 - + 1,200 - + 1,400 - + 1,600 - + 1,800 - + 2,000 - + 2,200 - + 2,400 - + 2,600 ↑ deaths - + Apr @@ -118,80 +118,80 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/crimeanWarStacked.svg b/test/output/crimeanWarStacked.svg index d6f767128d..f2eae27f53 100644 --- a/test/output/crimeanWarStacked.svg +++ b/test/output/crimeanWarStacked.svg @@ -1,28 +1,28 @@ - + - + 0 - + 500 - + 1,000 - + 1,500 - + 2,000 - + 2,500 - + 3,000 ↑ deaths - + Apr @@ -97,80 +97,80 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/empty.svg b/test/output/empty.svg index a1f1e07e1a..0cc4729c0a 100644 --- a/test/output/empty.svg +++ b/test/output/empty.svg @@ -1,42 +1,42 @@ - + - + 0.0 - + 0.1 - + 0.2 - + 0.3 - + 0.4 - + 0.5 - + 0.6 - + 0.7 - + 0.8 - + 0.9 @@ -45,51 +45,51 @@ 1.0 - + - 0.0 + 0.0 - 0.1 + 0.1 - 0.2 + 0.2 - 0.3 + 0.3 - 0.4 + 0.4 - 0.5 + 0.5 - 0.6 + 0.6 - 0.7 + 0.7 - 0.8 + 0.8 - 0.9 + 0.9 - 1.0 + 1.0 - + \ No newline at end of file diff --git a/test/output/figcaption.html b/test/output/figcaption.html index ce317a3dd3..822194ec6f 100644 --- a/test/output/figcaption.html +++ b/test/output/figcaption.html @@ -1,59 +1,59 @@ -
+
- + 0 - + 1 - + 2 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 9 - + 10 - + 11 - + 12 ↑ Frequency (%) - + A @@ -134,35 +134,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - +
The relative frequency of letters in the English language. Data: Robert Edward Lewand
diff --git a/test/output/figcaptionHtml.html b/test/output/figcaptionHtml.html index 30cc265acb..f0c8da2b4b 100644 --- a/test/output/figcaptionHtml.html +++ b/test/output/figcaptionHtml.html @@ -1,59 +1,59 @@ -
+
- + 0 - + 1 - + 2 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 9 - + 10 - + 11 - + 12 ↑ Frequency (%) - + A @@ -134,35 +134,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - +
Figure 1. The relative frequency of letters in the English language. Data: Cryptographical Mathematics diff --git a/test/output/fruitSales.svg b/test/output/fruitSales.svg index 2bd1245ad7..b5f7c125da 100644 --- a/test/output/fruitSales.svg +++ b/test/output/fruitSales.svg @@ -1,19 +1,19 @@ - + - + apples - + bananas - + grapes - + oranges - + 0 @@ -49,12 +49,12 @@ units → - - - - + + + + - + \ No newline at end of file diff --git a/test/output/fruitSalesDate.svg b/test/output/fruitSalesDate.svg index 6c25f881a1..6fbe1d28fd 100644 --- a/test/output/fruitSalesDate.svg +++ b/test/output/fruitSalesDate.svg @@ -1,28 +1,28 @@ - + - + 0 - + 5 - + 10 - + 15 - + 20 - + 25 - + 30 ↑ units - + 2021-03-15 @@ -31,13 +31,13 @@ date - - - - - - - + + + + + + + - applesorangesgrapesapplesorangesgrapesbananas + applesorangesgrapesapplesorangesgrapesbananas \ No newline at end of file diff --git a/test/output/gistempAnomaly.svg b/test/output/gistempAnomaly.svg index b5c83475c6..72841d0155 100644 --- a/test/output/gistempAnomaly.svg +++ b/test/output/gistempAnomaly.svg @@ -1,47 +1,47 @@ - + - + −0.6 - + −0.4 - + −0.2 - + +0.0 - + +0.2 - + +0.4 - + +0.6 - + +0.8 - + +1.0 - + +1.2 ↑ Temperature anomaly (°C) - + 1880 @@ -65,1652 +65,1652 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/test/output/gistempAnomalyMoving.svg b/test/output/gistempAnomalyMoving.svg index 6057eb1266..e37aa50e36 100644 --- a/test/output/gistempAnomalyMoving.svg +++ b/test/output/gistempAnomalyMoving.svg @@ -1,47 +1,47 @@ - + - + −0.6 - + −0.4 - + −0.2 - + +0.0 - + +0.2 - + +0.4 - + +0.6 - + +0.8 - + +1.0 - + +1.2 ↑ Temperature anomaly (°C) - + 1880 @@ -65,1655 +65,1655 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/identityScale.svg b/test/output/identityScale.svg index 8227c3569a..475b06d6fe 100644 --- a/test/output/identityScale.svg +++ b/test/output/identityScale.svg @@ -1,4 +1,4 @@ - + 350 @@ -22,7 +22,7 @@ 50 - + 100 diff --git a/test/output/industryUnemployment.svg b/test/output/industryUnemployment.svg index d8a28672e7..5305274f1d 100644 --- a/test/output/industryUnemployment.svg +++ b/test/output/industryUnemployment.svg @@ -1,39 +1,39 @@ - + - + 0 - + 2,000 - + 4,000 - + 6,000 - + 8,000 - + 10,000 - + 12,000 - + 14,000 ↑ unemployed - + 2000 @@ -69,50 +69,50 @@ - + Wholesale and Retail Trade - + Manufacturing - + Leisure and hospitality - + Business services - + Construction - + Education and Health - + Government - + Finance - + Self-employed - + Other - + Transportation and Utilities - + Information - + Agriculture - + Mining and Extraction - + \ No newline at end of file diff --git a/test/output/industryUnemploymentShare.svg b/test/output/industryUnemploymentShare.svg index c19e06e2c7..36c8143875 100644 --- a/test/output/industryUnemploymentShare.svg +++ b/test/output/industryUnemploymentShare.svg @@ -1,42 +1,42 @@ - + - + 0% - + 10% - + 20% - + 30% - + 40% - + 50% - + 60% - + 70% - + 80% - + 90% @@ -45,7 +45,7 @@ 100% ↑ unemployed - + 2000 @@ -81,50 +81,50 @@ - + Wholesale and Retail Trade - + Manufacturing - + Leisure and hospitality - + Business services - + Construction - + Education and Health - + Government - + Finance - + Self-employed - + Other - + Transportation and Utilities - + Information - + Agriculture - + Mining and Extraction - + \ No newline at end of file diff --git a/test/output/industryUnemploymentStream.svg b/test/output/industryUnemploymentStream.svg index bff233c08c..f2728a748c 100644 --- a/test/output/industryUnemploymentStream.svg +++ b/test/output/industryUnemploymentStream.svg @@ -1,31 +1,31 @@ - + - + 0 - + 2,000 - + 4,000 - + 6,000 - + 8,000 - + 10,000 - + 12,000 - + 14,000 ↑ unemployed - + 2000 @@ -61,46 +61,46 @@ - + Wholesale and Retail Trade - + Manufacturing - + Leisure and hospitality - + Business services - + Construction - + Education and Health - + Government - + Finance - + Self-employed - + Other - + Transportation and Utilities - + Information - + Agriculture - + Mining and Extraction diff --git a/test/output/letterFrequencyCloud.svg b/test/output/letterFrequencyCloud.svg index 73077b7372..c91e69a627 100644 --- a/test/output/letterFrequencyCloud.svg +++ b/test/output/letterFrequencyCloud.svg @@ -1,3 +1,3 @@ - - ETAOINSHRDLCUMWFGYPBVKJXQZ + + ETAOINSHRDLCUMWFGYPBVKJXQZ \ No newline at end of file diff --git a/test/output/letterFrequencyColumn.svg b/test/output/letterFrequencyColumn.svg index ba8d694631..e83fc2086b 100644 --- a/test/output/letterFrequencyColumn.svg +++ b/test/output/letterFrequencyColumn.svg @@ -1,59 +1,59 @@ - + - + 0 - + 1 - + 2 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 9 - + 10 - + 11 - + 12 ↑ Frequency (%) - + A @@ -134,34 +134,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/letterFrequencyLollipop.svg b/test/output/letterFrequencyLollipop.svg index 0d4f6f1e12..68797494c6 100644 --- a/test/output/letterFrequencyLollipop.svg +++ b/test/output/letterFrequencyLollipop.svg @@ -1,59 +1,59 @@ - + - + 0.00 - + 0.01 - + 0.02 - + 0.03 - + 0.04 - + 0.05 - + 0.06 - + 0.07 - + 0.08 - + 0.09 - + 0.10 - + 0.11 - + 0.12 ↑ frequency - + A @@ -134,62 +134,62 @@ letter - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/metroInequality.svg b/test/output/metroInequality.svg index 15a86360c5..415acca054 100644 --- a/test/output/metroInequality.svg +++ b/test/output/metroInequality.svg @@ -1,46 +1,46 @@ - + - + 3.4 - + 3.6 - + 3.8 - + 4.0 - + 4.2 - + 4.4 - + 4.6 - + 4.8 - + 5.0 - + 5.2 - + 5.4 @@ -49,275 +49,275 @@ 5.6 ↑ Inequality - + - 200k + 200k - 300k + 300k - + - + - + - + - + - + - 1M + 1M - 2M + 2M - 3M + 3M - + - + - + - + - + - + - 10M + 10M Population → - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/metroInequalityChange.svg b/test/output/metroInequalityChange.svg index 1234a1c95f..e1e1d87c2f 100644 --- a/test/output/metroInequalityChange.svg +++ b/test/output/metroInequalityChange.svg @@ -1,521 +1,521 @@ - + - + 3.5 - + 4.0 - + 4.5 - + 5.0 - + 5.5 - + 6.0 - + 6.5 - + 7.0 - + 7.5 - + 8.0 - + 8.5 ↑ Inequality - + - 200k + 200k - 300k + 300k - + - + - + - + - + - + - 1M + 1M - 2M + 2M - 3M + 3M - + - + - + - + - + - + - 10M + 10M - 20M + 20M Population → - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - New YorkChicagoHoustonWashington, D.C.San FranciscoSan JoseFairfield, Conn.Binghamton, N.Y. + New YorkChicagoHoustonWashington, D.C.San FranciscoSan JoseFairfield, Conn.Binghamton, N.Y. \ No newline at end of file diff --git a/test/output/metroUnemployment.svg b/test/output/metroUnemployment.svg index 5d67d1862d..6110dbd094 100644 --- a/test/output/metroUnemployment.svg +++ b/test/output/metroUnemployment.svg @@ -1,34 +1,34 @@ - + - + 0 - + 2 - + 4 - + 6 - + 8 - + 10 - + 12 - + 14 - + 16 ↑ unemployment - + 2000 @@ -52,53 +52,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/metroUnemploymentHighlight.svg b/test/output/metroUnemploymentHighlight.svg index d800ca4120..d83ffb6fe1 100644 --- a/test/output/metroUnemploymentHighlight.svg +++ b/test/output/metroUnemploymentHighlight.svg @@ -1,43 +1,43 @@ - + - + 0 - + 2 - + 4 - + 6 - + 8 - + 10 - + 12 - + 14 - + 16 ↑ Unemployment (%) - + 2000 @@ -61,53 +61,53 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/metroUnemploymentIndex.svg b/test/output/metroUnemploymentIndex.svg index 88bebd3579..cd5e4f61f7 100644 --- a/test/output/metroUnemploymentIndex.svg +++ b/test/output/metroUnemploymentIndex.svg @@ -1,28 +1,28 @@ - + - + 4 - + 6 - + 8 - + 10 - + 12 - + 14 - + 16 ↑ unemployment - + 0 @@ -49,6 +49,6 @@ - + \ No newline at end of file diff --git a/test/output/metroUnemploymentMoving.svg b/test/output/metroUnemploymentMoving.svg index b9d2fc845c..ba6522aff2 100644 --- a/test/output/metroUnemploymentMoving.svg +++ b/test/output/metroUnemploymentMoving.svg @@ -1,34 +1,34 @@ - + - + 0 - + 2 - + 4 - + 6 - + 8 - + 10 - + 12 - + 14 - + 16 ↑ unemployment - + 2000 @@ -52,53 +52,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/metroUnemploymentNormalize.svg b/test/output/metroUnemploymentNormalize.svg index 603d55d0e5..ff133dff5d 100644 --- a/test/output/metroUnemploymentNormalize.svg +++ b/test/output/metroUnemploymentNormalize.svg @@ -1,35 +1,35 @@ - + - + 0.8× - + 0.9× - + 1× - + 2× - + 3× - + 4× - + 5× ↑ Change in unemployment (%) - + 2000 @@ -53,53 +53,53 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/mobyDickFaceted.svg b/test/output/mobyDickFaceted.svg index c0f92dd178..527a9a1077 100644 --- a/test/output/mobyDickFaceted.svg +++ b/test/output/mobyDickFaceted.svg @@ -1,9 +1,9 @@ - + - + lower - + upper @@ -18,70 +18,118 @@ - + 0 - + + 100 + + + 200 - + + 300 + + + 400 - + + 500 + + + 600 - + + 700 + + + 800 - + + 900 + + + 1,000 - + + 1,100 + + + 1,200 ↑ Frequency - + - + 0 - + + 100 + + + 200 - + + 300 + + + 400 - + + 500 + + + 600 - + + 700 + + + 800 - + + 900 + + + 1,000 - + + 1,100 + + + 1,200 - + A @@ -163,7 +211,7 @@ - + A @@ -246,78 +294,78 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + diff --git a/test/output/mobyDickLetterFrequency.svg b/test/output/mobyDickLetterFrequency.svg index 5a395bbe21..02768f8e4c 100644 --- a/test/output/mobyDickLetterFrequency.svg +++ b/test/output/mobyDickLetterFrequency.svg @@ -1,59 +1,59 @@ - + - + 0 - + 100 - + 200 - + 300 - + 400 - + 500 - + 600 - + 700 - + 800 - + 900 - + 1,000 - + 1,100 - + 1,200 ↑ Frequency - + A @@ -134,34 +134,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/mobyDickLetterRelativeFrequency.svg b/test/output/mobyDickLetterRelativeFrequency.svg index 48ca645879..68c74144b0 100644 --- a/test/output/mobyDickLetterRelativeFrequency.svg +++ b/test/output/mobyDickLetterRelativeFrequency.svg @@ -1,59 +1,59 @@ - + - + 0 - + 1 - + 2 - + 3 - + 4 - + 5 - + 6 - + 7 - + 8 - + 9 - + 10 - + 11 - + 12 ↑ Frequency (%) - + A @@ -134,34 +134,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/morleyBoxplot.svg b/test/output/morleyBoxplot.svg index 60e2709a3d..d8c6f78e1f 100644 --- a/test/output/morleyBoxplot.svg +++ b/test/output/morleyBoxplot.svg @@ -1,86 +1,86 @@ - + - + 1 - + 2 - + 3 - + 4 - + 5 - Expt + Expt - + - 650 + 650 - 700 + 700 - 750 + 750 - 800 + 800 - 850 + 850 - 900 + 900 - 950 + 950 - 1,000 + 1,000 - 1,050 + 1,050 Speed → - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/test/output/moviesProfitByGenre.svg b/test/output/moviesProfitByGenre.svg index 4ada3d3902..a775086ac8 100644 --- a/test/output/moviesProfitByGenre.svg +++ b/test/output/moviesProfitByGenre.svg @@ -1,3305 +1,3305 @@ - + - + Adventure - + Action - + Horror - + Romantic Comedy - + Concert/Performance - + Musical - + Comedy - + Thriller/Suspense - + Drama - + Black Comedy - + Documentary - + Western - + Other - + - 0 + 0 - 200 + 200 - 400 + 400 - 600 + 600 - 800 + 800 - 1,000 + 1,000 Profit ($M) → - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/musicRevenue.svg b/test/output/musicRevenue.svg index 1c78526936..902b871a89 100644 --- a/test/output/musicRevenue.svg +++ b/test/output/musicRevenue.svg @@ -1,55 +1,55 @@ - + - + 0 - + 2 - + 4 - + 6 - + 8 - + 10 - + 12 - + 14 - + 16 - + 18 - + 20 - + 22 ↑ Annual revenue (billions, adj.) - + 1975 @@ -79,125 +79,125 @@ - + 8 - Track Tape - + CD Disc - + CD Single Disc - + Cassette Tape - + Cassette Single Tape - + DVD Audio Other - + Download Album Download - + Download Music Video Download - + Download Single Download - + Kiosk Other - + LP/EP Vinyl - + Limited Tier Paid Subscription Streaming - + Music Video (Physical) Other - + On-Demand Streaming (Ad-Supported) Streaming - + Other Ad-Supported Streaming Streaming - + Other Digital Download - + Other Tapes Tape - + Paid Subscription Streaming - + Ringtones & Ringbacks Download - + SACD Disc - + SoundExchange Distributions Streaming - + Synchronization Other - + Vinyl Single Vinyl - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/ordinalBar.svg b/test/output/ordinalBar.svg index c3ebb6fe82..c0d73223ce 100644 --- a/test/output/ordinalBar.svg +++ b/test/output/ordinalBar.svg @@ -1,35 +1,35 @@ - + - + 0 - + A - + B - + C - + D - + E - + F - + 0 @@ -50,14 +50,14 @@ - - - - - - + + + + + + - + \ No newline at end of file diff --git a/test/output/penguinMass.svg b/test/output/penguinMass.svg index 5f54b2432e..857ae07ced 100644 --- a/test/output/penguinMass.svg +++ b/test/output/penguinMass.svg @@ -1,47 +1,47 @@ - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 - + 60 - + 70 - + 80 - + 90 ↑ Frequency - + 2,500 @@ -71,16 +71,16 @@ Body mass (g) → - - - - - - - - + + + + + + + + - + \ No newline at end of file diff --git a/test/output/penguinMassSex.svg b/test/output/penguinMassSex.svg index b4d8c51f75..7fce60885d 100644 --- a/test/output/penguinMassSex.svg +++ b/test/output/penguinMassSex.svg @@ -1,16 +1,16 @@ - + - + FEMALE - + MALE - + - sex + sex - + 2,500 @@ -42,80 +42,152 @@ - + 0 - + + 5 + + + 10 + + + 15 + + 20 - + + 25 + + + 30 + + + 35 + + 40 + + + 45 + + + 50 ↑ Frequency - + - + 0 - + + 5 + + + 10 + + + 15 + + 20 - + + 25 + + + 30 + + + 35 + + 40 + + 45 + + + 50 + - + - + 0 - + + 5 + + + 10 + + + 15 + + 20 - + + 25 + + + 30 + + + 35 + + 40 + + 45 + + + 50 + - - - - - - + + + + + + - + - + - - - - - - - + + + + + + + - + - + - - - - - + + + + + - + diff --git a/test/output/penguinMassSexSpecies.svg b/test/output/penguinMassSexSpecies.svg index d141c26d17..3ec07b34e8 100644 --- a/test/output/penguinMassSexSpecies.svg +++ b/test/output/penguinMassSexSpecies.svg @@ -1,14 +1,14 @@ - + - + Adelie - + Chinstrap - + Gentoo - species + species @@ -24,63 +24,99 @@ - + 0 - + + 5 + + 10 - + + 15 + + 20 - + + 25 + + 30 - + + 35 + + 40 ↑ Frequency - + - + 0 - + + 5 + + 10 - + + 15 + + 20 - + + 25 + + 30 - + + 35 + + 40 - + - + 0 - + + 5 + + 10 - + + 15 + + 20 - + + 25 + + 30 - + + 35 + + 40 - + 4,000 @@ -90,7 +126,7 @@ - + 4,000 @@ -100,7 +136,7 @@ - + 4,000 @@ -111,93 +147,93 @@ - - - + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - - + + - + diff --git a/test/output/penguinMassSpecies.svg b/test/output/penguinMassSpecies.svg index 992cf5bd23..af05220a79 100644 --- a/test/output/penguinMassSpecies.svg +++ b/test/output/penguinMassSpecies.svg @@ -1,47 +1,47 @@ - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 - + 60 - + 70 - + 80 - + 90 ↑ Frequency - + 2,500 @@ -71,24 +71,24 @@ Body mass (g) → - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/penguinSex.svg b/test/output/penguinSex.svg index 6cb37e5b26..ed12b8cbf3 100644 --- a/test/output/penguinSex.svg +++ b/test/output/penguinSex.svg @@ -1,34 +1,34 @@ - + - + 0 - + 20 - + 40 - + 60 - + 80 - + 100 - + 120 - + 140 - + 160 ↑ Frequency - + FEMALE @@ -40,11 +40,11 @@ sex - - - + + + - + \ No newline at end of file diff --git a/test/output/penguinSpeciesIsland.svg b/test/output/penguinSpeciesIsland.svg index e828806a0e..cc449d8f7d 100644 --- a/test/output/penguinSpeciesIsland.svg +++ b/test/output/penguinSpeciesIsland.svg @@ -1,39 +1,39 @@ - + - + 0 - + 20 - + 40 - + 60 - + 80 - + 100 - + 120 - + 140 ↑ Frequency - + Adelie @@ -45,13 +45,13 @@ species - - - - - + + + + + - + \ No newline at end of file diff --git a/test/output/penguinSpeciesIslandRelative.svg b/test/output/penguinSpeciesIslandRelative.svg index b7ac9f2545..f301bede58 100644 --- a/test/output/penguinSpeciesIslandRelative.svg +++ b/test/output/penguinSpeciesIslandRelative.svg @@ -1,40 +1,40 @@ - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 - + 60 - + 70 - + 80 - + 90 100 ↑ Frequency (%) - + Adelie @@ -48,28 +48,28 @@ - - - + + + - + - + - + - + - + diff --git a/test/output/penguinSpeciesIslandSex.svg b/test/output/penguinSpeciesIslandSex.svg index 56567db28f..ef4b9b08e6 100644 --- a/test/output/penguinSpeciesIslandSex.svg +++ b/test/output/penguinSpeciesIslandSex.svg @@ -1,62 +1,62 @@ - + - + 0 - + 5 - + 10 - + 15 - + 20 - + 25 - + 30 - + 35 - + 40 - + 45 - + 50 - + 55 - + 60 - + 65 - + 70 ↑ Frequency @@ -74,7 +74,7 @@ - + FEMALE @@ -87,7 +87,7 @@ - + FEMALE @@ -100,7 +100,7 @@ - + FEMALE @@ -114,36 +114,36 @@ - - - - - - - - + + + + + + + + - + - - + + - + - - - + + + - + diff --git a/test/output/policeDeaths.svg b/test/output/policeDeaths.svg index b4e50b9bac..6775153c7d 100644 --- a/test/output/policeDeaths.svg +++ b/test/output/policeDeaths.svg @@ -1,4 +1,4 @@ - + Share of deaths by police @@ -8,11 +8,11 @@ - - - - + + + + - Black 44%Hispanic 32%White 18%All other races 6% - Black 13%Hispanic 12%White 60%All other races 15% + Black 44%Hispanic 32%White 18%All other races 6% + Black 13%Hispanic 12%White 60%All other races 15% \ No newline at end of file diff --git a/test/output/randomWalk.svg b/test/output/randomWalk.svg index 49b03c1fb4..28ee3886d3 100644 --- a/test/output/randomWalk.svg +++ b/test/output/randomWalk.svg @@ -1,43 +1,43 @@ - + - + −35 - + −30 - + −25 - + −20 - + −15 - + −10 - + −5 - + 0 - + 5 - + 10 - + 15 - + 20 - + 0 @@ -70,9 +70,9 @@ - + - + \ No newline at end of file diff --git a/test/output/seattleTemperatureBand.svg b/test/output/seattleTemperatureBand.svg index cbf5b34bfd..9e34846766 100644 --- a/test/output/seattleTemperatureBand.svg +++ b/test/output/seattleTemperatureBand.svg @@ -1,39 +1,39 @@ - + - + 20 - + 30 - + 40 - + 50 - + 60 - + 70 - + 80 - + 90 ↑ Temperature (°F) - + 2012 @@ -48,1466 +48,1466 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/sfTemperatureBand.svg b/test/output/sfTemperatureBand.svg index f021ed2649..9f929e28d3 100644 --- a/test/output/sfTemperatureBand.svg +++ b/test/output/sfTemperatureBand.svg @@ -1,43 +1,43 @@ - + - + 40 - + 45 - + 50 - + 55 - + 60 - + 65 - + 70 - + 75 - + 80 ↑ Daily temperature range (°F) - + October @@ -67,12 +67,12 @@ - + - + - + \ No newline at end of file diff --git a/test/output/sfTemperatureBandArea.svg b/test/output/sfTemperatureBandArea.svg index af6fa12717..50432b9415 100644 --- a/test/output/sfTemperatureBandArea.svg +++ b/test/output/sfTemperatureBandArea.svg @@ -1,67 +1,67 @@ - + - + 42 - + 44 - + 46 - + 48 - + 50 - + 52 - + 54 - + 56 - + 58 - + 60 - + 62 - + 64 - + 66 - + 68 - + 70 ↑ Daily temperature range (°F) - + October @@ -91,9 +91,9 @@ - + - + \ No newline at end of file diff --git a/test/output/simpsonsRatingsDots.svg b/test/output/simpsonsRatingsDots.svg index e6834633a8..251950a6b2 100644 --- a/test/output/simpsonsRatingsDots.svg +++ b/test/output/simpsonsRatingsDots.svg @@ -1,37 +1,37 @@ - + - + 4.5 - + 5.0 - + 5.5 - + 6.0 - + 6.5 - + 7.0 - + 7.5 - + 8.0 - + 8.5 - + 9.0 ↑ IMDb rating - + 1 @@ -118,635 +118,635 @@ Season → - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/stocksIndex.svg b/test/output/stocksIndex.svg index 536946b541..dae4d5cd21 100644 --- a/test/output/stocksIndex.svg +++ b/test/output/stocksIndex.svg @@ -1,47 +1,47 @@ - + - + −40 - + −30 - + −20 - + −10 - + +0 - + +100 - + +200 - + +300 - + +400 - + +500 ↑ Change in price (%) - + 2014 @@ -59,13 +59,13 @@ - + - - - - + + + + - AAPLAMZNGOOGIBM + AAPLAMZNGOOGIBM \ No newline at end of file diff --git a/test/output/travelersYearOverYear.svg b/test/output/travelersYearOverYear.svg index 3e1fe9b88a..574981b8a1 100644 --- a/test/output/travelersYearOverYear.svg +++ b/test/output/travelersYearOverYear.svg @@ -1,62 +1,62 @@ - + - + 0.0 - + 0.2 - + 0.4 - + 0.6 - + 0.8 - + 1.0 - + 1.2 - + 1.4 - + 1.6 - + 1.8 - + 2.0 - + 2.2 - + 2.4 - + 2.6 - + 2.8 @@ -65,7 +65,7 @@ 3.0 ↑ Travelers per day (millions) - + March @@ -98,14 +98,14 @@ - + - + - + - 2019 - 2020 + 2019 + 2020 \ No newline at end of file diff --git a/test/output/uniformRandomDifference.svg b/test/output/uniformRandomDifference.svg index 1451d39687..81ac7b608c 100644 --- a/test/output/uniformRandomDifference.svg +++ b/test/output/uniformRandomDifference.svg @@ -1,51 +1,51 @@ - + - + 0.0 - + 0.5 - + 1.0 - + 1.5 - + 2.0 - + 2.5 - + 3.0 - + 3.5 - + 4.0 - + 4.5 - + 5.0 ↑ Frequency (%) - + −1.0 @@ -81,48 +81,48 @@ Difference of two uniform random variables - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/test/output/usPopulationStateAge.svg b/test/output/usPopulationStateAge.svg index f7ff09ebf7..8c66e2c4b4 100644 --- a/test/output/usPopulationStateAge.svg +++ b/test/output/usPopulationStateAge.svg @@ -1,559 +1,559 @@ - + - + <10 - + 10-19 - + 20-29 - + 30-39 - + 40-49 - + 50-59 - + 60-69 - + 70-79 - + ≥80 - Age + Age - 0 + 0 - 2 + 2 - 4 + 4 - 6 + 6 - 8 + 8 - 10 + 10 - 12 + 12 - 14 + 14 - 16 + 16 - 18 + 18 - 20 + 20 Percent (%) → - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/output/usRetailSales.svg b/test/output/usRetailSales.svg index 33a7dcd9b3..c4139ce2dc 100644 --- a/test/output/usRetailSales.svg +++ b/test/output/usRetailSales.svg @@ -1,55 +1,55 @@ - + - + 0 - + 50 - + 100 - + 150 - + 200 - + 250 - + 300 - + 350 - + 400 - + 450 - + 500 - + 550 U.S. retail monthly sales (in billions, seasonally-adjusted) - + 1995 @@ -70,12 +70,12 @@ - + - + - + \ No newline at end of file diff --git a/test/output/wordLengthMobyDick.svg b/test/output/wordLengthMobyDick.svg index 37237c28ef..c01a5f9d45 100644 --- a/test/output/wordLengthMobyDick.svg +++ b/test/output/wordLengthMobyDick.svg @@ -1,51 +1,51 @@ - + - + 0 - + 2 - + 4 - + 6 - + 8 - + 10 - + 12 - + 14 - + 16 - + 18 - + 20 ↑ Frequency (%) - + 1 @@ -90,19 +90,19 @@ Word length → - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file From ede14ad59030607ea373b7f4a51300f0b147ac89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Rivi=C3=A8re?= Date: Sun, 2 May 2021 11:01:10 +0200 Subject: [PATCH 12/13] (auto-height:) with vertical facets, the base height for a cell is half that of a usual plot --- src/plot.js | 4 +- test/output/ballotStatusRace.svg | 106 +++++++------- test/output/mobyDickFaceted.svg | 196 ++++++++++---------------- test/output/penguinMassSex.svg | 143 +++++++------------ test/output/penguinMassSexSpecies.svg | 174 +++++++++-------------- 5 files changed, 247 insertions(+), 376 deletions(-) diff --git a/src/plot.js b/src/plot.js index 3147a23758..76851d3dad 100644 --- a/src/plot.js +++ b/src/plot.js @@ -140,6 +140,6 @@ function ScaleFunctions(scales) { function autoHeight({y, fy, fx}) { const ny = y && y.type === "ordinal" ? y.scale.domain().length : 17; - const nfy = fy ? fy.scale.domain().length : 1; - return !!(y || fy) * Math.max(1, Math.min(60, ny * nfy)) * 20 + !!fx * 30 + 60; + const nfy = fy ? fy.scale.domain().length : 2; + return !!(y || fy) * Math.max(1, Math.min(60, ny * nfy)) * 10 + !!fx * 30 + 60; } diff --git a/test/output/ballotStatusRace.svg b/test/output/ballotStatusRace.svg index 6f620e501e..7337996d83 100644 --- a/test/output/ballotStatusRace.svg +++ b/test/output/ballotStatusRace.svg @@ -1,172 +1,172 @@ - + - + WHITE - + UNDESIGNATED - + ASIAN - + OTHER - + TWO or MORE RACES - + INDIAN AMERICAN or ALASKA NATIVE - + BLACK or AFRICAN AMERICAN - + NATIVE HAWAIIAN or PACIFIC ISLANDER - + 0 - + 20 - + 40 - + 60 - + Frequency (%) → - + - + 79.0% - + 0.4% - + 20.5% - + - + - + 78.3% - + 0.6% - + 21.1% - + - + - + 77.9% - + 21.5% - + 0.6% - + - + - + 74.1% - + 0.8% - + 25.1% - + - + - + 73.9% - + 25.3% - + 0.8% - + - + - + 25.5% - + 72.2% - + 2.3% - + - + - + 67.4% - + 31.5% - + 1.1% - + - + - + 41.7% - + 58.3% - + diff --git a/test/output/mobyDickFaceted.svg b/test/output/mobyDickFaceted.svg index 527a9a1077..9f3333e0dd 100644 --- a/test/output/mobyDickFaceted.svg +++ b/test/output/mobyDickFaceted.svg @@ -1,9 +1,9 @@ - + - + lower - + upper @@ -18,118 +18,70 @@ - + 0 - - 100 - - - + 200 - - 300 - - - + 400 - - 500 - - - + 600 - - 700 - - - + 800 - - 900 - - - + 1,000 - - 1,100 - - - + 1,200 ↑ Frequency - + - + 0 - - 100 - - - + 200 - - 300 - - - + 400 - - 500 - - - + 600 - - 700 - - - + 800 - - 900 - - - + 1,000 - - 1,100 - - - + 1,200 - + A @@ -211,7 +163,7 @@ - + A @@ -294,78 +246,78 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - - - - + + + + + + - + - + - - - - - - + + + + + + - + diff --git a/test/output/penguinMassSex.svg b/test/output/penguinMassSex.svg index 7fce60885d..188dacaa1a 100644 --- a/test/output/penguinMassSex.svg +++ b/test/output/penguinMassSex.svg @@ -1,16 +1,16 @@ - + - + FEMALE - + MALE - + - sex + sex - + 2,500 @@ -42,152 +42,107 @@ - + 0 - - 5 - - + 10 - - 15 - - + 20 - - 25 - - + 30 - - 35 - - + 40 - - 45 - - + 50 ↑ Frequency - + - + 0 - - 5 - - + 10 - - 15 - - + 20 - - 25 - - + 30 - - 35 - - + 40 - - 45 - - + 50 - + - + 0 - - 5 - - + 10 - - 15 - - + 20 - - 25 - - + 30 - - 35 - - + 40 - - 45 - - + 50 - - - - - - + + + + + + - + - + - - - - - - - + + + + + + + - + - + - - - - - + + + + + - + diff --git a/test/output/penguinMassSexSpecies.svg b/test/output/penguinMassSexSpecies.svg index 3ec07b34e8..5506e52856 100644 --- a/test/output/penguinMassSexSpecies.svg +++ b/test/output/penguinMassSexSpecies.svg @@ -1,14 +1,14 @@ - + - + Adelie - + Chinstrap - + Gentoo - species + species @@ -24,99 +24,63 @@ - + 0 - - 5 - - + 10 - - 15 - - + 20 - - 25 - - + 30 - - 35 - - + 40 ↑ Frequency - + - + 0 - - 5 - - + 10 - - 15 - - + 20 - - 25 - - + 30 - - 35 - - + 40 - + - + 0 - - 5 - - + 10 - - 15 - - + 20 - - 25 - - + 30 - - 35 - - + 40 - + 4,000 @@ -126,7 +90,7 @@ - + 4,000 @@ -136,7 +100,7 @@ - + 4,000 @@ -147,93 +111,93 @@ - - - + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - - + + - + From 71df28ca3664abeddfe824308a194b9fe6cde10e Mon Sep 17 00:00:00 2001 From: Mike Bostock Date: Mon, 3 May 2021 09:10:33 -0700 Subject: [PATCH 13/13] tweak autoHeight --- src/plot.js | 6 +- test/output/ballotStatusRace.svg | 106 ++++++++++---------- test/output/penguinMassSex.svg | 98 +++++++++--------- test/output/penguinMassSexSpecies.svg | 138 +++++++++++++------------- 4 files changed, 174 insertions(+), 174 deletions(-) diff --git a/src/plot.js b/src/plot.js index 76851d3dad..f6684edd4a 100644 --- a/src/plot.js +++ b/src/plot.js @@ -139,7 +139,7 @@ function ScaleFunctions(scales) { } function autoHeight({y, fy, fx}) { - const ny = y && y.type === "ordinal" ? y.scale.domain().length : 17; - const nfy = fy ? fy.scale.domain().length : 2; - return !!(y || fy) * Math.max(1, Math.min(60, ny * nfy)) * 10 + !!fx * 30 + 60; + const nfy = fy ? fy.scale.domain().length : 1; + const ny = y && y.type === "ordinal" ? y.scale.domain().length : Math.max(7, 17 / nfy); + return !!(y || fy) * Math.max(1, Math.min(60, ny * nfy)) * 20 + !!fx * 30 + 60; } diff --git a/test/output/ballotStatusRace.svg b/test/output/ballotStatusRace.svg index 7337996d83..6f620e501e 100644 --- a/test/output/ballotStatusRace.svg +++ b/test/output/ballotStatusRace.svg @@ -1,172 +1,172 @@ - + - + WHITE - + UNDESIGNATED - + ASIAN - + OTHER - + TWO or MORE RACES - + INDIAN AMERICAN or ALASKA NATIVE - + BLACK or AFRICAN AMERICAN - + NATIVE HAWAIIAN or PACIFIC ISLANDER - + 0 - + 20 - + 40 - + 60 - + Frequency (%) → - + - + 79.0% - + 0.4% - + 20.5% - + - + - + 78.3% - + 0.6% - + 21.1% - + - + - + 77.9% - + 21.5% - + 0.6% - + - + - + 74.1% - + 0.8% - + 25.1% - + - + - + 73.9% - + 25.3% - + 0.8% - + - + - + 25.5% - + 72.2% - + 2.3% - + - + - + 67.4% - + 31.5% - + 1.1% - + - + - + 41.7% - + 58.3% - + diff --git a/test/output/penguinMassSex.svg b/test/output/penguinMassSex.svg index 188dacaa1a..3eb5a26ba5 100644 --- a/test/output/penguinMassSex.svg +++ b/test/output/penguinMassSex.svg @@ -1,16 +1,16 @@ - + - + FEMALE - + MALE - + - sex + sex - + 2,500 @@ -42,107 +42,107 @@ - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 ↑ Frequency - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 50 - - - - - - + + + + + + - + - + - - - - - - - + + + + + + + - + - + - - - - - + + + + + - + diff --git a/test/output/penguinMassSexSpecies.svg b/test/output/penguinMassSexSpecies.svg index 5506e52856..3eb26dd0d2 100644 --- a/test/output/penguinMassSexSpecies.svg +++ b/test/output/penguinMassSexSpecies.svg @@ -1,14 +1,14 @@ - + - + Adelie - + Chinstrap - + Gentoo - species + species @@ -24,63 +24,63 @@ - + 0 - + 10 - + 20 - + 30 - + 40 ↑ Frequency - + - + 0 - + 10 - + 20 - + 30 - + 40 - + - + 0 - + 10 - + 20 - + 30 - + 40 - + 4,000 @@ -90,7 +90,7 @@ - + 4,000 @@ -100,7 +100,7 @@ - + 4,000 @@ -111,93 +111,93 @@ - - - + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - + + + + - + - - - - + + + + - + - + - + - + - - + + - +