(v2.1.1.9223) allow + ab

R/aa_helper_functions.R

@@ -539,7 +539,7 @@ word_wrap <- function(...,
     )
     # text starting with `?` must also lead to the help page
     parts[parts %like% "^[?]"] <- font_url(
-      url = paste0("ide:help:AMR::", parts[parts %like% "^[?]"]),
+      url = paste0("ide:help:AMR::", gsub("?", "", parts[parts %like% "^[?]"], fixed = TRUE)),
       txt = parts[parts %like% "^[?]"]
     )
     msg <- paste0(parts, collapse = "`")

R/ab.R

@@ -610,6 +610,16 @@ rep.ab <- function(x, ...) {
   y
 }
 
+#' @method + ab
+#' @export
+#' @noRd
+`+.ab` <- function(e1, e2) {
+  # this does not return ab class, it should just allow console usage of e.g., carbapenems() + c("", aminoglycosides())
+  out <- as.character(outer(e1, e2, paste, sep = " + "))
+  out <- gsub(" [+] $", "", out)
+  out
+}
+
 generalise_antibiotic_name <- function(x) {
   x <- toupper(x)
   # remove suffices

R/amr_selectors.R

@@ -954,9 +954,10 @@ any.amr_selector_any_all <- function(..., na.rm = FALSE) {
 #' @noRd
 `+.amr_selector` <- function(e1, e2) {
   # this is useful for `antibiogram()`: antibiogram(example_isolates, carbapenems() + c("", "GEN", "TOB"))
-  structure(as.character(outer(e1, e2, paste, sep = " + ")),
-    class = c("amr_selector", "character")
-  )
+  # this is also implemented for ab class, to allow direct console usage
+  out <- as.character(outer(e1, e2, paste, sep = " + "))
+  out <- gsub(" [+] $", "", out)
+  structure(out, class = c("amr_selector", "character"))
 }
 
 is_any <- function(el1) {

R/antibiogram.R

@@ -42,8 +42,9 @@
 #'     - `c(aminoglycosides(), "AMP", "AMC")`
 #'     - `c(aminoglycosides(), carbapenems())`
 #'   - Combination therapy, indicated by using `"+"`, with or without [antimicrobial selectors][antimicrobial_selectors], e.g.:
-#'     - `"TZP+TOB"`
 #'     - `"cipro + genta"`
+#'     - `"TZP+TOB"`
+#'     - `c("TZP", "TZP+GEN", "TZP+TOB")`
 #'     - `carbapenems() + "GEN"`
 #'     - `carbapenems() + c("", "GEN")`
 #'     - `carbapenems() + c("", aminoglycosides())`