chore: i think it's ready

hrbrmstr · Mar 3, 2024 · 6417996 · 6417996
1 parent 0ef1f1c
commit 6417996
Show file tree

Hide file tree

Showing 55 changed files with 34 additions and 108 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -11,8 +11,7 @@ Authors@R: c(
       person("Dan", "Wilson", email = "[email protected]", 
              role = c("ctb"), comment = c("Secondary axis support")), 
       person("Xavier", "Adam", role = c("ctb")),
-      person("Google", comment = "Roboto Condensed & Titillium Web Fonts", 
-             role = c("cph")),
+      person("Google", comment = "Roboto Condensed", role = c("cph")),
       person("IBM", comment = "Plex Sans Font", role = c("cph")),
       person("Goldman Sachs", comment = "Goldman Sans Font", role = c("cph")),
       person("Impallari Type", comment = "Public Sans Font", role = c("cph")),
@@ -24,9 +23,7 @@ Authors@R: c(
 Maintainer: Bob Rudis <[email protected]>
 Description: A compilation of extra 'ggplot2' themes, scales and utilities, including a 
     spell check function for plot label fields and an overall emphasis on typography. 
-    A copy of the 'Google' font 'Roboto Condensed' is also included along with a copy 
-    of the 'IBM' 'Plex Sans', and 'Public Sans' fonts
-    are also included to support their respective typography-oriented themes.
+    A copy of the 'Google' font 'Roboto Condensed' is also included.
 Copyright: file inst/COPYRIGHTS
 License: MIT + file LICENSE
 Encoding: UTF-8

diff --git a/R/econ-sans.R b/R/econ-sans.R
@@ -1,6 +1,6 @@
 #' A precise & pristine [ggplot2] theme with opinionated defaults and an emphasis on typoghraphy
 #'
-#' You should [import_econ_sans()] first and also install the fonts on your
+#' You should [import_econ_sans()] first and install the fonts on your
 #' system before trying to use this theme.
 #'
 #' There is an option `hrbrthemes.loadfonts` which -- if set to `TRUE` -- will
@@ -200,21 +200,15 @@ theme_ipsum_es <- function(
 #' to register non-core fonts with the Windows graphics device.
 #'
 #' @md
-#' @note This will take care of ensuring PDF/PostScript usage. The location of the
-#'   font directory is displayed after the base import is complete. It is highly
-#'   recommended that you install them on your system the same way you would any
-#'   other font you wish to use in other programs.
 #' @export
 import_econ_sans <- function() {
 
   es_font_dir <- system.file("fonts", "econ-sans", package="hrbrthemes")
-  #
-  # suppressWarnings(suppressMessages(extrafont::font_import(es_font_dir, prompt=FALSE)))
-  #
-  # message(
-  #   "You will likely need to install these fonts on your system as well.\n\n",
-  #   "You can find them in [", es_font_dir, "]"
-  # )
+
+  message(
+    "You will need to install these fonts on your system as well.\n\n",
+    "You can find them in [", es_font_dir, "]"
+  )
 
 }
 

diff --git a/R/goldmansans.R b/R/goldmansans.R
@@ -1,6 +1,6 @@
 #' A precise & pristine [ggplot2] theme with opinionated defaults and an emphasis on typoghraphy
 #'
-#' You should [import_goldman_sans()] first and also install the fonts on your
+#' You should [import_goldman_sans()] first and install the fonts on your
 #' system before trying to use this theme.
 #'
 #' There is an option `hrbrthemes.loadfonts` which -- if set to `TRUE` -- will
@@ -180,22 +180,16 @@ theme_ipsum_gs <- function(
 #' to register non-core fonts with the Windows graphics device.
 #'
 #' @md
-#' @note This will take care of ensuring PDF/PostScript usage. The location of the
-#'   font directory is displayed after the base import is complete. It is highly
-#'   recommended that you install them on your system the same way you would any
-#'   other font you wish to use in other programs.
 #' @export
 import_goldman_sans <- function() {
 
   gs_font_dir <- system.file("fonts", "goldman-sans", package="hrbrthemes")
 
-  # suppressWarnings(suppressMessages(extrafont::font_import(gs_font_dir, prompt=FALSE)))
-  #
-  # message(
-  #   sprintf(
-  #     "You will likely need to install these fonts on your system as well.\n\nYou can find them in [%s]",
-  #     gs_font_dir)
-  # )
+  message(
+    sprintf(
+      "You will need to install these fonts on your system as well.\n\nYou can find them in [%s]",
+      gs_font_dir)
+  )
 
 }
 

diff --git a/R/inter.R b/R/inter.R
@@ -1,6 +1,6 @@
 #' A precise & pristine [ggplot2] theme with opinionated defaults and an emphasis on typoghraphy
 #'
-#' You should [import_inter()] first and also install the fonts on your
+#' You should [import_inter()] first and install the fonts on your
 #' system before trying to use this theme.
 #'
 #' There is an option `hrbrthemes.loadfonts` which -- if set to `TRUE` -- will
@@ -174,30 +174,20 @@ theme_ipsum_inter <- function(
 
 #' Import Inter font for use in charts
 #'
-#' Inter is Copyright (c) 2016-2020 The Inter Project Authors
-#' (<https://rsms.me/inter/>).
+#' Inter is Copyright (c) 2016-2024 The Inter Project Authors
 #'
 #' There is an option `hrbrthemes.loadfonts` which -- if set to `TRUE` -- will
 #' call `extrafont::loadfonts()` to register non-core fonts with R PDF & PostScript
 #' devices. If you are running under Windows, the package calls the same function
 #' to register non-core fonts with the Windows graphics device.
 #'
 #' @md
-#' @note This will take care of ensuring PDF/PostScript usage. The location of the
-#'   font directory is displayed after the base import is complete. It is highly
-#'   recommended that you install them on your system the same way you would any
-#'   other font you wish to use in other programs.
 #' @export
 import_inter <- function() {
 
-  inter_font_dir <- system.file("fonts", "inter", package="hrbrthemes")
-
-  suppressWarnings(suppressMessages(extrafont::font_import(inter_font_dir, prompt=FALSE)))
-
   message(
-    sprintf(
-      "You will likely need to install these fonts on your system as well.\n\nYou can find them in [%s]",
-      inter_font_dir)
+    "You can find Inter at https://github.com/rsms/inter. Please install them ",
+    "and run extrafont::font_import()"
   )
 
 }

diff --git a/R/plexsans.R b/R/plexsans.R
@@ -1,6 +1,6 @@
 #' A precise & pristine [ggplot2] theme with opinionated defaults and an emphasis on typoghraphy
 #'
-#' You should [import_plex_sans()] first and also install the fonts on your
+#' You should [import_plex_sans()] first and install the fonts on your
 #' system before trying to use this theme.
 #'
 #' There is an option `hrbrthemes.loadfonts` which -- if set to `TRUE` -- will
@@ -175,22 +175,13 @@ theme_ipsum_ps <- function(
 #' to register non-core fonts with the Windows graphics device.
 #'
 #' @md
-#' @note This will take care of ensuring PDF/PostScript usage. The location of the
-#'   font directory is displayed after the base import is complete. It is highly
-#'   recommended that you install them on your system the same way you would any
-#'   other font you wish to use in other programs.
 #' @export
 import_plex_sans <- function() {
 
-  ps_font_dir <- system.file("fonts", "plex-sans", package="hrbrthemes")
-
-  # suppressWarnings(suppressMessages(extrafont::font_import(ps_font_dir, prompt=FALSE)))
-  #
-  # message(
-  #   sprintf(
-  #     "You will likely need to install these fonts on your system as well.\n\nYou can find them in [%s]",
-  #     ps_font_dir)
-  # )
+  message(
+    "You can find IBM Plex Sans at https://github.com/IBM/plex. Please install them ",
+    "and run extrafont::font_import()"
+  )
 
 }
 

diff --git a/R/public-sans.R b/R/public-sans.R
@@ -1,6 +1,6 @@
 #' A precise & pristine [ggplot2] theme with opinionated defaults and an emphasis on typoghraphy
 #'
-#' You should [import_public_sans()] first and also install the fonts on your
+#' You should [import_public_sans()] first and install the fonts on your
 #' system before trying to use this theme.
 #'
 #' There is an option `hrbrthemes.loadfonts` which -- if set to `TRUE` -- will
@@ -179,22 +179,13 @@ theme_ipsum_pub <- function(
 #' to register non-core fonts with the Windows graphics device.
 #'
 #' @md
-#' @note This will take care of ensuring PDF/PostScript usage. The location of the
-#'   font directory is displayed after the base import is complete. It is highly
-#'   recommended that you install them on your system the same way you would any
-#'   other font you wish to use in other programs.
 #' @export
 import_public_sans <- function() {
 
-  pub_font_dir <- system.file("fonts", "public-sans", package="hrbrthemes")
-
-  # suppressWarnings(suppressMessages(extrafont::font_import(pub_font_dir, prompt=FALSE)))
-  #
-  # message(
-  #   sprintf(
-  #     "You will likely need to install these fonts on your system as well.\n\nYou can find them in [%s]",
-  #     pub_font_dir)
-  # )
+  message(
+    "You can find Public Sans at https://github.com/IBM/plex. Please install them ",
+    "and run extrafont::font_import()"
+  )
 
 }
 

diff --git a/inst/fonts/inter/Inter-Black.ttf b/inst/fonts/inter/Inter-Black.ttf
diff --git a/inst/fonts/inter/Inter-BlackItalic.ttf b/inst/fonts/inter/Inter-BlackItalic.ttf
diff --git a/inst/fonts/inter/Inter-Bold.ttf b/inst/fonts/inter/Inter-Bold.ttf
diff --git a/inst/fonts/inter/Inter-BoldItalic.ttf b/inst/fonts/inter/Inter-BoldItalic.ttf
diff --git a/inst/fonts/inter/Inter-ExtraBold.ttf b/inst/fonts/inter/Inter-ExtraBold.ttf
diff --git a/inst/fonts/inter/Inter-ExtraBoldItalic.ttf b/inst/fonts/inter/Inter-ExtraBoldItalic.ttf
diff --git a/inst/fonts/inter/Inter-ExtraLight.ttf b/inst/fonts/inter/Inter-ExtraLight.ttf
diff --git a/inst/fonts/inter/Inter-ExtraLightItalic.ttf b/inst/fonts/inter/Inter-ExtraLightItalic.ttf
diff --git a/inst/fonts/inter/Inter-Italic.ttf b/inst/fonts/inter/Inter-Italic.ttf
diff --git a/inst/fonts/inter/Inter-Light.ttf b/inst/fonts/inter/Inter-Light.ttf
diff --git a/inst/fonts/inter/Inter-LightItalic.ttf b/inst/fonts/inter/Inter-LightItalic.ttf
diff --git a/inst/fonts/inter/Inter-Medium.ttf b/inst/fonts/inter/Inter-Medium.ttf
diff --git a/inst/fonts/inter/Inter-MediumItalic.ttf b/inst/fonts/inter/Inter-MediumItalic.ttf
diff --git a/inst/fonts/inter/Inter-Regular.ttf b/inst/fonts/inter/Inter-Regular.ttf
diff --git a/inst/fonts/inter/Inter-SemiBold.ttf b/inst/fonts/inter/Inter-SemiBold.ttf
diff --git a/inst/fonts/inter/Inter-SemiBoldItalic.ttf b/inst/fonts/inter/Inter-SemiBoldItalic.ttf
diff --git a/inst/fonts/inter/Inter-Thin.ttf b/inst/fonts/inter/Inter-Thin.ttf
diff --git a/inst/fonts/inter/Inter-ThinItalic.ttf b/inst/fonts/inter/Inter-ThinItalic.ttf
diff --git a/inst/fonts/plex-sans/IBMPlexSans-Bold.ttf b/inst/fonts/plex-sans/IBMPlexSans-Bold.ttf
diff --git a/inst/fonts/plex-sans/IBMPlexSans-Light.ttf b/inst/fonts/plex-sans/IBMPlexSans-Light.ttf
diff --git a/inst/fonts/plex-sans/IBMPlexSans-Medium.ttf b/inst/fonts/plex-sans/IBMPlexSans-Medium.ttf
diff --git a/inst/fonts/plex-sans/IBMPlexSans-Regular.ttf b/inst/fonts/plex-sans/IBMPlexSans-Regular.ttf
diff --git a/inst/fonts/plex-sans/IBMPlexSans-Text.ttf b/inst/fonts/plex-sans/IBMPlexSans-Text.ttf
diff --git a/inst/fonts/plex-sans/IBMPlexSans-Thin.ttf b/inst/fonts/plex-sans/IBMPlexSans-Thin.ttf
diff --git a/inst/fonts/public-sans/PublicSans-Black.ttf b/inst/fonts/public-sans/PublicSans-Black.ttf
diff --git a/inst/fonts/public-sans/PublicSans-BlackItalic.ttf b/inst/fonts/public-sans/PublicSans-BlackItalic.ttf
diff --git a/inst/fonts/public-sans/PublicSans-Bold.ttf b/inst/fonts/public-sans/PublicSans-Bold.ttf
diff --git a/inst/fonts/public-sans/PublicSans-ExtraBold.ttf b/inst/fonts/public-sans/PublicSans-ExtraBold.ttf
diff --git a/inst/fonts/public-sans/PublicSans-ExtraBoldItalic.ttf b/inst/fonts/public-sans/PublicSans-ExtraBoldItalic.ttf
diff --git a/inst/fonts/public-sans/PublicSans-ExtraLight.ttf b/inst/fonts/public-sans/PublicSans-ExtraLight.ttf
diff --git a/inst/fonts/public-sans/PublicSans-Light.ttf b/inst/fonts/public-sans/PublicSans-Light.ttf
diff --git a/inst/fonts/public-sans/PublicSans-Medium.ttf b/inst/fonts/public-sans/PublicSans-Medium.ttf
diff --git a/inst/fonts/public-sans/PublicSans-Regular.ttf b/inst/fonts/public-sans/PublicSans-Regular.ttf
diff --git a/inst/fonts/public-sans/PublicSans-SemiBold.ttf b/inst/fonts/public-sans/PublicSans-SemiBold.ttf
diff --git a/inst/fonts/public-sans/PublicSans-Thin.ttf b/inst/fonts/public-sans/PublicSans-Thin.ttf
diff --git a/inst/fonts/roboto-slab/RobotoSlab-Bold.ttf b/inst/fonts/roboto-slab/RobotoSlab-Bold.ttf
diff --git a/inst/fonts/roboto-slab/RobotoSlab-Light.ttf b/inst/fonts/roboto-slab/RobotoSlab-Light.ttf
diff --git a/inst/fonts/roboto-slab/RobotoSlab-Regular.ttf b/inst/fonts/roboto-slab/RobotoSlab-Regular.ttf
diff --git a/inst/fonts/roboto-slab/RobotoSlab-Thin.ttf b/inst/fonts/roboto-slab/RobotoSlab-Thin.ttf
diff --git a/man/import_econ_sans.Rd b/man/import_econ_sans.Rd
diff --git a/man/import_goldman_sans.Rd b/man/import_goldman_sans.Rd
diff --git a/man/import_inter.Rd b/man/import_inter.Rd
diff --git a/man/import_plex_sans.Rd b/man/import_plex_sans.Rd
diff --git a/man/import_public_sans.Rd b/man/import_public_sans.Rd
diff --git a/man/theme_ipsum_es.Rd b/man/theme_ipsum_es.Rd
diff --git a/man/theme_ipsum_gs.Rd b/man/theme_ipsum_gs.Rd
diff --git a/man/theme_ipsum_inter.Rd b/man/theme_ipsum_inter.Rd
diff --git a/man/theme_ipsum_ps.Rd b/man/theme_ipsum_ps.Rd
diff --git a/man/theme_ipsum_pub.Rd b/man/theme_ipsum_pub.Rd