diff --git a/R/ggnorad.R b/R/ggnorad.R index e05192a..a2eb32b 100644 --- a/R/ggnorad.R +++ b/R/ggnorad.R @@ -8,17 +8,16 @@ ggnorad <- function(...) { showtext::showtext_auto() - sysfonts::font_add(family = "Arimo", - regular = "fonts/Arimo-Regular.ttf", - bold = "fonts/Arimo-Bold.ttf", - italic = "fonts/Arimo-Italic.ttf", - bolditalic = "fonts/Arimo-BoldItalic.ttf") - sysfonts::font_add(family = "EB Garamond", - regular = "fonts/EBGaramond-Regular.ttf", - bold = "fonts/EBGaramond-Bold.ttf", - italic = "fonts/EBGaramond-Italic.ttf", - bolditalic = "fonts/EBGaramond-BoldItalic.ttf") - + sysfonts::font_add(family = "Norad Sans", + regular = "fonts/NoradSans-Regular.otf", + bold = "fonts/NoradSans-Bold.otf", + italic = "fonts/NoradSans-Italic.otf", + bolditalic = "fonts/NoradSans-BoldItalic.otf") + sysfonts::font_add(family = "Norad Serif", + regular = "fonts/NoradSerif-Regular.otf", + bold = "fonts/NoradSerif-Bold.otf", + italic = "fonts/NoradSerif-Italic.otf", + bolditalic = "fonts/NoradSerif-BoldItalic.otf") ggplot2::update_geom_defaults("path", list(linewidth = 1)) ggplot2::theme_set(theme_norad()) diff --git a/R/style_functions.R b/R/style_functions.R index f9c4d58..83f470d 100644 --- a/R/style_functions.R +++ b/R/style_functions.R @@ -5,8 +5,8 @@ #'@name theme_norad theme_norad <- function() { - sans <- "Arimo" - serif <- "EB Garamond" + sans <- "Norad Sans" + serif <- "Norad Serif" ggplot2::theme_classic() + ggplot2::theme( diff --git a/README.Rmd b/README.Rmd index 5b473f4..5318323 100644 --- a/README.Rmd +++ b/README.Rmd @@ -18,7 +18,7 @@ knitr::opts_chunk$set( Norads colour palette and plot style for creating ggplot2 graphics. -- Use `theme_norad()` to add norad style +- Use `ggnorad()` to add Norad plot style - Use `scale_*` functions to add norad colour palette diff --git a/README.md b/README.md index 8d09165..74a4264 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Norads colour palette and plot style for creating ggplot2 graphics. -- Use `theme_norad()` to add norad style +- Use `ggnorad()` to add Norad plot style - Use `scale_*` functions to add norad colour palette diff --git a/fonts/Arimo-Bold.ttf b/fonts/Arimo-Bold.ttf deleted file mode 100644 index 94dd587..0000000 Binary files a/fonts/Arimo-Bold.ttf and /dev/null differ diff --git a/fonts/Arimo-BoldItalic.ttf b/fonts/Arimo-BoldItalic.ttf deleted file mode 100644 index 86f167e..0000000 Binary files a/fonts/Arimo-BoldItalic.ttf and /dev/null differ diff --git a/fonts/Arimo-Italic.ttf b/fonts/Arimo-Italic.ttf deleted file mode 100644 index 3a1ae19..0000000 Binary files a/fonts/Arimo-Italic.ttf and /dev/null differ diff --git a/fonts/Arimo-Medium.ttf b/fonts/Arimo-Medium.ttf deleted file mode 100644 index a21774b..0000000 Binary files a/fonts/Arimo-Medium.ttf and /dev/null differ diff --git a/fonts/Arimo-MediumItalic.ttf b/fonts/Arimo-MediumItalic.ttf deleted file mode 100644 index c26734a..0000000 Binary files a/fonts/Arimo-MediumItalic.ttf and /dev/null differ diff --git a/fonts/Arimo-Regular.ttf b/fonts/Arimo-Regular.ttf deleted file mode 100644 index 2ab41c9..0000000 Binary files a/fonts/Arimo-Regular.ttf and /dev/null differ diff --git a/fonts/Arimo-SemiBold.ttf b/fonts/Arimo-SemiBold.ttf deleted file mode 100644 index 81ff295..0000000 Binary files a/fonts/Arimo-SemiBold.ttf and /dev/null differ diff --git a/fonts/Arimo-SemiBoldItalic.ttf b/fonts/Arimo-SemiBoldItalic.ttf deleted file mode 100644 index 72b1e2c..0000000 Binary files a/fonts/Arimo-SemiBoldItalic.ttf and /dev/null differ diff --git a/fonts/EBGaramond-Bold.ttf b/fonts/EBGaramond-Bold.ttf deleted file mode 100644 index a31cb9b..0000000 Binary files a/fonts/EBGaramond-Bold.ttf and /dev/null differ diff --git a/fonts/EBGaramond-BoldItalic.ttf b/fonts/EBGaramond-BoldItalic.ttf deleted file mode 100644 index 4468f39..0000000 Binary files a/fonts/EBGaramond-BoldItalic.ttf and /dev/null differ diff --git a/fonts/EBGaramond-ExtraBold.ttf b/fonts/EBGaramond-ExtraBold.ttf deleted file mode 100644 index d6f0500..0000000 Binary files a/fonts/EBGaramond-ExtraBold.ttf and /dev/null differ diff --git a/fonts/EBGaramond-ExtraBoldItalic.ttf b/fonts/EBGaramond-ExtraBoldItalic.ttf deleted file mode 100644 index 8be79d9..0000000 Binary files a/fonts/EBGaramond-ExtraBoldItalic.ttf and /dev/null differ diff --git a/fonts/EBGaramond-Italic.ttf b/fonts/EBGaramond-Italic.ttf deleted file mode 100644 index 269ce51..0000000 Binary files a/fonts/EBGaramond-Italic.ttf and /dev/null differ diff --git a/fonts/EBGaramond-Medium.ttf b/fonts/EBGaramond-Medium.ttf deleted file mode 100644 index a39f2a4..0000000 Binary files a/fonts/EBGaramond-Medium.ttf and /dev/null differ diff --git a/fonts/EBGaramond-MediumItalic.ttf b/fonts/EBGaramond-MediumItalic.ttf deleted file mode 100644 index 6f76de0..0000000 Binary files a/fonts/EBGaramond-MediumItalic.ttf and /dev/null differ diff --git a/fonts/EBGaramond-Regular.ttf b/fonts/EBGaramond-Regular.ttf deleted file mode 100644 index c86defb..0000000 Binary files a/fonts/EBGaramond-Regular.ttf and /dev/null differ diff --git a/fonts/EBGaramond-SemiBold.ttf b/fonts/EBGaramond-SemiBold.ttf deleted file mode 100644 index f48ec39..0000000 Binary files a/fonts/EBGaramond-SemiBold.ttf and /dev/null differ diff --git a/fonts/EBGaramond-SemiBoldItalic.ttf b/fonts/EBGaramond-SemiBoldItalic.ttf deleted file mode 100644 index e8697e5..0000000 Binary files a/fonts/EBGaramond-SemiBoldItalic.ttf and /dev/null differ diff --git a/fonts/NoradSans-Bold.otf b/fonts/NoradSans-Bold.otf new file mode 100644 index 0000000..0b1818b Binary files /dev/null and b/fonts/NoradSans-Bold.otf differ diff --git a/fonts/NoradSans-BoldItalic.otf b/fonts/NoradSans-BoldItalic.otf new file mode 100644 index 0000000..dd0cc72 Binary files /dev/null and b/fonts/NoradSans-BoldItalic.otf differ diff --git a/fonts/NoradSans-Italic.otf b/fonts/NoradSans-Italic.otf new file mode 100644 index 0000000..5affacd Binary files /dev/null and b/fonts/NoradSans-Italic.otf differ diff --git a/fonts/NoradSans-Medium.otf b/fonts/NoradSans-Medium.otf new file mode 100644 index 0000000..9c0ad2d Binary files /dev/null and b/fonts/NoradSans-Medium.otf differ diff --git a/fonts/NoradSans-MediumItalic.otf b/fonts/NoradSans-MediumItalic.otf new file mode 100644 index 0000000..df34d0d Binary files /dev/null and b/fonts/NoradSans-MediumItalic.otf differ diff --git a/fonts/NoradSans-Regular.otf b/fonts/NoradSans-Regular.otf new file mode 100644 index 0000000..195c785 Binary files /dev/null and b/fonts/NoradSans-Regular.otf differ diff --git a/fonts/NoradSerif-Bold.otf b/fonts/NoradSerif-Bold.otf new file mode 100644 index 0000000..18daa41 Binary files /dev/null and b/fonts/NoradSerif-Bold.otf differ diff --git a/fonts/NoradSerif-BoldItalic.otf b/fonts/NoradSerif-BoldItalic.otf new file mode 100644 index 0000000..06a052e Binary files /dev/null and b/fonts/NoradSerif-BoldItalic.otf differ diff --git a/fonts/NoradSerif-Italic.otf b/fonts/NoradSerif-Italic.otf new file mode 100644 index 0000000..48c19ac Binary files /dev/null and b/fonts/NoradSerif-Italic.otf differ diff --git a/fonts/NoradSerif-Medium.otf b/fonts/NoradSerif-Medium.otf new file mode 100644 index 0000000..3d68871 Binary files /dev/null and b/fonts/NoradSerif-Medium.otf differ diff --git a/fonts/NoradSerif-MediumItalic.otf b/fonts/NoradSerif-MediumItalic.otf new file mode 100644 index 0000000..bf8af06 Binary files /dev/null and b/fonts/NoradSerif-MediumItalic.otf differ diff --git a/fonts/NoradSerif-Regular.otf b/fonts/NoradSerif-Regular.otf new file mode 100644 index 0000000..1c809cf Binary files /dev/null and b/fonts/NoradSerif-Regular.otf differ diff --git a/man/figures/README-example-1.png b/man/figures/README-example-1.png index 7b2077a..4153ae8 100644 Binary files a/man/figures/README-example-1.png and b/man/figures/README-example-1.png differ