retrieve font, not fontface in set_context_fontface, change fontface …

…char to font int
wilkelab · Apr 21, 2022 · b410f97 · b410f97
1 parent bad2607
commit b410f97
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/R/drawing-context.R b/R/drawing-context.R
@@ -70,13 +70,13 @@ set_context_gp <- function(drawing_context, gp = NULL) {
 
 # update the fontface of a drawing context
 set_context_fontface <- function(drawing_context, fontface = "plain", overwrite = FALSE) {
-  fontface_old <- drawing_context$gp$fontface
+  fontface_old <- drawing_context$gp$font
 
   # combine bold and italic if needed
   if (!isTRUE(overwrite)) {
-    if (isTRUE(fontface == "italic") && isTRUE(fontface_old == "bold")) {
+    if (isTRUE(fontface == "italic") && isTRUE(fontface_old == 2)) { # see ?grid::gpar for fontface codes
       fontface <- "bold.italic"
-    } else if (isTRUE(fontface == "bold") && isTRUE(fontface_old == "italic")) {
+    } else if (isTRUE(fontface == "bold") && isTRUE(fontface_old == 3)) {
       fontface <- "bold.italic"
     }
   }