diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index c7c2fcf5..39b163af 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -34,6 +34,16 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      # r-ci's run.sh (hotfix a07614a, 2026-08-19) seds /etc/apt/apt-mirrors.txt
+      # unconditionally to drop the flaky azure mirror. That file only exists on
+      # GitHub-hosted runner images, not in containers, so the sed exits 2 and
+      # kills the step under `bash -e`. (r2u4ci escapes it via the /etc/r2u_ci
+      # stamp, which makes Bootstrap() skip BootstrapLinux entirely; drd has no
+      # such stamp.) An empty file is inert here -- containers never used the
+      # azure mirror. Drop once upstream guards the sed with `test -f`.
+      - name: Work around r-ci apt-mirrors.txt assumption
+        run: touch /etc/apt/apt-mirrors.txt
+
       - name: Setup
         uses: eddelbuettel/github-actions/r-ci@master
 
diff --git a/NEWS.md b/NEWS.md
index 2703a9c0..33c0724d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -6,6 +6,18 @@ where the formatting is also better._
 
 ## Development version
 
+### Breaking changes
+
+- `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
+  other types like `type_points()`, which have always ordered the `x` axis by
+  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
+  explicit override; see "Other new features" below. (#683 @grantmcdermott)
+
 ### New features
 
 #### New plot types
@@ -15,7 +27,7 @@ where the formatting is also better._
 - `type_tile()` / `"tile"` for tile plots, i.e. a grid of rectangles whose fill
   encodes a third variable. (#677 @grantmcdermott)
 - `type_heatmap()` / `"heatmap"` builds on `type_tile()`, adding a `scale`
-  argument that scales the fill values *within* each category of one axis. This
+  argument that scales the fill values _within_ each category of one axis. This
   is analogous to base R's `heatmap()` function, and like the latter it z-scores
   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
@@ -23,21 +35,31 @@ where the formatting is also better._
 
 #### Other new features
 
+- `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
   limits, fills its legend key from `col`, and so on---and **tinyplot** adjusts
-  margins, axis limits and legend keys accordingly. Previously this behaviour was
-  hard-coded against the names of built-in types, so it was unavailable to custom
-  types. See
+  margins, axis limits and legend keys accordingly. Previously this behaviour
+  was hard-coded against the names of built-in types, so it was unavailable to
+  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)
-- New `axes` argument for `facet.args`, giving explicit control over which facets
-  draw their own axes: `"all"`, `"outer"` (drop redundant interior axes), or
-  `"none"`. Previously this was only achievable as a side effect of
+- New `axes` argument for `facet.args`, giving explicit control over which
+  facets draw their own axes: `"all"`, `"outer"` (drop redundant interior
+  axes), or `"none"`. Previously this was only achievable as a side effect of
   `frame.plot = FALSE`, so `facet.args = list(axes = "outer")` now allows
