diff --git a/inst/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdo.woff b/inst/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdo.woff index b4673fabc..7ad023c27 100644 Binary files a/inst/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdo.woff and b/inst/fonts/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vwlxdo.woff differ diff --git a/inst/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTsoprSg.woff b/inst/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTsoprSg.woff index 1beb305a4..8a5c82f75 100644 Binary files a/inst/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTsoprSg.woff and b/inst/fonts/HI_jiYsKILxRpg3hIP6sJ7fM7PqlOPHYvDP_W9O7GQTTsoprSg.woff differ diff --git a/inst/fonts/KFOmCnqEu92Fr1Mu4mxM.woff b/inst/fonts/KFOmCnqEu92Fr1Mu4mxM.woff index 9eaa94f9b..76ee218c7 100644 Binary files a/inst/fonts/KFOmCnqEu92Fr1Mu4mxM.woff and b/inst/fonts/KFOmCnqEu92Fr1Mu4mxM.woff differ diff --git a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff index a93f73ba1..e80e5b951 100644 Binary files a/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff and b/inst/fonts/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0RkyFjaVQ.woff differ diff --git a/tools/download_preset_fonts.R b/tools/download_preset_fonts.R index a67863240..0a66b38b3 100644 --- a/tools/download_preset_fonts.R +++ b/tools/download_preset_fonts.R @@ -38,6 +38,14 @@ download_and_copy_fonts <- function(theme, rule_file = "_bootswatch.scss") { urls <- sass:::extract_group(css, "url\\(([^)]+)") basenames <- basename(urls) Map(function(url, nm) { + if (!grepl("[.]woff$", nm)) { + # Google Fonts recently started using query parameters + # fonts.gstatic.com/l/font?kit={id}&skey={...}... + stopifnot(grepl("?kit=", url, fixed = TRUE)) + nm <- strsplit(url, "?", fixed = TRUE)[[1]][2] + nm <- paste0(shiny::parseQueryString(nm)$kit, ".woff") + } + target <- file.path(fonts_home, nm) # The basename can sometimes be very long, and R CMD check # will complain if the target file is over 100 characters long,