Merge remote-tracking branch 'upstream/main' into split/08-parley-text

# Conflicts:
#	core/src/render/primitive.rs

core/src/render/primitive.rs

@@ -93,7 +93,6 @@ macro_rules! primitives {
             }
         )*
     };
-    // Preserve the whitespace-separated token shape across recursion.
     (@count $t1:tt $($t:tt)+) => { 1 + primitives!(@count $($t)+) };
     (@count $t:tt) => { 1 };
 }