-  redundant axes to be dropped while *keeping* the facet frames. (#661, #673
-  @grantmcdermott)
+  redundant axes to be dropped while _keeping_ the facet frames.
+  (#661, #673 @grantmcdermott)
   - The same behaviour can be set globally via the new `facet.axes` parameter
     (note the reverse order), e.g. `tpar(facet.axes = "outer")`, which also
     makes it available to themes. A per-call `facet.args = list(axes = ...)`
@@ -53,7 +75,7 @@ where the formatting is also better._
   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 
+  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.
   Both default to `NULL`, in which case the shared `cex.axis` value is used, so
   existing plots are unaffected. (#677 @grantmcdermott)
@@ -70,8 +92,22 @@ where the formatting is also better._
   not just the axes: `type = "h"` draws horizontal segments to the baseline,
   and the step types `"s"` and `"S"` swap which coordinate moves first.
   (#675 @haomeng797-ship-it)
+- Line types now keep the category labels on a categorical y-axis, both for
+  `flip = TRUE` and for a factor `y` variable. Previously the y-axis fell back
+  to numeric tick labels for every line type except `"p"`.
+  (#679 @grantmcdermott)
+- Added layers now align on the category that each row belongs to, rather than
+  on the row's _position_. The latter only coincided with the right answer when
+  the added layer's rows happened to arrive in ascending order; other rows were
+  permuted, and repeated categories collapsed onto a single position.
+  (#679 @grantmcdermott)
 - Fixed several bugs specific to plots with free facets (i.e.,
   `facet.args = list(free = TRUE)`):
+  - A categorical y-axis no longer errors out with `'labels' is supplied and
+not 'at'`. The free-facet code path listed the eligible types by name, so
+    any other type lost its tick positions while keeping the corresponding
+    labels, whether flipped (e.g. `type = "b"` with `flip = TRUE`) or not
+    (e.g. `type = "p"` with a factor `y` variable). (#679 @grantmcdermott)
   - Single-valued discrete axes no longer trigger invalid `par(usr)` values.
     (#668 @grantmcdermott)
   - User-provided `x/ylim` overrides now work correctly with flipped plots.
@@ -125,9 +161,9 @@ below for easier navigation.
 
 ### Aesthetic changes
 
-A major focus of v0.7.0 is bringing various aesthetic improvements to 
+A major focus of v0.7.0 is bringing various aesthetic improvements to
 **tinyplot**. These aesthetic improvements should carry over to all of your
-(tiny)plots automatically and do not require any changes to user-facing inputs 
+(tiny)plots automatically and do not require any changes to user-facing inputs
 or the core API. From that perspective they are not a breaking change, even
 though some of your plots may look slightly different from before. Still, we
 hope that you agree the following changes result in better looking
@@ -298,18 +334,19 @@ Theme fixes:
 - `tinyplot.data.frame()`: Supports direct plotting of data frames, alongside
   the new top-level function `tinypairs()`. Can be called with or without a
   formula. One benefit of the former is that it facilitates piping, e.g.
-  
+
   ```r
   iris |> plt(Sepal.Length ~ Petal.Width | Species)
   ```
-  
+
   If no formula is provided, then the behaviour depends on the number of
   variables (columns) in the data frame. For example, a dataset with 3 or more
-  variables will yield a `pairs()`-style grid of all variable combinations. 
+  variables will yield a `pairs()`-style grid of all variable combinations.
   Thanks to @mthulin for the suggestion and original implementation idea.
   (#613, #640 @zeileis @grantmcdermott)
+
 - `tinyplot.matrix()`: for `matrix` objects, e.g.
-  
+
   ```r
   plt(VADeaths, type = "b")
   ```
@@ -317,12 +354,13 @@ Theme fixes:
   The output largely mimics the base `matplot`/`matlines` equivalents, but with
   additional **tinyplot** functionality related to automatic legends, options
   for faceting, etc. (#649 @grantmcdermott)
+
 - `tinyplot.ts()`: for `ts` time series, e.g.
-  
+
   ```r
   plt(EuStockMarkets)
   ```
-  
+
   Produces a line plot by default, although users can override by passing an
   explicit `type` argument. Similarly, multivariate series are faceted by
   default, but users can also override to obtain, say, a single frame with
@@ -331,6 +369,7 @@ Theme fixes:
 #### Other new features
 
 - New and updated top-level `tinyplot()`/`plt()` arguments:
+
   - `cap = <string>` for adding a caption to your plots. Captions are drawn at
     the bottom of the plot and are best paired with dynamic themes (since
     separation from `sub` is guaranteed). Appearance is customizable via
@@ -345,28 +384,31 @@ Theme fixes:
     names can be passed for convenience. Users can also pass a weights argument
     directly at the type-specific function level, but this must be a vector
     of correct length (no NSE). For example:
-    
+
     ```r
     plt(y ~ x, data = dat, type = "lm", weights = w)        # top-level, NSE
     plt(y ~ x, data = dat, type = type_lm(weights = dat$w)) # type-level, vector
     ```
-    
+
     In addition to NSE convenience, the top-level variant is preferred since it
     is correctly matched to the model frame construction with the formula method
     (e.g., so missing values are handled automatically). Thanks to @eleuven for
     the original suggestion, as well as various discussion participants for
     helping to frame the scope. (#639 @grantmcdermott)
+
   - `labels = <varname>` for passing labels to `type = "text"`. Like the new
     `weights` argument (above), the main benefit is the convenience of NSE, as
     well as the automatic handling of missing values and subsets as part of the
     model frame construction. For example, compare:
-    
+
     ```r
     plt(y ~ x, data = dat, type = "text", labels = labs, subset = x < 10)
     plt(y ~ x, data = subset(dat, x < 10), type = type_text(labels = subset(dat, x < 10)$labs))
     ```
+
     The `labels` arg is silently ignored for non-text types.
     (#639 @grantmcdermott)
+
   - The `grid` argument (and `tpar("grid")`) now accepts character strings to
     control axis-specific grids at different resolutions. Uppercase letters
     (`"X"`, `"Y"`, `"XY"`) draw grid lines at the standard tick positions, while
@@ -384,6 +426,7 @@ Theme fixes:
       limit and lets the data determine the other.
     - The string `"rev"` (or `"reverse"`) reverses the auto-computed axis range,
       without needing to know the data extent in advance.
+
 - Type-specific updates:
   - `type_barplot()` gains an `offset` argument for shifting bar baselines away
     from zero. (#611, #615 @grantmcdermott @zeileis)
@@ -440,14 +483,14 @@ Theme fixes:
   `"ridge"` types. (#635, #650 @grantmcdermott)
 - `tinyplot_add()` (`plt_add()`) now captures its arguments unevaluated, so
   arguments that rely on non-standard evaluation against `data` (e.g.,
-  `plt_add(..., subset = <>)`) resolve correctly instead of erroring with 
+  `plt_add(..., subset = <>)`) resolve correctly instead of erroring with
   "object not found". (#638 @grantmcdermott)
 - `plt(..., ann = FALSE)` correctly turns off title annotations now, fixing a
   regression that we missed from at least v0.6.0. Thanks to @bastistician for
   the report. (#641 @zeileis)
 - Fixed `bquote()` (and other unevaluated language) annotations such as `main`,
   `sub`, `cap`, `xlab`, and `ylab` being evaluated instead of coerced to
-  plotmath expressions, e.g. `plt(0, 0, main = bquote(foo == .(pi)))`. Thanks 
+  plotmath expressions, e.g. `plt(0, 0, main = bquote(foo == .(pi)))`. Thanks
   (again) to @bastistician for the report. (#642 @grantmcdermott)
 - Line plots (`type = "l"`, and relatives like `"b"`/`"o"`) with a factor or
   character `x` variable now draw the category labels on the x-axis, matching
@@ -488,7 +531,7 @@ Theme fixes:
   (#565 @grantmcdermott)
 - Several improvements/fixes to jittered plots and layering:
   - Jittered plots now support Date/POSIXt axes. Thanks to @wachtermh for the
-     bug report and @vincentarelbundock for the code contribution. (#327)
+    bug report and @vincentarelbundock for the code contribution. (#327)
   - `tinyplot_add(type = "jitter")` no longer errors when layered on top of
     boxplot, violin, or similar categorical plot types. (#560 @grantmcdermott)
   - Jitter layers added via `tinyplot_add()` now align correctly with grouped
@@ -524,14 +567,14 @@ Theme fixes:
   will enable various internal enhancements, from improving the modularity and
   maintainability of the `tinyplot` codebase, to reducing memory overhead and
   performance (since we require fewer object copies). Looking ahead, we also
-  expect that it will make it easier to support new features and integration 
+  expect that it will make it easier to support new features and integration
   with downstream packages. Most `tinyplot` users should be unaffected by these
   internal changes. However, users who have defined their own custom types will
   need to make some adjustments to match the new `settings` logic; details are
   provided in the updated `Types` vignette. (#473 @vincentarelbundock and @grantmcdermott)
 - The ancillary `fixed.pos` argument for dodged plots has been renamed to
   `fixed.dodge` to avoid ambiguity, especially when passed down from a top-level
-  `tinyplot(...)` call. (#528 @grantmcdermott) 
+  `tinyplot(...)` call. (#528 @grantmcdermott)
 
 ### New features
 
@@ -575,7 +618,6 @@ Theme fixes:
 - Custom axis titles work properly for one-sided (formula) bar plots. Thanks to
   @lbelzile for the report in #423. (#527 @grantmcdermott)
 
-
 ### Documentation
 
 - Add a "recession bars" section to the `Tips & tricks` vignette.
@@ -623,8 +665,8 @@ Theme fixes:
   `options()`. (#460 @zeileis)
 - Fixed several minor `tinylabel` bugs. (#468 @grantmcdermott)
   - `tinylabel(x, "%")` is more precise, preserving unique levels of `x` through
-     automatic decimal level determination. Thanks to @etiennebacher for the
-     bug report in #449.
+    automatic decimal level determination. Thanks to @etiennebacher for the
+    bug report in #449.
   - Numeric labellers now work on appropriate `x`/`y` variables, even if the
     plot type internally coerces it to factor (e.g., `"boxplot"`)
 - `type_text()` can now also deal with factor `x`/`y` variables by converting
@@ -645,7 +687,7 @@ Theme fixes:
 - Move `altdoc` from `Suggests` to `Config/Needs/website`.
   Thanks to @etiennebacher for the suggestion and to @eddelbuettel for help
   with the CI implementation.
-- Add a `devcontainer.json` file for remote testing. (#480 @grantmcdermott) 
+- Add a `devcontainer.json` file for remote testing. (#480 @grantmcdermott)
 
 ## v0.4.2
 
@@ -659,7 +701,7 @@ Theme fixes:
 ### Bug fixes
 
 - Fixed a long-standing issue whereby resizing the plot window would cause
-  secondary plot layers, e.g. from `plt_add()`, to become misaligned in 
+  secondary plot layers, e.g. from `plt_add()`, to become misaligned in
   faceted plots (#313). This also resolves a related alignment + layering issue
   specific to the Positron IDE
   ([positron#7316](https://github.com/posit-dev/positron/issues/7316)).
@@ -697,7 +739,7 @@ Theme fixes:
 
 - `"barplot"` / `type_barplot()` for bar plots. This closes out
   one of the last remaining canonical base plot types that we wanted to provide
-  a native `tinyplot` equivalent for. (#305 and #360 @zeileis and @grantmcdermott) 
+  a native `tinyplot` equivalent for. (#305 and #360 @zeileis and @grantmcdermott)
 - `"violin"` / `type_violin()` for violin plots. (#354 @grantmcdermott)
 
 #### Other new features
@@ -712,28 +754,30 @@ Theme fixes:
   - `xaxb`/`yaxb` control the manual break points of the axis tick marks. (#400 @grantmcdermott)
   - `xaxl`/`yaxl` apply a formatting function to change the appearance of the
     axis tick labels. (#363, #391 @grantmcdermott)
-    
-  These `x/yaxb` and `x/yaxl` arguments can be used in complementary fashion;
-  see the new (lower-level) `tinylabel` function documentation. For example:
+    These `x/yaxb` and `x/yaxl` arguments can be used in complementary fashion;
+    see the new (lower-level) `tinylabel` function documentation. For example:
   ```r
   tinyplot((0:10)/10, yaxb = c(.17, .33, .5, .67, .83), yaxl = "%")
   ```
 - The `x/ymin` and `x/ymax` arguments can now be specified directly via the
   `tinyplot.formula()` method thanks to better NSE processing. For example,
   instead of having to write
+
   ```r
   with(dat, tinyplot(x = x, y = y, by = by ymin = lwr, ymax = upr))
   ```
+
   users can now do
+
   ```r
   tinyplot(y ~ x | by, dat, ymin = lwr, ymax = upr)
   ```
-  
+
   Underneath the hood, this works by processing these NSE arguments as part of
   formula `model.frame()` and reference against the provided dataset. We plan to
   extend the same logic to other top-level formula arguments such as `weights`
   and `subset` in a future version of tinyplot.
-  
+
 ### Bug fixes:
 
 - The `tinyplot(..., cex = <cex>)` argument should be respected when using
@@ -841,32 +885,31 @@ _(Primary PR and author: #222 @vincentarelbundock)_
 
 #### Support for additional plot types
 
-  - Visualizations:
-  
-    - `type_spineplot()` (shortcut: `"spineplot"`) spine plots and
+- Visualizations:
+
+  - `type_spineplot()` (shortcut: `"spineplot"`) spine plots and
     spinograms. These are modified versions of a histogram or mosaic plot,
     and are particularly useful for visualizing factor variables. (#233
     @zeileis with contributions from @grantmcdermott)
-    - `type_qq()` (shortcut: "qq") for quantile-quantile plots. (#251
+  - `type_qq()` (shortcut: "qq") for quantile-quantile plots. (#251
     @vincentarelbundock)
-    - `type_ridge()` (shortcut: `"ridge"`) for ridge plots aka Joy plots.
+  - `type_ridge()` (shortcut: `"ridge"`) for ridge plots aka Joy plots.
     (#252 @vincentarelbundock, @zeileis, and @grantmcdermott)
-    - `type_rug()` (shortcut: `"rug"`) adds a rug to an existing plot. (#276
+  - `type_rug()` (shortcut: `"rug"`) adds a rug to an existing plot. (#276
     @grantmcdermott)
-    - `type_text()` (shortcut: `"text"`) adds text annotations. (@vincentarelbundock)
-    
-  - Models:
-    - `type_glm()` (shortcut: `"glm"`) (@vincentarelbundock)
-    - `type_lm()` (shortcut: `"lm"`) (@vincentarelbundock)
-    - `type_loess()` (shortcut: `"loess"`) (@vincentarelbundock)
-    - `type_spline()` (shortcut: `"spline"`) (#241 @grantmcdermott)
-    
-  - Functions:
-    - `type_abline()`: line(s) with intercept and slope (#249 @vincentarelbundock)
-    - `type_hline()`: horizontal line(s) (#249 @vincentarelbundock)
-    - `type_vline()`: vertical line(s) (#249 @vincentarelbundock)
-    - `type_function()`: arbitrary function. (#250 @vincentarelbundock)
-    - `type_summary()`: summarize values of `y` along unique values of `x` (#274
+  - `type_text()` (shortcut: `"text"`) adds text annotations. (@vincentarelbundock)
+
+- Models:
+  - `type_glm()` (shortcut: `"glm"`) (@vincentarelbundock)
+  - `type_lm()` (shortcut: `"lm"`) (@vincentarelbundock)
+  - `type_loess()` (shortcut: `"loess"`) (@vincentarelbundock)
+  - `type_spline()` (shortcut: `"spline"`) (#241 @grantmcdermott)
+- Functions:
+  - `type_abline()`: line(s) with intercept and slope (#249 @vincentarelbundock)
+  - `type_hline()`: horizontal line(s) (#249 @vincentarelbundock)
+  - `type_vline()`: vertical line(s) (#249 @vincentarelbundock)
+  - `type_function()`: arbitrary function. (#250 @vincentarelbundock)
+  - `type_summary()`: summarize values of `y` along unique values of `x` (#274
     @grantmcdermott)
 
 #### Themes
@@ -891,32 +934,30 @@ _(Primary PR and authors: #258 @vincentarelbundock and @grantmcdermott)_
 #### Other new features
 
 - New `tinyplot()` arguments:
-  -  `flip <logical>` allows for easily flipping (swapping) the orientation
-  of the x and y axes. This should work regardless of plot type, e.g.
-  `tinyplot(~Sepal.Length | Species, data = iris, type = "density", flip = TRUE)`.
-  (#216 @grantmcdermott)
+  - `flip <logical>` allows for easily flipping (swapping) the orientation
+    of the x and y axes. This should work regardless of plot type, e.g.
+    `tinyplot(~Sepal.Length | Species, data = iris, type = "density", flip = TRUE)`.
+    (#216 @grantmcdermott)
   - `draw = <draw_funcs>` allows users to pass arbitrary drawing functions that
-  are evaluated as-is, before the main plotting elements. A core use case is
-  drawing common annotations across every facet of a faceted plot, e.g. text or
-  threshold lines. (#245 @grantmcdermott)
+    are evaluated as-is, before the main plotting elements. A core use case is
+    drawing common annotations across every facet of a faceted plot, e.g. text or
+    threshold lines. (#245 @grantmcdermott)
   - `facet.args` gains a `free = <logical>` sub-argument for independently
-  scaling the axes limits of individual facets. (#253 @grantmcdermott)
-  
+    scaling the axes limits of individual facets. (#253 @grantmcdermott)
 - `tpar()` gains additional `grid.col`, `grid.lty`, and `grid.lwd` arguments for
   fine-grained control over the appearance of the default panel grid when
   `tinyplot(..., grid = TRUE)` is called. (#237 @grantmcdermott)
-  
 - The new `tinyplot_add()` (alias: `plt_add()`) convenience function allows
-easy layering of plots without having to specify repeat arguments. (#246
-@vincentarelbundock)
+  easy layering of plots without having to specify repeat arguments. (#246
+  @vincentarelbundock)
 
 ### Breaking changes
 
 - There are a few breaking changes to grouped density plots.
   - The joint smoothing bandwidth is now computed using an observation-weighted
-    mean (as opposed to a simple mean). Users can customize this joint bandwidth 
+    mean (as opposed to a simple mean). Users can customize this joint bandwidth
     by invoking the new `type_density(joint.bw = <option>)` argument. See the
-    function documentation for details.  (#291 @grantmcdermott and @zeileis)
+    function documentation for details. (#291 @grantmcdermott and @zeileis)
   - Grouped and/or faceted plots are no longer possible on density objects
     (i.e., via the `tinyplot.density()` method). Instead, please rather call
     `tinyplot(..., type = "density")` or `tinyplot(..., type = type_density())`
@@ -926,39 +967,39 @@ easy layering of plots without having to specify repeat arguments. (#246
   `alpha` argument in `type_ribbon()` (and equivalents) instead: e.g.,
   `tinyplot(..., type = type_ribbon(alpha = 0.5))`.
   - Aside: Please note that this is _not_ equivalent to using
-  `tinyplot(..., type = "ribbon", alpha = 0.5)` because the latter matches the
-  top-level `alpha` argument of `tinyplot()` itself (and thus modifies the
-  entire `palette`, rather than just the ribbon). See our warning about passing
-  ancillary type-specific arguments above.
+    `tinyplot(..., type = "ribbon", alpha = 0.5)` because the latter matches the
+    top-level `alpha` argument of `tinyplot()` itself (and thus modifies the
+    entire `palette`, rather than just the ribbon). See our warning about passing
+    ancillary type-specific arguments above.
 
 ### Bug fixes
 
 - Better preserve facet attributes, thus avoiding misarrangement of facet grids
-for density and histogram types. (#209 @zeileis)
+  for density and histogram types. (#209 @zeileis)
 - Plots of the form `plt(numeric ~ character)` now work correctly, with the
-character variable automatically being coerced to a factor. (#219 @zeileis)
+  character variable automatically being coerced to a factor. (#219 @zeileis)
 - Respect `xlim` and `ylim` when explicitly supplied by the user. (Thanks to
-@mclements for code submission #221)
+  @mclements for code submission #221)
 - Axis titles for flipped (horizontal) boxplots are appropriately swapped too.
-(#223 @grantmcdermott)
+  (#223 @grantmcdermott)
 - Ribbon plots without `ymin` or `ymax` args, now inherit these values from `y`
-(#224 @grantmcdermott)
+  (#224 @grantmcdermott)
 - Plots where `y` is a factor now work automatically, dispatching to the new
-`type_spineplot()` type. Thanks to @zeileis for the original suggestion all the
-way back in #2 and the eventual solution in #233.
+  `type_spineplot()` type. Thanks to @zeileis for the original suggestion all the
+  way back in #2 and the eventual solution in #233.
 - Free axis scaling now works properly for faceted histograms. The new
-`type_histogram(free.breaks = <logical>, drop.zeros = <logical>)` arguments
-enable fine-grained control over this behaviour. (#228 @eleuven and
-@grantmcdermott)
+  `type_histogram(free.breaks = <logical>, drop.zeros = <logical>)` arguments
+  enable fine-grained control over this behaviour. (#228 @eleuven and
+  @grantmcdermott)
 
 ### Misc
 
 - Continued modularization/abstraction of the code logic. (#214
-@vincentarelbundock)
+  @vincentarelbundock)
 - Major internal refactor of the type drawing and data processing. (#222
-@vincentarelbundock)
+  @vincentarelbundock)
 - Documentation improvements, e.g. explicit guidance on how to specify multiple
-grouping variables (thanks to @strengejacke for reporting #213).
+  grouping variables (thanks to @strengejacke for reporting #213).
   - The new functional type processing system also means that each type now
     has its own help page (e.g. `?type_hist`, `type_ridge`, etc.)
 
@@ -967,9 +1008,10 @@ grouping variables (thanks to @strengejacke for reporting #213).
 New Features:
 
 - The `axes` argument of `tinyplot()`/`plt()` gains extra options for
-fine-grained control of the plot axes. In addition to the existing logical
-(`TRUE`/`FALSE`) option, users can now specify one of the following character
-keywords (or, just their first letters as a convenient shorthand):
+  fine-grained control of the plot axes. In addition to the existing logical
+  (`TRUE`/`FALSE`) option, users can now specify one of the following character
+  keywords (or, just their first letters as a convenient shorthand):
+
   - `"standard"` (with axis, ticks, and labels; equivalent to `TRUE`),
   - `"none"` (no axes; equivalent to `FALSE`),
   - `"ticks"` (only ticks and labels without axis line),
@@ -977,39 +1019,40 @@ keywords (or, just their first letters as a convenient shorthand):
   - `"axis"` (only axis line and labels but no ticks).
 
   Simultaneously, the main plotting functions also gain the `xaxt` and `yaxt`
-for _separately_ controlling the two axes using the same keyword options. For
-example, `plt(0:10, xaxt = "l", yaxt = "t")` will yield a plot where the x-axis
-only contains labels and the y-axis contains both labels and ticks, but no axis
-line. (#190 @zeileis)
+  for _separately_ controlling the two axes using the same keyword options. For
+  example, `plt(0:10, xaxt = "l", yaxt = "t")` will yield a plot where the x-axis
+  only contains labels and the y-axis contains both labels and ticks, but no axis
+  line. (#190 @zeileis)
+
 - Support additional boxplot arguments like `varwidth`, `notch`, etc. Note
-that `tinyplot(..., type = "boxplot", boxwidth = <num>)` is equivalent to the
-`boxplot(..., width = <num>)`; we just use the "box(width)" prefix to avoid 
-conflicting with the existing `tinyplot(..., width)` argument.
-(#196 @grantmcdermott)
+  that `tinyplot(..., type = "boxplot", boxwidth = <num>)` is equivalent to the
+  `boxplot(..., width = <num>)`; we just use the "box(width)" prefix to avoid
+  conflicting with the existing `tinyplot(..., width)` argument.
+  (#196 @grantmcdermott)
 
 Bug fixes:
 
 - Fix duplicate plots produced with `type = "density"`, which was a regression
-accidentally introduced in v0.2.0 (#187 @grantmcdermott)
+  accidentally introduced in v0.2.0 (#187 @grantmcdermott)
 - Ensure correct boxplot positioning if `x` == `by`, or these two are
-functionally identical. (#196 @grantmcdermott)
+  functionally identical. (#196 @grantmcdermott)
 - `xlab` and `ylab` arguments not respected in some plots. Thanks to @lbelzile
-for reporting Issue #203.
+  for reporting Issue #203.
 - Avoid triggering an inadvertent legend when a function transformation of x is
-plotted against x itself, `tinyplot(log(x) ~ x)`. (#197 @zeileis)
+  plotted against x itself, `tinyplot(log(x) ~ x)`. (#197 @zeileis)
 - Facets with interactions and/or multivariate formulas (e.g., complex grid
-arrangements like `tinyplot(mpg ~ wt, data = mtcars, facet = am + vs ~ gear)`)
-now plot all panels correctly, even if some combinations are missing. (#197
-@grantmcdermott)
+  arrangements like `tinyplot(mpg ~ wt, data = mtcars, facet = am + vs ~ gear)`)
+  now plot all panels correctly, even if some combinations are missing. (#197
+  @grantmcdermott)
 - Fix alignment of facet titles when axes are logged. (#207 @grantmcdermott)
-- Consistent decimals for gradient legends (#277 @grantmcdermott) 
+- Consistent decimals for gradient legends (#277 @grantmcdermott)
 
 Internals:
 
 - Continued modularization of the main code logic. (#192 & #198
-@vincentarelbundock)
+  @vincentarelbundock)
 - Revamped formula processing that allows for better sanity checking and
-edge-case logic. (#197 @zeileis)
+  edge-case logic. (#197 @zeileis)
 
 ## v0.2.0
 
@@ -1017,12 +1060,12 @@ New features:
 
 - Support for additional plot types:
   - `type = "n"`, i.e. empty plot. Since `type = "n"` implicitly assumes points,
-  which limits the type of legend that can be drawn alongside the empty plot, we
-  have also added a companion `empty` argument that can be used alongside any
-  plot type. (#157, #167 @grantmcdermott)
+    which limits the type of legend that can be drawn alongside the empty plot, we
+    have also added a companion `empty` argument that can be used alongside any
+    plot type. (#157, #167 @grantmcdermott)
   - `type = "boxplot"`. Simultaneously enables `plt(numeric ~ factor)`
-  support, first raised in #2, so that a boxplot is automatically plotted if a
-  numeric is plotted against a factor. (#154 @grantmcdermott)
+    support, first raised in #2, so that a boxplot is automatically plotted if a
+    numeric is plotted against a factor. (#154 @grantmcdermott)
   - `type = "polypath"`. (#159 @grantmcdermott)
   - `type = "rect"`. (#161 @grantmcdermott)
   - `type = "segments"`. (#163 @grantmcdermott)
@@ -1032,8 +1075,8 @@ New features:
 Internals:
 
 - The main codebase has been significantly refactored (modularized), which
-should simplify future maintenance and enable better user-level error messages
-(#171, #173 @vincentarelbundock)
+  should simplify future maintenance and enable better user-level error messages
+  (#171, #173 @vincentarelbundock)
 
 Misc:
 
@@ -1051,89 +1094,86 @@ License:
 Breaking changes:
 
 - To ensure consistent "dot.case" style for all `tinyplot()` function arguments,
-the following two arguments have been renamed (`old` => `new`):
+  the following two arguments have been renamed (`old` => `new`):
   - `par_restore` => `restore.par` (note the change in word order too!)
   - `ribbon_alpha` => `ribbon.alpha`
-  
-  We don't believe that these two arguments are much used in practice. So
-  hopefully it will only have a negligible effect on existing `tinyplot` code in
-  the wild, even though it is a breaking change. (#149 @grantmcdermott)
+    We don't believe that these two arguments are much used in practice. So
+    hopefully it will only have a negligible effect on existing `tinyplot` code in
+    the wild, even though it is a breaking change. (#149 @grantmcdermott)
 
 New features:
 
 - Gradient legends are now supported if a continuous variable is passed to
-`by`. Thanks to @zeileis for detailed feedback and advice around the default
-palette choice (a restricted version of the "viridis" palette), as well as
-StackOverflow user mnel, whose answer
-[here](https://stackoverflow.com/a/13355440) provided the inspiration for the
-final implementation. (#122 @grantmcdermott)
+  `by`. Thanks to @zeileis for detailed feedback and advice around the default
+  palette choice (a restricted version of the "viridis" palette), as well as
+  StackOverflow user mnel, whose answer
+  [here](https://stackoverflow.com/a/13355440) provided the inspiration for the
+  final implementation. (#122 @grantmcdermott)
 - Ordered factors now inherit a discrete sequential color palette ("viridis") by
-default. Thanks to @zeileis for the suggestion. (#130 @grantmcdermott)
+  default. Thanks to @zeileis for the suggestion. (#130 @grantmcdermott)
 - Support user-supplied polygons. (#127 @grantmcdermott)
 - Support for the `lwd` argument for adjusting line widths. Similar to `pch`,
-`lty`, etc. this arguments also accepts a "by" convenience keyword to
-automatically vary line widths by group. (#134 @grantmcdermott)
+  `lty`, etc. this arguments also accepts a "by" convenience keyword to
+  automatically vary line widths by group. (#134 @grantmcdermott)
 - `tpar()` now accepts standard `par()` arguments in addition to the
-`tinyplot`-specific ones. This allows users to set or query graphical parameters
-via a single convenience function, instead having to invoke `tpar` and `par`
-separately. (#140 @grantmcdermott)
+  `tinyplot`-specific ones. This allows users to set or query graphical parameters
+  via a single convenience function, instead having to invoke `tpar` and `par`
+  separately. (#140 @grantmcdermott)
   - As an aside, `tpar()` has gained some additional parameters for fine-grained
-  control of global plot defaults, including `grid`, `ribbon.alpha`, and various
-  `file.*` parameters (see next bullet point).
+    control of global plot defaults, including `grid`, `ribbon.alpha`, and various
+    `file.*` parameters (see next bullet point).
 - Users can write plots directly to disk using the new `file` argument,
-alongside corresponding `width` and `height` arguments for output customization
-(both of which are defined in inches). For example,
-`tinyplot(..., file = "~/myplot.png", width = 8, height = 5)`. This
-implementation relies on a simple internal wrapper around the traditional R
-external graphics devices like `png()`, `pdf()`, etc. But it may prove more
-convenient, since the current global graphics parameters held in `(t)par()` are
-carried over to the external device too and don't need to be reset. Note that
-the appropriate device type is determined automatically by the file extension,
-which must be one of ".png", ".jpg" (".jpeg"), ".pdf", or ".svg".
-(#143 @grantmcdermott)
+  alongside corresponding `width` and `height` arguments for output customization
+  (both of which are defined in inches). For example,
+  `tinyplot(..., file = "~/myplot.png", width = 8, height = 5)`. This
+  implementation relies on a simple internal wrapper around the traditional R
+  external graphics devices like `png()`, `pdf()`, etc. But it may prove more
+  convenient, since the current global graphics parameters held in `(t)par()` are
+  carried over to the external device too and don't need to be reset. Note that
+  the appropriate device type is determined automatically by the file extension,
+  which must be one of ".png", ".jpg" (".jpeg"), ".pdf", or ".svg".
+  (#143 @grantmcdermott)
 - We have a shiny new `tinyplot` logo. (#148 @grantmcdermott)
 - The new `get_saved_par()` function can be used to retrieve the `par` settings
-from immediately before or immediately after the preceding `tinyplot` call.
-This function replaces some older (non-exported) internal functions that
-`tinyplot` was using to restore and control `par` environments. But it could
-also prove help to end users who are looking for additional ways to restore
-`par` settings after the fact. See `?get_saved_par` for some examples. (#152
-@grantmcdermott)
+  from immediately before or immediately after the preceding `tinyplot` call.
+  This function replaces some older (non-exported) internal functions that
+  `tinyplot` was using to restore and control `par` environments. But it could
+  also prove help to end users who are looking for additional ways to restore
+  `par` settings after the fact. See `?get_saved_par` for some examples. (#152
+  @grantmcdermott)
 - `tinyplot`/`plt` gains a new `alpha = <numeric[0,1]>` convenience argument for
-adding transparency to plot elements and colours. Example use:
-`plt(rnorm(1e3), pch = 19, alpha = 0.3)`. (#129 @grantmcdermott)
+  adding transparency to plot elements and colours. Example use:
+  `plt(rnorm(1e3), pch = 19, alpha = 0.3)`. (#129 @grantmcdermott)
 - Similar to the preceding news item, transparency can be added to (grouped)
-background fill by passing `bg` (or its alias, `fill`) a numeric in the range
-`[0,1]`. This feature has the same effect as `bg = "by"` except for the added
-transparency. Example use:
-`tinyplot(lat ~ long | depth, data = quakes, pch = 21, cex = 2, bg = 0.2)`. (#129
-@grantmcdermott)
-
+  background fill by passing `bg` (or its alias, `fill`) a numeric in the range
+  `[0,1]`. This feature has the same effect as `bg = "by"` except for the added
+  transparency. Example use:
+  `tinyplot(lat ~ long | depth, data = quakes, pch = 21, cex = 2, bg = 0.2)`. (#129
+  @grantmcdermott)
 
 Bug fixes:
 
 - Fixed bug that prevented `tpar(facet.x = ...)` args from being passed forward
-and set correctly. (#137 @grantmcdermott)
+  and set correctly. (#137 @grantmcdermott)
 - Fixed bug where custom legends weren't working with `type = "density"`. (#147
-@grantmcdermott)
+  @grantmcdermott)
 
 Internals:
 
 - We no longer ship the vignette(s) with the built package. This helps to reduce
-the size of the installation tarball and also avoids some redundancy with the
-actual help documentation (since many of the examples are the same). Note that
-the vignettes are all still rendered and available online at the `tinyplot`
-[website](https://grantmcdermott.com/tinyplot/).
-(#135 @grantmcdermott)
+  the size of the installation tarball and also avoids some redundancy with the
+  actual help documentation (since many of the examples are the same). Note that
+  the vignettes are all still rendered and available online at the `tinyplot`
+  [website](https://grantmcdermott.com/tinyplot/).
+  (#135 @grantmcdermott)
 - Similarly, we anticipate skipping tests on CRAN since the large suite of test
-snapshots (images) held in `inst/tinytest` is pushing the install tarball over
-CRAN's recommended 5 MB limit. Please note that local testing of the package
-requires adding the `NOT_CRAN=TRUE` environment variable to your .Renviron file
-(or, exporting it in your .bashrc/.zshrc/etc. dotfile if you prefer that
-approach). (#145 @vincentarelbundock & @grantmcdermott)
+  snapshots (images) held in `inst/tinytest` is pushing the install tarball over
+  CRAN's recommended 5 MB limit. Please note that local testing of the package
+  requires adding the `NOT_CRAN=TRUE` environment variable to your .Renviron file
+  (or, exporting it in your .bashrc/.zshrc/etc. dotfile if you prefer that
+  approach). (#145 @vincentarelbundock & @grantmcdermott)
 - Update some test snapshots to match slight changes in the way that R 4.4.0
-calculates `density` grid coords. (#150 @grantmcdermott)
-
+  calculates `density` grid coords. (#150 @grantmcdermott)
 
 ## v0.0.5
 
@@ -1178,8 +1218,7 @@ For more details about the rational underlying this renaming decision, please
 see the following GitHub comment, as well as the discussion that preceded it:
 https://github.com/grantmcdermott/plot2/issues/22#issuecomment-1928472754
 
-
-##  v0.0.4
+## v0.0.4
 
 Website:
 
@@ -1188,108 +1227,108 @@ We now have a dedicated website! (#80 @vincentarelbundock)
 New features:
 
 - Support for `cex` and `bg` (alias `fill`) arguments. The latter also permit
-the "by" convenience keyword similar to `lty` and `pch`. This is useful for
-plotting filled point characters (e.g., pch = 21), where you want a different
-colour for the fill and border. (#50, #75 @grantmcdermott)
+  the "by" convenience keyword similar to `lty` and `pch`. This is useful for
+  plotting filled point characters (e.g., pch = 21), where you want a different
+  colour for the fill and border. (#50, #75 @grantmcdermott)
 - Support for filled density plots. (#58 @grantmcdermott)
 - The new `add` argument allows new plot2 objects to be added to / on top of the
-existing plot window. (#60 @grantmcdermott)
+  existing plot window. (#60 @grantmcdermott)
 - Support for one-sided formulas, e.g. `plot2(~ Temp | Month, airquality)`. (#62
-@grantmcdermott and @zeileis)
+  @grantmcdermott and @zeileis)
 - Support for `plot2(x, type = "density")` as an alternative to
-`plot2(density(x))`. Works for both the atomic and one-sided formula methods.
-(#66 @grantmcdermott)
+  `plot2(density(x))`. Works for both the atomic and one-sided formula methods.
+  (#66 @grantmcdermott)
 - Support for "area" type plots as a special case of ribbon plots. (#68
-@grantmcdermott)
+  @grantmcdermott)
 - Partial matching for palette keywords. (#74 @grantmcdermott)
 - `plot2` gains a new `facet` argument for drawing faceted plots. Users can
-override the default square arrangement by passing the desired number of facet
-rows or columns to the companion `facet.args` helper function. Facets can be
-combined with `by` grouping, or used on their own.
-(#83, #91, #94, #96, #101, #103 @grantmcdermott)
+  override the default square arrangement by passing the desired number of facet
+  rows or columns to the companion `facet.args` helper function. Facets can be
+  combined with `by` grouping, or used on their own.
+  (#83, #91, #94, #96, #101, #103 @grantmcdermott)
 - Users can now control `plot2`-specific graphical parameters globally via
-the new `par2()` function (which is modeled on the base `par()` function). At
-the moment only a subset of global parameters, mostly related to legend and
-facet behaviour, are exposed in `par2`. But users can expect that more will be
-added in future releases. (#33, #94 @grantmcdermott)
+  the new `par2()` function (which is modeled on the base `par()` function). At
+  the moment only a subset of global parameters, mostly related to legend and
+  facet behaviour, are exposed in `par2`. But users can expect that more will be
+  added in future releases. (#33, #94 @grantmcdermott)
 
 Bug fixes:
 
 - Y-label correctly prints if a function was used for the atomic plot method,
-e.g. `plot2(rnorm(100))`. (#52 etiennebacher)
+  e.g. `plot2(rnorm(100))`. (#52 etiennebacher)
 - Ribbon plot types are now automatically ordered by the x variable. (#54
-@grantmcdermott)
+  @grantmcdermott)
 - Interval plots like ribbons, errorbars, and pointranges are now correctly
-plotted even if a y variable isn't specified. (#54 @grantmcdermott)
+  plotted even if a y variable isn't specified. (#54 @grantmcdermott)
 - Correctly label date-time axes. (#77 @grantmcdermott and @zeileis)
 - Improved consistency of legend and facet margins across different plot types
-and placement, via the new `lmar` and `fmar` arguments of `par2()`. The default
-legend margin is `par2(lmar = c(1,0, 0.1)`, which means that there is 1.0 line
-of padding between the legend and the plot region (inside margin) and 0.1 line 
-of padding between the legend and edge of the graphics device (outer margin).
-Similarly, the default facet padding is `par2(fmar = c(1,1,1,1)`, which means
-that there is a single line of padding around each side of the individual
-facets. Users can override these defaults by passing numeric vectors of the
-appropriate length to `par2()`. For example, `par2(lmar = c(0,0.1)` would shrink
-the inner gap between the legend and plot region to zero, but leave the small
-outer gap to outside of the graphics device unchanged. (#94 @grantmcdermott)
+  and placement, via the new `lmar` and `fmar` arguments of `par2()`. The default
+  legend margin is `par2(lmar = c(1,0, 0.1)`, which means that there is 1.0 line
+  of padding between the legend and the plot region (inside margin) and 0.1 line
+  of padding between the legend and edge of the graphics device (outer margin).
+  Similarly, the default facet padding is `par2(fmar = c(1,1,1,1)`, which means
+  that there is a single line of padding around each side of the individual
+  facets. Users can override these defaults by passing numeric vectors of the
+  appropriate length to `par2()`. For example, `par2(lmar = c(0,0.1)` would shrink
+  the inner gap between the legend and plot region to zero, but leave the small
+  outer gap to outside of the graphics device unchanged. (#94 @grantmcdermott)
 - Fix bug where grid wasn't auto-expanding correctly for area plots. (#92
-@grantmcdermott)
+  @grantmcdermott)
 
-##  v0.0.3
+## v0.0.3
 
 Breaking changes:
 
 - Colour palettes are now controlled via a single `palette` argument that
-unifies the old `palette` and (deprecated) `palette.args` arguments. In
-addition, the default palette for small groups has been changed from "Okabe-Ito"
-to "R4". (#31 and #32 @grantmcdermott)
+  unifies the old `palette` and (deprecated) `palette.args` arguments. In
+  addition, the default palette for small groups has been changed from "Okabe-Ito"
+  to "R4". (#31 and #32 @grantmcdermott)
 - Legends are now controlled via a single `legend` argument that unifies the
-previous (deprecated) `legend.position` and `legend.args` arguments.  This
-change also enables several enhancements over the old legend behaviour; see
-below. (#34 @grantmcdermott)
+  previous (deprecated) `legend.position` and `legend.args` arguments. This
+  change also enables several enhancements over the old legend behaviour; see
+  below. (#34 @grantmcdermott)
 
 New features:
 
 - Add support for the argument `log`. (#15 @etiennebacher)
 - Add support for grouped density plots. (#18 @grantmcdermott)
 - Add support for (both grouped and non-grouped) "c", "h", "s", and "S" types.
-(#26 @grantmcdermott)
+  (#26 @grantmcdermott)
 - Both the `pch` and `lty` arguments now accept a "by" convenience keyword for
-automatically adjusting plot characters and line types by groups. (#28
-@grantmcdermott)
+  automatically adjusting plot characters and line types by groups. (#28
+  @grantmcdermott)
 - Add outside ("!") placement support for remaining legend keywords, e.g.
-"top!", "left!", "topright!", etc. Users also gain finer control over many other
-aspects of the legend via the new unified `legend` argument, including changing
-labels, turning of the legend title, and so on. (#34 @grantmcdermott) 
+  "top!", "left!", "topright!", etc. Users also gain finer control over many other
+  aspects of the legend via the new unified `legend` argument, including changing
+  labels, turning of the legend title, and so on. (#34 @grantmcdermott)
 - Add support for `"pointrange"`, `"errobar"`, and `"ribbon"` plot types. (#35
-@vincentarelbundock, #40 and #46 @grantmcdermott)
+  @vincentarelbundock, #40 and #46 @grantmcdermott)
 - Support `grid = TRUE` as an alternative to `grid = grid()`. (#43
-@grantmcdermott)
+  @grantmcdermott)
 
 Bug fixes:
 
 - Setting `par(pch=X)` globally is now respected. (#20 @grantmcdermott)
 - Fix x-axis scale/index when y is NULL. (#24 @grantmcdermott)
 - Setting a global palette, e.g. `palette("ggplot2")` is now respected. (#44
-@grantmcdermott)
+  @grantmcdermott)
 
-##  v0.0.2
+## v0.0.2
 
 Breaking changes:
 
 - Legend defaults have been changed. The default position is now "right!" and
-drawn without a border, i.e. bty = "n" (#14 by @grantmcdermott).
+  drawn without a border, i.e. bty = "n" (#14 by @grantmcdermott).
 
 New features:
 
 - Allow users to specify different `pch`, `lty`, and `col` types per group (#5
-and #11 by @vincentarelbundock).
+  and #11 by @vincentarelbundock).
 
 Bug fixes:
 
 - Adding further elements to `plot2` now works (#13 by @grantmcdermott, thanks
-@karoliskoncevicius for reporting).
+  @karoliskoncevicius for reporting).
 
 Internals:
 
@@ -1299,8 +1338,8 @@ Internals:
 Project:
 
 - @vincentarelbundock and @zeileis have joined the project as core contributors.
-🎉
+  🎉
 
-##  v0.0.1
+## v0.0.1
 
-* Initial release on GitHub.
+- Initial release on GitHub.
diff --git a/R/align_layer.R b/R/align_layer.R
index 1ed43fb3..cc52d69d 100644
--- a/R/align_layer.R
+++ b/R/align_layer.R
@@ -36,10 +36,13 @@ align_layer = function(settings) {
       if (setequal(names(xlabs_layer), names(xlabs_orig))) {
         # If mappings already agree and no dodge, no realignment needed
         if (identical(xlabs_layer, xlabs_orig) && is.null(settings$dodge)) return(invisible())
-        orig_order = xlabs_orig[names(xlabs_layer)[settings$datapoints[["x"]]]]
         x_layer = settings$datapoints[["x"]]
         if (is.null(settings$dodge)) {
-          x_new = x_layer[orig_order] 
+          # Per-row lookup, not a permutation: the position each row's category
+          # occupies in the original layer. Indexing `x_layer` by it instead
+          # only coincided with the right answer when the layer's rows happened
+          # to arrive in ascending order. (#679)
+          x_new = unname(xlabs_orig[names(xlabs_layer)[x_layer]])
         } else {
           names(x_layer) = names(xlabs_layer)[round(x_layer)]
           x_new = x_layer + (xlabs_orig[names(round(x_layer))] - round(x_layer))
diff --git a/R/facet.R b/R/facet.R
index 247c277d..3f23a21d 100644
--- a/R/facet.R
+++ b/R/facet.R
@@ -459,7 +459,12 @@ draw_facet_window = function(
         if (.free_axes) {
           .ayf = args_y
           .ayf[[1L]] = yfree
-          if (isTRUE(flip) && type %in% c("barplot", "pointrange", "errorbar", "ribbon", "boxplot", "p", "violin") && !is.null(ylabs)) {
+          # Same signal as the fixed-scale branch above: named `ylabs` means the
+          # type put categories on the y-axis. Listing eligible types by name
+          # instead not only dropped the labels for unlisted types, it left the
+          # `labels` inherited from `args_y` without a matching `at`, which
+          # axis() rejects outright. (#679)
+          if (!is.null(ylabs)) {
             .ayf = modifyList(.ayf, list(at = ylabs, labels = names(ylabs)))
           } else if (!is.null(yat)) {
             .ayf = modifyList(.ayf, list(at = yat))
diff --git a/R/sanitize_xlevels.R b/R/sanitize_xlevels.R
new file mode 100644
index 00000000..0eb27f4a
--- /dev/null
+++ b/R/sanitize_xlevels.R
@@ -0,0 +1,41 @@
+## Reorder the levels of a categorical variable, per a type's `xlevels` (or
+## `ylevels`) argument. Shared by every type that exposes such an argument;
+## the accepted inputs are:
+##
+##   - 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.
+##
+## Site-specific follow-ups -- re-syncing `by` when it aliases the releveled
+## variable (spineplot, ridge), or converting the factor to integer positions
+## (points, lines, pointrange) -- remain at the call sites.
+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]
+  }
+  if (anyNA(xlevels) || !all(xlevels %in% levels(x))) {
+    warning(sprintf(
+      "not all '%s' correspond to levels of '%s'",
+      arg, substr(arg, 1, 1)
+    ))
+  }
+  factor(x, levels = xlevels)
+}
diff --git a/R/type_barplot.R b/R/type_barplot.R
index 8872cd0e..e4589734 100644
--- a/R/type_barplot.R
+++ b/R/type_barplot.R
@@ -21,7 +21,10 @@
 #'   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.
+#'   (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 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
@@ -171,11 +174,7 @@ data_barplot = function(width = 5/6, beside = FALSE, center = FALSE, offset = NU
           if (is.null(FUN)) FUN = function(x, ...) mean(x, ..., na.rm = TRUE)
         }
         if (!is.factor(datapoints$x)) datapoints$x = factor(datapoints$x)
-        if (!is.null(xlevels)) {
-          xlevels = if(is.numeric(xlevels)) levels(datapoints$x)[xlevels] else xlevels
-          if (anyNA(xlevels) || !all(xlevels %in% levels(datapoints$x))) warning("not all 'xlevels' correspond to levels of 'x'")
-          datapoints$x = factor(datapoints$x, levels = xlevels)
-        }
+        datapoints$x = sanitize_xlevels(datapoints$x, xlevels)
         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?#
diff --git a/R/type_errorbar.R b/R/type_errorbar.R
index 9c6fae60..45d67ee6 100644
--- a/R/type_errorbar.R
+++ b/R/type_errorbar.R
@@ -4,6 +4,17 @@
 #'
 #' @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.
 #' @examples
 #' tinytheme("basic")
 #' 
@@ -86,10 +97,10 @@
 #' tinytheme() # reset theme
 #'
 #' @export
-type_errorbar = function(length = 0.05, dodge = 0, fixed.dodge = FALSE) {
+type_errorbar = function(length = 0.05, dodge = 0, fixed.dodge = FALSE, xlevels = "asis") {
     out = list(
         draw = draw_errorbar(length = length),
-        data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge),
+        data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
         name = "p"
     )
     class(out) = "tinyplot_type"
diff --git a/R/type_lines.R b/R/type_lines.R
index 7caa91fa..b5f29032 100644
--- a/R/type_lines.R
+++ b/R/type_lines.R
@@ -4,11 +4,26 @@
 #' 
 #' @inheritParams graphics::plot.default
 #' @inheritParams dodge_positions
-#' 
+#' @inheritParams type_points
+#'
+#' @section Categorical axes:
+#'
+#' Like the other plot types, `type_lines()` places categorical (factor or
+#' 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.
+#' `factor(x, levels = unique(x))`.
+#'
+#' Note that the lines themselves are always drawn in the order that the rows
+#' arrive in, exactly as base [lines()] does. Categories whose level order
+#' differs from their row order will therefore produce a zig-zag, just as an
+#' unsorted numeric x-variable would.
+#'
 #' @examples
 #' # "l" type convenience character string
 #' tinyplot(circumference ~ age | Tree, data = Orange, type = "l")
-#' 
+#'
 #' # Use `type_lines()` to pass extra arguments for customization
 #' tinyplot(circumference ~ age | Tree, data = Orange, type = type_lines(type = "s"))
 #' 
@@ -33,10 +48,10 @@
 #' )
 #' 
 #' @export
-type_lines = function(type = "l", dodge = 0, fixed.dodge = FALSE) {
+type_lines = function(type = "l", dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
   out = list(
     draw = draw_lines(type = type),
-    data = data_lines(dodge = dodge, fixed.dodge = fixed.dodge),
+    data = data_lines(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
     name = type
   )
   class(out) = "tinyplot_type"
@@ -44,20 +59,31 @@ type_lines = function(type = "l", dodge = 0, fixed.dodge = FALSE) {
 }
 
 
-data_lines = function(dodge = 0, fixed.dodge = FALSE) {
+data_lines = function(dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
   fun = function(settings, ...) {
-    env2env(settings, environment(), c("datapoints", "xlabs"))
+    env2env(settings, environment(), "datapoints")
 
-    if (is.character(datapoints$x)) {
-      datapoints$x = as.factor(datapoints$x)
-    }
-    if (is.factor(datapoints$x)) {
-      # honour pre-ordered factors; otherwise fall back to first-appearance order
-      xlvls = if (is.ordered(datapoints$x)) levels(datapoints$x) else unique(datapoints$x)
-      datapoints$x = factor(datapoints$x, levels = xlvls)
+    # Categorical axes follow the factor levels, exactly as in data_points().
+    # (Character vectors have already been coerced by sanitize_datapoints().)
+    # Ordering by the levels rather than by first appearance means an explicit
+    # `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)
+    if (is.factor(datapoints[["x"]])) {
+      xlvls = levels(datapoints[["x"]])
       xlabs = seq_along(xlvls)
       names(xlabs) = xlvls
-      datapoints$x = as.integer(datapoints$x)
+      datapoints[["x"]] = as.integer(datapoints[["x"]])
+    } else {
+      xlabs = NULL
+    }
+    if (is.factor(datapoints[["y"]])) {
+      ylvls = levels(datapoints[["y"]])
+      ylabs = seq_along(ylvls)
+      names(ylabs) = ylvls
+      datapoints[["y"]] = as.integer(datapoints[["y"]])
+    } else {
+      ylabs = NULL
     }
 
     # dodge
@@ -65,10 +91,13 @@ data_lines = function(dodge = 0, fixed.dodge = FALSE) {
       datapoints = dodge_positions(datapoints, dodge, fixed.dodge)
     }
 
-    x = datapoints$x
+    x = datapoints[["x"]]
+    y = datapoints[["y"]]
     env2env(environment(), settings, c(
       "x",
+      "y",
       "xlabs",
+      "ylabs",
       "datapoints"
     ))
   }
diff --git a/R/type_pointrange.R b/R/type_pointrange.R
index 967020ac..9f8cddd8 100644
--- a/R/type_pointrange.R
+++ b/R/type_pointrange.R
@@ -1,9 +1,9 @@
 #' @rdname type_errorbar
 #' @export
-type_pointrange = function(dodge = 0, fixed.dodge = FALSE) {
+type_pointrange = function(dodge = 0, fixed.dodge = FALSE, xlevels = "asis") {
   out = list(
     draw = draw_pointrange(),
-    data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge),
+    data = data_pointrange(dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
     name = "p"
   )
   class(out) = "tinyplot_type"
@@ -47,17 +47,19 @@ draw_pointrange = function() {
 }
 
 
-data_pointrange = function(dodge, fixed.dodge) {
+data_pointrange = function(dodge, fixed.dodge, xlevels = "asis") {
   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
+    ## new sorting by factor), since these types are typically used for
+    ## coefficient plots where that order is intentional
+    datapoints$x = sanitize_xlevels(datapoints$x, xlevels)
     if (is.factor(datapoints$x)) {
-      ## original data (i.e., no new sorting by factor)
-      xlvls = unique(datapoints$x)
-      datapoints$x = factor(datapoints$x, levels = xlvls)
+      xlvls = levels(datapoints$x)
       xlabs = seq_along(xlvls)
       names(xlabs) = xlvls
       datapoints$x = as.integer(datapoints$x)
diff --git a/R/type_points.R b/R/type_points.R
index 16e66663..557b48cc 100644
--- a/R/type_points.R
+++ b/R/type_points.R
@@ -3,6 +3,15 @@
 #' @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).
 #' @inheritParams dodge_positions
 #'
 #' @examples
@@ -32,9 +41,9 @@
 #'   pch = 21, fill = 0.3)
 #'
 #' @export
-type_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE) {
+type_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
   out = list(
-    data = data_points(clim = clim, dodge = dodge, fixed.dodge = fixed.dodge),
+    data = data_points(clim = clim, dodge = dodge, fixed.dodge = fixed.dodge, xlevels = xlevels),
     draw = draw_points(),
     name = "p"
   )
@@ -42,7 +51,7 @@ type_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE) {
   return(out)
 }
 
-data_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE) {
+data_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL) {
   fun = function(settings, ...) {
     env2env(settings, environment(), "datapoints")
 
@@ -50,6 +59,7 @@ data_points = function(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE) {
     settings$clim = clim
 
     # catch for factors (we should still be able to "force" plot these with points)
+    datapoints$x = sanitize_xlevels(datapoints$x, xlevels)
     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 5a8b03c2..6274fbfd 100644
--- a/R/type_ridge.R
+++ b/R/type_ridge.R
@@ -28,7 +28,8 @@
 #' (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 levels of the y-variable should be plotted. The special keyword
+#' `"asis"` takes the categories in the order that they appear in the data.
 #' @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.
@@ -286,7 +287,7 @@ data_ridge = function(bw = "nrd0", adjust = 1, kernel = "gaussian", n = 512,
     ## reorder levels of y-variable if requested
     if (!is.null(ylevels)) {
       if (!is.factor(datapoints$y)) datapoints$y = factor(datapoints$y)
-      datapoints$y = factor(datapoints$y, levels = if(is.numeric(ylevels)) levels(datapoints$y)[ylevels] else ylevels)
+      datapoints$y = sanitize_xlevels(datapoints$y, ylevels, arg = "ylevels")
       if (y_by) datapoints$by = datapoints$y
     }
 
diff --git a/R/type_spineplot.R b/R/type_spineplot.R
index e940b72c..2d5500f8 100644
--- a/R/type_spineplot.R
+++ b/R/type_spineplot.R
@@ -6,7 +6,9 @@
 #'   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.
+#'   (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.
 #' @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
@@ -157,15 +159,11 @@ data_spineplot = function(off = NULL, breaks = NULL, xlevels = xlevels, ylevels
         
         x.categorical = is.factor(datapoints$x)
         if (!is.null(xlevels) && x.categorical) {
-          xlevels = if(is.numeric(xlevels)) levels(datapoints$x)[xlevels] else xlevels
-          if (anyNA(xlevels) || !all(xlevels %in% levels(datapoints$x))) warning("not all 'xlevels' correspond to levels of 'x'")
-          datapoints$x = factor(datapoints$x, levels = xlevels)
+          datapoints$x = sanitize_xlevels(datapoints$x, xlevels)
           if (x_by) datapoints$by = datapoints$x
         }
         if (!is.null(ylevels)) {
-          ylevels = if(is.numeric(ylevels)) levels(datapoints$y)[ylevels] else ylevels
-          if (anyNA(ylevels) || !all(ylevels %in% levels(datapoints$y))) warning("not all 'ylevels' correspond to levels of 'y'")
-          datapoints$y = factor(datapoints$y, levels = ylevels)
+          datapoints$y = sanitize_xlevels(datapoints$y, ylevels, arg = "ylevels")
           if (y_by) datapoints$by = datapoints$y
         }
         
diff --git a/altdoc/pkgdown.yml b/altdoc/pkgdown.yml
index 5bfba3e2..dc63ad1f 100644
--- a/altdoc/pkgdown.yml
+++ b/altdoc/pkgdown.yml
@@ -1,8 +1,8 @@
 altdoc: 0.7.3
-pandoc: '0'
+pandoc: 3.8.3
 pkgdown: 2.1.3
 pkgdown_sha: ~
-last_built: 2026-08-17T18:20:36+0000
+last_built: 2026-08-18T05:02:34+0000
 urls:
   reference: https://grantmcdermott.com/tinyplot/man
   article: https://grantmcdermott.com/tinyplot/vignettes
diff --git a/inst/tinytest/_tinysnapshot/facet_free_categorical_yaxis.svg b/inst/tinytest/_tinysnapshot/facet_free_categorical_yaxis.svg
new file mode 100644
index 00000000..e088df26
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/facet_free_categorical_yaxis.svg
@@ -0,0 +1,114 @@
+<?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='40.02px' lengthAdjust='spacingAndGlyphs'>runtime</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='30.02px' lengthAdjust='spacingAndGlyphs'>name</text>
+</g>
+<defs>
+  <clipPath id='cpNTkuMDR8MjUwLjU2fDU5LjA0fDQzMC41Ng=='>
+    <rect x='59.04' y='59.04' width='191.52' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpNTkuMDR8MjUwLjU2fDU5LjA0fDQzMC41Ng==)'>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='74.38' y1='430.56' x2='239.34' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='74.38' y1='430.56' x2='74.38' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='115.62' y1='430.56' x2='115.62' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='156.86' y1='430.56' x2='156.86' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='198.10' y1='430.56' x2='198.10' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='239.34' y1='430.56' x2='239.34' y2='437.76' style='stroke-width: 0.75;' />
+<text x='74.38' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>210</text>
+<text x='115.62' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>220</text>
+<text x='156.86' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>230</text>
+<text x='198.10' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>240</text>
+<text x='239.34' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>250</text>
+<line x1='59.04' y1='416.80' x2='59.04' y2='72.80' 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='244.80' x2='51.84' y2='244.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='72.80' x2='51.84' y2='72.80' 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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</text>
+<text transform='translate(41.76,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</text>
+<text transform='translate(41.76,72.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='36.02px' lengthAdjust='spacingAndGlyphs'>Return</text>
+<rect x='59.04' y='43.20' width='191.52' height='15.84' style='stroke-width: 0.75; stroke: none;' />
+<text x='154.80' y='55.25' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='49.36px' lengthAdjust='spacingAndGlyphs'>extended</text>
+<polygon points='59.04,430.56 250.56,430.56 250.56,59.04 59.04,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpMjgyLjI0fDQ3My43Nnw1OS4wNHw0MzAuNTY='>
+    <rect x='282.24' y='59.04' width='191.52' height='371.52' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMjgyLjI0fDQ3My43Nnw1OS4wNHw0MzAuNTY=)'>
+</g>
+<g clip-path='url(#cpMC4wMHw1MDQuMDB8MC4wMHw1MDQuMDA=)'>
+<line x1='304.75' y1='430.56' x2='458.96' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='304.75' y1='430.56' x2='304.75' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='343.30' y1='430.56' x2='343.30' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='381.86' y1='430.56' x2='381.86' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='420.41' y1='430.56' x2='420.41' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='458.96' y1='430.56' x2='458.96' y2='437.76' style='stroke-width: 0.75;' />
+<text x='304.75' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>180</text>
+<text x='343.30' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>185</text>
+<text x='381.86' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>190</text>
+<text x='420.41' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>195</text>
+<text x='458.96' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>200</text>
+<line x1='282.24' y1='416.80' x2='282.24' y2='72.80' style='stroke-width: 0.75;' />
+<line x1='282.24' y1='416.80' x2='275.04' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='282.24' y1='244.80' x2='275.04' y2='244.80' style='stroke-width: 0.75;' />
+<line x1='282.24' y1='72.80' x2='275.04' y2='72.80' style='stroke-width: 0.75;' />
+<text transform='translate(264.96,416.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</text>
+<text transform='translate(264.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</text>
+<text transform='translate(264.96,72.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='36.02px' lengthAdjust='spacingAndGlyphs'>Return</text>
+<rect x='282.24' y='43.20' width='191.52' height='15.84' style='stroke-width: 0.75; stroke: none;' />
+<text x='378.00' y='55.25' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='48.69px' lengthAdjust='spacingAndGlyphs'>theatrical</text>
+<polygon points='282.24,430.56 473.76,430.56 473.76,59.04 282.24,59.04 ' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpNTkuMDR8MjUwLjU2fDU5LjA0fDQzMC41Ng==)'>
+<line x1='68.57' y1='410.02' x2='125.56' y2='251.58' style='stroke-width: 0.75;' />
+<line x1='132.01' y1='238.82' x2='239.45' y2='78.78' style='stroke-width: 0.75;' />
+<circle cx='66.13' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='127.99' cy='244.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='243.47' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+</g>
+<g clip-path='url(#cpMjgyLjI0fDQ3My43Nnw1OS4wNHw0MzAuNTY=)'>
+<line x1='289.66' y1='409.61' x2='296.72' y2='251.99' style='stroke-width: 0.75;' />
+<line x1='302.10' y1='239.67' x2='461.61' y2='77.93' style='stroke-width: 0.75;' />
+<circle cx='289.33' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='297.04' cy='244.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='466.67' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+</g>
+<defs>
+  <clipPath id='cpMTAyLjI0fDQ1OS4zNnw4Ny44NHwzNzIuOTY='>
+    <rect x='102.24' y='87.84' width='357.12' height='285.12' />
+  </clipPath>
+</defs>
+<g clip-path='url(#cpMTAyLjI0fDQ1OS4zNnw4Ny44NHwzNzIuOTY=)'>
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/pointrange_xlevels_null.svg b/inst/tinytest/_tinysnapshot/pointrange_xlevels_null.svg
new file mode 100644
index 00000000..722f223f
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/pointrange_xlevels_null.svg
@@ -0,0 +1,69 @@
+<?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.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>
+<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='202.40' y1='430.56' x2='202.40' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='330.40' y1='430.56' x2='330.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='54.67px' lengthAdjust='spacingAndGlyphs'>(Intercept)</text>
+<text x='202.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='59.34px' lengthAdjust='spacingAndGlyphs'>factor(cyl)6</text>
+<text x='330.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='59.34px' lengthAdjust='spacingAndGlyphs'>factor(cyl)8</text>
+<text x='458.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='13.34px' lengthAdjust='spacingAndGlyphs'>hp</text>
+<line x1='59.04' y1='391.79' x2='59.04' y2='87.28' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='391.79' x2='51.84' y2='391.79' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='315.66' x2='51.84' y2='315.66' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='239.54' x2='51.84' y2='239.54' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='163.41' x2='51.84' y2='163.41' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='87.28' x2='51.84' y2='87.28' style='stroke-width: 0.75;' />
+<text transform='translate(41.76,391.79) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='17.34px' lengthAdjust='spacingAndGlyphs'>-10</text>
+<text transform='translate(41.76,315.66) 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,239.54) 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,163.41) 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,87.28) 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==)'>
+<line x1='74.40' y1='122.32' x2='74.40' y2='72.80' style='stroke-width: 0.75;' />
+<line x1='458.40' y1='316.09' x2='458.40' y2='315.60' style='stroke-width: 0.75;' />
+<line x1='202.40' y1='386.65' x2='202.40' y2='335.53' style='stroke-width: 0.75;' />
+<line x1='330.40' y1='416.80' x2='330.40' y2='344.26' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='97.56' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='315.84' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='202.40' cy='361.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='330.40' cy='380.53' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/tinyplot_add_layer_category_alignment.svg b/inst/tinytest/_tinysnapshot/tinyplot_add_layer_category_alignment.svg
new file mode 100644
index 00000000..2030f903
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/tinyplot_add_layer_category_alignment.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='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'>y</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'>a</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'>b</text>
+<text x='458.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='6.00px' lengthAdjust='spacingAndGlyphs'>c</text>
+<line x1='59.04' y1='416.80' x2='59.04' y2='72.80' 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='367.66' x2='51.84' y2='367.66' 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='269.37' x2='51.84' y2='269.37' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='220.23' x2='51.84' y2='220.23' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='171.09' x2='51.84' y2='171.09' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='121.94' x2='51.84' y2='121.94' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='72.80' x2='51.84' y2='72.80' 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='16.67px' lengthAdjust='spacingAndGlyphs'>0.5</text>
+<text transform='translate(41.76,367.66) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.0</text>
+<text transform='translate(41.76,318.51) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>1.5</text>
+<text transform='translate(41.76,269.37) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.0</text>
+<text transform='translate(41.76,220.23) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>2.5</text>
+<text transform='translate(41.76,171.09) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.0</text>
+<text transform='translate(41.76,121.94) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>3.5</text>
+<text transform='translate(41.76,72.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='16.67px' lengthAdjust='spacingAndGlyphs'>4.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>
+<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='74.40' cy='367.66' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='269.37' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='171.09' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='318.51' r='2.70' style='stroke-width: 0.75; stroke: none; fill: #FF0000;' />
+<circle cx='266.40' cy='220.23' r='2.70' style='stroke-width: 0.75; stroke: none; fill: #FF0000;' />
+<circle cx='458.40' cy='121.94' r='2.70' style='stroke-width: 0.75; stroke: none; fill: #FF0000;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/type_lines_categorical_lines.svg b/inst/tinytest/_tinysnapshot/type_lines_categorical_lines.svg
new file mode 100644
index 00000000..01cfe2ec
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_lines_categorical_lines.svg
@@ -0,0 +1,62 @@
+<?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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</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='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</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==)'>
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.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/type_lines_categorical_points.svg b/inst/tinytest/_tinysnapshot/type_lines_categorical_points.svg
new file mode 100644
index 00000000..01cfe2ec
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_lines_categorical_points.svg
@@ -0,0 +1,62 @@
+<?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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</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='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</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==)'>
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.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/type_lines_categorical_y.svg b/inst/tinytest/_tinysnapshot/type_lines_categorical_y.svg
new file mode 100644
index 00000000..6157d6e0
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_lines_categorical_y.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='40.02px' lengthAdjust='spacingAndGlyphs'>runtime</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='30.02px' lengthAdjust='spacingAndGlyphs'>name</text>
+<line x1='107.79' y1='430.56' x2='441.70' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='107.79' y1='430.56' x2='107.79' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='191.27' y1='430.56' x2='191.27' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='274.75' y1='430.56' x2='274.75' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='358.23' y1='430.56' x2='358.23' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='441.70' y1='430.56' x2='441.70' y2='437.76' style='stroke-width: 0.75;' />
+<text x='107.79' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>180</text>
+<text x='191.27' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>185</text>
+<text x='274.75' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>190</text>
+<text x='358.23' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>195</text>
+<text x='441.70' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>200</text>
+<line x1='59.04' y1='416.80' x2='59.04' y2='72.80' 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='244.80' x2='51.84' y2='244.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='72.80' x2='51.84' y2='72.80' 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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</text>
+<text transform='translate(41.76,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='36.02px' lengthAdjust='spacingAndGlyphs'>Return</text>
+<text transform='translate(41.76,72.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</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='74.75' y1='409.61' x2='90.75' y2='79.99' style='stroke-width: 0.75;' />
+<line x1='97.62' y1='75.85' x2='451.88' y2='241.75' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='91.10' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='244.80' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/type_lines_explicit_levels.svg b/inst/tinytest/_tinysnapshot/type_lines_explicit_levels.svg
new file mode 100644
index 00000000..af59da9d
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_lines_explicit_levels.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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</text>
+<text x='266.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='458.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='36.02px' lengthAdjust='spacingAndGlyphs'>Return</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='81.58' y1='416.24' x2='259.22' y2='402.40' style='stroke-width: 0.75;' />
+<line x1='270.03' y1='395.62' x2='454.77' y2='79.02' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='401.84' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/type_lines_flip_labels.svg b/inst/tinytest/_tinysnapshot/type_lines_flip_labels.svg
new file mode 100644
index 00000000..6157d6e0
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_lines_flip_labels.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='40.02px' lengthAdjust='spacingAndGlyphs'>runtime</text>
+<text transform='translate(12.96,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='30.02px' lengthAdjust='spacingAndGlyphs'>name</text>
+<line x1='107.79' y1='430.56' x2='441.70' y2='430.56' style='stroke-width: 0.75;' />
+<line x1='107.79' y1='430.56' x2='107.79' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='191.27' y1='430.56' x2='191.27' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='274.75' y1='430.56' x2='274.75' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='358.23' y1='430.56' x2='358.23' y2='437.76' style='stroke-width: 0.75;' />
+<line x1='441.70' y1='430.56' x2='441.70' y2='437.76' style='stroke-width: 0.75;' />
+<text x='107.79' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>180</text>
+<text x='191.27' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>185</text>
+<text x='274.75' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>190</text>
+<text x='358.23' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>195</text>
+<text x='441.70' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='20.02px' lengthAdjust='spacingAndGlyphs'>200</text>
+<line x1='59.04' y1='416.80' x2='59.04' y2='72.80' 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='244.80' x2='51.84' y2='244.80' style='stroke-width: 0.75;' />
+<line x1='59.04' y1='72.80' x2='51.84' y2='72.80' 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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</text>
+<text transform='translate(41.76,244.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='36.02px' lengthAdjust='spacingAndGlyphs'>Return</text>
+<text transform='translate(41.76,72.80) rotate(-90)' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</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='74.75' y1='409.61' x2='90.75' y2='79.99' style='stroke-width: 0.75;' />
+<line x1='97.62' y1='75.85' x2='451.88' y2='241.75' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='91.10' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='244.80' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/type_lines_layer_h_p.svg b/inst/tinytest/_tinysnapshot/type_lines_layer_h_p.svg
new file mode 100644
index 00000000..68d0f831
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_lines_layer_h_p.svg
@@ -0,0 +1,65 @@
+<?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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</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='63.14px' lengthAdjust='spacingAndGlyphs'>Two Towers</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='74.40' y1='3079.06' x2='74.40' y2='416.80' style='stroke-width: 0.75;' />
+<line x1='458.40' y1='3079.06' x2='458.40' y2='401.84' style='stroke-width: 0.75;' />
+<line x1='266.40' y1='3079.06' x2='266.40' y2='72.80' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.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/type_lines_xlevels_asis.svg b/inst/tinytest/_tinysnapshot/type_lines_xlevels_asis.svg
new file mode 100644
index 00000000..af59da9d
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_lines_xlevels_asis.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='56.70px' lengthAdjust='spacingAndGlyphs'>Fellowship</text>
+<text x='266.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='458.40' y='456.48' text-anchor='middle' style='font-size: 12.00px; font-family: "Liberation Sans";' textLength='36.02px' lengthAdjust='spacingAndGlyphs'>Return</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='81.58' y1='416.24' x2='259.22' y2='402.40' style='stroke-width: 0.75;' />
+<line x1='270.03' y1='395.62' x2='454.77' y2='79.02' style='stroke-width: 0.75;' />
+<circle cx='74.40' cy='416.80' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='266.40' cy='401.84' r='2.70' style='stroke-width: 0.75;' />
+<circle cx='458.40' cy='72.80' r='2.70' style='stroke-width: 0.75;' />
+</g>
+</g>
+</svg>
diff --git a/inst/tinytest/_tinysnapshot/type_points_xlevels_idx.svg b/inst/tinytest/_tinysnapshot/type_points_xlevels_idx.svg
new file mode 100644
index 00000000..2715e07c
--- /dev/null
+++ b/inst/tinytest/_tinysnapshot/type_points_xlevels_idx.svg
@@ -0,0 +1,62 @@
+<?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==)'>
+<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/test-facet.R b/inst/tinytest/test-facet.R
index fcc7b154..e3c5523f 100644
--- a/inst/tinytest/test-facet.R
+++ b/inst/tinytest/test-facet.R
@@ -644,6 +644,25 @@ f = function() {
 }
 expect_snapshot_plot(f, label = "facet_axes_outer_free")
 
+# Free facets with categories on the y-axis used to error out with
+# "'labels' is supplied and not 'at'": the eligible types were listed by name,
+# so anything else lost its tick positions but kept the labels. Levels are set
+# in data order here, so the snapshot does not depend on how a type orders its
+# categories. (#679)
+f = function() {
+  LOTR = data.frame(
+    name = rep(c("Fellowship", "Two Towers", "Return"), 2),
+    runtime = c(178, 179, 201, 208, 223, 251),
+    cut = rep(c("theatrical", "extended"), each = 3)
+  )
+  LOTR$name = factor(LOTR$name, levels = unique(LOTR$name))
+  tinyplot(
+    runtime ~ name, facet = ~cut, data = LOTR, type = "b",
+    flip = TRUE, facet.args = list(free = TRUE)
+  )
+}
+expect_snapshot_plot(f, label = "facet_free_categorical_yaxis")
+
 #
 # restore original par settings
 #
diff --git a/inst/tinytest/test-tinyplot_add.R b/inst/tinytest/test-tinyplot_add.R
index e2921243..e1e67e11 100644
--- a/inst/tinytest/test-tinyplot_add.R
+++ b/inst/tinytest/test-tinyplot_add.R
@@ -125,3 +125,20 @@ f = function() {
   tinyplot_add(subset = cyl == 4, col = "red", pch = 16)
 }
 expect_snapshot_plot(f, label = "tinyplot_add_subset")
+
+# Layer alignment follows the category each row belongs to, not the row's
+# position, which is what the two layers disagreed on: the added rows were
+# permuted rather than matched up by category. Both layers use the same type
+# here, and the disagreement comes from the levels each data frame declares,
+# so the test does not depend on how any given type orders its categories.
+# The red points should sit directly above the black ones. (#679)
+f = function() {
+  d1 = data.frame(g = factor(c("a", "b", "c")), y = c(1, 2, 3))
+  d2 = data.frame(
+    g = factor(c("a", "b", "c"), levels = c("c", "b", "a")),
+    y = c(1.5, 2.5, 3.5)
+  )
+  tinyplot(y ~ g, data = d1, type = "p", ylim = c(0.5, 4))
+  tinyplot_add(y ~ g, data = d2, type = "p", col = "red", pch = 16)
+}
+expect_snapshot_plot(f, label = "tinyplot_add_layer_category_alignment")
diff --git a/inst/tinytest/test-type_lines.R b/inst/tinytest/test-type_lines.R
new file mode 100644
index 00000000..ea8d8278
--- /dev/null
+++ b/inst/tinytest/test-type_lines.R
@@ -0,0 +1,53 @@
+source("helpers.R")
+using("tinysnapshot")
+
+# Issue #679: type_lines() should place categorical data on the axes the same
+# way type_points() does, i.e. following the factor levels (rather than the
+# order in which the categories happen to appear in the data).
+
+LOTR = data.frame(
+  name = c("Fellowship", "Two Towers", "Return"),
+  runtime = c(178, 179, 201)
+)
+
+# Level order, not appearance order, and identical for both types
+f = function() tinyplot(runtime ~ name, data = LOTR, type = type_points())
+expect_snapshot_plot(f, label = "type_lines_categorical_points")
+
+f = function() tinyplot(runtime ~ name, data = LOTR, type = type_lines(type = "p"))
+expect_snapshot_plot(f, label = "type_lines_categorical_lines")
+
+# An explicit level order is honoured
+LOTR2 = transform(
+  LOTR,
+  name = factor(name, levels = c("Fellowship", "Two Towers", "Return"))
+)
+f = function() tinyplot(runtime ~ name, data = LOTR2, type = "b")
+expect_snapshot_plot(f, label = "type_lines_explicit_levels")
+
+# Categorical labels survive on a flipped axis for non-"p" line types
+f = function() tinyplot(runtime ~ name, data = LOTR, type = "b", flip = TRUE)
+expect_snapshot_plot(f, label = "type_lines_flip_labels")
+
+# ... and on an unflipped categorical y-axis
+f = function() tinyplot(name ~ runtime, data = LOTR, type = "b")
+expect_snapshot_plot(f, label = "type_lines_categorical_y")
+
+# A line type layered onto a point type lands on the same categories
+f = function() {
+  tinyplot(runtime ~ name, data = LOTR, type = "h")
+  tinyplot_add(type = "p")
+}
+expect_snapshot_plot(f, label = "type_lines_layer_h_p")
+
+# xlevels: on-the-fly reordering of a categorical x variable (#679). The
+# "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")
+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")
+
diff --git a/inst/tinytest/test-type_pointrange.R b/inst/tinytest/test-type_pointrange.R
index 5ea61637..9715b3ea 100644
--- a/inst/tinytest/test-type_pointrange.R
+++ b/inst/tinytest/test-type_pointrange.R
@@ -71,3 +71,19 @@ fun = function() {
   tinyplot_add(type = "vline", lty = 2)
 }
 expect_snapshot_plot(fun, label = "pointrange_with_layers_flipped")
+
+# xlevels = NULL overrides the "asis" default, ordering the terms by their
+# factor levels (alphabetical here) instead of their row order (#679)
+fun = function() {
+    with(
+        coefs,
+        tinyplot(
+          x = x,
+          y = y,
+          ymin = ymin,
+          ymax = ymax,
+          type = type_pointrange(xlevels = NULL)
+        )
+      )
+}
+expect_snapshot_plot(fun, label = "pointrange_xlevels_null")
diff --git a/man/type_barplot.Rd b/man/type_barplot.Rd
index 41be212c..5e3b72ee 100644
--- a/man/type_barplot.Rd
+++ b/man/type_barplot.Rd
@@ -52,7 +52,10 @@ group of \code{x} in case of using a two-sided formula \code{y ~ x} (default: me
 
 \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.}
+(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{xaxlabels}{a character vector with the axis labels for the \code{x} variable,
 defaulting to the levels of \code{x}.}
diff --git a/man/type_errorbar.Rd b/man/type_errorbar.Rd
index 8d835d67..3d59cc6b 100644
--- a/man/type_errorbar.Rd
+++ b/man/type_errorbar.Rd
@@ -5,9 +5,9 @@
 \alias{type_pointrange}
 \title{Error bar and pointrange plot types}
 \usage{
-type_errorbar(length = 0.05, dodge = 0, fixed.dodge = FALSE)
+type_errorbar(length = 0.05, dodge = 0, fixed.dodge = FALSE, xlevels = "asis")
 
-type_pointrange(dodge = 0, fixed.dodge = FALSE)
+type_pointrange(dodge = 0, fixed.dodge = FALSE, xlevels = "asis")
 }
 \arguments{
 \item{length}{length of the edges of the arrow head (in inches).}
@@ -33,6 +33,18 @@ calculated independently for each \code{x} value, based only on the groups
 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.}
 }
 \description{
 Type function(s) for producing error bar and pointrange plots.
diff --git a/man/type_lines.Rd b/man/type_lines.Rd
index 3c5c741c..79acd24d 100644
--- a/man/type_lines.Rd
+++ b/man/type_lines.Rd
@@ -4,7 +4,7 @@
 \alias{type_lines}
 \title{Lines plot type}
 \usage{
-type_lines(type = "l", dodge = 0, fixed.dodge = FALSE)
+type_lines(type = "l", dodge = 0, fixed.dodge = FALSE, xlevels = NULL)
 }
 \arguments{
 \item{type}{1-character string giving the type of plot desired.  The
@@ -39,10 +39,36 @@ calculated independently for each \code{x} value, based only on the groups
 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).}
 }
 \description{
 Type function for plotting lines.
 }
+\section{Categorical axes}{
+
+
+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{factor(x, levels = unique(x))}.
+
+Note that the lines themselves are always drawn in the order that the rows
+arrive in, exactly as base \code{\link[=lines]{lines()}} does. Categories whose level order
+differs from their row order will therefore produce a zig-zag, just as an
+unsorted numeric x-variable would.
+}
+
 \examples{
 # "l" type convenience character string
 tinyplot(circumference ~ age | Tree, data = Orange, type = "l")
diff --git a/man/type_points.Rd b/man/type_points.Rd
index 4bd520ed..205c4cbb 100644
--- a/man/type_points.Rd
+++ b/man/type_points.Rd
@@ -4,7 +4,7 @@
 \alias{type_points}
 \title{Points plot type}
 \usage{
-type_points(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE)
+type_points(clim = c(0.5, 2.5), dodge = 0, fixed.dodge = FALSE, xlevels = NULL)
 }
 \arguments{
 \item{clim}{Numeric giving the lower and upper limits of the character
@@ -31,6 +31,16 @@ calculated independently for each \code{x} value, based only on the groups
 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).}
 }
 \description{
 Type function for plotting points, i.e. a scatter plot.
diff --git a/man/type_ridge.Rd b/man/type_ridge.Rd
index 99b05e44..bd059b38 100644
--- a/man/type_ridge.Rd
+++ b/man/type_ridge.Rd
@@ -47,7 +47,8 @@ at the specified \code{probs}. The quantiles are computed based on the density
 \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 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{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 041b56d6..9540520d 100644
--- a/man/type_spineplot.Rd
+++ b/man/type_spineplot.Rd
@@ -31,7 +31,9 @@ type_spineplot(
 
 \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.}
+(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{col}{a vector of fill colors of the same length as \code{levels(y)}.
     The default is to call \code{\link{gray.colors}}.}