Custom axis titles for one-sided bar plots

NEWS.md

@@ -56,6 +56,8 @@ where the formatting is also better._
   x-axis order of the original plot layer. This should ensure that we don't end
   up with misaligned layers. For example, when ribbon is added on top of an
   errorbar plot. (#517, #520, #523, #526 @grantmcdermott)
+- Custom axis titles work properly for one-sided (formula) bar plots. Thanks to
+  @lbelzile for the report in #423. (#527 @grantmcdermott)
 
 
 ### Documentation

R/tinyplot.R

@@ -1463,17 +1463,23 @@ tinyplot.formula = function(
   }
 
   ## nice axis and legend labels
-  dens_type = (is.atomic(type) && identical(type, "density")) || (!is.atomic(type) && identical(type$name, "density"))
-  hist_type = (is.atomic(type) && type %in% c("hist", "histogram")) || (!is.atomic(type) && identical(type$name, "histogram"))
-  if (!is.null(type) && dens_type) {
+  dens_type = !is.null(type) && (is.atomic(type) && identical(type, "density")) || (!is.atomic(type) && identical(type$name, "density"))
+  hist_type = !is.null(type) && (is.atomic(type) && type %in% c("hist", "histogram")) || (!is.atomic(type) && identical(type$name, "histogram"))
+  barp_type = !is.null(type) &&  (is.atomic(type) && identical(type, "barplot")) || (!is.atomic(type) && identical(type$name, "barplot"))
+  if (dens_type) {
     # if (is.null(ylab)) ylab = "Density" ## rather assign ylab as part of internal type_density() logic
     if (is.null(xlab)) xlab = xnam
-  } else if (!is.null(type) && hist_type) {
+  } else if (hist_type) {
     # if (is.null(ylab)) ylab = "Frequency" ## rather assign ylab as part of internal type_histogram() logic
     if (is.null(xlab)) xlab = xnam
   } else if (is.null(y)) {
-    if (is.null(ylab)) ylab = xnam
-    if (is.null(xlab)) xlab = "Index"
+    if (!barp_type) {
+      if (is.null(ylab)) ylab = xnam
+      if (is.null(xlab)) xlab = "Index"
+    } else {
+      if (is.null(ylab)) ylab = "Count"
+      if (is.null(xlab)) xlab = xnam
+    }
   } else {
     if (is.null(ylab)) ylab = ynam
     if (is.null(xlab)) xlab = xnam

R/type_barplot.R

@@ -91,9 +91,8 @@ data_barplot = function(width = 5/6, beside = FALSE, center = FALSE, FUN = NULL,
 
         ## tabulate/aggregate datapoints
         if (is.null(datapoints$y)) {
-          xlab = ylab
-          ylab = "Count"
-
+          if (is.null(xlab) || xlab == "Index") xlab = ylab
+          if (is.null(settings$y_dep) && is.null(ylab)) ylab = "Count"
           datapoints$y = numeric(nrow(datapoints))          
           if (!is.null(FUN)) warning("without 'y' variable 'FUN' specification is ignored")
           FUN = length