Merge pull request #9 from noradno/dev

Fix fonts

DESCRIPTION

@@ -1,9 +1,12 @@
 Package: noradplot
 Type: Package
 Title: Norad colour palette and theme for ggplot2 graphics
-Version: 0.2.0
-Author: Norad
-Maintainer: Einar Tornes <[email protected]>
+Version: 0.3.0
+Authors@R: c(
+    person("Einar", "Tornes", email = "[email protected]", role = c("aut", "cre")),
+    person("Eivind", "Hammersmark", "Moe", email = "[email protected]", role = "aut"),
+    person("Norad", role = c("cph", "fnd"))
+    )
 Description: Provides Norads colour palette and theme for creating ggplot2 graphics. Credits: Based on Simon Jackson's blog post: Creating corporate colour palettes for ggplot2, BBC BBC Visual and Data Journalism cookbook for R graphics: https://bbc.github.io/rcookbook/ and Meghan Halls blog post Creating Custom colour palettes for ggplot2: https://meghan.rbind.io/blog/2022-10-11-creating-custom-color-palettes-with-ggplot2/.
 License: MIT + file LICENSE
 Encoding: UTF-8

R/ggnorad.R

@@ -8,16 +8,19 @@ ggnorad <- function(...) {
 
   showtext::showtext_auto()
 
+  fonts_dir <- system.file("fonts", package = "noradplot")
   sysfonts::font_add(family = "Norad Sans",
-                     regular = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSans-Regular.otf",
-                     bold = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSans-Bold.otf",
-                     italic = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSans-Italic.otf",
-                     bolditalic = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSans-BoldItalic.otf")
+                     regular = paste0(fonts_dir, "/NoradSans-Regular.otf"),
+                     bold = paste0(fonts_dir, "/NoradSans-Bold.otf"),
+                     italic = paste0(fonts_dir, "/NoradSans-Italic.otf"),
+                     bolditalic = paste0(fonts_dir, "/NoradSans-BoldItalic.otf"))
+
   sysfonts::font_add(family = "Norad Serif",
-                     regular = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSerif-Regular.otf",
-                     bold = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSerif-Bold.otf",
-                     italic = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSerif-Italic.otf",
-                     bolditalic = "https://github.com/noradno/noradplot/raw/main/fonts/NoradSerif-BoldItalic.otf")
+                     regular = paste0(fonts_dir, "/NoradSerif-Regular.otf"),
+                     bold = paste0(fonts_dir, "/NoradSerif-Bold.otf"),
+                     italic = paste0(fonts_dir, "/NoradSerif-Italic.otf"),
+                     bolditalic = paste0(fonts_dir, "/NoradSerif-BoldItalic.otf"))
+
   ggplot2::update_geom_defaults("path", list(linewidth = 1))
 
   ggplot2::theme_set(theme_norad())