more robust strategy for grabbing subplot objects from schema, fixes #1156

Author: cpsievert

NEWS.md

@@ -9,6 +9,7 @@
 
 ## BUG FIXES
 
+Fixed algorithm for coercing the proposed layout to the plot schema (see #1156).
 
 # 4.7.1
 

R/utils.R

@@ -369,7 +369,7 @@ verify_attr_spec <- function(p) {
 
 verify_attr <- function(proposed, schema) {
   for (attr in names(proposed)) {
-    attrSchema <- schema[[sub("[2-9]+$", "", attr)]]
+    attrSchema <- schema[[attr]] %||% schema[[sub("[0-9]+$", "", attr)]]
     # if schema is missing (i.e., this is an un-official attr), move along
     if (is.null(attrSchema)) next