version 0.1.2

caprice-j · Aug 30, 2017 · 199605c · 199605c
1 parent 4725637
commit 199605c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: ggconf
 Type: Package
 Title: Simpler Appearance Modification of 'ggplot2'
-Version: 0.1
+Version: 0.1.2
 Authors@R: c(person('Yasutaka', 'Tanaka', , '[email protected]', c('aut', 'cre')))
 Description: A flexible interface for ggplot2::theme(), potentially saving 50% of your typing.
 License: GPL-3

diff --git a/R/approx_match.R b/R/approx_match.R
@@ -20,6 +20,10 @@
 #'
 #' get_analogue("axis.txt", c("axis.text", "axis.text.x", "axis.ticks"))
 #' # returns "axis.text" "axis.text.x" "axis.ticks"
+#' 
+#' get_analogue("p.bg", c("plot.background", "panel.background"))
+#' # returns "plot.background" as first, and then "panel.background"
+#' 
 #'
 #' @importFrom utils adist
 #' @importFrom stats na.omit

diff --git a/R/compiler.R b/R/compiler.R
@@ -22,7 +22,8 @@ ggregex <- list(
     charaes    = paste0("[a-z]+=('|\\\").*?('|\\\")"),
     constaes   = "[a-z\\.]+=c\\([0-9\\.,\\)]+", # FIXME adhoc for binw=c(.1, .1)
     # Note: ggregex$constaes and t_CONSTAES rules are duplicated
-    unit       = "[0-9\\.,]+\\s*['\"]?(cm|in|inch|inches)['\"]?"
+    unit       = "[0-9\\.,]+\\s*['\"]?(cm|in|inch|inches)['\"]?",
+    func       = "[a-z\\.]+=(arrow|rel|paste|paste0|c)\\([^#]*\\)"
 )
 
 Ggplot2Lexer <-
@@ -69,10 +70,10 @@ Ggplot2Lexer <-
                 ggconf_dbgmsg("  t_COMMA: ", t$value)
                 t$type <- "COMMA"; return(t) 
             },
-            t_0_FUNC = function(re="[a-z\\.]+=(arrow|rel|paste|paste0)\\([^#]*\\)", t) {
-                # FIXME any function
+            t_0_FUNC = function(re = "[a-z\\.]+=(arrow|rel|paste|paste0|c)\\([^#]*\\)(\\[[0-9a-zA-Z\\._]+\\])?", t) {
                 ggconf_dbgmsg("  t_0_FUNC: ", t$value)
-                t$type <- "0_FUNC"; return(t) 
+                t$type <- "0_FUNC"; 
+                return(t) 
             },
             t_1_NAME      = function(re="(\\\"|')?[\\.a-zA-Z0-9_\\(\\)\\-][a-zA-Z_0-9\\.,=\\(\\)\\-\\+\\/\\*]*(\\\"|')?(\\s*inches|\\s*inch|\\s*in|\\s*cm)?(\\\"|')?", t) {
                 if (grepl("theme\\(", t$value)) {

diff --git a/R/ggconf.R b/R/ggconf.R
@@ -104,6 +104,10 @@ exec_ggconf <- function(raw_input="",
 #'     plt.margin(.3, .3, .3, .1, "inch")          
 #'   )
 #'
+#' 
+#' ggplot(mtcars) + geom_point(aes(wt, hp, color=cyl)) +
+#'    theme2(a.txt(family = c("Consolas", "Times")[1]))
+#'
 #' # all of the following three generate the same plot
 #'
 #' ggplot(mtcars) + geom_point(aes(wt, hp, color=cyl)) +
@@ -119,6 +123,7 @@ exec_ggconf <- function(raw_input="",
 #'    theme2(txt(sz=20, f="bold"), aline(sz=2), l.key(c="black"))
 #' 
 #' 
+#' 
 #' }
 #' 
 #'

diff --git a/tests/testthat/test-theme2.R b/tests/testthat/test-theme2.R
@@ -80,6 +80,17 @@ test_that("theme2", {
 
     ee(theme2(ax.ttl(col=paste0('sky','blue'))),
        theme(axis.title = element_text(color=paste0('sky','blue'))))
+
+    ee(theme2(a.txt(family=c("consolas", "Times New Roman")[1])),
+       theme(axis.text = element_text(family="consolas")))
+
+    ee(theme2(a.txt(family=c("consolas", "Times New Roman")[2])),
+       theme(axis.text = element_text(family="Times New Roman")))
+
+    my.se_1_ection <<- 1
+    ee(theme2(a.txt(family=c("consolas", "Times New Roman")[my.se_1_ection])),
+       theme(axis.text = element_text(family="consolas")))
+
 })
 
 test_that("partial-match", {