From 2be37fc4a16f87dd3e79eeb6c401af1332272325 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Dec 2025 16:08:08 +0000 Subject: [PATCH 1/2] Initial plan From 2675a8eff2be2ac792d58562c0d561d3b44c8487 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 9 Dec 2025 18:20:56 +0000 Subject: [PATCH 2/2] Fix thicknesses scale to use transform instead of scalepoint Co-authored-by: gvegayon <893619+gvegayon@users.noreply.github.com> --- specs/1.3.1/_viz.rnc | 20 +++- specs/1.3.1/_viz.rng | 40 +++++-- specs/1.3.1/_viz.xsd | 238 ++++++++++++++------------------------- specs/1.3.1/common.xsd | 4 +- specs/1.3.1/dynamics.xsd | 174 ++++++++++++++++++++-------- 5 files changed, 265 insertions(+), 211 deletions(-) diff --git a/specs/1.3.1/_viz.rnc b/specs/1.3.1/_viz.rnc index c16a57b..b6cce86 100644 --- a/specs/1.3.1/_viz.rnc +++ b/specs/1.3.1/_viz.rnc @@ -140,10 +140,22 @@ sizes-scale-content = scale-label-attribute? } thicknesses-scale-content = scale-label-attribute? & attribute scale {"quantitative"} - & element scalepoint { - for-ratio-attribute - & attribute factor {xsd:float} - }* + & element transform { + (element pow { attribute exponent {xsd:integer}}| + element sqrt {empty}| + element log {empty}| + element log10 {empty}| + element exp {empty}| + element exp10 {empty}| + element spline { + element origin-control-point { + control-point-content + }, + element destination-control-point { + control-point-content + } + }) + } & element range { attribute min { thickness-type }, attribute max { thickness-type }, diff --git a/specs/1.3.1/_viz.rng b/specs/1.3.1/_viz.rng index b56d7ba..b7e0f27 100644 --- a/specs/1.3.1/_viz.rng +++ b/specs/1.3.1/_viz.rng @@ -318,16 +318,38 @@ quantitative - - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/specs/1.3.1/_viz.xsd b/specs/1.3.1/_viz.xsd index c6d3fba..7d1979d 100644 --- a/specs/1.3.1/_viz.xsd +++ b/specs/1.3.1/_viz.xsd @@ -1,64 +1,16 @@ - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + @@ -68,20 +20,20 @@ - + - + - + - + @@ -152,21 +104,8 @@ colors scale content - - - - - - - - - - - - - - - + + @@ -178,9 +117,23 @@ + + + + + + + + + + + + + + - + @@ -188,18 +141,8 @@ shapes scale content - - - - - - - - - - - - + + @@ -210,11 +153,22 @@ + + + + + + + + + + + - + @@ -230,17 +184,17 @@ - - + + - + - - - + + + @@ -256,13 +210,13 @@ - - - - - - - + + + + + + + @@ -289,29 +243,29 @@ - - + + - + - + - + - - - + + + @@ -324,16 +278,10 @@ - - - - - - - + @@ -343,47 +291,31 @@ - + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/specs/1.3.1/common.xsd b/specs/1.3.1/common.xsd index 508c29c..ca6ae70 100644 --- a/specs/1.3.1/common.xsd +++ b/specs/1.3.1/common.xsd @@ -1,5 +1,7 @@ - + + + diff --git a/specs/1.3.1/dynamics.xsd b/specs/1.3.1/dynamics.xsd index 36a893c..100588a 100644 --- a/specs/1.3.1/dynamics.xsd +++ b/specs/1.3.1/dynamics.xsd @@ -1,71 +1,157 @@ - + + + - + Gext and data extension - - - - - - + + + + + + + + + + + - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + - - - - - - - - + + +