From d494c47ccfd2fd025e9375536658f0541c776ee4 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Wed, 26 Aug 2026 16:50:43 -0700
Subject: [PATCH 01/23] xyord

---
 R/ordering_args.R     | 38 +++++++++++++++++++
 R/sanitize_ord.R      | 87 +++++++++++++++++++++++++++++++++++++++----
 R/sanitize_xlevels.R  | 40 ++++++++++++++------
 R/tinyplot.R          |  6 +++
 R/type_barplot.R      | 80 ++++++++++++++++++++++++++++++++++-----
 R/type_errorbar.R     | 46 ++++++++++++++++-------
 R/type_lines.R        | 18 +++++++--
 R/type_pointrange.R   | 17 +++++++--
 R/type_points.R       | 51 +++++++++++++++++++------
 R/type_ridge.R        | 44 ++++++++++++++++++++--
 R/type_spineplot.R    | 53 ++++++++++++++++++++++----
 man/type_barplot.Rd   | 53 ++++++++++++++++++++++----
 man/type_errorbar.Rd  | 52 +++++++++++++++++++-------
 man/type_lines.Rd     | 46 +++++++++++++++++------
 man/type_points.Rd    | 44 +++++++++++++++++-----
 man/type_ridge.Rd     | 32 ++++++++++++++--
 man/type_spineplot.Rd | 33 +++++++++++++---
 17 files changed, 618 insertions(+), 122 deletions(-)
 create mode 100644 R/ordering_args.R

diff --git a/R/ordering_args.R b/R/ordering_args.R
new file mode 100644
index 00000000..edd81cbf
--- /dev/null
+++ b/R/ordering_args.R
@@ -0,0 +1,38 @@
+## Guards shared by the `*levels` / `*ord` argument pair. Both members control
+## the same thing -- the order of a categorical variable's levels -- so these
+## are named for that concept rather than for either argument.
+##
+## Note the pair is resolved by precedence rather than by a guard: `*levels`
+## wins and `*ord` is skipped at the call site when both are given. That keeps
+## the types free of supplied-vs-default bookkeeping, which would otherwise be
+## needed because `type_errorbar()` and `type_pointrange()` default `xord` to
+## "asis".
+
+## Warn when `*levels` / `*ord` were supplied for an axis that cannot be
+## reordered. Types that coerce their categorical axis to a factor (barplot,
+## ridge) never reach this -- there the arguments always apply. For the point
+## and line family a numeric `x` is plotted at its own values, so the request
+## is silently dropped, which is the failure mode worth surfacing.
+##
+## `supplied` is passed by the caller rather than inferred, because these
+## arguments reach here through a closure: `type_errorbar()` and
+## `type_pointrange()` default `xord` to "asis", and warning about a default
+## the user never typed would fire on every numeric-x coefficient plot.
+warn_ignored_ordering = function(v, xlevels, ord, supplied = TRUE) {
+  nms = c(deparse(substitute(xlevels)), deparse(substitute(ord)))
+  if (is.factor(v) || !isTRUE(supplied)) {
+    return(invisible(NULL))
+  }
+  given = c(if (!is.null(xlevels)) nms[1L], if (!is.null(ord)) nms[2L])
+  if (length(given) == 0L) {
+    return(invisible(NULL))
+  }
+  warning(
+    sprintf(
+      "ignoring '%s': only categorical (factor or character) variables can be reordered.",
+      paste(given, collapse = "' and '")
+    ),
+    call. = FALSE
+  )
+  invisible(NULL)
+}
diff --git a/R/sanitize_ord.R b/R/sanitize_ord.R
index cde8f18c..cb6ded53 100644
--- a/R/sanitize_ord.R
+++ b/R/sanitize_ord.R
@@ -24,6 +24,11 @@
 ## from being silently handed x. x is passed by name, so the two arguments may
 ## be declared in either order.
 ##
+## Only types whose categories span a real secondary axis pass one (`x = NULL`
+## otherwise). Handing a barplot's ranking function the `by` level index would
+## let `lm(y ~ x)` quietly return a number that means nothing, so asking for `x`
+## where there is none is an error instead.
+##
 ## "asis" and "rev" are the two keywords that consult no data at all -- they
 ## just permute the levels -- so they work when y is absent or non-numeric.
 ## "rev" is also the one thing a ranking function cannot express: a function is
@@ -56,17 +61,45 @@
 
 ord_keywords = c("asis", "rev", "start", "end", "total", "minvar")
 
-sanitize_ord = function(v, y, x, ord, arg = "ord") {
-  if (is.null(ord) || !is.factor(v)) {
+## The three sets below track what a type's categories actually are, since that
+## is what decides which keywords can mean anything:
+##
+##   ord_keywords               a series along a secondary axis  (byord)
+##   ord_keywords_distribution  a distribution, but no axis      (points, ...)
+##   ord_keywords_scalar        a single value                   (bars, spines)
+##
+## "start"/"end" name a position along a *secondary* axis, so they only mean
+## what they say for categories that span one -- the `by` groups of a stacked
+## area, say. Elsewhere they would silently collapse onto "total" when there is
+## no grouping, and silently re-read as "first/last `by` level" when there is.
+ord_keywords_distribution = setdiff(ord_keywords, c("start", "end"))
+
+## "minvar" then needs each category to carry a spread of its own: the scatter
+## of points at an x position, the width of a ridge. A bar is a single
+## aggregate and a spine a proportion of a count, so ranking either by variance
+## would measure something the reader never sees -- cell values across
+## `by`/facets for a bar (which stacking sums away and `beside` splits into
+## separate bars), the supplied weights for a spine.
+ord_keywords_scalar = setdiff(ord_keywords_distribution, "minvar")
+
+sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords) {
+  # nlevels < 2 has exactly one ordering, so skip the work (and the degeneracy
+  # check below, which a single level would otherwise trip).
+  if (is.null(ord) || !is.factor(v) || nlevels(v) < 2L) {
     return(v)
   }
 
-  keyword = is.character(ord) && length(ord) == 1L && ord %in% ord_keywords
+  keyword = is.character(ord) && length(ord) == 1L && ord %in% keywords
   if (!keyword && !is.function(ord)) {
+    hint = if (is.character(ord) && length(ord) == 1L && ord %in% ord_keywords) {
+      sprintf("\n  \"%s\" is not available for this plot type.", ord)
+    } else {
+      "\n  To set the level order explicitly, use factor(levels = ) on the variable beforehand."
+    }
     stop(
       sprintf(
-        "`%s` must be NULL, one of %s, or a function.\n  To set the level order explicitly, use factor(levels = ) on the variable beforehand.",
-        arg, paste(sprintf('"%s"', ord_keywords), collapse = ", ")
+        "`%s` must be NULL, one of %s, or a function.%s",
+        arg, paste(sprintf('"%s"', keywords), collapse = ", "), hint
       ),
       call. = FALSE
     )
@@ -82,6 +115,20 @@ sanitize_ord = function(v, y, x, ord, arg = "ord") {
     return(factor(v, levels = rev(levels(v))))
   }
 
+  # Everything below ranks on numbers. Reaching here with a non-numeric is
+  # almost always a transposed formula (e.g. a ridge plot called with the
+  # continuous variable on the categorical side), so say that rather than
+  # letting var()/sum() fail with something cryptic about factors.
+  if (!is.numeric(y)) {
+    stop(
+      sprintf(
+        "`%s = \"%s\"` ranks on a numeric variable, but was given %s.\n  Only \"asis\" and \"rev\" work without one.",
+        arg, ord, class(y)[1L]
+      ),
+      call. = FALSE
+    )
+  }
+
   if (identical(ord, "minvar")) {
     # Ascending, i.e. *not* negated like the size keywords below: a stacked
     # baseline is steadiest when the least variable group sits on it, since
@@ -89,9 +136,26 @@ sanitize_ord = function(v, y, x, ord, arg = "ord") {
     # variance give NA and sort last (to the top), which is the right place
     # for them anyway.
     stat = tapply(y, v, function(z) var(z, na.rm = TRUE), default = NA_real_)
+    # A variance that is NA everywhere (one observation per group) or identical
+    # everywhere (constant weights) cannot order anything, and would otherwise
+    # return the input untouched -- a silent no-op is the worst outcome here.
+    if (length(unique(stat)) < 2L) {
+      stop(
+        sprintf(
+          "`%s = \"minvar\"` cannot order these groups: %s.",
+          arg,
+          if (all(is.na(stat))) {
+            "each has fewer than two observations, so there is no variance to rank on"
+          } else {
+            "every group has the same variance"
+          }
+        ),
+        call. = FALSE
+      )
+    }
   } else if (keyword) {
     if (identical(ord, "total")) {
-      keep = rep.int(TRUE, length(x))
+      keep = rep.int(TRUE, length(y))
     } else {
       edge = if (identical(ord, "start")) min(x, na.rm = TRUE) else max(x, na.rm = TRUE)
       keep = !is.na(x) & x == edge
@@ -99,11 +163,20 @@ sanitize_ord = function(v, y, x, ord, arg = "ord") {
     stat = tapply(y[keep], v[keep], function(z) sum(z, na.rm = TRUE), default = 0)
     stat = -stat # largest group first, i.e. the bottom band
   } else {
-    xord = order(x)
+    xord = if (is.null(x)) seq_along(y) else order(x)
     grps = split(y[xord], v[xord])
     # Hand over x too, but only to functions that ask for it by name; see the
     # note at the top of this file.
     want_x = "x" %in% names(formals(ord))
+    if (want_x && is.null(x)) {
+      stop(
+        sprintf(
+          "the `%s` function asks for `x`, but this plot type has no secondary axis to supply.\n  Its categories are a flat set, so drop the `x` argument and rank on `y` alone.",
+          arg
+        ),
+        call. = FALSE
+      )
+    }
     xgrps = if (want_x) split(x[xord], v[xord]) else NULL
     stat = vapply(
       seq_along(grps),
diff --git a/R/sanitize_xlevels.R b/R/sanitize_xlevels.R
index 0eb27f4a..bb96125b 100644
--- a/R/sanitize_xlevels.R
+++ b/R/sanitize_xlevels.R
@@ -4,19 +4,18 @@
 ##
 ##   - NULL:      keep the existing factor levels (the default everywhere
 ##                except type_errorbar()/type_pointrange())
-##   - "asis":    take the categories in the order they appear in the data,
-##                i.e. skip the alphabetical sorting that factor() applies
-##                when coercing a character variable (cf. read.table's
-##                `as.is` argument)
 ##   - character: the levels in the desired order
 ##   - numeric:   indexes into the existing levels, e.g. 3:1
 ##
 ## Only affects factors (character variables have already been coerced by
 ## sanitize_datapoints() when this runs inside a type_data() function); any
 ## other class is returned untouched, so the argument is inert for numeric
-## variables. A length-1 "asis" is always read as the keyword: in the
-## degenerate case of a category literally named "asis", set the factor
-## levels beforehand instead.
+## variables.
+##
+## Data-derived orderings -- "asis", "rev", ranking by size or variance -- are
+## deliberately *not* handled here. They belong to the sibling `*ord` arguments
+## and sanitize_ord(); keeping the two vocabularies disjoint is what makes each
+## argument name mean one thing. The two compose, `*levels` first.
 ##
 ## Site-specific follow-ups -- re-syncing `by` when it aliases the releveled
 ## variable (spineplot, ridge), or converting the factor to integer positions
@@ -25,16 +24,35 @@ sanitize_xlevels = function(x, xlevels, arg = "xlevels") {
   if (is.null(xlevels) || !is.factor(x)) {
     return(x)
   }
-  if (identical(xlevels, "asis")) {
-    return(factor(x, levels = unique(x)))
-  }
   if (is.numeric(xlevels)) {
     xlevels = levels(x)[xlevels]
   }
+  v = substr(arg, 1, 1)
   if (anyNA(xlevels) || !all(xlevels %in% levels(x))) {
     warning(sprintf(
       "not all '%s' correspond to levels of '%s'",
-      arg, substr(arg, 1, 1)
+      arg, v
+    ))
+  }
+  # Naming a strict subset silently sends every other level to NA, which drops
+  # those rows from the plot without a word. Ordering is all these arguments
+  # claim to do, so treat a shortfall as a mistake worth flagging -- and a
+  # complete miss (no supplied level matches at all) as fatal, since the
+  # all-NA factor it produces only surfaces later as an unrelated error about
+  # zero-length ranges.
+  kept = intersect(levels(x), xlevels)
+  if (length(kept) == 0L) {
+    stop(sprintf(
+      "'%s' matches none of the levels of '%s'.\n  Expected some of: %s",
+      arg, v, paste(sprintf('"%s"', levels(x)), collapse = ", ")
+    ), call. = FALSE)
+  }
+  dropped = setdiff(levels(x), xlevels)
+  if (length(dropped) > 0L) {
+    warning(sprintf(
+      "'%s' omits %d of the %d levels of '%s' (%s); those observations will not be plotted",
+      arg, length(dropped), nlevels(x), v,
+      paste(sprintf('"%s"', dropped), collapse = ", ")
     ))
   }
   factor(x, levels = xlevels)
diff --git a/R/tinyplot.R b/R/tinyplot.R
index 2beefe67..881b4d30 100644
--- a/R/tinyplot.R
+++ b/R/tinyplot.R
@@ -1284,6 +1284,12 @@ tinyplot.default = function(
     par(mar = dynmar_computed + .whtsbp)
   }
 
+  # A "legend_reversed" type reads bottom-up, so its key is flipped to match.
+  # Under `flip = TRUE` the same groups run left-to-right instead, and a
+  # vertical key has no height to concur with -- reading it top-down against
+  # bands laid out left-to-right just runs it backwards. Drop the hint.
+  if (isTRUE(flip)) type_hints[["legend_reversed"]] = NULL
+
   if (legend_draw_flag && !identical(legend_args[["x"]], "direct")) {
     if (!multi_legend) {
       ## simple case: single legend only
diff --git a/R/type_barplot.R b/R/type_barplot.R
index e4589734..4b83a2e3 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -19,12 +19,32 @@
 #'   or the mid-way in the third category, respectively.
 #' @param FUN a function to compute the summary statistic for `y` within each
 #'   group of `x` in case of using a two-sided formula `y ~ x` (default: mean).
-#' @param xlevels a character or numeric vector specifying the ordering of the
-#'   levels of the `x` variable (if character) or the corresponding indexes
-#'   (if numeric) for the plot. The special keyword `"asis"` takes the
-#'   categories in the order that they appear in the data. Note that this
-#'   argument only affects categorical (i.e., factor or character) `x`
-#'   variables.
+#' @param xlevels,xord two ways to control the order of the `x` variable, and
+#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
+#'   takes precedence and `xord` is ignored. Note that a numeric `x` is coerced
+#'   to a factor before the bars are drawn, so it is reordered like any other
+#'   categorical variable.
+#'
+#'   `xlevels` names the levels literally: a character vector of level names in
+#'   the desired order, or a numeric vector of the corresponding level indexes
+#'   (e.g. `3:1`).
+#'
+#'   `xord` instead derives the order from the data, via a keyword or a
+#'   function. Options are:
+#'
+#'   - `"total"` ranks the categories by value, largest first. In practice this
+#'   is the keyword most reach for, since it sorts the bars by height. Note that
+#'   it ranks the *aggregated* bars, i.e. whatever `FUN` produced, rather than
+#'   the underlying rows.
+#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
+#'   data at all. The former takes the categories in the order that they appear
+#'   in the data, while `"rev"` reverses the current level order.
+#'   - a custom function that determines both the ranking statistic and its
+#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
+#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
+#'   than by sum.
+#'
+#'   Both default to `NULL`, i.e. keep the existing factor levels.
 #' @param xaxlabels a character vector with the axis labels for the `x` variable,
 #'   defaulting to the levels of `x`.
 #' @param offset optional specification for shifting bar baselines, accepting
@@ -32,7 +52,8 @@
 #' 
 #'   - *Positions* via an unnamed numeric scalar or vector. Bars start at the
 #'   offset value(s) rather than zero, matched per x-level after any `xlevels`
-#'   reordering (a scalar is applied to all bars). Useful for waterfall charts.
+#'   or `xord` reordering (a scalar is applied to all bars). Useful for
+#'   waterfall charts.
 #'   The positional form cannot be combined with `center`.
 #'   - *Category* via a character vector such as `offset = "Unsure"`, or a
 #'   named numeric vector such as `offset = c(Unsure = 1.1)`. The named
@@ -59,6 +80,22 @@
 #' tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = c("8", "6", "4"))
 #' tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = 3:1)
 #' 
+#' # Or let the data decide the order, rather than naming it. `xord = "total"`
+#' # sorts the bars by height; the ordering is shared across groups and facets.
+#' tinyplot(~ cyl, data = mtcars, type = "barplot", xord = "total")
+#' tinyplot(~ cyl | vs, data = mtcars, type = "barplot", xord = "total")
+#' 
+#' # The ranking statistic is always sorted ascending, so passing a function is
+#' # how you get the reverse: `sum` undoes what `"total"` does.
+#' tinyplot(~ cyl, data = mtcars, type = "barplot", xord = function(y) sum(y))
+#' 
+#' # The two arguments compose, `xlevels` first: here we fix an explicit order
+#' # and then flip it.
+#' tinyplot(
+#'   ~ cyl, data = mtcars, type = "barplot",
+#'   xlevels = c("8", "6", "4"), xord = "rev"
+#' )
+#' 
 #' # Note: Above we used automatic argument passing for `beside`. But this
 #' # wouldn't work for `width`, since it would conflict with the top-level
 #' # `tinyplot(..., width = <width>)` argument. It's safer to pass these args
@@ -140,9 +177,9 @@
 #' tinyplot_add(type = "vline")
 #'
 #' @export
-type_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xaxlabels = NULL, drop.zeros = FALSE, lighten = TRUE) {
+type_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xord = NULL, xaxlabels = NULL, drop.zeros = FALSE, lighten = TRUE) {
   out = list(
-    data = data_barplot(width = width, beside = beside, center = center, offset = offset, FUN = FUN, xlevels = xlevels, xaxlabels = xaxlabels, drop.zeros = drop.zeros, lighten = lighten),
+    data = data_barplot(width = width, beside = beside, center = center, offset = offset, FUN = FUN, xlevels = xlevels, xord = xord, xaxlabels = xaxlabels, drop.zeros = drop.zeros, lighten = lighten),
     draw = draw_rect(),
     name = "barplot"
   )
@@ -151,7 +188,7 @@ type_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NU
 }
 
 #' @importFrom stats aggregate
-data_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xaxlabels = NULL, drop.zeros = FALSE, lighten = TRUE) {
+data_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xord = NULL, xaxlabels = NULL, drop.zeros = FALSE, lighten = TRUE) {
     fun = function(settings, ...) {
         env2env(
           settings,
@@ -175,11 +212,34 @@ data_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NU
         }
         if (!is.factor(datapoints$x)) datapoints$x = factor(datapoints$x)
         datapoints$x = sanitize_xlevels(datapoints$x, xlevels)
+        ## "asis" means "the order the categories appear in the data", and the
+        ## aggregate() below destroys that by sorting on the grouping columns.
+        ## It consults no `y`, so apply it here while the row order still
+        ## survives. The ranking keywords have the opposite requirement -- they
+        ## must see the aggregated bars -- and so stay below.
+        if (identical(xord, "asis") && is.null(xlevels)) {
+          datapoints$x = sanitize_ord(
+            datapoints$x, NULL, NULL,
+            xord, arg = "xord", keywords = ord_keywords_scalar
+          )
+        }
         if (!is.null(xaxlabels)) levels(datapoints$x) = xaxlabels
         datapoints = aggregate(datapoints[, "y", drop = FALSE], datapoints[, c("x", "by", "facet")], FUN = FUN, drop = FALSE)
         datapoints$y[is.na(datapoints$y)] = 0 #FIXME: always?#
         if (!is.factor(datapoints$by)) datapoints$by = factor(datapoints$by)
         if (!is.factor(datapoints$facet)) datapoints$facet = factor(datapoints$facet)
+
+        ## `xord` ranks on the *aggregated* bars, so it has to run after the
+        ## aggregate() above -- ranking the raw cells would sort on sums while
+        ## the plot draws whatever FUN produced. It also has to run before the
+        ## `offset` block below, which is keyed positionally by x-level.
+        if (!is.null(xord) && !identical(xord, "asis") && is.null(xlevels)) {
+          datapoints$x = sanitize_ord(
+            datapoints$x, datapoints$y, NULL,
+            xord, arg = "xord", keywords = ord_keywords_scalar
+          )
+          datapoints = datapoints[order(datapoints$facet, datapoints$by, datapoints$x), , drop = FALSE]
+        }
         
         ## `offset` accepts two distinct forms:
         ##  - unnamed numeric -> positional, keyed by x-level (waterfall)
diff --git a/R/type_errorbar.R b/R/type_errorbar.R
index 45d67ee6..57db4274 100644
--- a/R/type_errorbar.R
+++ b/R/type_errorbar.R
@@ -4,17 +4,36 @@
 #'
 #' @inheritParams dodge_positions
 #' @inheritParams graphics::arrows
-#' @param xlevels a character or numeric vector specifying the order in which
-#'   the levels of the `x` variable should be plotted (as level names if
-#'   character, or level indexes if numeric, e.g. `3:1`). Note that this
-#'   argument only affects categorical (i.e., factor or character) `x`
-#'   variables; it is ignored for numeric `x`. Unlike most other plot types,
-#'   here it defaults to the special keyword `"asis"`, which takes the
-#'   categories in the order that they appear in the data: these types are
-#'   typically used for coefficient plots, where the row order of the data
-#'   (e.g., the terms of a model) is usually intentional. Set
-#'   `xlevels = NULL` to follow the factor levels instead, matching the other
-#'   plot types.
+#' @param xlevels,xord two ways to control the order of the `x` variable, and
+#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
+#'   takes precedence and `xord` is ignored. Both only affect categorical (i.e.,
+#'   factor or character) `x` variables; a numeric `x` is plotted at its own
+#'   values and cannot be reordered, so supplying either there is ignored with a
+#'   warning.
+#'
+#'   `xlevels` names the levels literally: a character vector of level names in
+#'   the desired order, or a numeric vector of the corresponding level indexes
+#'   (e.g. `3:1`). Default is `NULL`.
+#'
+#'   `xord` instead derives the order from the data, via a keyword or a
+#'   function. Options are:
+#'
+#'   - `"total"` ranks the categories by their `y` values, largest first.
+#'   - `"minvar"` ranks them by variance, lowest first. This needs more than one
+#'   observation per category, so it does not apply to the usual one-row-per-
+#'   term coefficient table.
+#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
+#'   data at all. The former takes the categories in the order that they appear
+#'   in the data, while `"rev"` reverses the current level order.
+#'   - a custom function that determines both the ranking statistic and its
+#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
+#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
+#'   than by sum.
+#'
+#'   Unlike most other plot types, `xord` defaults to `"asis"` here rather than
+#'   `NULL`: these types are typically used for coefficient plots, where the row
+#'   order of the data (e.g., the terms of a model) is usually intentional. Set
+#'   `xord = NULL` to follow the factor levels instead, matching the other types.
 #' @examples
 #' tinytheme("basic")
 #' 
@@ -97,10 +116,11 @@
 #' tinytheme() # reset theme
 #'
 #' @export
-type_errorbar = function(length = 0.05, dodge = 0, fixed.dodge = FALSE, xlevels = "asis") {
+type_errorbar = function(length = 0.05, dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = "asis") {
+    ord_supplied = !missing(xord) || !is.null(xlevels)
     out = list(
         draw = draw_errorbar(length = length),
-        data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
+        data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels, xord = xord, ord_supplied = ord_supplied),
         name = "p"
     )
     class(out) = "tinyplot_type"
diff --git a/R/type_lines.R b/R/type_lines.R
index b5f29032..af80a3e3 100644
--- a/R/type_lines.R
+++ b/R/type_lines.R
@@ -12,7 +12,7 @@
 #' character) data according to the factor levels. Character variables are
 #' coerced with [factor()] and so end up in alphabetical order. To order the
 #' categories by their appearance in the data instead, use
-#' `xlevels = "asis"`, or set the levels explicitly, e.g.
+#' `xord = "asis"`, or set the levels explicitly, e.g.
 #' `factor(x, levels = unique(x))`.
 #'
 #' Note that the lines themselves are always drawn in the order that the rows
@@ -48,10 +48,10 @@
 #' )
 #' 
 #' @export
-type_lines = function(type = "l", dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
+type_lines = function(type = "l", dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = NULL) {
   out = list(
     draw = draw_lines(type = type),
-    data = data_lines(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
+    data = data_lines(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels, xord = xord),
     name = type
   )
   class(out) = "tinyplot_type"
@@ -59,7 +59,7 @@ type_lines = function(type = "l", dodge = 0, fixed.dodge = FALSE, xlevels = NULL
 }
 
 
-data_lines = function(dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
+data_lines = function(dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = NULL) {
   fun = function(settings, ...) {
     env2env(settings, environment(), "datapoints")
 
@@ -69,6 +69,16 @@ data_lines = function(dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
     # `factor(x, levels = ...)` is honoured, and that layering a line type onto
     # a point type (or vice versa) lands on the same categories. #679
     datapoints[["x"]] = sanitize_xlevels(datapoints[["x"]], xlevels)
+    warn_ignored_ordering(datapoints[["x"]], xlevels, xord)
+    # `xord` must run here, before the factor is collapsed to integer
+    # positions below -- once x is an integer there are no levels left to
+    # reorder.
+    if (!is.null(xord) && is.null(xlevels)) {
+      datapoints[["x"]] = sanitize_ord(
+        datapoints[["x"]], datapoints[["y"]], NULL,
+        xord, arg = "xord", keywords = ord_keywords_distribution
+      )
+    }
     if (is.factor(datapoints[["x"]])) {
       xlvls = levels(datapoints[["x"]])
       xlabs = seq_along(xlvls)
diff --git a/R/type_pointrange.R b/R/type_pointrange.R
index 9f8cddd8..8d6c6887 100644
--- a/R/type_pointrange.R
+++ b/R/type_pointrange.R
@@ -1,9 +1,10 @@
 #' @rdname type_errorbar
 #' @export
-type_pointrange = function(dodge = 0, fixed.dodge = FALSE, xlevels = "asis") {
+type_pointrange = function(dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = "asis") {
+  ord_supplied = !missing(xord) || !is.null(xlevels)
   out = list(
     draw = draw_pointrange(),
-    data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
+    data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels, xord = xord, ord_supplied = ord_supplied),
     name = "p"
   )
   class(out) = "tinyplot_type"
@@ -47,17 +48,25 @@ draw_pointrange = function() {
 }
 
 
-data_pointrange = function(dodge, fixed.dodge, xlevels = "asis") {
+data_pointrange = function(dodge, fixed.dodge, xlevels = NULL, xord = "asis", ord_supplied = TRUE) {
   fun = function(settings, ...) {
     env2env(settings, environment(), c("datapoints", "xlabs", "cex", "lty", "lwd"))
 
     if (is.character(datapoints$x)) {
       datapoints$x = as.factor(datapoints$x)
     }
-    ## default xlevels = "asis" preserves the row order of the data (i.e., no
+    ## default xord = "asis" preserves the row order of the data (i.e., no
     ## new sorting by factor), since these types are typically used for
     ## coefficient plots where that order is intentional
+    warn_ignored_ordering(datapoints$x, xlevels, xord, supplied = ord_supplied)
     datapoints$x = sanitize_xlevels(datapoints$x, xlevels)
+    # before the collapse to integer positions below
+    if (!is.null(xord) && is.null(xlevels)) {
+      datapoints$x = sanitize_ord(
+        datapoints$x, datapoints[["y"]], NULL,
+        xord, arg = "xord", keywords = ord_keywords_distribution
+      )
+    }
     if (is.factor(datapoints$x)) {
       xlvls = levels(datapoints$x)
       xlabs = seq_along(xlvls)
diff --git a/R/type_points.R b/R/type_points.R
index 557b48cc..61173d37 100644
--- a/R/type_points.R
+++ b/R/type_points.R
@@ -3,15 +3,32 @@
 #' @description Type function for plotting points, i.e. a scatter plot.
 #' @param clim Numeric giving the lower and upper limits of the character
 #'   expansion (`cex`) normalization for bubble charts.
-#' @param xlevels a character or numeric vector specifying the order in which
-#'   the levels of the `x` variable should be plotted (as level names if
-#'   character, or level indexes if numeric, e.g. `3:1`). The special keyword
-#'   `"asis"` takes the categories in the order that they appear in the data,
-#'   i.e. skipping the alphabetical sort that is otherwise applied when
-#'   coercing a character variable to a factor. Note that this argument only
-#'   affects categorical (i.e., factor or character) `x` variables; it is
-#'   ignored for numeric `x`. The default `NULL` keeps the existing factor
-#'   levels (alphabetical for character variables).
+#' @param xlevels,xord two ways to control the order of the `x` variable, and
+#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
+#'   takes precedence and `xord` is ignored. Both only affect categorical (i.e.,
+#'   factor or character) `x` variables; a numeric `x` is plotted at its own
+#'   values and cannot be reordered, so supplying either there is ignored with a
+#'   warning.
+#'
+#'   `xlevels` names the levels literally: a character vector of level names in the
+#'   desired order, or a numeric vector of the corresponding level indexes
+#'   (e.g. `3:1`).
+#'
+#'   `xord` instead derives the order from the data, via a keyword or a function.
+#'   Options are:
+#'
+#'   - `"total"` ranks the categories by the `y` values observed at each one,
+#'   largest first.
+#'   - `"minvar"` ranks them by the variance of those values, lowest first.
+#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
+#'   data at all. The former takes the categories in the order that they appear
+#'   in the data, while `"rev"` reverses the current level order.
+#'   - a custom function that determines both the ranking statistic and its
+#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
+#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
+#'   than by sum.
+#'
+#'   Both default to `NULL`, i.e. keep the existing factor levels.
 #' @inheritParams dodge_positions
 #'
 #' @examples
@@ -41,9 +58,9 @@
 #'   pch = 21, fill = 0.3)
 #'
 #' @export
-type_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
+type_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = NULL) {
   out = list(
-    data = data_points(clim = clim, dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
+    data = data_points(clim = clim, dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels, xord = xord),
     draw = draw_points(),
     name = "p"
   )
@@ -51,7 +68,7 @@ type_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xleve
   return(out)
 }
 
-data_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
+data_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = NULL) {
   fun = function(settings, ...) {
     env2env(settings, environment(), "datapoints")
 
@@ -60,6 +77,16 @@ data_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xleve
 
     # catch for factors (we should still be able to "force" plot these with points)
     datapoints$x = sanitize_xlevels(datapoints$x, xlevels)
+    warn_ignored_ordering(datapoints$x, xlevels, xord)
+    # `xord` must run here, before the factor is collapsed to integer
+    # positions below -- once x is an integer there are no levels left to
+    # reorder.
+    if (!is.null(xord) && is.null(xlevels)) {
+      datapoints$x = sanitize_ord(
+        datapoints$x, datapoints[["y"]], NULL,
+        xord, arg = "xord", keywords = ord_keywords_distribution
+      )
+    }
     if (is.factor(datapoints$x)) {
       xlvls = levels(datapoints$x)
       xlabs = seq_along(xlvls)
diff --git a/R/type_ridge.R b/R/type_ridge.R
index 915d12ae..276149b9 100644
--- a/R/type_ridge.R
+++ b/R/type_ridge.R
@@ -27,9 +27,33 @@
 #' at the specified `probs`. The quantiles are computed based on the density
 #' (rather than the raw original variable). Only one of `breaks` or
 #' `probs` must be specified.
-#' @param ylevels a character or numeric vector specifying in which order
-#' the levels of the y-variable should be plotted. The special keyword
-#' `"asis"` takes the categories in the order that they appear in the data.
+#' @param ylevels,yord two ways to control the order of the `y` variable, and
+#'   hence of the axis. Supply one or the other; if both are given, `ylevels`
+#'   takes precedence and `yord` is ignored. Note that a numeric `y` is coerced
+#'   to a factor before the ridges are drawn, so it is reordered like any other
+#'   categorical variable.
+#'
+#'   `ylevels` names the levels literally: a character vector of level names in
+#'   the desired order, or a numeric vector of the corresponding level indexes
+#'   (e.g. `3:1`).
+#'
+#'   `yord` instead derives the order from the data, via a keyword or a
+#'   function. Options are:
+#'
+#'   - `"total"` ranks the ridges by summed `x`, largest first. (Ridge plots
+#'   have no separate response, so the ranking runs on the continuous `x`
+#'   variable.)
+#'   - `"minvar"` ranks them by the spread of each distribution, narrowest
+#'   first.
+#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
+#'   data at all. The former takes the categories in the order that they appear
+#'   in the data, while `"rev"` reverses the current level order.
+#'   - a custom function that determines both the ranking statistic and its
+#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
+#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
+#'   than by sum.
+#'
+#'   Both default to `NULL`, i.e. keep the existing factor levels.
 #' @inheritParams stats::density
 #' @param bw the smoothing \code{\link[stats:bw.nrd]{bandwidth}} to be used,
 #'   see \code{\link[stats]{density}} for details and options.
@@ -215,6 +239,7 @@ type_ridge = function(
     breaks = NULL,
     probs = NULL,
     ylevels = NULL,
+    yord = NULL,
     bw = "nrd0",
     joint.bw =  c("mean", "full", "none"),
     adjust = 1,
@@ -245,6 +270,7 @@ type_ridge = function(
                       breaks = breaks,
                       probs = probs,
                       ylevels = ylevels,
+                      yord = yord,
                       raster = raster,
                       col = col,
                       alpha = alpha,
@@ -265,7 +291,7 @@ data_ridge = function(bw = "nrd0", adjust = 1, kernel = "gaussian", n = 512,
                       gradient = FALSE,
                       breaks = NULL,
                       probs = NULL,
-                      ylevels = NULL,
+                      ylevels = NULL, yord = NULL,
                       raster = FALSE,
                       col = NULL,
                       alpha = NULL,
@@ -303,6 +329,16 @@ data_ridge = function(bw = "nrd0", adjust = 1, kernel = "gaussian", n = 512,
       datapoints$y = sanitize_xlevels(datapoints$y, ylevels, arg = "ylevels")
       if (y_by) datapoints$by = datapoints$y
     }
+    ## `yord` ranks the ridges on the *continuous* variable, which for this
+    ## type is `x` -- there is no separate response to rank on. So "total"
+    ## orders by summed x, "minvar" by the spread of each distribution.
+    if (!is.null(yord) && is.null(ylevels)) {
+      datapoints$y = sanitize_ord(
+        datapoints$y, datapoints$x, NULL,
+        yord, arg = "yord", keywords = ord_keywords_distribution
+      )
+      if (y_by) datapoints$by = datapoints$y
+    }
 
     ##
     datapoints = split(datapoints, list(datapoints$y, datapoints$by, datapoints$facet))
diff --git a/R/type_spineplot.R b/R/type_spineplot.R
index 2d5500f8..f8f02fbd 100644
--- a/R/type_spineplot.R
+++ b/R/type_spineplot.R
@@ -4,11 +4,30 @@
 #'   are modified versions of histograms or mosaic plots, and particularly
 #'   useful for visualizing factor variables. Note that [`tinyplot`] defaults
 #'   to `type_spineplot()` if `y` is a factor variable.
-#' @param xlevels,ylevels a character or numeric vector specifying the ordering of the
-#'   levels of the `x` and `y` variables (if character) or the corresponding indexes
-#'   (if numeric) for the plot. The special keyword `"asis"` takes the
-#'   categories in the order that they appear in the data. Note that these
-#'   arguments only affect categorical (i.e., factor or character) variables.
+#' @param xlevels,xord two ways to control the order of the `x` variable, and
+#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
+#'   takes precedence and `xord` is ignored. Both only affect categorical (i.e.,
+#'   factor or character) variables.
+#'
+#'   `xlevels` names the levels literally: a character vector of level names in
+#'   the desired order, or a numeric vector of the corresponding level indexes
+#'   (e.g. `3:1`).
+#'
+#'   `xord` instead derives the order from the data, via a keyword or a
+#'   function. Options are:
+#'
+#'   - `"total"` ranks the categories by frequency, most common first. (Both
+#'   axes of a spineplot are categorical, so there is no response to rank on and
+#'   observations are counted instead, weighted if `weights` is given.)
+#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
+#'   data at all. The former takes the categories in the order that they appear
+#'   in the data, while `"rev"` reverses the current level order.
+#'   - a custom function that determines both the ranking statistic and its
+#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
+#'   reverses `"total"`.
+#'
+#'   Both default to `NULL`, i.e. keep the existing factor levels.
+#' @param ylevels,yord as for `xlevels` / `xord` above, but for the `y` variable.
 #' @inheritParams graphics::spineplot
 #' @param lighten logical. For grouped spineplots where the `y` variable is
 #'   itself the grouping variable (i.e. `y == by`), should the fills use a
@@ -94,10 +113,10 @@
 #' )
 #' 
 #' @export
-type_spineplot = function(breaks = NULL, tol.ylab = 0.05, off = NULL, xlevels = NULL, ylevels = NULL, col = NULL, xaxlabels = NULL, yaxlabels = NULL, weights = NULL, lighten = FALSE) {
+type_spineplot = function(breaks = NULL, tol.ylab = 0.05, off = NULL, xlevels = NULL, xord = NULL, ylevels = NULL, yord = NULL, col = NULL, xaxlabels = NULL, yaxlabels = NULL, weights = NULL, lighten = FALSE) {
   col = col
   out = list(
-    data = data_spineplot(off = off, breaks = breaks, xlevels = xlevels, ylevels = ylevels, xaxlabels = xaxlabels, yaxlabels = yaxlabels, weights = weights, lighten = lighten),
+    data = data_spineplot(off = off, breaks = breaks, xlevels = xlevels, xord = xord, ylevels = ylevels, yord = yord, xaxlabels = xaxlabels, yaxlabels = yaxlabels, weights = weights, lighten = lighten),
     draw = draw_spineplot(tol.ylab = tol.ylab, off = off, col = col, xaxlabels = xaxlabels, yaxlabels = yaxlabels, lighten = lighten),
     name = "spineplot"
   )
@@ -106,7 +125,7 @@ type_spineplot = function(breaks = NULL, tol.ylab = 0.05, off = NULL, xlevels =
 }
 
 #' @importFrom grDevices nclass.Sturges
-data_spineplot = function(off = NULL, breaks = NULL, xlevels = xlevels, ylevels = ylevels, xaxlabels = NULL, yaxlabels = NULL, weights = NULL, lighten = FALSE) {
+data_spineplot = function(off = NULL, breaks = NULL, xlevels = xlevels, xord = NULL, ylevels = ylevels, yord = NULL, xaxlabels = NULL, yaxlabels = NULL, weights = NULL, lighten = FALSE) {
     fun = function(settings, ...) {
         env2env(settings, environment(), c("datapoints", "xlim", "ylim", "facet", "facet.args", "by", "xaxb", "yaxb", "null_by", "null_facet", "col", "bg", "axes", "frame.plot", "xaxt", "yaxt", "lwd", "lty"))
         settings[["lighten"]] = lighten
@@ -166,6 +185,24 @@ data_spineplot = function(off = NULL, breaks = NULL, xlevels = xlevels, ylevels
           datapoints$y = sanitize_xlevels(datapoints$y, ylevels, arg = "ylevels")
           if (y_by) datapoints$by = datapoints$y
         }
+        ## Both axes here are categorical, so there is no response to rank on:
+        ## the size keywords count observations instead (weighted, if given),
+        ## i.e. "total" orders the categories by frequency.
+        spine_w = if (!is.null(weights)) weights else rep.int(1, nrow(datapoints))
+        if (!is.null(xord) && is.null(xlevels) && x.categorical) {
+          datapoints$x = sanitize_ord(
+            datapoints$x, spine_w, NULL,
+            xord, arg = "xord", keywords = ord_keywords_scalar
+          )
+          if (x_by) datapoints$by = datapoints$x
+        }
+        if (!is.null(yord) && is.null(ylevels)) {
+          datapoints$y = sanitize_ord(
+            datapoints$y, spine_w, NULL,
+            yord, arg = "yord", keywords = ord_keywords_scalar
+          )
+          if (y_by) datapoints$by = datapoints$y
+        }
         
         x = datapoints$x
         y = datapoints$y
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index 5e3b72ee..8498d62c 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -11,6 +11,7 @@ type_barplot(
   offset = NULL,
   FUN = NULL,
   xlevels = NULL,
+  xord = NULL,
   xaxlabels = NULL,
   drop.zeros = FALSE,
   lighten = TRUE
@@ -36,7 +37,8 @@ one of two distinct forms. See the Examples for illustrations of both.
 \itemize{
 \item \emph{Positions} via an unnamed numeric scalar or vector. Bars start at the
 offset value(s) rather than zero, matched per x-level after any \code{xlevels}
-reordering (a scalar is applied to all bars). Useful for waterfall charts.
+or \code{xord} reordering (a scalar is applied to all bars). Useful for
+waterfall charts.
 The positional form cannot be combined with \code{center}.
 \item \emph{Category} via a character vector such as \code{offset = "Unsure"}, or a
 named numeric vector such as \code{offset = c(Unsure = 1.1)}. The named
@@ -50,12 +52,33 @@ grouping and \code{beside = FALSE}, but can be combined with \code{center}.
 \item{FUN}{a function to compute the summary statistic for \code{y} within each
 group of \code{x} in case of using a two-sided formula \code{y ~ x} (default: mean).}
 
-\item{xlevels}{a character or numeric vector specifying the ordering of the
-levels of the \code{x} variable (if character) or the corresponding indexes
-(if numeric) for the plot. The special keyword \code{"asis"} takes the
-categories in the order that they appear in the data. Note that this
-argument only affects categorical (i.e., factor or character) \code{x}
-variables.}
+\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
+hence of the axis. Supply one or the other; if both are given, \code{xlevels}
+takes precedence and \code{xord} is ignored. Note that a numeric \code{x} is coerced
+to a factor before the bars are drawn, so it is reordered like any other
+categorical variable.
+
+\code{xlevels} names the levels literally: a character vector of level names in
+the desired order, or a numeric vector of the corresponding level indexes
+(e.g. \code{3:1}).
+
+\code{xord} instead derives the order from the data, via a keyword or a
+function. Options are:
+\itemize{
+\item \code{"total"} ranks the categories by value, largest first. In practice this
+is the keyword most reach for, since it sorts the bars by height. Note that
+it ranks the \emph{aggregated} bars, i.e. whatever \code{FUN} produced, rather than
+the underlying rows.
+\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they appear
+in the data, while \code{"rev"} reverses the current level order.
+\item a custom function that determines both the ranking statistic and its
+direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
+reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
+than by sum.
+}
+
+Both default to \code{NULL}, i.e. keep the existing factor levels.}
 
 \item{xaxlabels}{a character vector with the axis labels for the \code{x} variable,
 defaulting to the levels of \code{x}.}
@@ -86,6 +109,22 @@ tinyplot(~ cyl | vs, data = mtcars, type = "barplot", beside = TRUE)
 tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = c("8", "6", "4"))
 tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = 3:1)
 
+# Or let the data decide the order, rather than naming it. `xord = "total"`
+# sorts the bars by height; the ordering is shared across groups and facets.
+tinyplot(~ cyl, data = mtcars, type = "barplot", xord = "total")
+tinyplot(~ cyl | vs, data = mtcars, type = "barplot", xord = "total")
+
+# The ranking statistic is always sorted ascending, so passing a function is
+# how you get the reverse: `sum` undoes what `"total"` does.
+tinyplot(~ cyl, data = mtcars, type = "barplot", xord = function(y) sum(y))
+
+# The two arguments compose, `xlevels` first: here we fix an explicit order
+# and then flip it.
+tinyplot(
+  ~ cyl, data = mtcars, type = "barplot",
+  xlevels = c("8", "6", "4"), xord = "rev"
+)
+
 # Note: Above we used automatic argument passing for `beside`. But this
 # wouldn't work for `width`, since it would conflict with the top-level
 # `tinyplot(..., width = <width>)` argument. It's safer to pass these args
diff --git a/man/type_errorbar.Rd b/man/type_errorbar.Rd
index 3d59cc6b..05cfcd38 100644
--- a/man/type_errorbar.Rd
+++ b/man/type_errorbar.Rd
@@ -5,9 +5,15 @@
 \alias{type_pointrange}
 \title{Error bar and pointrange plot types}
 \usage{
-type_errorbar(length = 0.05, dodge = 0, fixed.dodge = FALSE, xlevels = "asis")
+type_errorbar(
+  length = 0.05,
+  dodge = 0,
+  fixed.dodge = FALSE,
+  xlevels = NULL,
+  xord = "asis"
+)
 
-type_pointrange(dodge = 0, fixed.dodge = FALSE, xlevels = "asis")
+type_pointrange(dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = "asis")
 }
 \arguments{
 \item{length}{length of the edges of the arrow head (in inches).}
@@ -34,17 +40,37 @@ present at that position. If \code{TRUE}, dodge positions are based on all
 groups, ensuring "fixed" spacing across x-axis breaks (i.e., even if some
 groups are missing for a particular \code{x} value).}
 
-\item{xlevels}{a character or numeric vector specifying the order in which
-the levels of the \code{x} variable should be plotted (as level names if
-character, or level indexes if numeric, e.g. \code{3:1}). Note that this
-argument only affects categorical (i.e., factor or character) \code{x}
-variables; it is ignored for numeric \code{x}. Unlike most other plot types,
-here it defaults to the special keyword \code{"asis"}, which takes the
-categories in the order that they appear in the data: these types are
-typically used for coefficient plots, where the row order of the data
-(e.g., the terms of a model) is usually intentional. Set
-\code{xlevels = NULL} to follow the factor levels instead, matching the other
-plot types.}
+\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
+hence of the axis. Supply one or the other; if both are given, \code{xlevels}
+takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
+factor or character) \code{x} variables; a numeric \code{x} is plotted at its own
+values and cannot be reordered, so supplying either there is ignored with a
+warning.
+
+\code{xlevels} names the levels literally: a character vector of level names in
+the desired order, or a numeric vector of the corresponding level indexes
+(e.g. \code{3:1}). Default is \code{NULL}.
+
+\code{xord} instead derives the order from the data, via a keyword or a
+function. Options are:
+\itemize{
+\item \code{"total"} ranks the categories by their \code{y} values, largest first.
+\item \code{"minvar"} ranks them by variance, lowest first. This needs more than one
+observation per category, so it does not apply to the usual one-row-per-
+term coefficient table.
+\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they appear
+in the data, while \code{"rev"} reverses the current level order.
+\item a custom function that determines both the ranking statistic and its
+direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
+reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
+than by sum.
+}
+
+Unlike most other plot types, \code{xord} defaults to \code{"asis"} here rather than
+\code{NULL}: these types are typically used for coefficient plots, where the row
+order of the data (e.g., the terms of a model) is usually intentional. Set
+\code{xord = NULL} to follow the factor levels instead, matching the other types.}
 }
 \description{
 Type function(s) for producing error bar and pointrange plots.
diff --git a/man/type_lines.Rd b/man/type_lines.Rd
index 79acd24d..b21be42a 100644
--- a/man/type_lines.Rd
+++ b/man/type_lines.Rd
@@ -4,7 +4,13 @@
 \alias{type_lines}
 \title{Lines plot type}
 \usage{
-type_lines(type = "l", dodge = 0, fixed.dodge = FALSE, xlevels = NULL)
+type_lines(
+  type = "l",
+  dodge = 0,
+  fixed.dodge = FALSE,
+  xlevels = NULL,
+  xord = NULL
+)
 }
 \arguments{
 \item{type}{1-character string giving the type of plot desired.  The
@@ -40,15 +46,33 @@ present at that position. If \code{TRUE}, dodge positions are based on all
 groups, ensuring "fixed" spacing across x-axis breaks (i.e., even if some
 groups are missing for a particular \code{x} value).}
 
-\item{xlevels}{a character or numeric vector specifying the order in which
-the levels of the \code{x} variable should be plotted (as level names if
-character, or level indexes if numeric, e.g. \code{3:1}). The special keyword
-\code{"asis"} takes the categories in the order that they appear in the data,
-i.e. skipping the alphabetical sort that is otherwise applied when
-coercing a character variable to a factor. Note that this argument only
-affects categorical (i.e., factor or character) \code{x} variables; it is
-ignored for numeric \code{x}. The default \code{NULL} keeps the existing factor
-levels (alphabetical for character variables).}
+\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
+hence of the axis. Supply one or the other; if both are given, \code{xlevels}
+takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
+factor or character) \code{x} variables; a numeric \code{x} is plotted at its own
+values and cannot be reordered, so supplying either there is ignored with a
+warning.
+
+\code{xlevels} names the levels literally: a character vector of level names in the
+desired order, or a numeric vector of the corresponding level indexes
+(e.g. \code{3:1}).
+
+\code{xord} instead derives the order from the data, via a keyword or a function.
+Options are:
+\itemize{
+\item \code{"total"} ranks the categories by the \code{y} values observed at each one,
+largest first.
+\item \code{"minvar"} ranks them by the variance of those values, lowest first.
+\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they appear
+in the data, while \code{"rev"} reverses the current level order.
+\item a custom function that determines both the ranking statistic and its
+direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
+reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
+than by sum.
+}
+
+Both default to \code{NULL}, i.e. keep the existing factor levels.}
 }
 \description{
 Type function for plotting lines.
@@ -60,7 +84,7 @@ Like the other plot types, \code{type_lines()} places categorical (factor or
 character) data according to the factor levels. Character variables are
 coerced with \code{\link[=factor]{factor()}} and so end up in alphabetical order. To order the
 categories by their appearance in the data instead, use
-\code{xlevels = "asis"}, or set the levels explicitly, e.g.
+\code{xord = "asis"}, or set the levels explicitly, e.g.
 \code{factor(x, levels = unique(x))}.
 
 Note that the lines themselves are always drawn in the order that the rows
diff --git a/man/type_points.Rd b/man/type_points.Rd
index 205c4cbb..4b907dc1 100644
--- a/man/type_points.Rd
+++ b/man/type_points.Rd
@@ -4,7 +4,13 @@
 \alias{type_points}
 \title{Points plot type}
 \usage{
-type_points(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL)
+type_points(
+  clim = c(0.5, 2.5),
+  dodge = 0,
+  fixed.dodge = FALSE,
+  xlevels = NULL,
+  xord = NULL
+)
 }
 \arguments{
 \item{clim}{Numeric giving the lower and upper limits of the character
@@ -32,15 +38,33 @@ present at that position. If \code{TRUE}, dodge positions are based on all
 groups, ensuring "fixed" spacing across x-axis breaks (i.e., even if some
 groups are missing for a particular \code{x} value).}
 
-\item{xlevels}{a character or numeric vector specifying the order in which
-the levels of the \code{x} variable should be plotted (as level names if
-character, or level indexes if numeric, e.g. \code{3:1}). The special keyword
-\code{"asis"} takes the categories in the order that they appear in the data,
-i.e. skipping the alphabetical sort that is otherwise applied when
-coercing a character variable to a factor. Note that this argument only
-affects categorical (i.e., factor or character) \code{x} variables; it is
-ignored for numeric \code{x}. The default \code{NULL} keeps the existing factor
-levels (alphabetical for character variables).}
+\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
+hence of the axis. Supply one or the other; if both are given, \code{xlevels}
+takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
+factor or character) \code{x} variables; a numeric \code{x} is plotted at its own
+values and cannot be reordered, so supplying either there is ignored with a
+warning.
+
+\code{xlevels} names the levels literally: a character vector of level names in the
+desired order, or a numeric vector of the corresponding level indexes
+(e.g. \code{3:1}).
+
+\code{xord} instead derives the order from the data, via a keyword or a function.
+Options are:
+\itemize{
+\item \code{"total"} ranks the categories by the \code{y} values observed at each one,
+largest first.
+\item \code{"minvar"} ranks them by the variance of those values, lowest first.
+\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they appear
+in the data, while \code{"rev"} reverses the current level order.
+\item a custom function that determines both the ranking statistic and its
+direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
+reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
+than by sum.
+}
+
+Both default to \code{NULL}, i.e. keep the existing factor levels.}
 }
 \description{
 Type function for plotting points, i.e. a scatter plot.
diff --git a/man/type_ridge.Rd b/man/type_ridge.Rd
index a6207864..7dd471fe 100644
--- a/man/type_ridge.Rd
+++ b/man/type_ridge.Rd
@@ -10,6 +10,7 @@ type_ridge(
   breaks = NULL,
   probs = NULL,
   ylevels = NULL,
+  yord = NULL,
   bw = "nrd0",
   joint.bw = c("mean", "full", "none"),
   adjust = 1,
@@ -47,9 +48,34 @@ at the specified \code{probs}. The quantiles are computed based on the density
 (rather than the raw original variable). Only one of \code{breaks} or
 \code{probs} must be specified.}
 
-\item{ylevels}{a character or numeric vector specifying in which order
-the levels of the y-variable should be plotted. The special keyword
-\code{"asis"} takes the categories in the order that they appear in the data.}
+\item{ylevels, yord}{two ways to control the order of the \code{y} variable, and
+hence of the axis. Supply one or the other; if both are given, \code{ylevels}
+takes precedence and \code{yord} is ignored. Note that a numeric \code{y} is coerced
+to a factor before the ridges are drawn, so it is reordered like any other
+categorical variable.
+
+\code{ylevels} names the levels literally: a character vector of level names in
+the desired order, or a numeric vector of the corresponding level indexes
+(e.g. \code{3:1}).
+
+\code{yord} instead derives the order from the data, via a keyword or a
+function. Options are:
+\itemize{
+\item \code{"total"} ranks the ridges by summed \code{x}, largest first. (Ridge plots
+have no separate response, so the ranking runs on the continuous \code{x}
+variable.)
+\item \code{"minvar"} ranks them by the spread of each distribution, narrowest
+first.
+\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they appear
+in the data, while \code{"rev"} reverses the current level order.
+\item a custom function that determines both the ranking statistic and its
+direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
+reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
+than by sum.
+}
+
+Both default to \code{NULL}, i.e. keep the existing factor levels.}
 
 \item{bw}{the smoothing \code{\link[stats:bw.nrd]{bandwidth}} to be used,
 see \code{\link[stats]{density}} for details and options.}
diff --git a/man/type_spineplot.Rd b/man/type_spineplot.Rd
index 9540520d..9d6d86dc 100644
--- a/man/type_spineplot.Rd
+++ b/man/type_spineplot.Rd
@@ -9,7 +9,9 @@ type_spineplot(
   tol.ylab = 0.05,
   off = NULL,
   xlevels = NULL,
+  xord = NULL,
   ylevels = NULL,
+  yord = NULL,
   col = NULL,
   xaxlabels = NULL,
   yaxlabels = NULL,
@@ -29,11 +31,32 @@ type_spineplot(
 \item{off}{vertical offset between the bars (in per cent). It is fixed to
     \code{0} for spinograms and defaults to \code{2} for spine plots.}
 
-\item{xlevels, ylevels}{a character or numeric vector specifying the ordering of the
-levels of the \code{x} and \code{y} variables (if character) or the corresponding indexes
-(if numeric) for the plot. The special keyword \code{"asis"} takes the
-categories in the order that they appear in the data. Note that these
-arguments only affect categorical (i.e., factor or character) variables.}
+\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
+hence of the axis. Supply one or the other; if both are given, \code{xlevels}
+takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
+factor or character) variables.
+
+\code{xlevels} names the levels literally: a character vector of level names in
+the desired order, or a numeric vector of the corresponding level indexes
+(e.g. \code{3:1}).
+
+\code{xord} instead derives the order from the data, via a keyword or a
+function. Options are:
+\itemize{
+\item \code{"total"} ranks the categories by frequency, most common first. (Both
+axes of a spineplot are categorical, so there is no response to rank on and
+observations are counted instead, weighted if \code{weights} is given.)
+\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they appear
+in the data, while \code{"rev"} reverses the current level order.
+\item a custom function that determines both the ranking statistic and its
+direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
+reverses \code{"total"}.
+}
+
+Both default to \code{NULL}, i.e. keep the existing factor levels.}
+
+\item{ylevels, yord}{as for \code{xlevels} / \code{xord} above, but for the \code{y} variable.}
 
 \item{col}{a vector of fill colors of the same length as \code{levels(y)}.
     The default is to call \code{\link{gray.colors}}.}

From 745386b72ddfb50bcf88b8987901a922ebf7450d Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Wed, 26 Aug 2026 20:33:24 -0700
Subject: [PATCH 02/23] tinylabel accepts dict of named vector or list

---
 R/legend.R    | 10 ++++---
 R/tinylabel.R | 75 +++++++++++++++++++++++++++++++++++++++------------
 R/tinyplot.R  | 16 +++++------
 R/type_text.R | 10 +++----
 4 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/R/legend.R b/R/legend.R
index 4922e78d..eebb0ede 100644
--- a/R/legend.R
+++ b/R/legend.R
@@ -542,7 +542,8 @@ prepare_legend = function(settings) {
 #' @param legend_args Additional legend arguments
 #' @param by_dep The (deparsed) "by" grouping variable name
 #' @param lgnd_labs The legend labels
-#' @param labeller Character or function for formatting labels
+#' @param labeller Function, character keyword, or named vector for formatting
+#'   or relabelling the labels. See [`tinylabel`] for the accepted forms.
 #' @param type Plot type
 #' @param pch Plotting character(s)
 #' @param lty Line type(s)
@@ -770,7 +771,8 @@ reverse_legend_keys = function(legend_args, n) {
 #' @param legend_args Additional legend arguments
 #' @param by_dep The (deparsed) "by" grouping variable name
 #' @param lgnd_labs The legend labels
-#' @param labeller Character or function for formatting labels
+#' @param labeller Function, character keyword, or named vector for formatting
+#'   or relabelling the labels. See [`tinylabel`] for the accepted forms.
 #' @param type Plot type
 #' @param pch Plotting character(s)
 #' @param lty Line type(s)
@@ -879,7 +881,9 @@ build_legend_env = function(
 #'   \code{\link[graphics]{legend}}.
 #' @param by_dep The (deparsed) "by" grouping variable name.
 #' @param lgnd_labs The labels passed to `legend(legend = ...)`.
-#' @param labeller Character or function for formatting the labels (`lgnd_labs`).
+#' @param labeller Function, character keyword, or named vector for formatting
+#'   or relabelling the labels (`lgnd_labs`). See [`tinylabel`] for the
+#'   accepted forms.
 #'   Passed down to [`tinylabel`].
 #' @param type Plotting type(s), passed down from [tinyplot].
 #' @param pch Plotting character(s), passed down from [tinyplot].
diff --git a/R/tinylabel.R b/R/tinylabel.R
index cd51e514..9e3afec3 100644
--- a/R/tinylabel.R
+++ b/R/tinylabel.R
@@ -4,12 +4,27 @@
 #' ticks labels. This is what the top-level `xaxl` and `yaxl` arguments
 #' from [`tinyplot`] ultimately get passed to.
 #' @param x a numeric or character vector
-#' @param labeller a formatting function to be applied to `x`, e.g. [`format`],
-#'   [`toupper`], [`abs`], or other custom function (including from the popular
-#'   **scales** package). Can also be one of the following convenience strings
-#'   (symbols), for which common formatting transformations are provided:
-#'   `"percent"` (`"%"`), `"comma"` (`","`), `"log"` (`"l"`), `"dollar"`
-#'   (`"$"`), `"euro"` (`"€"`), or `"sterling"` (`"£"`).
+#' @param labeller how the labels should be relabelled or reformatted. One of:
+#'
+#'   - a function to be applied to `x`, e.g. [`format`], [`toupper`], [`abs`],
+#'   or any other custom function (including from the popular **scales**
+#'   package).
+#'   - one of the following convenience strings (or their symbol equivalents),
+#'   for which common formatting transformations are provided: `"percent"`
+#'   (`"%"`), `"comma"` (`","`), `"log"` (`"l"`), `"dollar"` (`"$"`), `"euro"`
+#'   (`"€"`), or `"sterling"` (`"£"`).
+#'   - a *named* character vector or list, acting as a dictionary, e.g.
+#'   `c(setosa = "SET")`. Entries of `x` that match a name are replaced by the
+#'   corresponding value and the rest are left alone, so a partial mapping is
+#'   fine. The lookup is by value rather than by position, which means it is
+#'   unaffected by any reordering of the underlying categories.
+#'
+#'   Note that an *unnamed* character vector of length greater than one is an
+#'   error, rather than a positional replacement of the labels. Such a vector
+#'   could not be told apart from a formatting keyword when `x` is of length
+#'   one, and would not follow the categories if they were reordered. Pass a
+#'   function if you want to compute the labels positionally, e.g.
+#'   `function(x) LETTERS[seq_along(x)]`.
 #' @param na.ignore logical indicating whether the labelling function should
 #'   ignore `NA` values in `x`. In other words, should the `NA` values be left
 #'   as-is? Default is `TRUE`.
@@ -25,6 +40,10 @@
 #' tinylabel(x, "comma")
 #' tinylabel(x, ",") # same
 #' tinylabel(x, "$") # or "dollar"
+#'
+#' # a named vector acts as a dictionary: matched entries are replaced and the
+#' # rest are left alone
+#' tinylabel(c("setosa", "versicolor"), c(setosa = "SET"))
 #' 
 #' # invoke tinylabel from a parent tinyplot call...
 #' #   => x/yaxl for adjusting axes tick labels
@@ -93,8 +112,32 @@ tinylabel = function(x, labeller = NULL, na.ignore = TRUE, na.rm = TRUE) {
   } else {
     seq_along(x)
   }
+  if (is.list(labeller) && !is.null(names(labeller))) {
+    labeller = unlist(labeller)
+  }
   if (is.character(labeller)) {
-    labeller = labeller_fun((labeller))
+    # A *named* character vector is a dictionary: replace the labels it names
+    # and leave the rest alone. Names are what make this safe -- they cannot
+    # collide with the formatting keywords, they survive any `*ord`/`*levels`
+    # reordering (the mapping is by value, not by position), and a length
+    # mismatch is meaningless rather than silently recycled.
+    if (!is.null(names(labeller))) {
+      out = as.character(x)
+      hit = match(out, names(labeller))
+      out[!is.na(hit)] = unname(labeller)[hit[!is.na(hit)]]
+      return(out)
+    }
+    # An unnamed vector is a formatting keyword, and only ever that. Positional
+    # replacement is deliberately not supported: it could not be told apart
+    # from a keyword on a one-tick axis, and it would not follow the categories
+    # when they are reordered.
+    if (length(labeller) != 1L) {
+      stop(
+        "a character `labeller` must be a single formatting keyword, or a named vector mapping old labels to new ones.\n  For positional or computed labels, pass a function, e.g. `function(x) LETTERS[seq_along(x)]`.",
+        call. = FALSE
+      )
+    }
+    labeller = labeller_fun(labeller)
   }
   # don't need to subset if everything is being used. DateTime also require
   # exception logic (e.g., date format needs to be consistent for whole vector)
@@ -116,20 +159,18 @@ labeller_fun = function(label = "percent") {
     "\u00a3" = "sterling",
     "l"      = "log"
   )
-  if (label %in% names(labels)) {
-    label = labels[label]
-  }
-
-  ## all labels plus absolute value version
-  # labels = c("percent", "comma", "dollar", "euro", "sterling")
-  labels = c(labels, paste0("abs_", labels))
-
-  ## match full label first, then store abs_ info separately
-  label = match.arg(label, labels)
+  ## Strip any "abs_" prefix *before* resolving a symbol to its full name.
+  ## Doing it the other way round leaves "abs_," unresolvable, which is exactly
+  ## what a centered barplot produces from a symbol keyword: it prepends the
+  ## prefix itself (see type_barplot()).
   abs_ = substr(label, 1L, 4L) == "abs_"
   if (abs_) {
     label = substr(label, 5L, nchar(label))
   }
+  if (label %in% names(labels)) {
+    label = labels[label]
+  }
+  label = match.arg(label, unname(labels))
 
   ## actual formatting functions
 
diff --git a/R/tinyplot.R b/R/tinyplot.R
index 881b4d30..2e279ad1 100644
--- a/R/tinyplot.R
+++ b/R/tinyplot.R
@@ -257,16 +257,12 @@
 #'   the break points at which the axis tick-marks are to be drawn. Break points
 #'   outside the range of the data will be ignored if the associated axis
 #'   variable is categorical, or an explicit `x/ylim` range is given.
-#' @param xaxl,yaxl a function or a character keyword specifying the format of
-#'   the x- or y-axis tick labels. Note that this is a post-processing step that
-#'   affects the _appearance_ of the tick labels only; use in conjunction with
-#'   `x/yaxb` if you would like to adjust the position of the tick marks too. In
-#'   addition to user-supplied formatting functions (e.g., [`format`],
-#'   [`toupper`], [`abs`], or other custom function), several convenience
-#'   keywords (or their symbol equivalents) are available for common formatting
-#'   transformations: `"percent"` (`"%"`), `"comma"` (`","`), `"log"` (`"l"`),
-#'   `"dollar"` (`"$"`), `"euro"` (`"€"`), or `"sterling"` (`"£"`). See the
-#'   [`tinylabel`] documentation for examples.
+#' @param xaxl,yaxl a function, character keyword, or named vector for
+#'   formatting or (re)labelling the x- or y-axis tick labels. Passed to
+#'   [`tinylabel`]; see the latter's help file for more detailed documentation
+#'   and examples. Note that this is a post-processing step that affects the
+#'   _appearance_ of the tick labels only; use in conjunction with `x/yaxb` if
+#'   you would like to adjust the position of the tick marks too.
 #' @param log a character string which contains `"x"` if the x axis is to be
 #'   logarithmic, `"y"` if the y axis is to be logarithmic and `"xy"` or `"yx"`
 #'   if both axes are to be logarithmic.
diff --git a/R/type_text.R b/R/type_text.R
index 803bec38..1e990859 100644
--- a/R/type_text.R
+++ b/R/type_text.R
@@ -9,11 +9,11 @@
 #'   a top-level [`tinyplot`] argument, which additionally supports non-standard
 #'   evaluation against `data` and takes precedence if both are given. See
 #'   Examples.
-#' @param labeller A formatting function (or convenience string) passed to
-#'   [`tinylabel`] for formatting the `labels`. Useful for ensuring that the
-#'   text labels match the formatting of an axis, e.g. `labeller = "%"` to
-#'   display the labels as percentages. Default is `NULL`, i.e. no formatting.
-#'   See Examples.
+#' @param labeller A formatting function, convenience string, or named vector
+#'   passed to [`tinylabel`] for formatting or relabelling the `labels`. Useful
+#'   for ensuring that the text labels match the formatting of an axis, e.g.
+#'   `labeller = "%"` to display the labels as percentages. Default is `NULL`,
+#'   i.e. no formatting. See Examples.
 #' @param family The name of a font family. Default of `NULL` means that the
 #' family will be the same as the main plot text, following
 #' \code{\link[graphics]{par}}. Note that if a `family` argument is provided,

From 0a297732eaf6ae0a9559e5f13ec30f2a2766e22f Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Wed, 26 Aug 2026 20:36:05 -0700
Subject: [PATCH 03/23] x/yaxlabels -> x/yaxl

- deprecate remaining type-level x/yaxlabels arguments in favour of tope-level x-yaxl args
---
 R/type_barplot.R   | 14 ++++++++++++--
 R/type_ridge.R     | 10 ++++++++--
 R/type_spineplot.R | 29 ++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/R/type_barplot.R b/R/type_barplot.R
index 4b83a2e3..709c2587 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -45,8 +45,10 @@
 #'   than by sum.
 #'
 #'   Both default to `NULL`, i.e. keep the existing factor levels.
-#' @param xaxlabels a character vector with the axis labels for the `x` variable,
-#'   defaulting to the levels of `x`.
+#' @param xaxlabels \[Deprecated\] a character vector with the axis labels for
+#'   the `x` variable. Use the top-level `xaxl` argument instead, which now
+#'   accepts a named vector mapping old labels to new ones, and applies
+#'   consistently across plot types.
 #' @param offset optional specification for shifting bar baselines, accepting
 #'   one of two distinct forms. See the Examples for illustrations of both.
 #' 
@@ -178,6 +180,14 @@
 #'
 #' @export
 type_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xord = NULL, xaxlabels = NULL, drop.zeros = FALSE, lighten = TRUE) {
+  if (!is.null(xaxlabels)) {
+    warning(
+      "'xaxlabels' is deprecated; use the top-level 'xaxl' argument instead, ",
+      "e.g. tinyplot(..., xaxl = c(old = \"new\")) to rename particular ",
+      "categories, or xaxl = function(x) ... to compute the labels.",
+      call. = FALSE
+    )
+  }
   out = list(
     data = data_barplot(width = width, beside = beside, center = center, offset = offset, FUN = FUN, xlevels = xlevels, xord = xord, xaxlabels = xaxlabels, drop.zeros = drop.zeros, lighten = lighten),
     draw = draw_rect(),
diff --git a/R/type_ridge.R b/R/type_ridge.R
index 276149b9..2f328e2a 100644
--- a/R/type_ridge.R
+++ b/R/type_ridge.R
@@ -298,7 +298,7 @@ data_ridge = function(bw = "nrd0", adjust = 1, kernel = "gaussian", n = 512,
                       singletons = "warn"
                       ) {
   fun = function(settings, ...) {
-    env2env(settings, environment(), c("datapoints", "yaxt", "xaxt", "null_by"))
+    env2env(settings, environment(), c("datapoints", "yaxt", "xaxt", "null_by", "yaxl"))
 
     # `col` may arrive either via the top-level `tinyplot(..., col =)` call
     # (stored in settings) or via the `type_ridge(col =)` constructor arg. The
@@ -496,6 +496,10 @@ data_ridge = function(bw = "nrd0", adjust = 1, kernel = "gaussian", n = 512,
       probs = probs,
       manbreaks = manbreaks,
       yaxt = yaxt_orig,
+      ## This type draws its own y-axis category labels (see `draws_own_axes`),
+      ## so it never reaches the standard path where `yaxl` is applied. Carry it
+      ## through for the tinyAxis() calls in draw_ridge() to use as a labeller.
+      yaxl = yaxl,
       raster = raster,
       ridge_theme = ridge_theme,
       x_by = x_by,
@@ -616,6 +620,7 @@ draw_ridge = function() {
     if (ridge_theme) {
       if (keep_axis(2)) {
         tinyAxis(x = d$y, side = 2, at = val, labels = lab, type = type_info[["yaxt"]],
+                 labeller = type_info[["yaxl"]],
                  padj = 0,
                  mgp = c(3, 1, 0) - c(0.5, 0.5 + 0.3, 0),
                  tcl = 0)
@@ -623,7 +628,8 @@ draw_ridge = function() {
       if (identical(.tpar[["tinytheme"]], "ridge2") && keep_axis(1)) axis(1, labels = FALSE)
     } else {
       if (keep_axis(2)) {
-        tinyAxis(x = d$y, side = 2, at = val, labels = lab, type = type_info[["yaxt"]])
+        tinyAxis(x = d$y, side = 2, at = val, labels = lab, type = type_info[["yaxt"]],
+                 labeller = type_info[["yaxl"]])
       }
     }
   }
diff --git a/R/type_spineplot.R b/R/type_spineplot.R
index f8f02fbd..75f10065 100644
--- a/R/type_spineplot.R
+++ b/R/type_spineplot.R
@@ -28,6 +28,10 @@
 #'
 #'   Both default to `NULL`, i.e. keep the existing factor levels.
 #' @param ylevels,yord as for `xlevels` / `xord` above, but for the `y` variable.
+#' @param xaxlabels,yaxlabels \[Deprecated\] character vectors for annotation of
+#'   the x and y axis. Use the top-level `xaxl` / `yaxl` arguments instead,
+#'   which accept a named vector mapping old labels to new ones, and apply
+#'   consistently across plot types.
 #' @inheritParams graphics::spineplot
 #' @param lighten logical. For grouped spineplots where the `y` variable is
 #'   itself the grouping variable (i.e. `y == by`), should the fills use a
@@ -115,6 +119,20 @@
 #' @export
 type_spineplot = function(breaks = NULL, tol.ylab = 0.05, off = NULL, xlevels = NULL, xord = NULL, ylevels = NULL, yord = NULL, col = NULL, xaxlabels = NULL, yaxlabels = NULL, weights = NULL, lighten = FALSE) {
   col = col
+  dep = c(if (!is.null(xaxlabels)) "xaxlabels", if (!is.null(yaxlabels)) "yaxlabels")
+  if (length(dep)) {
+    warning(
+      sprintf(
+        "'%s' %s deprecated; ",
+        paste(dep, collapse = "' and '"),
+        if (length(dep) > 1L) "are" else "is"
+      ),
+      "use the top-level 'xaxl'/'yaxl' arguments instead, e.g. ",
+      "tinyplot(..., yaxl = c(old = \"new\")) to rename particular categories, ",
+      "or yaxl = function(x) ... to compute the labels.",
+      call. = FALSE
+    )
+  }
   out = list(
     data = data_spineplot(off = off, breaks = breaks, xlevels = xlevels, xord = xord, ylevels = ylevels, yord = yord, xaxlabels = xaxlabels, yaxlabels = yaxlabels, weights = weights, lighten = lighten),
     draw = draw_spineplot(tol.ylab = tol.ylab, off = off, col = col, xaxlabels = xaxlabels, yaxlabels = yaxlabels, lighten = lighten),
@@ -127,7 +145,7 @@ type_spineplot = function(breaks = NULL, tol.ylab = 0.05, off = NULL, xlevels =
 #' @importFrom grDevices nclass.Sturges
 data_spineplot = function(off = NULL, breaks = NULL, xlevels = xlevels, xord = NULL, ylevels = ylevels, yord = NULL, xaxlabels = NULL, yaxlabels = NULL, weights = NULL, lighten = FALSE) {
     fun = function(settings, ...) {
-        env2env(settings, environment(), c("datapoints", "xlim", "ylim", "facet", "facet.args", "by", "xaxb", "yaxb", "null_by", "null_facet", "col", "bg", "axes", "frame.plot", "xaxt", "yaxt", "lwd", "lty"))
+        env2env(settings, environment(), c("datapoints", "xlim", "ylim", "facet", "facet.args", "by", "xaxb", "yaxb", "xaxl", "yaxl", "null_by", "null_facet", "col", "bg", "axes", "frame.plot", "xaxt", "yaxt", "lwd", "lty"))
         settings[["lighten"]] = lighten
       
         ## process weights: a top-level `weights` column (carried on datapoints
@@ -302,6 +320,15 @@ data_spineplot = function(off = NULL, breaks = NULL, xlevels = xlevels, xord = N
         if (isTRUE(x_by)) datapoints$by = factor(rep(xaxlabels, each = ny)) # each x label extends over ny rows
         if (isTRUE(y_by)) datapoints$by = factor(rep_len(yaxlabels, nrow(datapoints)))
 
+        ## This type draws its own axes (see the `draws_own_axes` hint below),
+        ## so it never reaches the standard path where the top-level `xaxl` /
+        ## `yaxl` are applied. Apply them here instead, to the labels that
+        ## spine_axis() will actually draw. Deliberately after the `by` catch
+        ## above: `x/yaxl` are documented as affecting the tick labels only, so
+        ## a legend built from the same categories should be left alone.
+        if (!is.null(xaxl)) xaxlabels = tinylabel(xaxlabels, xaxl)
+        if (!is.null(yaxl)) yaxlabels = tinylabel(yaxlabels, yaxl)
+
         x = c(datapoints$xmin, datapoints$xmax)
         y = c(datapoints$ymin, datapoints$ymax)
         ymin = datapoints$ymin

From b07386c056d9f2882e16578594eac05f58489fd1 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Wed, 26 Aug 2026 20:36:40 -0700
Subject: [PATCH 04/23] docs

---
 man/build_legend_args.Rd |  3 ++-
 man/build_legend_env.Rd  |  3 ++-
 man/draw_legend.Rd       |  4 +++-
 man/tinyAxis.Rd          | 28 ++++++++++++++++++++++------
 man/tinylabel.Rd         | 32 ++++++++++++++++++++++++++------
 man/tinyplot.Rd          | 16 ++++++----------
 man/type_barplot.Rd      |  6 ++++--
 man/type_text.Rd         | 10 +++++-----
 8 files changed, 70 insertions(+), 32 deletions(-)

diff --git a/man/build_legend_args.Rd b/man/build_legend_args.Rd
index 1e1ea297..4f093e7a 100644
--- a/man/build_legend_args.Rd
+++ b/man/build_legend_args.Rd
@@ -32,7 +32,8 @@ build_legend_args(
 
 \item{lgnd_labs}{The legend labels}
 
-\item{labeller}{Character or function for formatting labels}
+\item{labeller}{Function, character keyword, or named vector for formatting
+or relabelling the labels. See \code{\link{tinylabel}} for the accepted forms.}
 
 \item{type}{Plot type}
 
diff --git a/man/build_legend_env.Rd b/man/build_legend_env.Rd
index 9deb42e9..69d9b0cf 100644
--- a/man/build_legend_env.Rd
+++ b/man/build_legend_env.Rd
@@ -36,7 +36,8 @@ build_legend_env(
 
 \item{lgnd_labs}{The legend labels}
 
-\item{labeller}{Character or function for formatting labels}
+\item{labeller}{Function, character keyword, or named vector for formatting
+or relabelling the labels. See \code{\link{tinylabel}} for the accepted forms.}
 
 \item{type}{Plot type}
 
diff --git a/man/draw_legend.Rd b/man/draw_legend.Rd
index b604375c..145b5ed9 100644
--- a/man/draw_legend.Rd
+++ b/man/draw_legend.Rd
@@ -39,7 +39,9 @@ draw_legend(
 
 \item{lgnd_labs}{The labels passed to \code{legend(legend = ...)}.}
 
-\item{labeller}{Character or function for formatting the labels (\code{lgnd_labs}).
+\item{labeller}{Function, character keyword, or named vector for formatting
+or relabelling the labels (\code{lgnd_labs}). See \code{\link{tinylabel}} for the
+accepted forms.
 Passed down to \code{\link{tinylabel}}.}
 
 \item{type}{Plotting type(s), passed down from \link{tinyplot}.}
diff --git a/man/tinyAxis.Rd b/man/tinyAxis.Rd
index d052c848..f5182168 100644
--- a/man/tinyAxis.Rd
+++ b/man/tinyAxis.Rd
@@ -20,12 +20,28 @@ arguments of the parent \code{\link[=tinyplot]{tinyplot()}} call. One of either:
 labels without ticks and axis line), or \code{"axis"} (only axis line and labels
 but no ticks). Partial matching is allowed, e.g. \code{type = "s"}.}
 
-\item{labeller}{a formatting function to be applied to \code{x}, e.g. \code{\link{format}},
-\code{\link{toupper}}, \code{\link{abs}}, or other custom function (including from the popular
-\strong{scales} package). Can also be one of the following convenience strings
-(symbols), for which common formatting transformations are provided:
-\code{"percent"} (\code{"\%"}), \code{"comma"} (\code{","}), \code{"log"} (\code{"l"}), \code{"dollar"}
-(\code{"$"}), \code{"euro"} (\code{"€"}), or \code{"sterling"} (\code{"£"}).}
+\item{labeller}{how the labels should be relabelled or reformatted. One of:
+\itemize{
+\item a function to be applied to \code{x}, e.g. \code{\link{format}}, \code{\link{toupper}}, \code{\link{abs}},
+or any other custom function (including from the popular \strong{scales}
+package).
+\item one of the following convenience strings (or their symbol equivalents),
+for which common formatting transformations are provided: \code{"percent"}
+(\code{"\%"}), \code{"comma"} (\code{","}), \code{"log"} (\code{"l"}), \code{"dollar"} (\code{"$"}), \code{"euro"}
+(\code{"€"}), or \code{"sterling"} (\code{"£"}).
+\item a \emph{named} character vector or list, acting as a dictionary, e.g.
+\code{c(setosa = "SET")}. Entries of \code{x} that match a name are replaced by the
+corresponding value and the rest are left alone, so a partial mapping is
+fine. The lookup is by value rather than by position, which means it is
+unaffected by any reordering of the underlying categories.
+}
+
+Note that an \emph{unnamed} character vector of length greater than one is an
+error, rather than a positional replacement of the labels. Such a vector
+could not be told apart from a formatting keyword when \code{x} is of length
+one, and would not follow the categories if they were reordered. Pass a
+function if you want to compute the labels positionally, e.g.
+\code{function(x) LETTERS[seq_along(x)]}.}
 }
 \description{
 Internal function used for adding an axis to a \code{\link{tinyplot}}
diff --git a/man/tinylabel.Rd b/man/tinylabel.Rd
index 7150eef7..2997d05c 100644
--- a/man/tinylabel.Rd
+++ b/man/tinylabel.Rd
@@ -9,12 +9,28 @@ tinylabel(x, labeller = NULL, na.ignore = TRUE, na.rm = TRUE)
 \arguments{
 \item{x}{a numeric or character vector}
 
-\item{labeller}{a formatting function to be applied to \code{x}, e.g. \code{\link{format}},
-\code{\link{toupper}}, \code{\link{abs}}, or other custom function (including from the popular
-\strong{scales} package). Can also be one of the following convenience strings
-(symbols), for which common formatting transformations are provided:
-\code{"percent"} (\code{"\%"}), \code{"comma"} (\code{","}), \code{"log"} (\code{"l"}), \code{"dollar"}
-(\code{"$"}), \code{"euro"} (\code{"€"}), or \code{"sterling"} (\code{"£"}).}
+\item{labeller}{how the labels should be relabelled or reformatted. One of:
+\itemize{
+\item a function to be applied to \code{x}, e.g. \code{\link{format}}, \code{\link{toupper}}, \code{\link{abs}},
+or any other custom function (including from the popular \strong{scales}
+package).
+\item one of the following convenience strings (or their symbol equivalents),
+for which common formatting transformations are provided: \code{"percent"}
+(\code{"\%"}), \code{"comma"} (\code{","}), \code{"log"} (\code{"l"}), \code{"dollar"} (\code{"$"}), \code{"euro"}
+(\code{"€"}), or \code{"sterling"} (\code{"£"}).
+\item a \emph{named} character vector or list, acting as a dictionary, e.g.
+\code{c(setosa = "SET")}. Entries of \code{x} that match a name are replaced by the
+corresponding value and the rest are left alone, so a partial mapping is
+fine. The lookup is by value rather than by position, which means it is
+unaffected by any reordering of the underlying categories.
+}
+
+Note that an \emph{unnamed} character vector of length greater than one is an
+error, rather than a positional replacement of the labels. Such a vector
+could not be told apart from a formatting keyword when \code{x} is of length
+one, and would not follow the categories if they were reordered. Pass a
+function if you want to compute the labels positionally, e.g.
+\code{function(x) LETTERS[seq_along(x)]}.}
 
 \item{na.ignore}{logical indicating whether the labelling function should
 ignore \code{NA} values in \code{x}. In other words, should the \code{NA} values be left
@@ -39,6 +55,10 @@ tinylabel(x, "comma")
 tinylabel(x, ",") # same
 tinylabel(x, "$") # or "dollar"
 
+# a named vector acts as a dictionary: matched entries are replaced and the
+# rest are left alone
+tinylabel(c("setosa", "versicolor"), c(setosa = "SET"))
+
 # invoke tinylabel from a parent tinyplot call...
 #   => x/yaxl for adjusting axes tick labels
 #   => legend = list(labeller = ...) for adjusting the legend labels
diff --git a/man/tinyplot.Rd b/man/tinyplot.Rd
index 609420bb..ba643546 100644
--- a/man/tinyplot.Rd
+++ b/man/tinyplot.Rd
@@ -417,16 +417,12 @@ the break points at which the axis tick-marks are to be drawn. Break points
 outside the range of the data will be ignored if the associated axis
 variable is categorical, or an explicit \code{x/ylim} range is given.}
 
-\item{xaxl, yaxl}{a function or a character keyword specifying the format of
-the x- or y-axis tick labels. Note that this is a post-processing step that
-affects the \emph{appearance} of the tick labels only; use in conjunction with
-\code{x/yaxb} if you would like to adjust the position of the tick marks too. In
-addition to user-supplied formatting functions (e.g., \code{\link{format}},
-\code{\link{toupper}}, \code{\link{abs}}, or other custom function), several convenience
-keywords (or their symbol equivalents) are available for common formatting
-transformations: \code{"percent"} (\code{"\%"}), \code{"comma"} (\code{","}), \code{"log"} (\code{"l"}),
-\code{"dollar"} (\code{"$"}), \code{"euro"} (\code{"€"}), or \code{"sterling"} (\code{"£"}). See the
-\code{\link{tinylabel}} documentation for examples.}
+\item{xaxl, yaxl}{a function, character keyword, or named vector for
+formatting or (re)labelling the x- or y-axis tick labels. Passed to
+\code{\link{tinylabel}}; see the latter's help file for more detailed documentation
+and examples. Note that this is a post-processing step that affects the
+\emph{appearance} of the tick labels only; use in conjunction with \code{x/yaxb} if
+you would like to adjust the position of the tick marks too.}
 
 \item{log}{a character string which contains \code{"x"} if the x axis is to be
 logarithmic, \code{"y"} if the y axis is to be logarithmic and \code{"xy"} or \code{"yx"}
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index 8498d62c..cfeaa91d 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -80,8 +80,10 @@ than by sum.
 
 Both default to \code{NULL}, i.e. keep the existing factor levels.}
 
-\item{xaxlabels}{a character vector with the axis labels for the \code{x} variable,
-defaulting to the levels of \code{x}.}
+\item{xaxlabels}{[Deprecated] a character vector with the axis labels for
+the \code{x} variable. Use the top-level \code{xaxl} argument instead, which now
+accepts a named vector mapping old labels to new ones, and applies
+consistently across plot types.}
 
 \item{drop.zeros}{logical. Should bars with zero height be dropped? If set
 to \code{FALSE} (default) a zero height bar is still drawn for which the border
diff --git a/man/type_text.Rd b/man/type_text.Rd
index ccb105d7..b8705c81 100644
--- a/man/type_text.Rd
+++ b/man/type_text.Rd
@@ -27,11 +27,11 @@ a top-level \code{\link{tinyplot}} argument, which additionally supports non-sta
 evaluation against \code{data} and takes precedence if both are given. See
 Examples.}
 
-\item{labeller}{A formatting function (or convenience string) passed to
-\code{\link{tinylabel}} for formatting the \code{labels}. Useful for ensuring that the
-text labels match the formatting of an axis, e.g. \code{labeller = "\%"} to
-display the labels as percentages. Default is \code{NULL}, i.e. no formatting.
-See Examples.}
+\item{labeller}{A formatting function, convenience string, or named vector
+passed to \code{\link{tinylabel}} for formatting or relabelling the \code{labels}. Useful
+for ensuring that the text labels match the formatting of an axis, e.g.
+\code{labeller = "\%"} to display the labels as percentages. Default is \code{NULL},
+i.e. no formatting. See Examples.}
 
 \item{adj}{one or two values in \eqn{[0, 1]} which specify the x
     (and optionally y) adjustment (\sQuote{justification}) of the

From d2aeb59795c827c1895874abd68baf3b986e3e14 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Thu, 27 Aug 2026 15:21:06 -0700
Subject: [PATCH 05/23] doc tweaks

---
 R/type_barplot.R      | 55 +++++++++++++++++++-------------------
 R/type_errorbar.R     | 51 ++++++++++++++++++-----------------
 R/type_points.R       | 45 ++++++++++++++++---------------
 R/type_ribbon.R       | 33 ++++++++++++-----------
 R/type_ridge.R        | 54 ++++++++++++++++++-------------------
 R/type_spineplot.R    | 54 ++++++++++++++++++++-----------------
 man/type_barplot.Rd   | 61 +++++++++++++++++++++---------------------
 man/type_errorbar.Rd  | 45 ++++++++++++++++---------------
 man/type_lines.Rd     | 41 ++++++++++++++--------------
 man/type_points.Rd    | 41 ++++++++++++++--------------
 man/type_ribbon.Rd    | 29 ++++++++++----------
 man/type_ridge.Rd     | 38 +++++++++++++-------------
 man/type_spineplot.Rd | 62 +++++++++++++++++++++++--------------------
 13 files changed, 313 insertions(+), 296 deletions(-)

diff --git a/R/type_barplot.R b/R/type_barplot.R
index 709c2587..8ce2c823 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -19,36 +19,32 @@
 #'   or the mid-way in the third category, respectively.
 #' @param FUN a function to compute the summary statistic for `y` within each
 #'   group of `x` in case of using a two-sided formula `y ~ x` (default: mean).
-#' @param xlevels,xord two ways to control the order of the `x` variable, and
-#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
-#'   takes precedence and `xord` is ignored. Note that a numeric `x` is coerced
-#'   to a factor before the bars are drawn, so it is reordered like any other
-#'   categorical variable.
+#' @param xlevels,xord arguments controlling the order of the `x` variable, and
+#'   hence of the x-axis. Supply one or the other; if both arguments are
+#'   provided, `xlevels` takes precedence and `xord` is silently ignored.
 #'
-#'   `xlevels` names the levels literally: a character vector of level names in
-#'   the desired order, or a numeric vector of the corresponding level indexes
-#'   (e.g. `3:1`).
+#'   - `xlevels` specifies the levels _literally_, either a character vector of
+#'   level names in the desired order (e.g., `c("C", "B", "A")`), or a numeric
+#'   vector of the corresponding level indexes (e.g. `3:1`).
 #'
-#'   `xord` instead derives the order from the data, via a keyword or a
-#'   function. Options are:
+#'   - `xord` instead accepts a keyword or custom function, which then _derives_
+#'   the order from the data. Options are:
 #'
-#'   - `"total"` ranks the categories by value, largest first. In practice this
-#'   is the keyword most reach for, since it sorts the bars by height. Note that
-#'   it ranks the *aggregated* bars, i.e. whatever `FUN` produced, rather than
-#'   the underlying rows.
-#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
-#'   data at all. The former takes the categories in the order that they appear
-#'   in the data, while `"rev"` reverses the current level order.
-#'   - a custom function that determines both the ranking statistic and its
-#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
-#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
-#'   than by sum.
+#'     - `"total"` ranks the categories by value, largest first. In practice
+#'     this is the keyword most reach for, since it sorts the bars by height.
+#'     Note that it ranks the *aggregated* bars, i.e. whatever `FUN` produced,
+#'     rather than the underlying rows.
+#'     - `"asis"` or `"rev"` permute the existing levels without consulting the
+#'     data at all. The former takes the categories in the order that they
+#'     appear in the data, while the latter reverses the current level order.
+#'     - a custom function that determines both the ranking statistic and its
+#'     direction. The statistic is always sorted in ascending order, so
+#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
+#'     ranks by median rather than by sum.
 #'
-#'   Both default to `NULL`, i.e. keep the existing factor levels.
-#' @param xaxlabels \[Deprecated\] a character vector with the axis labels for
-#'   the `x` variable. Use the top-level `xaxl` argument instead, which now
-#'   accepts a named vector mapping old labels to new ones, and applies
-#'   consistently across plot types.
+#'   Note that a numeric `x` is coerced to a factor before the bars are drawn,
+#'   so it is reordered like any other categorical variable.
+#'   Each argument defaults to `NULL`, i.e. keep the existing factor levels.
 #' @param offset optional specification for shifting bar baselines, accepting
 #'   one of two distinct forms. See the Examples for illustrations of both.
 #' 
@@ -71,6 +67,11 @@
 #'   series colour(s)? Default is `TRUE`, which keeps single- and multi-group
 #'   displays consistent and lets the fill read cleanly over grid lines. Set to
 #'   `FALSE` to use the fully-saturated palette colour(s) instead.
+#' @param xaxlabels \[Deprecated\] a character vector with the axis labels for
+#'   the `x` variable. Use the top-level `xaxl` argument instead, which now
+#'   accepts a named vector mapping old labels to new ones, and applies
+#'   consistently across plot types. This argument will be removed in a future
+#'   release.
 #'
 #' @examples
 #' # Basic examples of frequency tables (without y variable)
@@ -179,7 +180,7 @@
 #' tinyplot_add(type = "vline")
 #'
 #' @export
-type_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xord = NULL, xaxlabels = NULL, drop.zeros = FALSE, lighten = TRUE) {
+type_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xord = NULL, drop.zeros = FALSE, lighten = TRUE, xaxlabels = NULL) {
   if (!is.null(xaxlabels)) {
     warning(
       "'xaxlabels' is deprecated; use the top-level 'xaxl' argument instead, ",
diff --git a/R/type_errorbar.R b/R/type_errorbar.R
index 57db4274..27d246a0 100644
--- a/R/type_errorbar.R
+++ b/R/type_errorbar.R
@@ -4,31 +4,32 @@
 #'
 #' @inheritParams dodge_positions
 #' @inheritParams graphics::arrows
-#' @param xlevels,xord two ways to control the order of the `x` variable, and
-#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
-#'   takes precedence and `xord` is ignored. Both only affect categorical (i.e.,
-#'   factor or character) `x` variables; a numeric `x` is plotted at its own
-#'   values and cannot be reordered, so supplying either there is ignored with a
-#'   warning.
-#'
-#'   `xlevels` names the levels literally: a character vector of level names in
-#'   the desired order, or a numeric vector of the corresponding level indexes
-#'   (e.g. `3:1`). Default is `NULL`.
-#'
-#'   `xord` instead derives the order from the data, via a keyword or a
-#'   function. Options are:
-#'
-#'   - `"total"` ranks the categories by their `y` values, largest first.
-#'   - `"minvar"` ranks them by variance, lowest first. This needs more than one
-#'   observation per category, so it does not apply to the usual one-row-per-
-#'   term coefficient table.
-#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
-#'   data at all. The former takes the categories in the order that they appear
-#'   in the data, while `"rev"` reverses the current level order.
-#'   - a custom function that determines both the ranking statistic and its
-#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
-#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
-#'   than by sum.
+#' @param xlevels,xord arguments controlling the order of the `x` variable, and
+#'   hence of the x-axis. Supply one or the other; if both arguments are
+#'   provided, `xlevels` takes precedence and `xord` is silently ignored.
+#'
+#'   - `xlevels` specifies the levels _literally_, either a character vector of
+#'   level names in the desired order (e.g., `c("C", "B", "A")`), or a numeric
+#'   vector of the corresponding level indexes (e.g. `3:1`).
+#'
+#'   - `xord` instead accepts a keyword or custom function, which then _derives_
+#'   the order from the data. Options are:
+#'
+#'     - `"total"` ranks the categories by their `y` values, largest first.
+#'     - `"minvar"` ranks them by variance, lowest first. This needs more than
+#'     one observation per category, so it does not apply to the usual
+#'     one-row-per-term coefficient table.
+#'     - `"asis"` or `"rev"` permute the existing levels without consulting the
+#'     data at all. The former takes the categories in the order that they
+#'     appear in the data, while the latter reverses the current level order.
+#'     - a custom function that determines both the ranking statistic and its
+#'     direction. The statistic is always sorted ascending, so
+#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
+#'     ranks by median rather than by sum.
+#'
+#'   Note that `x` is only reordered when it is categorical (i.e., factor or
+#'   character). A numeric `x` is plotted at its own values and cannot be
+#'   reordered, so supplying either argument there is ignored with a warning.
 #'
 #'   Unlike most other plot types, `xord` defaults to `"asis"` here rather than
 #'   `NULL`: these types are typically used for coefficient plots, where the row
diff --git a/R/type_points.R b/R/type_points.R
index 61173d37..e1cf7e93 100644
--- a/R/type_points.R
+++ b/R/type_points.R
@@ -3,32 +3,33 @@
 #' @description Type function for plotting points, i.e. a scatter plot.
 #' @param clim Numeric giving the lower and upper limits of the character
 #'   expansion (`cex`) normalization for bubble charts.
-#' @param xlevels,xord two ways to control the order of the `x` variable, and
-#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
-#'   takes precedence and `xord` is ignored. Both only affect categorical (i.e.,
-#'   factor or character) `x` variables; a numeric `x` is plotted at its own
-#'   values and cannot be reordered, so supplying either there is ignored with a
-#'   warning.
+#' @param xlevels,xord arguments controlling the order of the (categorical) `x`
+#'   variable, and hence of the x-axis. Supply one or the other; if both
+#'   arguments are provided, `xlevels` takes precedence and `xord` is silently
+#'   ignored.
 #'
-#'   `xlevels` names the levels literally: a character vector of level names in the
-#'   desired order, or a numeric vector of the corresponding level indexes
-#'   (e.g. `3:1`).
+#'   - `xlevels` specifies the levels _literally_, either a character vector of
+#'   level names in the desired order (e.g., `c("C", "B", "A")`), or a numeric
+#'   vector of the corresponding level indexes (e.g. `3:1`).
 #'
-#'   `xord` instead derives the order from the data, via a keyword or a function.
-#'   Options are:
+#'   - `xord` instead accepts a keyword or custom function, which then _derives_
+#'   the order from the data. Options are:
 #'
-#'   - `"total"` ranks the categories by the `y` values observed at each one,
-#'   largest first.
-#'   - `"minvar"` ranks them by the variance of those values, lowest first.
-#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
-#'   data at all. The former takes the categories in the order that they appear
-#'   in the data, while `"rev"` reverses the current level order.
-#'   - a custom function that determines both the ranking statistic and its
-#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
-#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
-#'   than by sum.
+#'     - `"total"` ranks the categories by the `y` values observed at each one,
+#'     largest first.
+#'     - `"minvar"` ranks them by the variance of those values, lowest first.
+#'     - `"asis"` or `"rev"` permute the existing levels without consulting the
+#'     data at all. The former takes the categories in the order that they
+#'     appear in the data, while the latter reverses the current level order.
+#'     - a custom function that determines both the ranking statistic and its
+#'     direction. The statistic is always sorted ascending, so
+#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
+#'     ranks by median rather than by sum.
 #'
-#'   Both default to `NULL`, i.e. keep the existing factor levels.
+#'   Note that `x` is only reordered when it is categorical (i.e., factor or
+#'   character). A numeric `x` is plotted at its own values and cannot be
+#'   reordered, so supplying either argument there is ignored with a warning.
+#'   Each argument defaults to `NULL`, i.e. keep the existing factor levels.
 #' @inheritParams dodge_positions
 #'
 #' @examples
diff --git a/R/type_ribbon.R b/R/type_ribbon.R
index 01765a9e..23b4fda7 100644
--- a/R/type_ribbon.R
+++ b/R/type_ribbon.R
@@ -11,25 +11,26 @@
 #' @param byord keyword string or function. Permits on-the-fly (re)ordering of
 #'   the `by` group layers, thus controlling the order in which they stack.
 #'   Options are:
-#' 
-#'   - `"start"`, `"end"`, and `"total"` are positional keywords that rank groups
-#'   according to their `y` values along the `x` axis. In each case, the group
-#'   with the largest value is stacked first as the bottom layer.
-#'   - `"minvar"` ranks by variance and puts the lowest variance group on the
+#'
+#'   - `"start"`, `"end"` and `"total"` are positional keywords that rank the
+#'   groups by their `y` values along the `x` axis. In each case, the group with
+#'   the largest value is stacked first, as the bottom layer.
+#'   - `"minvar"` ranks by variance, putting the lowest variance group on the
 #'   baseline.
-#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
+#'   - `"asis"` or `"rev"` permute the existing levels without consulting the
 #'   data at all. The former takes the groups in the order that they appear in
-#'   the data, while `"rev"` reverses the current level order.
-#'   - custom function that determines both the ranking statistic and its
-#'   direction, e.g. `function(y) -median(y)` would layer by median `y` value,
-#'   from the biggest to the smallest. Note: if a function requires access to a
-#'   group's `x` values, then one of its arguments _must_ be named `x`, e.g.
+#'   the data, while the latter reverses the current level order.
+#'   - a custom function that determines both the ranking statistic and its
+#'   direction. The statistic is always sorted ascending, so
+#'   `function(y) -median(y)` layers by median `y` value, from the biggest to
+#'   the smallest. Note that if a function requires access to a group's `x`
+#'   values, then one of its arguments _must_ be named `x`, e.g.
 #'   `function(y, x) coef(lm(y ~ x))[2]` would layer by trend.
-#' 
-#'   Default is `NULL`, in which case the existing factor level order is
-#'   retained; to set that order explicitly, call `factor(levels = ...)` on the
-#'   grouping variable beforehand. See Examples, as well as the "Stacked area
-#'   plots" section below.
+#'
+#'   Defaults to `NULL`, i.e. keep the existing factor levels. To set that order
+#'   explicitly, call `factor(levels = ...)` on the grouping variable
+#'   beforehand. See Examples, as well as the "Stacked area plots" section
+#'   below.
 #' @param FUN a function for collapsing repeated `y` values within a group and
 #'   `x` position, used only when `stack = TRUE`. Defaults to `mean`, matching
 #'   [`type_barplot()`], so that the same data stacks to the same heights
diff --git a/R/type_ridge.R b/R/type_ridge.R
index 2f328e2a..37fcf6e9 100644
--- a/R/type_ridge.R
+++ b/R/type_ridge.R
@@ -27,33 +27,33 @@
 #' at the specified `probs`. The quantiles are computed based on the density
 #' (rather than the raw original variable). Only one of `breaks` or
 #' `probs` must be specified.
-#' @param ylevels,yord two ways to control the order of the `y` variable, and
-#'   hence of the axis. Supply one or the other; if both are given, `ylevels`
-#'   takes precedence and `yord` is ignored. Note that a numeric `y` is coerced
-#'   to a factor before the ridges are drawn, so it is reordered like any other
-#'   categorical variable.
-#'
-#'   `ylevels` names the levels literally: a character vector of level names in
-#'   the desired order, or a numeric vector of the corresponding level indexes
-#'   (e.g. `3:1`).
-#'
-#'   `yord` instead derives the order from the data, via a keyword or a
-#'   function. Options are:
-#'
-#'   - `"total"` ranks the ridges by summed `x`, largest first. (Ridge plots
-#'   have no separate response, so the ranking runs on the continuous `x`
-#'   variable.)
-#'   - `"minvar"` ranks them by the spread of each distribution, narrowest
-#'   first.
-#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
-#'   data at all. The former takes the categories in the order that they appear
-#'   in the data, while `"rev"` reverses the current level order.
-#'   - a custom function that determines both the ranking statistic and its
-#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
-#'   reverses `"total"`, and `function(y) -median(y)` ranks by median rather
-#'   than by sum.
-#'
-#'   Both default to `NULL`, i.e. keep the existing factor levels.
+#' @param ylevels,yord arguments controlling the order of the `y` variable, and
+#'   hence of the y-axis. Supply one or the other; if both arguments are
+#'   provided, `ylevels` takes precedence and `yord` is silently ignored.
+#'
+#'   - `ylevels` specifies the levels _literally_, either a character vector of
+#'   level names in the desired order (e.g., `c("C", "B", "A")`), or a numeric
+#'   vector of the corresponding level indexes (e.g. `3:1`).
+#'
+#'   - `yord` instead accepts a keyword or custom function, which then _derives_
+#'   the order from the data. Options are:
+#'
+#'     - `"total"` ranks the ridges by summed `x`, largest first. (Ridge plots
+#'     have no separate response, so the ranking runs on the continuous `x`
+#'     variable.)
+#'     - `"minvar"` ranks them by the spread of each distribution, narrowest
+#'     first.
+#'     - `"asis"` or `"rev"` permute the existing levels without consulting the
+#'     data at all. The former takes the categories in the order that they
+#'     appear in the data, while the latter reverses the current level order.
+#'     - a custom function that determines both the ranking statistic and its
+#'     direction. The statistic is always sorted ascending, so
+#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
+#'     ranks by median rather than by sum.
+#'
+#'   Note that a numeric `y` is coerced to a factor before the ridges are
+#'   drawn, so it is reordered like any other categorical variable.
+#'   Each argument defaults to `NULL`, i.e. keep the existing factor levels.
 #' @inheritParams stats::density
 #' @param bw the smoothing \code{\link[stats:bw.nrd]{bandwidth}} to be used,
 #'   see \code{\link[stats]{density}} for details and options.
diff --git a/R/type_spineplot.R b/R/type_spineplot.R
index 75f10065..48256bfb 100644
--- a/R/type_spineplot.R
+++ b/R/type_spineplot.R
@@ -4,34 +4,34 @@
 #'   are modified versions of histograms or mosaic plots, and particularly
 #'   useful for visualizing factor variables. Note that [`tinyplot`] defaults
 #'   to `type_spineplot()` if `y` is a factor variable.
-#' @param xlevels,xord two ways to control the order of the `x` variable, and
-#'   hence of the axis. Supply one or the other; if both are given, `xlevels`
-#'   takes precedence and `xord` is ignored. Both only affect categorical (i.e.,
-#'   factor or character) variables.
+#' @param xlevels,xord arguments controlling the order of the `x` variable, and
+#'   hence of the x-axis. Supply one or the other; if both arguments are
+#'   provided, `xlevels` takes precedence and `xord` is silently ignored.
 #'
-#'   `xlevels` names the levels literally: a character vector of level names in
-#'   the desired order, or a numeric vector of the corresponding level indexes
-#'   (e.g. `3:1`).
+#'   - `xlevels` specifies the levels _literally_, either a character vector of
+#'   level names in the desired order (e.g., `c("C", "B", "A")`), or a numeric
+#'   vector of the corresponding level indexes (e.g. `3:1`).
 #'
-#'   `xord` instead derives the order from the data, via a keyword or a
-#'   function. Options are:
+#'   - `xord` instead accepts a keyword or custom function, which then _derives_
+#'   the order from the data. Options are:
 #'
-#'   - `"total"` ranks the categories by frequency, most common first. (Both
-#'   axes of a spineplot are categorical, so there is no response to rank on and
-#'   observations are counted instead, weighted if `weights` is given.)
-#'   - `"asis"` and `"rev"` permute the existing levels without consulting the
-#'   data at all. The former takes the categories in the order that they appear
-#'   in the data, while `"rev"` reverses the current level order.
-#'   - a custom function that determines both the ranking statistic and its
-#'   direction. The statistic is always sorted ascending, so `function(y) sum(y)`
-#'   reverses `"total"`.
+#'     - `"total"` ranks the categories by (weighted) frequency, i.e. most
+#'     common first.
+#'     - `"asis"` or `"rev"` permute the existing levels without consulting the
+#'     data at all. The former takes the categories in the order that they
+#'     appear in the data, while the latter reverses the current level order.
+#'     - a custom function that determines both the ranking statistic and its
+#'     direction. The statistic is always sorted ascending, so
+#'     `function(y) sum(y)` reverses `"total"`.
 #'
-#'   Both default to `NULL`, i.e. keep the existing factor levels.
-#' @param ylevels,yord as for `xlevels` / `xord` above, but for the `y` variable.
-#' @param xaxlabels,yaxlabels \[Deprecated\] character vectors for annotation of
-#'   the x and y axis. Use the top-level `xaxl` / `yaxl` arguments instead,
-#'   which accept a named vector mapping old labels to new ones, and apply
-#'   consistently across plot types.
+#'   Note that `x` is only reordered when it is categorical (i.e., factor or
+#'   character). Both arguments are thus ignored for spinograms, which have a
+#'   (binned) numeric `x` axis. Each argument defaults to `NULL`, i.e. keep the
+#'   existing factor levels.
+#' @param ylevels,yord as for `xlevels` / `xord` above, but for the `y`
+#'   variable. Note that `y` is always coerced to a factor for spineplots and
+#'   spinograms, so these arguments are always binding if provided. Be aware
+#'   that a numeric `y` gives one level per distinct value.
 #' @inheritParams graphics::spineplot
 #' @param lighten logical. For grouped spineplots where the `y` variable is
 #'   itself the grouping variable (i.e. `y == by`), should the fills use a
@@ -43,6 +43,10 @@
 #'   the lighter tint. Note that `lighten` has no effect on other spineplot
 #'   displays (single-group or `x == by`), which always use a sequential shading
 #'   ramp of the base colour.
+#' @param xaxlabels,yaxlabels \[Deprecated\] character vectors for annotation of
+#'   the x and y axis. Use the top-level `xaxl` / `yaxl` arguments instead,
+#'   which apply consistently across [`tinyplot`] types. These two type-specific
+#'   arguments will be removed in a future release.
 #' @examples
 #' # "spineplot" type convenience string
 #' tinyplot(Species ~ Sepal.Width, data = iris, type = "spineplot")
@@ -117,7 +121,7 @@
 #' )
 #' 
 #' @export
-type_spineplot = function(breaks = NULL, tol.ylab = 0.05, off = NULL, xlevels = NULL, xord = NULL, ylevels = NULL, yord = NULL, col = NULL, xaxlabels = NULL, yaxlabels = NULL, weights = NULL, lighten = FALSE) {
+type_spineplot = function(breaks = NULL, tol.ylab = 0.05, off = NULL, xlevels = NULL, xord = NULL, ylevels = NULL, yord = NULL, col = NULL, weights = NULL, lighten = FALSE, xaxlabels = NULL, yaxlabels = NULL) {
   col = col
   dep = c(if (!is.null(xaxlabels)) "xaxlabels", if (!is.null(yaxlabels)) "yaxlabels")
   if (length(dep)) {
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index cfeaa91d..dcd1af77 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -12,9 +12,9 @@ type_barplot(
   FUN = NULL,
   xlevels = NULL,
   xord = NULL,
-  xaxlabels = NULL,
   drop.zeros = FALSE,
-  lighten = TRUE
+  lighten = TRUE,
+  xaxlabels = NULL
 )
 }
 \arguments{
@@ -52,38 +52,33 @@ grouping and \code{beside = FALSE}, but can be combined with \code{center}.
 \item{FUN}{a function to compute the summary statistic for \code{y} within each
 group of \code{x} in case of using a two-sided formula \code{y ~ x} (default: mean).}
 
-\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
-hence of the axis. Supply one or the other; if both are given, \code{xlevels}
-takes precedence and \code{xord} is ignored. Note that a numeric \code{x} is coerced
-to a factor before the bars are drawn, so it is reordered like any other
-categorical variable.
-
-\code{xlevels} names the levels literally: a character vector of level names in
-the desired order, or a numeric vector of the corresponding level indexes
-(e.g. \code{3:1}).
-
-\code{xord} instead derives the order from the data, via a keyword or a
-function. Options are:
+\item{xlevels, xord}{arguments controlling the order of the \code{x} variable, and
+hence of the x-axis. Supply one or the other; if both arguments are
+provided, \code{xlevels} takes precedence and \code{xord} is silently ignored.
+\itemize{
+\item \code{xlevels} specifies the levels \emph{literally}, either a character vector of
+level names in the desired order (e.g., \code{c("C", "B", "A")}), or a numeric
+vector of the corresponding level indexes (e.g. \code{3:1}).
+\item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
+the order from the data. Options are:
 \itemize{
-\item \code{"total"} ranks the categories by value, largest first. In practice this
-is the keyword most reach for, since it sorts the bars by height. Note that
-it ranks the \emph{aggregated} bars, i.e. whatever \code{FUN} produced, rather than
-the underlying rows.
-\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
-data at all. The former takes the categories in the order that they appear
-in the data, while \code{"rev"} reverses the current level order.
+\item \code{"total"} ranks the categories by value, largest first. In practice
+this is the keyword most reach for, since it sorts the bars by height.
+Note that it ranks the \emph{aggregated} bars, i.e. whatever \code{FUN} produced,
+rather than the underlying rows.
+\item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they
+appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
-direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
-reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
-than by sum.
+direction. The statistic is always sorted in ascending order, so
+\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
+ranks by median rather than by sum.
+}
 }
 
-Both default to \code{NULL}, i.e. keep the existing factor levels.}
-
-\item{xaxlabels}{[Deprecated] a character vector with the axis labels for
-the \code{x} variable. Use the top-level \code{xaxl} argument instead, which now
-accepts a named vector mapping old labels to new ones, and applies
-consistently across plot types.}
+Note that a numeric \code{x} is coerced to a factor before the bars are drawn,
+so it is reordered like any other categorical variable.
+Each argument defaults to \code{NULL}, i.e. keep the existing factor levels.}
 
 \item{drop.zeros}{logical. Should bars with zero height be dropped? If set
 to \code{FALSE} (default) a zero height bar is still drawn for which the border
@@ -93,6 +88,12 @@ lines will still be visible.}
 series colour(s)? Default is \code{TRUE}, which keeps single- and multi-group
 displays consistent and lets the fill read cleanly over grid lines. Set to
 \code{FALSE} to use the fully-saturated palette colour(s) instead.}
+
+\item{xaxlabels}{[Deprecated] a character vector with the axis labels for
+the \code{x} variable. Use the top-level \code{xaxl} argument instead, which now
+accepts a named vector mapping old labels to new ones, and applies
+consistently across plot types. This argument will be removed in a future
+release.}
 }
 \description{
 Type function for producing barplots. For formulas of type
diff --git a/man/type_errorbar.Rd b/man/type_errorbar.Rd
index 05cfcd38..b35a6725 100644
--- a/man/type_errorbar.Rd
+++ b/man/type_errorbar.Rd
@@ -40,33 +40,34 @@ present at that position. If \code{TRUE}, dodge positions are based on all
 groups, ensuring "fixed" spacing across x-axis breaks (i.e., even if some
 groups are missing for a particular \code{x} value).}
 
-\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
-hence of the axis. Supply one or the other; if both are given, \code{xlevels}
-takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
-factor or character) \code{x} variables; a numeric \code{x} is plotted at its own
-values and cannot be reordered, so supplying either there is ignored with a
-warning.
-
-\code{xlevels} names the levels literally: a character vector of level names in
-the desired order, or a numeric vector of the corresponding level indexes
-(e.g. \code{3:1}). Default is \code{NULL}.
-
-\code{xord} instead derives the order from the data, via a keyword or a
-function. Options are:
+\item{xlevels, xord}{arguments controlling the order of the \code{x} variable, and
+hence of the x-axis. Supply one or the other; if both arguments are
+provided, \code{xlevels} takes precedence and \code{xord} is silently ignored.
+\itemize{
+\item \code{xlevels} specifies the levels \emph{literally}, either a character vector of
+level names in the desired order (e.g., \code{c("C", "B", "A")}), or a numeric
+vector of the corresponding level indexes (e.g. \code{3:1}).
+\item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
+the order from the data. Options are:
 \itemize{
 \item \code{"total"} ranks the categories by their \code{y} values, largest first.
-\item \code{"minvar"} ranks them by variance, lowest first. This needs more than one
-observation per category, so it does not apply to the usual one-row-per-
-term coefficient table.
-\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
-data at all. The former takes the categories in the order that they appear
-in the data, while \code{"rev"} reverses the current level order.
+\item \code{"minvar"} ranks them by variance, lowest first. This needs more than
+one observation per category, so it does not apply to the usual
+one-row-per-term coefficient table.
+\item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they
+appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
-direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
-reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
-than by sum.
+direction. The statistic is always sorted ascending, so
+\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
+ranks by median rather than by sum.
+}
 }
 
+Note that \code{x} is only reordered when it is categorical (i.e., factor or
+character). A numeric \code{x} is plotted at its own values and cannot be
+reordered, so supplying either argument there is ignored with a warning.
+
 Unlike most other plot types, \code{xord} defaults to \code{"asis"} here rather than
 \code{NULL}: these types are typically used for coefficient plots, where the row
 order of the data (e.g., the terms of a model) is usually intentional. Set
diff --git a/man/type_lines.Rd b/man/type_lines.Rd
index b21be42a..c62addb9 100644
--- a/man/type_lines.Rd
+++ b/man/type_lines.Rd
@@ -46,33 +46,34 @@ present at that position. If \code{TRUE}, dodge positions are based on all
 groups, ensuring "fixed" spacing across x-axis breaks (i.e., even if some
 groups are missing for a particular \code{x} value).}
 
-\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
-hence of the axis. Supply one or the other; if both are given, \code{xlevels}
-takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
-factor or character) \code{x} variables; a numeric \code{x} is plotted at its own
-values and cannot be reordered, so supplying either there is ignored with a
-warning.
-
-\code{xlevels} names the levels literally: a character vector of level names in the
-desired order, or a numeric vector of the corresponding level indexes
-(e.g. \code{3:1}).
-
-\code{xord} instead derives the order from the data, via a keyword or a function.
-Options are:
+\item{xlevels, xord}{arguments controlling the order of the (categorical) \code{x}
+variable, and hence of the x-axis. Supply one or the other; if both
+arguments are provided, \code{xlevels} takes precedence and \code{xord} is silently
+ignored.
+\itemize{
+\item \code{xlevels} specifies the levels \emph{literally}, either a character vector of
+level names in the desired order (e.g., \code{c("C", "B", "A")}), or a numeric
+vector of the corresponding level indexes (e.g. \code{3:1}).
+\item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
+the order from the data. Options are:
 \itemize{
 \item \code{"total"} ranks the categories by the \code{y} values observed at each one,
 largest first.
 \item \code{"minvar"} ranks them by the variance of those values, lowest first.
-\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
-data at all. The former takes the categories in the order that they appear
-in the data, while \code{"rev"} reverses the current level order.
+\item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they
+appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
-direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
-reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
-than by sum.
+direction. The statistic is always sorted ascending, so
+\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
+ranks by median rather than by sum.
+}
 }
 
-Both default to \code{NULL}, i.e. keep the existing factor levels.}
+Note that \code{x} is only reordered when it is categorical (i.e., factor or
+character). A numeric \code{x} is plotted at its own values and cannot be
+reordered, so supplying either argument there is ignored with a warning.
+Each argument defaults to \code{NULL}, i.e. keep the existing factor levels.}
 }
 \description{
 Type function for plotting lines.
diff --git a/man/type_points.Rd b/man/type_points.Rd
index 4b907dc1..3d238069 100644
--- a/man/type_points.Rd
+++ b/man/type_points.Rd
@@ -38,33 +38,34 @@ present at that position. If \code{TRUE}, dodge positions are based on all
 groups, ensuring "fixed" spacing across x-axis breaks (i.e., even if some
 groups are missing for a particular \code{x} value).}
 
-\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
-hence of the axis. Supply one or the other; if both are given, \code{xlevels}
-takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
-factor or character) \code{x} variables; a numeric \code{x} is plotted at its own
-values and cannot be reordered, so supplying either there is ignored with a
-warning.
-
-\code{xlevels} names the levels literally: a character vector of level names in the
-desired order, or a numeric vector of the corresponding level indexes
-(e.g. \code{3:1}).
-
-\code{xord} instead derives the order from the data, via a keyword or a function.
-Options are:
+\item{xlevels, xord}{arguments controlling the order of the (categorical) \code{x}
+variable, and hence of the x-axis. Supply one or the other; if both
+arguments are provided, \code{xlevels} takes precedence and \code{xord} is silently
+ignored.
+\itemize{
+\item \code{xlevels} specifies the levels \emph{literally}, either a character vector of
+level names in the desired order (e.g., \code{c("C", "B", "A")}), or a numeric
+vector of the corresponding level indexes (e.g. \code{3:1}).
+\item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
+the order from the data. Options are:
 \itemize{
 \item \code{"total"} ranks the categories by the \code{y} values observed at each one,
 largest first.
 \item \code{"minvar"} ranks them by the variance of those values, lowest first.
-\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
-data at all. The former takes the categories in the order that they appear
-in the data, while \code{"rev"} reverses the current level order.
+\item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they
+appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
-direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
-reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
-than by sum.
+direction. The statistic is always sorted ascending, so
+\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
+ranks by median rather than by sum.
+}
 }
 
-Both default to \code{NULL}, i.e. keep the existing factor levels.}
+Note that \code{x} is only reordered when it is categorical (i.e., factor or
+character). A numeric \code{x} is plotted at its own values and cannot be
+reordered, so supplying either argument there is ignored with a warning.
+Each argument defaults to \code{NULL}, i.e. keep the existing factor levels.}
 }
 \description{
 Type function for plotting points, i.e. a scatter plot.
diff --git a/man/type_ribbon.Rd b/man/type_ribbon.Rd
index 22d1ab7d..590ec153 100644
--- a/man/type_ribbon.Rd
+++ b/man/type_ribbon.Rd
@@ -24,25 +24,26 @@ area plots" section below.}
 the \code{by} group layers, thus controlling the order in which they stack.
 Options are:
 \itemize{
-\item \code{"start"}, \code{"end"}, and \code{"total"} are positional keywords that rank groups
-according to their \code{y} values along the \code{x} axis. In each case, the group
-with the largest value is stacked first as the bottom layer.
-\item \code{"minvar"} ranks by variance and puts the lowest variance group on the
+\item \code{"start"}, \code{"end"} and \code{"total"} are positional keywords that rank the
+groups by their \code{y} values along the \code{x} axis. In each case, the group with
+the largest value is stacked first, as the bottom layer.
+\item \code{"minvar"} ranks by variance, putting the lowest variance group on the
 baseline.
-\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
+\item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
 data at all. The former takes the groups in the order that they appear in
-the data, while \code{"rev"} reverses the current level order.
-\item custom function that determines both the ranking statistic and its
-direction, e.g. \code{function(y) -median(y)} would layer by median \code{y} value,
-from the biggest to the smallest. Note: if a function requires access to a
-group's \code{x} values, then one of its arguments \emph{must} be named \code{x}, e.g.
+the data, while the latter reverses the current level order.
+\item a custom function that determines both the ranking statistic and its
+direction. The statistic is always sorted ascending, so
+\code{function(y) -median(y)} layers by median \code{y} value, from the biggest to
+the smallest. Note that if a function requires access to a group's \code{x}
+values, then one of its arguments \emph{must} be named \code{x}, e.g.
 \code{function(y, x) coef(lm(y ~ x))[2]} would layer by trend.
 }
 
-Default is \code{NULL}, in which case the existing factor level order is
-retained; to set that order explicitly, call \code{factor(levels = ...)} on the
-grouping variable beforehand. See Examples, as well as the "Stacked area
-plots" section below.}
+Defaults to \code{NULL}, i.e. keep the existing factor levels. To set that order
+explicitly, call \code{factor(levels = ...)} on the grouping variable
+beforehand. See Examples, as well as the "Stacked area plots" section
+below.}
 
 \item{FUN}{a function for collapsing repeated \code{y} values within a group and
 \code{x} position, used only when \code{stack = TRUE}. Defaults to \code{mean}, matching
diff --git a/man/type_ridge.Rd b/man/type_ridge.Rd
index 7dd471fe..ce60fab1 100644
--- a/man/type_ridge.Rd
+++ b/man/type_ridge.Rd
@@ -48,34 +48,34 @@ at the specified \code{probs}. The quantiles are computed based on the density
 (rather than the raw original variable). Only one of \code{breaks} or
 \code{probs} must be specified.}
 
-\item{ylevels, yord}{two ways to control the order of the \code{y} variable, and
-hence of the axis. Supply one or the other; if both are given, \code{ylevels}
-takes precedence and \code{yord} is ignored. Note that a numeric \code{y} is coerced
-to a factor before the ridges are drawn, so it is reordered like any other
-categorical variable.
-
-\code{ylevels} names the levels literally: a character vector of level names in
-the desired order, or a numeric vector of the corresponding level indexes
-(e.g. \code{3:1}).
-
-\code{yord} instead derives the order from the data, via a keyword or a
-function. Options are:
+\item{ylevels, yord}{arguments controlling the order of the \code{y} variable, and
+hence of the y-axis. Supply one or the other; if both arguments are
+provided, \code{ylevels} takes precedence and \code{yord} is silently ignored.
+\itemize{
+\item \code{ylevels} specifies the levels \emph{literally}, either a character vector of
+level names in the desired order (e.g., \code{c("C", "B", "A")}), or a numeric
+vector of the corresponding level indexes (e.g. \code{3:1}).
+\item \code{yord} instead accepts a keyword or custom function, which then \emph{derives}
+the order from the data. Options are:
 \itemize{
 \item \code{"total"} ranks the ridges by summed \code{x}, largest first. (Ridge plots
 have no separate response, so the ranking runs on the continuous \code{x}
 variable.)
 \item \code{"minvar"} ranks them by the spread of each distribution, narrowest
 first.
-\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
-data at all. The former takes the categories in the order that they appear
-in the data, while \code{"rev"} reverses the current level order.
+\item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they
+appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
-direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
-reverses \code{"total"}, and \code{function(y) -median(y)} ranks by median rather
-than by sum.
+direction. The statistic is always sorted ascending, so
+\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
+ranks by median rather than by sum.
+}
 }
 
-Both default to \code{NULL}, i.e. keep the existing factor levels.}
+Note that a numeric \code{y} is coerced to a factor before the ridges are
+drawn, so it is reordered like any other categorical variable.
+Each argument defaults to \code{NULL}, i.e. keep the existing factor levels.}
 
 \item{bw}{the smoothing \code{\link[stats:bw.nrd]{bandwidth}} to be used,
 see \code{\link[stats]{density}} for details and options.}
diff --git a/man/type_spineplot.Rd b/man/type_spineplot.Rd
index 9d6d86dc..d30fa45a 100644
--- a/man/type_spineplot.Rd
+++ b/man/type_spineplot.Rd
@@ -13,10 +13,10 @@ type_spineplot(
   ylevels = NULL,
   yord = NULL,
   col = NULL,
-  xaxlabels = NULL,
-  yaxlabels = NULL,
   weights = NULL,
-  lighten = FALSE
+  lighten = FALSE,
+  xaxlabels = NULL,
+  yaxlabels = NULL
 )
 }
 \arguments{
@@ -31,41 +31,40 @@ type_spineplot(
 \item{off}{vertical offset between the bars (in per cent). It is fixed to
     \code{0} for spinograms and defaults to \code{2} for spine plots.}
 
-\item{xlevels, xord}{two ways to control the order of the \code{x} variable, and
-hence of the axis. Supply one or the other; if both are given, \code{xlevels}
-takes precedence and \code{xord} is ignored. Both only affect categorical (i.e.,
-factor or character) variables.
-
-\code{xlevels} names the levels literally: a character vector of level names in
-the desired order, or a numeric vector of the corresponding level indexes
-(e.g. \code{3:1}).
-
-\code{xord} instead derives the order from the data, via a keyword or a
-function. Options are:
+\item{xlevels, xord}{arguments controlling the order of the \code{x} variable, and
+hence of the x-axis. Supply one or the other; if both arguments are
+provided, \code{xlevels} takes precedence and \code{xord} is silently ignored.
 \itemize{
-\item \code{"total"} ranks the categories by frequency, most common first. (Both
-axes of a spineplot are categorical, so there is no response to rank on and
-observations are counted instead, weighted if \code{weights} is given.)
-\item \code{"asis"} and \code{"rev"} permute the existing levels without consulting the
-data at all. The former takes the categories in the order that they appear
-in the data, while \code{"rev"} reverses the current level order.
+\item \code{xlevels} specifies the levels \emph{literally}, either a character vector of
+level names in the desired order (e.g., \code{c("C", "B", "A")}), or a numeric
+vector of the corresponding level indexes (e.g. \code{3:1}).
+\item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
+the order from the data. Options are:
+\itemize{
+\item \code{"total"} ranks the categories by (weighted) frequency, i.e. most
+common first.
+\item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
+data at all. The former takes the categories in the order that they
+appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
-direction. The statistic is always sorted ascending, so \code{function(y) sum(y)}
-reverses \code{"total"}.
+direction. The statistic is always sorted ascending, so
+\code{function(y) sum(y)} reverses \code{"total"}.
+}
 }
 
-Both default to \code{NULL}, i.e. keep the existing factor levels.}
+Note that \code{x} is only reordered when it is categorical (i.e., factor or
+character). Both arguments are thus ignored for spinograms, which have a
+(binned) numeric \code{x} axis. Each argument defaults to \code{NULL}, i.e. keep the
+existing factor levels.}
 
-\item{ylevels, yord}{as for \code{xlevels} / \code{xord} above, but for the \code{y} variable.}
+\item{ylevels, yord}{as for \code{xlevels} / \code{xord} above, but for the \code{y}
+variable. Note that \code{y} is always coerced to a factor for spineplots and
+spinograms, so these arguments are always binding if provided. Be aware
+that a numeric \code{y} gives one level per distinct value.}
 
 \item{col}{a vector of fill colors of the same length as \code{levels(y)}.
     The default is to call \code{\link{gray.colors}}.}
 
-\item{xaxlabels, yaxlabels}{character vectors for annotation of x and y axis.
-    Default to \code{levels(y)} and \code{levels(x)}, respectively for the
-    spine plot. For \code{xaxlabels} in the spinogram, the breaks are
-    used.}
-
 \item{weights}{numeric. A vector of frequency weights for each
     observation in the data. If \code{NULL} all weights are implicitly
     assumed to be 1. If \code{x} is already a 2-way table, the weights
@@ -81,6 +80,11 @@ better against their matching border colours.) Set to \code{TRUE} to opt in to
 the lighter tint. Note that \code{lighten} has no effect on other spineplot
 displays (single-group or \code{x == by}), which always use a sequential shading
 ramp of the base colour.}
+
+\item{xaxlabels, yaxlabels}{[Deprecated] character vectors for annotation of
+the x and y axis. Use the top-level \code{xaxl} / \code{yaxl} arguments instead,
+which apply consistently across \code{\link{tinyplot}} types. These two type-specific
+arguments will be removed in a future release.}
 }
 \description{
 Type function(s) for producing spineplots and spinograms, which

From 7a7ad16964f282d0973e676420c5c4eee62a5b14 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Thu, 27 Aug 2026 18:40:08 -0700
Subject: [PATCH 06/23] xord: "total" -> "ascending" / "descending"

- drop the ambiguous "total" xord keyword and rather use explicit directional ranking descriptions like "asc(ending)" and "desc(ending)".
---
 R/sanitize_ord.R      | 76 ++++++++++++++++++++++++++-----------
 R/type_barplot.R      | 87 ++++++++++++++++++++++++-------------------
 R/type_errorbar.R     |  6 +--
 R/type_lines.R        |  3 +-
 R/type_pointrange.R   |  3 +-
 R/type_points.R       | 10 ++---
 R/type_ribbon.R       | 19 ++++++----
 R/type_ridge.R        | 16 ++++----
 R/type_spineplot.R    |  8 ++--
 man/type_barplot.Rd   | 87 ++++++++++++++++++++++++-------------------
 man/type_errorbar.Rd  |  6 +--
 man/type_lines.Rd     |  7 ++--
 man/type_points.Rd    |  7 ++--
 man/type_ribbon.Rd    | 19 ++++++----
 man/type_ridge.Rd     |  9 ++---
 man/type_spineplot.Rd |  6 +--
 16 files changed, 215 insertions(+), 154 deletions(-)

diff --git a/R/sanitize_ord.R b/R/sanitize_ord.R
index cb6ded53..179f982a 100644
--- a/R/sanitize_ord.R
+++ b/R/sanitize_ord.R
@@ -5,16 +5,17 @@
 ##   - NULL:       keep the existing factor levels (the default)
 ##   - "asis":     the categories in the order they appear in the data
 ##   - "rev":      the existing factor levels, reversed
+##   - "desc":     rank by the group's ranking statistic, largest first
+##   - "asc":      ditto, smallest first
 ##   - "start":    rank by the group's y value at the smallest x
 ##   - "end":      rank by the group's y value at the largest x
-##   - "total":    rank by the group's summed y across every x
 ##   - "minvar":   rank by the group's variance, least variable first
 ##
 ## ... and, for anything else, a function that is handed each group's y values
 ## (ordered by x) and returns a single number to sort *ascending* on. So
-## `function(y) -sum(y)` reproduces "total", and `function(y) sum(y)` reverses
-## it. This is the escape hatch for the reverse direction, and for statistics we
-## don't have a keyword for (`function(y) -median(y)`, etc.).
+## `function(y) -sum(y)` reproduces a summed "desc", and `function(y) sum(y)`
+## its "asc". This is the escape hatch for statistics we don't have a keyword
+## for (`function(y) -median(y)`, etc.).
 ##
 ## A function that declares a formal named `x` also receives that group's x
 ## values, which is what any statistic depending on the spacing between
@@ -35,13 +36,14 @@
 ## handed only its own group's y values, never its group identity or level
 ## index, so it has no way to say "put me where I already am, backwards". Note
 ## that it reverses the *existing* level order only; to reverse what another
-## keyword computed, negate it with a function instead (`function(y) sum(y)` is
-## the reverse of "total").
+## keyword computed, swap "asc" for "desc".
 ##
-## The three size keywords rank largest first, i.e. into the first level, which
-## is the bottom band of a stacked area. "minvar" ranks the *other* way --
-## smallest first -- because there the stable baseline is the calm group, not
-## the big one. Both directions serve the same end.
+## "start"/"end"/"minvar" each bake in a direction, since only one of the two
+## is ever wanted: the size keywords rank largest first, i.e. into the first
+## level, which is the bottom band of a stacked area, while "minvar" ranks the
+## *other* way -- smallest first -- because there the stable baseline is the
+## calm group, not the big one. Both directions serve the same end. Only
+## "asc"/"desc" name a direction without naming a statistic; see `stat` below.
 ##
 ## Explicit level names or indexes are deliberately *not* accepted here -- that
 ## is what sanitize_xlevels() is for, and letting both arguments take the same
@@ -59,7 +61,7 @@
 ## category: in the degenerate case of a group literally called "end", set the
 ## factor levels beforehand instead.
 
-ord_keywords = c("asis", "rev", "start", "end", "total", "minvar")
+ord_keywords = c("asis", "rev", "start", "end", "asc", "desc", "minvar")
 
 ## The three sets below track what a type's categories actually are, since that
 ## is what decides which keywords can mean anything:
@@ -70,7 +72,7 @@ ord_keywords = c("asis", "rev", "start", "end", "total", "minvar")
 ##
 ## "start"/"end" name a position along a *secondary* axis, so they only mean
 ## what they say for categories that span one -- the `by` groups of a stacked
-## area, say. Elsewhere they would silently collapse onto "total" when there is
+## area, say. Elsewhere they would silently collapse onto "desc" when there is
 ## no grouping, and silently re-read as "first/last `by` level" when there is.
 ord_keywords_distribution = setdiff(ord_keywords, c("start", "end"))
 
@@ -82,12 +84,29 @@ ord_keywords_distribution = setdiff(ord_keywords, c("start", "end"))
 ## separate bars), the supplied weights for a spine.
 ord_keywords_scalar = setdiff(ord_keywords_distribution, "minvar")
 
-sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords) {
+## Long-form spellings of the two direction keywords. Only "asc"/"desc" are
+## documented and only they appear in the error below; these exist so that
+## typing the word that comes naturally does not error. "inc"/"dec" are
+## deliberately absent: in code they read first as increment/decrement.
+ord_aliases = c(
+  ascending  = "asc",  increasing = "asc",
+  descending = "desc", decreasing = "desc"
+)
+
+sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords, stat = c("sum", "mean")) {
   # nlevels < 2 has exactly one ordering, so skip the work (and the degeneracy
   # check below, which a single level would otherwise trip).
   if (is.null(ord) || !is.factor(v) || nlevels(v) < 2L) {
     return(v)
   }
+  stat = match.arg(stat)
+
+  # Normalise the long forms before anything else looks at `ord`, so that the
+  # keyword check, the error message and the branches below all see canonical
+  # spellings only.
+  if (is.character(ord) && length(ord) == 1L && ord %in% names(ord_aliases)) {
+    ord = unname(ord_aliases[[ord]])
+  }
 
   keyword = is.character(ord) && length(ord) == 1L && ord %in% keywords
   if (!keyword && !is.function(ord)) {
@@ -135,16 +154,16 @@ sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords) {
     # every band above inherits its movement. Groups too short to have a
     # variance give NA and sort last (to the top), which is the right place
     # for them anyway.
-    stat = tapply(y, v, function(z) var(z, na.rm = TRUE), default = NA_real_)
+    score = tapply(y, v, function(z) var(z, na.rm = TRUE), default = NA_real_)
     # A variance that is NA everywhere (one observation per group) or identical
     # everywhere (constant weights) cannot order anything, and would otherwise
     # return the input untouched -- a silent no-op is the worst outcome here.
-    if (length(unique(stat)) < 2L) {
+    if (length(unique(score)) < 2L) {
       stop(
         sprintf(
           "`%s = \"minvar\"` cannot order these groups: %s.",
           arg,
-          if (all(is.na(stat))) {
+          if (all(is.na(score))) {
             "each has fewer than two observations, so there is no variance to rank on"
           } else {
             "every group has the same variance"
@@ -154,14 +173,29 @@ sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords) {
       )
     }
   } else if (keyword) {
-    if (identical(ord, "total")) {
+    # `stat` picks the summary the *reader* sees. Types whose categories carry
+    # one value each -- a bar's height, a spine's count, one band of a stacked
+    # area at a given x -- sum, so that pooling across `by`/facets adds up the
+    # way the drawing does. Types whose categories carry a whole distribution
+    # (a column of points, a ridge) average instead: summing there ranks by
+    # group size, so a category of many small values outranks one of few large
+    # ones even though every one of its observations is lower.
+    agg = if (identical(stat, "mean")) mean else sum
+    if (identical(ord, "asc") || identical(ord, "desc")) {
       keep = rep.int(TRUE, length(y))
     } else {
       edge = if (identical(ord, "start")) min(x, na.rm = TRUE) else max(x, na.rm = TRUE)
       keep = !is.na(x) & x == edge
     }
-    stat = tapply(y[keep], v[keep], function(z) sum(z, na.rm = TRUE), default = 0)
-    stat = -stat # largest group first, i.e. the bottom band
+    # An absent group has no mean, so it sorts last rather than to zero; under
+    # a sum, zero *is* its total and ranks it correctly among the others.
+    score = tapply(
+      y[keep], v[keep], function(z) agg(z, na.rm = TRUE),
+      default = if (identical(stat, "mean")) NA_real_ else 0
+    )
+    # "start"/"end" rank largest first, i.e. the bottom band; "asc" is the one
+    # keyword here that wants the raw ascending order.
+    if (!identical(ord, "asc")) score = -score
   } else {
     xord = if (is.null(x)) seq_along(y) else order(x)
     grps = split(y[xord], v[xord])
@@ -178,7 +212,7 @@ sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords) {
       )
     }
     xgrps = if (want_x) split(x[xord], v[xord]) else NULL
-    stat = vapply(
+    score = vapply(
       seq_along(grps),
       function(i) {
         z = grps[[i]]
@@ -190,6 +224,6 @@ sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords) {
   }
 
   # seq_along() breaks ties on the existing level order; empty groups sort last
-  o = order(stat, seq_along(stat), na.last = TRUE)
+  o = order(score, seq_along(score), na.last = TRUE)
   factor(v, levels = levels(v)[o])
 }
diff --git a/R/type_barplot.R b/R/type_barplot.R
index 8ce2c823..3bf21dd7 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -30,17 +30,23 @@
 #'   - `xord` instead accepts a keyword or custom function, which then _derives_
 #'   the order from the data. Options are:
 #'
-#'     - `"total"` ranks the categories by value, largest first. In practice
-#'     this is the keyword most reach for, since it sorts the bars by height.
-#'     Note that it ranks the *aggregated* bars, i.e. whatever `FUN` produced,
-#'     rather than the underlying rows.
+#'     - `"desc(ending)"` and `"asc(ending)"` rank (sort) the categories by bar
+#'     height, tallest or shortest first. Both the abbreviated and long form
+#'     strings are permitted, as are the `"decreasing"` and `"increasing"`
+#'     aliases. Note that the ranking is applied to the *aggregated* bars, i.e.
+#'     whatever `FUN` produced, rather than the underlying rows. With `by`
+#'     groups or facets, a single ordering is computed and shared across all of
+#'     them, by summing each category's bars over every group and facet. For
+#'     stacked bars that sum is the height of the full stack; with
+#'     `beside = TRUE` it is the group total rather than any individual bar. (A
+#'     factor carries one level order, so a per-facet ranking is not
+#'     expressible.)
 #'     - `"asis"` or `"rev"` permute the existing levels without consulting the
 #'     data at all. The former takes the categories in the order that they
 #'     appear in the data, while the latter reverses the current level order.
 #'     - a custom function that determines both the ranking statistic and its
 #'     direction. The statistic is always sorted in ascending order, so
-#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
-#'     ranks by median rather than by sum.
+#'     `function(y) -median(y)` ranks by median, largest first.
 #'
 #'   Note that a numeric `x` is coerced to a factor before the bars are drawn,
 #'   so it is reordered like any other categorical variable.
@@ -74,54 +80,58 @@
 #'   release.
 #'
 #' @examples
-#' # Basic examples of frequency tables (without y variable)
-#' tinyplot(~ cyl, data = mtcars, type = "barplot")
-#' tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
-#' tinyplot(~ cyl | vs, data = mtcars, type = "barplot", beside = TRUE)
+#' #
+#' ## Basic use
 #' 
-#' # Reorder x variable categories either by their character levels or numeric indexes
-#' tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = c("8", "6", "4"))
-#' tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = 3:1)
+#' sleep2 = transform(sleep, drug = group) # less misleading name (same people)
 #' 
-#' # Or let the data decide the order, rather than naming it. `xord = "total"`
-#' # sorts the bars by height; the ordering is shared across groups and facets.
-#' tinyplot(~ cyl, data = mtcars, type = "barplot", xord = "total")
-#' tinyplot(~ cyl | vs, data = mtcars, type = "barplot", xord = "total")
+#' tinyplot(extra ~ ID, data = sleep2, type = "barplot")
+#' tinyplot(extra ~ ID, data = sleep2, type = "barplot", xord = "desc")
+#' tinyplot(extra ~ ID | drug, data = sleep2, type = "barplot", beside = TRUE)
 #' 
-#' # The ranking statistic is always sorted ascending, so passing a function is
-#' # how you get the reverse: `sum` undoes what `"total"` does.
-#' tinyplot(~ cyl, data = mtcars, type = "barplot", xord = function(y) sum(y))
-#' 
-#' # The two arguments compose, `xlevels` first: here we fix an explicit order
-#' # and then flip it.
+#' # Change the aggregation (non-grouped case) from the `FUN = mean` default to
+#' # ask a more interesting question: which subject benefitted most from the
+#' # switch to drug 2?
 #' tinyplot(
-#'   ~ cyl, data = mtcars, type = "barplot",
-#'   xlevels = c("8", "6", "4"), xord = "rev"
+#'    extra ~ ID, data = sleep2, type = "barplot",
+#'    FUN = diff, xord = "desc",
+#'    main = "Sleep gain (drug 2 vs drug 1)"
 #' )
 #' 
-#' # Note: Above we used automatic argument passing for `beside`. But this
-#' # wouldn't work for `width`, since it would conflict with the top-level
+#' # Note: We used automatic argument passing for 'xord', `FUN`, etc. above. But
+#' # this wouldn't work for `width`, since it would conflict with the top-level
 #' # `tinyplot(..., width = <width>)` argument. It's safer to pass these args
 #' # through the `type_barplot()` functional equivalent.
 #' tinyplot(
-#'   ~ cyl | vs, data = mtcars,
-#'   type = type_barplot(beside = TRUE, drop.zeros = TRUE, width = 0.65)
+#'   extra ~ ID | drug, data = sleep2,
+#'   type = type_barplot(beside = TRUE, xord = "desc", width = 0.5)
 #' )
 #' 
-#' # Example for numeric y aggregated by x (default: FUN = mean) + facets
-#' tinyplot(
-#'   extra ~ ID | group, facet = "by", data = sleep,
-#'   type = "barplot",
-#'   theme = "clean2"
-#' )
+#' #
+#' ## matrix method (no formula required)
+#' 
+#' tinyplot(VADeaths, type = "barplot")
+#' tinyplot(VADeaths, type = "barplot", beside = TRUE)
+#' # etc. see ?tinyplot.matrix
 #' 
-#' # Fancy frequency table:
+#' #
+#' ## Frequency tables
+#' 
+#' # No y variable (frequency calculated on the fly)
+#' tinyplot(~ cyl, data = mtcars, type = "barplot")
+#' tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
+#' 
+#' 
+#' # Fancy frequency table (y = frequency aleady computed)
 #' tinyplot(
 #'   Freq ~ Sex | Survived, data = as.data.frame(Titanic),
 #'   facet = ~ Class, facet.args = list(nrow = 1),
-#'   type = "barplot", flip = TRUE,
+#'   type = "barplot", beside = TRUE, flip = TRUE,
 #'   theme = "clean2"
 #' )
+#' 
+#' #
+#' ## Centering
 #'
 #' # Centered barplot for conditional proportions of dark (black/brown) vs.
 #' # light (red/blond) hair color, conditional on eye color and sex.
@@ -136,7 +146,8 @@
 #'   theme = list("clean2", palette.qualitative = hcols)
 #' )
 #'
-#' # Use cases for the `offset` argument
+#' #
+#' ## Offset
 #'
 #' # 1. Waterfall plot
 #' d = data.frame(item = c("Sales", "Services", "Costs", "Returns", "TOTAL"),
diff --git a/R/type_errorbar.R b/R/type_errorbar.R
index 27d246a0..c5e4ee95 100644
--- a/R/type_errorbar.R
+++ b/R/type_errorbar.R
@@ -15,7 +15,8 @@
 #'   - `xord` instead accepts a keyword or custom function, which then _derives_
 #'   the order from the data. Options are:
 #'
-#'     - `"total"` ranks the categories by their `y` values, largest first.
+#'     - `"desc"` and `"asc"` rank the categories by their mean `y` value,
+#'     largest or smallest first. (Long forms like `"descending"` and `"increasing"` are also accepted.)
 #'     - `"minvar"` ranks them by variance, lowest first. This needs more than
 #'     one observation per category, so it does not apply to the usual
 #'     one-row-per-term coefficient table.
@@ -24,8 +25,7 @@
 #'     appear in the data, while the latter reverses the current level order.
 #'     - a custom function that determines both the ranking statistic and its
 #'     direction. The statistic is always sorted ascending, so
-#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
-#'     ranks by median rather than by sum.
+#'     `function(y) -median(y)` ranks by median, largest first.
 #'
 #'   Note that `x` is only reordered when it is categorical (i.e., factor or
 #'   character). A numeric `x` is plotted at its own values and cannot be
diff --git a/R/type_lines.R b/R/type_lines.R
index af80a3e3..46a90f20 100644
--- a/R/type_lines.R
+++ b/R/type_lines.R
@@ -76,7 +76,8 @@ data_lines = function(dodge = 0, fixed.dodge = FALSE, xlevels = NULL, xord = NUL
     if (!is.null(xord) && is.null(xlevels)) {
       datapoints[["x"]] = sanitize_ord(
         datapoints[["x"]], datapoints[["y"]], NULL,
-        xord, arg = "xord", keywords = ord_keywords_distribution
+        xord, arg = "xord", keywords = ord_keywords_distribution,
+        stat = "mean"
       )
     }
     if (is.factor(datapoints[["x"]])) {
diff --git a/R/type_pointrange.R b/R/type_pointrange.R
index 8d6c6887..2e64df95 100644
--- a/R/type_pointrange.R
+++ b/R/type_pointrange.R
@@ -64,7 +64,8 @@ data_pointrange = function(dodge, fixed.dodge, xlevels = NULL, xord = "asis", or
     if (!is.null(xord) && is.null(xlevels)) {
       datapoints$x = sanitize_ord(
         datapoints$x, datapoints[["y"]], NULL,
-        xord, arg = "xord", keywords = ord_keywords_distribution
+        xord, arg = "xord", keywords = ord_keywords_distribution,
+        stat = "mean"
       )
     }
     if (is.factor(datapoints$x)) {
diff --git a/R/type_points.R b/R/type_points.R
index e1cf7e93..31c2fc55 100644
--- a/R/type_points.R
+++ b/R/type_points.R
@@ -15,16 +15,15 @@
 #'   - `xord` instead accepts a keyword or custom function, which then _derives_
 #'   the order from the data. Options are:
 #'
-#'     - `"total"` ranks the categories by the `y` values observed at each one,
-#'     largest first.
+#'     - `"desc"` and `"asc"` rank the categories by their mean `y` value,
+#'     largest or smallest first. (Long forms like `"descending"` and `"increasing"` are also accepted.)
 #'     - `"minvar"` ranks them by the variance of those values, lowest first.
 #'     - `"asis"` or `"rev"` permute the existing levels without consulting the
 #'     data at all. The former takes the categories in the order that they
 #'     appear in the data, while the latter reverses the current level order.
 #'     - a custom function that determines both the ranking statistic and its
 #'     direction. The statistic is always sorted ascending, so
-#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
-#'     ranks by median rather than by sum.
+#'     `function(y) -median(y)` ranks by median, largest first.
 #'
 #'   Note that `x` is only reordered when it is categorical (i.e., factor or
 #'   character). A numeric `x` is plotted at its own values and cannot be
@@ -85,7 +84,8 @@ data_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xleve
     if (!is.null(xord) && is.null(xlevels)) {
       datapoints$x = sanitize_ord(
         datapoints$x, datapoints[["y"]], NULL,
-        xord, arg = "xord", keywords = ord_keywords_distribution
+        xord, arg = "xord", keywords = ord_keywords_distribution,
+        stat = "mean"
       )
     }
     if (is.factor(datapoints$x)) {
diff --git a/R/type_ribbon.R b/R/type_ribbon.R
index 23b4fda7..78c7e206 100644
--- a/R/type_ribbon.R
+++ b/R/type_ribbon.R
@@ -12,9 +12,11 @@
 #'   the `by` group layers, thus controlling the order in which they stack.
 #'   Options are:
 #'
-#'   - `"start"`, `"end"` and `"total"` are positional keywords that rank the
-#'   groups by their `y` values along the `x` axis. In each case, the group with
-#'   the largest value is stacked first, as the bottom layer.
+#'   - `"desc"` and `"asc"` rank the groups by their summed `y` across the `x`
+#'   axis, largest or smallest first. With `"desc"` the biggest group is stacked
+#'   first, as the bottom layer. (Long forms like `"descending"` and `"increasing"` are also accepted.)
+#'   - `"start"` and `"end"` instead rank on the `y` values at the smallest and
+#'   largest `x` respectively, again stacking the largest group first.
 #'   - `"minvar"` ranks by variance, putting the lowest variance group on the
 #'   baseline.
 #'   - `"asis"` or `"rev"` permute the existing levels without consulting the
@@ -60,10 +62,11 @@
 #'
 #' The `byord` argument is a helpful companion to stacked area plots, since it
 #' enables on-the-fly adjustment of the stacking order. For example,
-#' three positional keywords---`"start"`, `"end"`, and `"total"`---rank the
-#' stacked `by` groups according to their `y` values at the designated position
-#' along the `x` axis. Following convention, the ranking runs in descending
-#' order, so that the biggest group is drawn on the bottom layer. However, size
+#' the size keywords---`"desc"`, `"start"`, and `"end"`---rank the
+#' stacked `by` groups according to their `y` values, either summed across the
+#' `x` axis or taken at one end of it. Following convention, the ranking runs in
+#' descending order, so that the biggest group is drawn on the bottom layer
+#' (use `"asc"` for the reverse). However, size
 #' is not the only route to a stable baseline. Because each band is
 #' drawn on top of the ones below it, they all inherit whatever movement the
 #' bottom layer has. A large but volatile group can therefore be a worse choice
@@ -147,7 +150,7 @@
 #' # `"minvar"` instead puts the *least variable* group on the baseline. Every
 #' # band inherits the movement of the ones below it, so a steady bottom layer
 #' # keeps the whole chart legible. Here that picks group B, which the default
-#' # level order leaves in the middle and `"end"`/`"total"` push to the top.
+#' # level order leaves in the middle and `"end"`/`"desc"` push to the top.
 #'
 #' tinyplot(
 #'   val ~ year | grp, data = dat,
diff --git a/R/type_ridge.R b/R/type_ridge.R
index 37fcf6e9..ef33b613 100644
--- a/R/type_ridge.R
+++ b/R/type_ridge.R
@@ -38,9 +38,9 @@
 #'   - `yord` instead accepts a keyword or custom function, which then _derives_
 #'   the order from the data. Options are:
 #'
-#'     - `"total"` ranks the ridges by summed `x`, largest first. (Ridge plots
-#'     have no separate response, so the ranking runs on the continuous `x`
-#'     variable.)
+#'     - `"desc"` and `"asc"` rank the ridges by their mean `x` value, largest
+#'     or smallest first. (Long forms like `"descending"` and `"increasing"` are also accepted.) (Ridge plots have no
+#'     separate response, so the ranking runs on the continuous `x` variable.)
 #'     - `"minvar"` ranks them by the spread of each distribution, narrowest
 #'     first.
 #'     - `"asis"` or `"rev"` permute the existing levels without consulting the
@@ -48,8 +48,7 @@
 #'     appear in the data, while the latter reverses the current level order.
 #'     - a custom function that determines both the ranking statistic and its
 #'     direction. The statistic is always sorted ascending, so
-#'     `function(y) sum(y)` reverses `"total"`, and `function(y) -median(y)`
-#'     ranks by median rather than by sum.
+#'     `function(y) -median(y)` ranks by median, largest first.
 #'
 #'   Note that a numeric `y` is coerced to a factor before the ridges are
 #'   drawn, so it is reordered like any other categorical variable.
@@ -330,12 +329,13 @@ data_ridge = function(bw = "nrd0", adjust = 1, kernel = "gaussian", n = 512,
       if (y_by) datapoints$by = datapoints$y
     }
     ## `yord` ranks the ridges on the *continuous* variable, which for this
-    ## type is `x` -- there is no separate response to rank on. So "total"
-    ## orders by summed x, "minvar" by the spread of each distribution.
+    ## type is `x` -- there is no separate response to rank on. So "asc"/"desc"
+    ## order by mean x, "minvar" by the spread of each distribution.
     if (!is.null(yord) && is.null(ylevels)) {
       datapoints$y = sanitize_ord(
         datapoints$y, datapoints$x, NULL,
-        yord, arg = "yord", keywords = ord_keywords_distribution
+        yord, arg = "yord", keywords = ord_keywords_distribution,
+        stat = "mean"
       )
       if (y_by) datapoints$by = datapoints$y
     }
diff --git a/R/type_spineplot.R b/R/type_spineplot.R
index 48256bfb..6056bf25 100644
--- a/R/type_spineplot.R
+++ b/R/type_spineplot.R
@@ -15,14 +15,14 @@
 #'   - `xord` instead accepts a keyword or custom function, which then _derives_
 #'   the order from the data. Options are:
 #'
-#'     - `"total"` ranks the categories by (weighted) frequency, i.e. most
-#'     common first.
+#'     - `"desc"` and `"asc"` rank the categories by (weighted) frequency,
+#'     i.e. most or least common first. (Long forms like `"descending"` and `"increasing"` are also accepted.)
 #'     - `"asis"` or `"rev"` permute the existing levels without consulting the
 #'     data at all. The former takes the categories in the order that they
 #'     appear in the data, while the latter reverses the current level order.
 #'     - a custom function that determines both the ranking statistic and its
 #'     direction. The statistic is always sorted ascending, so
-#'     `function(y) sum(y)` reverses `"total"`.
+#'     `function(y) -median(y)` ranks by median, largest first.
 #'
 #'   Note that `x` is only reordered when it is categorical (i.e., factor or
 #'   character). Both arguments are thus ignored for spinograms, which have a
@@ -209,7 +209,7 @@ data_spineplot = function(off = NULL, breaks = NULL, xlevels = xlevels, xord = N
         }
         ## Both axes here are categorical, so there is no response to rank on:
         ## the size keywords count observations instead (weighted, if given),
-        ## i.e. "total" orders the categories by frequency.
+        ## i.e. "asc"/"desc" order the categories by frequency.
         spine_w = if (!is.null(weights)) weights else rep.int(1, nrow(datapoints))
         if (!is.null(xord) && is.null(xlevels) && x.categorical) {
           datapoints$x = sanitize_ord(
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index dcd1af77..f470493a 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -62,17 +62,23 @@ vector of the corresponding level indexes (e.g. \code{3:1}).
 \item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
 the order from the data. Options are:
 \itemize{
-\item \code{"total"} ranks the categories by value, largest first. In practice
-this is the keyword most reach for, since it sorts the bars by height.
-Note that it ranks the \emph{aggregated} bars, i.e. whatever \code{FUN} produced,
-rather than the underlying rows.
+\item \code{"desc(ending)"} and \code{"asc(ending)"} rank (sort) the categories by bar
+height, tallest or shortest first. Both the abbreviated and long form
+strings are permitted, as are the \code{"decreasing"} and \code{"increasing"}
+aliases. Note that the ranking is applied to the \emph{aggregated} bars, i.e.
+whatever \code{FUN} produced, rather than the underlying rows. With \code{by}
+groups or facets, a single ordering is computed and shared across all of
+them, by summing each category's bars over every group and facet. For
+stacked bars that sum is the height of the full stack; with
+\code{beside = TRUE} it is the group total rather than any individual bar. (A
+factor carries one level order, so a per-facet ranking is not
+expressible.)
 \item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
 data at all. The former takes the categories in the order that they
 appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
 direction. The statistic is always sorted in ascending order, so
-\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
-ranks by median rather than by sum.
+\code{function(y) -median(y)} ranks by median, largest first.
 }
 }
 
@@ -103,55 +109,59 @@ of \code{y} within each level of \code{x} is visualized, if necessary aggregated
 using some function (default: mean).
 }
 \examples{
-# Basic examples of frequency tables (without y variable)
-tinyplot(~ cyl, data = mtcars, type = "barplot")
-tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
-tinyplot(~ cyl | vs, data = mtcars, type = "barplot", beside = TRUE)
+#
+## Basic use
 
-# Reorder x variable categories either by their character levels or numeric indexes
-tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = c("8", "6", "4"))
-tinyplot(~ cyl, data = mtcars, type = "barplot", xlevels = 3:1)
+sleep2 = transform(sleep, drug = group) # less misleading name (same people)
 
-# Or let the data decide the order, rather than naming it. `xord = "total"`
-# sorts the bars by height; the ordering is shared across groups and facets.
-tinyplot(~ cyl, data = mtcars, type = "barplot", xord = "total")
-tinyplot(~ cyl | vs, data = mtcars, type = "barplot", xord = "total")
+tinyplot(extra ~ ID, data = sleep2, type = "barplot")
+tinyplot(extra ~ ID, data = sleep2, type = "barplot", xord = "desc")
+tinyplot(extra ~ ID | drug, data = sleep2, type = "barplot", beside = TRUE)
 
-# The ranking statistic is always sorted ascending, so passing a function is
-# how you get the reverse: `sum` undoes what `"total"` does.
-tinyplot(~ cyl, data = mtcars, type = "barplot", xord = function(y) sum(y))
-
-# The two arguments compose, `xlevels` first: here we fix an explicit order
-# and then flip it.
+# Change the aggregation (non-grouped case) from the `FUN = mean` default to
+# ask a more interesting question: which subject benefitted most from the
+# switch to drug 2?
 tinyplot(
-  ~ cyl, data = mtcars, type = "barplot",
-  xlevels = c("8", "6", "4"), xord = "rev"
+   extra ~ ID, data = sleep2, type = "barplot",
+   FUN = diff, xord = "desc",
+   main = "Sleep gain (drug 2 vs drug 1)"
 )
 
-# Note: Above we used automatic argument passing for `beside`. But this
-# wouldn't work for `width`, since it would conflict with the top-level
+# Note: We used automatic argument passing for 'xord', `FUN`, etc. above. But
+# this wouldn't work for `width`, since it would conflict with the top-level
 # `tinyplot(..., width = <width>)` argument. It's safer to pass these args
 # through the `type_barplot()` functional equivalent.
 tinyplot(
-  ~ cyl | vs, data = mtcars,
-  type = type_barplot(beside = TRUE, drop.zeros = TRUE, width = 0.65)
+  extra ~ ID | drug, data = sleep2,
+  type = type_barplot(beside = TRUE, xord = "desc", width = 0.5)
 )
 
-# Example for numeric y aggregated by x (default: FUN = mean) + facets
-tinyplot(
-  extra ~ ID | group, facet = "by", data = sleep,
-  type = "barplot",
-  theme = "clean2"
-)
+#
+## matrix method (no formula required)
+
+tinyplot(VADeaths, type = "barplot")
+tinyplot(VADeaths, type = "barplot", beside = TRUE)
+# etc. see ?tinyplot.matrix
 
-# Fancy frequency table:
+#
+## Frequency tables
+
+# No y variable (frequency calculated on the fly)
+tinyplot(~ cyl, data = mtcars, type = "barplot")
+tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
+
+
+# Fancy frequency table (y = frequency aleady computed)
 tinyplot(
   Freq ~ Sex | Survived, data = as.data.frame(Titanic),
   facet = ~ Class, facet.args = list(nrow = 1),
-  type = "barplot", flip = TRUE,
+  type = "barplot", beside = TRUE, flip = TRUE,
   theme = "clean2"
 )
 
+#
+## Centering
+
 # Centered barplot for conditional proportions of dark (black/brown) vs.
 # light (red/blond) hair color, conditional on eye color and sex.
 # Aside: use `lighten = FALSE` to avoid lightening the bar fill colors.
@@ -165,7 +175,8 @@ tinyplot(
   theme = list("clean2", palette.qualitative = hcols)
 )
 
-# Use cases for the `offset` argument
+#
+## Offset
 
 # 1. Waterfall plot
 d = data.frame(item = c("Sales", "Services", "Costs", "Returns", "TOTAL"),
diff --git a/man/type_errorbar.Rd b/man/type_errorbar.Rd
index b35a6725..b1e4bfe9 100644
--- a/man/type_errorbar.Rd
+++ b/man/type_errorbar.Rd
@@ -50,7 +50,8 @@ vector of the corresponding level indexes (e.g. \code{3:1}).
 \item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
 the order from the data. Options are:
 \itemize{
-\item \code{"total"} ranks the categories by their \code{y} values, largest first.
+\item \code{"desc"} and \code{"asc"} rank the categories by their mean \code{y} value,
+largest or smallest first. (Long forms like \code{"descending"} and \code{"increasing"} are also accepted.)
 \item \code{"minvar"} ranks them by variance, lowest first. This needs more than
 one observation per category, so it does not apply to the usual
 one-row-per-term coefficient table.
@@ -59,8 +60,7 @@ data at all. The former takes the categories in the order that they
 appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
 direction. The statistic is always sorted ascending, so
-\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
-ranks by median rather than by sum.
+\code{function(y) -median(y)} ranks by median, largest first.
 }
 }
 
diff --git a/man/type_lines.Rd b/man/type_lines.Rd
index c62addb9..f9be54a1 100644
--- a/man/type_lines.Rd
+++ b/man/type_lines.Rd
@@ -57,16 +57,15 @@ vector of the corresponding level indexes (e.g. \code{3:1}).
 \item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
 the order from the data. Options are:
 \itemize{
-\item \code{"total"} ranks the categories by the \code{y} values observed at each one,
-largest first.
+\item \code{"desc"} and \code{"asc"} rank the categories by their mean \code{y} value,
+largest or smallest first. (Long forms like \code{"descending"} and \code{"increasing"} are also accepted.)
 \item \code{"minvar"} ranks them by the variance of those values, lowest first.
 \item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
 data at all. The former takes the categories in the order that they
 appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
 direction. The statistic is always sorted ascending, so
-\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
-ranks by median rather than by sum.
+\code{function(y) -median(y)} ranks by median, largest first.
 }
 }
 
diff --git a/man/type_points.Rd b/man/type_points.Rd
index 3d238069..4ee9342e 100644
--- a/man/type_points.Rd
+++ b/man/type_points.Rd
@@ -49,16 +49,15 @@ vector of the corresponding level indexes (e.g. \code{3:1}).
 \item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
 the order from the data. Options are:
 \itemize{
-\item \code{"total"} ranks the categories by the \code{y} values observed at each one,
-largest first.
+\item \code{"desc"} and \code{"asc"} rank the categories by their mean \code{y} value,
+largest or smallest first. (Long forms like \code{"descending"} and \code{"increasing"} are also accepted.)
 \item \code{"minvar"} ranks them by the variance of those values, lowest first.
 \item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
 data at all. The former takes the categories in the order that they
 appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
 direction. The statistic is always sorted ascending, so
-\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
-ranks by median rather than by sum.
+\code{function(y) -median(y)} ranks by median, largest first.
 }
 }
 
diff --git a/man/type_ribbon.Rd b/man/type_ribbon.Rd
index 590ec153..282b063a 100644
--- a/man/type_ribbon.Rd
+++ b/man/type_ribbon.Rd
@@ -24,9 +24,11 @@ area plots" section below.}
 the \code{by} group layers, thus controlling the order in which they stack.
 Options are:
 \itemize{
-\item \code{"start"}, \code{"end"} and \code{"total"} are positional keywords that rank the
-groups by their \code{y} values along the \code{x} axis. In each case, the group with
-the largest value is stacked first, as the bottom layer.
+\item \code{"desc"} and \code{"asc"} rank the groups by their summed \code{y} across the \code{x}
+axis, largest or smallest first. With \code{"desc"} the biggest group is stacked
+first, as the bottom layer. (Long forms like \code{"descending"} and \code{"increasing"} are also accepted.)
+\item \code{"start"} and \code{"end"} instead rank on the \code{y} values at the smallest and
+largest \code{x} respectively, again stacking the largest group first.
 \item \code{"minvar"} ranks by variance, putting the lowest variance group on the
 baseline.
 \item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
@@ -99,10 +101,11 @@ separately within each facet.
 
 The \code{byord} argument is a helpful companion to stacked area plots, since it
 enables on-the-fly adjustment of the stacking order. For example,
-three positional keywords---\code{"start"}, \code{"end"}, and \code{"total"}---rank the
-stacked \code{by} groups according to their \code{y} values at the designated position
-along the \code{x} axis. Following convention, the ranking runs in descending
-order, so that the biggest group is drawn on the bottom layer. However, size
+the size keywords---\code{"desc"}, \code{"start"}, and \code{"end"}---rank the
+stacked \code{by} groups according to their \code{y} values, either summed across the
+\code{x} axis or taken at one end of it. Following convention, the ranking runs in
+descending order, so that the biggest group is drawn on the bottom layer
+(use \code{"asc"} for the reverse). However, size
 is not the only route to a stable baseline. Because each band is
 drawn on top of the ones below it, they all inherit whatever movement the
 bottom layer has. A large but volatile group can therefore be a worse choice
@@ -185,7 +188,7 @@ tinyplot(
 # `"minvar"` instead puts the *least variable* group on the baseline. Every
 # band inherits the movement of the ones below it, so a steady bottom layer
 # keeps the whole chart legible. Here that picks group B, which the default
-# level order leaves in the middle and `"end"`/`"total"` push to the top.
+# level order leaves in the middle and `"end"`/`"desc"` push to the top.
 
 tinyplot(
   val ~ year | grp, data = dat,
diff --git a/man/type_ridge.Rd b/man/type_ridge.Rd
index ce60fab1..0ca4dd4a 100644
--- a/man/type_ridge.Rd
+++ b/man/type_ridge.Rd
@@ -58,9 +58,9 @@ vector of the corresponding level indexes (e.g. \code{3:1}).
 \item \code{yord} instead accepts a keyword or custom function, which then \emph{derives}
 the order from the data. Options are:
 \itemize{
-\item \code{"total"} ranks the ridges by summed \code{x}, largest first. (Ridge plots
-have no separate response, so the ranking runs on the continuous \code{x}
-variable.)
+\item \code{"desc"} and \code{"asc"} rank the ridges by their mean \code{x} value, largest
+or smallest first. (Long forms like \code{"descending"} and \code{"increasing"} are also accepted.) (Ridge plots have no
+separate response, so the ranking runs on the continuous \code{x} variable.)
 \item \code{"minvar"} ranks them by the spread of each distribution, narrowest
 first.
 \item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
@@ -68,8 +68,7 @@ data at all. The former takes the categories in the order that they
 appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
 direction. The statistic is always sorted ascending, so
-\code{function(y) sum(y)} reverses \code{"total"}, and \code{function(y) -median(y)}
-ranks by median rather than by sum.
+\code{function(y) -median(y)} ranks by median, largest first.
 }
 }
 
diff --git a/man/type_spineplot.Rd b/man/type_spineplot.Rd
index d30fa45a..7fb8c48b 100644
--- a/man/type_spineplot.Rd
+++ b/man/type_spineplot.Rd
@@ -41,14 +41,14 @@ vector of the corresponding level indexes (e.g. \code{3:1}).
 \item \code{xord} instead accepts a keyword or custom function, which then \emph{derives}
 the order from the data. Options are:
 \itemize{
-\item \code{"total"} ranks the categories by (weighted) frequency, i.e. most
-common first.
+\item \code{"desc"} and \code{"asc"} rank the categories by (weighted) frequency,
+i.e. most or least common first. (Long forms like \code{"descending"} and \code{"increasing"} are also accepted.)
 \item \code{"asis"} or \code{"rev"} permute the existing levels without consulting the
 data at all. The former takes the categories in the order that they
 appear in the data, while the latter reverses the current level order.
 \item a custom function that determines both the ranking statistic and its
 direction. The statistic is always sorted ascending, so
-\code{function(y) sum(y)} reverses \code{"total"}.
+\code{function(y) -median(y)} ranks by median, largest first.
 }
 }
 

From f7bdb022cb3c33ea89463de4aaeecfccf151d434 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Thu, 27 Aug 2026 21:15:29 -0700
Subject: [PATCH 07/23] more examples

---
 R/tinyplot.matrix.R    | 11 +++++++++--
 man/tinyplot.matrix.Rd | 11 +++++++++--
 man/type_barplot.Rd    |  3 +--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/R/tinyplot.matrix.R b/R/tinyplot.matrix.R
index 03260bcd..149451ba 100644
--- a/R/tinyplot.matrix.R
+++ b/R/tinyplot.matrix.R
@@ -51,13 +51,20 @@
 #' tinyplot(VADeaths, type = "b", legend = "direct", theme = "socviz")
 #' tinyplot(VADeaths, type = "b", legend = FALSE, facet = "by", theme = "socviz")
 #'
-#' # equivalent plot to an example in `?matplot`
+#' # digression: equivalent "o" plot to an example in `?matplot`
 #' sines = outer(1:20, 1:4, function(x, y) sin(x / 20 * pi * y))
 #' tinyplot(sines, type = "o", pch = "by", lty = "by", col = rainbow(ncol(sines)))
 #' 
-#' # `"tile"` + `"heatmap"` types lay the matrix out as a grid instead
+#' # back to VADeaths running example, we can pass down other types too...
+#' 
+#' # heatmap
 #' tinyplot(VADeaths, type = "heatmap", theme = "heatmap", col = "white")
 #'
+#' # barplot(s)
+#' tinyplot(VADeaths, type = "barplot", beside = TRUE)
+#' tinyplot(t(VADeaths), type = "barplot", beside = TRUE)
+#' tinyplot(VADeaths, type = "barplot", beside = TRUE, facet = "by", legend = FALSE)
+#' 
 #' @export
 tinyplot.matrix = function(x, type = NULL, legend = NULL, facet = NULL, xlab = NULL, ylab = NULL, ...) {
   assert_choice(facet, "by", null.ok = TRUE)
diff --git a/man/tinyplot.matrix.Rd b/man/tinyplot.matrix.Rd
index e39f60a4..da266206 100644
--- a/man/tinyplot.matrix.Rd
+++ b/man/tinyplot.matrix.Rd
@@ -72,13 +72,20 @@ tinyplot(VADeaths, type = "b")
 tinyplot(VADeaths, type = "b", legend = "direct", theme = "socviz")
 tinyplot(VADeaths, type = "b", legend = FALSE, facet = "by", theme = "socviz")
 
-# equivalent plot to an example in `?matplot`
+# digression: equivalent "o" plot to an example in `?matplot`
 sines = outer(1:20, 1:4, function(x, y) sin(x / 20 * pi * y))
 tinyplot(sines, type = "o", pch = "by", lty = "by", col = rainbow(ncol(sines)))
 
-# `"tile"` + `"heatmap"` types lay the matrix out as a grid instead
+# back to VADeaths running example, we can pass down other types too...
+
+# heatmap
 tinyplot(VADeaths, type = "heatmap", theme = "heatmap", col = "white")
 
+# barplot(s)
+tinyplot(VADeaths, type = "barplot", beside = TRUE)
+tinyplot(t(VADeaths), type = "barplot", beside = TRUE)
+tinyplot(VADeaths, type = "barplot", beside = TRUE, facet = "by", legend = FALSE)
+
 }
 \seealso{
 \code{\link[graphics]{matplot}}
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index f470493a..087fe612 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -150,7 +150,6 @@ tinyplot(VADeaths, type = "barplot", beside = TRUE)
 tinyplot(~ cyl, data = mtcars, type = "barplot")
 tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
 
-
 # Fancy frequency table (y = frequency aleady computed)
 tinyplot(
   Freq ~ Sex | Survived, data = as.data.frame(Titanic),
@@ -176,7 +175,7 @@ tinyplot(
 )
 
 #
-## Offset
+## Offset examples
 
 # 1. Waterfall plot
 d = data.frame(item = c("Sales", "Services", "Costs", "Returns", "TOTAL"),

From 60305dbe89a2d7050a181275cbac513b4690bcc9 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Thu, 27 Aug 2026 21:20:27 -0700
Subject: [PATCH 08/23] again

---
 R/tinyplot.matrix.R    | 2 +-
 R/type_barplot.R       | 3 +--
 man/tinyplot.matrix.Rd | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/R/tinyplot.matrix.R b/R/tinyplot.matrix.R
index 149451ba..f031ce2c 100644
--- a/R/tinyplot.matrix.R
+++ b/R/tinyplot.matrix.R
@@ -63,7 +63,7 @@
 #' # barplot(s)
 #' tinyplot(VADeaths, type = "barplot", beside = TRUE)
 #' tinyplot(t(VADeaths), type = "barplot", beside = TRUE)
-#' tinyplot(VADeaths, type = "barplot", beside = TRUE, facet = "by", legend = FALSE)
+#' tinyplot(VADeaths, type = "barplot", facet = "by", legend = FALSE)
 #' 
 #' @export
 tinyplot.matrix = function(x, type = NULL, legend = NULL, facet = NULL, xlab = NULL, ylab = NULL, ...) {
diff --git a/R/type_barplot.R b/R/type_barplot.R
index 3bf21dd7..ecf6192b 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -121,7 +121,6 @@
 #' tinyplot(~ cyl, data = mtcars, type = "barplot")
 #' tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
 #' 
-#' 
 #' # Fancy frequency table (y = frequency aleady computed)
 #' tinyplot(
 #'   Freq ~ Sex | Survived, data = as.data.frame(Titanic),
@@ -147,7 +146,7 @@
 #' )
 #'
 #' #
-#' ## Offset
+#' ## Offset examples
 #'
 #' # 1. Waterfall plot
 #' d = data.frame(item = c("Sales", "Services", "Costs", "Returns", "TOTAL"),
diff --git a/man/tinyplot.matrix.Rd b/man/tinyplot.matrix.Rd
index da266206..ad908448 100644
--- a/man/tinyplot.matrix.Rd
+++ b/man/tinyplot.matrix.Rd
@@ -84,7 +84,7 @@ tinyplot(VADeaths, type = "heatmap", theme = "heatmap", col = "white")
 # barplot(s)
 tinyplot(VADeaths, type = "barplot", beside = TRUE)
 tinyplot(t(VADeaths), type = "barplot", beside = TRUE)
-tinyplot(VADeaths, type = "barplot", beside = TRUE, facet = "by", legend = FALSE)
+tinyplot(VADeaths, type = "barplot", facet = "by", legend = FALSE)
 
 }
 \seealso{

From 6760ea87666bb62e54148cf4fc746bf8136c1fff Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 09:43:00 -0700
Subject: [PATCH 09/23] tinylabel + abs precision (#689)

---
 R/tinylabel.R | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/R/tinylabel.R b/R/tinylabel.R
index 9e3afec3..5ca08b65 100644
--- a/R/tinylabel.R
+++ b/R/tinylabel.R
@@ -178,7 +178,8 @@ labeller_fun = function(label = "percent") {
   # the unique values distinct, so a single consistent format can be applied to
   # the whole vector. Falls back to max_decimals.
   consistent_decimals = function(x, max_decimals = 5L) {
-    ux = unique(as.numeric(x))
+    # Deduplicate at printed precision (#689)
+    ux = unique(round(as.numeric(x), max_decimals))
     Find(
       function(d) {
         length(unique(sprintf(paste0("%.", d, "f"), ux))) == length(ux)

From ba50f158d9e2c544873507b5f0c01a8fcdc0a761 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 10:17:40 -0700
Subject: [PATCH 10/23] tinylabel dictionary docs (late follow-up to #690)

---
 R/legend.R               | 17 +++++++++--------
 R/tinylabel.R            | 13 +++++++------
 R/tinyplot.R             | 19 +++++++++++--------
 R/tpar.R                 |  2 +-
 R/type_text.R            | 10 +++++-----
 man/build_legend_args.Rd |  5 +++--
 man/build_legend_env.Rd  |  5 +++--
 man/draw_legend.Rd       |  7 +++----
 man/tinyAxis.Rd          | 13 +++++++------
 man/tinylabel.Rd         | 13 +++++++------
 man/tinyplot.Rd          | 19 +++++++++++--------
 man/tpar.Rd              |  2 +-
 man/type_text.Rd         | 10 +++++-----
 13 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/R/legend.R b/R/legend.R
index eebb0ede..0dff41d1 100644
--- a/R/legend.R
+++ b/R/legend.R
@@ -542,8 +542,9 @@ prepare_legend = function(settings) {
 #' @param legend_args Additional legend arguments
 #' @param by_dep The (deparsed) "by" grouping variable name
 #' @param lgnd_labs The legend labels
-#' @param labeller Function, character keyword, or named vector for formatting
-#'   or relabelling the labels. See [`tinylabel`] for the accepted forms.
+#' @param labeller Function, character keyword, or dictionary (named vector or
+#'   list) for formatting or relabelling the labels. See [`tinylabel`] for the
+#'   accepted forms.
 #' @param type Plot type
 #' @param pch Plotting character(s)
 #' @param lty Line type(s)
@@ -771,8 +772,9 @@ reverse_legend_keys = function(legend_args, n) {
 #' @param legend_args Additional legend arguments
 #' @param by_dep The (deparsed) "by" grouping variable name
 #' @param lgnd_labs The legend labels
-#' @param labeller Function, character keyword, or named vector for formatting
-#'   or relabelling the labels. See [`tinylabel`] for the accepted forms.
+#' @param labeller Function, character keyword, or dictionary (named vector or
+#'   list) for formatting or relabelling the labels. See [`tinylabel`] for the
+#'   accepted forms.
 #' @param type Plot type
 #' @param pch Plotting character(s)
 #' @param lty Line type(s)
@@ -881,10 +883,9 @@ build_legend_env = function(
 #'   \code{\link[graphics]{legend}}.
 #' @param by_dep The (deparsed) "by" grouping variable name.
 #' @param lgnd_labs The labels passed to `legend(legend = ...)`.
-#' @param labeller Function, character keyword, or named vector for formatting
-#'   or relabelling the labels (`lgnd_labs`). See [`tinylabel`] for the
-#'   accepted forms.
-#'   Passed down to [`tinylabel`].
+#' @param labeller Function, character keyword, or dictionary (named vector or
+#'   list) for formatting or relabelling the labels (`lgnd_labs`). See
+#'   [`tinylabel`] for the accepted forms. Passed down to [`tinylabel`].
 #' @param type Plotting type(s), passed down from [tinyplot].
 #' @param pch Plotting character(s), passed down from [tinyplot].
 #' @param lty Plotting linetype(s), passed down from [tinyplot].
diff --git a/R/tinylabel.R b/R/tinylabel.R
index 5ca08b65..ce694ee2 100644
--- a/R/tinylabel.R
+++ b/R/tinylabel.R
@@ -13,15 +13,16 @@
 #'   for which common formatting transformations are provided: `"percent"`
 #'   (`"%"`), `"comma"` (`","`), `"log"` (`"l"`), `"dollar"` (`"$"`), `"euro"`
 #'   (`"€"`), or `"sterling"` (`"£"`).
-#'   - a *named* character vector or list, acting as a dictionary, e.g.
-#'   `c(setosa = "SET")`. Entries of `x` that match a name are replaced by the
-#'   corresponding value and the rest are left alone, so a partial mapping is
-#'   fine. The lookup is by value rather than by position, which means it is
-#'   unaffected by any reordering of the underlying categories.
+#'   - a dictionary, i.e. a *named* character vector or list of form
+#'   `c(old_lab = "new_lab", ...)`. Entries of `x` that match a name are
+#'   replaced by the corresponding value and the rest are left alone, so a
+#'   partial mapping is fine. The lookup is by value rather than by position,
+#'   which means it is unaffected by any reordering of the underlying
+#'   categories.
 #'
 #'   Note that an *unnamed* character vector of length greater than one is an
 #'   error, rather than a positional replacement of the labels. Such a vector
-#'   could not be told apart from a formatting keyword when `x` is of length
+#'   cannot be distinguished from a formatting keyword when `x` is of length
 #'   one, and would not follow the categories if they were reordered. Pass a
 #'   function if you want to compute the labels positionally, e.g.
 #'   `function(x) LETTERS[seq_along(x)]`.
diff --git a/R/tinyplot.R b/R/tinyplot.R
index 2e279ad1..81d94f11 100644
--- a/R/tinyplot.R
+++ b/R/tinyplot.R
@@ -89,8 +89,11 @@
 #'   `labeller = list(firm = toupper, yield = "%")`, with any variable left
 #'   unnamed not formatted. While not recommended, unnamed values are matched
 #'   positionally, according to the variable order in the `facet` formula
-#'   specification. Defaults to the value of `tpar("facet.labeller")`, which is
-#'   `NULL` (no formatting).
+#'   specification. Note that this per-variable naming claims the same slot that
+#'   a [`tinylabel`] dictionary would, so a dictionary has to be nested inside
+#'   it, e.g. `labeller = list(Species = c(setosa = "SET"))`; a bare named
+#'   vector is read as a per-variable mapping instead. Defaults to the value of
+#'   `tpar("facet.labeller")`, which is `NULL` (no formatting).
 #'   - `prefix` a logical or character value for prefixing the facet titles with
 #'   a descriptive name. Pass `TRUE` to prefix with the (deparsed) facet
 #'   variable name(s), e.g. `"am = 0"` instead of just `"0"`. Alternatively,
@@ -257,12 +260,12 @@
 #'   the break points at which the axis tick-marks are to be drawn. Break points
 #'   outside the range of the data will be ignored if the associated axis
 #'   variable is categorical, or an explicit `x/ylim` range is given.
-#' @param xaxl,yaxl a function, character keyword, or named vector for
-#'   formatting or (re)labelling the x- or y-axis tick labels. Passed to
-#'   [`tinylabel`]; see the latter's help file for more detailed documentation
-#'   and examples. Note that this is a post-processing step that affects the
-#'   _appearance_ of the tick labels only; use in conjunction with `x/yaxb` if
-#'   you would like to adjust the position of the tick marks too.
+#' @param xaxl,yaxl a function, character keyword, or dictionary (named vector
+#'   or list) for formatting or (re)labelling the x- or y-axis tick labels.
+#'   Passed to [`tinylabel`]; see the latter's help file for more detailed
+#'   documentation and examples. Note that this is a post-processing step that
+#'   affects the _appearance_ of the tick labels only; use in conjunction with
+#'   `x/yaxb` if you would like to adjust the position of the tick marks too.
 #' @param log a character string which contains `"x"` if the x axis is to be
 #'   logarithmic, `"y"` if the y axis is to be logarithmic and `"xy"` or `"yx"`
 #'   if both axes are to be logarithmic.
diff --git a/R/tpar.R b/R/tpar.R
index dc6884c2..a481d42f 100644
--- a/R/tpar.R
+++ b/R/tpar.R
@@ -67,7 +67,7 @@
 #' * `facet.cex`: Expansion factor for facet titles. Defaults to `1`.
 #' * `facet.col`: Character or integer specifying the facet text colour. If an integer, will correspond to the user's default global colour palette (see `palette`). Defaults to `NULL`, which is equivalent to "black".
 #' * `facet.font`: An integer corresponding to the desired font face for facet titles. For most font families and graphics devices, one of four possible values: `1` (regular), `2` (bold), `3` (italic), or `4` (bold italic). Defaults to `NULL`, which is equivalent to `1` (i.e., regular).
-#' * `facet.labeller`: A formatting function (or [`tinylabel`] convenience string, e.g. `"percent"`) applied to the facet titles, or a list of them (or a character vector of convenience strings), optionally named for the facet variables they apply to, for formatting each facet variable differently. Defaults to `NULL` (no formatting). Applied to the underlying facet values, i.e. before any `facet.prefix` name is added. Equivalent to setting `tinyplot(..., facet.args = list(labeller = X))`, but globally.
+#' * `facet.labeller`: A formatting function (or [`tinylabel`] convenience string, e.g. `"percent"`) applied to the facet titles, or a list of them (or a character vector of convenience strings), optionally named for the facet variables they apply to, for formatting each facet variable differently. Note that this per-variable naming claims the same slot that a [`tinylabel`] dictionary would, so a dictionary has to be nested inside it, e.g. `facet.labeller = list(Species = c(setosa = "SET"))`. Defaults to `NULL` (no formatting). Applied to the underlying facet values, i.e. before any `facet.prefix` name is added. Equivalent to setting `tinyplot(..., facet.args = list(labeller = X))`, but globally.
 #' * `facet.prefix`: Logical or character controlling whether facet titles are prefixed with their variable name, e.g. `"vs = 0"` rather than just `"0"`. `TRUE` uses the variable name(s), while a character string---or a vector or list of them, one element per facet variable, optionally named for the variables they apply to---supplies custom name(s) instead. Defaults to `NULL`, which is equivalent to `FALSE` (no prefix). Equivalent to setting `tinyplot(..., facet.args = list(prefix = X))`, but globally.
 #' * `facet.sep`: Character string separating the individual variables of a multi-variable facet title, e.g. `"\n"` to stack them on separate lines. Ignored for single-variable facets. Defaults to `NULL`, i.e. the `":"` that the variables were combined with, or `", "` if they are prefixed via `facet.prefix` (above). Equivalent to setting `tinyplot(..., facet.args = list(sep = X))`, but globally.
 #' * `file.height`: Numeric specifying the height (in inches) of any plot that is written to disk using the `tinyplot(..., file = X)` argument. Defaults to `7`.
diff --git a/R/type_text.R b/R/type_text.R
index 1e990859..96bc88bc 100644
--- a/R/type_text.R
+++ b/R/type_text.R
@@ -9,11 +9,11 @@
 #'   a top-level [`tinyplot`] argument, which additionally supports non-standard
 #'   evaluation against `data` and takes precedence if both are given. See
 #'   Examples.
-#' @param labeller A formatting function, convenience string, or named vector
-#'   passed to [`tinylabel`] for formatting or relabelling the `labels`. Useful
-#'   for ensuring that the text labels match the formatting of an axis, e.g.
-#'   `labeller = "%"` to display the labels as percentages. Default is `NULL`,
-#'   i.e. no formatting. See Examples.
+#' @param labeller A formatting function, convenience string, or dictionary
+#'   (named vector or list) passed to [`tinylabel`] for formatting or
+#'   relabelling the `labels`. Useful for ensuring that the text labels match
+#'   the formatting of an axis, e.g. `labeller = "%"` to display the labels as
+#'   percentages. Default is `NULL`, i.e. no formatting. See Examples.
 #' @param family The name of a font family. Default of `NULL` means that the
 #' family will be the same as the main plot text, following
 #' \code{\link[graphics]{par}}. Note that if a `family` argument is provided,
diff --git a/man/build_legend_args.Rd b/man/build_legend_args.Rd
index 4f093e7a..28492eee 100644
--- a/man/build_legend_args.Rd
+++ b/man/build_legend_args.Rd
@@ -32,8 +32,9 @@ build_legend_args(
 
 \item{lgnd_labs}{The legend labels}
 
-\item{labeller}{Function, character keyword, or named vector for formatting
-or relabelling the labels. See \code{\link{tinylabel}} for the accepted forms.}
+\item{labeller}{Function, character keyword, or dictionary (named vector or
+list) for formatting or relabelling the labels. See \code{\link{tinylabel}} for the
+accepted forms.}
 
 \item{type}{Plot type}
 
diff --git a/man/build_legend_env.Rd b/man/build_legend_env.Rd
index 69d9b0cf..62a162b3 100644
--- a/man/build_legend_env.Rd
+++ b/man/build_legend_env.Rd
@@ -36,8 +36,9 @@ build_legend_env(
 
 \item{lgnd_labs}{The legend labels}
 
-\item{labeller}{Function, character keyword, or named vector for formatting
-or relabelling the labels. See \code{\link{tinylabel}} for the accepted forms.}
+\item{labeller}{Function, character keyword, or dictionary (named vector or
+list) for formatting or relabelling the labels. See \code{\link{tinylabel}} for the
+accepted forms.}
 
 \item{type}{Plot type}
 
diff --git a/man/draw_legend.Rd b/man/draw_legend.Rd
index 145b5ed9..412ba7b5 100644
--- a/man/draw_legend.Rd
+++ b/man/draw_legend.Rd
@@ -39,10 +39,9 @@ draw_legend(
 
 \item{lgnd_labs}{The labels passed to \code{legend(legend = ...)}.}
 
-\item{labeller}{Function, character keyword, or named vector for formatting
-or relabelling the labels (\code{lgnd_labs}). See \code{\link{tinylabel}} for the
-accepted forms.
-Passed down to \code{\link{tinylabel}}.}
+\item{labeller}{Function, character keyword, or dictionary (named vector or
+list) for formatting or relabelling the labels (\code{lgnd_labs}). See
+\code{\link{tinylabel}} for the accepted forms. Passed down to \code{\link{tinylabel}}.}
 
 \item{type}{Plotting type(s), passed down from \link{tinyplot}.}
 
diff --git a/man/tinyAxis.Rd b/man/tinyAxis.Rd
index f5182168..baacbad0 100644
--- a/man/tinyAxis.Rd
+++ b/man/tinyAxis.Rd
@@ -29,16 +29,17 @@ package).
 for which common formatting transformations are provided: \code{"percent"}
 (\code{"\%"}), \code{"comma"} (\code{","}), \code{"log"} (\code{"l"}), \code{"dollar"} (\code{"$"}), \code{"euro"}
 (\code{"€"}), or \code{"sterling"} (\code{"£"}).
-\item a \emph{named} character vector or list, acting as a dictionary, e.g.
-\code{c(setosa = "SET")}. Entries of \code{x} that match a name are replaced by the
-corresponding value and the rest are left alone, so a partial mapping is
-fine. The lookup is by value rather than by position, which means it is
-unaffected by any reordering of the underlying categories.
+\item a dictionary, i.e. a \emph{named} character vector or list of form
+\code{c(old_lab = "new_lab", ...)}. Entries of \code{x} that match a name are
+replaced by the corresponding value and the rest are left alone, so a
+partial mapping is fine. The lookup is by value rather than by position,
+which means it is unaffected by any reordering of the underlying
+categories.
 }
 
 Note that an \emph{unnamed} character vector of length greater than one is an
 error, rather than a positional replacement of the labels. Such a vector
-could not be told apart from a formatting keyword when \code{x} is of length
+cannot be distinguished from a formatting keyword when \code{x} is of length
 one, and would not follow the categories if they were reordered. Pass a
 function if you want to compute the labels positionally, e.g.
 \code{function(x) LETTERS[seq_along(x)]}.}
diff --git a/man/tinylabel.Rd b/man/tinylabel.Rd
index 2997d05c..4ebbe088 100644
--- a/man/tinylabel.Rd
+++ b/man/tinylabel.Rd
@@ -18,16 +18,17 @@ package).
 for which common formatting transformations are provided: \code{"percent"}
 (\code{"\%"}), \code{"comma"} (\code{","}), \code{"log"} (\code{"l"}), \code{"dollar"} (\code{"$"}), \code{"euro"}
 (\code{"€"}), or \code{"sterling"} (\code{"£"}).
-\item a \emph{named} character vector or list, acting as a dictionary, e.g.
-\code{c(setosa = "SET")}. Entries of \code{x} that match a name are replaced by the
-corresponding value and the rest are left alone, so a partial mapping is
-fine. The lookup is by value rather than by position, which means it is
-unaffected by any reordering of the underlying categories.
+\item a dictionary, i.e. a \emph{named} character vector or list of form
+\code{c(old_lab = "new_lab", ...)}. Entries of \code{x} that match a name are
+replaced by the corresponding value and the rest are left alone, so a
+partial mapping is fine. The lookup is by value rather than by position,
+which means it is unaffected by any reordering of the underlying
+categories.
 }
 
 Note that an \emph{unnamed} character vector of length greater than one is an
 error, rather than a positional replacement of the labels. Such a vector
-could not be told apart from a formatting keyword when \code{x} is of length
+cannot be distinguished from a formatting keyword when \code{x} is of length
 one, and would not follow the categories if they were reordered. Pass a
 function if you want to compute the labels positionally, e.g.
 \code{function(x) LETTERS[seq_along(x)]}.}
diff --git a/man/tinyplot.Rd b/man/tinyplot.Rd
index ba643546..8b804b53 100644
--- a/man/tinyplot.Rd
+++ b/man/tinyplot.Rd
@@ -220,8 +220,11 @@ format each variable differently, e.g.
 \code{labeller = list(firm = toupper, yield = "\%")}, with any variable left
 unnamed not formatted. While not recommended, unnamed values are matched
 positionally, according to the variable order in the \code{facet} formula
-specification. Defaults to the value of \code{tpar("facet.labeller")}, which is
-\code{NULL} (no formatting).
+specification. Note that this per-variable naming claims the same slot that
+a \code{\link{tinylabel}} dictionary would, so a dictionary has to be nested inside
+it, e.g. \code{labeller = list(Species = c(setosa = "SET"))}; a bare named
+vector is read as a per-variable mapping instead. Defaults to the value of
+\code{tpar("facet.labeller")}, which is \code{NULL} (no formatting).
 \item \code{prefix} a logical or character value for prefixing the facet titles with
 a descriptive name. Pass \code{TRUE} to prefix with the (deparsed) facet
 variable name(s), e.g. \code{"am = 0"} instead of just \code{"0"}. Alternatively,
@@ -417,12 +420,12 @@ the break points at which the axis tick-marks are to be drawn. Break points
 outside the range of the data will be ignored if the associated axis
 variable is categorical, or an explicit \code{x/ylim} range is given.}
 
-\item{xaxl, yaxl}{a function, character keyword, or named vector for
-formatting or (re)labelling the x- or y-axis tick labels. Passed to
-\code{\link{tinylabel}}; see the latter's help file for more detailed documentation
-and examples. Note that this is a post-processing step that affects the
-\emph{appearance} of the tick labels only; use in conjunction with \code{x/yaxb} if
-you would like to adjust the position of the tick marks too.}
+\item{xaxl, yaxl}{a function, character keyword, or dictionary (named vector
+or list) for formatting or (re)labelling the x- or y-axis tick labels.
+Passed to \code{\link{tinylabel}}; see the latter's help file for more detailed
+documentation and examples. Note that this is a post-processing step that
+affects the \emph{appearance} of the tick labels only; use in conjunction with
+\code{x/yaxb} if you would like to adjust the position of the tick marks too.}
 
 \item{log}{a character string which contains \code{"x"} if the x axis is to be
 logarithmic, \code{"y"} if the y axis is to be logarithmic and \code{"xy"} or \code{"yx"}
diff --git a/man/tpar.Rd b/man/tpar.Rd
index 47ebd4a4..b4cc1866 100644
--- a/man/tpar.Rd
+++ b/man/tpar.Rd
@@ -78,7 +78,7 @@ you should rather use \code{par()} instead.
 \item \code{facet.cex}: Expansion factor for facet titles. Defaults to \code{1}.
 \item \code{facet.col}: Character or integer specifying the facet text colour. If an integer, will correspond to the user's default global colour palette (see \code{palette}). Defaults to \code{NULL}, which is equivalent to "black".
 \item \code{facet.font}: An integer corresponding to the desired font face for facet titles. For most font families and graphics devices, one of four possible values: \code{1} (regular), \code{2} (bold), \code{3} (italic), or \code{4} (bold italic). Defaults to \code{NULL}, which is equivalent to \code{1} (i.e., regular).
-\item \code{facet.labeller}: A formatting function (or \code{\link{tinylabel}} convenience string, e.g. \code{"percent"}) applied to the facet titles, or a list of them (or a character vector of convenience strings), optionally named for the facet variables they apply to, for formatting each facet variable differently. Defaults to \code{NULL} (no formatting). Applied to the underlying facet values, i.e. before any \code{facet.prefix} name is added. Equivalent to setting \code{tinyplot(..., facet.args = list(labeller = X))}, but globally.
+\item \code{facet.labeller}: A formatting function (or \code{\link{tinylabel}} convenience string, e.g. \code{"percent"}) applied to the facet titles, or a list of them (or a character vector of convenience strings), optionally named for the facet variables they apply to, for formatting each facet variable differently. Note that this per-variable naming claims the same slot that a \code{\link{tinylabel}} dictionary would, so a dictionary has to be nested inside it, e.g. \code{facet.labeller = list(Species = c(setosa = "SET"))}. Defaults to \code{NULL} (no formatting). Applied to the underlying facet values, i.e. before any \code{facet.prefix} name is added. Equivalent to setting \code{tinyplot(..., facet.args = list(labeller = X))}, but globally.
 \item \code{facet.prefix}: Logical or character controlling whether facet titles are prefixed with their variable name, e.g. \code{"vs = 0"} rather than just \code{"0"}. \code{TRUE} uses the variable name(s), while a character string---or a vector or list of them, one element per facet variable, optionally named for the variables they apply to---supplies custom name(s) instead. Defaults to \code{NULL}, which is equivalent to \code{FALSE} (no prefix). Equivalent to setting \code{tinyplot(..., facet.args = list(prefix = X))}, but globally.
 \item \code{facet.sep}: Character string separating the individual variables of a multi-variable facet title, e.g. \code{"\\n"} to stack them on separate lines. Ignored for single-variable facets. Defaults to \code{NULL}, i.e. the \code{":"} that the variables were combined with, or \code{", "} if they are prefixed via \code{facet.prefix} (above). Equivalent to setting \code{tinyplot(..., facet.args = list(sep = X))}, but globally.
 \item \code{file.height}: Numeric specifying the height (in inches) of any plot that is written to disk using the \code{tinyplot(..., file = X)} argument. Defaults to \code{7}.
diff --git a/man/type_text.Rd b/man/type_text.Rd
index b8705c81..0cfc1505 100644
--- a/man/type_text.Rd
+++ b/man/type_text.Rd
@@ -27,11 +27,11 @@ a top-level \code{\link{tinyplot}} argument, which additionally supports non-sta
 evaluation against \code{data} and takes precedence if both are given. See
 Examples.}
 
-\item{labeller}{A formatting function, convenience string, or named vector
-passed to \code{\link{tinylabel}} for formatting or relabelling the \code{labels}. Useful
-for ensuring that the text labels match the formatting of an axis, e.g.
-\code{labeller = "\%"} to display the labels as percentages. Default is \code{NULL},
-i.e. no formatting. See Examples.}
+\item{labeller}{A formatting function, convenience string, or dictionary
+(named vector or list) passed to \code{\link{tinylabel}} for formatting or
+relabelling the \code{labels}. Useful for ensuring that the text labels match
+the formatting of an axis, e.g. \code{labeller = "\%"} to display the labels as
+percentages. Default is \code{NULL}, i.e. no formatting. See Examples.}
 
 \item{adj}{one or two values in \eqn{[0, 1]} which specify the x
     (and optionally y) adjustment (\sQuote{justification}) of the

From 9514972fa9cd87d4404230d526886318f2148ab5 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 11:48:28 -0700
Subject: [PATCH 11/23] tests

---
 .../tinylabel_center_percent.svg              | 75 +++++++++++++++++++
 inst/tinytest/test-tinylabel.R                | 69 +++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 inst/tinytest/_tinysnapshot/tinylabel_center_percent.svg

diff --git a/inst/tinytest/_tinysnapshot/tinylabel_center_percent.svg b/inst/tinytest/_tinysnapshot/tinylabel_center_percent.svg
new file mode 100644
index 00000000..c6412636
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/tinylabel_center_percent.svg
@@ -0,0 +1,75 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<rect x='449.30' y='236.43' width='16.75' height='16.75' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='449.30' y='254.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #DF536B; fill: #FFE0E4;' />
+<text x='452.27' y='225.00' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>grp</text>
+<text x='468.47' y='248.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='28.69px' lengthAdjust='spacingAndGlyphs'>down</text>
+<text x='468.47' y='266.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>up</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHw0MzIuNDd8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='432.47' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw0MzIuNDd8MC4wMHw1MDQuMDA=)'>
+<text x='245.76' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>v</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>g</text>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='91.15' y1='430.56' x2='429.09' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='91.15' y1='430.56' x2='91.15' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='147.47' y1='430.56' x2='147.47' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='203.79' y1='430.56' x2='203.79' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='260.12' y1='430.56' x2='260.12' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='316.44' y1='430.56' x2='316.44' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='372.77' y1='430.56' x2='372.77' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='429.09' y1='430.56' x2='429.09' y2='437.76' style='stroke-width: 0.75;' />
+<text x='91.15' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='24.02px' lengthAdjust='spacingAndGlyphs'>60%</text>
+<text x='147.47' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='24.02px' lengthAdjust='spacingAndGlyphs'>40%</text>
+<text x='203.79' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='24.02px' lengthAdjust='spacingAndGlyphs'>20%</text>
+<text x='260.12' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>0%</text>
+<text x='316.44' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='24.02px' lengthAdjust='spacingAndGlyphs'>20%</text>
+<text x='372.77' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='24.02px' lengthAdjust='spacingAndGlyphs'>40%</text>
+<text x='429.09' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='24.02px' lengthAdjust='spacingAndGlyphs'>60%</text>
+<text transform='translate(41.76,338.62) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>a</text>
+<text transform='translate(41.76,150.98) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>b</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDMyLjQ3fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='373.43' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDMyLjQ3fDU5LjA0fDQzMC41Ng==)'>
+<rect x='147.47' y='260.44' width='112.65' height='156.36' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='62.98' y='72.80' width='197.14' height='156.36' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='260.12' y='260.44' width='168.97' height='156.36' style='stroke-width: 0.75; stroke: #DF536B; fill: #FFE0E4;' />
+<rect x='260.12' y='72.80' width='84.49' height='156.36' style='stroke-width: 0.75; stroke: #DF536B; fill: #FFE0E4;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/test-tinylabel.R b/inst/tinytest/test-tinylabel.R
index a20bd079..55aa101b 100644
--- a/inst/tinytest/test-tinylabel.R
+++ b/inst/tinytest/test-tinylabel.R
@@ -53,3 +53,72 @@ expect_equal(
 # coercion" warnings (#622).
 spp = c("Adelie", "Gentoo", "Chinstrap")
 expect_equal(tinylabel(spp, ","), spp)
+
+# `xaxl`/`yaxl` accept a dictionary mapping old labels to new ones. Unmatched
+# labels are left alone, the mapping is by value rather than position (so it
+# survives reordering), and a named list works as well as a named vector.
+expect_equal(tinylabel(c("a", "b", "c"), c(b = "Bee")), c("a", "Bee", "c"))
+expect_equal(tinylabel(c("c", "a", "b"), c(a = "A", b = "B", c = "C")), c("C", "A", "B"))
+expect_equal(tinylabel(c("a", "b"), list(a = "Alpha", b = "Beta")), c("Alpha", "Beta"))
+
+# names remove the keyword collision that a bare vector could never resolve
+expect_equal(tinylabel(c("log", "x"), c(log = "Log scale")), c("Log scale", "x"))
+
+# an unnamed multi-element vector is not positional replacement
+expect_error(tinylabel(c("a", "b"), c("X", "Y")), pattern = "single formatting keyword")
+
+# "abs_" must be stripped before a symbol keyword is resolved; a centered
+# barplot prepends it itself, which previously made `yaxl = ","` unusable there
+expect_equal(tinylabel(c(-1000, 2000), "abs_,"), c("1,000", "2,000"))
+expect_equal(tinylabel(c(-1000, 2000), "abs_comma"), c("1,000", "2,000"))
+
+
+#
+## symmetric breaks must not blow up the precision -----
+
+# A centered barplot's breaks are symmetric, so the "abs_" wrapper hands the
+# formatter genuine duplicates -- but abs(-0.4) * 100 and 0.4 * 100 differ in
+# their last bits, so unique() keeps both. consistent_decimals() was then asked
+# for a precision that prints two identical numbers distinctly, failed at every
+# candidate, and fell back to its 5-decimal maximum ("80.00000%" not "80%").
+# seq() rather than typed-out constants: literals are exact, so abs() maps them
+# onto bit-equal values that unique() collapses cleanly and the bug never fires.
+# Real axis breaks are computed, and carry the noise that defeats unique(). The
+# guard below asserts that condition holds, so this cannot quietly go vacuous.
+brks = seq(-0.8, 0.8, by = 0.2)
+expect_true(
+  length(unique(abs(brks) * 100)) > length(unique(round(abs(brks) * 100, 5)))
+)
+expect_equal(
+  tinylabel(brks, "abs_percent"),
+  c("80%", "60%", "40%", "20%", "0%", "20%", "40%", "60%", "80%")
+)
+
+# ...while precision still adapts where the values genuinely need it
+expect_equal(tinylabel(c(0.00011, 0.00012), "percent"), c("0.011%", "0.012%"))
+
+# The deduplication runs at max_decimals rather than at a fixed number of
+# significant digits: significance is relative while max_decimals is absolute,
+# so any signif() threshold merges values still distinguishable at the 5th
+# decimal once they grow large enough. This case fails under signif(., 6),
+# (., 8) and (., 12) alike.
+expect_equal(
+  tinylabel(c(10000000.00001, 10000000.00002), "comma"),
+  c("10,000,000.00001", "10,000,000.00002")
+)
+
+# ...and end to end, since the axis is where it surfaced: a centered stacked
+# barplot is the simplest thing that produces breaks symmetric about zero
+props = data.frame(
+  g   = factor(rep(c("a", "b"), each = 2)),
+  grp = factor(rep(c("up", "down"), 2)),
+  v   = c(0.6, 0.4, 0.3, 0.7)
+)
+f = function() {
+  tinyplot(
+    v ~ g | grp, data = props,
+    type = type_barplot(center = TRUE), yaxl = "percent",
+    flip = TRUE
+  )
+}
+expect_snapshot_plot(f, label = "tinylabel_center_percent")

From f888ac1e1fc78cfdb4dcc8cdb47dec768792d899 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 16:42:34 -0700
Subject: [PATCH 12/23] fix numeric->factor layering (#691)

---
 R/align_layer.R                               |  19 ++-
 .../tinyplot_add_numeric_x_barplot.svg        |  71 ++++++++++
 .../tinyplot_add_numeric_x_violin.svg         | 122 ++++++++++++++++++
 3 files changed, 210 insertions(+), 2 deletions(-)
 create mode 100644 inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_barplot.svg
 create mode 100644 inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_violin.svg

diff --git a/R/align_layer.R b/R/align_layer.R
index cc52d69d..c9cd4a76 100644
--- a/R/align_layer.R
+++ b/R/align_layer.R
@@ -22,8 +22,23 @@ align_layer = function(settings) {
   
   # Only adjust if original layer has named xlabs
   if (!is.null(names(xlabs_orig))) {
-    if (is.factor(settings$datapoints[["x"]])) {
-      # Case 1: relevel a factor (e.g., ribbon added to errorbars)
+    # The atomic branch of this condition covers a base layer that coerced a
+    # numeric/character x to a factor itself (bars, ridges): its categories are
+    # the *labels*, while the added layer still carries the raw values. Those
+    # values are releveled below just like a factor would be, and the resulting
+    # integer codes are the positions the base layer drew at.
+    #
+    # Both extra tests are load-bearing. Requiring the layer to have no named
+    # xlabs of its own leaves Case 2 owning layers that already converted --
+    # otherwise a base whose categories are literally "1", "2", "3" would have
+    # the layer's integer *positions* misread as labels. Requiring every value
+    # to match leaves a partial overlap alone, rather than silently turning the
+    # unmatched rows into NA and dropping them from the plot.
+    if (is.factor(settings$datapoints[["x"]]) ||
+        (is.null(names(xlabs_layer)) &&
+         all(as.character(settings$datapoints[["x"]]) %in% names(xlabs_orig)))) {
+      # Case 1: relevel a factor (e.g., ribbon added to errorbars), or an
+      # atomic x whose values name the original layer's categories
       settings$datapoints[["x"]] = tryCatch(
         factor(settings$datapoints[["x"]], levels = names(xlabs_orig)),
         error = function(e) {
diff --git a/inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_barplot.svg b/inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_barplot.svg
new file mode 100644
index 00000000..f3d930ea
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_barplot.svg
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.23px' lengthAdjust='spacingAndGlyphs'>Time</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='43.36px' lengthAdjust='spacingAndGlyphs'>demand</text>
+<text x='101.83' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>1</text>
+<text x='167.66' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text x='233.49' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='299.31' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='365.14' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text x='430.97' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>7</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='62.65' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='338.58' x2='51.84' y2='338.58' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='246.60' x2='51.84' y2='246.60' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='154.62' x2='51.84' y2='154.62' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='62.65' x2='51.84' y2='62.65' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,338.58) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text transform='translate(41.76,246.60) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,154.62) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>15</text>
+<text transform='translate(41.76,62.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='277.88' width='54.86' height='152.68' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='140.23' y='241.08' width='54.86' height='189.48' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='206.06' y='81.04' width='54.86' height='349.52' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='271.89' y='136.23' width='54.86' height='294.33' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='337.71' y='143.59' width='54.86' height='286.97' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='403.54' y='66.32' width='54.86' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='101.83' y='270.68' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>8.3</text>
+<text x='167.66' y='233.88' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.34px' lengthAdjust='spacingAndGlyphs'>10.3</text>
+<text x='233.49' y='73.84' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>19</text>
+<text x='299.31' y='129.03' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>16</text>
+<text x='365.14' y='136.39' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.34px' lengthAdjust='spacingAndGlyphs'>15.6</text>
+<text x='430.97' y='59.12' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.34px' lengthAdjust='spacingAndGlyphs'>19.8</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_violin.svg b/inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_violin.svg
new file mode 100644
index 00000000..6fda13b3
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/tinyplot_add_numeric_x_violin.svg
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.02px' lengthAdjust='spacingAndGlyphs'>dose</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.02px' lengthAdjust='spacingAndGlyphs'>len</text>
+<line x1='133.99' y1='430.56' x2='398.81' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='133.99' y1='430.56' x2='133.99' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='266.40' y1='430.56' x2='266.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='398.81' y1='430.56' x2='398.81' y2='437.76' style='stroke-width: 0.75;' />
+<text x='133.99' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.5</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>1</text>
+<text x='398.81' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<line x1='59.04' y1='404.85' x2='59.04' y2='68.79' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='404.85' x2='51.84' y2='404.85' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='320.83' x2='51.84' y2='320.83' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='236.82' x2='51.84' y2='236.82' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='152.81' x2='51.84' y2='152.81' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='68.79' x2='51.84' y2='68.79' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,404.85) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,320.83) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,236.82) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text transform='translate(41.76,152.81) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>30</text>
+<text transform='translate(41.76,68.79) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='134.08,416.80 134.09,416.33 134.10,415.86 134.11,415.39 134.12,414.92 134.13,414.45 134.14,413.98 134.16,413.51 134.17,413.05 134.19,412.58 134.21,412.11 134.23,411.64 134.25,411.17 134.27,410.70 134.30,410.23 134.33,409.76 134.35,409.29 134.38,408.82 134.42,408.35 134.45,407.88 134.49,407.41 134.53,406.94 134.57,406.47 134.62,406.01 134.67,405.54 134.72,405.07 134.78,404.60 134.84,404.13 134.90,403.66 134.97,403.19 135.04,402.72 135.11,402.25 135.19,401.78 135.28,401.31 135.37,400.84 135.46,400.37 135.56,399.90 135.67,399.44 135.78,398.97 135.89,398.50 136.02,398.03 136.15,397.56 136.28,397.09 136.42,396.62 136.57,396.15 136.73,395.68 136.89,395.21 137.07,394.74 137.25,394.27 137.43,393.80 137.63,393.33 137.83,392.86 138.04,392.40 138.27,391.93 138.50,391.46 138.73,390.99 138.98,390.52 139.24,390.05 139.50,389.58 139.78,389.11 140.07,388.64 140.36,388.17 140.67,387.70 140.98,387.23 141.31,386.76 141.65,386.29 141.99,385.82 142.34,385.36 142.71,384.89 143.09,384.42 143.47,383.95 143.87,383.48 144.27,383.01 144.69,382.54 145.11,382.07 145.54,381.60 145.99,381.13 146.44,380.66 146.90,380.19 147.37,379.72 147.85,379.25 148.34,378.78 148.84,378.32 149.34,377.85 149.85,377.38 150.37,376.91 150.89,376.44 151.42,375.97 151.96,375.50 152.51,375.03 153.06,374.56 153.61,374.09 154.17,373.62 154.74,373.15 155.31,372.68 155.88,372.21 156.45,371.75 157.03,371.28 157.61,370.81 158.19,370.34 158.78,369.87 159.36,369.40 159.94,368.93 160.53,368.46 161.11,367.99 161.70,367.52 162.28,367.05 162.86,366.58 163.44,366.11 164.02,365.64 164.59,365.17 165.16,364.71 165.73,364.24 166.29,363.77 166.85,363.30 167.40,362.83 167.95,362.36 168.49,361.89 169.03,361.42 169.56,360.95 170.09,360.48 170.61,360.01 171.12,359.54 171.63,359.07 172.13,358.60 172.62,358.13 173.11,357.67 173.59,357.20 174.06,356.73 174.52,356.26 174.98,355.79 175.44,355.32 175.88,354.85 176.32,354.38 176.75,353.91 177.17,353.44 177.59,352.97 178.00,352.50 178.40,352.03 178.80,351.56 179.20,351.09 179.58,350.63 179.97,350.16 180.34,349.69 180.71,349.22 181.08,348.75 181.44,348.28 181.80,347.81 182.15,347.34 182.50,346.87 182.85,346.40 183.19,345.93 183.53,345.46 183.86,344.99 184.19,344.52 184.52,344.06 184.85,343.59 185.17,343.12 185.49,342.65 185.81,342.18 186.13,341.71 186.44,341.24 186.75,340.77 187.06,340.30 187.37,339.83 187.67,339.36 187.97,338.89 188.27,338.42 188.56,337.95 188.85,337.48 189.14,337.02 189.42,336.55 189.70,336.08 189.97,335.61 190.24,335.14 190.50,334.67 190.75,334.20 191.00,333.73 191.24,333.26 191.47,332.79 191.69,332.32 191.91,331.85 192.11,331.38 192.31,330.91 192.49,330.44 192.66,329.98 192.82,329.51 192.96,329.04 193.09,328.57 193.21,328.10 193.31,327.63 193.40,327.16 193.47,326.69 193.52,326.22 193.56,325.75 193.57,325.28 193.57,324.81 193.55,324.34 193.51,323.87 193.44,323.40 193.37,322.94 193.26,322.47 193.14,322.00 192.99,321.53 192.82,321.06 192.63,320.59 192.43,320.12 192.19,319.65 191.93,319.18 191.66,318.71 191.35,318.24 191.03,317.77 190.69,317.30 190.33,316.83 189.94,316.37 189.54,315.90 189.11,315.43 188.66,314.96 188.20,314.49 187.71,314.02 187.22,313.55 186.70,313.08 186.16,312.61 185.62,312.14 185.05,311.67 184.48,311.20 183.89,310.73 183.29,310.26 182.67,309.79 182.05,309.33 181.42,308.86 180.79,308.39 180.14,307.92 179.49,307.45 178.84,306.98 178.19,306.51 177.53,306.04 176.87,305.57 176.21,305.10 175.56,304.63 174.90,304.16 174.25,303.69 173.61,303.22 172.97,302.75 172.33,302.29 171.71,301.82 171.09,301.35 170.48,300.88 169.89,300.41 169.30,299.94 168.73,299.47 168.17,299.00 167.62,298.53 167.08,298.06 166.57,297.59 166.06,297.12 165.57,296.65 165.10,296.18 164.64,295.71 164.20,295.25 163.78,294.78 163.37,294.31 162.98,293.84 162.60,293.37 162.24,292.90 161.91,292.43 161.59,291.96 161.28,291.49 160.99,291.02 160.72,290.55 160.46,290.08 160.22,289.61 159.99,289.14 159.78,288.68 159.59,288.21 159.40,287.74 159.23,287.27 159.08,286.80 158.93,286.33 158.80,285.86 158.68,285.39 158.57,284.92 158.47,284.45 158.38,283.98 158.29,283.51 158.22,283.04 158.15,282.57 158.09,282.10 158.03,281.64 157.98,281.17 157.94,280.70 157.90,280.23 157.86,279.76 157.82,279.29 157.78,278.82 157.75,278.35 157.72,277.88 157.68,277.41 157.65,276.94 157.61,276.47 157.58,276.00 157.54,275.53 157.49,275.06 157.45,274.60 157.40,274.13 157.34,273.66 157.29,273.19 157.22,272.72 157.16,272.25 157.08,271.78 157.00,271.31 156.92,270.84 156.82,270.37 156.73,269.90 156.62,269.43 156.51,268.96 156.39,268.49 156.27,268.02 156.14,267.56 156.00,267.09 155.85,266.62 155.70,266.15 155.54,265.68 155.37,265.21 155.20,264.74 155.02,264.27 154.83,263.80 154.64,263.33 154.44,262.86 154.24,262.39 154.03,261.92 153.81,261.45 153.59,260.99 153.37,260.52 153.14,260.05 152.90,259.58 152.67,259.11 152.43,258.64 152.18,258.17 151.94,257.70 151.69,257.23 151.43,256.76 151.18,256.29 150.93,255.82 150.67,255.35 150.42,254.88 150.16,254.41 149.90,253.95 149.65,253.48 149.39,253.01 149.14,252.54 148.89,252.07 148.64,251.60 148.39,251.13 148.15,250.66 147.91,250.19 147.67,249.72 147.44,249.25 147.21,248.78 146.98,248.31 146.76,247.84 146.54,247.37 146.33,246.91 146.12,246.44 145.93,245.97 145.73,245.50 145.54,245.03 145.36,244.56 145.18,244.09 145.01,243.62 144.84,243.15 144.68,242.68 144.53,242.21 144.38,241.74 144.24,241.27 144.10,240.80 143.97,240.33 143.85,239.87 143.73,239.40 143.62,238.93 143.51,238.46 143.41,237.99 143.31,237.52 143.22,237.05 143.13,236.58 143.05,236.11 142.97,235.64 142.89,235.17 142.82,234.70 142.75,234.23 142.69,233.76 142.62,233.30 142.56,232.83 142.51,232.36 142.45,231.89 142.40,231.42 142.34,230.95 142.29,230.48 142.24,230.01 142.19,229.54 142.14,229.07 142.09,228.60 142.03,228.13 141.98,227.66 141.93,227.19 141.87,226.72 141.82,226.26 141.76,225.79 141.70,225.32 141.64,224.85 141.58,224.38 141.51,223.91 141.45,223.44 141.38,222.97 141.30,222.50 141.23,222.03 141.15,221.56 141.07,221.09 140.98,220.62 140.90,220.15 140.81,219.68 140.72,219.22 140.62,218.75 140.52,218.28 140.42,217.81 140.32,217.34 140.21,216.87 140.10,216.40 139.99,215.93 139.88,215.46 139.77,214.99 139.65,214.52 139.53,214.05 139.41,213.58 139.29,213.11 139.17,212.64 139.04,212.18 138.92,211.71 138.80,211.24 138.67,210.77 138.54,210.30 138.42,209.83 138.29,209.36 138.17,208.89 138.04,208.42 137.91,207.95 137.79,207.48 137.67,207.01 137.54,206.54 137.42,206.07 137.30,205.61 137.19,205.14 137.07,204.67 136.95,204.20 136.84,203.73 136.73,203.26 136.62,202.79 136.51,202.32 136.41,201.85 136.31,201.38 136.21,200.91 136.11,200.44 136.01,199.97 135.92,199.50 135.83,199.03 135.74,198.57 135.66,198.10 135.58,197.63 135.50,197.16 135.42,196.69 135.35,196.22 135.28,195.75 135.21,195.28 135.14,194.81 135.08,194.34 135.02,193.87 134.96,193.40 134.91,192.93 134.85,192.46 134.80,191.99 134.75,191.53 134.71,191.06 134.66,190.59 134.62,190.12 134.58,189.65 134.54,189.18 134.51,188.71 134.47,188.24 134.44,187.77 134.41,187.30 134.38,186.83 134.35,186.36 134.33,185.89 134.30,185.42 134.28,184.95 134.26,184.49 134.24,184.02 134.22,183.55 134.20,183.08 134.19,182.61 134.17,182.14 134.16,181.67 134.14,181.20 134.13,180.73 134.12,180.26 134.11,179.79 134.10,179.32 134.09,178.85 134.08,178.38 134.07,177.92 134.07,177.45 134.06,176.98 133.91,176.98 133.91,177.45 133.90,177.92 133.89,178.38 133.88,178.85 133.87,179.32 133.86,179.79 133.85,180.26 133.84,180.73 133.83,181.20 133.81,181.67 133.80,182.14 133.78,182.61 133.77,183.08 133.75,183.55 133.73,184.02 133.71,184.49 133.69,184.95 133.67,185.42 133.64,185.89 133.62,186.36 133.59,186.83 133.56,187.30 133.53,187.77 133.50,188.24 133.47,188.71 133.43,189.18 133.39,189.65 133.35,190.12 133.31,190.59 133.27,191.06 133.22,191.53 133.17,191.99 133.12,192.46 133.07,192.93 133.01,193.40 132.95,193.87 132.89,194.34 132.83,194.81 132.76,195.28 132.69,195.75 132.62,196.22 132.55,196.69 132.47,197.16 132.39,197.63 132.31,198.10 132.23,198.57 132.14,199.03 132.05,199.50 131.96,199.97 131.86,200.44 131.77,200.91 131.67,201.38 131.56,201.85 131.46,202.32 131.35,202.79 131.24,203.26 131.13,203.73 131.02,204.20 130.90,204.67 130.79,205.14 130.67,205.61 130.55,206.07 130.43,206.54 130.31,207.01 130.18,207.48 130.06,207.95 129.93,208.42 129.81,208.89 129.68,209.36 129.55,209.83 129.43,210.30 129.30,210.77 129.18,211.24 129.05,211.71 128.93,212.18 128.80,212.64 128.68,213.11 128.56,213.58 128.44,214.05 128.32,214.52 128.21,214.99 128.09,215.46 127.98,215.93 127.87,216.40 127.76,216.87 127.65,217.34 127.55,217.81 127.45,218.28 127.35,218.75 127.26,219.22 127.17,219.68 127.08,220.15 126.99,220.62 126.90,221.09 126.82,221.56 126.74,222.03 126.67,222.50 126.60,222.97 126.53,223.44 126.46,223.91 126.39,224.38 126.33,224.85 126.27,225.32 126.21,225.79 126.15,226.26 126.10,226.72 126.04,227.19 125.99,227.66 125.94,228.13 125.89,228.60 125.84,229.07 125.78,229.54 125.73,230.01 125.68,230.48 125.63,230.95 125.58,231.42 125.52,231.89 125.47,232.36 125.41,232.83 125.35,233.30 125.29,233.76 125.22,234.23 125.15,234.70 125.08,235.17 125.01,235.64 124.93,236.11 124.84,236.58 124.76,237.05 124.66,237.52 124.57,237.99 124.46,238.46 124.36,238.93 124.24,239.40 124.12,239.87 124.00,240.33 123.87,240.80 123.74,241.27 123.59,241.74 123.45,242.21 123.29,242.68 123.13,243.15 122.97,243.62 122.79,244.09 122.62,244.56 122.43,245.03 122.24,245.50 122.05,245.97 121.85,246.44 121.64,246.91 121.43,247.37 121.21,247.84 120.99,248.31 120.77,248.78 120.54,249.25 120.30,249.72 120.06,250.19 119.82,250.66 119.58,251.13 119.33,251.60 119.08,252.07 118.83,252.54 118.58,253.01 118.32,253.48 118.07,253.95 117.81,254.41 117.56,254.88 117.30,255.35 117.05,255.82 116.79,256.29 116.54,256.76 116.29,257.23 116.04,257.70 115.79,258.17 115.55,258.64 115.30,259.11 115.07,259.58 114.83,260.05 114.60,260.52 114.38,260.99 114.16,261.45 113.94,261.92 113.73,262.39 113.53,262.86 113.33,263.33 113.14,263.80 112.95,264.27 112.77,264.74 112.60,265.21 112.43,265.68 112.27,266.15 112.12,266.62 111.97,267.09 111.84,267.56 111.70,268.02 111.58,268.49 111.46,268.96 111.35,269.43 111.24,269.90 111.15,270.37 111.05,270.84 110.97,271.31 110.89,271.78 110.82,272.25 110.75,272.72 110.69,273.19 110.63,273.66 110.57,274.13 110.53,274.60 110.48,275.06 110.44,275.53 110.40,276.00 110.36,276.47 110.32,276.94 110.29,277.41 110.26,277.88 110.22,278.35 110.19,278.82 110.15,279.29 110.12,279.76 110.08,280.23 110.03,280.70 109.99,281.17 109.94,281.64 109.88,282.10 109.82,282.57 109.75,283.04 109.68,283.51 109.59,283.98 109.50,284.45 109.40,284.92 109.29,285.39 109.17,285.86 109.04,286.33 108.89,286.80 108.74,287.27 108.57,287.74 108.39,288.21 108.19,288.68 107.98,289.14 107.75,289.61 107.52,290.08 107.26,290.55 106.98,291.02 106.70,291.49 106.39,291.96 106.07,292.43 105.73,292.90 105.37,293.37 105.00,293.84 104.61,294.31 104.20,294.78 103.77,295.25 103.33,295.71 102.87,296.18 102.40,296.65 101.91,297.12 101.41,297.59 100.89,298.06 100.35,298.53 99.81,299.00 99.25,299.47 98.67,299.94 98.08,300.41 97.49,300.88 96.88,301.35 96.26,301.82 95.64,302.29 95.01,302.75 94.37,303.22 93.72,303.69 93.07,304.16 92.42,304.63 91.76,305.10 91.10,305.57 90.44,306.04 89.79,306.51 89.13,306.98 88.48,307.45 87.83,307.92 87.19,308.39 86.55,308.86 85.92,309.33 85.30,309.79 84.69,310.26 84.08,310.73 83.50,311.20 82.92,311.67 82.36,312.14 81.81,312.61 81.27,313.08 80.76,313.55 80.26,314.02 79.77,314.49 79.31,314.96 78.86,315.43 78.43,315.90 78.03,316.37 77.65,316.83 77.28,317.30 76.94,317.77 76.62,318.24 76.31,318.71 76.04,319.18 75.78,319.65 75.55,320.12 75.34,320.59 75.15,321.06 74.98,321.53 74.84,322.00 74.71,322.47 74.61,322.94 74.53,323.40 74.46,323.87 74.42,324.34 74.40,324.81 74.40,325.28 74.42,325.75 74.45,326.22 74.50,326.69 74.57,327.16 74.66,327.63 74.76,328.10 74.88,328.57 75.01,329.04 75.15,329.51 75.31,329.98 75.49,330.44 75.67,330.91 75.86,331.38 76.07,331.85 76.28,332.32 76.50,332.79 76.73,333.26 76.97,333.73 77.22,334.20 77.48,334.67 77.74,335.14 78.00,335.61 78.28,336.08 78.55,336.55 78.83,337.02 79.12,337.48 79.41,337.95 79.70,338.42 80.00,338.89 80.30,339.36 80.60,339.83 80.91,340.30 81.22,340.77 81.53,341.24 81.84,341.71 82.16,342.18 82.48,342.65 82.80,343.12 83.12,343.59 83.45,344.06 83.78,344.52 84.11,344.99 84.45,345.46 84.78,345.93 85.13,346.40 85.47,346.87 85.82,347.34 86.17,347.81 86.53,348.28 86.89,348.75 87.26,349.22 87.63,349.69 88.01,350.16 88.39,350.63 88.78,351.09 89.17,351.56 89.57,352.03 89.97,352.50 90.38,352.97 90.80,353.44 91.22,353.91 91.66,354.38 92.09,354.85 92.54,355.32 92.99,355.79 93.45,356.26 93.91,356.73 94.39,357.20 94.87,357.67 95.35,358.13 95.85,358.60 96.35,359.07 96.85,359.54 97.37,360.01 97.89,360.48 98.41,360.95 98.94,361.42 99.48,361.89 100.02,362.36 100.57,362.83 101.13,363.30 101.68,363.77 102.25,364.24 102.81,364.71 103.38,365.17 103.96,365.64 104.53,366.11 105.11,366.58 105.69,367.05 106.27,367.52 106.86,367.99 107.44,368.46 108.03,368.93 108.61,369.40 109.20,369.87 109.78,370.34 110.36,370.81 110.94,371.28 111.52,371.75 112.09,372.21 112.67,372.68 113.24,373.15 113.80,373.62 114.36,374.09 114.92,374.56 115.46,375.03 116.01,375.50 116.55,375.97 117.08,376.44 117.60,376.91 118.12,377.38 118.63,377.85 119.14,378.32 119.63,378.78 120.12,379.25 120.60,379.72 121.07,380.19 121.53,380.66 121.98,381.13 122.43,381.60 122.86,382.07 123.29,382.54 123.70,383.01 124.11,383.48 124.50,383.95 124.89,384.42 125.26,384.89 125.63,385.36 125.98,385.82 126.33,386.29 126.66,386.76 126.99,387.23 127.30,387.70 127.61,388.17 127.90,388.64 128.19,389.11 128.47,389.58 128.73,390.05 128.99,390.52 129.24,390.99 129.48,391.46 129.71,391.93 129.93,392.40 130.14,392.86 130.34,393.33 130.54,393.80 130.73,394.27 130.91,394.74 131.08,395.21 131.24,395.68 131.40,396.15 131.55,396.62 131.69,397.09 131.83,397.56 131.96,398.03 132.08,398.50 132.20,398.97 132.31,399.44 132.41,399.90 132.51,400.37 132.60,400.84 132.69,401.31 132.78,401.78 132.86,402.25 132.93,402.72 133.01,403.19 133.07,403.66 133.14,404.13 133.20,404.60 133.25,405.07 133.30,405.54 133.35,406.01 133.40,406.47 133.44,406.94 133.48,407.41 133.52,407.88 133.55,408.35 133.59,408.82 133.62,409.29 133.65,409.76 133.67,410.23 133.70,410.70 133.72,411.17 133.74,411.64 133.76,412.11 133.78,412.58 133.80,413.05 133.81,413.51 133.83,413.98 133.84,414.45 133.85,414.92 133.87,415.39 133.88,415.86 133.89,416.33 133.89,416.80 ' style='stroke-width: 0.75; fill: #D3D3D3; fill-opacity: 0.20;' />
+<polygon points='266.53,337.83 266.54,337.42 266.55,337.01 266.56,336.60 266.58,336.19 266.59,335.78 266.61,335.37 266.62,334.96 266.64,334.55 266.66,334.14 266.68,333.73 266.71,333.32 266.73,332.91 266.76,332.50 266.78,332.09 266.81,331.68 266.84,331.27 266.88,330.86 266.91,330.45 266.95,330.03 266.99,329.62 267.03,329.21 267.08,328.80 267.13,328.39 267.18,327.98 267.24,327.57 267.30,327.16 267.36,326.75 267.42,326.34 267.49,325.93 267.57,325.52 267.64,325.11 267.73,324.70 267.81,324.29 267.90,323.88 268.00,323.47 268.10,323.06 268.21,322.65 268.32,322.24 268.44,321.83 268.56,321.42 268.69,321.01 268.83,320.60 268.97,320.19 269.12,319.78 269.28,319.37 269.45,318.96 269.62,318.55 269.80,318.14 269.99,317.73 270.18,317.32 270.39,316.91 270.60,316.50 270.82,316.09 271.06,315.68 271.30,315.27 271.54,314.86 271.81,314.45 272.07,314.04 272.36,313.63 272.65,313.22 272.94,312.81 273.26,312.40 273.58,311.99 273.91,311.58 274.26,311.17 274.61,310.76 274.98,310.35 275.36,309.94 275.74,309.53 276.15,309.12 276.56,308.71 276.98,308.30 277.42,307.89 277.86,307.48 278.32,307.07 278.80,306.66 279.27,306.25 279.77,305.84 280.28,305.43 280.79,305.02 281.32,304.61 281.86,304.20 282.41,303.79 282.97,303.38 283.54,302.97 284.13,302.56 284.72,302.15 285.32,301.74 285.94,301.33 286.56,300.92 287.19,300.51 287.83,300.10 288.48,299.69 289.14,299.27 289.80,298.86 290.47,298.45 291.15,298.04 291.84,297.63 292.53,297.22 293.23,296.81 293.93,296.40 294.64,295.99 295.35,295.58 296.06,295.17 296.78,294.76 297.50,294.35 298.23,293.94 298.95,293.53 299.67,293.12 300.40,292.71 301.13,292.30 301.85,291.89 302.57,291.48 303.29,291.07 304.01,290.66 304.73,290.25 305.44,289.84 306.14,289.43 306.85,289.02 307.54,288.61 308.23,288.20 308.92,287.79 309.59,287.38 310.26,286.97 310.92,286.56 311.57,286.15 312.21,285.74 312.84,285.33 313.46,284.92 314.07,284.51 314.67,284.10 315.26,283.69 315.83,283.28 316.39,282.87 316.94,282.46 317.47,282.05 317.99,281.64 318.50,281.23 318.99,280.82 319.46,280.41 319.92,280.00 320.36,279.59 320.79,279.18 321.20,278.77 321.60,278.36 321.98,277.95 322.34,277.54 322.68,277.13 323.01,276.72 323.32,276.31 323.61,275.90 323.89,275.49 324.15,275.08 324.39,274.67 324.61,274.26 324.82,273.85 325.01,273.44 325.18,273.03 325.34,272.62 325.48,272.21 325.59,271.80 325.70,271.39 325.79,270.98 325.86,270.57 325.92,270.16 325.95,269.75 325.98,269.34 325.99,268.92 325.98,268.51 325.96,268.10 325.92,267.69 325.87,267.28 325.81,266.87 325.73,266.46 325.64,266.05 325.54,265.64 325.42,265.23 325.29,264.82 325.15,264.41 325.00,264.00 324.84,263.59 324.67,263.18 324.49,262.77 324.30,262.36 324.10,261.95 323.89,261.54 323.67,261.13 323.45,260.72 323.22,260.31 322.98,259.90 322.74,259.49 322.49,259.08 322.23,258.67 321.97,258.26 321.70,257.85 321.43,257.44 321.16,257.03 320.88,256.62 320.60,256.21 320.32,255.80 320.03,255.39 319.74,254.98 319.45,254.57 319.16,254.16 318.87,253.75 318.58,253.34 318.29,252.93 318.00,252.52 317.71,252.11 317.41,251.70 317.12,251.29 316.84,250.88 316.55,250.47 316.26,250.06 315.98,249.65 315.70,249.24 315.42,248.83 315.14,248.42 314.87,248.01 314.60,247.60 314.33,247.19 314.06,246.78 313.80,246.37 313.54,245.96 313.29,245.55 313.03,245.14 312.79,244.73 312.54,244.32 312.30,243.91 312.07,243.50 311.84,243.09 311.61,242.68 311.39,242.27 311.16,241.86 310.95,241.45 310.74,241.04 310.53,240.63 310.33,240.22 310.13,239.81 309.94,239.40 309.75,238.99 309.57,238.57 309.39,238.16 309.21,237.75 309.04,237.34 308.87,236.93 308.71,236.52 308.55,236.11 308.40,235.70 308.25,235.29 308.10,234.88 307.96,234.47 307.83,234.06 307.70,233.65 307.57,233.24 307.45,232.83 307.33,232.42 307.21,232.01 307.10,231.60 307.00,231.19 306.90,230.78 306.80,230.37 306.71,229.96 306.62,229.55 306.54,229.14 306.45,228.73 306.38,228.32 306.31,227.91 306.24,227.50 306.17,227.09 306.11,226.68 306.06,226.27 306.00,225.86 305.95,225.45 305.91,225.04 305.87,224.63 305.83,224.22 305.79,223.81 305.76,223.40 305.73,222.99 305.71,222.58 305.69,222.17 305.67,221.76 305.65,221.35 305.64,220.94 305.63,220.53 305.62,220.12 305.62,219.71 305.62,219.30 305.62,218.89 305.62,218.48 305.62,218.07 305.63,217.66 305.64,217.25 305.65,216.84 305.66,216.43 305.68,216.02 305.69,215.61 305.71,215.20 305.72,214.79 305.74,214.38 305.76,213.97 305.78,213.56 305.80,213.15 305.82,212.74 305.85,212.33 305.87,211.92 305.89,211.51 305.91,211.10 305.94,210.69 305.96,210.28 305.98,209.87 306.00,209.46 306.02,209.05 306.04,208.64 306.06,208.23 306.08,207.81 306.09,207.40 306.11,206.99 306.12,206.58 306.14,206.17 306.15,205.76 306.16,205.35 306.16,204.94 306.17,204.53 306.17,204.12 306.17,203.71 306.17,203.30 306.16,202.89 306.16,202.48 306.15,202.07 306.13,201.66 306.12,201.25 306.09,200.84 306.07,200.43 306.04,200.02 306.01,199.61 305.97,199.20 305.93,198.79 305.89,198.38 305.84,197.97 305.78,197.56 305.73,197.15 305.66,196.74 305.59,196.33 305.52,195.92 305.43,195.51 305.35,195.10 305.25,194.69 305.15,194.28 305.05,193.87 304.94,193.46 304.82,193.05 304.69,192.64 304.56,192.23 304.42,191.82 304.27,191.41 304.11,191.00 303.95,190.59 303.78,190.18 303.60,189.77 303.42,189.36 303.22,188.95 303.02,188.54 302.81,188.13 302.59,187.72 302.36,187.31 302.12,186.90 301.88,186.49 301.63,186.08 301.36,185.67 301.09,185.26 300.82,184.85 300.53,184.44 300.23,184.03 299.93,183.62 299.62,183.21 299.30,182.80 298.97,182.39 298.63,181.98 298.29,181.57 297.93,181.16 297.58,180.75 297.21,180.34 296.83,179.93 296.45,179.52 296.06,179.11 295.67,178.70 295.27,178.29 294.86,177.88 294.45,177.46 294.03,177.05 293.61,176.64 293.18,176.23 292.75,175.82 292.31,175.41 291.88,175.00 291.43,174.59 290.98,174.18 290.53,173.77 290.08,173.36 289.63,172.95 289.17,172.54 288.72,172.13 288.26,171.72 287.80,171.31 287.34,170.90 286.88,170.49 286.42,170.08 285.96,169.67 285.51,169.26 285.05,168.85 284.60,168.44 284.15,168.03 283.70,167.62 283.25,167.21 282.81,166.80 282.37,166.39 281.94,165.98 281.51,165.57 281.08,165.16 280.66,164.75 280.24,164.34 279.83,163.93 279.42,163.52 279.02,163.11 278.63,162.70 278.24,162.29 277.85,161.88 277.48,161.47 277.11,161.06 276.75,160.65 276.39,160.24 276.04,159.83 275.70,159.42 275.37,159.01 275.04,158.60 274.72,158.19 274.40,157.78 274.10,157.37 273.80,156.96 273.51,156.55 273.23,156.14 272.96,155.73 272.69,155.32 272.43,154.91 272.17,154.50 271.93,154.09 271.69,153.68 271.46,153.27 271.24,152.86 271.02,152.45 270.81,152.04 270.61,151.63 270.42,151.22 270.23,150.81 270.05,150.40 269.87,149.99 269.71,149.58 269.54,149.17 269.39,148.76 269.24,148.35 269.09,147.94 268.96,147.53 268.82,147.11 268.70,146.70 268.58,146.29 268.46,145.88 268.35,145.47 268.24,145.06 268.14,144.65 268.04,144.24 267.95,143.83 267.86,143.42 267.78,143.01 267.70,142.60 267.62,142.19 267.55,141.78 267.48,141.37 267.42,140.96 267.35,140.55 267.30,140.14 267.24,139.73 267.19,139.32 267.14,138.91 267.09,138.50 267.05,138.09 267.00,137.68 266.97,137.27 266.93,136.86 266.89,136.45 266.86,136.04 266.83,135.63 266.80,135.22 266.77,134.81 266.75,134.40 266.72,133.99 266.70,133.58 266.68,133.17 266.66,132.76 266.64,132.35 266.62,131.94 266.61,131.53 266.59,131.12 266.58,130.71 266.56,130.30 266.55,129.89 266.54,129.48 266.53,129.07 266.52,128.66 266.51,128.25 266.29,128.25 266.28,128.66 266.27,129.07 266.26,129.48 266.25,129.89 266.24,130.30 266.22,130.71 266.21,131.12 266.19,131.53 266.18,131.94 266.16,132.35 266.14,132.76 266.12,133.17 266.10,133.58 266.08,133.99 266.05,134.40 266.03,134.81 266.00,135.22 265.97,135.63 265.94,136.04 265.91,136.45 265.87,136.86 265.83,137.27 265.80,137.68 265.75,138.09 265.71,138.50 265.66,138.91 265.61,139.32 265.56,139.73 265.50,140.14 265.45,140.55 265.38,140.96 265.32,141.37 265.25,141.78 265.18,142.19 265.10,142.60 265.02,143.01 264.94,143.42 264.85,143.83 264.76,144.24 264.66,144.65 264.56,145.06 264.45,145.47 264.34,145.88 264.22,146.29 264.10,146.70 263.98,147.11 263.84,147.53 263.71,147.94 263.56,148.35 263.41,148.76 263.26,149.17 263.09,149.58 262.93,149.99 262.75,150.40 262.57,150.81 262.38,151.22 262.19,151.63 261.99,152.04 261.78,152.45 261.56,152.86 261.34,153.27 261.11,153.68 260.87,154.09 260.63,154.50 260.37,154.91 260.11,155.32 259.84,155.73 259.57,156.14 259.29,156.55 259.00,156.96 258.70,157.37 258.40,157.78 258.08,158.19 257.76,158.60 257.43,159.01 257.10,159.42 256.76,159.83 256.41,160.24 256.05,160.65 255.69,161.06 255.32,161.47 254.95,161.88 254.56,162.29 254.17,162.70 253.78,163.11 253.38,163.52 252.97,163.93 252.56,164.34 252.14,164.75 251.72,165.16 251.29,165.57 250.86,165.98 250.43,166.39 249.99,166.80 249.55,167.21 249.10,167.62 248.65,168.03 248.20,168.44 247.75,168.85 247.29,169.26 246.84,169.67 246.38,170.08 245.92,170.49 245.46,170.90 245.00,171.31 244.54,171.72 244.08,172.13 243.63,172.54 243.17,172.95 242.72,173.36 242.27,173.77 241.82,174.18 241.37,174.59 240.92,175.00 240.49,175.41 240.05,175.82 239.62,176.23 239.19,176.64 238.77,177.05 238.35,177.46 237.94,177.88 237.53,178.29 237.13,178.70 236.74,179.11 236.35,179.52 235.97,179.93 235.59,180.34 235.22,180.75 234.87,181.16 234.51,181.57 234.17,181.98 233.83,182.39 233.50,182.80 233.18,183.21 232.87,183.62 232.57,184.03 232.27,184.44 231.98,184.85 231.71,185.26 231.44,185.67 231.17,186.08 230.92,186.49 230.68,186.90 230.44,187.31 230.21,187.72 229.99,188.13 229.78,188.54 229.58,188.95 229.38,189.36 229.20,189.77 229.02,190.18 228.85,190.59 228.69,191.00 228.53,191.41 228.38,191.82 228.24,192.23 228.11,192.64 227.98,193.05 227.86,193.46 227.75,193.87 227.65,194.28 227.55,194.69 227.45,195.10 227.37,195.51 227.28,195.92 227.21,196.33 227.14,196.74 227.07,197.15 227.02,197.56 226.96,197.97 226.91,198.38 226.87,198.79 226.83,199.20 226.79,199.61 226.76,200.02 226.73,200.43 226.71,200.84 226.68,201.25 226.67,201.66 226.65,202.07 226.64,202.48 226.64,202.89 226.63,203.30 226.63,203.71 226.63,204.12 226.63,204.53 226.64,204.94 226.64,205.35 226.65,205.76 226.66,206.17 226.68,206.58 226.69,206.99 226.71,207.40 226.72,207.81 226.74,208.23 226.76,208.64 226.78,209.05 226.80,209.46 226.82,209.87 226.84,210.28 226.86,210.69 226.89,211.10 226.91,211.51 226.93,211.92 226.95,212.33 226.98,212.74 227.00,213.15 227.02,213.56 227.04,213.97 227.06,214.38 227.08,214.79 227.09,215.20 227.11,215.61 227.12,216.02 227.14,216.43 227.15,216.84 227.16,217.25 227.17,217.66 227.18,218.07 227.18,218.48 227.18,218.89 227.18,219.30 227.18,219.71 227.18,220.12 227.17,220.53 227.16,220.94 227.15,221.35 227.13,221.76 227.11,222.17 227.09,222.58 227.07,222.99 227.04,223.40 227.01,223.81 226.97,224.22 226.93,224.63 226.89,225.04 226.85,225.45 226.80,225.86 226.74,226.27 226.69,226.68 226.63,227.09 226.56,227.50 226.49,227.91 226.42,228.32 226.35,228.73 226.26,229.14 226.18,229.55 226.09,229.96 226.00,230.37 225.90,230.78 225.80,231.19 225.70,231.60 225.59,232.01 225.47,232.42 225.35,232.83 225.23,233.24 225.10,233.65 224.97,234.06 224.84,234.47 224.70,234.88 224.55,235.29 224.40,235.70 224.25,236.11 224.09,236.52 223.93,236.93 223.76,237.34 223.59,237.75 223.41,238.16 223.23,238.57 223.05,238.99 222.86,239.40 222.67,239.81 222.47,240.22 222.27,240.63 222.06,241.04 221.85,241.45 221.64,241.86 221.41,242.27 221.19,242.68 220.96,243.09 220.73,243.50 220.50,243.91 220.26,244.32 220.01,244.73 219.77,245.14 219.51,245.55 219.26,245.96 219.00,246.37 218.74,246.78 218.47,247.19 218.20,247.60 217.93,248.01 217.66,248.42 217.38,248.83 217.10,249.24 216.82,249.65 216.54,250.06 216.25,250.47 215.96,250.88 215.68,251.29 215.39,251.70 215.09,252.11 214.80,252.52 214.51,252.93 214.22,253.34 213.93,253.75 213.64,254.16 213.35,254.57 213.06,254.98 212.77,255.39 212.48,255.80 212.20,256.21 211.92,256.62 211.64,257.03 211.37,257.44 211.10,257.85 210.83,258.26 210.57,258.67 210.31,259.08 210.06,259.49 209.82,259.90 209.58,260.31 209.35,260.72 209.13,261.13 208.91,261.54 208.70,261.95 208.50,262.36 208.31,262.77 208.13,263.18 207.96,263.59 207.80,264.00 207.65,264.41 207.51,264.82 207.38,265.23 207.26,265.64 207.16,266.05 207.07,266.46 206.99,266.87 206.93,267.28 206.88,267.69 206.84,268.10 206.82,268.51 206.81,268.92 206.82,269.34 206.85,269.75 206.88,270.16 206.94,270.57 207.01,270.98 207.10,271.39 207.21,271.80 207.32,272.21 207.46,272.62 207.62,273.03 207.79,273.44 207.98,273.85 208.19,274.26 208.41,274.67 208.65,275.08 208.91,275.49 209.19,275.90 209.48,276.31 209.79,276.72 210.12,277.13 210.46,277.54 210.82,277.95 211.20,278.36 211.60,278.77 212.01,279.18 212.44,279.59 212.88,280.00 213.34,280.41 213.81,280.82 214.30,281.23 214.81,281.64 215.33,282.05 215.86,282.46 216.41,282.87 216.97,283.28 217.54,283.69 218.13,284.10 218.73,284.51 219.34,284.92 219.96,285.33 220.59,285.74 221.23,286.15 221.88,286.56 222.54,286.97 223.21,287.38 223.88,287.79 224.57,288.20 225.26,288.61 225.95,289.02 226.66,289.43 227.36,289.84 228.07,290.25 228.79,290.66 229.51,291.07 230.23,291.48 230.95,291.89 231.67,292.30 232.40,292.71 233.13,293.12 233.85,293.53 234.57,293.94 235.30,294.35 236.02,294.76 236.74,295.17 237.45,295.58 238.16,295.99 238.87,296.40 239.57,296.81 240.27,297.22 240.96,297.63 241.65,298.04 242.33,298.45 243.00,298.86 243.66,299.27 244.32,299.69 244.97,300.10 245.61,300.51 246.24,300.92 246.86,301.33 247.48,301.74 248.08,302.15 248.67,302.56 249.26,302.97 249.83,303.38 250.39,303.79 250.94,304.20 251.48,304.61 252.01,305.02 252.52,305.43 253.03,305.84 253.53,306.25 254.00,306.66 254.48,307.07 254.94,307.48 255.38,307.89 255.82,308.30 256.24,308.71 256.65,309.12 257.06,309.53 257.44,309.94 257.82,310.35 258.19,310.76 258.54,311.17 258.89,311.58 259.22,311.99 259.54,312.40 259.86,312.81 260.15,313.22 260.44,313.63 260.73,314.04 260.99,314.45 261.26,314.86 261.50,315.27 261.74,315.68 261.98,316.09 262.20,316.50 262.41,316.91 262.62,317.32 262.81,317.73 263.00,318.14 263.18,318.55 263.35,318.96 263.52,319.37 263.68,319.78 263.83,320.19 263.97,320.60 264.11,321.01 264.24,321.42 264.36,321.83 264.48,322.24 264.59,322.65 264.70,323.06 264.80,323.47 264.90,323.88 264.99,324.29 265.07,324.70 265.16,325.11 265.23,325.52 265.31,325.93 265.38,326.34 265.44,326.75 265.50,327.16 265.56,327.57 265.62,327.98 265.67,328.39 265.72,328.80 265.77,329.21 265.81,329.62 265.85,330.03 265.89,330.45 265.92,330.86 265.96,331.27 265.99,331.68 266.02,332.09 266.04,332.50 266.07,332.91 266.09,333.32 266.12,333.73 266.14,334.14 266.16,334.55 266.18,334.96 266.19,335.37 266.21,335.78 266.22,336.19 266.24,336.60 266.25,337.01 266.26,337.42 266.27,337.83 ' style='stroke-width: 0.75; fill: #D3D3D3; fill-opacity: 0.20;' />
+<polygon points='398.88,296.66 398.89,296.22 398.89,295.78 398.90,295.35 398.91,294.91 398.91,294.47 398.92,294.03 398.93,293.59 398.94,293.16 398.95,292.72 398.96,292.28 398.97,291.84 398.98,291.40 399.00,290.97 399.01,290.53 399.03,290.09 399.04,289.65 399.06,289.21 399.08,288.78 399.10,288.34 399.12,287.90 399.14,287.46 399.16,287.02 399.18,286.59 399.21,286.15 399.23,285.71 399.26,285.27 399.29,284.83 399.32,284.39 399.36,283.96 399.39,283.52 399.43,283.08 399.46,282.64 399.50,282.20 399.54,281.77 399.59,281.33 399.63,280.89 399.68,280.45 399.73,280.01 399.78,279.58 399.83,279.14 399.89,278.70 399.94,278.26 400.00,277.82 400.07,277.39 400.13,276.95 400.20,276.51 400.27,276.07 400.34,275.63 400.41,275.19 400.49,274.76 400.57,274.32 400.65,273.88 400.73,273.44 400.81,273.00 400.90,272.57 400.99,272.13 401.08,271.69 401.18,271.25 401.27,270.81 401.37,270.38 401.47,269.94 401.58,269.50 401.68,269.06 401.79,268.62 401.90,268.19 402.01,267.75 402.13,267.31 402.24,266.87 402.36,266.43 402.48,266.00 402.60,265.56 402.72,265.12 402.84,264.68 402.97,264.24 403.10,263.80 403.22,263.37 403.35,262.93 403.48,262.49 403.62,262.05 403.75,261.61 403.88,261.18 404.02,260.74 404.15,260.30 404.29,259.86 404.43,259.42 404.57,258.99 404.71,258.55 404.85,258.11 404.99,257.67 405.13,257.23 405.27,256.80 405.42,256.36 405.56,255.92 405.71,255.48 405.85,255.04 406.00,254.60 406.15,254.17 406.30,253.73 406.45,253.29 406.60,252.85 406.76,252.41 406.91,251.98 407.07,251.54 407.23,251.10 407.39,250.66 407.55,250.22 407.72,249.79 407.89,249.35 408.06,248.91 408.23,248.47 408.41,248.03 408.59,247.60 408.77,247.16 408.96,246.72 409.15,246.28 409.35,245.84 409.55,245.41 409.75,244.97 409.96,244.53 410.17,244.09 410.39,243.65 410.62,243.21 410.85,242.78 411.09,242.34 411.33,241.90 411.58,241.46 411.84,241.02 412.10,240.59 412.37,240.15 412.65,239.71 412.94,239.27 413.23,238.83 413.53,238.40 413.85,237.96 414.16,237.52 414.49,237.08 414.83,236.64 415.17,236.21 415.52,235.77 415.88,235.33 416.25,234.89 416.63,234.45 417.02,234.01 417.42,233.58 417.82,233.14 418.24,232.70 418.66,232.26 419.09,231.82 419.53,231.39 419.98,230.95 420.44,230.51 420.91,230.07 421.38,229.63 421.86,229.20 422.35,228.76 422.85,228.32 423.35,227.88 423.86,227.44 424.38,227.01 424.91,226.57 425.44,226.13 425.97,225.69 426.52,225.25 427.06,224.82 427.62,224.38 428.17,223.94 428.73,223.50 429.30,223.06 429.87,222.62 430.44,222.19 431.01,221.75 431.59,221.31 432.17,220.87 432.75,220.43 433.33,220.00 433.91,219.56 434.50,219.12 435.08,218.68 435.67,218.24 436.25,217.81 436.83,217.37 437.41,216.93 437.99,216.49 438.57,216.05 439.14,215.62 439.72,215.18 440.29,214.74 440.85,214.30 441.41,213.86 441.97,213.43 442.53,212.99 443.08,212.55 443.62,212.11 444.16,211.67 444.69,211.23 445.22,210.80 445.74,210.36 446.25,209.92 446.76,209.48 447.26,209.04 447.76,208.61 448.24,208.17 448.72,207.73 449.19,207.29 449.65,206.85 450.11,206.42 450.55,205.98 450.99,205.54 451.41,205.10 451.82,204.66 452.23,204.23 452.63,203.79 453.01,203.35 453.39,202.91 453.75,202.47 454.10,202.03 454.44,201.60 454.76,201.16 455.08,200.72 455.38,200.28 455.67,199.84 455.95,199.41 456.21,198.97 456.46,198.53 456.70,198.09 456.92,197.65 457.13,197.22 457.32,196.78 457.50,196.34 457.66,195.90 457.81,195.46 457.94,195.03 458.05,194.59 458.15,194.15 458.23,193.71 458.30,193.27 458.35,192.84 458.38,192.40 458.40,191.96 458.39,191.52 458.38,191.08 458.34,190.64 458.29,190.21 458.22,189.77 458.13,189.33 458.02,188.89 457.90,188.45 457.76,188.02 457.60,187.58 457.43,187.14 457.23,186.70 457.02,186.26 456.80,185.83 456.55,185.39 456.29,184.95 456.02,184.51 455.73,184.07 455.42,183.64 455.10,183.20 454.76,182.76 454.42,182.32 454.05,181.88 453.67,181.44 453.29,181.01 452.88,180.57 452.47,180.13 452.05,179.69 451.61,179.25 451.16,178.82 450.71,178.38 450.24,177.94 449.77,177.50 449.29,177.06 448.80,176.63 448.31,176.19 447.81,175.75 447.31,175.31 446.80,174.87 446.29,174.44 445.77,174.00 445.25,173.56 444.73,173.12 444.21,172.68 443.69,172.25 443.17,171.81 442.65,171.37 442.13,170.93 441.61,170.49 441.09,170.05 440.58,169.62 440.07,169.18 439.56,168.74 439.06,168.30 438.56,167.86 438.07,167.43 437.58,166.99 437.10,166.55 436.62,166.11 436.15,165.67 435.69,165.24 435.24,164.80 434.79,164.36 434.34,163.92 433.91,163.48 433.48,163.05 433.07,162.61 432.66,162.17 432.25,161.73 431.86,161.29 431.47,160.85 431.09,160.42 430.72,159.98 430.36,159.54 430.00,159.10 429.65,158.66 429.31,158.23 428.98,157.79 428.66,157.35 428.34,156.91 428.03,156.47 427.73,156.04 427.43,155.60 427.14,155.16 426.86,154.72 426.58,154.28 426.31,153.85 426.05,153.41 425.79,152.97 425.54,152.53 425.29,152.09 425.05,151.66 424.81,151.22 424.58,150.78 424.35,150.34 424.13,149.90 423.91,149.46 423.70,149.03 423.49,148.59 423.28,148.15 423.08,147.71 422.88,147.27 422.68,146.84 422.49,146.40 422.30,145.96 422.11,145.52 421.93,145.08 421.74,144.65 421.56,144.21 421.39,143.77 421.21,143.33 421.03,142.89 420.86,142.46 420.69,142.02 420.52,141.58 420.35,141.14 420.18,140.70 420.01,140.26 419.85,139.83 419.68,139.39 419.52,138.95 419.35,138.51 419.19,138.07 419.03,137.64 418.86,137.20 418.70,136.76 418.53,136.32 418.37,135.88 418.21,135.45 418.04,135.01 417.88,134.57 417.71,134.13 417.54,133.69 417.38,133.26 417.21,132.82 417.04,132.38 416.87,131.94 416.70,131.50 416.52,131.07 416.35,130.63 416.18,130.19 416.00,129.75 415.82,129.31 415.64,128.87 415.46,128.44 415.27,128.00 415.09,127.56 414.90,127.12 414.71,126.68 414.52,126.25 414.33,125.81 414.14,125.37 413.94,124.93 413.74,124.49 413.54,124.06 413.34,123.62 413.14,123.18 412.93,122.74 412.73,122.30 412.52,121.87 412.31,121.43 412.09,120.99 411.88,120.55 411.67,120.11 411.45,119.68 411.23,119.24 411.01,118.80 410.79,118.36 410.57,117.92 410.35,117.48 410.13,117.05 409.90,116.61 409.68,116.17 409.46,115.73 409.23,115.29 409.01,114.86 408.78,114.42 408.56,113.98 408.33,113.54 408.11,113.10 407.89,112.67 407.67,112.23 407.44,111.79 407.22,111.35 407.01,110.91 406.79,110.48 406.57,110.04 406.36,109.60 406.15,109.16 405.94,108.72 405.73,108.28 405.52,107.85 405.32,107.41 405.12,106.97 404.92,106.53 404.72,106.09 404.53,105.66 404.34,105.22 404.16,104.78 403.97,104.34 403.79,103.90 403.61,103.47 403.44,103.03 403.27,102.59 403.11,102.15 402.94,101.71 402.78,101.28 402.63,100.84 402.48,100.40 402.33,99.96 402.18,99.52 402.05,99.09 401.91,98.65 401.78,98.21 401.65,97.77 401.52,97.33 401.40,96.89 401.28,96.46 401.17,96.02 401.06,95.58 400.95,95.14 400.85,94.70 400.75,94.27 400.66,93.83 400.57,93.39 400.48,92.95 400.39,92.51 400.31,92.08 400.23,91.64 400.16,91.20 400.08,90.76 400.02,90.32 399.95,89.89 399.89,89.45 399.83,89.01 399.77,88.57 399.71,88.13 399.66,87.69 399.61,87.26 399.56,86.82 399.52,86.38 399.47,85.94 399.43,85.50 399.40,85.07 399.36,84.63 399.32,84.19 399.29,83.75 399.26,83.31 399.23,82.88 399.20,82.44 399.18,82.00 399.15,81.56 399.13,81.12 399.11,80.69 399.09,80.25 399.07,79.81 399.05,79.37 399.03,78.93 399.02,78.50 399.00,78.06 398.99,77.62 398.98,77.18 398.96,76.74 398.95,76.30 398.94,75.87 398.93,75.43 398.92,74.99 398.91,74.55 398.91,74.11 398.90,73.68 398.89,73.24 398.89,72.80 398.74,72.80 398.74,73.24 398.73,73.68 398.72,74.11 398.71,74.55 398.71,74.99 398.70,75.43 398.69,75.87 398.68,76.30 398.66,76.74 398.65,77.18 398.64,77.62 398.63,78.06 398.61,78.50 398.59,78.93 398.58,79.37 398.56,79.81 398.54,80.25 398.52,80.69 398.50,81.12 398.48,81.56 398.45,82.00 398.42,82.44 398.40,82.88 398.37,83.31 398.34,83.75 398.30,84.19 398.27,84.63 398.23,85.07 398.19,85.50 398.15,85.94 398.11,86.38 398.06,86.82 398.02,87.26 397.97,87.69 397.91,88.13 397.86,88.57 397.80,89.01 397.74,89.45 397.68,89.89 397.61,90.32 397.54,90.76 397.47,91.20 397.40,91.64 397.32,92.08 397.24,92.51 397.15,92.95 397.06,93.39 396.97,93.83 396.87,94.27 396.78,94.70 396.67,95.14 396.57,95.58 396.46,96.02 396.34,96.46 396.23,96.89 396.11,97.33 395.98,97.77 395.85,98.21 395.72,98.65 395.58,99.09 395.44,99.52 395.30,99.96 395.15,100.40 395.00,100.84 394.84,101.28 394.68,101.71 394.52,102.15 394.36,102.59 394.19,103.03 394.01,103.47 393.84,103.90 393.66,104.34 393.47,104.78 393.29,105.22 393.10,105.66 392.90,106.09 392.71,106.53 392.51,106.97 392.31,107.41 392.11,107.85 391.90,108.28 391.69,108.72 391.48,109.16 391.27,109.60 391.05,110.04 390.84,110.48 390.62,110.91 390.40,111.35 390.18,111.79 389.96,112.23 389.74,112.67 389.52,113.10 389.29,113.54 389.07,113.98 388.85,114.42 388.62,114.86 388.40,115.29 388.17,115.73 387.95,116.17 387.72,116.61 387.50,117.05 387.28,117.48 387.06,117.92 386.83,118.36 386.61,118.80 386.40,119.24 386.18,119.68 385.96,120.11 385.75,120.55 385.53,120.99 385.32,121.43 385.11,121.87 384.90,122.30 384.69,122.74 384.49,123.18 384.29,123.62 384.08,124.06 383.88,124.49 383.69,124.93 383.49,125.37 383.30,125.81 383.10,126.25 382.91,126.68 382.72,127.12 382.54,127.56 382.35,128.00 382.17,128.44 381.99,128.87 381.81,129.31 381.63,129.75 381.45,130.19 381.28,130.63 381.10,131.07 380.93,131.50 380.76,131.94 380.59,132.38 380.42,132.82 380.25,133.26 380.08,133.69 379.92,134.13 379.75,134.57 379.59,135.01 379.42,135.45 379.26,135.88 379.09,136.32 378.93,136.76 378.77,137.20 378.60,137.64 378.44,138.07 378.27,138.51 378.11,138.95 377.95,139.39 377.78,139.83 377.61,140.26 377.45,140.70 377.28,141.14 377.11,141.58 376.94,142.02 376.77,142.46 376.59,142.89 376.42,143.33 376.24,143.77 376.06,144.21 375.88,144.65 375.70,145.08 375.51,145.52 375.33,145.96 375.14,146.40 374.94,146.84 374.75,147.27 374.55,147.71 374.34,148.15 374.14,148.59 373.93,149.03 373.71,149.46 373.49,149.90 373.27,150.34 373.05,150.78 372.81,151.22 372.58,151.66 372.34,152.09 372.09,152.53 371.84,152.97 371.58,153.41 371.31,153.85 371.05,154.28 370.77,154.72 370.49,155.16 370.20,155.60 369.90,156.04 369.60,156.47 369.29,156.91 368.97,157.35 368.65,157.79 368.31,158.23 367.97,158.66 367.63,159.10 367.27,159.54 366.91,159.98 366.54,160.42 366.16,160.85 365.77,161.29 365.38,161.73 364.97,162.17 364.56,162.61 364.14,163.05 363.72,163.48 363.28,163.92 362.84,164.36 362.39,164.80 361.94,165.24 361.47,165.67 361.00,166.11 360.53,166.55 360.05,166.99 359.56,167.43 359.07,167.86 358.57,168.30 358.07,168.74 357.56,169.18 357.05,169.62 356.54,170.05 356.02,170.49 355.50,170.93 354.98,171.37 354.46,171.81 353.94,172.25 353.42,172.68 352.90,173.12 352.37,173.56 351.86,174.00 351.34,174.44 350.83,174.87 350.32,175.31 349.82,175.75 349.32,176.19 348.82,176.63 348.34,177.06 347.85,177.50 347.38,177.94 346.92,178.38 346.46,178.82 346.02,179.25 345.58,179.69 345.16,180.13 344.75,180.57 344.34,181.01 343.95,181.44 343.58,181.88 343.21,182.32 342.86,182.76 342.53,183.20 342.20,183.64 341.90,184.07 341.61,184.51 341.33,184.95 341.08,185.39 340.83,185.83 340.61,186.26 340.40,186.70 340.20,187.14 340.03,187.58 339.87,188.02 339.73,188.45 339.61,188.89 339.50,189.33 339.41,189.77 339.34,190.21 339.29,190.64 339.25,191.08 339.23,191.52 339.23,191.96 339.25,192.40 339.28,192.84 339.32,193.27 339.39,193.71 339.48,194.15 339.57,194.59 339.69,195.03 339.82,195.46 339.97,195.90 340.13,196.34 340.31,196.78 340.50,197.22 340.71,197.65 340.93,198.09 341.17,198.53 341.42,198.97 341.68,199.41 341.96,199.84 342.24,200.28 342.55,200.72 342.86,201.16 343.19,201.60 343.53,202.03 343.88,202.47 344.24,202.91 344.62,203.35 345.00,203.79 345.39,204.23 345.80,204.66 346.22,205.10 346.64,205.54 347.08,205.98 347.52,206.42 347.97,206.85 348.44,207.29 348.91,207.73 349.38,208.17 349.87,208.61 350.36,209.04 350.87,209.48 351.37,209.92 351.89,210.36 352.41,210.80 352.94,211.23 353.47,211.67 354.01,212.11 354.55,212.55 355.10,212.99 355.66,213.43 356.21,213.86 356.78,214.30 357.34,214.74 357.91,215.18 358.48,215.62 359.06,216.05 359.64,216.49 360.22,216.93 360.80,217.37 361.38,217.81 361.96,218.24 362.55,218.68 363.13,219.12 363.71,219.56 364.30,220.00 364.88,220.43 365.46,220.87 366.04,221.31 366.61,221.75 367.19,222.19 367.76,222.62 368.33,223.06 368.90,223.50 369.46,223.94 370.01,224.38 370.57,224.82 371.11,225.25 371.65,225.69 372.19,226.13 372.72,226.57 373.25,227.01 373.76,227.44 374.27,227.88 374.78,228.32 375.28,228.76 375.76,229.20 376.25,229.63 376.72,230.07 377.19,230.51 377.65,230.95 378.09,231.39 378.53,231.82 378.97,232.26 379.39,232.70 379.80,233.14 380.21,233.58 380.61,234.01 381.00,234.45 381.37,234.89 381.74,235.33 382.11,235.77 382.46,236.21 382.80,236.64 383.14,237.08 383.46,237.52 383.78,237.96 384.09,238.40 384.39,238.83 384.69,239.27 384.98,239.71 385.25,240.15 385.53,240.59 385.79,241.02 386.05,241.46 386.30,241.90 386.54,242.34 386.78,242.78 387.01,243.21 387.23,243.65 387.45,244.09 387.67,244.53 387.88,244.97 388.08,245.41 388.28,245.84 388.48,246.28 388.67,246.72 388.85,247.16 389.04,247.60 389.22,248.03 389.39,248.47 389.57,248.91 389.74,249.35 389.91,249.79 390.07,250.22 390.24,250.66 390.40,251.10 390.56,251.54 390.71,251.98 390.87,252.41 391.02,252.85 391.18,253.29 391.33,253.73 391.48,254.17 391.62,254.60 391.77,255.04 391.92,255.48 392.06,255.92 392.21,256.36 392.35,256.80 392.50,257.23 392.64,257.67 392.78,258.11 392.92,258.55 393.06,258.99 393.20,259.42 393.34,259.86 393.47,260.30 393.61,260.74 393.74,261.18 393.88,261.61 394.01,262.05 394.14,262.49 394.27,262.93 394.40,263.37 394.53,263.80 394.66,264.24 394.78,264.68 394.91,265.12 395.03,265.56 395.15,266.00 395.27,266.43 395.39,266.87 395.50,267.31 395.61,267.75 395.73,268.19 395.84,268.62 395.94,269.06 396.05,269.50 396.15,269.94 396.25,270.38 396.35,270.81 396.45,271.25 396.54,271.69 396.64,272.13 396.73,272.57 396.81,273.00 396.90,273.44 396.98,273.88 397.06,274.32 397.14,274.76 397.22,275.19 397.29,275.63 397.36,276.07 397.43,276.51 397.50,276.95 397.56,277.39 397.62,277.82 397.68,278.26 397.74,278.70 397.80,279.14 397.85,279.58 397.90,280.01 397.95,280.45 398.00,280.89 398.04,281.33 398.08,281.77 398.13,282.20 398.16,282.64 398.20,283.08 398.24,283.52 398.27,283.96 398.30,284.39 398.34,284.83 398.36,285.27 398.39,285.71 398.42,286.15 398.44,286.59 398.47,287.02 398.49,287.46 398.51,287.90 398.53,288.34 398.55,288.78 398.57,289.21 398.59,289.65 398.60,290.09 398.62,290.53 398.63,290.97 398.64,291.40 398.66,291.84 398.67,292.28 398.68,292.72 398.69,293.16 398.70,293.59 398.71,294.03 398.71,294.47 398.72,294.91 398.73,295.35 398.74,295.78 398.74,296.22 398.75,296.66 ' style='stroke-width: 0.75; fill: #D3D3D3; fill-opacity: 0.20;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='133.99' cy='322.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='243.12' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='398.81' cy='186.83' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>

From 0e4a7a22b4c5a7a74cfa00385b5c51b13c5a03db Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 17:46:00 -0700
Subject: [PATCH 13/23] docs: better examples

---
 R/type_barplot.R    | 52 ++++++++++++++++++++++++++++++++-------------
 man/type_barplot.Rd | 51 +++++++++++++++++++++++++++++++-------------
 2 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/R/type_barplot.R b/R/type_barplot.R
index ecf6192b..9c3db69c 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -75,33 +75,52 @@
 #'   `FALSE` to use the fully-saturated palette colour(s) instead.
 #' @param xaxlabels \[Deprecated\] a character vector with the axis labels for
 #'   the `x` variable. Use the top-level `xaxl` argument instead, which now
-#'   accepts a named vector mapping old labels to new ones, and applies
+#'   accepts a dictionary mapping old labels to new ones, and applies
 #'   consistently across plot types. This argument will be removed in a future
 #'   release.
 #'
 #' @examples
 #' #
-#' ## Basic use
+#' ## Basic use (raw values)
 #' 
-#' sleep2 = transform(sleep, drug = group) # less misleading name (same people)
+#' tinyplot(GNP ~ Year, data = longley, type = "barplot")
 #' 
-#' tinyplot(extra ~ ID, data = sleep2, type = "barplot")
-#' tinyplot(extra ~ ID, data = sleep2, type = "barplot", xord = "desc")
-#' tinyplot(extra ~ ID | drug, data = sleep2, type = "barplot", beside = TRUE)
+#' tinyplot(demand ~ Time, data = BOD, type = "bar") # "bar" is a shorthand
+#' tinyplot_add(type = "text", pos = 3, xpd = NA)    # add y values as text
+#' 
+#' #
+#' ## Aggregated vs grouped values (multiple ys per x)
 #' 
-#' # Change the aggregation (non-grouped case) from the `FUN = mean` default to
-#' # ask a more interesting question: which subject benefitted most from the
-#' # switch to drug 2?
+#' # each person receives two drugs
+#' sleep2 = transform(sleep, drug = group) # less misleading name
+#' 
+#' # default aggregation FUN is mean
+#' tinyplot(
+#'   extra ~ ID, data = sleep2,
+#'   type = "barplot",
+#'   main = "Mean extra sleep from 2 soporiphic drugs"
+#' )
+#' # switch to diff (answers a more relevant q: who benefits most from drug 2?)
 #' tinyplot(
-#'    extra ~ ID, data = sleep2, type = "barplot",
-#'    FUN = diff, xord = "desc",
-#'    main = "Sleep gain (drug 2 vs drug 1)"
+#'   extra ~ ID, data = sleep2,
+#'   type = "barplot", FUN = diff,
+#'   main = "Sleep gain (drug 2 vs drug 1)"
+#' )
+#' # we can sort in descending (or ascending) order too
+#' tinyplot(
+#'   extra ~ ID, data = sleep2,
+#'   type = "barplot", FUN = diff, xord = "desc",
+#'   main = "Sleep gain (drug 2 vs drug 1), ordered"
 #' )
 #' 
+#' # of course, we don't have to aggregate if we specify groups (stacked or non)
+#' tinyplot(extra ~ ID | drug, data = sleep2, type = "barplot", beside = TRUE)
+
 #' # Note: We used automatic argument passing for 'xord', `FUN`, etc. above. But
 #' # this wouldn't work for `width`, since it would conflict with the top-level
 #' # `tinyplot(..., width = <width>)` argument. It's safer to pass these args
-#' # through the `type_barplot()` functional equivalent.
+#' # through the `type_barplot()` functional equivalent...
+#' 
 #' tinyplot(
 #'   extra ~ ID | drug, data = sleep2,
 #'   type = type_barplot(beside = TRUE, xord = "desc", width = 0.5)
@@ -120,6 +139,7 @@
 #' # No y variable (frequency calculated on the fly)
 #' tinyplot(~ cyl, data = mtcars, type = "barplot")
 #' tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
+#' tinyplot(~ cyl | vs, data = mtcars, type = "barplot", beside = TRUE)
 #' 
 #' # Fancy frequency table (y = frequency aleady computed)
 #' tinyplot(
@@ -132,8 +152,8 @@
 #' #
 #' ## Centering
 #'
-#' # Centered barplot for conditional proportions of dark (black/brown) vs.
-#' # light (red/blond) hair color, conditional on eye color and sex.
+#' # Centered barplot for conditional proportions of "dark" (black/brown) vs.
+#' # "fair" (red/blond) hair color, conditional on eye color and sex.
 #' # Aside: use `lighten = FALSE` to avoid lightening the bar fill colors.
 #' hec = as.data.frame(proportions(HairEyeColor, 2:3))
 #' hcols = c("black", "sienna", "indianred", "goldenrod")
@@ -144,6 +164,7 @@
 #'   flip = TRUE, yaxl = "percent",
 #'   theme = list("clean2", palette.qualitative = hcols)
 #' )
+#' tinyplot_add(type = "vline", col = "white")
 #'
 #' #
 #' ## Offset examples
@@ -188,6 +209,7 @@
 #'   main = "Hypothetical Likert example with category offset"
 #' )
 #' tinyplot_add(type = "vline")
+#' tinyplot_add(type = "vline", v = 1, lty = 2)
 #'
 #' @export
 type_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NULL, FUN = NULL, xlevels = NULL, xord = NULL, drop.zeros = FALSE, lighten = TRUE, xaxlabels = NULL) {
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index 087fe612..8ee1a957 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -97,7 +97,7 @@ displays consistent and lets the fill read cleanly over grid lines. Set to
 
 \item{xaxlabels}{[Deprecated] a character vector with the axis labels for
 the \code{x} variable. Use the top-level \code{xaxl} argument instead, which now
-accepts a named vector mapping old labels to new ones, and applies
+accepts a dictionary mapping old labels to new ones, and applies
 consistently across plot types. This argument will be removed in a future
 release.}
 }
@@ -110,27 +110,45 @@ using some function (default: mean).
 }
 \examples{
 #
-## Basic use
+## Basic use (raw values)
 
-sleep2 = transform(sleep, drug = group) # less misleading name (same people)
+tinyplot(GNP ~ Year, data = longley, type = "barplot")
 
-tinyplot(extra ~ ID, data = sleep2, type = "barplot")
-tinyplot(extra ~ ID, data = sleep2, type = "barplot", xord = "desc")
-tinyplot(extra ~ ID | drug, data = sleep2, type = "barplot", beside = TRUE)
+tinyplot(demand ~ Time, data = BOD, type = "bar") # "bar" is a shorthand
+tinyplot_add(type = "text", pos = 3, xpd = NA)    # add y values as text
+
+#
+## Aggregated vs grouped values (multiple ys per x)
 
-# Change the aggregation (non-grouped case) from the `FUN = mean` default to
-# ask a more interesting question: which subject benefitted most from the
-# switch to drug 2?
+# each person receives two drugs
+sleep2 = transform(sleep, drug = group) # less misleading name
+
+# default aggregation FUN is mean
+tinyplot(
+  extra ~ ID, data = sleep2,
+  type = "barplot",
+  main = "Mean extra sleep from 2 soporiphic drugs"
+)
+# switch to diff (answers a more relevant q: who benefits most from drug 2?)
+tinyplot(
+  extra ~ ID, data = sleep2,
+  type = "barplot", FUN = diff,
+  main = "Sleep gain (drug 2 vs drug 1)"
+)
+# we can sort in descending (or ascending) order too
 tinyplot(
-   extra ~ ID, data = sleep2, type = "barplot",
-   FUN = diff, xord = "desc",
-   main = "Sleep gain (drug 2 vs drug 1)"
+  extra ~ ID, data = sleep2,
+  type = "barplot", FUN = diff, xord = "desc",
+  main = "Sleep gain (drug 2 vs drug 1), ordered"
 )
 
+# of course, we don't have to aggregate if we specify groups (stacked or non)
+tinyplot(extra ~ ID | drug, data = sleep2, type = "barplot", beside = TRUE)
 # Note: We used automatic argument passing for 'xord', `FUN`, etc. above. But
 # this wouldn't work for `width`, since it would conflict with the top-level
 # `tinyplot(..., width = <width>)` argument. It's safer to pass these args
-# through the `type_barplot()` functional equivalent.
+# through the `type_barplot()` functional equivalent...
+
 tinyplot(
   extra ~ ID | drug, data = sleep2,
   type = type_barplot(beside = TRUE, xord = "desc", width = 0.5)
@@ -149,6 +167,7 @@ tinyplot(VADeaths, type = "barplot", beside = TRUE)
 # No y variable (frequency calculated on the fly)
 tinyplot(~ cyl, data = mtcars, type = "barplot")
 tinyplot(~ cyl | vs, data = mtcars, type = "barplot")
+tinyplot(~ cyl | vs, data = mtcars, type = "barplot", beside = TRUE)
 
 # Fancy frequency table (y = frequency aleady computed)
 tinyplot(
@@ -161,8 +180,8 @@ tinyplot(
 #
 ## Centering
 
-# Centered barplot for conditional proportions of dark (black/brown) vs.
-# light (red/blond) hair color, conditional on eye color and sex.
+# Centered barplot for conditional proportions of "dark" (black/brown) vs.
+# "fair" (red/blond) hair color, conditional on eye color and sex.
 # Aside: use `lighten = FALSE` to avoid lightening the bar fill colors.
 hec = as.data.frame(proportions(HairEyeColor, 2:3))
 hcols = c("black", "sienna", "indianred", "goldenrod")
@@ -173,6 +192,7 @@ tinyplot(
   flip = TRUE, yaxl = "percent",
   theme = list("clean2", palette.qualitative = hcols)
 )
+tinyplot_add(type = "vline", col = "white")
 
 #
 ## Offset examples
@@ -217,5 +237,6 @@ tinyplot(
   main = "Hypothetical Likert example with category offset"
 )
 tinyplot_add(type = "vline")
+tinyplot_add(type = "vline", v = 1, lty = 2)
 
 }

From 862b462a4a07cfb8b0294063c8dfa0f1e21bb945 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 19:22:25 -0700
Subject: [PATCH 14/23] forgot the actual tests

---
 inst/tinytest/test-tinyplot_add.R | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/inst/tinytest/test-tinyplot_add.R b/inst/tinytest/test-tinyplot_add.R
index e1e67e11..dd9eae48 100644
--- a/inst/tinytest/test-tinyplot_add.R
+++ b/inst/tinytest/test-tinyplot_add.R
@@ -142,3 +142,19 @@ f = function() {
   tinyplot_add(y ~ g, data = d2, type = "p", col = "red", pch = 16)
 }
 expect_snapshot_plot(f, label = "tinyplot_add_layer_category_alignment")
+
+# A base layer that coerces a numeric x to a factor itself (bars, violins, ...)
+# leaves its categories named by the *labels*, while the added layer still
+# carries the raw values. Those used to be plotted at their own coordinates,
+# landing far outside a panel that spans the factor positions. (#691)
+f = function() {
+  tinyplot(demand ~ Time, data = BOD, type = "barplot")
+  tinyplot_add(type = "text", pos = 3, xpd = NA)
+}
+expect_snapshot_plot(f, label = "tinyplot_add_numeric_x_barplot")
+
+f = function() {
+  tinyplot(len ~ dose, data = ToothGrowth, fill = 0.2, type = "violin")
+  tinyplot_add(type = type_summary(median, type = "p"))
+}
+expect_snapshot_plot(f, label = "tinyplot_add_numeric_x_violin")

From cba3a0421ce053ce174fdeb623f6a0bae3be9d51 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 21:02:46 -0700
Subject: [PATCH 15/23] barplot tests

---
 .../_tinysnapshot/barplot_xaxl_dict.svg       |  63 ++++++++++
 .../barplot_xord_aggregated_mean.svg          |  59 ++++++++++
 .../barplot_xord_aggregated_sum.svg           |  55 +++++++++
 .../_tinysnapshot/barplot_xord_ascending.svg  |  63 ++++++++++
 .../_tinysnapshot/barplot_xord_asis.svg       |  59 ++++++++++
 .../_tinysnapshot/barplot_xord_desc.svg       |  63 ++++++++++
 .../_tinysnapshot/barplot_xord_rev.svg        |  63 ++++++++++
 inst/tinytest/test-type_barplot.R             | 111 ++++++++++++++++++
 8 files changed, 536 insertions(+)
 create mode 100644 inst/tinytest/_tinysnapshot/barplot_xaxl_dict.svg
 create mode 100644 inst/tinytest/_tinysnapshot/barplot_xord_aggregated_mean.svg
 create mode 100644 inst/tinytest/_tinysnapshot/barplot_xord_aggregated_sum.svg
 create mode 100644 inst/tinytest/_tinysnapshot/barplot_xord_ascending.svg
 create mode 100644 inst/tinytest/_tinysnapshot/barplot_xord_asis.svg
 create mode 100644 inst/tinytest/_tinysnapshot/barplot_xord_desc.svg
 create mode 100644 inst/tinytest/_tinysnapshot/barplot_xord_rev.svg

diff --git a/inst/tinytest/_tinysnapshot/barplot_xaxl_dict.svg b/inst/tinytest/_tinysnapshot/barplot_xaxl_dict.svg
new file mode 100644
index 00000000..b43df53a
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/barplot_xaxl_dict.svg
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='14.67px' lengthAdjust='spacingAndGlyphs'>cyl</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='32.02px' lengthAdjust='spacingAndGlyphs'>Count</text>
+<text x='130.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.67px' lengthAdjust='spacingAndGlyphs'>four</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='14.67px' lengthAdjust='spacingAndGlyphs'>six</text>
+<text x='401.93' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.02px' lengthAdjust='spacingAndGlyphs'>eight</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='66.32' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='378.53' x2='51.84' y2='378.53' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='326.49' x2='51.84' y2='326.49' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='274.46' x2='51.84' y2='274.46' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='222.43' x2='51.84' y2='222.43' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='170.39' x2='51.84' y2='170.39' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='118.36' x2='51.84' y2='118.36' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='66.32' x2='51.84' y2='66.32' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,378.53) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text transform='translate(41.76,326.49) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,274.46) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text transform='translate(41.76,222.43) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text transform='translate(41.76,170.39) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,118.36) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>12</text>
+<text transform='translate(41.76,66.32) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>14</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='144.38' width='112.94' height='286.18' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='209.93' y='248.44' width='112.94' height='182.12' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='345.46' y='66.32' width='112.94' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/barplot_xord_aggregated_mean.svg b/inst/tinytest/_tinysnapshot/barplot_xord_aggregated_mean.svg
new file mode 100644
index 00000000..20baca9a
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/barplot_xord_aggregated_mean.svg
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>g</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>v</text>
+<text x='130.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='18.67px' lengthAdjust='spacingAndGlyphs'>few</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='19.34px' lengthAdjust='spacingAndGlyphs'>mid</text>
+<text x='401.93' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>many</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='66.32' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='357.71' x2='51.84' y2='357.71' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='284.87' x2='51.84' y2='284.87' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='212.02' x2='51.84' y2='212.02' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='139.17' x2='51.84' y2='139.17' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='66.32' x2='51.84' y2='66.32' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,357.71) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text transform='translate(41.76,284.87) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,212.02) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text transform='translate(41.76,139.17) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text transform='translate(41.76,66.32) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='66.32' width='112.94' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='209.93' y='248.44' width='112.94' height='182.12' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='345.46' y='321.29' width='112.94' height='109.27' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/barplot_xord_aggregated_sum.svg b/inst/tinytest/_tinysnapshot/barplot_xord_aggregated_sum.svg
new file mode 100644
index 00000000..9e13c9a0
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/barplot_xord_aggregated_sum.svg
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>g</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>v</text>
+<text x='130.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='29.34px' lengthAdjust='spacingAndGlyphs'>many</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='19.34px' lengthAdjust='spacingAndGlyphs'>mid</text>
+<text x='401.93' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='18.67px' lengthAdjust='spacingAndGlyphs'>few</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='127.03' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='329.38' x2='51.84' y2='329.38' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='228.21' x2='51.84' y2='228.21' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='127.03' x2='51.84' y2='127.03' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,329.38) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text transform='translate(41.76,228.21) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,127.03) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>15</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='66.32' width='112.94' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='209.93' y='127.03' width='112.94' height='303.53' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='345.46' y='228.21' width='112.94' height='202.35' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/barplot_xord_ascending.svg b/inst/tinytest/_tinysnapshot/barplot_xord_ascending.svg
new file mode 100644
index 00000000..ace55a4c
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/barplot_xord_ascending.svg
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='14.67px' lengthAdjust='spacingAndGlyphs'>cyl</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='32.02px' lengthAdjust='spacingAndGlyphs'>Count</text>
+<text x='130.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='401.93' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='66.32' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='378.53' x2='51.84' y2='378.53' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='326.49' x2='51.84' y2='326.49' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='274.46' x2='51.84' y2='274.46' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='222.43' x2='51.84' y2='222.43' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='170.39' x2='51.84' y2='170.39' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='118.36' x2='51.84' y2='118.36' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='66.32' x2='51.84' y2='66.32' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,378.53) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text transform='translate(41.76,326.49) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,274.46) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text transform='translate(41.76,222.43) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text transform='translate(41.76,170.39) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,118.36) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>12</text>
+<text transform='translate(41.76,66.32) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>14</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='248.44' width='112.94' height='182.12' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='209.93' y='144.38' width='112.94' height='286.18' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='345.46' y='66.32' width='112.94' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/barplot_xord_asis.svg b/inst/tinytest/_tinysnapshot/barplot_xord_asis.svg
new file mode 100644
index 00000000..72887bb7
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/barplot_xord_asis.svg
@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>g</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>v</text>
+<text x='130.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>z</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>a</text>
+<text x='401.93' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='10.00px' lengthAdjust='spacingAndGlyphs'>m</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='66.32' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='357.71' x2='51.84' y2='357.71' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='284.87' x2='51.84' y2='284.87' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='212.02' x2='51.84' y2='212.02' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='139.17' x2='51.84' y2='139.17' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='66.32' x2='51.84' y2='66.32' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,357.71) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>1</text>
+<text transform='translate(41.76,284.87) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text transform='translate(41.76,212.02) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text transform='translate(41.76,139.17) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,66.32) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='66.32' width='112.94' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='209.93' y='357.71' width='112.94' height='72.85' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='345.46' y='212.02' width='112.94' height='218.54' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/barplot_xord_desc.svg b/inst/tinytest/_tinysnapshot/barplot_xord_desc.svg
new file mode 100644
index 00000000..d6550adf
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/barplot_xord_desc.svg
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='14.67px' lengthAdjust='spacingAndGlyphs'>cyl</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='32.02px' lengthAdjust='spacingAndGlyphs'>Count</text>
+<text x='130.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='401.93' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='66.32' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='378.53' x2='51.84' y2='378.53' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='326.49' x2='51.84' y2='326.49' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='274.46' x2='51.84' y2='274.46' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='222.43' x2='51.84' y2='222.43' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='170.39' x2='51.84' y2='170.39' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='118.36' x2='51.84' y2='118.36' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='66.32' x2='51.84' y2='66.32' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,378.53) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text transform='translate(41.76,326.49) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,274.46) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text transform='translate(41.76,222.43) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text transform='translate(41.76,170.39) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,118.36) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>12</text>
+<text transform='translate(41.76,66.32) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>14</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='66.32' width='112.94' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='209.93' y='144.38' width='112.94' height='286.18' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='345.46' y='248.44' width='112.94' height='182.12' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/barplot_xord_rev.svg b/inst/tinytest/_tinysnapshot/barplot_xord_rev.svg
new file mode 100644
index 00000000..bd58dafc
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/barplot_xord_rev.svg
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='14.67px' lengthAdjust='spacingAndGlyphs'>cyl</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='32.02px' lengthAdjust='spacingAndGlyphs'>Count</text>
+<text x='130.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='401.93' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<line x1='59.04' y1='430.56' x2='59.04' y2='66.32' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='51.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='378.53' x2='51.84' y2='378.53' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='326.49' x2='51.84' y2='326.49' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='274.46' x2='51.84' y2='274.46' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='222.43' x2='51.84' y2='222.43' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='170.39' x2='51.84' y2='170.39' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='118.36' x2='51.84' y2='118.36' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='66.32' x2='51.84' y2='66.32' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,378.53) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text transform='translate(41.76,326.49) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,274.46) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text transform='translate(41.76,222.43) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text transform='translate(41.76,170.39) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,118.36) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>12</text>
+<text transform='translate(41.76,66.32) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>14</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='74.40' y='66.32' width='112.94' height='364.24' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='209.93' y='248.44' width='112.94' height='182.12' style='stroke-width: 0.75; fill: #D3D3D3;' />
+<rect x='345.46' y='144.38' width='112.94' height='286.18' style='stroke-width: 0.75; fill: #D3D3D3;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/test-type_barplot.R b/inst/tinytest/test-type_barplot.R
index a994a37a..f3355cac 100644
--- a/inst/tinytest/test-type_barplot.R
+++ b/inst/tinytest/test-type_barplot.R
@@ -192,3 +192,114 @@ f = function() {
     type = type_barplot(lighten = FALSE), theme = "clean2")
 }
 expect_snapshot_plot(f, label = "barplot_group_lighten_false")
+
+
+#
+## xord -----
+
+# sort bars by height -- not previously possible without relevelling by hand
+f = function() tinyplot(~ cyl, data = mtcars, type = type_barplot(xord = "desc"))
+expect_snapshot_plot(f, label = "barplot_xord_desc")
+
+f = function() tinyplot(~ cyl, data = mtcars, type = type_barplot(xord = "rev"))
+expect_snapshot_plot(f, label = "barplot_xord_rev")
+
+# `xord` must rank the *aggregated* bars, not the raw cells. With unequal cell
+# counts these two order the bars oppositely (means: few>mid>many; sums:
+# many>mid>few), so the pair pins the ranking to whatever FUN actually drew.
+bars = data.frame(
+  g = factor(rep(c("few", "many", "mid"), times = c(1, 6, 3))),
+  v = c(10, rep(3, 6), rep(5, 3))
+)
+
+f = function() tinyplot(v ~ g, data = bars, type = type_barplot(xord = "desc"))
+expect_snapshot_plot(f, label = "barplot_xord_aggregated_mean")
+
+f = function() tinyplot(v ~ g, data = bars, type = type_barplot(xord = "desc", FUN = sum))
+expect_snapshot_plot(f, label = "barplot_xord_aggregated_sum")
+
+
+# `xord` no longer accepts explicit levels; that is what `xlevels` is for
+expect_error(
+  tinyplot(~ cyl, data = mtcars, type = type_barplot(xord = c("8", "6", "4"))),
+  pattern = "must be NULL"
+)
+# and `xlevels` no longer accepts the ord keywords
+# TODO: sanitize_xlevels() warns about the partial match and *then* aborts on
+# the complete miss. expect_error() does not muffle the warning, so it escapes
+# to R's deferred list and surfaces at the end of a suite run. Restore this and
+# the `xlevels = "rev"` case below once the no-match stop() is ordered ahead of
+# the partial-match warning.
+# expect_warning(
+#   tinyplot(~ cyl, data = mtcars, type = type_barplot(xlevels = "asis")),
+#   pattern = "correspond to levels"
+# )
+
+# "start"/"end" name a position along a secondary axis, which x-categories do
+# not have; offering them here would silently alias "desc" (ungrouped) or
+# silently re-read as "first/last `by` level" (grouped)
+expect_error(
+  tinyplot(~ cyl, data = mtcars, type = type_barplot(xord = "end")),
+  pattern = "not available for this plot type"
+)
+
+# a bar is a single aggregate, so it has no variance to rank on: "minvar" is
+# not part of this type's vocabulary at all
+expect_error(
+  tinyplot(~ cyl | vs, data = mtcars, type = type_barplot(xord = "minvar")),
+  pattern = "must be NULL"
+)
+
+# a ranking function may not ask for `x` here: bar categories are a flat set,
+# so the only thing to hand over would be the `by` level index -- a nominal
+# code that lm() would happily regress on and return a meaningless number
+expect_error(
+  tinyplot(~ cyl | vs, data = mtcars,
+           type = type_barplot(xord = function(y, x) coef(lm(y ~ x))[2])),
+  pattern = "no secondary axis"
+)
+# ...but a plain function is fine. "asc" is now the direct route to ascending
+# order, and must agree with the function that used to be the only way there
+f = function() tinyplot(~ cyl, data = mtcars, type = type_barplot(xord = function(y) sum(y)))
+expect_snapshot_plot(f, label = "barplot_xord_ascending")
+
+f = function() tinyplot(~ cyl, data = mtcars, type = type_barplot(xord = "asc"))
+expect_snapshot_plot(f, label = "barplot_xord_ascending")
+
+# naming a strict subset of levels silently dropped the rest to NA, taking
+# those observations out of the plot without a word (#645 follow-up)
+expect_warning(
+  tinyplot(~ cyl, data = mtcars, type = type_barplot(xlevels = c("8", "4"))),
+  pattern = "omits 1 of the 3 levels"
+)
+# and a complete miss is fatal, rather than surfacing later as an unrelated
+# error about zero-length ranges. (Commented out; see the TODO above.)
+# expect_error(
+#   tinyplot(~ cyl, data = mtcars, type = type_barplot(xlevels = "rev")),
+#   pattern = "matches none of the levels"
+# )
+
+asis_dat = data.frame(
+  g = factor(c("z", "z", "a", "m", "m", "m")),   # appearance z,a,m; levels a,m,z
+  v = c(5, 5, 1, 3, 3, 3)
+)
+# what "asis" computes: appearance order, not level order
+expect_equal(
+  levels(tinyplot:::sanitize_ord(asis_dat$g, NULL, NULL, "asis", keywords = tinyplot:::ord_keywords_scalar)),
+  c("z", "a", "m")
+)
+# ...and *where* barplot applies it, which the unit call above cannot check:
+# "asis" has to run before aggregate(), which sorts on the grouping columns and
+# would otherwise leave it returning plain level order. The ranking keywords
+# have the opposite requirement, so the two are applied at different points.
+f = function() tinyplot(v ~ g, data = asis_dat, type = type_barplot(xord = "asis"))
+expect_snapshot_plot(f, label = "barplot_xord_asis")
+
+
+# xaxl dictionary relabelling (replaces deprecated, type-specific xaxalabels)
+f = function() {
+  tinyplot(~ cyl, data = mtcars, type = "barplot",
+           xaxl = c("4" = "four", "6" = "six", "8" = "eight"))
+}
+expect_snapshot_plot(f, label = "barplot_xaxl_dict")
+

From 24b48bd051689d0d5a6409d9bdeb92a8d7eb99ad Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 21:41:34 -0700
Subject: [PATCH 16/23] some extra examples

---
 R/type_barplot.R    | 20 ++++++++++++++++----
 man/type_barplot.Rd | 20 ++++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/R/type_barplot.R b/R/type_barplot.R
index 9c3db69c..90221255 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -74,10 +74,8 @@
 #'   displays consistent and lets the fill read cleanly over grid lines. Set to
 #'   `FALSE` to use the fully-saturated palette colour(s) instead.
 #' @param xaxlabels \[Deprecated\] a character vector with the axis labels for
-#'   the `x` variable. Use the top-level `xaxl` argument instead, which now
-#'   accepts a dictionary mapping old labels to new ones, and applies
-#'   consistently across plot types. This argument will be removed in a future
-#'   release.
+#'   the `x` variable. Use the top-level `xaxl` argument instead (see
+#'   `[tinylabel]`). This argument will be removed in a future release.
 #'
 #' @examples
 #' #
@@ -88,6 +86,11 @@
 #' tinyplot(demand ~ Time, data = BOD, type = "bar") # "bar" is a shorthand
 #' tinyplot_add(type = "text", pos = 3, xpd = NA)    # add y values as text
 #' 
+#' # reordering (just to demonstrate; these aren't sensible for a time variable)
+#' tinyplot(demand ~ Time, data = BOD, type = "bar", xord = "asc")
+#' jumble = c("7","1","5","2","4","3") # note: Time = 6 is also missing
+#' tinyplot(demand ~ Time, data = BOD, type = "bar", xlevels = jumble) 
+#' 
 #' #
 #' ## Aggregated vs grouped values (multiple ys per x)
 #' 
@@ -126,6 +129,15 @@
 #'   type = type_barplot(beside = TRUE, xord = "desc", width = 0.5)
 #' )
 #' 
+#' # speaking of top-level args, use xaxl to format the x labels, e.g. with a
+#' # dictionary, keyword, or (here:) function
+#' 
+#' tinyplot(
+#'   extra ~ ID | drug, data = sleep2,
+#'   type = type_barplot(beside = TRUE, xord = "desc"),
+#'   xaxl = as.roman
+#' )
+#' 
 #' #
 #' ## matrix method (no formula required)
 #' 
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index 8ee1a957..aa722763 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -96,10 +96,8 @@ displays consistent and lets the fill read cleanly over grid lines. Set to
 \code{FALSE} to use the fully-saturated palette colour(s) instead.}
 
 \item{xaxlabels}{[Deprecated] a character vector with the axis labels for
-the \code{x} variable. Use the top-level \code{xaxl} argument instead, which now
-accepts a dictionary mapping old labels to new ones, and applies
-consistently across plot types. This argument will be removed in a future
-release.}
+the \code{x} variable. Use the top-level \code{xaxl} argument instead (see
+\verb{[tinylabel]}). This argument will be removed in a future release.}
 }
 \description{
 Type function for producing barplots. For formulas of type
@@ -117,6 +115,11 @@ tinyplot(GNP ~ Year, data = longley, type = "barplot")
 tinyplot(demand ~ Time, data = BOD, type = "bar") # "bar" is a shorthand
 tinyplot_add(type = "text", pos = 3, xpd = NA)    # add y values as text
 
+# reordering (just to demonstrate; these aren't sensible for a time variable)
+tinyplot(demand ~ Time, data = BOD, type = "bar", xord = "asc")
+jumble = c("7","1","5","2","4","3") # note: Time = 6 is also missing
+tinyplot(demand ~ Time, data = BOD, type = "bar", xlevels = jumble) 
+
 #
 ## Aggregated vs grouped values (multiple ys per x)
 
@@ -154,6 +157,15 @@ tinyplot(
   type = type_barplot(beside = TRUE, xord = "desc", width = 0.5)
 )
 
+# speaking of top-level args, use xaxl to format the x labels, e.g. with a
+# dictionary, keyword, or (here:) function
+
+tinyplot(
+  extra ~ ID | drug, data = sleep2,
+  type = type_barplot(beside = TRUE, xord = "desc"),
+  xaxl = as.roman
+)
+
 #
 ## matrix method (no formula required)
 

From 628d5c1c355a881b75a78fe8744a708fd51c2488 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 21:55:48 -0700
Subject: [PATCH 17/23] x/yord and x/yaxl tests

---
 .../_tinysnapshot/area_stack_byord_asc.svg    |  87 +++++++++++++
 .../_tinysnapshot/area_stack_byord_desc.svg   |  87 +++++++++++++
 .../_tinysnapshot/area_stack_byord_start.svg  |  89 +++++++++++++
 .../_tinysnapshot/area_stack_flip.svg         |   8 +-
 .../tinytest/_tinysnapshot/lines_xord_rev.svg |  64 ++++++++++
 .../_tinysnapshot/points_xord_desc.svg        |  91 ++++++++++++++
 .../_tinysnapshot/points_xord_rev.svg         |  91 ++++++++++++++
 .../_tinysnapshot/ridge_yaxl_dict.svg         |  71 +++++++++++
 .../_tinysnapshot/ridge_yaxl_toupper.svg      |  71 +++++++++++
 .../_tinysnapshot/ridge_yord_minvar.svg       |  67 ++++++++++
 .../tinytest/_tinysnapshot/ridge_yord_rev.svg |  67 ++++++++++
 .../_tinysnapshot/spineplot_xaxl_toupper.svg  |  63 ++++++++++
 .../_tinysnapshot/spineplot_xord_desc.svg     |  70 +++++++++++
 .../_tinysnapshot/spineplot_yaxl_dict.svg     | 118 ++++++++++++++++++
 .../_tinysnapshot/spineplot_yaxl_toupper.svg  | 118 ++++++++++++++++++
 .../_tinysnapshot/spineplot_yord_rev.svg      |  70 +++++++++++
 inst/tinytest/test-type_area.R                |  40 ++++--
 inst/tinytest/test-type_lines.R               |   6 +-
 inst/tinytest/test-type_pointrange.R          |  16 ++-
 inst/tinytest/test-type_points.R              |  37 ++++++
 inst/tinytest/test-type_ridge.R               |  38 ++++++
 inst/tinytest/test-type_spineplot.R           |  48 +++++++
 22 files changed, 1400 insertions(+), 17 deletions(-)
 create mode 100644 inst/tinytest/_tinysnapshot/area_stack_byord_asc.svg
 create mode 100644 inst/tinytest/_tinysnapshot/area_stack_byord_desc.svg
 create mode 100644 inst/tinytest/_tinysnapshot/area_stack_byord_start.svg
 create mode 100644 inst/tinytest/_tinysnapshot/lines_xord_rev.svg
 create mode 100644 inst/tinytest/_tinysnapshot/points_xord_desc.svg
 create mode 100644 inst/tinytest/_tinysnapshot/points_xord_rev.svg
 create mode 100644 inst/tinytest/_tinysnapshot/ridge_yaxl_dict.svg
 create mode 100644 inst/tinytest/_tinysnapshot/ridge_yaxl_toupper.svg
 create mode 100644 inst/tinytest/_tinysnapshot/ridge_yord_minvar.svg
 create mode 100644 inst/tinytest/_tinysnapshot/ridge_yord_rev.svg
 create mode 100644 inst/tinytest/_tinysnapshot/spineplot_xaxl_toupper.svg
 create mode 100644 inst/tinytest/_tinysnapshot/spineplot_xord_desc.svg
 create mode 100644 inst/tinytest/_tinysnapshot/spineplot_yaxl_dict.svg
 create mode 100644 inst/tinytest/_tinysnapshot/spineplot_yaxl_toupper.svg
 create mode 100644 inst/tinytest/_tinysnapshot/spineplot_yord_rev.svg
 create mode 100644 inst/tinytest/test-type_points.R

diff --git a/inst/tinytest/_tinysnapshot/area_stack_byord_asc.svg b/inst/tinytest/_tinysnapshot/area_stack_byord_asc.svg
new file mode 100644
index 00000000..d6a029b2
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/area_stack_byord_asc.svg
@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<rect x='471.31' y='236.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #DF536B; fill: #DF536B;' />
+<rect x='471.31' y='254.43' width='16.75' height='16.75' style='stroke-width: 0.75; fill: #000000;' />
+<text x='482.96' y='225.00' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>grp</text>
+<text x='490.49' y='248.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>a</text>
+<text x='490.49' y='266.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>b</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHw0NTQuNDl8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='454.49' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw0NTQuNDl8MC4wMHw1MDQuMDA=)'>
+<text x='256.76' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>x</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>y</text>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='73.69' y1='430.56' x2='439.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='73.69' y1='430.56' x2='73.69' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='134.71' y1='430.56' x2='134.71' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='195.74' y1='430.56' x2='195.74' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='256.76' y1='430.56' x2='256.76' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='317.79' y1='430.56' x2='317.79' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='378.82' y1='430.56' x2='378.82' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='439.84' y1='430.56' x2='439.84' y2='437.76' style='stroke-width: 0.75;' />
+<text x='73.69' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+<text x='134.71' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.5</text>
+<text x='195.74' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.0</text>
+<text x='256.76' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.5</text>
+<text x='317.79' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.0</text>
+<text x='378.82' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.5</text>
+<text x='439.84' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>4.0</text>
+<line x1='59.04' y1='416.80' x2='59.04' y2='86.03' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='416.80' x2='51.84' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='350.65' x2='51.84' y2='350.65' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='284.49' x2='51.84' y2='284.49' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='218.34' x2='51.84' y2='218.34' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='152.18' x2='51.84' y2='152.18' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='86.03' x2='51.84' y2='86.03' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,350.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text transform='translate(41.76,284.49) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text transform='translate(41.76,218.34) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text>
+<text transform='translate(41.76,152.18) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text>
+<text transform='translate(41.76,86.03) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>100</text>
+<polygon points='59.04,430.56 454.49,430.56 454.49,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDU0LjQ5fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='395.45' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDU0LjQ5fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='73.69,416.80 195.74,416.80 317.79,416.80 439.84,416.80 439.84,403.57 317.79,403.57 195.74,403.57 73.69,403.57 ' style='stroke-width: 0.75; stroke: none; fill: #000000;' />
+<polyline points='73.69,403.57 195.74,403.57 317.79,403.57 439.84,403.57 ' style='stroke-width: 0.75;' />
+<polygon points='73.69,403.57 195.74,403.57 317.79,403.57 439.84,403.57 439.84,72.80 317.79,393.65 195.74,396.95 73.69,400.26 ' style='stroke-width: 0.75; stroke: none; fill: #DF536B;' />
+<polyline points='73.69,400.26 195.74,396.95 317.79,393.65 439.84,72.80 ' style='stroke-width: 0.75; stroke: #DF536B;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/area_stack_byord_desc.svg b/inst/tinytest/_tinysnapshot/area_stack_byord_desc.svg
new file mode 100644
index 00000000..e6d08924
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/area_stack_byord_desc.svg
@@ -0,0 +1,87 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<rect x='471.31' y='236.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #DF536B; fill: #DF536B;' />
+<rect x='471.31' y='254.43' width='16.75' height='16.75' style='stroke-width: 0.75; fill: #000000;' />
+<text x='482.96' y='225.00' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>grp</text>
+<text x='490.49' y='248.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>b</text>
+<text x='490.49' y='266.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>a</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHw0NTQuNDl8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='454.49' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw0NTQuNDl8MC4wMHw1MDQuMDA=)'>
+<text x='256.76' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>x</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>y</text>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='73.69' y1='430.56' x2='439.84' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='73.69' y1='430.56' x2='73.69' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='134.71' y1='430.56' x2='134.71' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='195.74' y1='430.56' x2='195.74' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='256.76' y1='430.56' x2='256.76' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='317.79' y1='430.56' x2='317.79' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='378.82' y1='430.56' x2='378.82' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='439.84' y1='430.56' x2='439.84' y2='437.76' style='stroke-width: 0.75;' />
+<text x='73.69' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+<text x='134.71' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.5</text>
+<text x='195.74' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.0</text>
+<text x='256.76' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.5</text>
+<text x='317.79' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.0</text>
+<text x='378.82' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.5</text>
+<text x='439.84' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>4.0</text>
+<line x1='59.04' y1='416.80' x2='59.04' y2='86.03' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='416.80' x2='51.84' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='350.65' x2='51.84' y2='350.65' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='284.49' x2='51.84' y2='284.49' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='218.34' x2='51.84' y2='218.34' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='152.18' x2='51.84' y2='152.18' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='86.03' x2='51.84' y2='86.03' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,350.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text transform='translate(41.76,284.49) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>40</text>
+<text transform='translate(41.76,218.34) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>60</text>
+<text transform='translate(41.76,152.18) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>80</text>
+<text transform='translate(41.76,86.03) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>100</text>
+<polygon points='59.04,430.56 454.49,430.56 454.49,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDU0LjQ5fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='395.45' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDU0LjQ5fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='73.69,416.80 195.74,416.80 317.79,416.80 439.84,416.80 439.84,86.03 317.79,406.88 195.74,410.18 73.69,413.49 ' style='stroke-width: 0.75; stroke: none; fill: #000000;' />
+<polyline points='73.69,413.49 195.74,410.18 317.79,406.88 439.84,86.03 ' style='stroke-width: 0.75;' />
+<polygon points='73.69,413.49 195.74,410.18 317.79,406.88 439.84,86.03 439.84,72.80 317.79,393.65 195.74,396.95 73.69,400.26 ' style='stroke-width: 0.75; stroke: none; fill: #DF536B;' />
+<polyline points='73.69,400.26 195.74,396.95 317.79,393.65 439.84,72.80 ' style='stroke-width: 0.75; stroke: #DF536B;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/area_stack_byord_start.svg b/inst/tinytest/_tinysnapshot/area_stack_byord_start.svg
new file mode 100644
index 00000000..ec6009f1
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/area_stack_byord_start.svg
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<rect x='469.31' y='227.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #61D04F; fill: #61D04F;' />
+<rect x='469.31' y='245.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #DF536B; fill: #DF536B;' />
+<rect x='469.31' y='263.43' width='16.75' height='16.75' style='stroke-width: 0.75; fill: #000000;' />
+<text x='480.96' y='216.00' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>grp</text>
+<text x='488.49' y='239.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.00px' lengthAdjust='spacingAndGlyphs'>A</text>
+<text x='488.49' y='257.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.00px' lengthAdjust='spacingAndGlyphs'>B</text>
+<text x='488.49' y='275.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.67px' lengthAdjust='spacingAndGlyphs'>C</text>
+</g>
+<defs>
+  <clipPath id='cpMC4wMHw0NTIuNDl8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='452.49' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw0NTIuNDl8MC4wMHw1MDQuMDA=)'>
+<text x='255.76' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.34px' lengthAdjust='spacingAndGlyphs'>year</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='15.34px' lengthAdjust='spacingAndGlyphs'>val</text>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='73.61' y1='430.56' x2='437.92' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='73.61' y1='430.56' x2='73.61' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='164.69' y1='430.56' x2='164.69' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='255.76' y1='430.56' x2='255.76' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='346.84' y1='430.56' x2='346.84' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='437.92' y1='430.56' x2='437.92' y2='437.76' style='stroke-width: 0.75;' />
+<text x='73.61' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.69px' lengthAdjust='spacingAndGlyphs'>2000</text>
+<text x='164.69' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.69px' lengthAdjust='spacingAndGlyphs'>2005</text>
+<text x='255.76' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.69px' lengthAdjust='spacingAndGlyphs'>2010</text>
+<text x='346.84' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.69px' lengthAdjust='spacingAndGlyphs'>2015</text>
+<text x='437.92' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='26.69px' lengthAdjust='spacingAndGlyphs'>2020</text>
+<line x1='59.04' y1='416.80' x2='59.04' y2='80.14' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='416.80' x2='51.84' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='360.69' x2='51.84' y2='360.69' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='304.58' x2='51.84' y2='304.58' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='248.47' x2='51.84' y2='248.47' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='192.36' x2='51.84' y2='192.36' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='136.25' x2='51.84' y2='136.25' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='80.14' x2='51.84' y2='80.14' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>0</text>
+<text transform='translate(41.76,360.69) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text transform='translate(41.76,304.58) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,248.47) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text transform='translate(41.76,192.36) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text transform='translate(41.76,136.25) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,80.14) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>12</text>
+<polygon points='59.04,430.56 452.49,430.56 452.49,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDUyLjQ5fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='393.45' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDUyLjQ5fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='73.61,416.80 91.83,416.80 110.04,416.80 128.26,416.80 146.47,416.80 164.69,416.80 182.90,416.80 201.12,416.80 219.33,416.80 237.55,416.80 255.76,416.80 273.98,416.80 292.19,416.80 310.41,416.80 328.62,416.80 346.84,416.80 365.06,416.80 383.27,416.80 401.49,416.80 419.70,416.80 437.92,416.80 437.92,233.17 419.70,246.83 401.49,264.07 383.27,283.30 365.06,302.71 346.84,320.47 328.62,334.94 310.41,344.83 292.19,349.37 273.98,348.35 255.76,342.21 237.55,331.92 219.33,318.94 201.12,304.99 182.90,291.92 164.69,281.48 146.47,275.13 128.26,273.87 110.04,278.16 91.83,287.82 73.61,302.11 ' style='stroke-width: 0.75; stroke: none; fill: #000000;' />
+<polyline points='73.61,302.11 91.83,287.82 110.04,278.16 128.26,273.87 146.47,275.13 164.69,281.48 182.90,291.92 201.12,304.99 219.33,318.94 237.55,331.92 255.76,342.21 273.98,348.35 292.19,349.37 310.41,344.83 328.62,334.94 346.84,320.47 365.06,302.71 383.27,283.30 401.49,264.07 419.70,246.83 437.92,233.17 ' style='stroke-width: 0.75;' />
+<polygon points='73.61,302.11 91.83,287.82 110.04,278.16 128.26,273.87 146.47,275.13 164.69,281.48 182.90,291.92 201.12,304.99 219.33,318.94 237.55,331.92 255.76,342.21 273.98,348.35 292.19,349.37 310.41,344.83 328.62,334.94 346.84,320.47 365.06,302.71 383.27,283.30 401.49,264.07 419.70,246.83 437.92,233.17 437.92,163.43 419.70,178.25 401.49,196.86 383.27,217.56 365.06,238.45 346.84,257.61 328.62,273.29 310.41,284.13 292.19,289.32 273.98,288.66 255.76,282.58 237.55,272.13 219.33,258.83 201.12,244.51 182.90,231.12 164.69,220.50 146.47,214.20 128.26,213.28 110.04,218.21 91.83,228.82 73.61,244.31 ' style='stroke-width: 0.75; stroke: none; fill: #DF536B;' />
+<polyline points='73.61,244.31 91.83,228.82 110.04,218.21 128.26,213.28 146.47,214.20 164.69,220.50 182.90,231.12 201.12,244.51 219.33,258.83 237.55,272.13 255.76,282.58 273.98,288.66 292.19,289.32 310.41,284.13 328.62,273.29 346.84,257.61 365.06,238.45 383.27,217.56 401.49,196.86 419.70,178.25 437.92,163.43 ' style='stroke-width: 0.75; stroke: #DF536B;' />
+<polygon points='73.61,244.31 91.83,228.82 110.04,218.21 128.26,213.28 146.47,214.20 164.69,220.50 182.90,231.12 201.12,244.51 219.33,258.83 237.55,272.13 255.76,282.58 273.98,288.66 292.19,289.32 310.41,284.13 328.62,273.29 346.84,257.61 365.06,238.45 383.27,217.56 401.49,196.86 419.70,178.25 437.92,163.43 437.92,72.80 419.70,96.55 401.49,126.46 383.27,159.79 365.06,193.44 346.84,224.25 328.62,249.39 310.41,266.64 292.19,274.67 273.98,273.14 255.76,262.78 237.55,245.28 219.33,223.14 201.12,199.33 182.90,177.04 164.69,159.28 146.47,148.56 128.26,146.62 110.04,154.21 91.83,171.08 73.61,195.90 ' style='stroke-width: 0.75; stroke: none; fill: #61D04F;' />
+<polyline points='73.61,195.90 91.83,171.08 110.04,154.21 128.26,146.62 146.47,148.56 164.69,159.28 182.90,177.04 201.12,199.33 219.33,223.14 237.55,245.28 255.76,262.78 273.98,273.14 292.19,274.67 310.41,266.64 328.62,249.39 346.84,224.25 365.06,193.44 383.27,159.79 401.49,126.46 419.70,96.55 437.92,72.80 ' style='stroke-width: 0.75; stroke: #61D04F;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/area_stack_flip.svg b/inst/tinytest/_tinysnapshot/area_stack_flip.svg
index 6836bee9..0a2f8e5c 100644
--- a/inst/tinytest/_tinysnapshot/area_stack_flip.svg
+++ b/inst/tinytest/_tinysnapshot/area_stack_flip.svg
@@ -26,13 +26,13 @@
   </clipPath>
 </defs>
 <g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
-<rect x='469.31' y='227.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #61D04F; fill: #61D04F;' />
+<rect x='469.31' y='227.43' width='16.75' height='16.75' style='stroke-width: 0.75; fill: #000000;' />
 <rect x='469.31' y='245.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #DF536B; fill: #DF536B;' />
-<rect x='469.31' y='263.43' width='16.75' height='16.75' style='stroke-width: 0.75; fill: #000000;' />
+<rect x='469.31' y='263.43' width='16.75' height='16.75' style='stroke-width: 0.75; stroke: #61D04F; fill: #61D04F;' />
 <text x='480.96' y='216.00' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>grp</text>
-<text x='488.49' y='239.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.67px' lengthAdjust='spacingAndGlyphs'>C</text>
+<text x='488.49' y='239.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.00px' lengthAdjust='spacingAndGlyphs'>A</text>
 <text x='488.49' y='257.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.00px' lengthAdjust='spacingAndGlyphs'>B</text>
-<text x='488.49' y='275.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.00px' lengthAdjust='spacingAndGlyphs'>A</text>
+<text x='488.49' y='275.93' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='8.67px' lengthAdjust='spacingAndGlyphs'>C</text>
 </g>
 <defs>
   <clipPath id='cpMC4wMHw0NTIuNDl8MC4wMHw1MDQuMDA='>
diff --git a/inst/tinytest/_tinysnapshot/lines_xord_rev.svg b/inst/tinytest/_tinysnapshot/lines_xord_rev.svg
new file mode 100644
index 00000000..abee4dc7
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/lines_xord_rev.svg
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='30.02px' lengthAdjust='spacingAndGlyphs'>name</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='40.02px' lengthAdjust='spacingAndGlyphs'>runtime</text>
+<line x1='74.40' y1='430.56' x2='458.40' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='74.40' y1='430.56' x2='74.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='266.40' y1='430.56' x2='266.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='458.40' y1='430.56' x2='458.40' y2='437.76' style='stroke-width: 0.75;' />
+<text x='74.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='36.02px' lengthAdjust='spacingAndGlyphs'>Return</text>
+<text x='458.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</text>
+<line x1='59.04' y1='386.89' x2='59.04' y2='87.76' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='386.89' x2='51.84' y2='386.89' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='312.10' x2='51.84' y2='312.10' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='237.32' x2='51.84' y2='237.32' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='162.54' x2='51.84' y2='162.54' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='87.76' x2='51.84' y2='87.76' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,386.89) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>180</text>
+<text transform='translate(41.76,312.10) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>185</text>
+<text transform='translate(41.76,237.32) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>190</text>
+<text transform='translate(41.76,162.54) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>195</text>
+<text transform='translate(41.76,87.76) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>200</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<line x1='451.21' y1='416.52' x2='81.59' y2='402.12' style='stroke-width: 0.75;' />
+<line x1='78.03' y1='395.62' x2='262.77' y2='79.02' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='401.84' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/points_xord_desc.svg b/inst/tinytest/_tinysnapshot/points_xord_desc.svg
new file mode 100644
index 00000000..0f16a85b
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/points_xord_desc.svg
@@ -0,0 +1,91 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='52.67px' lengthAdjust='spacingAndGlyphs'>factor(cyl)</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.34px' lengthAdjust='spacingAndGlyphs'>mpg</text>
+<line x1='74.40' y1='430.56' x2='458.40' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='74.40' y1='430.56' x2='74.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='266.40' y1='430.56' x2='266.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='458.40' y1='430.56' x2='458.40' y2='437.76' style='stroke-width: 0.75;' />
+<text x='74.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='458.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<line x1='59.04' y1='422.66' x2='59.04' y2='129.89' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='422.66' x2='51.84' y2='422.66' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='349.46' x2='51.84' y2='349.46' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='276.27' x2='51.84' y2='276.27' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='203.08' x2='51.84' y2='203.08' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='129.89' x2='51.84' y2='129.89' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,422.66) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,349.46) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>15</text>
+<text transform='translate(41.76,276.27) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text transform='translate(41.76,203.08) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>25</text>
+<text transform='translate(41.76,129.89) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>30</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<circle cx='266.40' cy='261.63' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='261.63' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='235.29' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='255.78' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='295.30' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='304.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='359.71' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='211.86' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='235.29' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='287.98' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='308.48' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='328.97' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='315.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='346.54' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='353.86' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='94.76' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='124.03' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='254.31' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='342.14' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='346.54' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='374.35' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='287.98' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='169.41' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='188.44' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='124.03' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='337.75' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='280.66' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='349.46' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='255.78' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/points_xord_rev.svg b/inst/tinytest/_tinysnapshot/points_xord_rev.svg
new file mode 100644
index 00000000..ae47da1e
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/points_xord_rev.svg
@@ -0,0 +1,91 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='52.67px' lengthAdjust='spacingAndGlyphs'>factor(cyl)</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.34px' lengthAdjust='spacingAndGlyphs'>mpg</text>
+<line x1='74.40' y1='430.56' x2='458.40' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='74.40' y1='430.56' x2='74.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='266.40' y1='430.56' x2='266.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='458.40' y1='430.56' x2='458.40' y2='437.76' style='stroke-width: 0.75;' />
+<text x='74.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<text x='266.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='458.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<line x1='59.04' y1='422.66' x2='59.04' y2='129.89' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='422.66' x2='51.84' y2='422.66' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='349.46' x2='51.84' y2='349.46' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='276.27' x2='51.84' y2='276.27' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='203.08' x2='51.84' y2='203.08' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='129.89' x2='51.84' y2='129.89' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,422.66) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>10</text>
+<text transform='translate(41.76,349.46) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>15</text>
+<text transform='translate(41.76,276.27) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>20</text>
+<text transform='translate(41.76,203.08) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>25</text>
+<text transform='translate(41.76,129.89) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>30</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<circle cx='266.40' cy='261.63' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='261.63' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='235.29' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='255.78' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='295.30' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='304.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='359.71' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='211.86' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='235.29' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='287.98' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='308.48' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='328.97' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='315.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='346.54' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='353.86' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='94.76' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='124.03' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='254.31' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='342.14' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='346.54' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='374.35' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='287.98' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='169.41' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='188.44' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='124.03' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='337.75' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='280.66' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='349.46' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='255.78' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/ridge_yaxl_dict.svg b/inst/tinytest/_tinysnapshot/ridge_yaxl_dict.svg
new file mode 100644
index 00000000..23993016
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/ridge_yaxl_dict.svg
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='64.69px' lengthAdjust='spacingAndGlyphs'>Sepal.Width</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+<line x1='61.15' y1='430.56' x2='423.36' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='61.15' y1='430.56' x2='61.15' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='121.51' y1='430.56' x2='121.51' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='181.88' y1='430.56' x2='181.88' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='242.25' y1='430.56' x2='242.25' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='302.62' y1='430.56' x2='302.62' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='362.99' y1='430.56' x2='362.99' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='423.36' y1='430.56' x2='423.36' y2='437.76' style='stroke-width: 0.75;' />
+<text x='61.15' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.5</text>
+<text x='121.51' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.0</text>
+<text x='181.88' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.5</text>
+<text x='242.25' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.0</text>
+<text x='302.62' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.5</text>
+<text x='362.99' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>4.0</text>
+<text x='423.36' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>4.5</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='98.55,220.15 99.11,220.14 99.67,220.13 100.23,220.12 100.80,220.11 101.36,220.10 101.92,220.08 102.48,220.07 103.05,220.05 103.61,220.03 104.17,220.01 104.73,219.99 105.30,219.97 105.86,219.95 106.42,219.92 106.98,219.89 107.55,219.86 108.11,219.82 108.67,219.79 109.23,219.75 109.80,219.71 110.36,219.67 110.92,219.62 111.48,219.57 112.05,219.52 112.61,219.46 113.17,219.40 113.73,219.34 114.30,219.27 114.86,219.20 115.42,219.12 115.98,219.05 116.55,218.96 117.11,218.88 117.67,218.79 118.23,218.69 118.80,218.59 119.36,218.49 119.92,218.38 120.48,218.27 121.05,218.16 121.61,218.04 122.17,217.91 122.73,217.78 123.30,217.65 123.86,217.52 124.42,217.38 124.98,217.24 125.54,217.09 126.11,216.94 126.67,216.79 127.23,216.63 127.79,216.47 128.36,216.31 128.92,216.15 129.48,215.99 130.04,215.82 130.61,215.65 131.17,215.48 131.73,215.31 132.29,215.14 132.86,214.97 133.42,214.80 133.98,214.62 134.54,214.45 135.11,214.28 135.67,214.11 136.23,213.93 136.79,213.76 137.36,213.59 137.92,213.42 138.48,213.25 139.04,213.09 139.61,212.92 140.17,212.75 140.73,212.58 141.29,212.42 141.86,212.25 142.42,212.08 142.98,211.92 143.54,211.75 144.11,211.58 144.67,211.41 145.23,211.23 145.79,211.05 146.36,210.87 146.92,210.68 147.48,210.49 148.04,210.30 148.61,210.09 149.17,209.88 149.73,209.66 150.29,209.43 150.86,209.19 151.42,208.95 151.98,208.68 152.54,208.41 153.10,208.12 153.67,207.82 154.23,207.50 154.79,207.16 155.35,206.82 155.92,206.44 156.48,206.05 157.04,205.65 157.60,205.22 158.17,204.77 158.73,204.30 159.29,203.80 159.85,203.29 160.42,202.75 160.98,202.19 161.54,201.60 162.10,200.99 162.67,200.36 163.23,199.70 163.79,199.02 164.35,198.32 164.92,197.60 165.48,196.85 166.04,196.08 166.60,195.29 167.17,194.47 167.73,193.64 168.29,192.79 168.85,191.91 169.42,191.02 169.98,190.11 170.54,189.18 171.10,188.24 171.67,187.29 172.23,186.32 172.79,185.33 173.35,184.34 173.92,183.34 174.48,182.32 175.04,181.30 175.60,180.27 176.17,179.23 176.73,178.19 177.29,177.14 177.85,176.09 178.41,175.03 178.98,173.97 179.54,172.91 180.10,171.84 180.66,170.78 181.23,169.71 181.79,168.64 182.35,167.58 182.91,166.51 183.48,165.44 184.04,164.37 184.60,163.31 185.16,162.24 185.73,161.17 186.29,160.10 186.85,159.03 187.41,157.96 187.98,156.89 188.54,155.82 189.10,154.74 189.66,153.66 190.23,152.58 190.79,151.50 191.35,150.41 191.91,149.33 192.48,148.23 193.04,147.13 193.60,146.03 194.16,144.92 194.73,143.81 195.29,142.70 195.85,141.57 196.41,140.45 196.98,139.32 197.54,138.18 198.10,137.04 198.66,135.90 199.23,134.75 199.79,133.60 200.35,132.45 200.91,131.29 201.48,130.13 202.04,128.97 202.60,127.81 203.16,126.66 203.72,125.50 204.29,124.34 204.85,123.19 205.41,122.04 205.97,120.89 206.54,119.75 207.10,118.62 207.66,117.49 208.22,116.37 208.79,115.25 209.35,114.15 209.91,113.05 210.47,111.97 211.04,110.89 211.60,109.82 212.16,108.77 212.72,107.72 213.29,106.69 213.85,105.66 214.41,104.65 214.97,103.65 215.54,102.66 216.10,101.68 216.66,100.71 217.22,99.76 217.79,98.81 218.35,97.88 218.91,96.95 219.47,96.04 220.04,95.13 220.60,94.24 221.16,93.35 221.72,92.48 222.29,91.61 222.85,90.75 223.41,89.90 223.97,89.06 224.54,88.23 225.10,87.41 225.66,86.60 226.22,85.80 226.79,85.02 227.35,84.24 227.91,83.48 228.47,82.73 229.03,81.99 229.60,81.28 230.16,80.58 230.72,79.89 231.28,79.23 231.85,78.59 232.41,77.98 232.97,77.38 233.53,76.82 234.10,76.29 234.66,75.78 235.22,75.31 235.78,74.87 236.35,74.47 236.91,74.11 237.47,73.79 238.03,73.51 238.60,73.27 239.16,73.08 239.72,72.94 240.28,72.84 240.85,72.80 241.41,72.81 241.97,72.86 242.53,72.97 243.10,73.14 243.66,73.36 244.22,73.63 244.78,73.97 245.35,74.35 245.91,74.78 246.47,75.28 247.03,75.83 247.60,76.43 248.16,77.08 248.72,77.80 249.28,78.55 249.85,79.35 250.41,80.21 250.97,81.11 251.53,82.05 252.10,83.05 252.66,84.08 253.22,85.14 253.78,86.25 254.35,87.40 254.91,88.57 255.47,89.78 256.03,91.02 256.59,92.29 257.16,93.57 257.72,94.89 258.28,96.23 258.84,97.58 259.41,98.95 259.97,100.34 260.53,101.74 261.09,103.15 261.66,104.58 262.22,106.01 262.78,107.45 263.34,108.90 263.91,110.35 264.47,111.80 265.03,113.26 265.59,114.72 266.16,116.18 266.72,117.64 267.28,119.10 267.84,120.56 268.41,122.02 268.97,123.47 269.53,124.93 270.09,126.37 270.66,127.82 271.22,129.26 271.78,130.70 272.34,132.13 272.91,133.55 273.47,134.98 274.03,136.39 274.59,137.81 275.16,139.21 275.72,140.61 276.28,142.01 276.84,143.40 277.41,144.79 277.97,146.16 278.53,147.54 279.09,148.90 279.66,150.26 280.22,151.61 280.78,152.96 281.34,154.30 281.90,155.63 282.47,156.95 283.03,158.26 283.59,159.56 284.15,160.86 284.72,162.15 285.28,163.42 285.84,164.68 286.40,165.93 286.97,167.17 287.53,168.39 288.09,169.61 288.65,170.81 289.22,171.99 289.78,173.16 290.34,174.31 290.90,175.45 291.47,176.56 292.03,177.67 292.59,178.75 293.15,179.81 293.72,180.85 294.28,181.88 294.84,182.88 295.40,183.86 295.97,184.82 296.53,185.75 297.09,186.66 297.65,187.56 298.22,188.42 298.78,189.26 299.34,190.08 299.90,190.87 300.47,191.63 301.03,192.38 301.59,193.09 302.15,193.78 302.72,194.45 303.28,195.09 303.84,195.70 304.40,196.28 304.97,196.85 305.53,197.38 306.09,197.89 306.65,198.38 307.21,198.84 307.78,199.28 308.34,199.69 308.90,200.08 309.46,200.44 310.03,200.78 310.59,201.10 311.15,201.40 311.71,201.67 312.28,201.92 312.84,202.15 313.40,202.36 313.96,202.56 314.53,202.73 315.09,202.89 315.65,203.02 316.21,203.15 316.78,203.25 317.34,203.34 317.90,203.42 318.46,203.48 319.03,203.53 319.59,203.56 320.15,203.59 320.71,203.60 321.28,203.61 321.84,203.61 322.40,203.60 322.96,203.58 323.53,203.56 324.09,203.53 324.65,203.50 325.21,203.46 325.78,203.43 326.34,203.39 326.90,203.35 327.46,203.31 328.03,203.27 328.59,203.24 329.15,203.21 329.71,203.18 330.28,203.16 330.84,203.14 331.40,203.13 331.96,203.13 332.53,203.13 333.09,203.14 333.65,203.17 334.21,203.20 334.77,203.24 335.34,203.30 335.90,203.36 336.46,203.43 337.02,203.52 337.59,203.62 338.15,203.74 338.71,203.86 339.27,204.00 339.84,204.15 340.40,204.31 340.96,204.49 341.52,204.68 342.09,204.87 342.65,205.09 343.21,205.31 343.77,205.54 344.34,205.79 344.90,206.05 345.46,206.31 346.02,206.59 346.59,206.87 347.15,207.16 347.71,207.46 348.27,207.77 348.84,208.08 349.40,208.40 349.96,208.72 350.52,209.05 351.09,209.37 351.65,209.71 352.21,210.04 352.77,210.37 353.34,210.71 353.90,211.04 354.46,211.37 355.02,211.70 355.59,212.03 356.15,212.35 356.71,212.68 357.27,212.99 357.84,213.30 358.40,213.61 358.96,213.91 359.52,214.20 360.08,214.49 360.65,214.77 361.21,215.04 361.77,215.31 362.33,215.57 362.90,215.82 363.46,216.06 364.02,216.29 364.58,216.52 365.15,216.73 365.71,216.94 366.27,217.14 366.83,217.33 367.40,217.51 367.96,217.69 368.52,217.85 369.08,218.01 369.65,218.16 370.21,218.30 370.77,218.44 371.33,218.56 371.90,218.69 372.46,218.80 373.02,218.90 373.58,219.01 374.15,219.10 374.71,219.19 375.27,219.27 375.83,219.35 376.40,219.42 376.96,219.49 377.52,219.55 378.08,219.61 378.65,219.66 379.21,219.71 379.77,219.76 380.33,219.80 380.90,219.84 381.46,219.87 382.02,219.91 382.58,219.94 383.15,219.96 383.71,219.99 384.27,220.01 384.83,220.04 385.39,220.05 385.96,220.07 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='98.55,220.15 99.11,220.14 99.67,220.13 100.23,220.12 100.80,220.11 101.36,220.10 101.92,220.08 102.48,220.07 103.05,220.05 103.61,220.03 104.17,220.01 104.73,219.99 105.30,219.97 105.86,219.95 106.42,219.92 106.98,219.89 107.55,219.86 108.11,219.82 108.67,219.79 109.23,219.75 109.80,219.71 110.36,219.67 110.92,219.62 111.48,219.57 112.05,219.52 112.61,219.46 113.17,219.40 113.73,219.34 114.30,219.27 114.86,219.20 115.42,219.12 115.98,219.05 116.55,218.96 117.11,218.88 117.67,218.79 118.23,218.69 118.80,218.59 119.36,218.49 119.92,218.38 120.48,218.27 121.05,218.16 121.61,218.04 122.17,217.91 122.73,217.78 123.30,217.65 123.86,217.52 124.42,217.38 124.98,217.24 125.54,217.09 126.11,216.94 126.67,216.79 127.23,216.63 127.79,216.47 128.36,216.31 128.92,216.15 129.48,215.99 130.04,215.82 130.61,215.65 131.17,215.48 131.73,215.31 132.29,215.14 132.86,214.97 133.42,214.80 133.98,214.62 134.54,214.45 135.11,214.28 135.67,214.11 136.23,213.93 136.79,213.76 137.36,213.59 137.92,213.42 138.48,213.25 139.04,213.09 139.61,212.92 140.17,212.75 140.73,212.58 141.29,212.42 141.86,212.25 142.42,212.08 142.98,211.92 143.54,211.75 144.11,211.58 144.67,211.41 145.23,211.23 145.79,211.05 146.36,210.87 146.92,210.68 147.48,210.49 148.04,210.30 148.61,210.09 149.17,209.88 149.73,209.66 150.29,209.43 150.86,209.19 151.42,208.95 151.98,208.68 152.54,208.41 153.10,208.12 153.67,207.82 154.23,207.50 154.79,207.16 155.35,206.82 155.92,206.44 156.48,206.05 157.04,205.65 157.60,205.22 158.17,204.77 158.73,204.30 159.29,203.80 159.85,203.29 160.42,202.75 160.98,202.19 161.54,201.60 162.10,200.99 162.67,200.36 163.23,199.70 163.79,199.02 164.35,198.32 164.92,197.60 165.48,196.85 166.04,196.08 166.60,195.29 167.17,194.47 167.73,193.64 168.29,192.79 168.85,191.91 169.42,191.02 169.98,190.11 170.54,189.18 171.10,188.24 171.67,187.29 172.23,186.32 172.79,185.33 173.35,184.34 173.92,183.34 174.48,182.32 175.04,181.30 175.60,180.27 176.17,179.23 176.73,178.19 177.29,177.14 177.85,176.09 178.41,175.03 178.98,173.97 179.54,172.91 180.10,171.84 180.66,170.78 181.23,169.71 181.79,168.64 182.35,167.58 182.91,166.51 183.48,165.44 184.04,164.37 184.60,163.31 185.16,162.24 185.73,161.17 186.29,160.10 186.85,159.03 187.41,157.96 187.98,156.89 188.54,155.82 189.10,154.74 189.66,153.66 190.23,152.58 190.79,151.50 191.35,150.41 191.91,149.33 192.48,148.23 193.04,147.13 193.60,146.03 194.16,144.92 194.73,143.81 195.29,142.70 195.85,141.57 196.41,140.45 196.98,139.32 197.54,138.18 198.10,137.04 198.66,135.90 199.23,134.75 199.79,133.60 200.35,132.45 200.91,131.29 201.48,130.13 202.04,128.97 202.60,127.81 203.16,126.66 203.72,125.50 204.29,124.34 204.85,123.19 205.41,122.04 205.97,120.89 206.54,119.75 207.10,118.62 207.66,117.49 208.22,116.37 208.79,115.25 209.35,114.15 209.91,113.05 210.47,111.97 211.04,110.89 211.60,109.82 212.16,108.77 212.72,107.72 213.29,106.69 213.85,105.66 214.41,104.65 214.97,103.65 215.54,102.66 216.10,101.68 216.66,100.71 217.22,99.76 217.79,98.81 218.35,97.88 218.91,96.95 219.47,96.04 220.04,95.13 220.60,94.24 221.16,93.35 221.72,92.48 222.29,91.61 222.85,90.75 223.41,89.90 223.97,89.06 224.54,88.23 225.10,87.41 225.66,86.60 226.22,85.80 226.79,85.02 227.35,84.24 227.91,83.48 228.47,82.73 229.03,81.99 229.60,81.28 230.16,80.58 230.72,79.89 231.28,79.23 231.85,78.59 232.41,77.98 232.97,77.38 233.53,76.82 234.10,76.29 234.66,75.78 235.22,75.31 235.78,74.87 236.35,74.47 236.91,74.11 237.47,73.79 238.03,73.51 238.60,73.27 239.16,73.08 239.72,72.94 240.28,72.84 240.85,72.80 241.41,72.81 241.97,72.86 242.53,72.97 243.10,73.14 243.66,73.36 244.22,73.63 244.78,73.97 245.35,74.35 245.91,74.78 246.47,75.28 247.03,75.83 247.60,76.43 248.16,77.08 248.72,77.80 249.28,78.55 249.85,79.35 250.41,80.21 250.97,81.11 251.53,82.05 252.10,83.05 252.66,84.08 253.22,85.14 253.78,86.25 254.35,87.40 254.91,88.57 255.47,89.78 256.03,91.02 256.59,92.29 257.16,93.57 257.72,94.89 258.28,96.23 258.84,97.58 259.41,98.95 259.97,100.34 260.53,101.74 261.09,103.15 261.66,104.58 262.22,106.01 262.78,107.45 263.34,108.90 263.91,110.35 264.47,111.80 265.03,113.26 265.59,114.72 266.16,116.18 266.72,117.64 267.28,119.10 267.84,120.56 268.41,122.02 268.97,123.47 269.53,124.93 270.09,126.37 270.66,127.82 271.22,129.26 271.78,130.70 272.34,132.13 272.91,133.55 273.47,134.98 274.03,136.39 274.59,137.81 275.16,139.21 275.72,140.61 276.28,142.01 276.84,143.40 277.41,144.79 277.97,146.16 278.53,147.54 279.09,148.90 279.66,150.26 280.22,151.61 280.78,152.96 281.34,154.30 281.90,155.63 282.47,156.95 283.03,158.26 283.59,159.56 284.15,160.86 284.72,162.15 285.28,163.42 285.84,164.68 286.40,165.93 286.97,167.17 287.53,168.39 288.09,169.61 288.65,170.81 289.22,171.99 289.78,173.16 290.34,174.31 290.90,175.45 291.47,176.56 292.03,177.67 292.59,178.75 293.15,179.81 293.72,180.85 294.28,181.88 294.84,182.88 295.40,183.86 295.97,184.82 296.53,185.75 297.09,186.66 297.65,187.56 298.22,188.42 298.78,189.26 299.34,190.08 299.90,190.87 300.47,191.63 301.03,192.38 301.59,193.09 302.15,193.78 302.72,194.45 303.28,195.09 303.84,195.70 304.40,196.28 304.97,196.85 305.53,197.38 306.09,197.89 306.65,198.38 307.21,198.84 307.78,199.28 308.34,199.69 308.90,200.08 309.46,200.44 310.03,200.78 310.59,201.10 311.15,201.40 311.71,201.67 312.28,201.92 312.84,202.15 313.40,202.36 313.96,202.56 314.53,202.73 315.09,202.89 315.65,203.02 316.21,203.15 316.78,203.25 317.34,203.34 317.90,203.42 318.46,203.48 319.03,203.53 319.59,203.56 320.15,203.59 320.71,203.60 321.28,203.61 321.84,203.61 322.40,203.60 322.96,203.58 323.53,203.56 324.09,203.53 324.65,203.50 325.21,203.46 325.78,203.43 326.34,203.39 326.90,203.35 327.46,203.31 328.03,203.27 328.59,203.24 329.15,203.21 329.71,203.18 330.28,203.16 330.84,203.14 331.40,203.13 331.96,203.13 332.53,203.13 333.09,203.14 333.65,203.17 334.21,203.20 334.77,203.24 335.34,203.30 335.90,203.36 336.46,203.43 337.02,203.52 337.59,203.62 338.15,203.74 338.71,203.86 339.27,204.00 339.84,204.15 340.40,204.31 340.96,204.49 341.52,204.68 342.09,204.87 342.65,205.09 343.21,205.31 343.77,205.54 344.34,205.79 344.90,206.05 345.46,206.31 346.02,206.59 346.59,206.87 347.15,207.16 347.71,207.46 348.27,207.77 348.84,208.08 349.40,208.40 349.96,208.72 350.52,209.05 351.09,209.37 351.65,209.71 352.21,210.04 352.77,210.37 353.34,210.71 353.90,211.04 354.46,211.37 355.02,211.70 355.59,212.03 356.15,212.35 356.71,212.68 357.27,212.99 357.84,213.30 358.40,213.61 358.96,213.91 359.52,214.20 360.08,214.49 360.65,214.77 361.21,215.04 361.77,215.31 362.33,215.57 362.90,215.82 363.46,216.06 364.02,216.29 364.58,216.52 365.15,216.73 365.71,216.94 366.27,217.14 366.83,217.33 367.40,217.51 367.96,217.69 368.52,217.85 369.08,218.01 369.65,218.16 370.21,218.30 370.77,218.44 371.33,218.56 371.90,218.69 372.46,218.80 373.02,218.90 373.58,219.01 374.15,219.10 374.71,219.19 375.27,219.27 375.83,219.35 376.40,219.42 376.96,219.49 377.52,219.55 378.08,219.61 378.65,219.66 379.21,219.71 379.77,219.76 380.33,219.80 380.90,219.84 381.46,219.87 382.02,219.91 382.58,219.94 383.15,219.96 383.71,219.99 384.27,220.01 384.83,220.04 385.39,220.05 385.96,220.07 ' style='stroke-width: 0.75;' />
+<polygon points='74.40,318.44 74.92,318.43 75.43,318.42 75.95,318.41 76.46,318.40 76.98,318.39 77.49,318.37 78.01,318.36 78.52,318.35 79.04,318.33 79.55,318.31 80.07,318.30 80.58,318.28 81.10,318.25 81.61,318.23 82.13,318.21 82.64,318.18 83.16,318.15 83.67,318.12 84.19,318.09 84.70,318.06 85.22,318.02 85.73,317.98 86.25,317.94 86.76,317.89 87.28,317.85 87.79,317.80 88.31,317.74 88.83,317.69 89.34,317.63 89.86,317.56 90.37,317.50 90.89,317.43 91.40,317.36 91.92,317.28 92.43,317.20 92.95,317.12 93.46,317.03 93.98,316.93 94.49,316.84 95.01,316.74 95.52,316.63 96.04,316.52 96.55,316.41 97.07,316.29 97.58,316.17 98.10,316.04 98.61,315.91 99.13,315.78 99.64,315.63 100.16,315.49 100.67,315.34 101.19,315.18 101.71,315.02 102.22,314.86 102.74,314.69 103.25,314.52 103.77,314.34 104.28,314.16 104.80,313.98 105.31,313.79 105.83,313.59 106.34,313.39 106.86,313.19 107.37,312.98 107.89,312.77 108.40,312.55 108.92,312.33 109.43,312.11 109.95,311.88 110.46,311.65 110.98,311.41 111.49,311.17 112.01,310.92 112.52,310.67 113.04,310.42 113.55,310.16 114.07,309.90 114.58,309.63 115.10,309.36 115.62,309.08 116.13,308.80 116.65,308.51 117.16,308.22 117.68,307.92 118.19,307.62 118.71,307.31 119.22,306.99 119.74,306.67 120.25,306.34 120.77,306.00 121.28,305.66 121.80,305.31 122.31,304.95 122.83,304.59 123.34,304.21 123.86,303.83 124.37,303.44 124.89,303.04 125.40,302.62 125.92,302.20 126.43,301.78 126.95,301.33 127.46,300.88 127.98,300.42 128.50,299.94 129.01,299.46 129.53,298.97 130.04,298.46 130.56,297.94 131.07,297.41 131.59,296.86 132.10,296.31 132.62,295.74 133.13,295.16 133.65,294.57 134.16,293.97 134.68,293.35 135.19,292.72 135.71,292.09 136.22,291.43 136.74,290.77 137.25,290.10 137.77,289.42 138.28,288.73 138.80,288.03 139.31,287.32 139.83,286.60 140.34,285.87 140.86,285.14 141.37,284.39 141.89,283.64 142.41,282.89 142.92,282.12 143.44,281.36 143.95,280.59 144.47,279.81 144.98,279.03 145.50,278.25 146.01,277.47 146.53,276.68 147.04,275.90 147.56,275.11 148.07,274.33 148.59,273.54 149.10,272.76 149.62,271.98 150.13,271.20 150.65,270.43 151.16,269.66 151.68,268.89 152.19,268.13 152.71,267.38 153.22,266.63 153.74,265.89 154.25,265.16 154.77,264.43 155.28,263.71 155.80,263.00 156.32,262.29 156.83,261.59 157.35,260.91 157.86,260.23 158.38,259.56 158.89,258.90 159.41,258.25 159.92,257.61 160.44,256.98 160.95,256.36 161.47,255.75 161.98,255.15 162.50,254.56 163.01,253.97 163.53,253.41 164.04,252.84 164.56,252.29 165.07,251.75 165.59,251.21 166.10,250.69 166.62,250.17 167.13,249.67 167.65,249.17 168.16,248.68 168.68,248.20 169.20,247.72 169.71,247.26 170.23,246.80 170.74,246.34 171.26,245.90 171.77,245.46 172.29,245.02 172.80,244.59 173.32,244.17 173.83,243.75 174.35,243.34 174.86,242.92 175.38,242.52 175.89,242.11 176.41,241.71 176.92,241.31 177.44,240.91 177.95,240.51 178.47,240.11 178.98,239.71 179.50,239.31 180.01,238.91 180.53,238.50 181.04,238.09 181.56,237.69 182.07,237.27 182.59,236.85 183.11,236.43 183.62,236.01 184.14,235.57 184.65,235.13 185.17,234.68 185.68,234.23 186.20,233.76 186.71,233.29 187.23,232.81 187.74,232.32 188.26,231.82 188.77,231.31 189.29,230.78 189.80,230.25 190.32,229.70 190.83,229.14 191.35,228.57 191.86,227.99 192.38,227.39 192.89,226.78 193.41,226.15 193.92,225.51 194.44,224.86 194.95,224.20 195.47,223.52 195.98,222.83 196.50,222.12 197.02,221.40 197.53,220.66 198.05,219.92 198.56,219.16 199.08,218.38 199.59,217.60 200.11,216.80 200.62,215.99 201.14,215.17 201.65,214.33 202.17,213.49 202.68,212.63 203.20,211.77 203.71,210.90 204.23,210.02 204.74,209.13 205.26,208.23 205.77,207.33 206.29,206.42 206.80,205.51 207.32,204.59 207.83,203.67 208.35,202.75 208.86,201.83 209.38,200.91 209.90,199.98 210.41,199.06 210.93,198.14 211.44,197.23 211.96,196.32 212.47,195.41 212.99,194.51 213.50,193.62 214.02,192.73 214.53,191.86 215.05,191.00 215.56,190.14 216.08,189.31 216.59,188.48 217.11,187.67 217.62,186.88 218.14,186.10 218.65,185.34 219.17,184.61 219.68,183.89 220.20,183.19 220.71,182.52 221.23,181.88 221.74,181.25 222.26,180.66 222.77,180.10 223.29,179.56 223.81,179.05 224.32,178.58 224.84,178.13 225.35,177.72 225.87,177.35 226.38,177.00 226.90,176.70 227.41,176.44 227.93,176.21 228.44,176.02 228.96,175.88 229.47,175.77 229.99,175.70 230.50,175.69 231.02,175.71 231.53,175.76 232.05,175.89 232.56,176.04 233.08,176.23 233.59,176.49 234.11,176.79 234.62,177.12 235.14,177.51 235.65,177.94 236.17,178.42 236.69,178.95 237.20,179.52 237.72,180.13 238.23,180.80 238.75,181.51 239.26,182.26 239.78,183.05 240.29,183.90 240.81,184.78 241.32,185.70 241.84,186.67 242.35,187.67 242.87,188.71 243.38,189.80 243.90,190.91 244.41,192.06 244.93,193.25 245.44,194.46 245.96,195.71 246.47,196.99 246.99,198.29 247.50,199.62 248.02,200.98 248.53,202.36 249.05,203.75 249.56,205.18 250.08,206.62 250.60,208.07 251.11,209.54 251.63,211.03 252.14,212.52 252.66,214.03 253.17,215.54 253.69,217.06 254.20,218.59 254.72,220.12 255.23,221.65 255.75,223.18 256.26,224.72 256.78,226.25 257.29,227.78 257.81,229.31 258.32,230.83 258.84,232.34 259.35,233.85 259.87,235.35 260.38,236.84 260.90,238.32 261.41,239.79 261.93,241.25 262.44,242.69 262.96,244.12 263.47,245.54 263.99,246.94 264.51,248.33 265.02,249.71 265.54,251.07 266.05,252.41 266.57,253.74 267.08,255.05 267.60,256.35 268.11,257.63 268.63,258.89 269.14,260.13 269.66,261.36 270.17,262.57 270.69,263.76 271.20,264.94 271.72,266.09 272.23,267.23 272.75,268.36 273.26,269.47 273.78,270.55 274.29,271.63 274.81,272.68 275.32,273.72 275.84,274.75 276.35,275.76 276.87,276.74 277.39,277.72 277.90,278.68 278.42,279.62 278.93,280.55 279.45,281.47 279.96,282.36 280.48,283.25 280.99,284.12 281.51,284.97 282.02,285.81 282.54,286.64 283.05,287.45 283.57,288.24 284.08,289.03 284.60,289.80 285.11,290.56 285.63,291.31 286.14,292.04 286.66,292.76 287.17,293.47 287.69,294.16 288.20,294.84 288.72,295.51 289.23,296.17 289.75,296.82 290.26,297.46 290.78,298.08 291.30,298.69 291.81,299.29 292.33,299.88 292.84,300.46 293.36,301.03 293.87,301.59 294.39,302.13 294.90,302.67 295.42,303.19 295.93,303.70 296.45,304.21 296.96,304.70 297.48,305.18 297.99,305.65 298.51,306.12 299.02,306.57 299.54,307.01 300.05,307.44 300.57,307.86 301.08,308.27 301.60,308.67 302.11,309.06 302.63,309.44 303.14,309.81 303.66,310.17 304.17,310.52 304.69,310.86 305.21,311.19 305.72,311.51 306.24,311.83 306.75,312.13 307.27,312.42 307.78,312.70 308.30,312.98 308.81,313.24 309.33,313.50 309.84,313.75 310.36,313.99 310.87,314.22 311.39,314.44 311.90,314.65 312.42,314.85 312.93,315.05 313.45,315.24 313.96,315.42 314.48,315.60 314.99,315.76 315.51,315.92 316.02,316.07 316.54,316.22 317.05,316.35 317.57,316.49 318.09,316.61 318.60,316.73 319.12,316.84 319.63,316.95 320.15,317.05 320.66,317.15 321.18,317.24 321.69,317.32 322.21,317.41 322.72,317.48 323.24,317.55 323.75,317.62 324.27,317.69 324.78,317.75 325.30,317.80 325.81,317.86 326.33,317.91 326.84,317.95 327.36,318.00 327.87,318.04 328.39,318.07 328.90,318.11 329.42,318.14 329.93,318.17 330.45,318.20 330.96,318.23 331.48,318.25 332.00,318.27 332.51,318.29 333.03,318.31 333.54,318.33 334.06,318.35 334.57,318.36 335.09,318.38 335.60,318.39 336.12,318.40 336.63,318.41 337.15,318.42 337.66,318.43 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='74.40,318.44 74.92,318.43 75.43,318.42 75.95,318.41 76.46,318.40 76.98,318.39 77.49,318.37 78.01,318.36 78.52,318.35 79.04,318.33 79.55,318.31 80.07,318.30 80.58,318.28 81.10,318.25 81.61,318.23 82.13,318.21 82.64,318.18 83.16,318.15 83.67,318.12 84.19,318.09 84.70,318.06 85.22,318.02 85.73,317.98 86.25,317.94 86.76,317.89 87.28,317.85 87.79,317.80 88.31,317.74 88.83,317.69 89.34,317.63 89.86,317.56 90.37,317.50 90.89,317.43 91.40,317.36 91.92,317.28 92.43,317.20 92.95,317.12 93.46,317.03 93.98,316.93 94.49,316.84 95.01,316.74 95.52,316.63 96.04,316.52 96.55,316.41 97.07,316.29 97.58,316.17 98.10,316.04 98.61,315.91 99.13,315.78 99.64,315.63 100.16,315.49 100.67,315.34 101.19,315.18 101.71,315.02 102.22,314.86 102.74,314.69 103.25,314.52 103.77,314.34 104.28,314.16 104.80,313.98 105.31,313.79 105.83,313.59 106.34,313.39 106.86,313.19 107.37,312.98 107.89,312.77 108.40,312.55 108.92,312.33 109.43,312.11 109.95,311.88 110.46,311.65 110.98,311.41 111.49,311.17 112.01,310.92 112.52,310.67 113.04,310.42 113.55,310.16 114.07,309.90 114.58,309.63 115.10,309.36 115.62,309.08 116.13,308.80 116.65,308.51 117.16,308.22 117.68,307.92 118.19,307.62 118.71,307.31 119.22,306.99 119.74,306.67 120.25,306.34 120.77,306.00 121.28,305.66 121.80,305.31 122.31,304.95 122.83,304.59 123.34,304.21 123.86,303.83 124.37,303.44 124.89,303.04 125.40,302.62 125.92,302.20 126.43,301.78 126.95,301.33 127.46,300.88 127.98,300.42 128.50,299.94 129.01,299.46 129.53,298.97 130.04,298.46 130.56,297.94 131.07,297.41 131.59,296.86 132.10,296.31 132.62,295.74 133.13,295.16 133.65,294.57 134.16,293.97 134.68,293.35 135.19,292.72 135.71,292.09 136.22,291.43 136.74,290.77 137.25,290.10 137.77,289.42 138.28,288.73 138.80,288.03 139.31,287.32 139.83,286.60 140.34,285.87 140.86,285.14 141.37,284.39 141.89,283.64 142.41,282.89 142.92,282.12 143.44,281.36 143.95,280.59 144.47,279.81 144.98,279.03 145.50,278.25 146.01,277.47 146.53,276.68 147.04,275.90 147.56,275.11 148.07,274.33 148.59,273.54 149.10,272.76 149.62,271.98 150.13,271.20 150.65,270.43 151.16,269.66 151.68,268.89 152.19,268.13 152.71,267.38 153.22,266.63 153.74,265.89 154.25,265.16 154.77,264.43 155.28,263.71 155.80,263.00 156.32,262.29 156.83,261.59 157.35,260.91 157.86,260.23 158.38,259.56 158.89,258.90 159.41,258.25 159.92,257.61 160.44,256.98 160.95,256.36 161.47,255.75 161.98,255.15 162.50,254.56 163.01,253.97 163.53,253.41 164.04,252.84 164.56,252.29 165.07,251.75 165.59,251.21 166.10,250.69 166.62,250.17 167.13,249.67 167.65,249.17 168.16,248.68 168.68,248.20 169.20,247.72 169.71,247.26 170.23,246.80 170.74,246.34 171.26,245.90 171.77,245.46 172.29,245.02 172.80,244.59 173.32,244.17 173.83,243.75 174.35,243.34 174.86,242.92 175.38,242.52 175.89,242.11 176.41,241.71 176.92,241.31 177.44,240.91 177.95,240.51 178.47,240.11 178.98,239.71 179.50,239.31 180.01,238.91 180.53,238.50 181.04,238.09 181.56,237.69 182.07,237.27 182.59,236.85 183.11,236.43 183.62,236.01 184.14,235.57 184.65,235.13 185.17,234.68 185.68,234.23 186.20,233.76 186.71,233.29 187.23,232.81 187.74,232.32 188.26,231.82 188.77,231.31 189.29,230.78 189.80,230.25 190.32,229.70 190.83,229.14 191.35,228.57 191.86,227.99 192.38,227.39 192.89,226.78 193.41,226.15 193.92,225.51 194.44,224.86 194.95,224.20 195.47,223.52 195.98,222.83 196.50,222.12 197.02,221.40 197.53,220.66 198.05,219.92 198.56,219.16 199.08,218.38 199.59,217.60 200.11,216.80 200.62,215.99 201.14,215.17 201.65,214.33 202.17,213.49 202.68,212.63 203.20,211.77 203.71,210.90 204.23,210.02 204.74,209.13 205.26,208.23 205.77,207.33 206.29,206.42 206.80,205.51 207.32,204.59 207.83,203.67 208.35,202.75 208.86,201.83 209.38,200.91 209.90,199.98 210.41,199.06 210.93,198.14 211.44,197.23 211.96,196.32 212.47,195.41 212.99,194.51 213.50,193.62 214.02,192.73 214.53,191.86 215.05,191.00 215.56,190.14 216.08,189.31 216.59,188.48 217.11,187.67 217.62,186.88 218.14,186.10 218.65,185.34 219.17,184.61 219.68,183.89 220.20,183.19 220.71,182.52 221.23,181.88 221.74,181.25 222.26,180.66 222.77,180.10 223.29,179.56 223.81,179.05 224.32,178.58 224.84,178.13 225.35,177.72 225.87,177.35 226.38,177.00 226.90,176.70 227.41,176.44 227.93,176.21 228.44,176.02 228.96,175.88 229.47,175.77 229.99,175.70 230.50,175.69 231.02,175.71 231.53,175.76 232.05,175.89 232.56,176.04 233.08,176.23 233.59,176.49 234.11,176.79 234.62,177.12 235.14,177.51 235.65,177.94 236.17,178.42 236.69,178.95 237.20,179.52 237.72,180.13 238.23,180.80 238.75,181.51 239.26,182.26 239.78,183.05 240.29,183.90 240.81,184.78 241.32,185.70 241.84,186.67 242.35,187.67 242.87,188.71 243.38,189.80 243.90,190.91 244.41,192.06 244.93,193.25 245.44,194.46 245.96,195.71 246.47,196.99 246.99,198.29 247.50,199.62 248.02,200.98 248.53,202.36 249.05,203.75 249.56,205.18 250.08,206.62 250.60,208.07 251.11,209.54 251.63,211.03 252.14,212.52 252.66,214.03 253.17,215.54 253.69,217.06 254.20,218.59 254.72,220.12 255.23,221.65 255.75,223.18 256.26,224.72 256.78,226.25 257.29,227.78 257.81,229.31 258.32,230.83 258.84,232.34 259.35,233.85 259.87,235.35 260.38,236.84 260.90,238.32 261.41,239.79 261.93,241.25 262.44,242.69 262.96,244.12 263.47,245.54 263.99,246.94 264.51,248.33 265.02,249.71 265.54,251.07 266.05,252.41 266.57,253.74 267.08,255.05 267.60,256.35 268.11,257.63 268.63,258.89 269.14,260.13 269.66,261.36 270.17,262.57 270.69,263.76 271.20,264.94 271.72,266.09 272.23,267.23 272.75,268.36 273.26,269.47 273.78,270.55 274.29,271.63 274.81,272.68 275.32,273.72 275.84,274.75 276.35,275.76 276.87,276.74 277.39,277.72 277.90,278.68 278.42,279.62 278.93,280.55 279.45,281.47 279.96,282.36 280.48,283.25 280.99,284.12 281.51,284.97 282.02,285.81 282.54,286.64 283.05,287.45 283.57,288.24 284.08,289.03 284.60,289.80 285.11,290.56 285.63,291.31 286.14,292.04 286.66,292.76 287.17,293.47 287.69,294.16 288.20,294.84 288.72,295.51 289.23,296.17 289.75,296.82 290.26,297.46 290.78,298.08 291.30,298.69 291.81,299.29 292.33,299.88 292.84,300.46 293.36,301.03 293.87,301.59 294.39,302.13 294.90,302.67 295.42,303.19 295.93,303.70 296.45,304.21 296.96,304.70 297.48,305.18 297.99,305.65 298.51,306.12 299.02,306.57 299.54,307.01 300.05,307.44 300.57,307.86 301.08,308.27 301.60,308.67 302.11,309.06 302.63,309.44 303.14,309.81 303.66,310.17 304.17,310.52 304.69,310.86 305.21,311.19 305.72,311.51 306.24,311.83 306.75,312.13 307.27,312.42 307.78,312.70 308.30,312.98 308.81,313.24 309.33,313.50 309.84,313.75 310.36,313.99 310.87,314.22 311.39,314.44 311.90,314.65 312.42,314.85 312.93,315.05 313.45,315.24 313.96,315.42 314.48,315.60 314.99,315.76 315.51,315.92 316.02,316.07 316.54,316.22 317.05,316.35 317.57,316.49 318.09,316.61 318.60,316.73 319.12,316.84 319.63,316.95 320.15,317.05 320.66,317.15 321.18,317.24 321.69,317.32 322.21,317.41 322.72,317.48 323.24,317.55 323.75,317.62 324.27,317.69 324.78,317.75 325.30,317.80 325.81,317.86 326.33,317.91 326.84,317.95 327.36,318.00 327.87,318.04 328.39,318.07 328.90,318.11 329.42,318.14 329.93,318.17 330.45,318.20 330.96,318.23 331.48,318.25 332.00,318.27 332.51,318.29 333.03,318.31 333.54,318.33 334.06,318.35 334.57,318.36 335.09,318.38 335.60,318.39 336.12,318.40 336.63,318.41 337.15,318.42 337.66,318.43 ' style='stroke-width: 0.75;' />
+<polygon points='110.62,416.72 111.30,416.71 111.98,416.70 112.66,416.69 113.34,416.67 114.02,416.65 114.70,416.63 115.39,416.61 116.07,416.59 116.75,416.57 117.43,416.54 118.11,416.51 118.79,416.47 119.47,416.44 120.15,416.40 120.83,416.35 121.51,416.31 122.19,416.26 122.87,416.20 123.55,416.14 124.23,416.08 124.91,416.01 125.59,415.93 126.27,415.85 126.96,415.77 127.64,415.68 128.32,415.58 129.00,415.48 129.68,415.37 130.36,415.26 131.04,415.14 131.72,415.02 132.40,414.89 133.08,414.75 133.76,414.61 134.44,414.46 135.12,414.31 135.80,414.15 136.48,413.99 137.16,413.82 137.84,413.65 138.53,413.48 139.21,413.30 139.89,413.12 140.57,412.94 141.25,412.75 141.93,412.57 142.61,412.38 143.29,412.20 143.97,412.02 144.65,411.84 145.33,411.66 146.01,411.49 146.69,411.32 147.37,411.15 148.05,410.99 148.73,410.84 149.41,410.70 150.10,410.56 150.78,410.44 151.46,410.32 152.14,410.21 152.82,410.12 153.50,410.03 154.18,409.96 154.86,409.90 155.54,409.85 156.22,409.81 156.90,409.79 157.58,409.78 158.26,409.79 158.94,409.80 159.62,409.83 160.30,409.88 160.98,409.93 161.67,410.00 162.35,410.08 163.03,410.17 163.71,410.27 164.39,410.38 165.07,410.50 165.75,410.64 166.43,410.77 167.11,410.92 167.79,411.08 168.47,411.24 169.15,411.40 169.83,411.58 170.51,411.75 171.19,411.93 171.87,412.11 172.55,412.29 173.24,412.47 173.92,412.65 174.60,412.84 175.28,413.01 175.96,413.19 176.64,413.37 177.32,413.54 178.00,413.70 178.68,413.87 179.36,414.03 180.04,414.18 180.72,414.32 181.40,414.46 182.08,414.59 182.76,414.72 183.44,414.83 184.12,414.94 184.81,415.05 185.49,415.14 186.17,415.22 186.85,415.29 187.53,415.36 188.21,415.41 188.89,415.46 189.57,415.49 190.25,415.51 190.93,415.52 191.61,415.52 192.29,415.51 192.97,415.48 193.65,415.44 194.33,415.39 195.01,415.32 195.69,415.24 196.37,415.14 197.06,415.02 197.74,414.89 198.42,414.73 199.10,414.56 199.78,414.36 200.46,414.14 201.14,413.90 201.82,413.64 202.50,413.35 203.18,413.02 203.86,412.67 204.54,412.30 205.22,411.89 205.90,411.44 206.58,410.96 207.26,410.45 207.94,409.90 208.63,409.31 209.31,408.67 209.99,408.01 210.67,407.29 211.35,406.52 212.03,405.72 212.71,404.87 213.39,403.96 214.07,403.01 214.75,402.01 215.43,400.97 216.11,399.86 216.79,398.71 217.47,397.51 218.15,396.26 218.83,394.95 219.51,393.60 220.20,392.21 220.88,390.75 221.56,389.25 222.24,387.72 222.92,386.14 223.60,384.51 224.28,382.84 224.96,381.14 225.64,379.41 226.32,377.63 227.00,375.84 227.68,374.02 228.36,372.18 229.04,370.32 229.72,368.44 230.40,366.56 231.08,364.67 231.77,362.77 232.45,360.88 233.13,358.99 233.81,357.12 234.49,355.26 235.17,353.41 235.85,351.59 236.53,349.80 237.21,348.03 237.89,346.30 238.57,344.60 239.25,342.95 239.93,341.34 240.61,339.77 241.29,338.25 241.97,336.80 242.65,335.38 243.34,334.02 244.02,332.72 244.70,331.49 245.38,330.30 246.06,329.16 246.74,328.11 247.42,327.10 248.10,326.15 248.78,325.25 249.46,324.43 250.14,323.65 250.82,322.92 251.50,322.25 252.18,321.63 252.86,321.05 253.54,320.51 254.22,320.03 254.91,319.58 255.59,319.16 256.27,318.77 256.95,318.42 257.63,318.09 258.31,317.78 258.99,317.49 259.67,317.21 260.35,316.94 261.03,316.68 261.71,316.42 262.39,316.15 263.07,315.88 263.75,315.61 264.43,315.31 265.11,315.01 265.79,314.68 266.48,314.34 267.16,313.97 267.84,313.57 268.52,313.14 269.20,312.69 269.88,312.20 270.56,311.68 271.24,311.13 271.92,310.54 272.60,309.92 273.28,309.26 273.96,308.58 274.64,307.86 275.32,307.11 276.00,306.34 276.68,305.55 277.36,304.73 278.05,303.89 278.73,303.04 279.41,302.17 280.09,301.30 280.77,300.42 281.45,299.55 282.13,298.68 282.81,297.83 283.49,296.99 284.17,296.17 284.85,295.38 285.53,294.63 286.21,293.91 286.89,293.22 287.57,292.59 288.25,292.01 288.93,291.49 289.62,291.01 290.30,290.62 290.98,290.29 291.66,290.02 292.34,289.82 293.02,289.71 293.70,289.68 294.38,289.71 295.06,289.83 295.74,290.04 296.42,290.32 297.10,290.67 297.78,291.12 298.46,291.64 299.14,292.23 299.82,292.89 300.50,293.64 301.18,294.45 301.87,295.32 302.55,296.24 303.23,297.25 303.91,298.29 304.59,299.38 305.27,300.52 305.95,301.70 306.63,302.91 307.31,304.15 307.99,305.43 308.67,306.72 309.35,308.02 310.03,309.34 310.71,310.66 311.39,311.99 312.07,313.31 312.75,314.64 313.44,315.94 314.12,317.24 314.80,318.52 315.48,319.79 316.16,321.02 316.84,322.24 317.52,323.44 318.20,324.60 318.88,325.73 319.56,326.84 320.24,327.92 320.92,328.97 321.60,329.98 322.28,330.97 322.96,331.93 323.64,332.85 324.32,333.75 325.01,334.63 325.69,335.48 326.37,336.31 327.05,337.11 327.73,337.90 328.41,338.67 329.09,339.43 329.77,340.17 330.45,340.90 331.13,341.63 331.81,342.35 332.49,343.06 333.17,343.77 333.85,344.49 334.53,345.20 335.21,345.92 335.89,346.65 336.58,347.38 337.26,348.12 337.94,348.88 338.62,349.64 339.30,350.42 339.98,351.21 340.66,352.01 341.34,352.83 342.02,353.66 342.70,354.51 343.38,355.37 344.06,356.24 344.74,357.13 345.42,358.03 346.10,358.94 346.78,359.86 347.46,360.80 348.15,361.74 348.83,362.68 349.51,363.64 350.19,364.60 350.87,365.56 351.55,366.52 352.23,367.48 352.91,368.45 353.59,369.40 354.27,370.36 354.95,371.30 355.63,372.24 356.31,373.18 356.99,374.09 357.67,375.00 358.35,375.90 359.03,376.78 359.72,377.64 360.40,378.49 361.08,379.33 361.76,380.14 362.44,380.94 363.12,381.72 363.80,382.48 364.48,383.22 365.16,383.94 365.84,384.64 366.52,385.33 367.20,385.99 367.88,386.63 368.56,387.26 369.24,387.86 369.92,388.45 370.60,389.02 371.29,389.57 371.97,390.11 372.65,390.63 373.33,391.13 374.01,391.62 374.69,392.10 375.37,392.56 376.05,393.01 376.73,393.45 377.41,393.87 378.09,394.29 378.77,394.69 379.45,395.09 380.13,395.47 380.81,395.85 381.49,396.22 382.17,396.58 382.86,396.93 383.54,397.28 384.22,397.62 384.90,397.95 385.58,398.27 386.26,398.59 386.94,398.91 387.62,399.21 388.30,399.51 388.98,399.81 389.66,400.10 390.34,400.38 391.02,400.66 391.70,400.93 392.38,401.19 393.06,401.45 393.74,401.71 394.43,401.95 395.11,402.20 395.79,402.44 396.47,402.67 397.15,402.90 397.83,403.12 398.51,403.34 399.19,403.55 399.87,403.76 400.55,403.97 401.23,404.17 401.91,404.37 402.59,404.57 403.27,404.77 403.95,404.96 404.63,405.16 405.31,405.35 405.99,405.54 406.68,405.73 407.36,405.93 408.04,406.12 408.72,406.31 409.40,406.51 410.08,406.71 410.76,406.91 411.44,407.11 412.12,407.31 412.80,407.52 413.48,407.73 414.16,407.94 414.84,408.16 415.52,408.37 416.20,408.59 416.88,408.82 417.56,409.04 418.25,409.27 418.93,409.50 419.61,409.73 420.29,409.96 420.97,410.20 421.65,410.43 422.33,410.66 423.01,410.90 423.69,411.13 424.37,411.36 425.05,411.59 425.73,411.82 426.41,412.04 427.09,412.26 427.77,412.48 428.45,412.69 429.13,412.90 429.82,413.10 430.50,413.30 431.18,413.50 431.86,413.69 432.54,413.87 433.22,414.05 433.90,414.22 434.58,414.38 435.26,414.54 435.94,414.69 436.62,414.83 437.30,414.97 437.98,415.10 438.66,415.23 439.34,415.34 440.02,415.46 440.70,415.56 441.39,415.66 442.07,415.75 442.75,415.84 443.43,415.92 444.11,416.00 444.79,416.07 445.47,416.13 446.15,416.20 446.83,416.25 447.51,416.30 448.19,416.35 448.87,416.40 449.55,416.44 450.23,416.47 450.91,416.51 451.59,416.54 452.27,416.56 452.96,416.59 453.64,416.61 454.32,416.63 455.00,416.65 455.68,416.67 456.36,416.68 457.04,416.70 457.72,416.71 458.40,416.72 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='110.62,416.72 111.30,416.71 111.98,416.70 112.66,416.69 113.34,416.67 114.02,416.65 114.70,416.63 115.39,416.61 116.07,416.59 116.75,416.57 117.43,416.54 118.11,416.51 118.79,416.47 119.47,416.44 120.15,416.40 120.83,416.35 121.51,416.31 122.19,416.26 122.87,416.20 123.55,416.14 124.23,416.08 124.91,416.01 125.59,415.93 126.27,415.85 126.96,415.77 127.64,415.68 128.32,415.58 129.00,415.48 129.68,415.37 130.36,415.26 131.04,415.14 131.72,415.02 132.40,414.89 133.08,414.75 133.76,414.61 134.44,414.46 135.12,414.31 135.80,414.15 136.48,413.99 137.16,413.82 137.84,413.65 138.53,413.48 139.21,413.30 139.89,413.12 140.57,412.94 141.25,412.75 141.93,412.57 142.61,412.38 143.29,412.20 143.97,412.02 144.65,411.84 145.33,411.66 146.01,411.49 146.69,411.32 147.37,411.15 148.05,410.99 148.73,410.84 149.41,410.70 150.10,410.56 150.78,410.44 151.46,410.32 152.14,410.21 152.82,410.12 153.50,410.03 154.18,409.96 154.86,409.90 155.54,409.85 156.22,409.81 156.90,409.79 157.58,409.78 158.26,409.79 158.94,409.80 159.62,409.83 160.30,409.88 160.98,409.93 161.67,410.00 162.35,410.08 163.03,410.17 163.71,410.27 164.39,410.38 165.07,410.50 165.75,410.64 166.43,410.77 167.11,410.92 167.79,411.08 168.47,411.24 169.15,411.40 169.83,411.58 170.51,411.75 171.19,411.93 171.87,412.11 172.55,412.29 173.24,412.47 173.92,412.65 174.60,412.84 175.28,413.01 175.96,413.19 176.64,413.37 177.32,413.54 178.00,413.70 178.68,413.87 179.36,414.03 180.04,414.18 180.72,414.32 181.40,414.46 182.08,414.59 182.76,414.72 183.44,414.83 184.12,414.94 184.81,415.05 185.49,415.14 186.17,415.22 186.85,415.29 187.53,415.36 188.21,415.41 188.89,415.46 189.57,415.49 190.25,415.51 190.93,415.52 191.61,415.52 192.29,415.51 192.97,415.48 193.65,415.44 194.33,415.39 195.01,415.32 195.69,415.24 196.37,415.14 197.06,415.02 197.74,414.89 198.42,414.73 199.10,414.56 199.78,414.36 200.46,414.14 201.14,413.90 201.82,413.64 202.50,413.35 203.18,413.02 203.86,412.67 204.54,412.30 205.22,411.89 205.90,411.44 206.58,410.96 207.26,410.45 207.94,409.90 208.63,409.31 209.31,408.67 209.99,408.01 210.67,407.29 211.35,406.52 212.03,405.72 212.71,404.87 213.39,403.96 214.07,403.01 214.75,402.01 215.43,400.97 216.11,399.86 216.79,398.71 217.47,397.51 218.15,396.26 218.83,394.95 219.51,393.60 220.20,392.21 220.88,390.75 221.56,389.25 222.24,387.72 222.92,386.14 223.60,384.51 224.28,382.84 224.96,381.14 225.64,379.41 226.32,377.63 227.00,375.84 227.68,374.02 228.36,372.18 229.04,370.32 229.72,368.44 230.40,366.56 231.08,364.67 231.77,362.77 232.45,360.88 233.13,358.99 233.81,357.12 234.49,355.26 235.17,353.41 235.85,351.59 236.53,349.80 237.21,348.03 237.89,346.30 238.57,344.60 239.25,342.95 239.93,341.34 240.61,339.77 241.29,338.25 241.97,336.80 242.65,335.38 243.34,334.02 244.02,332.72 244.70,331.49 245.38,330.30 246.06,329.16 246.74,328.11 247.42,327.10 248.10,326.15 248.78,325.25 249.46,324.43 250.14,323.65 250.82,322.92 251.50,322.25 252.18,321.63 252.86,321.05 253.54,320.51 254.22,320.03 254.91,319.58 255.59,319.16 256.27,318.77 256.95,318.42 257.63,318.09 258.31,317.78 258.99,317.49 259.67,317.21 260.35,316.94 261.03,316.68 261.71,316.42 262.39,316.15 263.07,315.88 263.75,315.61 264.43,315.31 265.11,315.01 265.79,314.68 266.48,314.34 267.16,313.97 267.84,313.57 268.52,313.14 269.20,312.69 269.88,312.20 270.56,311.68 271.24,311.13 271.92,310.54 272.60,309.92 273.28,309.26 273.96,308.58 274.64,307.86 275.32,307.11 276.00,306.34 276.68,305.55 277.36,304.73 278.05,303.89 278.73,303.04 279.41,302.17 280.09,301.30 280.77,300.42 281.45,299.55 282.13,298.68 282.81,297.83 283.49,296.99 284.17,296.17 284.85,295.38 285.53,294.63 286.21,293.91 286.89,293.22 287.57,292.59 288.25,292.01 288.93,291.49 289.62,291.01 290.30,290.62 290.98,290.29 291.66,290.02 292.34,289.82 293.02,289.71 293.70,289.68 294.38,289.71 295.06,289.83 295.74,290.04 296.42,290.32 297.10,290.67 297.78,291.12 298.46,291.64 299.14,292.23 299.82,292.89 300.50,293.64 301.18,294.45 301.87,295.32 302.55,296.24 303.23,297.25 303.91,298.29 304.59,299.38 305.27,300.52 305.95,301.70 306.63,302.91 307.31,304.15 307.99,305.43 308.67,306.72 309.35,308.02 310.03,309.34 310.71,310.66 311.39,311.99 312.07,313.31 312.75,314.64 313.44,315.94 314.12,317.24 314.80,318.52 315.48,319.79 316.16,321.02 316.84,322.24 317.52,323.44 318.20,324.60 318.88,325.73 319.56,326.84 320.24,327.92 320.92,328.97 321.60,329.98 322.28,330.97 322.96,331.93 323.64,332.85 324.32,333.75 325.01,334.63 325.69,335.48 326.37,336.31 327.05,337.11 327.73,337.90 328.41,338.67 329.09,339.43 329.77,340.17 330.45,340.90 331.13,341.63 331.81,342.35 332.49,343.06 333.17,343.77 333.85,344.49 334.53,345.20 335.21,345.92 335.89,346.65 336.58,347.38 337.26,348.12 337.94,348.88 338.62,349.64 339.30,350.42 339.98,351.21 340.66,352.01 341.34,352.83 342.02,353.66 342.70,354.51 343.38,355.37 344.06,356.24 344.74,357.13 345.42,358.03 346.10,358.94 346.78,359.86 347.46,360.80 348.15,361.74 348.83,362.68 349.51,363.64 350.19,364.60 350.87,365.56 351.55,366.52 352.23,367.48 352.91,368.45 353.59,369.40 354.27,370.36 354.95,371.30 355.63,372.24 356.31,373.18 356.99,374.09 357.67,375.00 358.35,375.90 359.03,376.78 359.72,377.64 360.40,378.49 361.08,379.33 361.76,380.14 362.44,380.94 363.12,381.72 363.80,382.48 364.48,383.22 365.16,383.94 365.84,384.64 366.52,385.33 367.20,385.99 367.88,386.63 368.56,387.26 369.24,387.86 369.92,388.45 370.60,389.02 371.29,389.57 371.97,390.11 372.65,390.63 373.33,391.13 374.01,391.62 374.69,392.10 375.37,392.56 376.05,393.01 376.73,393.45 377.41,393.87 378.09,394.29 378.77,394.69 379.45,395.09 380.13,395.47 380.81,395.85 381.49,396.22 382.17,396.58 382.86,396.93 383.54,397.28 384.22,397.62 384.90,397.95 385.58,398.27 386.26,398.59 386.94,398.91 387.62,399.21 388.30,399.51 388.98,399.81 389.66,400.10 390.34,400.38 391.02,400.66 391.70,400.93 392.38,401.19 393.06,401.45 393.74,401.71 394.43,401.95 395.11,402.20 395.79,402.44 396.47,402.67 397.15,402.90 397.83,403.12 398.51,403.34 399.19,403.55 399.87,403.76 400.55,403.97 401.23,404.17 401.91,404.37 402.59,404.57 403.27,404.77 403.95,404.96 404.63,405.16 405.31,405.35 405.99,405.54 406.68,405.73 407.36,405.93 408.04,406.12 408.72,406.31 409.40,406.51 410.08,406.71 410.76,406.91 411.44,407.11 412.12,407.31 412.80,407.52 413.48,407.73 414.16,407.94 414.84,408.16 415.52,408.37 416.20,408.59 416.88,408.82 417.56,409.04 418.25,409.27 418.93,409.50 419.61,409.73 420.29,409.96 420.97,410.20 421.65,410.43 422.33,410.66 423.01,410.90 423.69,411.13 424.37,411.36 425.05,411.59 425.73,411.82 426.41,412.04 427.09,412.26 427.77,412.48 428.45,412.69 429.13,412.90 429.82,413.10 430.50,413.30 431.18,413.50 431.86,413.69 432.54,413.87 433.22,414.05 433.90,414.22 434.58,414.38 435.26,414.54 435.94,414.69 436.62,414.83 437.30,414.97 437.98,415.10 438.66,415.23 439.34,415.34 440.02,415.46 440.70,415.56 441.39,415.66 442.07,415.75 442.75,415.84 443.43,415.92 444.11,416.00 444.79,416.07 445.47,416.13 446.15,416.20 446.83,416.25 447.51,416.30 448.19,416.35 448.87,416.40 449.55,416.44 450.23,416.47 450.91,416.51 451.59,416.54 452.27,416.56 452.96,416.59 453.64,416.61 454.32,416.63 455.00,416.65 455.68,416.67 456.36,416.68 457.04,416.70 457.72,416.71 458.40,416.72 ' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='59.04' y1='416.80' x2='59.04' y2='220.23' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='416.80' x2='51.84' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='318.51' x2='51.84' y2='318.51' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='220.23' x2='51.84' y2='220.23' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.33px' lengthAdjust='spacingAndGlyphs'>SET</text>
+<text transform='translate(41.76,318.51) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='51.36px' lengthAdjust='spacingAndGlyphs'>versicolor</text>
+<text transform='translate(41.76,220.23) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.00px' lengthAdjust='spacingAndGlyphs'>VIR</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/ridge_yaxl_toupper.svg b/inst/tinytest/_tinysnapshot/ridge_yaxl_toupper.svg
new file mode 100644
index 00000000..ad718faf
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/ridge_yaxl_toupper.svg
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='64.69px' lengthAdjust='spacingAndGlyphs'>Sepal.Width</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+<line x1='61.15' y1='430.56' x2='423.36' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='61.15' y1='430.56' x2='61.15' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='121.51' y1='430.56' x2='121.51' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='181.88' y1='430.56' x2='181.88' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='242.25' y1='430.56' x2='242.25' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='302.62' y1='430.56' x2='302.62' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='362.99' y1='430.56' x2='362.99' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='423.36' y1='430.56' x2='423.36' y2='437.76' style='stroke-width: 0.75;' />
+<text x='61.15' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.5</text>
+<text x='121.51' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.0</text>
+<text x='181.88' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.5</text>
+<text x='242.25' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.0</text>
+<text x='302.62' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.5</text>
+<text x='362.99' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>4.0</text>
+<text x='423.36' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>4.5</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='98.55,220.15 99.11,220.14 99.67,220.13 100.23,220.12 100.80,220.11 101.36,220.10 101.92,220.08 102.48,220.07 103.05,220.05 103.61,220.03 104.17,220.01 104.73,219.99 105.30,219.97 105.86,219.95 106.42,219.92 106.98,219.89 107.55,219.86 108.11,219.82 108.67,219.79 109.23,219.75 109.80,219.71 110.36,219.67 110.92,219.62 111.48,219.57 112.05,219.52 112.61,219.46 113.17,219.40 113.73,219.34 114.30,219.27 114.86,219.20 115.42,219.12 115.98,219.05 116.55,218.96 117.11,218.88 117.67,218.79 118.23,218.69 118.80,218.59 119.36,218.49 119.92,218.38 120.48,218.27 121.05,218.16 121.61,218.04 122.17,217.91 122.73,217.78 123.30,217.65 123.86,217.52 124.42,217.38 124.98,217.24 125.54,217.09 126.11,216.94 126.67,216.79 127.23,216.63 127.79,216.47 128.36,216.31 128.92,216.15 129.48,215.99 130.04,215.82 130.61,215.65 131.17,215.48 131.73,215.31 132.29,215.14 132.86,214.97 133.42,214.80 133.98,214.62 134.54,214.45 135.11,214.28 135.67,214.11 136.23,213.93 136.79,213.76 137.36,213.59 137.92,213.42 138.48,213.25 139.04,213.09 139.61,212.92 140.17,212.75 140.73,212.58 141.29,212.42 141.86,212.25 142.42,212.08 142.98,211.92 143.54,211.75 144.11,211.58 144.67,211.41 145.23,211.23 145.79,211.05 146.36,210.87 146.92,210.68 147.48,210.49 148.04,210.30 148.61,210.09 149.17,209.88 149.73,209.66 150.29,209.43 150.86,209.19 151.42,208.95 151.98,208.68 152.54,208.41 153.10,208.12 153.67,207.82 154.23,207.50 154.79,207.16 155.35,206.82 155.92,206.44 156.48,206.05 157.04,205.65 157.60,205.22 158.17,204.77 158.73,204.30 159.29,203.80 159.85,203.29 160.42,202.75 160.98,202.19 161.54,201.60 162.10,200.99 162.67,200.36 163.23,199.70 163.79,199.02 164.35,198.32 164.92,197.60 165.48,196.85 166.04,196.08 166.60,195.29 167.17,194.47 167.73,193.64 168.29,192.79 168.85,191.91 169.42,191.02 169.98,190.11 170.54,189.18 171.10,188.24 171.67,187.29 172.23,186.32 172.79,185.33 173.35,184.34 173.92,183.34 174.48,182.32 175.04,181.30 175.60,180.27 176.17,179.23 176.73,178.19 177.29,177.14 177.85,176.09 178.41,175.03 178.98,173.97 179.54,172.91 180.10,171.84 180.66,170.78 181.23,169.71 181.79,168.64 182.35,167.58 182.91,166.51 183.48,165.44 184.04,164.37 184.60,163.31 185.16,162.24 185.73,161.17 186.29,160.10 186.85,159.03 187.41,157.96 187.98,156.89 188.54,155.82 189.10,154.74 189.66,153.66 190.23,152.58 190.79,151.50 191.35,150.41 191.91,149.33 192.48,148.23 193.04,147.13 193.60,146.03 194.16,144.92 194.73,143.81 195.29,142.70 195.85,141.57 196.41,140.45 196.98,139.32 197.54,138.18 198.10,137.04 198.66,135.90 199.23,134.75 199.79,133.60 200.35,132.45 200.91,131.29 201.48,130.13 202.04,128.97 202.60,127.81 203.16,126.66 203.72,125.50 204.29,124.34 204.85,123.19 205.41,122.04 205.97,120.89 206.54,119.75 207.10,118.62 207.66,117.49 208.22,116.37 208.79,115.25 209.35,114.15 209.91,113.05 210.47,111.97 211.04,110.89 211.60,109.82 212.16,108.77 212.72,107.72 213.29,106.69 213.85,105.66 214.41,104.65 214.97,103.65 215.54,102.66 216.10,101.68 216.66,100.71 217.22,99.76 217.79,98.81 218.35,97.88 218.91,96.95 219.47,96.04 220.04,95.13 220.60,94.24 221.16,93.35 221.72,92.48 222.29,91.61 222.85,90.75 223.41,89.90 223.97,89.06 224.54,88.23 225.10,87.41 225.66,86.60 226.22,85.80 226.79,85.02 227.35,84.24 227.91,83.48 228.47,82.73 229.03,81.99 229.60,81.28 230.16,80.58 230.72,79.89 231.28,79.23 231.85,78.59 232.41,77.98 232.97,77.38 233.53,76.82 234.10,76.29 234.66,75.78 235.22,75.31 235.78,74.87 236.35,74.47 236.91,74.11 237.47,73.79 238.03,73.51 238.60,73.27 239.16,73.08 239.72,72.94 240.28,72.84 240.85,72.80 241.41,72.81 241.97,72.86 242.53,72.97 243.10,73.14 243.66,73.36 244.22,73.63 244.78,73.97 245.35,74.35 245.91,74.78 246.47,75.28 247.03,75.83 247.60,76.43 248.16,77.08 248.72,77.80 249.28,78.55 249.85,79.35 250.41,80.21 250.97,81.11 251.53,82.05 252.10,83.05 252.66,84.08 253.22,85.14 253.78,86.25 254.35,87.40 254.91,88.57 255.47,89.78 256.03,91.02 256.59,92.29 257.16,93.57 257.72,94.89 258.28,96.23 258.84,97.58 259.41,98.95 259.97,100.34 260.53,101.74 261.09,103.15 261.66,104.58 262.22,106.01 262.78,107.45 263.34,108.90 263.91,110.35 264.47,111.80 265.03,113.26 265.59,114.72 266.16,116.18 266.72,117.64 267.28,119.10 267.84,120.56 268.41,122.02 268.97,123.47 269.53,124.93 270.09,126.37 270.66,127.82 271.22,129.26 271.78,130.70 272.34,132.13 272.91,133.55 273.47,134.98 274.03,136.39 274.59,137.81 275.16,139.21 275.72,140.61 276.28,142.01 276.84,143.40 277.41,144.79 277.97,146.16 278.53,147.54 279.09,148.90 279.66,150.26 280.22,151.61 280.78,152.96 281.34,154.30 281.90,155.63 282.47,156.95 283.03,158.26 283.59,159.56 284.15,160.86 284.72,162.15 285.28,163.42 285.84,164.68 286.40,165.93 286.97,167.17 287.53,168.39 288.09,169.61 288.65,170.81 289.22,171.99 289.78,173.16 290.34,174.31 290.90,175.45 291.47,176.56 292.03,177.67 292.59,178.75 293.15,179.81 293.72,180.85 294.28,181.88 294.84,182.88 295.40,183.86 295.97,184.82 296.53,185.75 297.09,186.66 297.65,187.56 298.22,188.42 298.78,189.26 299.34,190.08 299.90,190.87 300.47,191.63 301.03,192.38 301.59,193.09 302.15,193.78 302.72,194.45 303.28,195.09 303.84,195.70 304.40,196.28 304.97,196.85 305.53,197.38 306.09,197.89 306.65,198.38 307.21,198.84 307.78,199.28 308.34,199.69 308.90,200.08 309.46,200.44 310.03,200.78 310.59,201.10 311.15,201.40 311.71,201.67 312.28,201.92 312.84,202.15 313.40,202.36 313.96,202.56 314.53,202.73 315.09,202.89 315.65,203.02 316.21,203.15 316.78,203.25 317.34,203.34 317.90,203.42 318.46,203.48 319.03,203.53 319.59,203.56 320.15,203.59 320.71,203.60 321.28,203.61 321.84,203.61 322.40,203.60 322.96,203.58 323.53,203.56 324.09,203.53 324.65,203.50 325.21,203.46 325.78,203.43 326.34,203.39 326.90,203.35 327.46,203.31 328.03,203.27 328.59,203.24 329.15,203.21 329.71,203.18 330.28,203.16 330.84,203.14 331.40,203.13 331.96,203.13 332.53,203.13 333.09,203.14 333.65,203.17 334.21,203.20 334.77,203.24 335.34,203.30 335.90,203.36 336.46,203.43 337.02,203.52 337.59,203.62 338.15,203.74 338.71,203.86 339.27,204.00 339.84,204.15 340.40,204.31 340.96,204.49 341.52,204.68 342.09,204.87 342.65,205.09 343.21,205.31 343.77,205.54 344.34,205.79 344.90,206.05 345.46,206.31 346.02,206.59 346.59,206.87 347.15,207.16 347.71,207.46 348.27,207.77 348.84,208.08 349.40,208.40 349.96,208.72 350.52,209.05 351.09,209.37 351.65,209.71 352.21,210.04 352.77,210.37 353.34,210.71 353.90,211.04 354.46,211.37 355.02,211.70 355.59,212.03 356.15,212.35 356.71,212.68 357.27,212.99 357.84,213.30 358.40,213.61 358.96,213.91 359.52,214.20 360.08,214.49 360.65,214.77 361.21,215.04 361.77,215.31 362.33,215.57 362.90,215.82 363.46,216.06 364.02,216.29 364.58,216.52 365.15,216.73 365.71,216.94 366.27,217.14 366.83,217.33 367.40,217.51 367.96,217.69 368.52,217.85 369.08,218.01 369.65,218.16 370.21,218.30 370.77,218.44 371.33,218.56 371.90,218.69 372.46,218.80 373.02,218.90 373.58,219.01 374.15,219.10 374.71,219.19 375.27,219.27 375.83,219.35 376.40,219.42 376.96,219.49 377.52,219.55 378.08,219.61 378.65,219.66 379.21,219.71 379.77,219.76 380.33,219.80 380.90,219.84 381.46,219.87 382.02,219.91 382.58,219.94 383.15,219.96 383.71,219.99 384.27,220.01 384.83,220.04 385.39,220.05 385.96,220.07 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='98.55,220.15 99.11,220.14 99.67,220.13 100.23,220.12 100.80,220.11 101.36,220.10 101.92,220.08 102.48,220.07 103.05,220.05 103.61,220.03 104.17,220.01 104.73,219.99 105.30,219.97 105.86,219.95 106.42,219.92 106.98,219.89 107.55,219.86 108.11,219.82 108.67,219.79 109.23,219.75 109.80,219.71 110.36,219.67 110.92,219.62 111.48,219.57 112.05,219.52 112.61,219.46 113.17,219.40 113.73,219.34 114.30,219.27 114.86,219.20 115.42,219.12 115.98,219.05 116.55,218.96 117.11,218.88 117.67,218.79 118.23,218.69 118.80,218.59 119.36,218.49 119.92,218.38 120.48,218.27 121.05,218.16 121.61,218.04 122.17,217.91 122.73,217.78 123.30,217.65 123.86,217.52 124.42,217.38 124.98,217.24 125.54,217.09 126.11,216.94 126.67,216.79 127.23,216.63 127.79,216.47 128.36,216.31 128.92,216.15 129.48,215.99 130.04,215.82 130.61,215.65 131.17,215.48 131.73,215.31 132.29,215.14 132.86,214.97 133.42,214.80 133.98,214.62 134.54,214.45 135.11,214.28 135.67,214.11 136.23,213.93 136.79,213.76 137.36,213.59 137.92,213.42 138.48,213.25 139.04,213.09 139.61,212.92 140.17,212.75 140.73,212.58 141.29,212.42 141.86,212.25 142.42,212.08 142.98,211.92 143.54,211.75 144.11,211.58 144.67,211.41 145.23,211.23 145.79,211.05 146.36,210.87 146.92,210.68 147.48,210.49 148.04,210.30 148.61,210.09 149.17,209.88 149.73,209.66 150.29,209.43 150.86,209.19 151.42,208.95 151.98,208.68 152.54,208.41 153.10,208.12 153.67,207.82 154.23,207.50 154.79,207.16 155.35,206.82 155.92,206.44 156.48,206.05 157.04,205.65 157.60,205.22 158.17,204.77 158.73,204.30 159.29,203.80 159.85,203.29 160.42,202.75 160.98,202.19 161.54,201.60 162.10,200.99 162.67,200.36 163.23,199.70 163.79,199.02 164.35,198.32 164.92,197.60 165.48,196.85 166.04,196.08 166.60,195.29 167.17,194.47 167.73,193.64 168.29,192.79 168.85,191.91 169.42,191.02 169.98,190.11 170.54,189.18 171.10,188.24 171.67,187.29 172.23,186.32 172.79,185.33 173.35,184.34 173.92,183.34 174.48,182.32 175.04,181.30 175.60,180.27 176.17,179.23 176.73,178.19 177.29,177.14 177.85,176.09 178.41,175.03 178.98,173.97 179.54,172.91 180.10,171.84 180.66,170.78 181.23,169.71 181.79,168.64 182.35,167.58 182.91,166.51 183.48,165.44 184.04,164.37 184.60,163.31 185.16,162.24 185.73,161.17 186.29,160.10 186.85,159.03 187.41,157.96 187.98,156.89 188.54,155.82 189.10,154.74 189.66,153.66 190.23,152.58 190.79,151.50 191.35,150.41 191.91,149.33 192.48,148.23 193.04,147.13 193.60,146.03 194.16,144.92 194.73,143.81 195.29,142.70 195.85,141.57 196.41,140.45 196.98,139.32 197.54,138.18 198.10,137.04 198.66,135.90 199.23,134.75 199.79,133.60 200.35,132.45 200.91,131.29 201.48,130.13 202.04,128.97 202.60,127.81 203.16,126.66 203.72,125.50 204.29,124.34 204.85,123.19 205.41,122.04 205.97,120.89 206.54,119.75 207.10,118.62 207.66,117.49 208.22,116.37 208.79,115.25 209.35,114.15 209.91,113.05 210.47,111.97 211.04,110.89 211.60,109.82 212.16,108.77 212.72,107.72 213.29,106.69 213.85,105.66 214.41,104.65 214.97,103.65 215.54,102.66 216.10,101.68 216.66,100.71 217.22,99.76 217.79,98.81 218.35,97.88 218.91,96.95 219.47,96.04 220.04,95.13 220.60,94.24 221.16,93.35 221.72,92.48 222.29,91.61 222.85,90.75 223.41,89.90 223.97,89.06 224.54,88.23 225.10,87.41 225.66,86.60 226.22,85.80 226.79,85.02 227.35,84.24 227.91,83.48 228.47,82.73 229.03,81.99 229.60,81.28 230.16,80.58 230.72,79.89 231.28,79.23 231.85,78.59 232.41,77.98 232.97,77.38 233.53,76.82 234.10,76.29 234.66,75.78 235.22,75.31 235.78,74.87 236.35,74.47 236.91,74.11 237.47,73.79 238.03,73.51 238.60,73.27 239.16,73.08 239.72,72.94 240.28,72.84 240.85,72.80 241.41,72.81 241.97,72.86 242.53,72.97 243.10,73.14 243.66,73.36 244.22,73.63 244.78,73.97 245.35,74.35 245.91,74.78 246.47,75.28 247.03,75.83 247.60,76.43 248.16,77.08 248.72,77.80 249.28,78.55 249.85,79.35 250.41,80.21 250.97,81.11 251.53,82.05 252.10,83.05 252.66,84.08 253.22,85.14 253.78,86.25 254.35,87.40 254.91,88.57 255.47,89.78 256.03,91.02 256.59,92.29 257.16,93.57 257.72,94.89 258.28,96.23 258.84,97.58 259.41,98.95 259.97,100.34 260.53,101.74 261.09,103.15 261.66,104.58 262.22,106.01 262.78,107.45 263.34,108.90 263.91,110.35 264.47,111.80 265.03,113.26 265.59,114.72 266.16,116.18 266.72,117.64 267.28,119.10 267.84,120.56 268.41,122.02 268.97,123.47 269.53,124.93 270.09,126.37 270.66,127.82 271.22,129.26 271.78,130.70 272.34,132.13 272.91,133.55 273.47,134.98 274.03,136.39 274.59,137.81 275.16,139.21 275.72,140.61 276.28,142.01 276.84,143.40 277.41,144.79 277.97,146.16 278.53,147.54 279.09,148.90 279.66,150.26 280.22,151.61 280.78,152.96 281.34,154.30 281.90,155.63 282.47,156.95 283.03,158.26 283.59,159.56 284.15,160.86 284.72,162.15 285.28,163.42 285.84,164.68 286.40,165.93 286.97,167.17 287.53,168.39 288.09,169.61 288.65,170.81 289.22,171.99 289.78,173.16 290.34,174.31 290.90,175.45 291.47,176.56 292.03,177.67 292.59,178.75 293.15,179.81 293.72,180.85 294.28,181.88 294.84,182.88 295.40,183.86 295.97,184.82 296.53,185.75 297.09,186.66 297.65,187.56 298.22,188.42 298.78,189.26 299.34,190.08 299.90,190.87 300.47,191.63 301.03,192.38 301.59,193.09 302.15,193.78 302.72,194.45 303.28,195.09 303.84,195.70 304.40,196.28 304.97,196.85 305.53,197.38 306.09,197.89 306.65,198.38 307.21,198.84 307.78,199.28 308.34,199.69 308.90,200.08 309.46,200.44 310.03,200.78 310.59,201.10 311.15,201.40 311.71,201.67 312.28,201.92 312.84,202.15 313.40,202.36 313.96,202.56 314.53,202.73 315.09,202.89 315.65,203.02 316.21,203.15 316.78,203.25 317.34,203.34 317.90,203.42 318.46,203.48 319.03,203.53 319.59,203.56 320.15,203.59 320.71,203.60 321.28,203.61 321.84,203.61 322.40,203.60 322.96,203.58 323.53,203.56 324.09,203.53 324.65,203.50 325.21,203.46 325.78,203.43 326.34,203.39 326.90,203.35 327.46,203.31 328.03,203.27 328.59,203.24 329.15,203.21 329.71,203.18 330.28,203.16 330.84,203.14 331.40,203.13 331.96,203.13 332.53,203.13 333.09,203.14 333.65,203.17 334.21,203.20 334.77,203.24 335.34,203.30 335.90,203.36 336.46,203.43 337.02,203.52 337.59,203.62 338.15,203.74 338.71,203.86 339.27,204.00 339.84,204.15 340.40,204.31 340.96,204.49 341.52,204.68 342.09,204.87 342.65,205.09 343.21,205.31 343.77,205.54 344.34,205.79 344.90,206.05 345.46,206.31 346.02,206.59 346.59,206.87 347.15,207.16 347.71,207.46 348.27,207.77 348.84,208.08 349.40,208.40 349.96,208.72 350.52,209.05 351.09,209.37 351.65,209.71 352.21,210.04 352.77,210.37 353.34,210.71 353.90,211.04 354.46,211.37 355.02,211.70 355.59,212.03 356.15,212.35 356.71,212.68 357.27,212.99 357.84,213.30 358.40,213.61 358.96,213.91 359.52,214.20 360.08,214.49 360.65,214.77 361.21,215.04 361.77,215.31 362.33,215.57 362.90,215.82 363.46,216.06 364.02,216.29 364.58,216.52 365.15,216.73 365.71,216.94 366.27,217.14 366.83,217.33 367.40,217.51 367.96,217.69 368.52,217.85 369.08,218.01 369.65,218.16 370.21,218.30 370.77,218.44 371.33,218.56 371.90,218.69 372.46,218.80 373.02,218.90 373.58,219.01 374.15,219.10 374.71,219.19 375.27,219.27 375.83,219.35 376.40,219.42 376.96,219.49 377.52,219.55 378.08,219.61 378.65,219.66 379.21,219.71 379.77,219.76 380.33,219.80 380.90,219.84 381.46,219.87 382.02,219.91 382.58,219.94 383.15,219.96 383.71,219.99 384.27,220.01 384.83,220.04 385.39,220.05 385.96,220.07 ' style='stroke-width: 0.75;' />
+<polygon points='74.40,318.44 74.92,318.43 75.43,318.42 75.95,318.41 76.46,318.40 76.98,318.39 77.49,318.37 78.01,318.36 78.52,318.35 79.04,318.33 79.55,318.31 80.07,318.30 80.58,318.28 81.10,318.25 81.61,318.23 82.13,318.21 82.64,318.18 83.16,318.15 83.67,318.12 84.19,318.09 84.70,318.06 85.22,318.02 85.73,317.98 86.25,317.94 86.76,317.89 87.28,317.85 87.79,317.80 88.31,317.74 88.83,317.69 89.34,317.63 89.86,317.56 90.37,317.50 90.89,317.43 91.40,317.36 91.92,317.28 92.43,317.20 92.95,317.12 93.46,317.03 93.98,316.93 94.49,316.84 95.01,316.74 95.52,316.63 96.04,316.52 96.55,316.41 97.07,316.29 97.58,316.17 98.10,316.04 98.61,315.91 99.13,315.78 99.64,315.63 100.16,315.49 100.67,315.34 101.19,315.18 101.71,315.02 102.22,314.86 102.74,314.69 103.25,314.52 103.77,314.34 104.28,314.16 104.80,313.98 105.31,313.79 105.83,313.59 106.34,313.39 106.86,313.19 107.37,312.98 107.89,312.77 108.40,312.55 108.92,312.33 109.43,312.11 109.95,311.88 110.46,311.65 110.98,311.41 111.49,311.17 112.01,310.92 112.52,310.67 113.04,310.42 113.55,310.16 114.07,309.90 114.58,309.63 115.10,309.36 115.62,309.08 116.13,308.80 116.65,308.51 117.16,308.22 117.68,307.92 118.19,307.62 118.71,307.31 119.22,306.99 119.74,306.67 120.25,306.34 120.77,306.00 121.28,305.66 121.80,305.31 122.31,304.95 122.83,304.59 123.34,304.21 123.86,303.83 124.37,303.44 124.89,303.04 125.40,302.62 125.92,302.20 126.43,301.78 126.95,301.33 127.46,300.88 127.98,300.42 128.50,299.94 129.01,299.46 129.53,298.97 130.04,298.46 130.56,297.94 131.07,297.41 131.59,296.86 132.10,296.31 132.62,295.74 133.13,295.16 133.65,294.57 134.16,293.97 134.68,293.35 135.19,292.72 135.71,292.09 136.22,291.43 136.74,290.77 137.25,290.10 137.77,289.42 138.28,288.73 138.80,288.03 139.31,287.32 139.83,286.60 140.34,285.87 140.86,285.14 141.37,284.39 141.89,283.64 142.41,282.89 142.92,282.12 143.44,281.36 143.95,280.59 144.47,279.81 144.98,279.03 145.50,278.25 146.01,277.47 146.53,276.68 147.04,275.90 147.56,275.11 148.07,274.33 148.59,273.54 149.10,272.76 149.62,271.98 150.13,271.20 150.65,270.43 151.16,269.66 151.68,268.89 152.19,268.13 152.71,267.38 153.22,266.63 153.74,265.89 154.25,265.16 154.77,264.43 155.28,263.71 155.80,263.00 156.32,262.29 156.83,261.59 157.35,260.91 157.86,260.23 158.38,259.56 158.89,258.90 159.41,258.25 159.92,257.61 160.44,256.98 160.95,256.36 161.47,255.75 161.98,255.15 162.50,254.56 163.01,253.97 163.53,253.41 164.04,252.84 164.56,252.29 165.07,251.75 165.59,251.21 166.10,250.69 166.62,250.17 167.13,249.67 167.65,249.17 168.16,248.68 168.68,248.20 169.20,247.72 169.71,247.26 170.23,246.80 170.74,246.34 171.26,245.90 171.77,245.46 172.29,245.02 172.80,244.59 173.32,244.17 173.83,243.75 174.35,243.34 174.86,242.92 175.38,242.52 175.89,242.11 176.41,241.71 176.92,241.31 177.44,240.91 177.95,240.51 178.47,240.11 178.98,239.71 179.50,239.31 180.01,238.91 180.53,238.50 181.04,238.09 181.56,237.69 182.07,237.27 182.59,236.85 183.11,236.43 183.62,236.01 184.14,235.57 184.65,235.13 185.17,234.68 185.68,234.23 186.20,233.76 186.71,233.29 187.23,232.81 187.74,232.32 188.26,231.82 188.77,231.31 189.29,230.78 189.80,230.25 190.32,229.70 190.83,229.14 191.35,228.57 191.86,227.99 192.38,227.39 192.89,226.78 193.41,226.15 193.92,225.51 194.44,224.86 194.95,224.20 195.47,223.52 195.98,222.83 196.50,222.12 197.02,221.40 197.53,220.66 198.05,219.92 198.56,219.16 199.08,218.38 199.59,217.60 200.11,216.80 200.62,215.99 201.14,215.17 201.65,214.33 202.17,213.49 202.68,212.63 203.20,211.77 203.71,210.90 204.23,210.02 204.74,209.13 205.26,208.23 205.77,207.33 206.29,206.42 206.80,205.51 207.32,204.59 207.83,203.67 208.35,202.75 208.86,201.83 209.38,200.91 209.90,199.98 210.41,199.06 210.93,198.14 211.44,197.23 211.96,196.32 212.47,195.41 212.99,194.51 213.50,193.62 214.02,192.73 214.53,191.86 215.05,191.00 215.56,190.14 216.08,189.31 216.59,188.48 217.11,187.67 217.62,186.88 218.14,186.10 218.65,185.34 219.17,184.61 219.68,183.89 220.20,183.19 220.71,182.52 221.23,181.88 221.74,181.25 222.26,180.66 222.77,180.10 223.29,179.56 223.81,179.05 224.32,178.58 224.84,178.13 225.35,177.72 225.87,177.35 226.38,177.00 226.90,176.70 227.41,176.44 227.93,176.21 228.44,176.02 228.96,175.88 229.47,175.77 229.99,175.70 230.50,175.69 231.02,175.71 231.53,175.76 232.05,175.89 232.56,176.04 233.08,176.23 233.59,176.49 234.11,176.79 234.62,177.12 235.14,177.51 235.65,177.94 236.17,178.42 236.69,178.95 237.20,179.52 237.72,180.13 238.23,180.80 238.75,181.51 239.26,182.26 239.78,183.05 240.29,183.90 240.81,184.78 241.32,185.70 241.84,186.67 242.35,187.67 242.87,188.71 243.38,189.80 243.90,190.91 244.41,192.06 244.93,193.25 245.44,194.46 245.96,195.71 246.47,196.99 246.99,198.29 247.50,199.62 248.02,200.98 248.53,202.36 249.05,203.75 249.56,205.18 250.08,206.62 250.60,208.07 251.11,209.54 251.63,211.03 252.14,212.52 252.66,214.03 253.17,215.54 253.69,217.06 254.20,218.59 254.72,220.12 255.23,221.65 255.75,223.18 256.26,224.72 256.78,226.25 257.29,227.78 257.81,229.31 258.32,230.83 258.84,232.34 259.35,233.85 259.87,235.35 260.38,236.84 260.90,238.32 261.41,239.79 261.93,241.25 262.44,242.69 262.96,244.12 263.47,245.54 263.99,246.94 264.51,248.33 265.02,249.71 265.54,251.07 266.05,252.41 266.57,253.74 267.08,255.05 267.60,256.35 268.11,257.63 268.63,258.89 269.14,260.13 269.66,261.36 270.17,262.57 270.69,263.76 271.20,264.94 271.72,266.09 272.23,267.23 272.75,268.36 273.26,269.47 273.78,270.55 274.29,271.63 274.81,272.68 275.32,273.72 275.84,274.75 276.35,275.76 276.87,276.74 277.39,277.72 277.90,278.68 278.42,279.62 278.93,280.55 279.45,281.47 279.96,282.36 280.48,283.25 280.99,284.12 281.51,284.97 282.02,285.81 282.54,286.64 283.05,287.45 283.57,288.24 284.08,289.03 284.60,289.80 285.11,290.56 285.63,291.31 286.14,292.04 286.66,292.76 287.17,293.47 287.69,294.16 288.20,294.84 288.72,295.51 289.23,296.17 289.75,296.82 290.26,297.46 290.78,298.08 291.30,298.69 291.81,299.29 292.33,299.88 292.84,300.46 293.36,301.03 293.87,301.59 294.39,302.13 294.90,302.67 295.42,303.19 295.93,303.70 296.45,304.21 296.96,304.70 297.48,305.18 297.99,305.65 298.51,306.12 299.02,306.57 299.54,307.01 300.05,307.44 300.57,307.86 301.08,308.27 301.60,308.67 302.11,309.06 302.63,309.44 303.14,309.81 303.66,310.17 304.17,310.52 304.69,310.86 305.21,311.19 305.72,311.51 306.24,311.83 306.75,312.13 307.27,312.42 307.78,312.70 308.30,312.98 308.81,313.24 309.33,313.50 309.84,313.75 310.36,313.99 310.87,314.22 311.39,314.44 311.90,314.65 312.42,314.85 312.93,315.05 313.45,315.24 313.96,315.42 314.48,315.60 314.99,315.76 315.51,315.92 316.02,316.07 316.54,316.22 317.05,316.35 317.57,316.49 318.09,316.61 318.60,316.73 319.12,316.84 319.63,316.95 320.15,317.05 320.66,317.15 321.18,317.24 321.69,317.32 322.21,317.41 322.72,317.48 323.24,317.55 323.75,317.62 324.27,317.69 324.78,317.75 325.30,317.80 325.81,317.86 326.33,317.91 326.84,317.95 327.36,318.00 327.87,318.04 328.39,318.07 328.90,318.11 329.42,318.14 329.93,318.17 330.45,318.20 330.96,318.23 331.48,318.25 332.00,318.27 332.51,318.29 333.03,318.31 333.54,318.33 334.06,318.35 334.57,318.36 335.09,318.38 335.60,318.39 336.12,318.40 336.63,318.41 337.15,318.42 337.66,318.43 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='74.40,318.44 74.92,318.43 75.43,318.42 75.95,318.41 76.46,318.40 76.98,318.39 77.49,318.37 78.01,318.36 78.52,318.35 79.04,318.33 79.55,318.31 80.07,318.30 80.58,318.28 81.10,318.25 81.61,318.23 82.13,318.21 82.64,318.18 83.16,318.15 83.67,318.12 84.19,318.09 84.70,318.06 85.22,318.02 85.73,317.98 86.25,317.94 86.76,317.89 87.28,317.85 87.79,317.80 88.31,317.74 88.83,317.69 89.34,317.63 89.86,317.56 90.37,317.50 90.89,317.43 91.40,317.36 91.92,317.28 92.43,317.20 92.95,317.12 93.46,317.03 93.98,316.93 94.49,316.84 95.01,316.74 95.52,316.63 96.04,316.52 96.55,316.41 97.07,316.29 97.58,316.17 98.10,316.04 98.61,315.91 99.13,315.78 99.64,315.63 100.16,315.49 100.67,315.34 101.19,315.18 101.71,315.02 102.22,314.86 102.74,314.69 103.25,314.52 103.77,314.34 104.28,314.16 104.80,313.98 105.31,313.79 105.83,313.59 106.34,313.39 106.86,313.19 107.37,312.98 107.89,312.77 108.40,312.55 108.92,312.33 109.43,312.11 109.95,311.88 110.46,311.65 110.98,311.41 111.49,311.17 112.01,310.92 112.52,310.67 113.04,310.42 113.55,310.16 114.07,309.90 114.58,309.63 115.10,309.36 115.62,309.08 116.13,308.80 116.65,308.51 117.16,308.22 117.68,307.92 118.19,307.62 118.71,307.31 119.22,306.99 119.74,306.67 120.25,306.34 120.77,306.00 121.28,305.66 121.80,305.31 122.31,304.95 122.83,304.59 123.34,304.21 123.86,303.83 124.37,303.44 124.89,303.04 125.40,302.62 125.92,302.20 126.43,301.78 126.95,301.33 127.46,300.88 127.98,300.42 128.50,299.94 129.01,299.46 129.53,298.97 130.04,298.46 130.56,297.94 131.07,297.41 131.59,296.86 132.10,296.31 132.62,295.74 133.13,295.16 133.65,294.57 134.16,293.97 134.68,293.35 135.19,292.72 135.71,292.09 136.22,291.43 136.74,290.77 137.25,290.10 137.77,289.42 138.28,288.73 138.80,288.03 139.31,287.32 139.83,286.60 140.34,285.87 140.86,285.14 141.37,284.39 141.89,283.64 142.41,282.89 142.92,282.12 143.44,281.36 143.95,280.59 144.47,279.81 144.98,279.03 145.50,278.25 146.01,277.47 146.53,276.68 147.04,275.90 147.56,275.11 148.07,274.33 148.59,273.54 149.10,272.76 149.62,271.98 150.13,271.20 150.65,270.43 151.16,269.66 151.68,268.89 152.19,268.13 152.71,267.38 153.22,266.63 153.74,265.89 154.25,265.16 154.77,264.43 155.28,263.71 155.80,263.00 156.32,262.29 156.83,261.59 157.35,260.91 157.86,260.23 158.38,259.56 158.89,258.90 159.41,258.25 159.92,257.61 160.44,256.98 160.95,256.36 161.47,255.75 161.98,255.15 162.50,254.56 163.01,253.97 163.53,253.41 164.04,252.84 164.56,252.29 165.07,251.75 165.59,251.21 166.10,250.69 166.62,250.17 167.13,249.67 167.65,249.17 168.16,248.68 168.68,248.20 169.20,247.72 169.71,247.26 170.23,246.80 170.74,246.34 171.26,245.90 171.77,245.46 172.29,245.02 172.80,244.59 173.32,244.17 173.83,243.75 174.35,243.34 174.86,242.92 175.38,242.52 175.89,242.11 176.41,241.71 176.92,241.31 177.44,240.91 177.95,240.51 178.47,240.11 178.98,239.71 179.50,239.31 180.01,238.91 180.53,238.50 181.04,238.09 181.56,237.69 182.07,237.27 182.59,236.85 183.11,236.43 183.62,236.01 184.14,235.57 184.65,235.13 185.17,234.68 185.68,234.23 186.20,233.76 186.71,233.29 187.23,232.81 187.74,232.32 188.26,231.82 188.77,231.31 189.29,230.78 189.80,230.25 190.32,229.70 190.83,229.14 191.35,228.57 191.86,227.99 192.38,227.39 192.89,226.78 193.41,226.15 193.92,225.51 194.44,224.86 194.95,224.20 195.47,223.52 195.98,222.83 196.50,222.12 197.02,221.40 197.53,220.66 198.05,219.92 198.56,219.16 199.08,218.38 199.59,217.60 200.11,216.80 200.62,215.99 201.14,215.17 201.65,214.33 202.17,213.49 202.68,212.63 203.20,211.77 203.71,210.90 204.23,210.02 204.74,209.13 205.26,208.23 205.77,207.33 206.29,206.42 206.80,205.51 207.32,204.59 207.83,203.67 208.35,202.75 208.86,201.83 209.38,200.91 209.90,199.98 210.41,199.06 210.93,198.14 211.44,197.23 211.96,196.32 212.47,195.41 212.99,194.51 213.50,193.62 214.02,192.73 214.53,191.86 215.05,191.00 215.56,190.14 216.08,189.31 216.59,188.48 217.11,187.67 217.62,186.88 218.14,186.10 218.65,185.34 219.17,184.61 219.68,183.89 220.20,183.19 220.71,182.52 221.23,181.88 221.74,181.25 222.26,180.66 222.77,180.10 223.29,179.56 223.81,179.05 224.32,178.58 224.84,178.13 225.35,177.72 225.87,177.35 226.38,177.00 226.90,176.70 227.41,176.44 227.93,176.21 228.44,176.02 228.96,175.88 229.47,175.77 229.99,175.70 230.50,175.69 231.02,175.71 231.53,175.76 232.05,175.89 232.56,176.04 233.08,176.23 233.59,176.49 234.11,176.79 234.62,177.12 235.14,177.51 235.65,177.94 236.17,178.42 236.69,178.95 237.20,179.52 237.72,180.13 238.23,180.80 238.75,181.51 239.26,182.26 239.78,183.05 240.29,183.90 240.81,184.78 241.32,185.70 241.84,186.67 242.35,187.67 242.87,188.71 243.38,189.80 243.90,190.91 244.41,192.06 244.93,193.25 245.44,194.46 245.96,195.71 246.47,196.99 246.99,198.29 247.50,199.62 248.02,200.98 248.53,202.36 249.05,203.75 249.56,205.18 250.08,206.62 250.60,208.07 251.11,209.54 251.63,211.03 252.14,212.52 252.66,214.03 253.17,215.54 253.69,217.06 254.20,218.59 254.72,220.12 255.23,221.65 255.75,223.18 256.26,224.72 256.78,226.25 257.29,227.78 257.81,229.31 258.32,230.83 258.84,232.34 259.35,233.85 259.87,235.35 260.38,236.84 260.90,238.32 261.41,239.79 261.93,241.25 262.44,242.69 262.96,244.12 263.47,245.54 263.99,246.94 264.51,248.33 265.02,249.71 265.54,251.07 266.05,252.41 266.57,253.74 267.08,255.05 267.60,256.35 268.11,257.63 268.63,258.89 269.14,260.13 269.66,261.36 270.17,262.57 270.69,263.76 271.20,264.94 271.72,266.09 272.23,267.23 272.75,268.36 273.26,269.47 273.78,270.55 274.29,271.63 274.81,272.68 275.32,273.72 275.84,274.75 276.35,275.76 276.87,276.74 277.39,277.72 277.90,278.68 278.42,279.62 278.93,280.55 279.45,281.47 279.96,282.36 280.48,283.25 280.99,284.12 281.51,284.97 282.02,285.81 282.54,286.64 283.05,287.45 283.57,288.24 284.08,289.03 284.60,289.80 285.11,290.56 285.63,291.31 286.14,292.04 286.66,292.76 287.17,293.47 287.69,294.16 288.20,294.84 288.72,295.51 289.23,296.17 289.75,296.82 290.26,297.46 290.78,298.08 291.30,298.69 291.81,299.29 292.33,299.88 292.84,300.46 293.36,301.03 293.87,301.59 294.39,302.13 294.90,302.67 295.42,303.19 295.93,303.70 296.45,304.21 296.96,304.70 297.48,305.18 297.99,305.65 298.51,306.12 299.02,306.57 299.54,307.01 300.05,307.44 300.57,307.86 301.08,308.27 301.60,308.67 302.11,309.06 302.63,309.44 303.14,309.81 303.66,310.17 304.17,310.52 304.69,310.86 305.21,311.19 305.72,311.51 306.24,311.83 306.75,312.13 307.27,312.42 307.78,312.70 308.30,312.98 308.81,313.24 309.33,313.50 309.84,313.75 310.36,313.99 310.87,314.22 311.39,314.44 311.90,314.65 312.42,314.85 312.93,315.05 313.45,315.24 313.96,315.42 314.48,315.60 314.99,315.76 315.51,315.92 316.02,316.07 316.54,316.22 317.05,316.35 317.57,316.49 318.09,316.61 318.60,316.73 319.12,316.84 319.63,316.95 320.15,317.05 320.66,317.15 321.18,317.24 321.69,317.32 322.21,317.41 322.72,317.48 323.24,317.55 323.75,317.62 324.27,317.69 324.78,317.75 325.30,317.80 325.81,317.86 326.33,317.91 326.84,317.95 327.36,318.00 327.87,318.04 328.39,318.07 328.90,318.11 329.42,318.14 329.93,318.17 330.45,318.20 330.96,318.23 331.48,318.25 332.00,318.27 332.51,318.29 333.03,318.31 333.54,318.33 334.06,318.35 334.57,318.36 335.09,318.38 335.60,318.39 336.12,318.40 336.63,318.41 337.15,318.42 337.66,318.43 ' style='stroke-width: 0.75;' />
+<polygon points='110.62,416.72 111.30,416.71 111.98,416.70 112.66,416.69 113.34,416.67 114.02,416.65 114.70,416.63 115.39,416.61 116.07,416.59 116.75,416.57 117.43,416.54 118.11,416.51 118.79,416.47 119.47,416.44 120.15,416.40 120.83,416.35 121.51,416.31 122.19,416.26 122.87,416.20 123.55,416.14 124.23,416.08 124.91,416.01 125.59,415.93 126.27,415.85 126.96,415.77 127.64,415.68 128.32,415.58 129.00,415.48 129.68,415.37 130.36,415.26 131.04,415.14 131.72,415.02 132.40,414.89 133.08,414.75 133.76,414.61 134.44,414.46 135.12,414.31 135.80,414.15 136.48,413.99 137.16,413.82 137.84,413.65 138.53,413.48 139.21,413.30 139.89,413.12 140.57,412.94 141.25,412.75 141.93,412.57 142.61,412.38 143.29,412.20 143.97,412.02 144.65,411.84 145.33,411.66 146.01,411.49 146.69,411.32 147.37,411.15 148.05,410.99 148.73,410.84 149.41,410.70 150.10,410.56 150.78,410.44 151.46,410.32 152.14,410.21 152.82,410.12 153.50,410.03 154.18,409.96 154.86,409.90 155.54,409.85 156.22,409.81 156.90,409.79 157.58,409.78 158.26,409.79 158.94,409.80 159.62,409.83 160.30,409.88 160.98,409.93 161.67,410.00 162.35,410.08 163.03,410.17 163.71,410.27 164.39,410.38 165.07,410.50 165.75,410.64 166.43,410.77 167.11,410.92 167.79,411.08 168.47,411.24 169.15,411.40 169.83,411.58 170.51,411.75 171.19,411.93 171.87,412.11 172.55,412.29 173.24,412.47 173.92,412.65 174.60,412.84 175.28,413.01 175.96,413.19 176.64,413.37 177.32,413.54 178.00,413.70 178.68,413.87 179.36,414.03 180.04,414.18 180.72,414.32 181.40,414.46 182.08,414.59 182.76,414.72 183.44,414.83 184.12,414.94 184.81,415.05 185.49,415.14 186.17,415.22 186.85,415.29 187.53,415.36 188.21,415.41 188.89,415.46 189.57,415.49 190.25,415.51 190.93,415.52 191.61,415.52 192.29,415.51 192.97,415.48 193.65,415.44 194.33,415.39 195.01,415.32 195.69,415.24 196.37,415.14 197.06,415.02 197.74,414.89 198.42,414.73 199.10,414.56 199.78,414.36 200.46,414.14 201.14,413.90 201.82,413.64 202.50,413.35 203.18,413.02 203.86,412.67 204.54,412.30 205.22,411.89 205.90,411.44 206.58,410.96 207.26,410.45 207.94,409.90 208.63,409.31 209.31,408.67 209.99,408.01 210.67,407.29 211.35,406.52 212.03,405.72 212.71,404.87 213.39,403.96 214.07,403.01 214.75,402.01 215.43,400.97 216.11,399.86 216.79,398.71 217.47,397.51 218.15,396.26 218.83,394.95 219.51,393.60 220.20,392.21 220.88,390.75 221.56,389.25 222.24,387.72 222.92,386.14 223.60,384.51 224.28,382.84 224.96,381.14 225.64,379.41 226.32,377.63 227.00,375.84 227.68,374.02 228.36,372.18 229.04,370.32 229.72,368.44 230.40,366.56 231.08,364.67 231.77,362.77 232.45,360.88 233.13,358.99 233.81,357.12 234.49,355.26 235.17,353.41 235.85,351.59 236.53,349.80 237.21,348.03 237.89,346.30 238.57,344.60 239.25,342.95 239.93,341.34 240.61,339.77 241.29,338.25 241.97,336.80 242.65,335.38 243.34,334.02 244.02,332.72 244.70,331.49 245.38,330.30 246.06,329.16 246.74,328.11 247.42,327.10 248.10,326.15 248.78,325.25 249.46,324.43 250.14,323.65 250.82,322.92 251.50,322.25 252.18,321.63 252.86,321.05 253.54,320.51 254.22,320.03 254.91,319.58 255.59,319.16 256.27,318.77 256.95,318.42 257.63,318.09 258.31,317.78 258.99,317.49 259.67,317.21 260.35,316.94 261.03,316.68 261.71,316.42 262.39,316.15 263.07,315.88 263.75,315.61 264.43,315.31 265.11,315.01 265.79,314.68 266.48,314.34 267.16,313.97 267.84,313.57 268.52,313.14 269.20,312.69 269.88,312.20 270.56,311.68 271.24,311.13 271.92,310.54 272.60,309.92 273.28,309.26 273.96,308.58 274.64,307.86 275.32,307.11 276.00,306.34 276.68,305.55 277.36,304.73 278.05,303.89 278.73,303.04 279.41,302.17 280.09,301.30 280.77,300.42 281.45,299.55 282.13,298.68 282.81,297.83 283.49,296.99 284.17,296.17 284.85,295.38 285.53,294.63 286.21,293.91 286.89,293.22 287.57,292.59 288.25,292.01 288.93,291.49 289.62,291.01 290.30,290.62 290.98,290.29 291.66,290.02 292.34,289.82 293.02,289.71 293.70,289.68 294.38,289.71 295.06,289.83 295.74,290.04 296.42,290.32 297.10,290.67 297.78,291.12 298.46,291.64 299.14,292.23 299.82,292.89 300.50,293.64 301.18,294.45 301.87,295.32 302.55,296.24 303.23,297.25 303.91,298.29 304.59,299.38 305.27,300.52 305.95,301.70 306.63,302.91 307.31,304.15 307.99,305.43 308.67,306.72 309.35,308.02 310.03,309.34 310.71,310.66 311.39,311.99 312.07,313.31 312.75,314.64 313.44,315.94 314.12,317.24 314.80,318.52 315.48,319.79 316.16,321.02 316.84,322.24 317.52,323.44 318.20,324.60 318.88,325.73 319.56,326.84 320.24,327.92 320.92,328.97 321.60,329.98 322.28,330.97 322.96,331.93 323.64,332.85 324.32,333.75 325.01,334.63 325.69,335.48 326.37,336.31 327.05,337.11 327.73,337.90 328.41,338.67 329.09,339.43 329.77,340.17 330.45,340.90 331.13,341.63 331.81,342.35 332.49,343.06 333.17,343.77 333.85,344.49 334.53,345.20 335.21,345.92 335.89,346.65 336.58,347.38 337.26,348.12 337.94,348.88 338.62,349.64 339.30,350.42 339.98,351.21 340.66,352.01 341.34,352.83 342.02,353.66 342.70,354.51 343.38,355.37 344.06,356.24 344.74,357.13 345.42,358.03 346.10,358.94 346.78,359.86 347.46,360.80 348.15,361.74 348.83,362.68 349.51,363.64 350.19,364.60 350.87,365.56 351.55,366.52 352.23,367.48 352.91,368.45 353.59,369.40 354.27,370.36 354.95,371.30 355.63,372.24 356.31,373.18 356.99,374.09 357.67,375.00 358.35,375.90 359.03,376.78 359.72,377.64 360.40,378.49 361.08,379.33 361.76,380.14 362.44,380.94 363.12,381.72 363.80,382.48 364.48,383.22 365.16,383.94 365.84,384.64 366.52,385.33 367.20,385.99 367.88,386.63 368.56,387.26 369.24,387.86 369.92,388.45 370.60,389.02 371.29,389.57 371.97,390.11 372.65,390.63 373.33,391.13 374.01,391.62 374.69,392.10 375.37,392.56 376.05,393.01 376.73,393.45 377.41,393.87 378.09,394.29 378.77,394.69 379.45,395.09 380.13,395.47 380.81,395.85 381.49,396.22 382.17,396.58 382.86,396.93 383.54,397.28 384.22,397.62 384.90,397.95 385.58,398.27 386.26,398.59 386.94,398.91 387.62,399.21 388.30,399.51 388.98,399.81 389.66,400.10 390.34,400.38 391.02,400.66 391.70,400.93 392.38,401.19 393.06,401.45 393.74,401.71 394.43,401.95 395.11,402.20 395.79,402.44 396.47,402.67 397.15,402.90 397.83,403.12 398.51,403.34 399.19,403.55 399.87,403.76 400.55,403.97 401.23,404.17 401.91,404.37 402.59,404.57 403.27,404.77 403.95,404.96 404.63,405.16 405.31,405.35 405.99,405.54 406.68,405.73 407.36,405.93 408.04,406.12 408.72,406.31 409.40,406.51 410.08,406.71 410.76,406.91 411.44,407.11 412.12,407.31 412.80,407.52 413.48,407.73 414.16,407.94 414.84,408.16 415.52,408.37 416.20,408.59 416.88,408.82 417.56,409.04 418.25,409.27 418.93,409.50 419.61,409.73 420.29,409.96 420.97,410.20 421.65,410.43 422.33,410.66 423.01,410.90 423.69,411.13 424.37,411.36 425.05,411.59 425.73,411.82 426.41,412.04 427.09,412.26 427.77,412.48 428.45,412.69 429.13,412.90 429.82,413.10 430.50,413.30 431.18,413.50 431.86,413.69 432.54,413.87 433.22,414.05 433.90,414.22 434.58,414.38 435.26,414.54 435.94,414.69 436.62,414.83 437.30,414.97 437.98,415.10 438.66,415.23 439.34,415.34 440.02,415.46 440.70,415.56 441.39,415.66 442.07,415.75 442.75,415.84 443.43,415.92 444.11,416.00 444.79,416.07 445.47,416.13 446.15,416.20 446.83,416.25 447.51,416.30 448.19,416.35 448.87,416.40 449.55,416.44 450.23,416.47 450.91,416.51 451.59,416.54 452.27,416.56 452.96,416.59 453.64,416.61 454.32,416.63 455.00,416.65 455.68,416.67 456.36,416.68 457.04,416.70 457.72,416.71 458.40,416.72 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='110.62,416.72 111.30,416.71 111.98,416.70 112.66,416.69 113.34,416.67 114.02,416.65 114.70,416.63 115.39,416.61 116.07,416.59 116.75,416.57 117.43,416.54 118.11,416.51 118.79,416.47 119.47,416.44 120.15,416.40 120.83,416.35 121.51,416.31 122.19,416.26 122.87,416.20 123.55,416.14 124.23,416.08 124.91,416.01 125.59,415.93 126.27,415.85 126.96,415.77 127.64,415.68 128.32,415.58 129.00,415.48 129.68,415.37 130.36,415.26 131.04,415.14 131.72,415.02 132.40,414.89 133.08,414.75 133.76,414.61 134.44,414.46 135.12,414.31 135.80,414.15 136.48,413.99 137.16,413.82 137.84,413.65 138.53,413.48 139.21,413.30 139.89,413.12 140.57,412.94 141.25,412.75 141.93,412.57 142.61,412.38 143.29,412.20 143.97,412.02 144.65,411.84 145.33,411.66 146.01,411.49 146.69,411.32 147.37,411.15 148.05,410.99 148.73,410.84 149.41,410.70 150.10,410.56 150.78,410.44 151.46,410.32 152.14,410.21 152.82,410.12 153.50,410.03 154.18,409.96 154.86,409.90 155.54,409.85 156.22,409.81 156.90,409.79 157.58,409.78 158.26,409.79 158.94,409.80 159.62,409.83 160.30,409.88 160.98,409.93 161.67,410.00 162.35,410.08 163.03,410.17 163.71,410.27 164.39,410.38 165.07,410.50 165.75,410.64 166.43,410.77 167.11,410.92 167.79,411.08 168.47,411.24 169.15,411.40 169.83,411.58 170.51,411.75 171.19,411.93 171.87,412.11 172.55,412.29 173.24,412.47 173.92,412.65 174.60,412.84 175.28,413.01 175.96,413.19 176.64,413.37 177.32,413.54 178.00,413.70 178.68,413.87 179.36,414.03 180.04,414.18 180.72,414.32 181.40,414.46 182.08,414.59 182.76,414.72 183.44,414.83 184.12,414.94 184.81,415.05 185.49,415.14 186.17,415.22 186.85,415.29 187.53,415.36 188.21,415.41 188.89,415.46 189.57,415.49 190.25,415.51 190.93,415.52 191.61,415.52 192.29,415.51 192.97,415.48 193.65,415.44 194.33,415.39 195.01,415.32 195.69,415.24 196.37,415.14 197.06,415.02 197.74,414.89 198.42,414.73 199.10,414.56 199.78,414.36 200.46,414.14 201.14,413.90 201.82,413.64 202.50,413.35 203.18,413.02 203.86,412.67 204.54,412.30 205.22,411.89 205.90,411.44 206.58,410.96 207.26,410.45 207.94,409.90 208.63,409.31 209.31,408.67 209.99,408.01 210.67,407.29 211.35,406.52 212.03,405.72 212.71,404.87 213.39,403.96 214.07,403.01 214.75,402.01 215.43,400.97 216.11,399.86 216.79,398.71 217.47,397.51 218.15,396.26 218.83,394.95 219.51,393.60 220.20,392.21 220.88,390.75 221.56,389.25 222.24,387.72 222.92,386.14 223.60,384.51 224.28,382.84 224.96,381.14 225.64,379.41 226.32,377.63 227.00,375.84 227.68,374.02 228.36,372.18 229.04,370.32 229.72,368.44 230.40,366.56 231.08,364.67 231.77,362.77 232.45,360.88 233.13,358.99 233.81,357.12 234.49,355.26 235.17,353.41 235.85,351.59 236.53,349.80 237.21,348.03 237.89,346.30 238.57,344.60 239.25,342.95 239.93,341.34 240.61,339.77 241.29,338.25 241.97,336.80 242.65,335.38 243.34,334.02 244.02,332.72 244.70,331.49 245.38,330.30 246.06,329.16 246.74,328.11 247.42,327.10 248.10,326.15 248.78,325.25 249.46,324.43 250.14,323.65 250.82,322.92 251.50,322.25 252.18,321.63 252.86,321.05 253.54,320.51 254.22,320.03 254.91,319.58 255.59,319.16 256.27,318.77 256.95,318.42 257.63,318.09 258.31,317.78 258.99,317.49 259.67,317.21 260.35,316.94 261.03,316.68 261.71,316.42 262.39,316.15 263.07,315.88 263.75,315.61 264.43,315.31 265.11,315.01 265.79,314.68 266.48,314.34 267.16,313.97 267.84,313.57 268.52,313.14 269.20,312.69 269.88,312.20 270.56,311.68 271.24,311.13 271.92,310.54 272.60,309.92 273.28,309.26 273.96,308.58 274.64,307.86 275.32,307.11 276.00,306.34 276.68,305.55 277.36,304.73 278.05,303.89 278.73,303.04 279.41,302.17 280.09,301.30 280.77,300.42 281.45,299.55 282.13,298.68 282.81,297.83 283.49,296.99 284.17,296.17 284.85,295.38 285.53,294.63 286.21,293.91 286.89,293.22 287.57,292.59 288.25,292.01 288.93,291.49 289.62,291.01 290.30,290.62 290.98,290.29 291.66,290.02 292.34,289.82 293.02,289.71 293.70,289.68 294.38,289.71 295.06,289.83 295.74,290.04 296.42,290.32 297.10,290.67 297.78,291.12 298.46,291.64 299.14,292.23 299.82,292.89 300.50,293.64 301.18,294.45 301.87,295.32 302.55,296.24 303.23,297.25 303.91,298.29 304.59,299.38 305.27,300.52 305.95,301.70 306.63,302.91 307.31,304.15 307.99,305.43 308.67,306.72 309.35,308.02 310.03,309.34 310.71,310.66 311.39,311.99 312.07,313.31 312.75,314.64 313.44,315.94 314.12,317.24 314.80,318.52 315.48,319.79 316.16,321.02 316.84,322.24 317.52,323.44 318.20,324.60 318.88,325.73 319.56,326.84 320.24,327.92 320.92,328.97 321.60,329.98 322.28,330.97 322.96,331.93 323.64,332.85 324.32,333.75 325.01,334.63 325.69,335.48 326.37,336.31 327.05,337.11 327.73,337.90 328.41,338.67 329.09,339.43 329.77,340.17 330.45,340.90 331.13,341.63 331.81,342.35 332.49,343.06 333.17,343.77 333.85,344.49 334.53,345.20 335.21,345.92 335.89,346.65 336.58,347.38 337.26,348.12 337.94,348.88 338.62,349.64 339.30,350.42 339.98,351.21 340.66,352.01 341.34,352.83 342.02,353.66 342.70,354.51 343.38,355.37 344.06,356.24 344.74,357.13 345.42,358.03 346.10,358.94 346.78,359.86 347.46,360.80 348.15,361.74 348.83,362.68 349.51,363.64 350.19,364.60 350.87,365.56 351.55,366.52 352.23,367.48 352.91,368.45 353.59,369.40 354.27,370.36 354.95,371.30 355.63,372.24 356.31,373.18 356.99,374.09 357.67,375.00 358.35,375.90 359.03,376.78 359.72,377.64 360.40,378.49 361.08,379.33 361.76,380.14 362.44,380.94 363.12,381.72 363.80,382.48 364.48,383.22 365.16,383.94 365.84,384.64 366.52,385.33 367.20,385.99 367.88,386.63 368.56,387.26 369.24,387.86 369.92,388.45 370.60,389.02 371.29,389.57 371.97,390.11 372.65,390.63 373.33,391.13 374.01,391.62 374.69,392.10 375.37,392.56 376.05,393.01 376.73,393.45 377.41,393.87 378.09,394.29 378.77,394.69 379.45,395.09 380.13,395.47 380.81,395.85 381.49,396.22 382.17,396.58 382.86,396.93 383.54,397.28 384.22,397.62 384.90,397.95 385.58,398.27 386.26,398.59 386.94,398.91 387.62,399.21 388.30,399.51 388.98,399.81 389.66,400.10 390.34,400.38 391.02,400.66 391.70,400.93 392.38,401.19 393.06,401.45 393.74,401.71 394.43,401.95 395.11,402.20 395.79,402.44 396.47,402.67 397.15,402.90 397.83,403.12 398.51,403.34 399.19,403.55 399.87,403.76 400.55,403.97 401.23,404.17 401.91,404.37 402.59,404.57 403.27,404.77 403.95,404.96 404.63,405.16 405.31,405.35 405.99,405.54 406.68,405.73 407.36,405.93 408.04,406.12 408.72,406.31 409.40,406.51 410.08,406.71 410.76,406.91 411.44,407.11 412.12,407.31 412.80,407.52 413.48,407.73 414.16,407.94 414.84,408.16 415.52,408.37 416.20,408.59 416.88,408.82 417.56,409.04 418.25,409.27 418.93,409.50 419.61,409.73 420.29,409.96 420.97,410.20 421.65,410.43 422.33,410.66 423.01,410.90 423.69,411.13 424.37,411.36 425.05,411.59 425.73,411.82 426.41,412.04 427.09,412.26 427.77,412.48 428.45,412.69 429.13,412.90 429.82,413.10 430.50,413.30 431.18,413.50 431.86,413.69 432.54,413.87 433.22,414.05 433.90,414.22 434.58,414.38 435.26,414.54 435.94,414.69 436.62,414.83 437.30,414.97 437.98,415.10 438.66,415.23 439.34,415.34 440.02,415.46 440.70,415.56 441.39,415.66 442.07,415.75 442.75,415.84 443.43,415.92 444.11,416.00 444.79,416.07 445.47,416.13 446.15,416.20 446.83,416.25 447.51,416.30 448.19,416.35 448.87,416.40 449.55,416.44 450.23,416.47 450.91,416.51 451.59,416.54 452.27,416.56 452.96,416.59 453.64,416.61 454.32,416.63 455.00,416.65 455.68,416.67 456.36,416.68 457.04,416.70 457.72,416.71 458.40,416.72 ' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='59.04' y1='416.80' x2='59.04' y2='220.23' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='416.80' x2='51.84' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='318.51' x2='51.84' y2='318.51' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='220.23' x2='51.84' y2='220.23' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='48.44px' lengthAdjust='spacingAndGlyphs'>SETOSA</text>
+<text transform='translate(41.76,318.51) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='78.67px' lengthAdjust='spacingAndGlyphs'>VERSICOLOR</text>
+<text transform='translate(41.76,220.23) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='61.33px' lengthAdjust='spacingAndGlyphs'>VIRGINICA</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/ridge_yord_minvar.svg b/inst/tinytest/_tinysnapshot/ridge_yord_minvar.svg
new file mode 100644
index 00000000..f0cab425
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/ridge_yord_minvar.svg
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='70.70px' lengthAdjust='spacingAndGlyphs'>Sepal.Length</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+<line x1='94.29' y1='430.56' x2='422.12' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='94.29' y1='430.56' x2='94.29' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='176.24' y1='430.56' x2='176.24' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='258.20' y1='430.56' x2='258.20' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='340.16' y1='430.56' x2='340.16' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='422.12' y1='430.56' x2='422.12' y2='437.76' style='stroke-width: 0.75;' />
+<text x='94.29' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='176.24' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text x='258.20' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='340.16' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>7</text>
+<text x='422.12' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='123.58,190.92 124.23,190.91 124.89,190.90 125.54,190.88 126.20,190.87 126.85,190.85 127.51,190.83 128.16,190.81 128.82,190.79 129.47,190.76 130.13,190.73 130.78,190.70 131.44,190.67 132.09,190.63 132.75,190.59 133.40,190.54 134.06,190.49 134.71,190.44 135.37,190.38 136.03,190.32 136.68,190.25 137.34,190.18 137.99,190.10 138.65,190.02 139.30,189.93 139.96,189.84 140.61,189.74 141.27,189.63 141.92,189.52 142.58,189.40 143.23,189.28 143.89,189.15 144.54,189.01 145.20,188.87 145.85,188.72 146.51,188.57 147.16,188.41 147.82,188.25 148.47,188.08 149.13,187.90 149.78,187.73 150.44,187.55 151.10,187.37 151.75,187.18 152.41,187.00 153.06,186.81 153.72,186.62 154.37,186.44 155.03,186.25 155.68,186.07 156.34,185.89 156.99,185.71 157.65,185.54 158.30,185.37 158.96,185.22 159.61,185.06 160.27,184.92 160.92,184.78 161.58,184.65 162.23,184.54 162.89,184.43 163.54,184.33 164.20,184.25 164.86,184.18 165.51,184.12 166.17,184.07 166.82,184.04 167.48,184.02 168.13,184.02 168.79,184.02 169.44,184.05 170.10,184.08 170.75,184.13 171.41,184.19 172.06,184.26 172.72,184.34 173.37,184.44 174.03,184.55 174.68,184.66 175.34,184.79 175.99,184.92 176.65,185.06 177.30,185.21 177.96,185.37 178.62,185.53 179.27,185.69 179.93,185.86 180.58,186.03 181.24,186.20 181.89,186.37 182.55,186.54 183.20,186.71 183.86,186.87 184.51,187.03 185.17,187.19 185.82,187.34 186.48,187.49 187.13,187.62 187.79,187.75 188.44,187.87 189.10,187.98 189.75,188.08 190.41,188.17 191.06,188.25 191.72,188.31 192.38,188.36 193.03,188.40 193.69,188.42 194.34,188.43 195.00,188.42 195.65,188.39 196.31,188.35 196.96,188.28 197.62,188.21 198.27,188.11 198.93,187.99 199.58,187.84 200.24,187.69 200.89,187.51 201.55,187.30 202.20,187.07 202.86,186.82 203.51,186.55 204.17,186.25 204.82,185.93 205.48,185.58 206.14,185.21 206.79,184.81 207.45,184.39 208.10,183.94 208.76,183.46 209.41,182.95 210.07,182.42 210.72,181.87 211.38,181.28 212.03,180.67 212.69,180.03 213.34,179.37 214.00,178.68 214.65,177.96 215.31,177.22 215.96,176.46 216.62,175.67 217.27,174.85 217.93,174.02 218.58,173.17 219.24,172.29 219.89,171.40 220.55,170.49 221.21,169.56 221.86,168.62 222.52,167.66 223.17,166.69 223.83,165.71 224.48,164.73 225.14,163.73 225.79,162.74 226.45,161.73 227.10,160.73 227.76,159.73 228.41,158.73 229.07,157.73 229.72,156.74 230.38,155.75 231.03,154.78 231.69,153.81 232.34,152.86 233.00,151.91 233.65,150.99 234.31,150.08 234.97,149.18 235.62,148.30 236.28,147.44 236.93,146.60 237.59,145.78 238.24,144.97 238.90,144.19 239.55,143.42 240.21,142.67 240.86,141.94 241.52,141.23 242.17,140.53 242.83,139.85 243.48,139.18 244.14,138.53 244.79,137.88 245.45,137.25 246.10,136.62 246.76,136.00 247.41,135.38 248.07,134.76 248.73,134.14 249.38,133.51 250.04,132.88 250.69,132.24 251.35,131.59 252.00,130.93 252.66,130.25 253.31,129.55 253.97,128.83 254.62,128.09 255.28,127.32 255.93,126.53 256.59,125.70 257.24,124.84 257.90,123.95 258.55,123.03 259.21,122.06 259.86,121.07 260.52,120.04 261.17,118.97 261.83,117.86 262.49,116.71 263.14,115.53 263.80,114.31 264.45,113.05 265.11,111.76 265.76,110.45 266.42,109.09 267.07,107.71 267.73,106.31 268.38,104.89 269.04,103.44 269.69,101.98 270.35,100.51 271.00,99.03 271.66,97.55 272.31,96.06 272.97,94.59 273.62,93.12 274.28,91.67 274.93,90.24 275.59,88.84 276.25,87.46 276.90,86.13 277.56,84.83 278.21,83.57 278.87,82.37 279.52,81.23 280.18,80.15 280.83,79.11 281.49,78.16 282.14,77.28 282.80,76.47 283.45,75.72 284.11,75.07 284.76,74.50 285.42,74.00 286.07,73.59 286.73,73.27 287.38,73.04 288.04,72.88 288.69,72.80 289.35,72.82 290.00,72.92 290.66,73.08 291.32,73.33 291.97,73.66 292.63,74.05 293.28,74.51 293.94,75.04 294.59,75.63 295.25,76.26 295.90,76.95 296.56,77.69 297.21,78.48 297.87,79.29 298.52,80.14 299.18,81.02 299.83,81.93 300.49,82.85 301.14,83.79 301.80,84.75 302.45,85.71 303.11,86.67 303.76,87.64 304.42,88.60 305.08,89.57 305.73,90.52 306.39,91.47 307.04,92.41 307.70,93.34 308.35,94.26 309.01,95.16 309.66,96.06 310.32,96.94 310.97,97.82 311.63,98.68 312.28,99.53 312.94,100.37 313.59,101.21 314.25,102.04 314.90,102.86 315.56,103.68 316.21,104.50 316.87,105.33 317.52,106.15 318.18,106.97 318.84,107.80 319.49,108.64 320.15,109.48 320.80,110.33 321.46,111.19 322.11,112.06 322.77,112.94 323.42,113.83 324.08,114.73 324.73,115.63 325.39,116.55 326.04,117.47 326.70,118.40 327.35,119.34 328.01,120.28 328.66,121.22 329.32,122.16 329.97,123.11 330.63,124.04 331.28,124.98 331.94,125.90 332.60,126.82 333.25,127.73 333.91,128.62 334.56,129.50 335.22,130.35 335.87,131.20 336.53,132.01 337.18,132.80 337.84,133.57 338.49,134.32 339.15,135.03 339.80,135.72 340.46,136.38 341.11,137.02 341.77,137.61 342.42,138.19 343.08,138.73 343.73,139.25 344.39,139.73 345.04,140.20 345.70,140.64 346.36,141.05 347.01,141.44 347.67,141.81 348.32,142.16 348.98,142.50 349.63,142.81 350.29,143.12 350.94,143.42 351.60,143.71 352.25,143.99 352.91,144.26 353.56,144.54 354.22,144.81 354.87,145.08 355.53,145.36 356.18,145.64 356.84,145.92 357.49,146.21 358.15,146.50 358.80,146.80 359.46,147.11 360.11,147.43 360.77,147.75 361.43,148.07 362.08,148.41 362.74,148.75 363.39,149.09 364.05,149.43 364.70,149.77 365.36,150.11 366.01,150.45 366.67,150.79 367.32,151.12 367.98,151.44 368.63,151.75 369.29,152.04 369.94,152.32 370.60,152.59 371.25,152.83 371.91,153.06 372.56,153.26 373.22,153.44 373.87,153.60 374.53,153.72 375.19,153.82 375.84,153.90 376.50,153.94 377.15,153.96 377.81,153.95 378.46,153.91 379.12,153.84 379.77,153.75 380.43,153.63 381.08,153.50 381.74,153.34 382.39,153.15 383.05,152.96 383.70,152.75 384.36,152.52 385.01,152.29 385.67,152.06 386.32,151.82 386.98,151.58 387.63,151.34 388.29,151.11 388.95,150.90 389.60,150.70 390.26,150.51 390.91,150.35 391.57,150.21 392.22,150.10 392.88,150.01 393.53,149.96 394.19,149.94 394.84,149.97 395.50,150.02 396.15,150.12 396.81,150.26 397.46,150.45 398.12,150.67 398.77,150.94 399.43,151.26 400.08,151.62 400.74,152.02 401.39,152.47 402.05,152.96 402.71,153.49 403.36,154.06 404.02,154.67 404.67,155.32 405.33,155.99 405.98,156.70 406.64,157.44 407.29,158.21 407.95,159.00 408.60,159.81 409.26,160.65 409.91,161.50 410.57,162.36 411.22,163.24 411.88,164.12 412.53,165.01 413.19,165.91 413.84,166.80 414.50,167.69 415.15,168.58 415.81,169.46 416.47,170.34 417.12,171.20 417.78,172.06 418.43,172.90 419.09,173.72 419.74,174.53 420.40,175.32 421.05,176.09 421.71,176.84 422.36,177.57 423.02,178.28 423.67,178.97 424.33,179.63 424.98,180.27 425.64,180.89 426.29,181.49 426.95,182.05 427.60,182.60 428.26,183.13 428.91,183.63 429.57,184.10 430.22,184.56 430.88,185.00 431.54,185.41 432.19,185.80 432.85,186.17 433.50,186.52 434.16,186.85 434.81,187.16 435.47,187.45 436.12,187.73 436.78,187.98 437.43,188.22 438.09,188.45 438.74,188.66 439.40,188.86 440.05,189.04 440.71,189.21 441.36,189.37 442.02,189.51 442.67,189.65 443.33,189.77 443.98,189.89 444.64,189.99 445.30,190.09 445.95,190.18 446.61,190.26 447.26,190.33 447.92,190.40 448.57,190.46 449.23,190.52 449.88,190.57 450.54,190.62 451.19,190.66 451.85,190.70 452.50,190.73 453.16,190.76 453.81,190.79 454.47,190.81 455.12,190.83 455.78,190.85 456.43,190.87 457.09,190.89 457.74,190.90 458.40,190.91 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='123.58,190.92 124.23,190.91 124.89,190.90 125.54,190.88 126.20,190.87 126.85,190.85 127.51,190.83 128.16,190.81 128.82,190.79 129.47,190.76 130.13,190.73 130.78,190.70 131.44,190.67 132.09,190.63 132.75,190.59 133.40,190.54 134.06,190.49 134.71,190.44 135.37,190.38 136.03,190.32 136.68,190.25 137.34,190.18 137.99,190.10 138.65,190.02 139.30,189.93 139.96,189.84 140.61,189.74 141.27,189.63 141.92,189.52 142.58,189.40 143.23,189.28 143.89,189.15 144.54,189.01 145.20,188.87 145.85,188.72 146.51,188.57 147.16,188.41 147.82,188.25 148.47,188.08 149.13,187.90 149.78,187.73 150.44,187.55 151.10,187.37 151.75,187.18 152.41,187.00 153.06,186.81 153.72,186.62 154.37,186.44 155.03,186.25 155.68,186.07 156.34,185.89 156.99,185.71 157.65,185.54 158.30,185.37 158.96,185.22 159.61,185.06 160.27,184.92 160.92,184.78 161.58,184.65 162.23,184.54 162.89,184.43 163.54,184.33 164.20,184.25 164.86,184.18 165.51,184.12 166.17,184.07 166.82,184.04 167.48,184.02 168.13,184.02 168.79,184.02 169.44,184.05 170.10,184.08 170.75,184.13 171.41,184.19 172.06,184.26 172.72,184.34 173.37,184.44 174.03,184.55 174.68,184.66 175.34,184.79 175.99,184.92 176.65,185.06 177.30,185.21 177.96,185.37 178.62,185.53 179.27,185.69 179.93,185.86 180.58,186.03 181.24,186.20 181.89,186.37 182.55,186.54 183.20,186.71 183.86,186.87 184.51,187.03 185.17,187.19 185.82,187.34 186.48,187.49 187.13,187.62 187.79,187.75 188.44,187.87 189.10,187.98 189.75,188.08 190.41,188.17 191.06,188.25 191.72,188.31 192.38,188.36 193.03,188.40 193.69,188.42 194.34,188.43 195.00,188.42 195.65,188.39 196.31,188.35 196.96,188.28 197.62,188.21 198.27,188.11 198.93,187.99 199.58,187.84 200.24,187.69 200.89,187.51 201.55,187.30 202.20,187.07 202.86,186.82 203.51,186.55 204.17,186.25 204.82,185.93 205.48,185.58 206.14,185.21 206.79,184.81 207.45,184.39 208.10,183.94 208.76,183.46 209.41,182.95 210.07,182.42 210.72,181.87 211.38,181.28 212.03,180.67 212.69,180.03 213.34,179.37 214.00,178.68 214.65,177.96 215.31,177.22 215.96,176.46 216.62,175.67 217.27,174.85 217.93,174.02 218.58,173.17 219.24,172.29 219.89,171.40 220.55,170.49 221.21,169.56 221.86,168.62 222.52,167.66 223.17,166.69 223.83,165.71 224.48,164.73 225.14,163.73 225.79,162.74 226.45,161.73 227.10,160.73 227.76,159.73 228.41,158.73 229.07,157.73 229.72,156.74 230.38,155.75 231.03,154.78 231.69,153.81 232.34,152.86 233.00,151.91 233.65,150.99 234.31,150.08 234.97,149.18 235.62,148.30 236.28,147.44 236.93,146.60 237.59,145.78 238.24,144.97 238.90,144.19 239.55,143.42 240.21,142.67 240.86,141.94 241.52,141.23 242.17,140.53 242.83,139.85 243.48,139.18 244.14,138.53 244.79,137.88 245.45,137.25 246.10,136.62 246.76,136.00 247.41,135.38 248.07,134.76 248.73,134.14 249.38,133.51 250.04,132.88 250.69,132.24 251.35,131.59 252.00,130.93 252.66,130.25 253.31,129.55 253.97,128.83 254.62,128.09 255.28,127.32 255.93,126.53 256.59,125.70 257.24,124.84 257.90,123.95 258.55,123.03 259.21,122.06 259.86,121.07 260.52,120.04 261.17,118.97 261.83,117.86 262.49,116.71 263.14,115.53 263.80,114.31 264.45,113.05 265.11,111.76 265.76,110.45 266.42,109.09 267.07,107.71 267.73,106.31 268.38,104.89 269.04,103.44 269.69,101.98 270.35,100.51 271.00,99.03 271.66,97.55 272.31,96.06 272.97,94.59 273.62,93.12 274.28,91.67 274.93,90.24 275.59,88.84 276.25,87.46 276.90,86.13 277.56,84.83 278.21,83.57 278.87,82.37 279.52,81.23 280.18,80.15 280.83,79.11 281.49,78.16 282.14,77.28 282.80,76.47 283.45,75.72 284.11,75.07 284.76,74.50 285.42,74.00 286.07,73.59 286.73,73.27 287.38,73.04 288.04,72.88 288.69,72.80 289.35,72.82 290.00,72.92 290.66,73.08 291.32,73.33 291.97,73.66 292.63,74.05 293.28,74.51 293.94,75.04 294.59,75.63 295.25,76.26 295.90,76.95 296.56,77.69 297.21,78.48 297.87,79.29 298.52,80.14 299.18,81.02 299.83,81.93 300.49,82.85 301.14,83.79 301.80,84.75 302.45,85.71 303.11,86.67 303.76,87.64 304.42,88.60 305.08,89.57 305.73,90.52 306.39,91.47 307.04,92.41 307.70,93.34 308.35,94.26 309.01,95.16 309.66,96.06 310.32,96.94 310.97,97.82 311.63,98.68 312.28,99.53 312.94,100.37 313.59,101.21 314.25,102.04 314.90,102.86 315.56,103.68 316.21,104.50 316.87,105.33 317.52,106.15 318.18,106.97 318.84,107.80 319.49,108.64 320.15,109.48 320.80,110.33 321.46,111.19 322.11,112.06 322.77,112.94 323.42,113.83 324.08,114.73 324.73,115.63 325.39,116.55 326.04,117.47 326.70,118.40 327.35,119.34 328.01,120.28 328.66,121.22 329.32,122.16 329.97,123.11 330.63,124.04 331.28,124.98 331.94,125.90 332.60,126.82 333.25,127.73 333.91,128.62 334.56,129.50 335.22,130.35 335.87,131.20 336.53,132.01 337.18,132.80 337.84,133.57 338.49,134.32 339.15,135.03 339.80,135.72 340.46,136.38 341.11,137.02 341.77,137.61 342.42,138.19 343.08,138.73 343.73,139.25 344.39,139.73 345.04,140.20 345.70,140.64 346.36,141.05 347.01,141.44 347.67,141.81 348.32,142.16 348.98,142.50 349.63,142.81 350.29,143.12 350.94,143.42 351.60,143.71 352.25,143.99 352.91,144.26 353.56,144.54 354.22,144.81 354.87,145.08 355.53,145.36 356.18,145.64 356.84,145.92 357.49,146.21 358.15,146.50 358.80,146.80 359.46,147.11 360.11,147.43 360.77,147.75 361.43,148.07 362.08,148.41 362.74,148.75 363.39,149.09 364.05,149.43 364.70,149.77 365.36,150.11 366.01,150.45 366.67,150.79 367.32,151.12 367.98,151.44 368.63,151.75 369.29,152.04 369.94,152.32 370.60,152.59 371.25,152.83 371.91,153.06 372.56,153.26 373.22,153.44 373.87,153.60 374.53,153.72 375.19,153.82 375.84,153.90 376.50,153.94 377.15,153.96 377.81,153.95 378.46,153.91 379.12,153.84 379.77,153.75 380.43,153.63 381.08,153.50 381.74,153.34 382.39,153.15 383.05,152.96 383.70,152.75 384.36,152.52 385.01,152.29 385.67,152.06 386.32,151.82 386.98,151.58 387.63,151.34 388.29,151.11 388.95,150.90 389.60,150.70 390.26,150.51 390.91,150.35 391.57,150.21 392.22,150.10 392.88,150.01 393.53,149.96 394.19,149.94 394.84,149.97 395.50,150.02 396.15,150.12 396.81,150.26 397.46,150.45 398.12,150.67 398.77,150.94 399.43,151.26 400.08,151.62 400.74,152.02 401.39,152.47 402.05,152.96 402.71,153.49 403.36,154.06 404.02,154.67 404.67,155.32 405.33,155.99 405.98,156.70 406.64,157.44 407.29,158.21 407.95,159.00 408.60,159.81 409.26,160.65 409.91,161.50 410.57,162.36 411.22,163.24 411.88,164.12 412.53,165.01 413.19,165.91 413.84,166.80 414.50,167.69 415.15,168.58 415.81,169.46 416.47,170.34 417.12,171.20 417.78,172.06 418.43,172.90 419.09,173.72 419.74,174.53 420.40,175.32 421.05,176.09 421.71,176.84 422.36,177.57 423.02,178.28 423.67,178.97 424.33,179.63 424.98,180.27 425.64,180.89 426.29,181.49 426.95,182.05 427.60,182.60 428.26,183.13 428.91,183.63 429.57,184.10 430.22,184.56 430.88,185.00 431.54,185.41 432.19,185.80 432.85,186.17 433.50,186.52 434.16,186.85 434.81,187.16 435.47,187.45 436.12,187.73 436.78,187.98 437.43,188.22 438.09,188.45 438.74,188.66 439.40,188.86 440.05,189.04 440.71,189.21 441.36,189.37 442.02,189.51 442.67,189.65 443.33,189.77 443.98,189.89 444.64,189.99 445.30,190.09 445.95,190.18 446.61,190.26 447.26,190.33 447.92,190.40 448.57,190.46 449.23,190.52 449.88,190.57 450.54,190.62 451.19,190.66 451.85,190.70 452.50,190.73 453.16,190.76 453.81,190.79 454.47,190.81 455.12,190.83 455.78,190.85 456.43,190.87 457.09,190.89 457.74,190.90 458.40,190.91 ' style='stroke-width: 0.75;' />
+<polygon points='123.58,303.79 124.09,303.78 124.60,303.77 125.11,303.75 125.62,303.74 126.13,303.72 126.64,303.70 127.15,303.68 127.66,303.66 128.17,303.63 128.68,303.60 129.20,303.57 129.71,303.54 130.22,303.51 130.73,303.47 131.24,303.43 131.75,303.38 132.26,303.33 132.77,303.28 133.28,303.22 133.79,303.16 134.30,303.09 134.82,303.02 135.33,302.94 135.84,302.86 136.35,302.77 136.86,302.68 137.37,302.58 137.88,302.47 138.39,302.35 138.90,302.23 139.41,302.10 139.92,301.96 140.43,301.81 140.95,301.65 141.46,301.49 141.97,301.31 142.48,301.12 142.99,300.93 143.50,300.72 144.01,300.50 144.52,300.28 145.03,300.04 145.54,299.78 146.05,299.52 146.57,299.25 147.08,298.96 147.59,298.66 148.10,298.35 148.61,298.02 149.12,297.68 149.63,297.33 150.14,296.97 150.65,296.59 151.16,296.21 151.67,295.80 152.19,295.39 152.70,294.96 153.21,294.52 153.72,294.07 154.23,293.61 154.74,293.14 155.25,292.66 155.76,292.16 156.27,291.66 156.78,291.15 157.29,290.63 157.80,290.10 158.32,289.56 158.83,289.02 159.34,288.47 159.85,287.92 160.36,287.36 160.87,286.80 161.38,286.24 161.89,285.67 162.40,285.11 162.91,284.54 163.42,283.98 163.94,283.42 164.45,282.86 164.96,282.30 165.47,281.75 165.98,281.21 166.49,280.67 167.00,280.14 167.51,279.62 168.02,279.11 168.53,278.60 169.04,278.11 169.56,277.63 170.07,277.17 170.58,276.71 171.09,276.27 171.60,275.85 172.11,275.43 172.62,275.03 173.13,274.65 173.64,274.28 174.15,273.93 174.66,273.60 175.17,273.28 175.69,272.97 176.20,272.68 176.71,272.40 177.22,272.14 177.73,271.89 178.24,271.66 178.75,271.43 179.26,271.22 179.77,271.02 180.28,270.82 180.79,270.64 181.31,270.47 181.82,270.29 182.33,270.13 182.84,269.97 183.35,269.80 183.86,269.64 184.37,269.48 184.88,269.32 185.39,269.15 185.90,268.97 186.41,268.78 186.93,268.59 187.44,268.37 187.95,268.15 188.46,267.91 188.97,267.65 189.48,267.37 189.99,267.08 190.50,266.75 191.01,266.40 191.52,266.02 192.03,265.62 192.54,265.18 193.06,264.71 193.57,264.21 194.08,263.66 194.59,263.08 195.10,262.47 195.61,261.81 196.12,261.12 196.63,260.38 197.14,259.60 197.65,258.78 198.16,257.92 198.68,257.01 199.19,256.05 199.70,255.05 200.21,254.02 200.72,252.93 201.23,251.80 201.74,250.64 202.25,249.41 202.76,248.16 203.27,246.87 203.78,245.54 204.30,244.17 204.81,242.77 205.32,241.33 205.83,239.85 206.34,238.36 206.85,236.83 207.36,235.27 207.87,233.70 208.38,232.10 208.89,230.49 209.40,228.86 209.91,227.22 210.43,225.57 210.94,223.91 211.45,222.25 211.96,220.59 212.47,218.93 212.98,217.28 213.49,215.64 214.00,214.01 214.51,212.40 215.02,210.80 215.53,209.23 216.05,207.68 216.56,206.15 217.07,204.67 217.58,203.21 218.09,201.78 218.60,200.40 219.11,199.06 219.62,197.75 220.13,196.50 220.64,195.30 221.15,194.13 221.67,193.02 222.18,191.97 222.69,190.96 223.20,190.01 223.71,189.12 224.22,188.28 224.73,187.49 225.24,186.78 225.75,186.12 226.26,185.50 226.77,184.96 227.28,184.47 227.80,184.03 228.31,183.65 228.82,183.34 229.33,183.06 229.84,182.85 230.35,182.69 230.86,182.57 231.37,182.50 231.88,182.50 232.39,182.53 232.90,182.59 233.42,182.72 233.93,182.87 234.44,183.06 234.95,183.30 235.46,183.56 235.97,183.85 236.48,184.18 236.99,184.53 237.50,184.90 238.01,185.30 238.52,185.72 239.04,186.15 239.55,186.60 240.06,187.06 240.57,187.53 241.08,188.01 241.59,188.50 242.10,189.00 242.61,189.50 243.12,189.99 243.63,190.49 244.14,190.99 244.65,191.48 245.17,191.97 245.68,192.46 246.19,192.94 246.70,193.41 247.21,193.87 247.72,194.33 248.23,194.77 248.74,195.21 249.25,195.64 249.76,196.05 250.27,196.46 250.79,196.85 251.30,197.24 251.81,197.62 252.32,197.98 252.83,198.34 253.34,198.69 253.85,199.04 254.36,199.37 254.87,199.70 255.38,200.02 255.89,200.34 256.41,200.66 256.92,200.97 257.43,201.28 257.94,201.59 258.45,201.90 258.96,202.21 259.47,202.53 259.98,202.84 260.49,203.16 261.00,203.48 261.51,203.81 262.02,204.15 262.54,204.49 263.05,204.84 263.56,205.20 264.07,205.56 264.58,205.94 265.09,206.33 265.60,206.72 266.11,207.13 266.62,207.55 267.13,207.98 267.64,208.42 268.16,208.87 268.67,209.34 269.18,209.82 269.69,210.31 270.20,210.81 270.71,211.32 271.22,211.85 271.73,212.38 272.24,212.92 272.75,213.48 273.26,214.05 273.78,214.62 274.29,215.21 274.80,215.80 275.31,216.40 275.82,217.01 276.33,217.62 276.84,218.24 277.35,218.87 277.86,219.50 278.37,220.13 278.88,220.77 279.39,221.41 279.91,222.05 280.42,222.69 280.93,223.33 281.44,223.97 281.95,224.61 282.46,225.25 282.97,225.88 283.48,226.51 283.99,227.14 284.50,227.75 285.01,228.37 285.53,228.97 286.04,229.57 286.55,230.16 287.06,230.75 287.57,231.32 288.08,231.88 288.59,232.44 289.10,232.97 289.61,233.50 290.12,234.03 290.63,234.53 291.15,235.02 291.66,235.51 292.17,235.97 292.68,236.43 293.19,236.87 293.70,237.30 294.21,237.71 294.72,238.11 295.23,238.50 295.74,238.88 296.25,239.24 296.76,239.59 297.28,239.93 297.79,240.26 298.30,240.57 298.81,240.87 299.32,241.17 299.83,241.45 300.34,241.73 300.85,241.99 301.36,242.25 301.87,242.51 302.38,242.75 302.90,242.99 303.41,243.23 303.92,243.46 304.43,243.69 304.94,243.92 305.45,244.15 305.96,244.38 306.47,244.61 306.98,244.84 307.49,245.08 308.00,245.32 308.52,245.56 309.03,245.81 309.54,246.07 310.05,246.34 310.56,246.61 311.07,246.89 311.58,247.19 312.09,247.49 312.60,247.80 313.11,248.13 313.62,248.47 314.13,248.82 314.65,249.19 315.16,249.57 315.67,249.96 316.18,250.37 316.69,250.79 317.20,251.23 317.71,251.68 318.22,252.14 318.73,252.62 319.24,253.12 319.75,253.63 320.27,254.15 320.78,254.69 321.29,255.24 321.80,255.80 322.31,256.38 322.82,256.97 323.33,257.57 323.84,258.19 324.35,258.81 324.86,259.45 325.37,260.09 325.89,260.75 326.40,261.41 326.91,262.08 327.42,262.76 327.93,263.45 328.44,264.14 328.95,264.84 329.46,265.55 329.97,266.25 330.48,266.97 330.99,267.68 331.50,268.40 332.02,269.12 332.53,269.84 333.04,270.56 333.55,271.28 334.06,272.01 334.57,272.73 335.08,273.45 335.59,274.16 336.10,274.88 336.61,275.59 337.12,276.30 337.64,277.01 338.15,277.71 338.66,278.40 339.17,279.09 339.68,279.78 340.19,280.45 340.70,281.13 341.21,281.79 341.72,282.45 342.23,283.10 342.74,283.74 343.26,284.38 343.77,285.00 344.28,285.62 344.79,286.23 345.30,286.82 345.81,287.41 346.32,287.99 346.83,288.56 347.34,289.12 347.85,289.66 348.36,290.20 348.87,290.73 349.39,291.24 349.90,291.74 350.41,292.24 350.92,292.72 351.43,293.18 351.94,293.64 352.45,294.08 352.96,294.52 353.47,294.94 353.98,295.35 354.49,295.74 355.01,296.13 355.52,296.50 356.03,296.86 356.54,297.21 357.05,297.54 357.56,297.87 358.07,298.18 358.58,298.48 359.09,298.77 359.60,299.05 360.11,299.32 360.63,299.58 361.14,299.82 361.65,300.06 362.16,300.29 362.67,300.50 363.18,300.71 363.69,300.90 364.20,301.09 364.71,301.27 365.22,301.44 365.73,301.60 366.24,301.75 366.76,301.89 367.27,302.03 367.78,302.16 368.29,302.28 368.80,302.39 369.31,302.50 369.82,302.60 370.33,302.70 370.84,302.78 371.35,302.87 371.86,302.95 372.38,303.02 372.89,303.09 373.40,303.15 373.91,303.21 374.42,303.27 374.93,303.32 375.44,303.37 375.95,303.41 376.46,303.45 376.97,303.49 377.48,303.53 378.00,303.56 378.51,303.59 379.02,303.62 379.53,303.64 380.04,303.67 380.55,303.69 381.06,303.71 381.57,303.73 382.08,303.74 382.59,303.76 383.10,303.77 383.61,303.78 384.13,303.80 384.64,303.81 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='123.58,303.79 124.09,303.78 124.60,303.77 125.11,303.75 125.62,303.74 126.13,303.72 126.64,303.70 127.15,303.68 127.66,303.66 128.17,303.63 128.68,303.60 129.20,303.57 129.71,303.54 130.22,303.51 130.73,303.47 131.24,303.43 131.75,303.38 132.26,303.33 132.77,303.28 133.28,303.22 133.79,303.16 134.30,303.09 134.82,303.02 135.33,302.94 135.84,302.86 136.35,302.77 136.86,302.68 137.37,302.58 137.88,302.47 138.39,302.35 138.90,302.23 139.41,302.10 139.92,301.96 140.43,301.81 140.95,301.65 141.46,301.49 141.97,301.31 142.48,301.12 142.99,300.93 143.50,300.72 144.01,300.50 144.52,300.28 145.03,300.04 145.54,299.78 146.05,299.52 146.57,299.25 147.08,298.96 147.59,298.66 148.10,298.35 148.61,298.02 149.12,297.68 149.63,297.33 150.14,296.97 150.65,296.59 151.16,296.21 151.67,295.80 152.19,295.39 152.70,294.96 153.21,294.52 153.72,294.07 154.23,293.61 154.74,293.14 155.25,292.66 155.76,292.16 156.27,291.66 156.78,291.15 157.29,290.63 157.80,290.10 158.32,289.56 158.83,289.02 159.34,288.47 159.85,287.92 160.36,287.36 160.87,286.80 161.38,286.24 161.89,285.67 162.40,285.11 162.91,284.54 163.42,283.98 163.94,283.42 164.45,282.86 164.96,282.30 165.47,281.75 165.98,281.21 166.49,280.67 167.00,280.14 167.51,279.62 168.02,279.11 168.53,278.60 169.04,278.11 169.56,277.63 170.07,277.17 170.58,276.71 171.09,276.27 171.60,275.85 172.11,275.43 172.62,275.03 173.13,274.65 173.64,274.28 174.15,273.93 174.66,273.60 175.17,273.28 175.69,272.97 176.20,272.68 176.71,272.40 177.22,272.14 177.73,271.89 178.24,271.66 178.75,271.43 179.26,271.22 179.77,271.02 180.28,270.82 180.79,270.64 181.31,270.47 181.82,270.29 182.33,270.13 182.84,269.97 183.35,269.80 183.86,269.64 184.37,269.48 184.88,269.32 185.39,269.15 185.90,268.97 186.41,268.78 186.93,268.59 187.44,268.37 187.95,268.15 188.46,267.91 188.97,267.65 189.48,267.37 189.99,267.08 190.50,266.75 191.01,266.40 191.52,266.02 192.03,265.62 192.54,265.18 193.06,264.71 193.57,264.21 194.08,263.66 194.59,263.08 195.10,262.47 195.61,261.81 196.12,261.12 196.63,260.38 197.14,259.60 197.65,258.78 198.16,257.92 198.68,257.01 199.19,256.05 199.70,255.05 200.21,254.02 200.72,252.93 201.23,251.80 201.74,250.64 202.25,249.41 202.76,248.16 203.27,246.87 203.78,245.54 204.30,244.17 204.81,242.77 205.32,241.33 205.83,239.85 206.34,238.36 206.85,236.83 207.36,235.27 207.87,233.70 208.38,232.10 208.89,230.49 209.40,228.86 209.91,227.22 210.43,225.57 210.94,223.91 211.45,222.25 211.96,220.59 212.47,218.93 212.98,217.28 213.49,215.64 214.00,214.01 214.51,212.40 215.02,210.80 215.53,209.23 216.05,207.68 216.56,206.15 217.07,204.67 217.58,203.21 218.09,201.78 218.60,200.40 219.11,199.06 219.62,197.75 220.13,196.50 220.64,195.30 221.15,194.13 221.67,193.02 222.18,191.97 222.69,190.96 223.20,190.01 223.71,189.12 224.22,188.28 224.73,187.49 225.24,186.78 225.75,186.12 226.26,185.50 226.77,184.96 227.28,184.47 227.80,184.03 228.31,183.65 228.82,183.34 229.33,183.06 229.84,182.85 230.35,182.69 230.86,182.57 231.37,182.50 231.88,182.50 232.39,182.53 232.90,182.59 233.42,182.72 233.93,182.87 234.44,183.06 234.95,183.30 235.46,183.56 235.97,183.85 236.48,184.18 236.99,184.53 237.50,184.90 238.01,185.30 238.52,185.72 239.04,186.15 239.55,186.60 240.06,187.06 240.57,187.53 241.08,188.01 241.59,188.50 242.10,189.00 242.61,189.50 243.12,189.99 243.63,190.49 244.14,190.99 244.65,191.48 245.17,191.97 245.68,192.46 246.19,192.94 246.70,193.41 247.21,193.87 247.72,194.33 248.23,194.77 248.74,195.21 249.25,195.64 249.76,196.05 250.27,196.46 250.79,196.85 251.30,197.24 251.81,197.62 252.32,197.98 252.83,198.34 253.34,198.69 253.85,199.04 254.36,199.37 254.87,199.70 255.38,200.02 255.89,200.34 256.41,200.66 256.92,200.97 257.43,201.28 257.94,201.59 258.45,201.90 258.96,202.21 259.47,202.53 259.98,202.84 260.49,203.16 261.00,203.48 261.51,203.81 262.02,204.15 262.54,204.49 263.05,204.84 263.56,205.20 264.07,205.56 264.58,205.94 265.09,206.33 265.60,206.72 266.11,207.13 266.62,207.55 267.13,207.98 267.64,208.42 268.16,208.87 268.67,209.34 269.18,209.82 269.69,210.31 270.20,210.81 270.71,211.32 271.22,211.85 271.73,212.38 272.24,212.92 272.75,213.48 273.26,214.05 273.78,214.62 274.29,215.21 274.80,215.80 275.31,216.40 275.82,217.01 276.33,217.62 276.84,218.24 277.35,218.87 277.86,219.50 278.37,220.13 278.88,220.77 279.39,221.41 279.91,222.05 280.42,222.69 280.93,223.33 281.44,223.97 281.95,224.61 282.46,225.25 282.97,225.88 283.48,226.51 283.99,227.14 284.50,227.75 285.01,228.37 285.53,228.97 286.04,229.57 286.55,230.16 287.06,230.75 287.57,231.32 288.08,231.88 288.59,232.44 289.10,232.97 289.61,233.50 290.12,234.03 290.63,234.53 291.15,235.02 291.66,235.51 292.17,235.97 292.68,236.43 293.19,236.87 293.70,237.30 294.21,237.71 294.72,238.11 295.23,238.50 295.74,238.88 296.25,239.24 296.76,239.59 297.28,239.93 297.79,240.26 298.30,240.57 298.81,240.87 299.32,241.17 299.83,241.45 300.34,241.73 300.85,241.99 301.36,242.25 301.87,242.51 302.38,242.75 302.90,242.99 303.41,243.23 303.92,243.46 304.43,243.69 304.94,243.92 305.45,244.15 305.96,244.38 306.47,244.61 306.98,244.84 307.49,245.08 308.00,245.32 308.52,245.56 309.03,245.81 309.54,246.07 310.05,246.34 310.56,246.61 311.07,246.89 311.58,247.19 312.09,247.49 312.60,247.80 313.11,248.13 313.62,248.47 314.13,248.82 314.65,249.19 315.16,249.57 315.67,249.96 316.18,250.37 316.69,250.79 317.20,251.23 317.71,251.68 318.22,252.14 318.73,252.62 319.24,253.12 319.75,253.63 320.27,254.15 320.78,254.69 321.29,255.24 321.80,255.80 322.31,256.38 322.82,256.97 323.33,257.57 323.84,258.19 324.35,258.81 324.86,259.45 325.37,260.09 325.89,260.75 326.40,261.41 326.91,262.08 327.42,262.76 327.93,263.45 328.44,264.14 328.95,264.84 329.46,265.55 329.97,266.25 330.48,266.97 330.99,267.68 331.50,268.40 332.02,269.12 332.53,269.84 333.04,270.56 333.55,271.28 334.06,272.01 334.57,272.73 335.08,273.45 335.59,274.16 336.10,274.88 336.61,275.59 337.12,276.30 337.64,277.01 338.15,277.71 338.66,278.40 339.17,279.09 339.68,279.78 340.19,280.45 340.70,281.13 341.21,281.79 341.72,282.45 342.23,283.10 342.74,283.74 343.26,284.38 343.77,285.00 344.28,285.62 344.79,286.23 345.30,286.82 345.81,287.41 346.32,287.99 346.83,288.56 347.34,289.12 347.85,289.66 348.36,290.20 348.87,290.73 349.39,291.24 349.90,291.74 350.41,292.24 350.92,292.72 351.43,293.18 351.94,293.64 352.45,294.08 352.96,294.52 353.47,294.94 353.98,295.35 354.49,295.74 355.01,296.13 355.52,296.50 356.03,296.86 356.54,297.21 357.05,297.54 357.56,297.87 358.07,298.18 358.58,298.48 359.09,298.77 359.60,299.05 360.11,299.32 360.63,299.58 361.14,299.82 361.65,300.06 362.16,300.29 362.67,300.50 363.18,300.71 363.69,300.90 364.20,301.09 364.71,301.27 365.22,301.44 365.73,301.60 366.24,301.75 366.76,301.89 367.27,302.03 367.78,302.16 368.29,302.28 368.80,302.39 369.31,302.50 369.82,302.60 370.33,302.70 370.84,302.78 371.35,302.87 371.86,302.95 372.38,303.02 372.89,303.09 373.40,303.15 373.91,303.21 374.42,303.27 374.93,303.32 375.44,303.37 375.95,303.41 376.46,303.45 376.97,303.49 377.48,303.53 378.00,303.56 378.51,303.59 379.02,303.62 379.53,303.64 380.04,303.67 380.55,303.69 381.06,303.71 381.57,303.73 382.08,303.74 382.59,303.76 383.10,303.77 383.61,303.78 384.13,303.80 384.64,303.81 ' style='stroke-width: 0.75;' />
+<polygon points='74.40,416.68 74.81,416.67 75.23,416.66 75.64,416.65 76.06,416.63 76.47,416.62 76.89,416.60 77.30,416.58 77.72,416.56 78.13,416.54 78.55,416.52 78.96,416.50 79.38,416.47 79.79,416.44 80.21,416.41 80.62,416.38 81.03,416.35 81.45,416.31 81.86,416.27 82.28,416.23 82.69,416.19 83.11,416.14 83.52,416.09 83.94,416.03 84.35,415.98 84.77,415.91 85.18,415.85 85.60,415.78 86.01,415.70 86.42,415.63 86.84,415.54 87.25,415.45 87.67,415.36 88.08,415.26 88.50,415.15 88.91,415.04 89.33,414.93 89.74,414.80 90.16,414.67 90.57,414.53 90.99,414.39 91.40,414.24 91.82,414.07 92.23,413.91 92.64,413.73 93.06,413.54 93.47,413.35 93.89,413.15 94.30,412.93 94.72,412.71 95.13,412.48 95.55,412.23 95.96,411.98 96.38,411.71 96.79,411.44 97.21,411.15 97.62,410.85 98.03,410.54 98.45,410.22 98.86,409.88 99.28,409.54 99.69,409.18 100.11,408.81 100.52,408.42 100.94,408.02 101.35,407.61 101.77,407.19 102.18,406.75 102.60,406.30 103.01,405.83 103.43,405.35 103.84,404.86 104.25,404.35 104.67,403.83 105.08,403.30 105.50,402.75 105.91,402.19 106.33,401.61 106.74,401.02 107.16,400.42 107.57,399.81 107.99,399.18 108.40,398.54 108.82,397.88 109.23,397.22 109.65,396.54 110.06,395.85 110.47,395.14 110.89,394.43 111.30,393.70 111.72,392.97 112.13,392.22 112.55,391.46 112.96,390.69 113.38,389.92 113.79,389.13 114.21,388.33 114.62,387.53 115.04,386.72 115.45,385.90 115.86,385.07 116.28,384.24 116.69,383.40 117.11,382.55 117.52,381.70 117.94,380.84 118.35,379.98 118.77,379.11 119.18,378.24 119.60,377.36 120.01,376.49 120.43,375.60 120.84,374.72 121.26,373.83 121.67,372.94 122.08,372.05 122.50,371.16 122.91,370.27 123.33,369.38 123.74,368.48 124.16,367.59 124.57,366.69 124.99,365.80 125.40,364.91 125.82,364.01 126.23,363.12 126.65,362.23 127.06,361.34 127.47,360.44 127.89,359.56 128.30,358.67 128.72,357.78 129.13,356.89 129.55,356.01 129.96,355.12 130.38,354.24 130.79,353.35 131.21,352.47 131.62,351.59 132.04,350.71 132.45,349.83 132.87,348.95 133.28,348.06 133.69,347.18 134.11,346.30 134.52,345.42 134.94,344.53 135.35,343.65 135.77,342.76 136.18,341.87 136.60,340.98 137.01,340.09 137.43,339.19 137.84,338.30 138.26,337.39 138.67,336.49 139.09,335.58 139.50,334.66 139.91,333.75 140.33,332.82 140.74,331.89 141.16,330.96 141.57,330.02 141.99,329.07 142.40,328.12 142.82,327.16 143.23,326.19 143.65,325.22 144.06,324.23 144.48,323.25 144.89,322.25 145.30,321.24 145.72,320.23 146.13,319.20 146.55,318.17 146.96,317.12 147.38,316.07 147.79,315.01 148.21,313.94 148.62,312.86 149.04,311.77 149.45,310.67 149.87,309.56 150.28,308.44 150.70,307.31 151.11,306.17 151.52,305.02 151.94,303.87 152.35,302.70 152.77,301.53 153.18,300.34 153.60,299.15 154.01,297.95 154.43,296.75 154.84,295.54 155.26,294.32 155.67,293.09 156.09,291.86 156.50,290.63 156.92,289.39 157.33,288.15 157.74,286.91 158.16,285.66 158.57,284.42 158.99,283.17 159.40,281.93 159.82,280.69 160.23,279.45 160.65,278.21 161.06,276.98 161.48,275.76 161.89,274.55 162.31,273.34 162.72,272.15 163.13,270.96 163.55,269.79 163.96,268.64 164.38,267.50 164.79,266.38 165.21,265.27 165.62,264.18 166.04,263.12 166.45,262.07 166.87,261.06 167.28,260.07 167.70,259.10 168.11,258.18 168.53,257.27 168.94,256.39 169.35,255.56 169.77,254.75 170.18,253.98 170.60,253.25 171.01,252.55 171.43,251.90 171.84,251.28 172.26,250.70 172.67,250.18 173.09,249.70 173.50,249.25 173.92,248.86 174.33,248.51 174.74,248.21 175.16,247.97 175.57,247.76 175.99,247.61 176.40,247.51 176.82,247.45 177.23,247.46 177.65,247.51 178.06,247.60 178.48,247.76 178.89,247.96 179.31,248.21 179.72,248.53 180.14,248.88 180.55,249.29 180.96,249.75 181.38,250.24 181.79,250.80 182.21,251.41 182.62,252.04 183.04,252.74 183.45,253.48 183.87,254.25 184.28,255.09 184.70,255.95 185.11,256.85 185.53,257.80 185.94,258.77 186.36,259.79 186.77,260.84 187.18,261.91 187.60,263.03 188.01,264.17 188.43,265.33 188.84,266.54 189.26,267.75 189.67,268.99 190.09,270.26 190.50,271.54 190.92,272.84 191.33,274.15 191.75,275.48 192.16,276.82 192.57,278.17 192.99,279.53 193.40,280.90 193.82,282.28 194.23,283.66 194.65,285.04 195.06,286.43 195.48,287.81 195.89,289.20 196.31,290.58 196.72,291.97 197.14,293.34 197.55,294.72 197.97,296.08 198.38,297.44 198.79,298.80 199.21,300.14 199.62,301.47 200.04,302.80 200.45,304.11 200.87,305.42 201.28,306.72 201.70,308.00 202.11,309.27 202.53,310.53 202.94,311.78 203.36,313.02 203.77,314.24 204.18,315.45 204.60,316.65 205.01,317.84 205.43,319.01 205.84,320.18 206.26,321.33 206.67,322.47 207.09,323.60 207.50,324.71 207.92,325.82 208.33,326.92 208.75,328.00 209.16,329.08 209.58,330.14 209.99,331.20 210.40,332.24 210.82,333.28 211.23,334.31 211.65,335.33 212.06,336.34 212.48,337.34 212.89,338.33 213.31,339.32 213.72,340.30 214.14,341.27 214.55,342.23 214.97,343.19 215.38,344.14 215.80,345.08 216.21,346.02 216.62,346.95 217.04,347.87 217.45,348.79 217.87,349.70 218.28,350.60 218.70,351.50 219.11,352.39 219.53,353.27 219.94,354.15 220.36,355.02 220.77,355.88 221.19,356.73 221.60,357.58 222.01,358.43 222.43,359.26 222.84,360.09 223.26,360.91 223.67,361.72 224.09,362.53 224.50,363.33 224.92,364.12 225.33,364.91 225.75,365.69 226.16,366.46 226.58,367.22 226.99,367.98 227.41,368.73 227.82,369.47 228.23,370.20 228.65,370.93 229.06,371.65 229.48,372.37 229.89,373.07 230.31,373.77 230.72,374.47 231.14,375.16 231.55,375.84 231.97,376.51 232.38,377.18 232.80,377.84 233.21,378.50 233.62,379.15 234.04,379.80 234.45,380.44 234.87,381.07 235.28,381.70 235.70,382.33 236.11,382.94 236.53,383.56 236.94,384.17 237.36,384.77 237.77,385.38 238.19,385.97 238.60,386.56 239.02,387.15 239.43,387.74 239.84,388.32 240.26,388.89 240.67,389.47 241.09,390.03 241.50,390.60 241.92,391.16 242.33,391.72 242.75,392.27 243.16,392.82 243.58,393.36 243.99,393.90 244.41,394.44 244.82,394.97 245.24,395.50 245.65,396.02 246.06,396.54 246.48,397.05 246.89,397.56 247.31,398.07 247.72,398.57 248.14,399.06 248.55,399.55 248.97,400.03 249.38,400.51 249.80,400.98 250.21,401.44 250.63,401.90 251.04,402.36 251.45,402.80 251.87,403.24 252.28,403.67 252.70,404.10 253.11,404.52 253.53,404.93 253.94,405.33 254.36,405.73 254.77,406.12 255.19,406.50 255.60,406.87 256.02,407.24 256.43,407.59 256.85,407.94 257.26,408.28 257.67,408.62 258.09,408.94 258.50,409.26 258.92,409.57 259.33,409.86 259.75,410.16 260.16,410.44 260.58,410.71 260.99,410.98 261.41,411.24 261.82,411.49 262.24,411.73 262.65,411.97 263.07,412.19 263.48,412.42 263.89,412.63 264.31,412.83 264.72,413.03 265.14,413.21 265.55,413.40 265.97,413.57 266.38,413.74 266.80,413.90 267.21,414.06 267.63,414.20 268.04,414.35 268.46,414.48 268.87,414.61 269.28,414.73 269.70,414.85 270.11,414.96 270.53,415.07 270.94,415.17 271.36,415.27 271.77,415.36 272.19,415.45 272.60,415.53 273.02,415.61 273.43,415.69 273.85,415.76 274.26,415.83 274.68,415.89 275.09,415.95 275.50,416.01 275.92,416.06 276.33,416.11 276.75,416.16 277.16,416.20 277.58,416.24 277.99,416.28 278.41,416.32 278.82,416.35 279.24,416.39 279.65,416.42 280.07,416.44 280.48,416.47 280.89,416.50 281.31,416.52 281.72,416.54 282.14,416.56 282.55,416.58 282.97,416.60 283.38,416.61 283.80,416.63 284.21,416.64 284.63,416.65 285.04,416.67 285.46,416.68 285.87,416.69 286.29,416.70 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='74.40,416.68 74.81,416.67 75.23,416.66 75.64,416.65 76.06,416.63 76.47,416.62 76.89,416.60 77.30,416.58 77.72,416.56 78.13,416.54 78.55,416.52 78.96,416.50 79.38,416.47 79.79,416.44 80.21,416.41 80.62,416.38 81.03,416.35 81.45,416.31 81.86,416.27 82.28,416.23 82.69,416.19 83.11,416.14 83.52,416.09 83.94,416.03 84.35,415.98 84.77,415.91 85.18,415.85 85.60,415.78 86.01,415.70 86.42,415.63 86.84,415.54 87.25,415.45 87.67,415.36 88.08,415.26 88.50,415.15 88.91,415.04 89.33,414.93 89.74,414.80 90.16,414.67 90.57,414.53 90.99,414.39 91.40,414.24 91.82,414.07 92.23,413.91 92.64,413.73 93.06,413.54 93.47,413.35 93.89,413.15 94.30,412.93 94.72,412.71 95.13,412.48 95.55,412.23 95.96,411.98 96.38,411.71 96.79,411.44 97.21,411.15 97.62,410.85 98.03,410.54 98.45,410.22 98.86,409.88 99.28,409.54 99.69,409.18 100.11,408.81 100.52,408.42 100.94,408.02 101.35,407.61 101.77,407.19 102.18,406.75 102.60,406.30 103.01,405.83 103.43,405.35 103.84,404.86 104.25,404.35 104.67,403.83 105.08,403.30 105.50,402.75 105.91,402.19 106.33,401.61 106.74,401.02 107.16,400.42 107.57,399.81 107.99,399.18 108.40,398.54 108.82,397.88 109.23,397.22 109.65,396.54 110.06,395.85 110.47,395.14 110.89,394.43 111.30,393.70 111.72,392.97 112.13,392.22 112.55,391.46 112.96,390.69 113.38,389.92 113.79,389.13 114.21,388.33 114.62,387.53 115.04,386.72 115.45,385.90 115.86,385.07 116.28,384.24 116.69,383.40 117.11,382.55 117.52,381.70 117.94,380.84 118.35,379.98 118.77,379.11 119.18,378.24 119.60,377.36 120.01,376.49 120.43,375.60 120.84,374.72 121.26,373.83 121.67,372.94 122.08,372.05 122.50,371.16 122.91,370.27 123.33,369.38 123.74,368.48 124.16,367.59 124.57,366.69 124.99,365.80 125.40,364.91 125.82,364.01 126.23,363.12 126.65,362.23 127.06,361.34 127.47,360.44 127.89,359.56 128.30,358.67 128.72,357.78 129.13,356.89 129.55,356.01 129.96,355.12 130.38,354.24 130.79,353.35 131.21,352.47 131.62,351.59 132.04,350.71 132.45,349.83 132.87,348.95 133.28,348.06 133.69,347.18 134.11,346.30 134.52,345.42 134.94,344.53 135.35,343.65 135.77,342.76 136.18,341.87 136.60,340.98 137.01,340.09 137.43,339.19 137.84,338.30 138.26,337.39 138.67,336.49 139.09,335.58 139.50,334.66 139.91,333.75 140.33,332.82 140.74,331.89 141.16,330.96 141.57,330.02 141.99,329.07 142.40,328.12 142.82,327.16 143.23,326.19 143.65,325.22 144.06,324.23 144.48,323.25 144.89,322.25 145.30,321.24 145.72,320.23 146.13,319.20 146.55,318.17 146.96,317.12 147.38,316.07 147.79,315.01 148.21,313.94 148.62,312.86 149.04,311.77 149.45,310.67 149.87,309.56 150.28,308.44 150.70,307.31 151.11,306.17 151.52,305.02 151.94,303.87 152.35,302.70 152.77,301.53 153.18,300.34 153.60,299.15 154.01,297.95 154.43,296.75 154.84,295.54 155.26,294.32 155.67,293.09 156.09,291.86 156.50,290.63 156.92,289.39 157.33,288.15 157.74,286.91 158.16,285.66 158.57,284.42 158.99,283.17 159.40,281.93 159.82,280.69 160.23,279.45 160.65,278.21 161.06,276.98 161.48,275.76 161.89,274.55 162.31,273.34 162.72,272.15 163.13,270.96 163.55,269.79 163.96,268.64 164.38,267.50 164.79,266.38 165.21,265.27 165.62,264.18 166.04,263.12 166.45,262.07 166.87,261.06 167.28,260.07 167.70,259.10 168.11,258.18 168.53,257.27 168.94,256.39 169.35,255.56 169.77,254.75 170.18,253.98 170.60,253.25 171.01,252.55 171.43,251.90 171.84,251.28 172.26,250.70 172.67,250.18 173.09,249.70 173.50,249.25 173.92,248.86 174.33,248.51 174.74,248.21 175.16,247.97 175.57,247.76 175.99,247.61 176.40,247.51 176.82,247.45 177.23,247.46 177.65,247.51 178.06,247.60 178.48,247.76 178.89,247.96 179.31,248.21 179.72,248.53 180.14,248.88 180.55,249.29 180.96,249.75 181.38,250.24 181.79,250.80 182.21,251.41 182.62,252.04 183.04,252.74 183.45,253.48 183.87,254.25 184.28,255.09 184.70,255.95 185.11,256.85 185.53,257.80 185.94,258.77 186.36,259.79 186.77,260.84 187.18,261.91 187.60,263.03 188.01,264.17 188.43,265.33 188.84,266.54 189.26,267.75 189.67,268.99 190.09,270.26 190.50,271.54 190.92,272.84 191.33,274.15 191.75,275.48 192.16,276.82 192.57,278.17 192.99,279.53 193.40,280.90 193.82,282.28 194.23,283.66 194.65,285.04 195.06,286.43 195.48,287.81 195.89,289.20 196.31,290.58 196.72,291.97 197.14,293.34 197.55,294.72 197.97,296.08 198.38,297.44 198.79,298.80 199.21,300.14 199.62,301.47 200.04,302.80 200.45,304.11 200.87,305.42 201.28,306.72 201.70,308.00 202.11,309.27 202.53,310.53 202.94,311.78 203.36,313.02 203.77,314.24 204.18,315.45 204.60,316.65 205.01,317.84 205.43,319.01 205.84,320.18 206.26,321.33 206.67,322.47 207.09,323.60 207.50,324.71 207.92,325.82 208.33,326.92 208.75,328.00 209.16,329.08 209.58,330.14 209.99,331.20 210.40,332.24 210.82,333.28 211.23,334.31 211.65,335.33 212.06,336.34 212.48,337.34 212.89,338.33 213.31,339.32 213.72,340.30 214.14,341.27 214.55,342.23 214.97,343.19 215.38,344.14 215.80,345.08 216.21,346.02 216.62,346.95 217.04,347.87 217.45,348.79 217.87,349.70 218.28,350.60 218.70,351.50 219.11,352.39 219.53,353.27 219.94,354.15 220.36,355.02 220.77,355.88 221.19,356.73 221.60,357.58 222.01,358.43 222.43,359.26 222.84,360.09 223.26,360.91 223.67,361.72 224.09,362.53 224.50,363.33 224.92,364.12 225.33,364.91 225.75,365.69 226.16,366.46 226.58,367.22 226.99,367.98 227.41,368.73 227.82,369.47 228.23,370.20 228.65,370.93 229.06,371.65 229.48,372.37 229.89,373.07 230.31,373.77 230.72,374.47 231.14,375.16 231.55,375.84 231.97,376.51 232.38,377.18 232.80,377.84 233.21,378.50 233.62,379.15 234.04,379.80 234.45,380.44 234.87,381.07 235.28,381.70 235.70,382.33 236.11,382.94 236.53,383.56 236.94,384.17 237.36,384.77 237.77,385.38 238.19,385.97 238.60,386.56 239.02,387.15 239.43,387.74 239.84,388.32 240.26,388.89 240.67,389.47 241.09,390.03 241.50,390.60 241.92,391.16 242.33,391.72 242.75,392.27 243.16,392.82 243.58,393.36 243.99,393.90 244.41,394.44 244.82,394.97 245.24,395.50 245.65,396.02 246.06,396.54 246.48,397.05 246.89,397.56 247.31,398.07 247.72,398.57 248.14,399.06 248.55,399.55 248.97,400.03 249.38,400.51 249.80,400.98 250.21,401.44 250.63,401.90 251.04,402.36 251.45,402.80 251.87,403.24 252.28,403.67 252.70,404.10 253.11,404.52 253.53,404.93 253.94,405.33 254.36,405.73 254.77,406.12 255.19,406.50 255.60,406.87 256.02,407.24 256.43,407.59 256.85,407.94 257.26,408.28 257.67,408.62 258.09,408.94 258.50,409.26 258.92,409.57 259.33,409.86 259.75,410.16 260.16,410.44 260.58,410.71 260.99,410.98 261.41,411.24 261.82,411.49 262.24,411.73 262.65,411.97 263.07,412.19 263.48,412.42 263.89,412.63 264.31,412.83 264.72,413.03 265.14,413.21 265.55,413.40 265.97,413.57 266.38,413.74 266.80,413.90 267.21,414.06 267.63,414.20 268.04,414.35 268.46,414.48 268.87,414.61 269.28,414.73 269.70,414.85 270.11,414.96 270.53,415.07 270.94,415.17 271.36,415.27 271.77,415.36 272.19,415.45 272.60,415.53 273.02,415.61 273.43,415.69 273.85,415.76 274.26,415.83 274.68,415.89 275.09,415.95 275.50,416.01 275.92,416.06 276.33,416.11 276.75,416.16 277.16,416.20 277.58,416.24 277.99,416.28 278.41,416.32 278.82,416.35 279.24,416.39 279.65,416.42 280.07,416.44 280.48,416.47 280.89,416.50 281.31,416.52 281.72,416.54 282.14,416.56 282.55,416.58 282.97,416.60 283.38,416.61 283.80,416.63 284.21,416.64 284.63,416.65 285.04,416.67 285.46,416.68 285.87,416.69 286.29,416.70 ' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='59.04' y1='416.80' x2='59.04' y2='191.00' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='416.80' x2='51.84' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='303.90' x2='51.84' y2='303.90' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='191.00' x2='51.84' y2='191.00' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='35.34px' lengthAdjust='spacingAndGlyphs'>setosa</text>
+<text transform='translate(41.76,303.90) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='51.36px' lengthAdjust='spacingAndGlyphs'>versicolor</text>
+<text transform='translate(41.76,191.00) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.03px' lengthAdjust='spacingAndGlyphs'>virginica</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/ridge_yord_rev.svg b/inst/tinytest/_tinysnapshot/ridge_yord_rev.svg
new file mode 100644
index 00000000..91929b3d
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/ridge_yord_rev.svg
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='70.70px' lengthAdjust='spacingAndGlyphs'>Sepal.Length</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+<line x1='94.29' y1='430.56' x2='422.12' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='94.29' y1='430.56' x2='94.29' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='176.24' y1='430.56' x2='176.24' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='258.20' y1='430.56' x2='258.20' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='340.16' y1='430.56' x2='340.16' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='422.12' y1='430.56' x2='422.12' y2='437.76' style='stroke-width: 0.75;' />
+<text x='94.29' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='176.24' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text x='258.20' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='340.16' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>7</text>
+<text x='422.12' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>8</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<polygon points='74.40,220.13 74.81,220.12 75.23,220.11 75.64,220.09 76.06,220.08 76.47,220.07 76.89,220.06 77.30,220.04 77.72,220.02 78.13,220.01 78.55,219.99 78.96,219.97 79.38,219.94 79.79,219.92 80.21,219.89 80.62,219.87 81.03,219.84 81.45,219.80 81.86,219.77 82.28,219.73 82.69,219.69 83.11,219.65 83.52,219.61 83.94,219.56 84.35,219.51 84.77,219.46 85.18,219.40 85.60,219.34 86.01,219.27 86.42,219.21 86.84,219.13 87.25,219.06 87.67,218.97 88.08,218.89 88.50,218.80 88.91,218.70 89.33,218.60 89.74,218.49 90.16,218.38 90.57,218.25 90.99,218.13 91.40,218.00 91.82,217.86 92.23,217.71 92.64,217.56 93.06,217.39 93.47,217.22 93.89,217.05 94.30,216.86 94.72,216.67 95.13,216.46 95.55,216.25 95.96,216.03 96.38,215.80 96.79,215.56 97.21,215.31 97.62,215.05 98.03,214.78 98.45,214.50 98.86,214.21 99.28,213.91 99.69,213.59 100.11,213.27 100.52,212.94 100.94,212.59 101.35,212.23 101.77,211.86 102.18,211.48 102.60,211.08 103.01,210.68 103.43,210.26 103.84,209.83 104.25,209.39 104.67,208.94 105.08,208.47 105.50,208.00 105.91,207.51 106.33,207.01 106.74,206.49 107.16,205.97 107.57,205.44 107.99,204.89 108.40,204.33 108.82,203.76 109.23,203.18 109.65,202.59 110.06,201.99 110.47,201.37 110.89,200.75 111.30,200.12 111.72,199.48 112.13,198.83 112.55,198.17 112.96,197.50 113.38,196.83 113.79,196.14 114.21,195.45 114.62,194.75 115.04,194.04 115.45,193.33 115.86,192.61 116.28,191.88 116.69,191.15 117.11,190.41 117.52,189.67 117.94,188.92 118.35,188.17 118.77,187.42 119.18,186.66 119.60,185.90 120.01,185.13 120.43,184.37 120.84,183.60 121.26,182.82 121.67,182.05 122.08,181.28 122.50,180.50 122.91,179.72 123.33,178.94 123.74,178.17 124.16,177.39 124.57,176.61 124.99,175.83 125.40,175.05 125.82,174.27 126.23,173.50 126.65,172.72 127.06,171.94 127.47,171.17 127.89,170.39 128.30,169.62 128.72,168.85 129.13,168.08 129.55,167.30 129.96,166.53 130.38,165.77 130.79,165.00 131.21,164.23 131.62,163.46 132.04,162.69 132.45,161.93 132.87,161.16 133.28,160.39 133.69,159.62 134.11,158.86 134.52,158.09 134.94,157.32 135.35,156.55 135.77,155.78 136.18,155.00 136.60,154.23 137.01,153.45 137.43,152.67 137.84,151.89 138.26,151.10 138.67,150.31 139.09,149.52 139.50,148.73 139.91,147.93 140.33,147.12 140.74,146.31 141.16,145.50 141.57,144.68 141.99,143.86 142.40,143.03 142.82,142.19 143.23,141.35 143.65,140.50 144.06,139.65 144.48,138.79 144.89,137.92 145.30,137.04 145.72,136.16 146.13,135.26 146.55,134.36 146.96,133.46 147.38,132.54 147.79,131.62 148.21,130.68 148.62,129.74 149.04,128.79 149.45,127.84 149.87,126.87 150.28,125.90 150.70,124.91 151.11,123.92 151.52,122.92 151.94,121.91 152.35,120.90 152.77,119.88 153.18,118.85 153.60,117.81 154.01,116.77 154.43,115.72 154.84,114.66 155.26,113.60 155.67,112.54 156.09,111.47 156.50,110.39 156.92,109.31 157.33,108.23 157.74,107.15 158.16,106.07 158.57,104.98 158.99,103.90 159.40,102.82 159.82,101.74 160.23,100.66 160.65,99.58 161.06,98.51 161.48,97.45 161.89,96.39 162.31,95.34 162.72,94.30 163.13,93.27 163.55,92.25 163.96,91.25 164.38,90.25 164.79,89.28 165.21,88.31 165.62,87.37 166.04,86.45 166.45,85.53 166.87,84.65 167.28,83.79 167.70,82.95 168.11,82.14 168.53,81.35 168.94,80.59 169.35,79.86 169.77,79.15 170.18,78.49 170.60,77.85 171.01,77.24 171.43,76.67 171.84,76.14 172.26,75.63 172.67,75.18 173.09,74.76 173.50,74.37 173.92,74.03 174.33,73.73 174.74,73.46 175.16,73.25 175.57,73.07 175.99,72.94 176.40,72.86 176.82,72.80 177.23,72.81 177.65,72.85 178.06,72.93 178.48,73.08 178.89,73.25 179.31,73.47 179.72,73.74 180.14,74.05 180.55,74.40 180.96,74.80 181.38,75.23 181.79,75.72 182.21,76.25 182.62,76.80 183.04,77.41 183.45,78.05 183.87,78.72 184.28,79.45 184.70,80.20 185.11,80.98 185.53,81.81 185.94,82.66 186.36,83.54 186.77,84.46 187.18,85.39 187.60,86.37 188.01,87.36 188.43,88.37 188.84,89.42 189.26,90.48 189.67,91.56 190.09,92.66 190.50,93.77 190.92,94.90 191.33,96.05 191.75,97.20 192.16,98.37 192.57,99.55 192.99,100.73 193.40,101.93 193.82,103.12 194.23,104.32 194.65,105.53 195.06,106.73 195.48,107.94 195.89,109.15 196.31,110.35 196.72,111.56 197.14,112.75 197.55,113.95 197.97,115.14 198.38,116.32 198.79,117.50 199.21,118.67 199.62,119.83 200.04,120.99 200.45,122.13 200.87,123.27 201.28,124.40 201.70,125.51 202.11,126.62 202.53,127.72 202.94,128.80 203.36,129.88 203.77,130.94 204.18,132.00 204.60,133.05 205.01,134.08 205.43,135.10 205.84,136.11 206.26,137.11 206.67,138.11 207.09,139.09 207.50,140.06 207.92,141.03 208.33,141.98 208.75,142.92 209.16,143.86 209.58,144.79 209.99,145.71 210.40,146.62 210.82,147.52 211.23,148.41 211.65,149.30 212.06,150.18 212.48,151.05 212.89,151.92 213.31,152.78 213.72,153.63 214.14,154.48 214.55,155.32 214.97,156.15 215.38,156.98 215.80,157.80 216.21,158.61 216.62,159.42 217.04,160.23 217.45,161.02 217.87,161.81 218.28,162.60 218.70,163.38 219.11,164.15 219.53,164.92 219.94,165.69 220.36,166.44 220.77,167.19 221.19,167.94 221.60,168.68 222.01,169.41 222.43,170.14 222.84,170.86 223.26,171.57 223.67,172.28 224.09,172.98 224.50,173.68 224.92,174.37 225.33,175.05 225.75,175.73 226.16,176.40 226.58,177.07 226.99,177.73 227.41,178.38 227.82,179.02 228.23,179.66 228.65,180.30 229.06,180.93 229.48,181.55 229.89,182.16 230.31,182.77 230.72,183.38 231.14,183.98 231.55,184.57 231.97,185.16 232.38,185.74 232.80,186.31 233.21,186.89 233.62,187.45 234.04,188.01 234.45,188.57 234.87,189.12 235.28,189.67 235.70,190.22 236.11,190.76 236.53,191.29 236.94,191.82 237.36,192.35 237.77,192.87 238.19,193.39 238.60,193.91 239.02,194.42 239.43,194.93 239.84,195.43 240.26,195.94 240.67,196.43 241.09,196.93 241.50,197.42 241.92,197.91 242.33,198.39 242.75,198.87 243.16,199.35 243.58,199.82 243.99,200.30 244.41,200.76 244.82,201.23 245.24,201.68 245.65,202.14 246.06,202.59 246.48,203.04 246.89,203.48 247.31,203.92 247.72,204.35 248.14,204.78 248.55,205.21 248.97,205.63 249.38,206.05 249.80,206.46 250.21,206.86 250.63,207.26 251.04,207.65 251.45,208.04 251.87,208.43 252.28,208.80 252.70,209.17 253.11,209.54 253.53,209.89 253.94,210.25 254.36,210.59 254.77,210.93 255.19,211.26 255.60,211.59 256.02,211.90 256.43,212.21 256.85,212.52 257.26,212.81 257.67,213.11 258.09,213.39 258.50,213.66 258.92,213.93 259.33,214.19 259.75,214.45 260.16,214.69 260.58,214.93 260.99,215.16 261.41,215.39 261.82,215.61 262.24,215.82 262.65,216.02 263.07,216.22 263.48,216.41 263.89,216.59 264.31,216.77 264.72,216.94 265.14,217.11 265.55,217.27 265.97,217.42 266.38,217.56 266.80,217.70 267.21,217.84 267.63,217.97 268.04,218.09 268.46,218.21 268.87,218.32 269.28,218.43 269.70,218.53 270.11,218.63 270.53,218.72 270.94,218.81 271.36,218.90 271.77,218.98 272.19,219.05 272.60,219.13 273.02,219.20 273.43,219.26 273.85,219.32 274.26,219.38 274.68,219.44 275.09,219.49 275.50,219.54 275.92,219.58 276.33,219.63 276.75,219.67 277.16,219.71 277.58,219.74 277.99,219.78 278.41,219.81 278.82,219.84 279.24,219.87 279.65,219.89 280.07,219.92 280.48,219.94 280.89,219.96 281.31,219.98 281.72,220.00 282.14,220.02 282.55,220.04 282.97,220.05 283.38,220.06 283.80,220.08 284.21,220.09 284.63,220.10 285.04,220.11 285.46,220.12 285.87,220.13 286.29,220.14 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='74.40,220.13 74.81,220.12 75.23,220.11 75.64,220.09 76.06,220.08 76.47,220.07 76.89,220.06 77.30,220.04 77.72,220.02 78.13,220.01 78.55,219.99 78.96,219.97 79.38,219.94 79.79,219.92 80.21,219.89 80.62,219.87 81.03,219.84 81.45,219.80 81.86,219.77 82.28,219.73 82.69,219.69 83.11,219.65 83.52,219.61 83.94,219.56 84.35,219.51 84.77,219.46 85.18,219.40 85.60,219.34 86.01,219.27 86.42,219.21 86.84,219.13 87.25,219.06 87.67,218.97 88.08,218.89 88.50,218.80 88.91,218.70 89.33,218.60 89.74,218.49 90.16,218.38 90.57,218.25 90.99,218.13 91.40,218.00 91.82,217.86 92.23,217.71 92.64,217.56 93.06,217.39 93.47,217.22 93.89,217.05 94.30,216.86 94.72,216.67 95.13,216.46 95.55,216.25 95.96,216.03 96.38,215.80 96.79,215.56 97.21,215.31 97.62,215.05 98.03,214.78 98.45,214.50 98.86,214.21 99.28,213.91 99.69,213.59 100.11,213.27 100.52,212.94 100.94,212.59 101.35,212.23 101.77,211.86 102.18,211.48 102.60,211.08 103.01,210.68 103.43,210.26 103.84,209.83 104.25,209.39 104.67,208.94 105.08,208.47 105.50,208.00 105.91,207.51 106.33,207.01 106.74,206.49 107.16,205.97 107.57,205.44 107.99,204.89 108.40,204.33 108.82,203.76 109.23,203.18 109.65,202.59 110.06,201.99 110.47,201.37 110.89,200.75 111.30,200.12 111.72,199.48 112.13,198.83 112.55,198.17 112.96,197.50 113.38,196.83 113.79,196.14 114.21,195.45 114.62,194.75 115.04,194.04 115.45,193.33 115.86,192.61 116.28,191.88 116.69,191.15 117.11,190.41 117.52,189.67 117.94,188.92 118.35,188.17 118.77,187.42 119.18,186.66 119.60,185.90 120.01,185.13 120.43,184.37 120.84,183.60 121.26,182.82 121.67,182.05 122.08,181.28 122.50,180.50 122.91,179.72 123.33,178.94 123.74,178.17 124.16,177.39 124.57,176.61 124.99,175.83 125.40,175.05 125.82,174.27 126.23,173.50 126.65,172.72 127.06,171.94 127.47,171.17 127.89,170.39 128.30,169.62 128.72,168.85 129.13,168.08 129.55,167.30 129.96,166.53 130.38,165.77 130.79,165.00 131.21,164.23 131.62,163.46 132.04,162.69 132.45,161.93 132.87,161.16 133.28,160.39 133.69,159.62 134.11,158.86 134.52,158.09 134.94,157.32 135.35,156.55 135.77,155.78 136.18,155.00 136.60,154.23 137.01,153.45 137.43,152.67 137.84,151.89 138.26,151.10 138.67,150.31 139.09,149.52 139.50,148.73 139.91,147.93 140.33,147.12 140.74,146.31 141.16,145.50 141.57,144.68 141.99,143.86 142.40,143.03 142.82,142.19 143.23,141.35 143.65,140.50 144.06,139.65 144.48,138.79 144.89,137.92 145.30,137.04 145.72,136.16 146.13,135.26 146.55,134.36 146.96,133.46 147.38,132.54 147.79,131.62 148.21,130.68 148.62,129.74 149.04,128.79 149.45,127.84 149.87,126.87 150.28,125.90 150.70,124.91 151.11,123.92 151.52,122.92 151.94,121.91 152.35,120.90 152.77,119.88 153.18,118.85 153.60,117.81 154.01,116.77 154.43,115.72 154.84,114.66 155.26,113.60 155.67,112.54 156.09,111.47 156.50,110.39 156.92,109.31 157.33,108.23 157.74,107.15 158.16,106.07 158.57,104.98 158.99,103.90 159.40,102.82 159.82,101.74 160.23,100.66 160.65,99.58 161.06,98.51 161.48,97.45 161.89,96.39 162.31,95.34 162.72,94.30 163.13,93.27 163.55,92.25 163.96,91.25 164.38,90.25 164.79,89.28 165.21,88.31 165.62,87.37 166.04,86.45 166.45,85.53 166.87,84.65 167.28,83.79 167.70,82.95 168.11,82.14 168.53,81.35 168.94,80.59 169.35,79.86 169.77,79.15 170.18,78.49 170.60,77.85 171.01,77.24 171.43,76.67 171.84,76.14 172.26,75.63 172.67,75.18 173.09,74.76 173.50,74.37 173.92,74.03 174.33,73.73 174.74,73.46 175.16,73.25 175.57,73.07 175.99,72.94 176.40,72.86 176.82,72.80 177.23,72.81 177.65,72.85 178.06,72.93 178.48,73.08 178.89,73.25 179.31,73.47 179.72,73.74 180.14,74.05 180.55,74.40 180.96,74.80 181.38,75.23 181.79,75.72 182.21,76.25 182.62,76.80 183.04,77.41 183.45,78.05 183.87,78.72 184.28,79.45 184.70,80.20 185.11,80.98 185.53,81.81 185.94,82.66 186.36,83.54 186.77,84.46 187.18,85.39 187.60,86.37 188.01,87.36 188.43,88.37 188.84,89.42 189.26,90.48 189.67,91.56 190.09,92.66 190.50,93.77 190.92,94.90 191.33,96.05 191.75,97.20 192.16,98.37 192.57,99.55 192.99,100.73 193.40,101.93 193.82,103.12 194.23,104.32 194.65,105.53 195.06,106.73 195.48,107.94 195.89,109.15 196.31,110.35 196.72,111.56 197.14,112.75 197.55,113.95 197.97,115.14 198.38,116.32 198.79,117.50 199.21,118.67 199.62,119.83 200.04,120.99 200.45,122.13 200.87,123.27 201.28,124.40 201.70,125.51 202.11,126.62 202.53,127.72 202.94,128.80 203.36,129.88 203.77,130.94 204.18,132.00 204.60,133.05 205.01,134.08 205.43,135.10 205.84,136.11 206.26,137.11 206.67,138.11 207.09,139.09 207.50,140.06 207.92,141.03 208.33,141.98 208.75,142.92 209.16,143.86 209.58,144.79 209.99,145.71 210.40,146.62 210.82,147.52 211.23,148.41 211.65,149.30 212.06,150.18 212.48,151.05 212.89,151.92 213.31,152.78 213.72,153.63 214.14,154.48 214.55,155.32 214.97,156.15 215.38,156.98 215.80,157.80 216.21,158.61 216.62,159.42 217.04,160.23 217.45,161.02 217.87,161.81 218.28,162.60 218.70,163.38 219.11,164.15 219.53,164.92 219.94,165.69 220.36,166.44 220.77,167.19 221.19,167.94 221.60,168.68 222.01,169.41 222.43,170.14 222.84,170.86 223.26,171.57 223.67,172.28 224.09,172.98 224.50,173.68 224.92,174.37 225.33,175.05 225.75,175.73 226.16,176.40 226.58,177.07 226.99,177.73 227.41,178.38 227.82,179.02 228.23,179.66 228.65,180.30 229.06,180.93 229.48,181.55 229.89,182.16 230.31,182.77 230.72,183.38 231.14,183.98 231.55,184.57 231.97,185.16 232.38,185.74 232.80,186.31 233.21,186.89 233.62,187.45 234.04,188.01 234.45,188.57 234.87,189.12 235.28,189.67 235.70,190.22 236.11,190.76 236.53,191.29 236.94,191.82 237.36,192.35 237.77,192.87 238.19,193.39 238.60,193.91 239.02,194.42 239.43,194.93 239.84,195.43 240.26,195.94 240.67,196.43 241.09,196.93 241.50,197.42 241.92,197.91 242.33,198.39 242.75,198.87 243.16,199.35 243.58,199.82 243.99,200.30 244.41,200.76 244.82,201.23 245.24,201.68 245.65,202.14 246.06,202.59 246.48,203.04 246.89,203.48 247.31,203.92 247.72,204.35 248.14,204.78 248.55,205.21 248.97,205.63 249.38,206.05 249.80,206.46 250.21,206.86 250.63,207.26 251.04,207.65 251.45,208.04 251.87,208.43 252.28,208.80 252.70,209.17 253.11,209.54 253.53,209.89 253.94,210.25 254.36,210.59 254.77,210.93 255.19,211.26 255.60,211.59 256.02,211.90 256.43,212.21 256.85,212.52 257.26,212.81 257.67,213.11 258.09,213.39 258.50,213.66 258.92,213.93 259.33,214.19 259.75,214.45 260.16,214.69 260.58,214.93 260.99,215.16 261.41,215.39 261.82,215.61 262.24,215.82 262.65,216.02 263.07,216.22 263.48,216.41 263.89,216.59 264.31,216.77 264.72,216.94 265.14,217.11 265.55,217.27 265.97,217.42 266.38,217.56 266.80,217.70 267.21,217.84 267.63,217.97 268.04,218.09 268.46,218.21 268.87,218.32 269.28,218.43 269.70,218.53 270.11,218.63 270.53,218.72 270.94,218.81 271.36,218.90 271.77,218.98 272.19,219.05 272.60,219.13 273.02,219.20 273.43,219.26 273.85,219.32 274.26,219.38 274.68,219.44 275.09,219.49 275.50,219.54 275.92,219.58 276.33,219.63 276.75,219.67 277.16,219.71 277.58,219.74 277.99,219.78 278.41,219.81 278.82,219.84 279.24,219.87 279.65,219.89 280.07,219.92 280.48,219.94 280.89,219.96 281.31,219.98 281.72,220.00 282.14,220.02 282.55,220.04 282.97,220.05 283.38,220.06 283.80,220.08 284.21,220.09 284.63,220.10 285.04,220.11 285.46,220.12 285.87,220.13 286.29,220.14 ' style='stroke-width: 0.75;' />
+<polygon points='123.58,318.42 124.09,318.41 124.60,318.40 125.11,318.39 125.62,318.37 126.13,318.36 126.64,318.34 127.15,318.32 127.66,318.30 128.17,318.28 128.68,318.26 129.20,318.23 129.71,318.20 130.22,318.17 130.73,318.14 131.24,318.10 131.75,318.06 132.26,318.02 132.77,317.97 133.28,317.92 133.79,317.87 134.30,317.81 134.82,317.75 135.33,317.68 135.84,317.61 136.35,317.53 136.86,317.45 137.37,317.36 137.88,317.27 138.39,317.17 138.90,317.06 139.41,316.95 139.92,316.82 140.43,316.70 140.95,316.56 141.46,316.42 141.97,316.26 142.48,316.10 142.99,315.93 143.50,315.75 144.01,315.56 144.52,315.36 145.03,315.15 145.54,314.93 146.05,314.71 146.57,314.46 147.08,314.21 147.59,313.95 148.10,313.68 148.61,313.40 149.12,313.10 149.63,312.80 150.14,312.48 150.65,312.15 151.16,311.82 151.67,311.47 152.19,311.11 152.70,310.74 153.21,310.35 153.72,309.96 154.23,309.56 154.74,309.15 155.25,308.73 155.76,308.30 156.27,307.86 156.78,307.42 157.29,306.96 157.80,306.50 158.32,306.04 158.83,305.56 159.34,305.09 159.85,304.61 160.36,304.12 160.87,303.63 161.38,303.14 161.89,302.65 162.40,302.16 162.91,301.66 163.42,301.17 163.94,300.68 164.45,300.20 164.96,299.71 165.47,299.23 165.98,298.76 166.49,298.29 167.00,297.83 167.51,297.38 168.02,296.93 168.53,296.49 169.04,296.06 169.56,295.65 170.07,295.24 170.58,294.85 171.09,294.46 171.60,294.09 172.11,293.73 172.62,293.39 173.13,293.06 173.64,292.73 174.15,292.43 174.66,292.14 175.17,291.86 175.69,291.59 176.20,291.34 176.71,291.10 177.22,290.86 177.73,290.65 178.24,290.45 178.75,290.25 179.26,290.07 179.77,289.89 180.28,289.72 180.79,289.56 181.31,289.41 181.82,289.26 182.33,289.12 182.84,288.97 183.35,288.83 183.86,288.69 184.37,288.55 184.88,288.41 185.39,288.26 185.90,288.11 186.41,287.94 186.93,287.77 187.44,287.59 187.95,287.39 188.46,287.19 188.97,286.96 189.48,286.72 189.99,286.46 190.50,286.18 191.01,285.87 191.52,285.54 192.03,285.19 192.54,284.81 193.06,284.40 193.57,283.96 194.08,283.49 194.59,282.98 195.10,282.45 195.61,281.88 196.12,281.27 196.63,280.63 197.14,279.95 197.65,279.23 198.16,278.48 198.68,277.70 199.19,276.86 199.70,275.99 200.21,275.09 200.72,274.14 201.23,273.16 201.74,272.15 202.25,271.08 202.76,269.99 203.27,268.87 203.78,267.71 204.30,266.51 204.81,265.30 205.32,264.04 205.83,262.76 206.34,261.46 206.85,260.13 207.36,258.77 207.87,257.40 208.38,256.01 208.89,254.61 209.40,253.19 209.91,251.76 210.43,250.32 210.94,248.88 211.45,247.44 211.96,245.99 212.47,244.55 212.98,243.11 213.49,241.68 214.00,240.26 214.51,238.86 215.02,237.47 215.53,236.10 216.05,234.75 216.56,233.42 217.07,232.13 217.58,230.86 218.09,229.62 218.60,228.42 219.11,227.25 219.62,226.11 220.13,225.02 220.64,223.97 221.15,222.96 221.67,221.99 222.18,221.08 222.69,220.20 223.20,219.37 223.71,218.60 224.22,217.87 224.73,217.18 225.24,216.56 225.75,215.98 226.26,215.44 226.77,214.97 227.28,214.55 227.80,214.16 228.31,213.84 228.82,213.56 229.33,213.32 229.84,213.13 230.35,213.00 230.86,212.89 231.37,212.84 231.88,212.83 232.39,212.85 232.90,212.91 233.42,213.02 233.93,213.16 234.44,213.32 234.95,213.53 235.46,213.76 235.97,214.01 236.48,214.29 236.99,214.60 237.50,214.92 238.01,215.27 238.52,215.63 239.04,216.01 239.55,216.40 240.06,216.80 240.57,217.21 241.08,217.63 241.59,218.06 242.10,218.49 242.61,218.92 243.12,219.36 243.63,219.79 244.14,220.22 244.65,220.65 245.17,221.08 245.68,221.50 246.19,221.92 246.70,222.33 247.21,222.73 247.72,223.13 248.23,223.52 248.74,223.90 249.25,224.27 249.76,224.63 250.27,224.98 250.79,225.33 251.30,225.66 251.81,225.99 252.32,226.31 252.83,226.62 253.34,226.93 253.85,227.23 254.36,227.52 254.87,227.81 255.38,228.09 255.89,228.37 256.41,228.64 256.92,228.91 257.43,229.18 257.94,229.45 258.45,229.72 258.96,229.99 259.47,230.27 259.98,230.54 260.49,230.82 261.00,231.10 261.51,231.39 262.02,231.68 262.54,231.97 263.05,232.28 263.56,232.59 264.07,232.91 264.58,233.24 265.09,233.57 265.60,233.92 266.11,234.27 266.62,234.64 267.13,235.01 267.64,235.40 268.16,235.79 268.67,236.20 269.18,236.61 269.69,237.04 270.20,237.47 270.71,237.92 271.22,238.38 271.73,238.84 272.24,239.32 272.75,239.80 273.26,240.30 273.78,240.79 274.29,241.31 274.80,241.82 275.31,242.34 275.82,242.87 276.33,243.41 276.84,243.95 277.35,244.49 277.86,245.04 278.37,245.59 278.88,246.15 279.39,246.70 279.91,247.26 280.42,247.82 280.93,248.38 281.44,248.94 281.95,249.49 282.46,250.05 282.97,250.60 283.48,251.15 283.99,251.69 284.50,252.23 285.01,252.76 285.53,253.29 286.04,253.81 286.55,254.33 287.06,254.83 287.57,255.33 288.08,255.82 288.59,256.30 289.10,256.77 289.61,257.23 290.12,257.69 290.63,258.13 291.15,258.56 291.66,258.98 292.17,259.38 292.68,259.78 293.19,260.16 293.70,260.54 294.21,260.90 294.72,261.25 295.23,261.59 295.74,261.91 296.25,262.23 296.76,262.53 297.28,262.83 297.79,263.11 298.30,263.39 298.81,263.65 299.32,263.91 299.83,264.15 300.34,264.39 300.85,264.62 301.36,264.85 301.87,265.07 302.38,265.28 302.90,265.49 303.41,265.70 303.92,265.90 304.43,266.10 304.94,266.30 305.45,266.50 305.96,266.70 306.47,266.90 306.98,267.10 307.49,267.31 308.00,267.52 308.52,267.73 309.03,267.95 309.54,268.17 310.05,268.40 310.56,268.64 311.07,268.89 311.58,269.14 312.09,269.41 312.60,269.68 313.11,269.97 313.62,270.26 314.13,270.57 314.65,270.88 315.16,271.22 315.67,271.56 316.18,271.91 316.69,272.28 317.20,272.66 317.71,273.05 318.22,273.46 318.73,273.88 319.24,274.31 319.75,274.75 320.27,275.21 320.78,275.68 321.29,276.15 321.80,276.65 322.31,277.15 322.82,277.66 323.33,278.19 323.84,278.72 324.35,279.26 324.86,279.82 325.37,280.38 325.89,280.95 326.40,281.53 326.91,282.11 327.42,282.70 327.93,283.30 328.44,283.91 328.95,284.51 329.46,285.13 329.97,285.74 330.48,286.36 330.99,286.99 331.50,287.61 332.02,288.24 332.53,288.87 333.04,289.49 333.55,290.12 334.06,290.75 334.57,291.38 335.08,292.01 335.59,292.63 336.10,293.25 336.61,293.87 337.12,294.49 337.64,295.10 338.15,295.71 338.66,296.32 339.17,296.92 339.68,297.51 340.19,298.11 340.70,298.69 341.21,299.27 341.72,299.84 342.23,300.41 342.74,300.97 343.26,301.52 343.77,302.06 344.28,302.60 344.79,303.13 345.30,303.65 345.81,304.16 346.32,304.67 346.83,305.16 347.34,305.65 347.85,306.12 348.36,306.59 348.87,307.05 349.39,307.50 349.90,307.93 350.41,308.36 350.92,308.78 351.43,309.19 351.94,309.58 352.45,309.97 352.96,310.35 353.47,310.71 353.98,311.07 354.49,311.41 355.01,311.75 355.52,312.07 356.03,312.39 356.54,312.69 357.05,312.98 357.56,313.26 358.07,313.54 358.58,313.80 359.09,314.05 359.60,314.29 360.11,314.53 360.63,314.75 361.14,314.97 361.65,315.17 362.16,315.37 362.67,315.56 363.18,315.74 363.69,315.91 364.20,316.07 364.71,316.22 365.22,316.37 365.73,316.51 366.24,316.64 366.76,316.77 367.27,316.89 367.78,317.00 368.29,317.10 368.80,317.20 369.31,317.30 369.82,317.38 370.33,317.47 370.84,317.55 371.35,317.62 371.86,317.69 372.38,317.75 372.89,317.81 373.40,317.87 373.91,317.92 374.42,317.97 374.93,318.01 375.44,318.05 375.95,318.09 376.46,318.13 376.97,318.16 377.48,318.19 378.00,318.22 378.51,318.25 379.02,318.27 379.53,318.29 380.04,318.31 380.55,318.33 381.06,318.35 381.57,318.36 382.08,318.38 382.59,318.39 383.10,318.40 383.61,318.41 384.13,318.42 384.64,318.43 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='123.58,318.42 124.09,318.41 124.60,318.40 125.11,318.39 125.62,318.37 126.13,318.36 126.64,318.34 127.15,318.32 127.66,318.30 128.17,318.28 128.68,318.26 129.20,318.23 129.71,318.20 130.22,318.17 130.73,318.14 131.24,318.10 131.75,318.06 132.26,318.02 132.77,317.97 133.28,317.92 133.79,317.87 134.30,317.81 134.82,317.75 135.33,317.68 135.84,317.61 136.35,317.53 136.86,317.45 137.37,317.36 137.88,317.27 138.39,317.17 138.90,317.06 139.41,316.95 139.92,316.82 140.43,316.70 140.95,316.56 141.46,316.42 141.97,316.26 142.48,316.10 142.99,315.93 143.50,315.75 144.01,315.56 144.52,315.36 145.03,315.15 145.54,314.93 146.05,314.71 146.57,314.46 147.08,314.21 147.59,313.95 148.10,313.68 148.61,313.40 149.12,313.10 149.63,312.80 150.14,312.48 150.65,312.15 151.16,311.82 151.67,311.47 152.19,311.11 152.70,310.74 153.21,310.35 153.72,309.96 154.23,309.56 154.74,309.15 155.25,308.73 155.76,308.30 156.27,307.86 156.78,307.42 157.29,306.96 157.80,306.50 158.32,306.04 158.83,305.56 159.34,305.09 159.85,304.61 160.36,304.12 160.87,303.63 161.38,303.14 161.89,302.65 162.40,302.16 162.91,301.66 163.42,301.17 163.94,300.68 164.45,300.20 164.96,299.71 165.47,299.23 165.98,298.76 166.49,298.29 167.00,297.83 167.51,297.38 168.02,296.93 168.53,296.49 169.04,296.06 169.56,295.65 170.07,295.24 170.58,294.85 171.09,294.46 171.60,294.09 172.11,293.73 172.62,293.39 173.13,293.06 173.64,292.73 174.15,292.43 174.66,292.14 175.17,291.86 175.69,291.59 176.20,291.34 176.71,291.10 177.22,290.86 177.73,290.65 178.24,290.45 178.75,290.25 179.26,290.07 179.77,289.89 180.28,289.72 180.79,289.56 181.31,289.41 181.82,289.26 182.33,289.12 182.84,288.97 183.35,288.83 183.86,288.69 184.37,288.55 184.88,288.41 185.39,288.26 185.90,288.11 186.41,287.94 186.93,287.77 187.44,287.59 187.95,287.39 188.46,287.19 188.97,286.96 189.48,286.72 189.99,286.46 190.50,286.18 191.01,285.87 191.52,285.54 192.03,285.19 192.54,284.81 193.06,284.40 193.57,283.96 194.08,283.49 194.59,282.98 195.10,282.45 195.61,281.88 196.12,281.27 196.63,280.63 197.14,279.95 197.65,279.23 198.16,278.48 198.68,277.70 199.19,276.86 199.70,275.99 200.21,275.09 200.72,274.14 201.23,273.16 201.74,272.15 202.25,271.08 202.76,269.99 203.27,268.87 203.78,267.71 204.30,266.51 204.81,265.30 205.32,264.04 205.83,262.76 206.34,261.46 206.85,260.13 207.36,258.77 207.87,257.40 208.38,256.01 208.89,254.61 209.40,253.19 209.91,251.76 210.43,250.32 210.94,248.88 211.45,247.44 211.96,245.99 212.47,244.55 212.98,243.11 213.49,241.68 214.00,240.26 214.51,238.86 215.02,237.47 215.53,236.10 216.05,234.75 216.56,233.42 217.07,232.13 217.58,230.86 218.09,229.62 218.60,228.42 219.11,227.25 219.62,226.11 220.13,225.02 220.64,223.97 221.15,222.96 221.67,221.99 222.18,221.08 222.69,220.20 223.20,219.37 223.71,218.60 224.22,217.87 224.73,217.18 225.24,216.56 225.75,215.98 226.26,215.44 226.77,214.97 227.28,214.55 227.80,214.16 228.31,213.84 228.82,213.56 229.33,213.32 229.84,213.13 230.35,213.00 230.86,212.89 231.37,212.84 231.88,212.83 232.39,212.85 232.90,212.91 233.42,213.02 233.93,213.16 234.44,213.32 234.95,213.53 235.46,213.76 235.97,214.01 236.48,214.29 236.99,214.60 237.50,214.92 238.01,215.27 238.52,215.63 239.04,216.01 239.55,216.40 240.06,216.80 240.57,217.21 241.08,217.63 241.59,218.06 242.10,218.49 242.61,218.92 243.12,219.36 243.63,219.79 244.14,220.22 244.65,220.65 245.17,221.08 245.68,221.50 246.19,221.92 246.70,222.33 247.21,222.73 247.72,223.13 248.23,223.52 248.74,223.90 249.25,224.27 249.76,224.63 250.27,224.98 250.79,225.33 251.30,225.66 251.81,225.99 252.32,226.31 252.83,226.62 253.34,226.93 253.85,227.23 254.36,227.52 254.87,227.81 255.38,228.09 255.89,228.37 256.41,228.64 256.92,228.91 257.43,229.18 257.94,229.45 258.45,229.72 258.96,229.99 259.47,230.27 259.98,230.54 260.49,230.82 261.00,231.10 261.51,231.39 262.02,231.68 262.54,231.97 263.05,232.28 263.56,232.59 264.07,232.91 264.58,233.24 265.09,233.57 265.60,233.92 266.11,234.27 266.62,234.64 267.13,235.01 267.64,235.40 268.16,235.79 268.67,236.20 269.18,236.61 269.69,237.04 270.20,237.47 270.71,237.92 271.22,238.38 271.73,238.84 272.24,239.32 272.75,239.80 273.26,240.30 273.78,240.79 274.29,241.31 274.80,241.82 275.31,242.34 275.82,242.87 276.33,243.41 276.84,243.95 277.35,244.49 277.86,245.04 278.37,245.59 278.88,246.15 279.39,246.70 279.91,247.26 280.42,247.82 280.93,248.38 281.44,248.94 281.95,249.49 282.46,250.05 282.97,250.60 283.48,251.15 283.99,251.69 284.50,252.23 285.01,252.76 285.53,253.29 286.04,253.81 286.55,254.33 287.06,254.83 287.57,255.33 288.08,255.82 288.59,256.30 289.10,256.77 289.61,257.23 290.12,257.69 290.63,258.13 291.15,258.56 291.66,258.98 292.17,259.38 292.68,259.78 293.19,260.16 293.70,260.54 294.21,260.90 294.72,261.25 295.23,261.59 295.74,261.91 296.25,262.23 296.76,262.53 297.28,262.83 297.79,263.11 298.30,263.39 298.81,263.65 299.32,263.91 299.83,264.15 300.34,264.39 300.85,264.62 301.36,264.85 301.87,265.07 302.38,265.28 302.90,265.49 303.41,265.70 303.92,265.90 304.43,266.10 304.94,266.30 305.45,266.50 305.96,266.70 306.47,266.90 306.98,267.10 307.49,267.31 308.00,267.52 308.52,267.73 309.03,267.95 309.54,268.17 310.05,268.40 310.56,268.64 311.07,268.89 311.58,269.14 312.09,269.41 312.60,269.68 313.11,269.97 313.62,270.26 314.13,270.57 314.65,270.88 315.16,271.22 315.67,271.56 316.18,271.91 316.69,272.28 317.20,272.66 317.71,273.05 318.22,273.46 318.73,273.88 319.24,274.31 319.75,274.75 320.27,275.21 320.78,275.68 321.29,276.15 321.80,276.65 322.31,277.15 322.82,277.66 323.33,278.19 323.84,278.72 324.35,279.26 324.86,279.82 325.37,280.38 325.89,280.95 326.40,281.53 326.91,282.11 327.42,282.70 327.93,283.30 328.44,283.91 328.95,284.51 329.46,285.13 329.97,285.74 330.48,286.36 330.99,286.99 331.50,287.61 332.02,288.24 332.53,288.87 333.04,289.49 333.55,290.12 334.06,290.75 334.57,291.38 335.08,292.01 335.59,292.63 336.10,293.25 336.61,293.87 337.12,294.49 337.64,295.10 338.15,295.71 338.66,296.32 339.17,296.92 339.68,297.51 340.19,298.11 340.70,298.69 341.21,299.27 341.72,299.84 342.23,300.41 342.74,300.97 343.26,301.52 343.77,302.06 344.28,302.60 344.79,303.13 345.30,303.65 345.81,304.16 346.32,304.67 346.83,305.16 347.34,305.65 347.85,306.12 348.36,306.59 348.87,307.05 349.39,307.50 349.90,307.93 350.41,308.36 350.92,308.78 351.43,309.19 351.94,309.58 352.45,309.97 352.96,310.35 353.47,310.71 353.98,311.07 354.49,311.41 355.01,311.75 355.52,312.07 356.03,312.39 356.54,312.69 357.05,312.98 357.56,313.26 358.07,313.54 358.58,313.80 359.09,314.05 359.60,314.29 360.11,314.53 360.63,314.75 361.14,314.97 361.65,315.17 362.16,315.37 362.67,315.56 363.18,315.74 363.69,315.91 364.20,316.07 364.71,316.22 365.22,316.37 365.73,316.51 366.24,316.64 366.76,316.77 367.27,316.89 367.78,317.00 368.29,317.10 368.80,317.20 369.31,317.30 369.82,317.38 370.33,317.47 370.84,317.55 371.35,317.62 371.86,317.69 372.38,317.75 372.89,317.81 373.40,317.87 373.91,317.92 374.42,317.97 374.93,318.01 375.44,318.05 375.95,318.09 376.46,318.13 376.97,318.16 377.48,318.19 378.00,318.22 378.51,318.25 379.02,318.27 379.53,318.29 380.04,318.31 380.55,318.33 381.06,318.35 381.57,318.36 382.08,318.38 382.59,318.39 383.10,318.40 383.61,318.41 384.13,318.42 384.64,318.43 ' style='stroke-width: 0.75;' />
+<polygon points='123.58,416.73 124.23,416.72 124.89,416.71 125.54,416.70 126.20,416.69 126.85,416.67 127.51,416.66 128.16,416.64 128.82,416.62 129.47,416.59 130.13,416.57 130.78,416.54 131.44,416.51 132.09,416.48 132.75,416.44 133.40,416.40 134.06,416.36 134.71,416.31 135.37,416.26 136.03,416.21 136.68,416.15 137.34,416.09 137.99,416.02 138.65,415.95 139.30,415.87 139.96,415.79 140.61,415.70 141.27,415.61 141.92,415.51 142.58,415.41 143.23,415.30 143.89,415.19 144.54,415.07 145.20,414.95 145.85,414.82 146.51,414.68 147.16,414.55 147.82,414.41 148.47,414.26 149.13,414.11 149.78,413.96 150.44,413.80 151.10,413.64 151.75,413.48 152.41,413.32 153.06,413.16 153.72,412.99 154.37,412.83 155.03,412.67 155.68,412.51 156.34,412.35 156.99,412.20 157.65,412.05 158.30,411.91 158.96,411.77 159.61,411.63 160.27,411.51 160.92,411.39 161.58,411.28 162.23,411.18 162.89,411.08 163.54,411.00 164.20,410.93 164.86,410.87 165.51,410.81 166.17,410.77 166.82,410.75 167.48,410.73 168.13,410.72 168.79,410.73 169.44,410.75 170.10,410.78 170.75,410.82 171.41,410.87 172.06,410.94 172.72,411.01 173.37,411.09 174.03,411.18 174.68,411.29 175.34,411.39 175.99,411.51 176.65,411.64 177.30,411.77 177.96,411.90 178.62,412.04 179.27,412.18 179.93,412.33 180.58,412.47 181.24,412.62 181.89,412.77 182.55,412.92 183.20,413.07 183.86,413.21 184.51,413.35 185.17,413.49 185.82,413.62 186.48,413.74 187.13,413.86 187.79,413.98 188.44,414.08 189.10,414.18 189.75,414.26 190.41,414.34 191.06,414.41 191.72,414.46 192.38,414.51 193.03,414.54 193.69,414.56 194.34,414.56 195.00,414.56 195.65,414.53 196.31,414.49 196.96,414.44 197.62,414.37 198.27,414.29 198.93,414.18 199.58,414.06 200.24,413.92 200.89,413.76 201.55,413.58 202.20,413.38 202.86,413.17 203.51,412.93 204.17,412.67 204.82,412.39 205.48,412.09 206.14,411.76 206.79,411.41 207.45,411.04 208.10,410.66 208.76,410.24 209.41,409.80 210.07,409.34 210.72,408.86 211.38,408.34 212.03,407.81 212.69,407.26 213.34,406.68 214.00,406.08 214.65,405.45 215.31,404.81 215.96,404.15 216.62,403.46 217.27,402.75 217.93,402.02 218.58,401.28 219.24,400.52 219.89,399.74 220.55,398.95 221.21,398.14 221.86,397.32 222.52,396.48 223.17,395.64 223.83,394.79 224.48,393.93 225.14,393.07 225.79,392.20 226.45,391.33 227.10,390.45 227.76,389.58 228.41,388.71 229.07,387.84 229.72,386.98 230.38,386.12 231.03,385.27 231.69,384.43 232.34,383.60 233.00,382.78 233.65,381.97 234.31,381.18 234.97,380.40 235.62,379.63 236.28,378.88 236.93,378.15 237.59,377.44 238.24,376.73 238.90,376.05 239.55,375.38 240.21,374.73 240.86,374.09 241.52,373.48 242.17,372.87 242.83,372.27 243.48,371.69 244.14,371.12 244.79,370.56 245.45,370.01 246.10,369.46 246.76,368.92 247.41,368.38 248.07,367.84 248.73,367.30 249.38,366.76 250.04,366.21 250.69,365.65 251.35,365.09 252.00,364.51 252.66,363.92 253.31,363.31 253.97,362.68 254.62,362.03 255.28,361.37 255.93,360.68 256.59,359.95 257.24,359.21 257.90,358.43 258.55,357.63 259.21,356.79 259.86,355.92 260.52,355.03 261.17,354.10 261.83,353.13 262.49,352.13 263.14,351.10 263.80,350.04 264.45,348.95 265.11,347.83 265.76,346.68 266.42,345.50 267.07,344.30 267.73,343.08 268.38,341.84 269.04,340.58 269.69,339.31 270.35,338.03 271.00,336.74 271.66,335.45 272.31,334.16 272.97,332.87 273.62,331.59 274.28,330.33 274.93,329.09 275.59,327.87 276.25,326.67 276.90,325.51 277.56,324.38 278.21,323.28 278.87,322.24 279.52,321.25 280.18,320.30 280.83,319.40 281.49,318.57 282.14,317.81 282.80,317.10 283.45,316.44 284.11,315.88 284.76,315.39 285.42,314.95 286.07,314.59 286.73,314.32 287.38,314.11 288.04,313.97 288.69,313.90 289.35,313.93 290.00,314.01 290.66,314.15 291.32,314.37 291.97,314.65 292.63,315.00 293.28,315.39 293.94,315.85 294.59,316.36 295.25,316.92 295.90,317.52 296.56,318.16 297.21,318.85 297.87,319.56 298.52,320.29 299.18,321.06 299.83,321.85 300.49,322.66 301.14,323.47 301.80,324.30 302.45,325.14 303.11,325.98 303.76,326.82 304.42,327.66 305.08,328.50 305.73,329.33 306.39,330.16 307.04,330.98 307.70,331.78 308.35,332.59 309.01,333.37 309.66,334.15 310.32,334.92 310.97,335.68 311.63,336.43 312.28,337.17 312.94,337.91 313.59,338.63 314.25,339.36 314.90,340.07 315.56,340.79 316.21,341.50 316.87,342.22 317.52,342.94 318.18,343.65 318.84,344.38 319.49,345.11 320.15,345.84 320.80,346.58 321.46,347.33 322.11,348.09 322.77,348.85 323.42,349.62 324.08,350.40 324.73,351.19 325.39,351.99 326.04,352.79 326.70,353.60 327.35,354.42 328.01,355.24 328.66,356.06 329.32,356.88 329.97,357.70 330.63,358.52 331.28,359.33 331.94,360.13 332.60,360.93 333.25,361.72 333.91,362.50 334.56,363.26 335.22,364.01 335.87,364.74 336.53,365.45 337.18,366.14 337.84,366.81 338.49,367.46 339.15,368.08 339.80,368.68 340.46,369.26 341.11,369.81 341.77,370.33 342.42,370.83 343.08,371.30 343.73,371.75 344.39,372.17 345.04,372.58 345.70,372.96 346.36,373.32 347.01,373.66 347.67,373.98 348.32,374.29 348.98,374.58 349.63,374.86 350.29,375.12 350.94,375.38 351.60,375.63 352.25,375.88 352.91,376.12 353.56,376.36 354.22,376.59 354.87,376.83 355.53,377.07 356.18,377.31 356.84,377.56 357.49,377.81 358.15,378.07 358.80,378.33 359.46,378.60 360.11,378.87 360.77,379.15 361.43,379.43 362.08,379.72 362.74,380.02 363.39,380.31 364.05,380.61 364.70,380.91 365.36,381.21 366.01,381.51 366.67,381.80 367.32,382.08 367.98,382.36 368.63,382.63 369.29,382.89 369.94,383.13 370.60,383.36 371.25,383.58 371.91,383.77 372.56,383.95 373.22,384.11 373.87,384.24 374.53,384.35 375.19,384.44 375.84,384.50 376.50,384.54 377.15,384.56 377.81,384.55 378.46,384.52 379.12,384.46 379.77,384.38 380.43,384.27 381.08,384.16 381.74,384.01 382.39,383.86 383.05,383.69 383.70,383.50 384.36,383.31 385.01,383.11 385.67,382.90 386.32,382.69 386.98,382.48 387.63,382.28 388.29,382.08 388.95,381.89 389.60,381.72 390.26,381.56 390.91,381.41 391.57,381.29 392.22,381.19 392.88,381.12 393.53,381.07 394.19,381.06 394.84,381.08 395.50,381.13 396.15,381.21 396.81,381.34 397.46,381.50 398.12,381.70 398.77,381.93 399.43,382.21 400.08,382.52 400.74,382.87 401.39,383.26 402.05,383.69 402.71,384.15 403.36,384.64 404.02,385.17 404.67,385.74 405.33,386.33 405.98,386.94 406.64,387.59 407.29,388.26 407.95,388.95 408.60,389.65 409.26,390.38 409.91,391.12 410.57,391.87 411.22,392.63 411.88,393.41 412.53,394.18 413.19,394.96 413.84,395.74 414.50,396.51 415.15,397.29 415.81,398.05 416.47,398.82 417.12,399.57 417.78,400.31 418.43,401.04 419.09,401.76 419.74,402.46 420.40,403.15 421.05,403.82 421.71,404.48 422.36,405.11 423.02,405.73 423.67,406.33 424.33,406.90 424.98,407.46 425.64,408.00 426.29,408.52 426.95,409.01 427.60,409.49 428.26,409.95 428.91,410.39 429.57,410.80 430.22,411.20 430.88,411.58 431.54,411.93 432.19,412.27 432.85,412.59 433.50,412.90 434.16,413.19 434.81,413.46 435.47,413.71 436.12,413.95 436.78,414.18 437.43,414.38 438.09,414.58 438.74,414.77 439.40,414.94 440.05,415.10 440.71,415.24 441.36,415.38 442.02,415.51 442.67,415.62 443.33,415.73 443.98,415.83 444.64,415.93 445.30,416.01 445.95,416.09 446.61,416.16 447.26,416.22 447.92,416.28 448.57,416.34 449.23,416.38 449.88,416.43 450.54,416.47 451.19,416.51 451.85,416.54 452.50,416.57 453.16,416.59 453.81,416.62 454.47,416.64 455.12,416.66 455.78,416.68 456.43,416.69 457.09,416.70 457.74,416.72 458.40,416.73 ' style='stroke-width: 0.75; stroke: none; fill: #BEBEBE;' />
+<polyline points='123.58,416.73 124.23,416.72 124.89,416.71 125.54,416.70 126.20,416.69 126.85,416.67 127.51,416.66 128.16,416.64 128.82,416.62 129.47,416.59 130.13,416.57 130.78,416.54 131.44,416.51 132.09,416.48 132.75,416.44 133.40,416.40 134.06,416.36 134.71,416.31 135.37,416.26 136.03,416.21 136.68,416.15 137.34,416.09 137.99,416.02 138.65,415.95 139.30,415.87 139.96,415.79 140.61,415.70 141.27,415.61 141.92,415.51 142.58,415.41 143.23,415.30 143.89,415.19 144.54,415.07 145.20,414.95 145.85,414.82 146.51,414.68 147.16,414.55 147.82,414.41 148.47,414.26 149.13,414.11 149.78,413.96 150.44,413.80 151.10,413.64 151.75,413.48 152.41,413.32 153.06,413.16 153.72,412.99 154.37,412.83 155.03,412.67 155.68,412.51 156.34,412.35 156.99,412.20 157.65,412.05 158.30,411.91 158.96,411.77 159.61,411.63 160.27,411.51 160.92,411.39 161.58,411.28 162.23,411.18 162.89,411.08 163.54,411.00 164.20,410.93 164.86,410.87 165.51,410.81 166.17,410.77 166.82,410.75 167.48,410.73 168.13,410.72 168.79,410.73 169.44,410.75 170.10,410.78 170.75,410.82 171.41,410.87 172.06,410.94 172.72,411.01 173.37,411.09 174.03,411.18 174.68,411.29 175.34,411.39 175.99,411.51 176.65,411.64 177.30,411.77 177.96,411.90 178.62,412.04 179.27,412.18 179.93,412.33 180.58,412.47 181.24,412.62 181.89,412.77 182.55,412.92 183.20,413.07 183.86,413.21 184.51,413.35 185.17,413.49 185.82,413.62 186.48,413.74 187.13,413.86 187.79,413.98 188.44,414.08 189.10,414.18 189.75,414.26 190.41,414.34 191.06,414.41 191.72,414.46 192.38,414.51 193.03,414.54 193.69,414.56 194.34,414.56 195.00,414.56 195.65,414.53 196.31,414.49 196.96,414.44 197.62,414.37 198.27,414.29 198.93,414.18 199.58,414.06 200.24,413.92 200.89,413.76 201.55,413.58 202.20,413.38 202.86,413.17 203.51,412.93 204.17,412.67 204.82,412.39 205.48,412.09 206.14,411.76 206.79,411.41 207.45,411.04 208.10,410.66 208.76,410.24 209.41,409.80 210.07,409.34 210.72,408.86 211.38,408.34 212.03,407.81 212.69,407.26 213.34,406.68 214.00,406.08 214.65,405.45 215.31,404.81 215.96,404.15 216.62,403.46 217.27,402.75 217.93,402.02 218.58,401.28 219.24,400.52 219.89,399.74 220.55,398.95 221.21,398.14 221.86,397.32 222.52,396.48 223.17,395.64 223.83,394.79 224.48,393.93 225.14,393.07 225.79,392.20 226.45,391.33 227.10,390.45 227.76,389.58 228.41,388.71 229.07,387.84 229.72,386.98 230.38,386.12 231.03,385.27 231.69,384.43 232.34,383.60 233.00,382.78 233.65,381.97 234.31,381.18 234.97,380.40 235.62,379.63 236.28,378.88 236.93,378.15 237.59,377.44 238.24,376.73 238.90,376.05 239.55,375.38 240.21,374.73 240.86,374.09 241.52,373.48 242.17,372.87 242.83,372.27 243.48,371.69 244.14,371.12 244.79,370.56 245.45,370.01 246.10,369.46 246.76,368.92 247.41,368.38 248.07,367.84 248.73,367.30 249.38,366.76 250.04,366.21 250.69,365.65 251.35,365.09 252.00,364.51 252.66,363.92 253.31,363.31 253.97,362.68 254.62,362.03 255.28,361.37 255.93,360.68 256.59,359.95 257.24,359.21 257.90,358.43 258.55,357.63 259.21,356.79 259.86,355.92 260.52,355.03 261.17,354.10 261.83,353.13 262.49,352.13 263.14,351.10 263.80,350.04 264.45,348.95 265.11,347.83 265.76,346.68 266.42,345.50 267.07,344.30 267.73,343.08 268.38,341.84 269.04,340.58 269.69,339.31 270.35,338.03 271.00,336.74 271.66,335.45 272.31,334.16 272.97,332.87 273.62,331.59 274.28,330.33 274.93,329.09 275.59,327.87 276.25,326.67 276.90,325.51 277.56,324.38 278.21,323.28 278.87,322.24 279.52,321.25 280.18,320.30 280.83,319.40 281.49,318.57 282.14,317.81 282.80,317.10 283.45,316.44 284.11,315.88 284.76,315.39 285.42,314.95 286.07,314.59 286.73,314.32 287.38,314.11 288.04,313.97 288.69,313.90 289.35,313.93 290.00,314.01 290.66,314.15 291.32,314.37 291.97,314.65 292.63,315.00 293.28,315.39 293.94,315.85 294.59,316.36 295.25,316.92 295.90,317.52 296.56,318.16 297.21,318.85 297.87,319.56 298.52,320.29 299.18,321.06 299.83,321.85 300.49,322.66 301.14,323.47 301.80,324.30 302.45,325.14 303.11,325.98 303.76,326.82 304.42,327.66 305.08,328.50 305.73,329.33 306.39,330.16 307.04,330.98 307.70,331.78 308.35,332.59 309.01,333.37 309.66,334.15 310.32,334.92 310.97,335.68 311.63,336.43 312.28,337.17 312.94,337.91 313.59,338.63 314.25,339.36 314.90,340.07 315.56,340.79 316.21,341.50 316.87,342.22 317.52,342.94 318.18,343.65 318.84,344.38 319.49,345.11 320.15,345.84 320.80,346.58 321.46,347.33 322.11,348.09 322.77,348.85 323.42,349.62 324.08,350.40 324.73,351.19 325.39,351.99 326.04,352.79 326.70,353.60 327.35,354.42 328.01,355.24 328.66,356.06 329.32,356.88 329.97,357.70 330.63,358.52 331.28,359.33 331.94,360.13 332.60,360.93 333.25,361.72 333.91,362.50 334.56,363.26 335.22,364.01 335.87,364.74 336.53,365.45 337.18,366.14 337.84,366.81 338.49,367.46 339.15,368.08 339.80,368.68 340.46,369.26 341.11,369.81 341.77,370.33 342.42,370.83 343.08,371.30 343.73,371.75 344.39,372.17 345.04,372.58 345.70,372.96 346.36,373.32 347.01,373.66 347.67,373.98 348.32,374.29 348.98,374.58 349.63,374.86 350.29,375.12 350.94,375.38 351.60,375.63 352.25,375.88 352.91,376.12 353.56,376.36 354.22,376.59 354.87,376.83 355.53,377.07 356.18,377.31 356.84,377.56 357.49,377.81 358.15,378.07 358.80,378.33 359.46,378.60 360.11,378.87 360.77,379.15 361.43,379.43 362.08,379.72 362.74,380.02 363.39,380.31 364.05,380.61 364.70,380.91 365.36,381.21 366.01,381.51 366.67,381.80 367.32,382.08 367.98,382.36 368.63,382.63 369.29,382.89 369.94,383.13 370.60,383.36 371.25,383.58 371.91,383.77 372.56,383.95 373.22,384.11 373.87,384.24 374.53,384.35 375.19,384.44 375.84,384.50 376.50,384.54 377.15,384.56 377.81,384.55 378.46,384.52 379.12,384.46 379.77,384.38 380.43,384.27 381.08,384.16 381.74,384.01 382.39,383.86 383.05,383.69 383.70,383.50 384.36,383.31 385.01,383.11 385.67,382.90 386.32,382.69 386.98,382.48 387.63,382.28 388.29,382.08 388.95,381.89 389.60,381.72 390.26,381.56 390.91,381.41 391.57,381.29 392.22,381.19 392.88,381.12 393.53,381.07 394.19,381.06 394.84,381.08 395.50,381.13 396.15,381.21 396.81,381.34 397.46,381.50 398.12,381.70 398.77,381.93 399.43,382.21 400.08,382.52 400.74,382.87 401.39,383.26 402.05,383.69 402.71,384.15 403.36,384.64 404.02,385.17 404.67,385.74 405.33,386.33 405.98,386.94 406.64,387.59 407.29,388.26 407.95,388.95 408.60,389.65 409.26,390.38 409.91,391.12 410.57,391.87 411.22,392.63 411.88,393.41 412.53,394.18 413.19,394.96 413.84,395.74 414.50,396.51 415.15,397.29 415.81,398.05 416.47,398.82 417.12,399.57 417.78,400.31 418.43,401.04 419.09,401.76 419.74,402.46 420.40,403.15 421.05,403.82 421.71,404.48 422.36,405.11 423.02,405.73 423.67,406.33 424.33,406.90 424.98,407.46 425.64,408.00 426.29,408.52 426.95,409.01 427.60,409.49 428.26,409.95 428.91,410.39 429.57,410.80 430.22,411.20 430.88,411.58 431.54,411.93 432.19,412.27 432.85,412.59 433.50,412.90 434.16,413.19 434.81,413.46 435.47,413.71 436.12,413.95 436.78,414.18 437.43,414.38 438.09,414.58 438.74,414.77 439.40,414.94 440.05,415.10 440.71,415.24 441.36,415.38 442.02,415.51 442.67,415.62 443.33,415.73 443.98,415.83 444.64,415.93 445.30,416.01 445.95,416.09 446.61,416.16 447.26,416.22 447.92,416.28 448.57,416.34 449.23,416.38 449.88,416.43 450.54,416.47 451.19,416.51 451.85,416.54 452.50,416.57 453.16,416.59 453.81,416.62 454.47,416.64 455.12,416.66 455.78,416.68 456.43,416.69 457.09,416.70 457.74,416.72 458.40,416.73 ' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='59.04' y1='416.80' x2='59.04' y2='220.23' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='416.80' x2='51.84' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='318.51' x2='51.84' y2='318.51' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='220.23' x2='51.84' y2='220.23' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.03px' lengthAdjust='spacingAndGlyphs'>virginica</text>
+<text transform='translate(41.76,318.51) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='51.36px' lengthAdjust='spacingAndGlyphs'>versicolor</text>
+<text transform='translate(41.76,220.23) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='35.34px' lengthAdjust='spacingAndGlyphs'>setosa</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/spineplot_xaxl_toupper.svg b/inst/tinytest/_tinysnapshot/spineplot_xaxl_toupper.svg
new file mode 100644
index 00000000..fb35196e
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/spineplot_xaxl_toupper.svg
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>grp</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.34px' lengthAdjust='spacingAndGlyphs'>resp</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='59.04' y='244.80' width='203.29' height='185.76' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='59.04' y='59.04' width='203.29' height='185.76' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='270.47' y='244.80' width='203.29' height='185.76' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='270.47' y='59.04' width='203.29' height='185.76' style='stroke-width: 0.75; fill: #E6E6E6;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='160.69' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='39.34px' lengthAdjust='spacingAndGlyphs'>ALPHA</text>
+<text x='372.11' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='30.44px' lengthAdjust='spacingAndGlyphs'>BETA</text>
+<text transform='translate(41.76,337.68) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='9.34px' lengthAdjust='spacingAndGlyphs'>hi</text>
+<text transform='translate(41.76,151.92) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='9.34px' lengthAdjust='spacingAndGlyphs'>lo</text>
+<line x1='473.76' y1='430.56' x2='473.76' y2='59.04' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='430.56' x2='480.96' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='356.26' x2='480.96' y2='356.26' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='281.95' x2='480.96' y2='281.95' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='207.65' x2='480.96' y2='207.65' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='133.34' x2='480.96' y2='133.34' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='59.04' x2='480.96' y2='59.04' style='stroke-width: 0.75;' />
+<text transform='translate(499.68,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.0</text>
+<text transform='translate(499.68,356.26) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.2</text>
+<text transform='translate(499.68,281.95) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.4</text>
+<text transform='translate(499.68,207.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.6</text>
+<text transform='translate(499.68,133.34) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.8</text>
+<text transform='translate(499.68,59.04) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/spineplot_xord_desc.svg b/inst/tinytest/_tinysnapshot/spineplot_xord_desc.svg
new file mode 100644
index 00000000..2283b780
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/spineplot_xord_desc.svg
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='108.03px' lengthAdjust='spacingAndGlyphs'>cut(Sepal.Length, 3)</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='59.04' y='263.11' width='188.75' height='167.45' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='59.04' y='74.74' width='188.75' height='188.38' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='59.04' y='59.04' width='188.75' height='15.70' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='255.77' y='424.26' width='156.85' height='6.30' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='255.77' y='355.00' width='156.85' height='69.27' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='255.77' y='59.04' width='156.85' height='295.96' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='420.59' y='114.77' width='53.17' height='315.79' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='420.59' y='59.04' width='53.17' height='55.73' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='420.59' y='59.04' width='53.17' height='0.00' style='stroke-width: 0.75; fill: #E6E6E6;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='153.42' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.00px' lengthAdjust='spacingAndGlyphs'>(5.5,6.7]</text>
+<text x='334.19' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.00px' lengthAdjust='spacingAndGlyphs'>(4.3,5.5]</text>
+<text x='447.18' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.00px' lengthAdjust='spacingAndGlyphs'>(6.7,7.9]</text>
+<text transform='translate(41.76,368.64) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.03px' lengthAdjust='spacingAndGlyphs'>virginica</text>
+<text transform='translate(41.76,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='51.36px' lengthAdjust='spacingAndGlyphs'>versicolor</text>
+<text transform='translate(41.76,120.96) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='35.34px' lengthAdjust='spacingAndGlyphs'>setosa</text>
+<line x1='473.76' y1='430.56' x2='473.76' y2='59.04' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='430.56' x2='480.96' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='356.26' x2='480.96' y2='356.26' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='281.95' x2='480.96' y2='281.95' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='207.65' x2='480.96' y2='207.65' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='133.34' x2='480.96' y2='133.34' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='59.04' x2='480.96' y2='59.04' style='stroke-width: 0.75;' />
+<text transform='translate(499.68,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.0</text>
+<text transform='translate(499.68,356.26) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.2</text>
+<text transform='translate(499.68,281.95) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.4</text>
+<text transform='translate(499.68,207.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.6</text>
+<text transform='translate(499.68,133.34) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.8</text>
+<text transform='translate(499.68,59.04) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/spineplot_yaxl_dict.svg b/inst/tinytest/_tinysnapshot/spineplot_yaxl_dict.svg
new file mode 100644
index 00000000..85c38f30
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/spineplot_yaxl_dict.svg
@@ -0,0 +1,118 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='64.69px' lengthAdjust='spacingAndGlyphs'>Sepal.Width</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='59.04' y='337.68' width='11.06' height='92.88' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='59.04' y='59.04' width='11.06' height='278.64' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='59.04' y='59.04' width='11.06' height='0.00' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='70.10' y='430.56' width='19.35' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='70.10' y='112.11' width='19.35' height='318.45' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='70.10' y='59.04' width='19.35' height='53.07' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='89.45' y='259.09' width='35.94' height='171.47' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='89.45' y='59.04' width='35.94' height='200.05' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='89.45' y='59.04' width='35.94' height='0.00' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='125.40' y='236.72' width='63.59' height='193.84' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='125.40' y='59.04' width='63.59' height='177.68' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='125.40' y='59.04' width='63.59' height='0.00' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='188.99' y='286.08' width='99.53' height='144.48' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='188.99' y='131.28' width='99.53' height='154.80' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='188.99' y='59.04' width='99.53' height='72.24' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='288.52' y='291.24' width='66.36' height='139.32' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='288.52' y='198.36' width='66.36' height='92.88' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='288.52' y='59.04' width='66.36' height='139.32' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='354.87' y='327.36' width='49.77' height='103.20' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='354.87' y='286.08' width='49.77' height='41.28' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='354.87' y='59.04' width='49.77' height='227.04' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='404.64' y='393.41' width='27.65' height='37.15' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='404.64' y='393.41' width='27.65' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='404.64' y='59.04' width='27.65' height='334.37' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='432.29' y='348.00' width='24.88' height='82.56' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='432.29' y='348.00' width='24.88' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='432.29' y='59.04' width='24.88' height='288.96' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='457.17' y='430.56' width='8.29' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='457.17' y='430.56' width='8.29' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='457.17' y='59.04' width='8.29' height='371.52' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='465.47' y='430.56' width='5.53' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='465.47' y='430.56' width='5.53' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='465.47' y='59.04' width='5.53' height='371.52' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='471.00' y='430.56' width='2.76' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='471.00' y='430.56' width='2.76' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='471.00' y='59.04' width='2.76' height='371.52' style='stroke-width: 0.75; fill: #E6E6E6;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='59.04' y1='430.56' x2='473.76' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='59.04' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='70.10' y1='430.56' x2='70.10' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='89.45' y1='430.56' x2='89.45' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='125.40' y1='430.56' x2='125.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='188.99' y1='430.56' x2='188.99' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='288.52' y1='430.56' x2='288.52' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='354.87' y1='430.56' x2='354.87' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='404.64' y1='430.56' x2='404.64' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='432.29' y1='430.56' x2='432.29' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='457.17' y1='430.56' x2='457.17' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='465.47' y1='430.56' x2='465.47' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='471.00' y1='430.56' x2='471.00' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='430.56' x2='473.76' y2='437.76' style='stroke-width: 0.75;' />
+<text x='59.04' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text x='89.45' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.4</text>
+<text x='125.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.6</text>
+<text x='188.99' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.8</text>
+<text x='288.52' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='354.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.2</text>
+<text x='404.64' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.4</text>
+<text x='432.29' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.6</text>
+<text x='465.47' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,368.64) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.00px' lengthAdjust='spacingAndGlyphs'>VIR</text>
+<text transform='translate(41.76,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='51.36px' lengthAdjust='spacingAndGlyphs'>versicolor</text>
+<text transform='translate(41.76,120.96) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.33px' lengthAdjust='spacingAndGlyphs'>SET</text>
+<line x1='473.76' y1='430.56' x2='473.76' y2='59.04' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='430.56' x2='480.96' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='356.26' x2='480.96' y2='356.26' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='281.95' x2='480.96' y2='281.95' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='207.65' x2='480.96' y2='207.65' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='133.34' x2='480.96' y2='133.34' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='59.04' x2='480.96' y2='59.04' style='stroke-width: 0.75;' />
+<text transform='translate(499.68,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.0</text>
+<text transform='translate(499.68,356.26) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.2</text>
+<text transform='translate(499.68,281.95) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.4</text>
+<text transform='translate(499.68,207.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.6</text>
+<text transform='translate(499.68,133.34) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.8</text>
+<text transform='translate(499.68,59.04) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/spineplot_yaxl_toupper.svg b/inst/tinytest/_tinysnapshot/spineplot_yaxl_toupper.svg
new file mode 100644
index 00000000..a4208d52
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/spineplot_yaxl_toupper.svg
@@ -0,0 +1,118 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='64.69px' lengthAdjust='spacingAndGlyphs'>Sepal.Width</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='59.04' y='337.68' width='11.06' height='92.88' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='59.04' y='59.04' width='11.06' height='278.64' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='59.04' y='59.04' width='11.06' height='0.00' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='70.10' y='430.56' width='19.35' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='70.10' y='112.11' width='19.35' height='318.45' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='70.10' y='59.04' width='19.35' height='53.07' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='89.45' y='259.09' width='35.94' height='171.47' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='89.45' y='59.04' width='35.94' height='200.05' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='89.45' y='59.04' width='35.94' height='0.00' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='125.40' y='236.72' width='63.59' height='193.84' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='125.40' y='59.04' width='63.59' height='177.68' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='125.40' y='59.04' width='63.59' height='0.00' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='188.99' y='286.08' width='99.53' height='144.48' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='188.99' y='131.28' width='99.53' height='154.80' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='188.99' y='59.04' width='99.53' height='72.24' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='288.52' y='291.24' width='66.36' height='139.32' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='288.52' y='198.36' width='66.36' height='92.88' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='288.52' y='59.04' width='66.36' height='139.32' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='354.87' y='327.36' width='49.77' height='103.20' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='354.87' y='286.08' width='49.77' height='41.28' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='354.87' y='59.04' width='49.77' height='227.04' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='404.64' y='393.41' width='27.65' height='37.15' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='404.64' y='393.41' width='27.65' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='404.64' y='59.04' width='27.65' height='334.37' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='432.29' y='348.00' width='24.88' height='82.56' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='432.29' y='348.00' width='24.88' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='432.29' y='59.04' width='24.88' height='288.96' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='457.17' y='430.56' width='8.29' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='457.17' y='430.56' width='8.29' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='457.17' y='59.04' width='8.29' height='371.52' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='465.47' y='430.56' width='5.53' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='465.47' y='430.56' width='5.53' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='465.47' y='59.04' width='5.53' height='371.52' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='471.00' y='430.56' width='2.76' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='471.00' y='430.56' width='2.76' height='0.00' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='471.00' y='59.04' width='2.76' height='371.52' style='stroke-width: 0.75; fill: #E6E6E6;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='59.04' y1='430.56' x2='473.76' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='430.56' x2='59.04' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='70.10' y1='430.56' x2='70.10' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='89.45' y1='430.56' x2='89.45' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='125.40' y1='430.56' x2='125.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='188.99' y1='430.56' x2='188.99' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='288.52' y1='430.56' x2='288.52' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='354.87' y1='430.56' x2='354.87' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='404.64' y1='430.56' x2='404.64' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='432.29' y1='430.56' x2='432.29' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='457.17' y1='430.56' x2='457.17' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='465.47' y1='430.56' x2='465.47' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='471.00' y1='430.56' x2='471.00' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='430.56' x2='473.76' y2='437.76' style='stroke-width: 0.75;' />
+<text x='59.04' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text x='89.45' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.4</text>
+<text x='125.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.6</text>
+<text x='188.99' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.8</text>
+<text x='288.52' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='354.87' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.2</text>
+<text x='404.64' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.4</text>
+<text x='432.29' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.6</text>
+<text x='465.47' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.67px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text transform='translate(41.76,368.64) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='61.33px' lengthAdjust='spacingAndGlyphs'>VIRGINICA</text>
+<text transform='translate(41.76,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='78.67px' lengthAdjust='spacingAndGlyphs'>VERSICOLOR</text>
+<text transform='translate(41.76,120.96) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='48.44px' lengthAdjust='spacingAndGlyphs'>SETOSA</text>
+<line x1='473.76' y1='430.56' x2='473.76' y2='59.04' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='430.56' x2='480.96' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='356.26' x2='480.96' y2='356.26' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='281.95' x2='480.96' y2='281.95' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='207.65' x2='480.96' y2='207.65' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='133.34' x2='480.96' y2='133.34' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='59.04' x2='480.96' y2='59.04' style='stroke-width: 0.75;' />
+<text transform='translate(499.68,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.0</text>
+<text transform='translate(499.68,356.26) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.2</text>
+<text transform='translate(499.68,281.95) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.4</text>
+<text transform='translate(499.68,207.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.6</text>
+<text transform='translate(499.68,133.34) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.8</text>
+<text transform='translate(499.68,59.04) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+<polygon points='59.04,430.56 473.76,430.56 473.76,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/spineplot_yord_rev.svg b/inst/tinytest/_tinysnapshot/spineplot_yord_rev.svg
new file mode 100644
index 00000000..9cd28fc5
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/spineplot_yord_rev.svg
@@ -0,0 +1,70 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='108.03px' lengthAdjust='spacingAndGlyphs'>cut(Sepal.Length, 3)</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='42.69px' lengthAdjust='spacingAndGlyphs'>Species</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='414.72' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8NDczLjc2fDU5LjA0fDQzMC41Ng==)'>
+<rect x='59.04' y='134.60' width='156.85' height='295.96' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='59.04' y='65.34' width='156.85' height='69.27' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='59.04' y='59.04' width='156.85' height='6.30' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='223.86' y='414.86' width='188.75' height='15.70' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='223.86' y='226.49' width='188.75' height='188.38' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='223.86' y='59.04' width='188.75' height='167.45' style='stroke-width: 0.75; fill: #E6E6E6;' />
+<rect x='420.59' y='430.56' width='53.17' height='0.00' style='stroke-width: 0.75; fill: #4D4D4D;' />
+<rect x='420.59' y='374.83' width='53.17' height='55.73' style='stroke-width: 0.75; fill: #AEAEAE;' />
+<rect x='420.59' y='59.04' width='53.17' height='315.79' style='stroke-width: 0.75; fill: #E6E6E6;' />
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='137.46' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.00px' lengthAdjust='spacingAndGlyphs'>(4.3,5.5]</text>
+<text x='318.24' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.00px' lengthAdjust='spacingAndGlyphs'>(5.5,6.7]</text>
+<text x='447.18' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.00px' lengthAdjust='spacingAndGlyphs'>(6.7,7.9]</text>
+<text transform='translate(41.76,368.64) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='35.34px' lengthAdjust='spacingAndGlyphs'>setosa</text>
+<text transform='translate(41.76,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='51.36px' lengthAdjust='spacingAndGlyphs'>versicolor</text>
+<text transform='translate(41.76,120.96) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='44.03px' lengthAdjust='spacingAndGlyphs'>virginica</text>
+<line x1='473.76' y1='430.56' x2='473.76' y2='59.04' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='430.56' x2='480.96' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='356.26' x2='480.96' y2='356.26' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='281.95' x2='480.96' y2='281.95' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='207.65' x2='480.96' y2='207.65' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='133.34' x2='480.96' y2='133.34' style='stroke-width: 0.75;' />
+<line x1='473.76' y1='59.04' x2='480.96' y2='59.04' style='stroke-width: 0.75;' />
+<text transform='translate(499.68,430.56) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.0</text>
+<text transform='translate(499.68,356.26) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.2</text>
+<text transform='translate(499.68,281.95) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.4</text>
+<text transform='translate(499.68,207.65) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.6</text>
+<text transform='translate(499.68,133.34) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>0.8</text>
+<text transform='translate(499.68,59.04) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/test-type_area.R b/inst/tinytest/test-type_area.R
index 37eba7b0..6ae39d6b 100644
--- a/inst/tinytest/test-type_area.R
+++ b/inst/tinytest/test-type_area.R
@@ -40,6 +40,9 @@ f = function() {
 }
 expect_snapshot_plot(f, label = "area_stack_alpha")
 
+# flipping lays the bands out left-to-right, so the bottom-up reading the
+# reversed legend key exists to match no longer applies: the key runs in
+# level order here, not reversed
 f = function() {
   tinyplot(val ~ year | grp, data = dat, type = type_area(stack = TRUE), flip = TRUE)
 }
@@ -139,14 +142,31 @@ expect_error(
   pattern = "must be NULL"
 )
 
-# a one-argument function keeps working unchanged, and a second argument that
-# is *not* named `x` (e.g. a tuning parameter with a default) must not be fed
-# the x values by mistake
-dp = function(byord) {
-  d = data.frame(x = rep(1:4, 2), y = c(1, 2, 3, 100, 4, 4, 4, 4),
-                 by = factor(rep(c("a", "b"), each = 4)), facet = "f")
-  levels(tinyplot:::sanitize_ord(d$by, d$y, d$x, byord))
+# `a` carries the larger values, so "desc" stacks it first and "asc" reverses
+# that. Every case below is asserted against one of these two references.
+ord = data.frame(x = rep(1:4, 2), y = c(1, 2, 3, 100, 4, 4, 4, 4),
+                 grp = factor(rep(c("a", "b"), each = 4)))
+byo = function(byord) {
+  function() {
+    tinyplot(y ~ x | grp, data = ord, type = type_area(stack = TRUE, byord = byord))
+  }
 }
-expect_equal(dp(function(y) -median(y)), c("b", "a"))
-expect_equal(dp(function(y, p = 0.9) -as.numeric(quantile(y, p))), c("a", "b"))
-expect_equal(dp(function(y, x) coef(lm(y ~ x))[2]), c("b", "a"))
+expect_snapshot_plot(byo("desc"), label = "area_stack_byord_desc")
+expect_snapshot_plot(byo("asc"),  label = "area_stack_byord_asc")
+
+# a second argument that is *not* named `x` is a tuning parameter, and must not
+# be fed the x values by mistake. Dispatching on the count of formals rather
+# than their names handed `p` the vector c(1, 2, 3, 4), and quantile() then
+# errored on probabilities outside [0, 1] -- so this failing at all is the
+# regression, whatever the resulting order.
+expect_snapshot_plot(
+  byo(function(y, p = 0.9) -as.numeric(quantile(y, p))),
+  label = "area_stack_byord_desc"
+)
+
+# ...but "start"/"end" remain available for `byord`, where the groups really do
+# span a secondary axis
+f = function() {
+  tinyplot(val ~ year | grp, data = dat, type = type_area(stack = TRUE, byord = "start"))
+}
+expect_snapshot_plot(f, label = "area_stack_byord_start")
diff --git a/inst/tinytest/test-type_lines.R b/inst/tinytest/test-type_lines.R
index ea8d8278..1419da7e 100644
--- a/inst/tinytest/test-type_lines.R
+++ b/inst/tinytest/test-type_lines.R
@@ -44,10 +44,14 @@ expect_snapshot_plot(f, label = "type_lines_layer_h_p")
 # "asis" keyword takes the categories in the order they appear in the data,
 # restoring the pre-fix behaviour on demand; forwarded automatically from the
 # top-level call.
-f = function() tinyplot(runtime ~ name, data = LOTR, type = "b", xlevels = "asis")
+f = function() tinyplot(runtime ~ name, data = LOTR, type = "b", xord = "asis")
 expect_snapshot_plot(f, label = "type_lines_xlevels_asis")
 
 # numeric indexes into the existing levels, via the constructor
 f = function() tinyplot(runtime ~ name, data = LOTR, type = type_points(xlevels = 3:1))
 expect_snapshot_plot(f, label = "type_points_xlevels_idx")
 
+
+# `xord` composes with `xlevels` and covers the keyword vocabulary
+f = function() tinyplot(runtime ~ name, data = LOTR, type = "b", xord = "rev")
+expect_snapshot_plot(f, label = "lines_xord_rev")
diff --git a/inst/tinytest/test-type_pointrange.R b/inst/tinytest/test-type_pointrange.R
index 9715b3ea..a0e4a2ce 100644
--- a/inst/tinytest/test-type_pointrange.R
+++ b/inst/tinytest/test-type_pointrange.R
@@ -72,7 +72,7 @@ fun = function() {
 }
 expect_snapshot_plot(fun, label = "pointrange_with_layers_flipped")
 
-# xlevels = NULL overrides the "asis" default, ordering the terms by their
+# xord = NULL overrides the "asis" default, ordering the terms by their
 # factor levels (alphabetical here) instead of their row order (#679)
 fun = function() {
     with(
@@ -82,8 +82,20 @@ fun = function() {
           y = y,
           ymin = ymin,
           ymax = ymax,
-          type = type_pointrange(xlevels = NULL)
+          type = type_pointrange(xord = NULL)
         )
       )
 }
 expect_snapshot_plot(fun, label = "pointrange_xlevels_null")
+
+# `xord` defaults to "asis" here, so the ignored-argument warning must key on
+# whether the user actually supplied it -- otherwise every numeric-x
+# coefficient plot would warn on its own default
+cf2 = data.frame(x = c(1, 2, 3), lo = c(0, 1, 2), hi = c(2, 3, 4))
+expect_silent(
+  tinyplot(x ~ x, data = cf2, ymin = lo, ymax = hi, type = type_pointrange())
+)
+expect_warning(
+  tinyplot(x ~ x, data = cf2, ymin = lo, ymax = hi, type = type_pointrange(xord = "rev")),
+  pattern = "only categorical"
+)
diff --git a/inst/tinytest/test-type_points.R b/inst/tinytest/test-type_points.R
new file mode 100644
index 00000000..1d9d2191
--- /dev/null
+++ b/inst/tinytest/test-type_points.R
@@ -0,0 +1,37 @@
+source("helpers.R")
+using("tinysnapshot")
+
+
+#
+## xord -----
+
+f = function() tinyplot(mpg ~ factor(cyl), data = mtcars, type = type_points(xord = "desc"))
+expect_snapshot_plot(f, label = "points_xord_desc")
+
+f = function() tinyplot(mpg ~ factor(cyl), data = mtcars, type = type_points(xord = "rev"))
+expect_snapshot_plot(f, label = "points_xord_rev")
+
+# The ranking statistic follows what the type draws. A distribution type ranks
+# on the mean, so a category of many small values must not outrank one of few
+# large ones -- which is exactly what summing would do here.
+d = data.frame(g = factor(rep(c("A", "B"), c(100, 5))), y = c(rep(1, 100), rep(10, 5)))
+expect_equal(levels(tinyplot:::sanitize_ord(d$g, d$y, NULL, "desc", stat = "mean")), c("B", "A"))
+expect_equal(levels(tinyplot:::sanitize_ord(d$g, d$y, NULL, "desc", stat = "sum")), c("A", "B"))
+
+
+#
+## numeric x cannot be reordered -----
+
+# a numeric x is plotted at its own values, so the request is dropped -- but
+# silently dropping it is the failure mode worth surfacing
+expect_warning(
+  tinyplot(mpg ~ cyl, data = mtcars, type = type_points(xord = "desc")),
+  pattern = "only categorical"
+)
+expect_warning(
+  tinyplot(mpg ~ cyl, data = mtcars, type = type_points(xlevels = c("4", "6"))),
+  pattern = "only categorical"
+)
+# ...but a factor x is fine, and so is not asking in the first place
+expect_silent(tinyplot(mpg ~ factor(cyl), data = mtcars, type = type_points(xord = "desc")))
+expect_silent(tinyplot(mpg ~ cyl, data = mtcars, type = type_points()))
diff --git a/inst/tinytest/test-type_ridge.R b/inst/tinytest/test-type_ridge.R
index bce0c812..c8013554 100644
--- a/inst/tinytest/test-type_ridge.R
+++ b/inst/tinytest/test-type_ridge.R
@@ -190,3 +190,41 @@ expect_error(
   pattern = "at least 2 data points"
 )
 expect_error(type_ridge(singletons = "nope"))
+
+
+#
+## yord -----
+
+# ridges rank on the continuous `x`, since there is no separate response
+f = function() tinyplot(Species ~ Sepal.Length, data = iris, type = type_ridge(yord = "minvar"))
+expect_snapshot_plot(f, label = "ridge_yord_minvar")
+
+f = function() tinyplot(Species ~ Sepal.Length, data = iris, type = type_ridge(yord = "rev"))
+expect_snapshot_plot(f, label = "ridge_yord_rev")
+
+# a transposed formula leaves nothing numeric to rank on; say so plainly
+expect_error(
+  tinyplot(Sepal.Length ~ Species, data = iris, type = type_ridge(yord = "minvar")),
+  pattern = "ranks on a numeric variable"
+)
+
+expect_error(
+  tinyplot(Species ~ Sepal.Length, data = iris, type = type_ridge(yord = "start")),
+  pattern = "not available for this plot type"
+)
+
+
+#
+## yaxl -----
+
+# ridge draws its own y-axis category labels, so `yaxl` has to be carried
+# through `type_info` to the tinyAxis() calls rather than picked up by the
+# standard axis path
+f = function() tinyplot(Species ~ Sepal.Width, data = iris, type = "ridge", yaxl = toupper)
+expect_snapshot_plot(f, label = "ridge_yaxl_toupper")
+
+f = function() {
+  tinyplot(Species ~ Sepal.Width, data = iris, type = "ridge",
+           yaxl = c(setosa = "SET", virginica = "VIR"))
+}
+expect_snapshot_plot(f, label = "ridge_yaxl_dict")
diff --git a/inst/tinytest/test-type_spineplot.R b/inst/tinytest/test-type_spineplot.R
index f47466a6..3876856c 100644
--- a/inst/tinytest/test-type_spineplot.R
+++ b/inst/tinytest/test-type_spineplot.R
@@ -127,3 +127,51 @@ f = function() {
   )
 }
 expect_snapshot_plot(f, label = "spineplot_yby_lighten_true")
+
+
+#
+## xord / yord -----
+
+# both spineplot axes are categorical, so the size keywords rank on frequency
+f = function() {
+  tinyplot(Species ~ cut(Sepal.Length, 3), data = iris, type = "spineplot", xord = "desc")
+}
+expect_snapshot_plot(f, label = "spineplot_xord_desc")
+
+f = function() {
+  tinyplot(Species ~ cut(Sepal.Length, 3), data = iris, type = "spineplot", yord = "rev")
+}
+expect_snapshot_plot(f, label = "spineplot_yord_rev")
+
+# a spine is a proportion of a count, with no dispersion of its own, so
+# "minvar" is not part of this type's vocabulary
+expect_error(
+  tinyplot(Species ~ cut(Sepal.Length, 3), data = iris, type = "spineplot", xord = "minvar"),
+  pattern = "must be NULL"
+)
+
+
+#
+## xaxl / yaxl -----
+
+# this type draws its own axes, so it never reaches the standard path where
+# `xaxl`/`yaxl` are applied; they are applied inside data_spineplot() instead
+f = function() {
+  tinyplot(Species ~ Sepal.Width, data = iris, type = "spineplot", yaxl = toupper)
+}
+expect_snapshot_plot(f, label = "spineplot_yaxl_toupper")
+
+f = function() {
+  tinyplot(Species ~ Sepal.Width, data = iris, type = "spineplot",
+           yaxl = c(setosa = "SET", virginica = "VIR"))
+}
+expect_snapshot_plot(f, label = "spineplot_yaxl_dict")
+
+# categorical x, and a numeric x whose breaks take a formatting keyword
+spine_d = data.frame(
+  grp  = factor(rep(c("alpha", "beta"), each = 50)),
+  resp = factor(rep(c("lo", "hi"), 50), levels = c("lo", "hi"))
+)
+f = function() tinyplot(resp ~ grp, data = spine_d, type = "spineplot", xaxl = toupper)
+expect_snapshot_plot(f, label = "spineplot_xaxl_toupper")
+

From cca384cf9492c59790095a680990c952114b00e9 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Fri, 28 Aug 2026 22:45:41 -0700
Subject: [PATCH 18/23] news

---
 NEWS.md            | 81 +++++++++++++++++++++++++++++++++++++++-------
 altdoc/pkgdown.yml |  4 +--
 2 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index ea6b04ca..49ebf47c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -8,6 +8,13 @@ where the formatting is also better._
 
 ### Breaking changes
 
+- The `xaxlabels` argument of `type_barplot()`, and the `xaxlabels` /
+  `yaxlabels` arguments of `type_spineplot()`, are deprecated in favour of the
+  top-level `xaxl` / `yaxl` arguments, which accept a dictionary mapping old
+  labels to new ones and apply consistently across plot types. Supplying them
+  still works but warns. Note that `type_barplot()`'s `xaxlabels` renamed the
+  underlying factor levels, so repeated names merged categories; `xaxl`
+  relabels the ticks only and cannot do this. (#688 @grantmcdermott)
 - `type_lines()` and its shortcut equivalents like `"l"` and `"b"` now order
   categorical `x` data by (coerced) factor levels, rather than simple order of
   appearance. This resolves a longstanding tension between line types and
@@ -15,7 +22,7 @@ where the formatting is also better._
   implied factor levels. It also improves layering consistency via `plt_add()`
   and co. so that plots are identical, regardless of whether lines are layered
   on top of points, or vice versa. Note that you can still select into the
-  old behaviour by passing the (new) `xlevels = "asis"` argument as an
+  old behaviour by passing the (new) `xord = "asis"` argument as an
   explicit override; see "Other new features" below. (#683 @grantmcdermott)
 
 ### New features
@@ -66,6 +73,40 @@ Note that each of these `facet.args` arguments is paired with an equivalent
 to set this behaviour globally. This also means that they can be set as part of
 a (custom) theme, e.g. `tinytheme("clean", facet.axes = "outer")`.
 
+#### Improved facilities for ordering and labelling categorical variables
+
+Types with a categorical `x`, `y`, or `by` variable gain several new arguments
+that enable finer control over the order of their levels, as well as the labels
+used to display them:
+
+- Expanded `xlevels` support for reordering a categorical `x` variable on the
+  fly. `type_points()`, `type_lines()`, `type_errorbar()`, and
+  `type_pointrange()` all gain this (type-level) argument, matching existing
+  functionality for `type_barplot()` and several other types. Values can be a
+  character vector of level names or a numeric vector of level indexes, e.g.
+  `3:1`. (#683, #694 @grantmcdermott)
+- New `xord` / `yord` arguments for _deriving_ order from the data, rather
+  than stating it literally (which is what `x/ylevels` do). Specifically, every 
+  type that takes an `xlevels` or `ylevels` argument now also takes its `x/yord`
+  sibling. The two are complementary: `x/ylevels` name the levels explicitly,  
+  while `x/yord` computes them via type-appropriate keywords or a custom ranking
+  function. For example, `"desc(ending)"`/`"asc(ending)"` order by value, while
+  `"asis"` ignores factor levels and just takes the order of categories as they
+  appear in the data. Among other things this makes it possible to sort bars by
+  height (e.g., `type_barplot(xord = "desc")`), or ridges by their spread (e.g., 
+  `type_ridge(yord = "minvar")`) without relevelling the underlying factor by
+  hand. _Note: users should only supply one or the other. If both are given,
+  `x/ylevels` takes precedence and `x/yord` is ignored, since the former is
+  more explcit. (#683 #688, #694 @grantmcdermott)
+- `tinylabel()` gains a dictionary form, i.e, a *named* character vector or
+  list, mapping existing labels to new ones, e.g. `c(old = "new")`. Labels that
+  are not named are left alone, so a partial mapping is fine, and the lookup is
+  by value rather than by position, which means it is unaffected by any
+  reordering of the underlying categories. Because everything that formats
+  labels routes through `tinylabel()`, this is available anywhere a `labeller`
+  is accepted: the top-level `xaxl` / `yaxl` arguments, the legend's
+  `labeller`, `type_text()`, and facet titles. (#688 @grantmcdermott)
+
 #### Other new features
 
 - `type_area()` gains a `stack` argument for stacked area plots. A sister
@@ -78,16 +119,6 @@ a (custom) theme, e.g. `tinytheme("clean", facet.axes = "outer")`.
   values, as needed by any statistic that depends on their spacing.
   Similarly, a new `FUN` argument permits stacking of multi-observation data by
   collapsing repeated `y` values. (#688 @grantmcdermott)
-- `type_points()`, `type_lines()`, `type_errorbar()`, and `type_pointrange()`
-  gain an `xlevels` argument for reordering a categorical `x` variable on the
-  fly (matching existing functionality for `type_barplot()` and several other
-  types). Values can be a character vector of level names, a numeric vector of
-  level indexes (e.g., `3:1`), or the new `"asis"` keyword, which takes the
-  categories in the order that they appear in the data. The latter option is
-  also the default for `type_errorbar()` and `type_pointrange()`, thus
-  preserving existing behaviour since these two types are typically fed
-  coefficient table data where the row order is intentional.
-  (#683 @grantmcdermott)
 - Custom plot types have more control over the surrounding plot machinery, via a
   new `type_hints` mechanism. A type can declare properties about itself---that
   it draws its own axes, needs a secondary right-hand axis, uses proportional
@@ -117,6 +148,34 @@ a (custom) theme, e.g. `tinytheme("clean", facet.axes = "outer")`.
 
 ### Bug fixes
 
+- Layers added with `tinyplot_add()` now align correctly when the base plot type
+  coerces a numeric `x` variable to a factor, as `type_barplot()` and
+  `type_violin()` do. The base layer's categories are the coerced *labels*,
+  while the added layer still carried the raw values, so it was drawn at those
+  coordinates instead of at the category positions---often well outside the
+  plotting region. (#691 @grantmcdermott)
+- Axis labellers no longer blow up the decimal precision when the breaks are
+  symmetric about zero, as they are for a centered barplot. `tinyplot(...,
+  center = TRUE, yaxl = "percent")` labelled its axis `80.00000%` rather than
+  `80%`. (#688 @grantmcdermott)
+- The top-level `xaxl` / `yaxl` arguments now work for `type_spineplot()` and
+  `type_ridge()`. Both types draw their own axes, and so never reached the
+  standard path where those arguments are applied, meaning they were silently
+  ignored. (#688 @grantmcdermott)
+- Fixed the formatting keywords being unusable on a centered `type_barplot()`.
+  Centering prepends `"abs_"` to `yaxl`, but the prefix was applied before a
+  symbol was resolved to its full name, so documented values such as
+  `yaxl = ","` failed with an unrelated `match.arg()` error.
+  (#688 @grantmcdermott)
+- `xlevels` / `ylevels` no longer drop data silently. Naming a strict subset of
+  a variable's levels sent every other level to `NA`, quietly removing those
+  observations from the plot; this now warns. Supplying a value that matches no
+  level at all is now an error, rather than surfacing later as an unrelated
+  complaint about zero-length ranges. (#688 @grantmcdermott)
+- The legend key for a stacked `type_area()` is no longer reversed when
+  `flip = TRUE`. Flipping lays the bands out left-to-right, so the bottom-up
+  reading that the reversal exists to match no longer applies.
+  (#688 @grantmcdermott)
 - `type_area()` now labels a categorical `x` axis with its factor levels,
   rather than falling back to the underlying integer positions.
   (#688 @grantmcdermott)
diff --git a/altdoc/pkgdown.yml b/altdoc/pkgdown.yml
index dc63ad1f..c82f70d4 100644
--- a/altdoc/pkgdown.yml
+++ b/altdoc/pkgdown.yml
@@ -1,8 +1,8 @@
 altdoc: 0.7.3
-pandoc: 3.8.3
+pandoc: 3.10.2
 pkgdown: 2.1.3
 pkgdown_sha: ~
-last_built: 2026-08-18T05:02:34+0000
+last_built: 2026-08-29T04:35:36+0000
 urls:
   reference: https://grantmcdermott.com/tinyplot/man
   article: https://grantmcdermott.com/tinyplot/vignettes

From 9555635b67d81931869131996e9e784d3102a67f Mon Sep 17 00:00:00 2001
From: Grant McDermott <gmcd@amazon.com>
Date: Sat, 29 Aug 2026 17:57:45 -0700
Subject: [PATCH 19/23] new touch-ups

---
 NEWS.md | 129 +++++++++++++++++++++++++++-----------------------------
 1 file changed, 63 insertions(+), 66 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 49ebf47c..86002ead 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -8,13 +8,6 @@ where the formatting is also better._
 
 ### Breaking changes
 
-- The `xaxlabels` argument of `type_barplot()`, and the `xaxlabels` /
-  `yaxlabels` arguments of `type_spineplot()`, are deprecated in favour of the
-  top-level `xaxl` / `yaxl` arguments, which accept a dictionary mapping old
-  labels to new ones and apply consistently across plot types. Supplying them
-  still works but warns. Note that `type_barplot()`'s `xaxlabels` renamed the
-  underlying factor levels, so repeated names merged categories; `xaxl`
-  relabels the ticks only and cannot do this. (#688 @grantmcdermott)
 - `type_lines()` and its shortcut equivalents like `"l"` and `"b"` now order
   categorical `x` data by (coerced) factor levels, rather than simple order of
   appearance. This resolves a longstanding tension between line types and
@@ -39,6 +32,14 @@ where the formatting is also better._
   along the chosen margin by default. It also reverses the y-axis by default, so
   that the first row sits at the top (again matching `heatmap()`); pass an
   explicit `ylim` to override. (#677 @grantmcdermott)
+- While not strictly a new plot type, `type_area()` gains a new `stack` argument
+  for drawing _stacked_ area plots, where each layer represents a discrete `by`
+  category group. This functionality is further enhanced by two (also new)
+  sister arguments. First, `byord` enables on-the-fly (re-)ordering of the
+  stacked `by` layers, via convenience keywords or custom functions (e.g.,
+  `byord = "end"` ranks groups according to their largest final value). Second,
+  a `FUN` argument permits stacking of multi-observation data by collapsing
+  repeated `y` values. (#688 @grantmcdermott)
 
 #### Facet improvements
 
@@ -73,52 +74,63 @@ Note that each of these `facet.args` arguments is paired with an equivalent
 to set this behaviour globally. This also means that they can be set as part of
 a (custom) theme, e.g. `tinytheme("clean", facet.axes = "outer")`.
 
-#### Improved facilities for ordering and labelling categorical variables
-
-Types with a categorical `x`, `y`, or `by` variable gain several new arguments
-that enable finer control over the order of their levels, as well as the labels
-used to display them:
-
-- Expanded `xlevels` support for reordering a categorical `x` variable on the
-  fly. `type_points()`, `type_lines()`, `type_errorbar()`, and
-  `type_pointrange()` all gain this (type-level) argument, matching existing
-  functionality for `type_barplot()` and several other types. Values can be a
-  character vector of level names or a numeric vector of level indexes, e.g.
-  `3:1`. (#683, #694 @grantmcdermott)
-- New `xord` / `yord` arguments for _deriving_ order from the data, rather
-  than stating it literally (which is what `x/ylevels` do). Specifically, every 
-  type that takes an `xlevels` or `ylevels` argument now also takes its `x/yord`
-  sibling. The two are complementary: `x/ylevels` name the levels explicitly,  
-  while `x/yord` computes them via type-appropriate keywords or a custom ranking
-  function. For example, `"desc(ending)"`/`"asc(ending)"` order by value, while
-  `"asis"` ignores factor levels and just takes the order of categories as they
-  appear in the data. Among other things this makes it possible to sort bars by
-  height (e.g., `type_barplot(xord = "desc")`), or ridges by their spread (e.g., 
+#### Ordering and labelling categorical variables
+
+This release bring several enhancements for working with _categorical_
+variables, i.e. where `x`, `y`, or `by` are characters or factors with discrete
+levels. This includes improvements to existing arguments, as well as the
+provision of some new arguments that enable finer control over level ordering
+and convenient label formatting.
+
+- `xlevels`, `ylevels`: these (type-level) argument permit on-the-fly
+  reordering of a categorical variable via _literal_ specification, either a
+  character vector of level names (e.g., `c("C", "B", "A")`), or a numeric
+  vector of level indices (e.g., `3:1`). While this argument is not new---having
+  been supported by `type_barplot` and several others types for a while---we now
+  extend `xlevels` support to  `type_points()`, `type_lines()`,
+  `type_errorbar()`, and `type_pointrange()`. (#683, #694 @grantmcdermott)
+- `xord`, `yord`: these are new (type-level) arguments that provide an alternate
+  ordering interface to `x/ylevels`. Specifically, while `x/ylevels` require a
+  literal ordering, `x/yord` _computes_ the order on the fly, according to
+  (type-appropriate) convenience keywords or a custom ranking function. For
+  example, `"desc(ending)"`/`"asc(ending)"` orders by value, while `"asis"`
+  ignores factor levels and just takes the order of appearance in the data as
+  given. Among other things, this makes it possible to sort barplots by height
+  (e.g., `type_barplot(xord = "desc")`), or ridges by their spread (e.g., 
   `type_ridge(yord = "minvar")`) without relevelling the underlying factor by
-  hand. _Note: users should only supply one or the other. If both are given,
-  `x/ylevels` takes precedence and `x/yord` is ignored, since the former is
-  more explcit. (#683 #688, #694 @grantmcdermott)
+  hand. (#683, #694 @grantmcdermott)
+- (Note: users should only supply one of preceding sets of arguments. If both
+  `x/ylevels` and `x/yord` are provided, the former takes precedence as the more
+  explicit.)
 - `tinylabel()` gains a dictionary form, i.e, a *named* character vector or
-  list, mapping existing labels to new ones, e.g. `c(old = "new")`. Labels that
-  are not named are left alone, so a partial mapping is fine, and the lookup is
-  by value rather than by position, which means it is unaffected by any
-  reordering of the underlying categories. Because everything that formats
-  labels routes through `tinylabel()`, this is available anywhere a `labeller`
-  is accepted: the top-level `xaxl` / `yaxl` arguments, the legend's
-  `labeller`, `type_text()`, and facet titles. (#688 @grantmcdermott)
+  list that maps existing labels to new ones _a la_
+  `c(old1 = "new1", old2 = "new2")`. Partial mapping is fine since the lookup is
+  by value rather than by position, so that some levels can be left unnamed.
+  Importantly, this behaviour extends to the rest of **tinyplot**'s
+  (re)labeling machinery---including `x/yaxl`, `type_text()`, and any function
+  with a `labeller` argument---since everything is routed through `tinylabel()`.
+  (#690 @grantmcdermott)
+- The type-level `x/yaxlabels` arguments of `type_spineplot()` and
+  `type_barplot()` are deprecated in favour of the top-level `x/yaxl` arguments.
+  The type-level arguments predated their top-level cousins, which now offer the
+  same functionality via a consistent interface across _all_ types. The old
+  arguments still work (with a warning) for now. But we will be formally
+  removing them in a future release and, going forwards, encourage users to move
+  over to `xaxl` and `yaxl` as the idiomatic **tinyplot** way to relabel
+  and format axes tick. (#692 @grantmcdermott)
+
+Beyond convenience, these improvements to categorical variable handling also
+provide the scaffolding to eliminate some niggling inconsistencies; for example,
+related to plot layering. See "Bug fixes" below.
 
 #### Other new features
 
-- `type_area()` gains a `stack` argument for stacked area plots. A sister
-  `byord` argument enables convenient, on-the-fly (re-)ordering of stacking
-  layers through convenience keywords or custom functions (e.g.,
-  `byord = "end"` ranks groups according to their largest final value, while
-  `byord = "minvar"` puts the lowest variance group on the baseline, and
-  `byord = "rev"` simply reverses the existing level order). Custom
-  functions may additionally name an `x` argument to receive the group's `x`
-  values, as needed by any statistic that depends on their spacing.
-  Similarly, a new `FUN` argument permits stacking of multi-observation data by
-  collapsing repeated `y` values. (#688 @grantmcdermott)
+- `type_density()` gains an `echo.bw` argument for reporting the smoothing
+  bandwidth and the number of observations behind it, neither of which is
+  visible from the curve itself. Destinations are `"sub"`, `"cap"`, and
+  `"cat"` (console), in any combination; a destination the user has already
+  labelled is left alone. Shared bandwidths are reported once and named as
+  joint, individual bandwidths per group. (#287 @haomeng797-ship-it)
 - Custom plot types have more control over the surrounding plot machinery, via a
   new `type_hints` mechanism. A type can declare properties about itself---that
   it draws its own axes, needs a secondary right-hand axis, uses proportional
@@ -128,12 +140,6 @@ used to display them:
   custom types. See
   [Advanced customization](https://grantmcdermott.com/tinyplot/vignettes/types.html#type-hints)
   in the `Types` vignette for the list of supported hints. (#543 @grantmcdermott)
-- `type_density()` gains an `echo.bw` argument for reporting the smoothing
-  bandwidth and the number of observations behind it, neither of which is
-  visible from the curve itself. Destinations are `"sub"`, `"cap"`, and
-  `"cat"` (console), in any combination; a destination the user has already
-  labelled is left alone. Shared bandwidths are reported once and named as
-  joint, individual bandwidths per group. (#287 @haomeng797-ship-it)
 - New `cex.xaxs` and `cex.yaxs` graphical parameters allow the x- and y-axis
   tick labels to be sized independently, e.g. `tpar(cex.yaxs = 0.6)` to shrink a
   long list of category names on the y-axis without also shrinking the x-axis.
@@ -157,25 +163,16 @@ used to display them:
 - Axis labellers no longer blow up the decimal precision when the breaks are
   symmetric about zero, as they are for a centered barplot. `tinyplot(...,
   center = TRUE, yaxl = "percent")` labelled its axis `80.00000%` rather than
-  `80%`. (#688 @grantmcdermott)
+  `80%`. (#689 @grantmcdermott)
 - The top-level `xaxl` / `yaxl` arguments now work for `type_spineplot()` and
   `type_ridge()`. Both types draw their own axes, and so never reached the
   standard path where those arguments are applied, meaning they were silently
-  ignored. (#688 @grantmcdermott)
-- Fixed the formatting keywords being unusable on a centered `type_barplot()`.
-  Centering prepends `"abs_"` to `yaxl`, but the prefix was applied before a
-  symbol was resolved to its full name, so documented values such as
-  `yaxl = ","` failed with an unrelated `match.arg()` error.
-  (#688 @grantmcdermott)
+  ignored. (#694 @grantmcdermott)
 - `xlevels` / `ylevels` no longer drop data silently. Naming a strict subset of
   a variable's levels sent every other level to `NA`, quietly removing those
   observations from the plot; this now warns. Supplying a value that matches no
   level at all is now an error, rather than surfacing later as an unrelated
-  complaint about zero-length ranges. (#688 @grantmcdermott)
-- The legend key for a stacked `type_area()` is no longer reversed when
-  `flip = TRUE`. Flipping lays the bands out left-to-right, so the bottom-up
-  reading that the reversal exists to match no longer applies.
-  (#688 @grantmcdermott)
+  complaint about zero-length ranges. (#688, #694 @grantmcdermott)
 - `type_area()` now labels a categorical `x` axis with its factor levels,
   rather than falling back to the underlying integer positions.
   (#688 @grantmcdermott)

From 2b37084f0bf3c0efcbf20723d82f4da56dff80f9 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Sat, 29 Aug 2026 20:44:19 -0700
Subject: [PATCH 20/23] typos etc.

---
 NEWS.md             | 22 +++++++++++-----------
 R/type_barplot.R    |  4 ++--
 man/type_barplot.Rd |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index 86002ead..53e3b94c 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -76,18 +76,18 @@ a (custom) theme, e.g. `tinytheme("clean", facet.axes = "outer")`.
 
 #### Ordering and labelling categorical variables
 
-This release bring several enhancements for working with _categorical_
+This release brings several enhancements for working with _categorical_
 variables, i.e. where `x`, `y`, or `by` are characters or factors with discrete
 levels. This includes improvements to existing arguments, as well as the
 provision of some new arguments that enable finer control over level ordering
 and convenient label formatting.
 
-- `xlevels`, `ylevels`: these (type-level) argument permit on-the-fly
+- `xlevels`, `ylevels`: these (type-level) arguments permit on-the-fly
   reordering of a categorical variable via _literal_ specification, either a
   character vector of level names (e.g., `c("C", "B", "A")`), or a numeric
   vector of level indices (e.g., `3:1`). While this argument is not new---having
-  been supported by `type_barplot` and several others types for a while---we now
-  extend `xlevels` support to  `type_points()`, `type_lines()`,
+  been supported by `type_barplot` and several other types for a while---we now
+  extend `xlevels` support to `type_points()`, `type_lines()`,
   `type_errorbar()`, and `type_pointrange()`. (#683, #694 @grantmcdermott)
 - `xord`, `yord`: these are new (type-level) arguments that provide an alternate
   ordering interface to `x/ylevels`. Specifically, while `x/ylevels` require a
@@ -96,18 +96,18 @@ and convenient label formatting.
   example, `"desc(ending)"`/`"asc(ending)"` orders by value, while `"asis"`
   ignores factor levels and just takes the order of appearance in the data as
   given. Among other things, this makes it possible to sort barplots by height
-  (e.g., `type_barplot(xord = "desc")`), or ridges by their spread (e.g., 
+  (e.g., `type_barplot(xord = "desc")`), or ridges by their spread (e.g.,
   `type_ridge(yord = "minvar")`) without relevelling the underlying factor by
   hand. (#683, #694 @grantmcdermott)
-- (Note: users should only supply one of preceding sets of arguments. If both
-  `x/ylevels` and `x/yord` are provided, the former takes precedence as the more
-  explicit.)
-- `tinylabel()` gains a dictionary form, i.e, a *named* character vector or
+- (Note: users should only supply one of the preceding sets of arguments. If
+  both `x/ylevels` and `x/yord` are provided, the former takes precedence as
+  the more explicit.)
+- `tinylabel()` gains a dictionary form, i.e., a *named* character vector or
   list that maps existing labels to new ones _a la_
   `c(old1 = "new1", old2 = "new2")`. Partial mapping is fine since the lookup is
   by value rather than by position, so that some levels can be left unnamed.
   Importantly, this behaviour extends to the rest of **tinyplot**'s
-  (re)labeling machinery---including `x/yaxl`, `type_text()`, and any function
+  (re)labelling machinery---including `x/yaxl`, `type_text()`, and any function
   with a `labeller` argument---since everything is routed through `tinylabel()`.
   (#690 @grantmcdermott)
 - The type-level `x/yaxlabels` arguments of `type_spineplot()` and
@@ -117,7 +117,7 @@ and convenient label formatting.
   arguments still work (with a warning) for now. But we will be formally
   removing them in a future release and, going forwards, encourage users to move
   over to `xaxl` and `yaxl` as the idiomatic **tinyplot** way to relabel
-  and format axes tick. (#692 @grantmcdermott)
+  and format axis ticks. (#692 @grantmcdermott)
 
 Beyond convenience, these improvements to categorical variable handling also
 provide the scaffolding to eliminate some niggling inconsistencies; for example,
diff --git a/R/type_barplot.R b/R/type_barplot.R
index 90221255..f396c54b 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -75,7 +75,7 @@
 #'   `FALSE` to use the fully-saturated palette colour(s) instead.
 #' @param xaxlabels \[Deprecated\] a character vector with the axis labels for
 #'   the `x` variable. Use the top-level `xaxl` argument instead (see
-#'   `[tinylabel]`). This argument will be removed in a future release.
+#'   [`tinylabel`]). This argument will be removed in a future release.
 #'
 #' @examples
 #' #
@@ -101,7 +101,7 @@
 #' tinyplot(
 #'   extra ~ ID, data = sleep2,
 #'   type = "barplot",
-#'   main = "Mean extra sleep from 2 soporiphic drugs"
+#'   main = "Mean extra sleep from 2 soporific drugs"
 #' )
 #' # switch to diff (answers a more relevant q: who benefits most from drug 2?)
 #' tinyplot(
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index aa722763..d47299bd 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -97,7 +97,7 @@ displays consistent and lets the fill read cleanly over grid lines. Set to
 
 \item{xaxlabels}{[Deprecated] a character vector with the axis labels for
 the \code{x} variable. Use the top-level \code{xaxl} argument instead (see
-\verb{[tinylabel]}). This argument will be removed in a future release.}
+\code{\link{tinylabel}}). This argument will be removed in a future release.}
 }
 \description{
 Type function for producing barplots. For formulas of type
@@ -130,7 +130,7 @@ sleep2 = transform(sleep, drug = group) # less misleading name
 tinyplot(
   extra ~ ID, data = sleep2,
   type = "barplot",
-  main = "Mean extra sleep from 2 soporiphic drugs"
+  main = "Mean extra sleep from 2 soporific drugs"
 )
 # switch to diff (answers a more relevant q: who benefits most from drug 2?)
 tinyplot(

From 5685c3240ba2643a65c52ee7b2c728eb412a2e64 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Sat, 29 Aug 2026 20:58:59 -0700
Subject: [PATCH 21/23] reorder to catch degenerate case

---
 R/sanitize_xlevels.R              | 18 ++++++++++++------
 inst/tinytest/test-type_barplot.R | 22 ++++++----------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/R/sanitize_xlevels.R b/R/sanitize_xlevels.R
index bb96125b..a9431588 100644
--- a/R/sanitize_xlevels.R
+++ b/R/sanitize_xlevels.R
@@ -28,18 +28,18 @@ sanitize_xlevels = function(x, xlevels, arg = "xlevels") {
     xlevels = levels(x)[xlevels]
   }
   v = substr(arg, 1, 1)
-  if (anyNA(xlevels) || !all(xlevels %in% levels(x))) {
-    warning(sprintf(
-      "not all '%s' correspond to levels of '%s'",
-      arg, v
-    ))
-  }
   # Naming a strict subset silently sends every other level to NA, which drops
   # those rows from the plot without a word. Ordering is all these arguments
   # claim to do, so treat a shortfall as a mistake worth flagging -- and a
   # complete miss (no supplied level matches at all) as fatal, since the
   # all-NA factor it produces only surfaces later as an unrelated error about
   # zero-length ranges.
+  #
+  # The fatal case has to be settled *before* either warning below, so that a
+  # complete miss aborts cleanly instead of warning on its way to the stop().
+  # A warning raised en route to an error is not muffled by the caller's
+  # tryCatch/expect_error, so it escapes to R's deferred list and resurfaces,
+  # unattributed, at the end of whatever was running.
   kept = intersect(levels(x), xlevels)
   if (length(kept) == 0L) {
     stop(sprintf(
@@ -47,6 +47,12 @@ sanitize_xlevels = function(x, xlevels, arg = "xlevels") {
       arg, v, paste(sprintf('"%s"', levels(x)), collapse = ", ")
     ), call. = FALSE)
   }
+  if (anyNA(xlevels) || !all(xlevels %in% levels(x))) {
+    warning(sprintf(
+      "not all '%s' correspond to levels of '%s'",
+      arg, v
+    ))
+  }
   dropped = setdiff(levels(x), xlevels)
   if (length(dropped) > 0L) {
     warning(sprintf(
diff --git a/inst/tinytest/test-type_barplot.R b/inst/tinytest/test-type_barplot.R
index f3355cac..08923ce7 100644
--- a/inst/tinytest/test-type_barplot.R
+++ b/inst/tinytest/test-type_barplot.R
@@ -224,16 +224,12 @@ expect_error(
   tinyplot(~ cyl, data = mtcars, type = type_barplot(xord = c("8", "6", "4"))),
   pattern = "must be NULL"
 )
-# and `xlevels` no longer accepts the ord keywords
-# TODO: sanitize_xlevels() warns about the partial match and *then* aborts on
-# the complete miss. expect_error() does not muffle the warning, so it escapes
-# to R's deferred list and surfaces at the end of a suite run. Restore this and
-# the `xlevels = "rev"` case below once the no-match stop() is ordered ahead of
-# the partial-match warning.
-# expect_warning(
-#   tinyplot(~ cyl, data = mtcars, type = type_barplot(xlevels = "asis")),
-#   pattern = "correspond to levels"
-# )
+# and `xlevels` no longer accepts the ord keywords: a keyword matches none of
+# the levels, which is fatal rather than a silent all-NA factor
+expect_error(
+  tinyplot(~ cyl, data = mtcars, type = type_barplot(xlevels = "asis")),
+  pattern = "matches none of the levels"
+)
 
 # "start"/"end" name a position along a secondary axis, which x-categories do
 # not have; offering them here would silently alias "desc" (ungrouped) or
@@ -272,12 +268,6 @@ expect_warning(
   tinyplot(~ cyl, data = mtcars, type = type_barplot(xlevels = c("8", "4"))),
   pattern = "omits 1 of the 3 levels"
 )
-# and a complete miss is fatal, rather than surfacing later as an unrelated
-# error about zero-length ranges. (Commented out; see the TODO above.)
-# expect_error(
-#   tinyplot(~ cyl, data = mtcars, type = type_barplot(xlevels = "rev")),
-#   pattern = "matches none of the levels"
-# )
 
 asis_dat = data.frame(
   g = factor(c("z", "z", "a", "m", "m", "m")),   # appearance z,a,m; levels a,m,z

From 52242909a52551d56d487aa015ccdfc8d427d6c1 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Sat, 29 Aug 2026 21:08:47 -0700
Subject: [PATCH 22/23] fix(sanitize_ord): correct bad-input diagnostics

---
 R/sanitize_ord.R                  | 29 ++++++++++++++++++++++++-----
 inst/tinytest/test-type_barplot.R |  8 ++++++++
 inst/tinytest/test-type_ridge.R   |  7 +++++++
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/R/sanitize_ord.R b/R/sanitize_ord.R
index 179f982a..b74bdbeb 100644
--- a/R/sanitize_ord.R
+++ b/R/sanitize_ord.R
@@ -94,9 +94,12 @@ ord_aliases = c(
 )
 
 sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords, stat = c("sum", "mean")) {
-  # nlevels < 2 has exactly one ordering, so skip the work (and the degeneracy
-  # check below, which a single level would otherwise trip).
-  if (is.null(ord) || !is.factor(v) || nlevels(v) < 2L) {
+  # A non-factor is not reordered at all, and the call sites already warn about
+  # that wholesale (see warn_ignored_ordering()), so there is nothing here to
+  # validate. Bailing out before the checks below also keeps us from raising a
+  # warning and an error over the same argument, which would leave the warning
+  # unmuffled by the caller's tryCatch().
+  if (is.null(ord) || !is.factor(v)) {
     return(v)
   }
   stat = match.arg(stat)
@@ -124,6 +127,14 @@ sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords, stat
     )
   }
 
+  # One level has exactly one ordering, so there is no work left to do -- but
+  # only past the validation above, so that a typo is still caught on data that
+  # happens to hold a single category today and two tomorrow. The "minvar"
+  # degeneracy check below would misfire here too.
+  if (nlevels(v) < 2L) {
+    return(v)
+  }
+
   # "asis" and "rev" need no y, and must work when y is absent or non-numeric.
   # factor() defaults `ordered` to is.ordered(v), so an ordered grouping stays
   # ordered (and keeps its sequential palette) through either.
@@ -139,10 +150,18 @@ sanitize_ord = function(v, y, x, ord, arg = "ord", keywords = ord_keywords, stat
   # continuous variable on the categorical side), so say that rather than
   # letting var()/sum() fail with something cryptic about factors.
   if (!is.numeric(y)) {
+    # Name `ord` only when it is a keyword: sprintf() cannot coerce a closure,
+    # so interpolating a ranking function here would replace this diagnostic
+    # with an internal error about closures.
+    culprit = if (keyword) {
+      sprintf("`%s = \"%s\"`", arg, ord)
+    } else {
+      sprintf("the `%s` function", arg)
+    }
     stop(
       sprintf(
-        "`%s = \"%s\"` ranks on a numeric variable, but was given %s.\n  Only \"asis\" and \"rev\" work without one.",
-        arg, ord, class(y)[1L]
+        "%s ranks on a numeric variable, but was given %s.\n  Only \"asis\" and \"rev\" work without one.",
+        culprit, class(y)[1L]
       ),
       call. = FALSE
     )
diff --git a/inst/tinytest/test-type_barplot.R b/inst/tinytest/test-type_barplot.R
index 08923ce7..08230193 100644
--- a/inst/tinytest/test-type_barplot.R
+++ b/inst/tinytest/test-type_barplot.R
@@ -231,6 +231,14 @@ expect_error(
   pattern = "matches none of the levels"
 )
 
+# `xord` is validated even where the ordering itself is a no-op, so that a typo
+# does not lie dormant until the data gains a second category
+one_level = data.frame(g = factor("only"), v = 1)
+expect_error(
+  tinyplot(v ~ g, data = one_level, type = type_barplot(xord = "des")),
+  pattern = "must be NULL"
+)
+
 # "start"/"end" name a position along a secondary axis, which x-categories do
 # not have; offering them here would silently alias "desc" (ungrouped) or
 # silently re-read as "first/last `by` level" (grouped)
diff --git a/inst/tinytest/test-type_ridge.R b/inst/tinytest/test-type_ridge.R
index c8013554..0ed6fb47 100644
--- a/inst/tinytest/test-type_ridge.R
+++ b/inst/tinytest/test-type_ridge.R
@@ -207,6 +207,13 @@ expect_error(
   tinyplot(Sepal.Length ~ Species, data = iris, type = type_ridge(yord = "minvar")),
   pattern = "ranks on a numeric variable"
 )
+# ...including when the ranking is a function, which cannot be interpolated
+# into the message the way a keyword can
+expect_error(
+  tinyplot(Sepal.Length ~ Species, data = iris,
+           type = type_ridge(yord = function(z) -mean(z))),
+  pattern = "ranks on a numeric variable"
+)
 
 expect_error(
   tinyplot(Species ~ Sepal.Length, data = iris, type = type_ridge(yord = "start")),

From f5aa8cc65de9e293d6f1187a67de3ac5afe007d8 Mon Sep 17 00:00:00 2001
From: Grant McDermott <grant.mcdermott@gmail.com>
Date: Sat, 29 Aug 2026 21:30:01 -0700
Subject: [PATCH 23/23] facet labeller dictionary gotcha

---
 R/assertions.R                                |  29 +-
 .../_tinysnapshot/facet_labeller_dict.svg     | 328 ++++++++++++++++++
 inst/tinytest/test-facet.R                    |  12 +
 3 files changed, 364 insertions(+), 5 deletions(-)
 create mode 100644 inst/tinytest/_tinysnapshot/facet_labeller_dict.svg

diff --git a/R/assertions.R b/R/assertions.R
index 0b9ab8f3..564a8297 100644
--- a/R/assertions.R
+++ b/R/assertions.R
@@ -103,16 +103,23 @@ is_string1 = function(x) {
   isTRUE(check_string(x)) && !is.na(x)
 }
 
-# label formatter passed on to tinylabel(): a function, or one of its
-# convenience strings (e.g. "percent"). With `list.ok`, several of them --  as a
-# list or character vector -- are allowed too, e.g. one per facet variable.
+# label formatter passed on to tinylabel(): a function, one of its convenience
+# strings (e.g. "percent"), or a dictionary. With `list.ok`, several of them --
+# as a list or character vector -- are allowed too, e.g. one per facet variable.
+#
+# A dictionary is only recognised *inside* that list, never as `x` itself: at
+# the top level a named vector is read as a per-variable mapping instead, which
+# is what makes `list(Species = c(setosa = "SET"))` mean something different
+# from a bare `c(setosa = "SET")`. match_facet_vars() enforces the top-level
+# reading; this only has to let the nested one through.
 assert_labeller = function(x, name = as.character(substitute(x)), list.ok = FALSE) {
   if (is.null(x) || is_labeller(x)) return(invisible(TRUE))
   if (isTRUE(list.ok) && (is.list(x) || is.character(x)) && length(x) >= 1L) {
-    if (all(vapply(x, is_labeller, logical(1L)))) return(invisible(TRUE))
+    ok = vapply(x, function(xi) is_labeller(xi) || is_dict(xi), logical(1L))
+    if (all(ok)) return(invisible(TRUE))
   }
   msg = if (isTRUE(list.ok)) {
-    "`%s` must be a function or a `tinylabel()` convenience string, or a list of them (one per facet variable)."
+    "`%s` must be a function, a `tinylabel()` convenience string, or a dictionary of labels -- or a list of them, one per facet variable."
   } else {
     "`%s` must be a function, or a `tinylabel()` convenience string."
   }
@@ -123,6 +130,18 @@ is_labeller = function(x) {
   is.function(x) || (is.character(x) && length(x) == 1L && !is.na(x))
 }
 
+# A tinylabel() dictionary: a *named* character vector, or a named list that
+# flattens to one, mapping existing labels to their replacements. Deliberately
+# mirrors what tinylabel() itself dispatches on (see R/tinylabel.R), so that
+# what passes validation here is exactly what it can consume. Note the overlap
+# with is_labeller() at length 1, where a one-entry dictionary and a
+# convenience string cannot be told apart -- and need not be, since both are
+# accepted either way.
+is_dict = function(x) {
+  if (is.list(x) && !is.null(names(x))) x = unlist(x)
+  is.character(x) && !is.null(names(x))
+}
+
 assert_length = function(x, len = 1, null.ok = FALSE, name = as.character(substitute(x))) {
   if (is.null(x) && isTRUE(null.ok)) {
     return(invisible(TRUE))
diff --git a/inst/tinytest/_tinysnapshot/facet_labeller_dict.svg b/inst/tinytest/_tinysnapshot/facet_labeller_dict.svg
new file mode 100644
index 00000000..2100a5f3
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/facet_labeller_dict.svg
@@ -0,0 +1,328 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' width='504.00pt' height='504.00pt' viewBox='0 0 504.00 504.00'>
+<g class='svglite'>
+<defs>
+  <style type='text/css'><![CDATA[
+    .svglite line, .svglite polyline, .svglite polygon, .svglite path, .svglite rect, .svglite circle {
+      fill: none;
+      stroke: #000000;
+      stroke-linecap: round;
+      stroke-linejoin: round;
+      stroke-miterlimit: 10.00;
+    }
+    .svglite text {
+      white-space: pre;
+    }
+    .svglite g.glyphgroup path {
+      fill: inherit;
+      stroke: none;
+    }
+  ]]></style>
+</defs>
+<rect width='100%' height='100%' style='stroke: none; fill: #FFFFFF;'/>
+<defs>
+  <clipPath id='cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA='>
+    <rect x='0.00' y='0.00' width='504.00' height='504.00' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<text x='266.40' y='485.28' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='67.36px' lengthAdjust='spacingAndGlyphs'>Petal.Length</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='70.70px' lengthAdjust='spacingAndGlyphs'>Sepal.Length</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8MTgwLjk2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='121.92' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8MTgwLjk2fDU5LjA0fDQzMC41Ng==)'>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='63.56' y1='430.56' x2='178.36' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='63.56' y1='430.56' x2='63.56' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='82.69' y1='430.56' x2='82.69' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='101.82' y1='430.56' x2='101.82' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='120.96' y1='430.56' x2='120.96' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='140.09' y1='430.56' x2='140.09' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='159.22' y1='430.56' x2='159.22' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='178.36' y1='430.56' x2='178.36' y2='435.31' style='stroke-width: 0.75;' />
+<text x='63.56' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>1</text>
+<text x='82.69' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text x='101.82' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='120.96' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='140.09' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text x='159.22' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='178.36' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>7</text>
+<line x1='59.04' y1='397.69' x2='59.04' y2='63.24' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='397.69' x2='54.29' y2='397.69' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='349.91' x2='54.29' y2='349.91' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='302.13' x2='54.29' y2='302.13' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='254.36' x2='54.29' y2='254.36' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='206.58' x2='54.29' y2='206.58' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='158.80' x2='54.29' y2='158.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='111.02' x2='54.29' y2='111.02' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='63.24' x2='54.29' y2='63.24' style='stroke-width: 0.75;' />
+<text transform='translate(47.64,397.69) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>4.5</text>
+<text transform='translate(47.64,349.91) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>5.0</text>
+<text transform='translate(47.64,302.13) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>5.5</text>
+<text transform='translate(47.64,254.36) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>6.0</text>
+<text transform='translate(47.64,206.58) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>6.5</text>
+<text transform='translate(47.64,158.80) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>7.0</text>
+<text transform='translate(47.64,111.02) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>7.5</text>
+<text transform='translate(47.64,63.24) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>8.0</text>
+<rect x='59.04' y='43.20' width='121.92' height='15.84' style='stroke-width: 0.75; stroke: none;' />
+<text x='120.00' y='55.25' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='23.33px' lengthAdjust='spacingAndGlyphs'>SET</text>
+<polygon points='59.04,430.56 180.96,430.56 180.96,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpMjA1LjQ0fDMyNy4zNnw1OS4wNHw0MzAuNTY='>
+    <rect x='205.44' y='59.04' width='121.92' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjA1LjQ0fDMyNy4zNnw1OS4wNHw0MzAuNTY=)'>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='209.96' y1='430.56' x2='324.76' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='209.96' y1='430.56' x2='209.96' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='229.09' y1='430.56' x2='229.09' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='248.22' y1='430.56' x2='248.22' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='267.36' y1='430.56' x2='267.36' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='286.49' y1='430.56' x2='286.49' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='305.62' y1='430.56' x2='305.62' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='324.76' y1='430.56' x2='324.76' y2='435.31' style='stroke-width: 0.75;' />
+<text x='209.96' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>1</text>
+<text x='229.09' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text x='248.22' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='267.36' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='286.49' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text x='305.62' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='324.76' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>7</text>
+<line x1='205.44' y1='397.69' x2='205.44' y2='63.24' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='397.69' x2='200.69' y2='397.69' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='349.91' x2='200.69' y2='349.91' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='302.13' x2='200.69' y2='302.13' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='254.36' x2='200.69' y2='254.36' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='206.58' x2='200.69' y2='206.58' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='158.80' x2='200.69' y2='158.80' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='111.02' x2='200.69' y2='111.02' style='stroke-width: 0.75;' />
+<line x1='205.44' y1='63.24' x2='200.69' y2='63.24' style='stroke-width: 0.75;' />
+<text transform='translate(194.04,397.69) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>4.5</text>
+<text transform='translate(194.04,349.91) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>5.0</text>
+<text transform='translate(194.04,302.13) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>5.5</text>
+<text transform='translate(194.04,254.36) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>6.0</text>
+<text transform='translate(194.04,206.58) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>6.5</text>
+<text transform='translate(194.04,158.80) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>7.0</text>
+<text transform='translate(194.04,111.02) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>7.5</text>
+<text transform='translate(194.04,63.24) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>8.0</text>
+<rect x='205.44' y='43.20' width='121.92' height='15.84' style='stroke-width: 0.75; stroke: none;' />
+<text x='266.40' y='55.25' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='51.36px' lengthAdjust='spacingAndGlyphs'>versicolor</text>
+<polygon points='205.44,430.56 327.36,430.56 327.36,59.04 205.44,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpMzUxLjg0fDQ3My43Nnw1OS4wNHw0MzAuNTY='>
+    <rect x='351.84' y='59.04' width='121.92' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMzUxLjg0fDQ3My43Nnw1OS4wNHw0MzAuNTY=)'>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='356.36' y1='430.56' x2='471.16' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='356.36' y1='430.56' x2='356.36' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='375.49' y1='430.56' x2='375.49' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='394.62' y1='430.56' x2='394.62' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='413.76' y1='430.56' x2='413.76' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='432.89' y1='430.56' x2='432.89' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='452.02' y1='430.56' x2='452.02' y2='435.31' style='stroke-width: 0.75;' />
+<line x1='471.16' y1='430.56' x2='471.16' y2='435.31' style='stroke-width: 0.75;' />
+<text x='356.36' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>1</text>
+<text x='375.49' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>2</text>
+<text x='394.62' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>3</text>
+<text x='413.76' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>4</text>
+<text x='432.89' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>5</text>
+<text x='452.02' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>6</text>
+<text x='471.16' y='447.67' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='4.39px' lengthAdjust='spacingAndGlyphs'>7</text>
+<line x1='351.84' y1='397.69' x2='351.84' y2='63.24' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='397.69' x2='347.09' y2='397.69' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='349.91' x2='347.09' y2='349.91' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='302.13' x2='347.09' y2='302.13' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='254.36' x2='347.09' y2='254.36' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='206.58' x2='347.09' y2='206.58' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='158.80' x2='347.09' y2='158.80' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='111.02' x2='347.09' y2='111.02' style='stroke-width: 0.75;' />
+<line x1='351.84' y1='63.24' x2='347.09' y2='63.24' style='stroke-width: 0.75;' />
+<text transform='translate(340.44,397.69) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>4.5</text>
+<text transform='translate(340.44,349.91) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>5.0</text>
+<text transform='translate(340.44,302.13) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>5.5</text>
+<text transform='translate(340.44,254.36) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>6.0</text>
+<text transform='translate(340.44,206.58) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>6.5</text>
+<text transform='translate(340.44,158.80) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>7.0</text>
+<text transform='translate(340.44,111.02) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>7.5</text>
+<text transform='translate(340.44,63.24) rotate(-90)' text-anchor='middle' style='font-size: 7.92px; font-family: "Liberation Sans";' textLength='10.98px' lengthAdjust='spacingAndGlyphs'>8.0</text>
+<rect x='351.84' y='43.20' width='121.92' height='15.84' style='stroke-width: 0.75; stroke: none;' />
+<text x='412.80' y='55.25' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.00px' lengthAdjust='spacingAndGlyphs'>VIR</text>
+<polygon points='351.84,430.56 473.76,430.56 473.76,59.04 351.84,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpNTkuMDR8MTgwLjk2fDU5LjA0fDQzMC41Ng==)'>
+<circle cx='71.21' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='359.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='69.30' cy='378.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='388.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='76.95' cy='311.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='388.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='407.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='359.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='311.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='75.04' cy='369.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='369.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='65.47' cy='416.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='67.38' cy='273.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='69.30' cy='311.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='76.95' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='76.95' cy='311.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='63.56' cy='388.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='76.95' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='80.78' cy='369.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='75.04' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='75.04' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='330.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='330.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='75.04' cy='378.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='75.04' cy='369.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='311.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='330.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='302.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='359.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='67.38' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='69.30' cy='302.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='359.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='69.30' cy='407.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='69.30' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='69.30' cy='397.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='69.30' cy='407.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='75.04' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='80.78' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='369.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='75.04' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='388.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='73.12' cy='321.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='71.21' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpMjA1LjQ0fDMyNy4zNnw1OS4wNHw0MzAuNTY=)'>
+<circle cx='280.75' cy='158.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='276.92' cy='216.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='284.58' cy='168.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='267.36' cy='302.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='278.84' cy='206.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='276.92' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='280.75' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='253.96' cy='359.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='278.84' cy='197.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='265.44' cy='330.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='257.79' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='271.18' cy='263.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='267.36' cy='254.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='280.75' cy='244.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='259.70' cy='292.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='275.01' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='276.92' cy='292.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='269.27' cy='273.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='276.92' cy='235.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='265.44' cy='292.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='282.66' cy='263.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='267.36' cy='244.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='284.58' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='280.75' cy='244.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='273.10' cy='216.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='275.01' cy='197.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='282.66' cy='177.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='286.49' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='276.92' cy='254.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='257.79' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='263.53' cy='302.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='261.62' cy='302.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='265.44' cy='273.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='288.40' cy='254.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='276.92' cy='311.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='276.92' cy='254.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='280.75' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='275.01' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='269.27' cy='292.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='267.36' cy='302.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='275.01' cy='302.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='278.84' cy='244.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='267.36' cy='273.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='253.96' cy='349.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='271.18' cy='292.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='271.18' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='271.18' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='273.10' cy='235.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='248.22' cy='340.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='269.27' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpMzUxLjg0fDQ3My43Nnw1OS4wNHw0MzAuNTY=)'>
+<circle cx='452.02' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='434.80' cy='273.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='450.11' cy='149.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='444.37' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='448.20' cy='206.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='463.50' cy='101.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='423.32' cy='359.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='457.76' cy='130.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='448.20' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='453.94' cy='139.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='434.80' cy='206.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='438.63' cy='216.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='442.46' cy='177.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='432.89' cy='283.02' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='434.80' cy='273.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='438.63' cy='216.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='442.46' cy='206.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='465.42' cy='91.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='469.24' cy='91.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='432.89' cy='254.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='446.28' cy='168.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='430.98' cy='292.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='465.42' cy='91.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='430.98' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='446.28' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='452.02' cy='139.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='429.06' cy='235.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='430.98' cy='244.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='444.37' cy='216.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='448.20' cy='139.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='453.94' cy='120.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='459.68' cy='72.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='444.37' cy='216.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='434.80' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='444.37' cy='244.80' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='453.94' cy='91.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='444.37' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='442.46' cy='216.13' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='429.06' cy='254.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='440.54' cy='168.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='444.37' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='434.80' cy='168.36' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='434.80' cy='273.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='450.11' cy='177.91' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='446.28' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='436.72' cy='187.47' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='432.89' cy='225.69' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='436.72' cy='206.58' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='440.54' cy='235.24' r='1.78' style='stroke-width: 0.75;' />
+<circle cx='434.80' cy='263.91' r='1.78' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpMTI5Ljk1fDQ0Ni40OXwxMDguMTN8MzM3Ljgz'>
+    <rect x='129.95' y='108.13' width='316.54' height='229.70' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMTI5Ljk1fDQ0Ni40OXwxMDguMTN8MzM3Ljgz)'>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/test-facet.R b/inst/tinytest/test-facet.R
index ce6ef115..4f0f8462 100644
--- a/inst/tinytest/test-facet.R
+++ b/inst/tinytest/test-facet.R
@@ -749,6 +749,18 @@ f = function() {
 }
 expect_snapshot_plot(f, label = "facet_labeller_list")
 
+# A dictionary can be nested inside that per-variable list, which is the only
+# way to reach one here: a bare named vector claims the same slot and is read
+# as a per-variable mapping instead. Partial mapping is fine -- "versicolor"
+# is not named, so it comes through untouched.
+f = function() {
+  tinyplot(
+    Sepal.Length ~ Petal.Length, data = iris, facet = ~Species,
+    facet.args = list(labeller = list(Species = c(setosa = "SET", virginica = "VIR")))
+  )
+}
+expect_snapshot_plot(f, label = "facet_labeller_dict")
+
 # All of the facet title arguments at once: a named `prefix` (so the order it
 # is written in doesn't matter), a `labeller`, and a `sep` to stack the two
 # variables. Note that the labeller sees each variable's own values rather than