Skip to content

Commit

Permalink
Merge pull request #109 from rstudio/update-fa-6-4-0
Browse files Browse the repository at this point in the history
Update to FontAwesome 6.4.0
  • Loading branch information
rich-iannone authored Apr 18, 2023
2 parents caf44a0 + b695e24 commit ac0db95
Show file tree
Hide file tree
Showing 16 changed files with 346 additions and 347 deletions.
2 changes: 1 addition & 1 deletion R/fa_version.R
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Generated by fontawesome-update.R: do not edit by hand

fa_version <- "6.3.0"
fa_version <- "6.4.0"
Binary file modified R/sysdata.rda
Binary file not shown.
650 changes: 325 additions & 325 deletions data-raw/fa_tbl.csv

Large diffs are not rendered by default.

33 changes: 16 additions & 17 deletions data-raw/fontawesome-update.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ library(purrr)
library(tibble)
library(withr)

version_tag <- "6.3.0"
version_tag <- "6.4.0"

base_url <- file.path(
"https://raw.githubusercontent.com/FortAwesome/Font-Awesome", version_tag
)
base_url <-
file.path(
"https://raw.githubusercontent.com/FortAwesome/Font-Awesome", version_tag
)

# FA4 -> FA6 shims
shims <- yaml::read_yaml(file.path(base_url, "metadata/shims.yml"))
Expand Down Expand Up @@ -73,8 +74,7 @@ for (ico in names(icons)) {
}
}

# Generate the `font_awesome_brands` vector for faster retrieval
# in `fa_i()`
# Generate the `font_awesome_brands` vector for faster retrieval in `fa_i()`
font_awesome_brands <- unique(fa_tbl$name[grepl("fab ", fa_tbl$full_name)])

# ==============================================================================
Expand Down Expand Up @@ -117,8 +117,7 @@ expect_col_vals_regex(
regex = "^fa[brs] fa-[a-z0-9-]*?$"
)

# Expect that the prefix of `full_name` corresponds to the
# `style` value
# Expect that the prefix of `full_name` corresponds to the `style` value
expect_col_vals_expr(fa_tbl, ~ case_when(
style == "regular" ~ grepl("^far", full_name),
style == "solid" ~ grepl("^fas", full_name),
Expand Down Expand Up @@ -163,8 +162,7 @@ expect_col_is_integer(fa_tbl, vars(min_x, min_y, width, height))
# Save the icon and alias info to disk
# ==============================================================================

# Write the `fa_tbl` and `alias_tbl` tables to internal
# data ('R/sysdata.rda')
# Write the `fa_tbl` and `alias_tbl` tables to internal data ('R/sysdata.rda')
usethis::use_data(
fa_tbl,
alias_tbl,
Expand Down Expand Up @@ -239,13 +237,14 @@ copy_files <- function(srcdir, destdir, filenames) {
}
}

filenames <- c(
"css/all.css",
"css/all.min.css",
"css/v4-shims.css",
"css/v4-shims.min.css",
file.path("webfonts", dir(file.path(source_dir, "webfonts")))
)
filenames <-
c(
"css/all.css",
"css/all.min.css",
"css/v4-shims.css",
"css/v4-shims.min.css",
file.path("webfonts", dir(file.path(source_dir, "webfonts")))
)

# Copy the complete set of CSS and font files to `inst/fontawesome`
copy_files(source_dir, dest_dir, filenames)
Expand Down
2 changes: 1 addition & 1 deletion inst/fontawesome/css/all.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc.
*/
Expand Down
2 changes: 1 addition & 1 deletion inst/fontawesome/css/all.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/fontawesome/css/v4-shims.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome Free 6.3.0 by @fontawesome - https://fontawesome.com
* Font Awesome Free 6.4.0 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
* Copyright 2023 Fonticons, Inc.
*/
Expand Down
2 changes: 1 addition & 1 deletion inst/fontawesome/css/v4-shims.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified inst/fontawesome/webfonts/fa-brands-400.ttf
Binary file not shown.
Binary file modified inst/fontawesome/webfonts/fa-brands-400.woff2
Binary file not shown.
Binary file modified inst/fontawesome/webfonts/fa-regular-400.ttf
Binary file not shown.
Binary file modified inst/fontawesome/webfonts/fa-regular-400.woff2
Binary file not shown.
Binary file modified inst/fontawesome/webfonts/fa-solid-900.ttf
Binary file not shown.
Binary file modified inst/fontawesome/webfonts/fa-solid-900.woff2
Binary file not shown.
Binary file modified inst/fontawesome/webfonts/fa-v4compatibility.ttf
Binary file not shown.
Binary file modified inst/fontawesome/webfonts/fa-v4compatibility.woff2
Binary file not shown.

0 comments on commit ac0db95

Please sign in to comment.