diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 6eab68a..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.Rbuildignore b/.Rbuildignore index 0375e90..02bd650 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -13,3 +13,4 @@ ^tools$ ^\.claude$ ^CLAUDE\.md$ +^\.Rhistory$ diff --git a/.Rhistory b/.Rhistory deleted file mode 100644 index 60e86ea..0000000 --- a/.Rhistory +++ /dev/null @@ -1,512 +0,0 @@ -HU: [half_hex_up(lgt , "Fuzz" italic, 0x0070c0, 0x0070c0, white)] with .n at .0175 above HD.s -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -lgt = .2 -cor_1 = 0xccd5ae -cor_2 = 0xe9edc9 -cor_3 = 0xfefae0 -cor_4 = 0xfaedcd #d4a373 -cor_5 = 0xd7e3fc -cor_1f = 0x283618 -cor_2f = 0x606c38 -cor_3f = 0xdda15e -cor_4f = 0xbc6c25 -cor_5f = 0x3083dc -passo = .2 -thickness = .01 -define half_hex_down { -A:line down $1*(sqrt(3)/2) right $1/2 then left 2*$1 then up $1*(sqrt(3)/2) right $1/2 close color $3 fill $4 -text $2 at last .c color $5 -} -define half_hex_up { -A:line down $1*(sqrt(3)/2) left $1/2 \\ -then left $1 \\ -then up $1*(sqrt(3)/2) left $1/2 \\ -close color $3 fill $4 -text $2 at last .c color $5 -} -define hex { -A:line down $1*(sqrt(3)/2) right $1/2 \ -then down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \ -then up $1*(sqrt(3)/2) left $1/2 \ -then up $1*(sqrt(3)/2) right $1/2 \ -close color $3 fill $4 -text $2 at last .c color $5 -} -HD: [half_hex_down(lgt , "Rapid", 0x0070c0, white, 0x0070c0)] -HU: [half_hex_up(lgt , "Fuzz" italic, 0x0070c0, 0x0070c0, white)] with .n at .0175 above HD.s -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -lgt = .2 -cor_1 = 0xccd5ae -cor_2 = 0xe9edc9 -cor_3 = 0xfefae0 -cor_4 = 0xfaedcd #d4a373 -cor_5 = 0xd7e3fc -cor_1f = 0x283618 -cor_2f = 0x606c38 -cor_3f = 0xdda15e -cor_4f = 0xbc6c25 -cor_5f = 0x3083dc -passo = .2 -thickness = .01 -define half_hex_down { -A:line down $1*(sqrt(3)/2) right $1/2 then left 2*$1 then up $1*(sqrt(3)/2) right $1/2 close color $3 fill $4 -text $2 at last .c color $5 -} -define half_hex_up { -A:line down $1*(sqrt(3)/2) left $1/2 \\ -then left $1 \\ -then up $1*(sqrt(3)/2) left $1/2 \\ -close color $3 fill $4 -text $2 at last .c color $5 -} -define hex { -A:line down $1*(sqrt(3)/2) right $1/2 \ -then down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \ -then up $1*(sqrt(3)/2) left $1/2 \ -then up $1*(sqrt(3)/2) right $1/2 \ -close color $3 fill $4 -text $2 at last .c color $5 -} -HD: [half_hex_down(lgt , "Rapid", 0x0070c0, white, 0x0070c0)] -HU: [half_hex_up(lgt , "Fuzz" italic, 0x0070c0, 0x0070c0, white)] with .n at .0175 above HD.s -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -lgt = .2 -cor_1 = 0xccd5ae -cor_2 = 0xe9edc9 -cor_3 = 0xfefae0 -cor_4 = 0xfaedcd #d4a373 -cor_5 = 0xd7e3fc -cor_1f = 0x283618 -cor_2f = 0x606c38 -cor_3f = 0xdda15e -cor_4f = 0xbc6c25 -cor_5f = 0x3083dc -passo = .2 -thickness = .01 -define half_hex_down { -A:line down $1*(sqrt(3)/2) right $1/2 then left 2*$1 then up $1*(sqrt(3)/2) right $1/2 close color $3 fill $4 -text $2 at last .c color $5 -} -define half_hex_up { -A:line down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \\ -then up $1*(sqrt(3)/2) left $1/2 \\ -close color $3 fill $4 -text $2 at last .c color $5 -} -define hex { -A:line down $1*(sqrt(3)/2) right $1/2 \ -then down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \ -then up $1*(sqrt(3)/2) left $1/2 \ -then up $1*(sqrt(3)/2) right $1/2 \ -close color $3 fill $4 -text $2 at last .c color $5 -} -HD: [half_hex_down(lgt , "Rapid", 0x0070c0, white, 0x0070c0)] -HU: [half_hex_up(lgt , "Fuzz" italic, 0x0070c0, 0x0070c0, white)] with .n at .0175 above HD.s -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -lgt = .2 -cor_1 = 0xccd5ae -cor_2 = 0xe9edc9 -cor_3 = 0xfefae0 -cor_4 = 0xfaedcd #d4a373 -cor_5 = 0xd7e3fc -cor_1f = 0x283618 -cor_2f = 0x606c38 -cor_3f = 0xdda15e -cor_4f = 0xbc6c25 -cor_5f = 0x3083dc -passo = .2 -thickness = .01 -define half_hex_down { -A:line down $1*(sqrt(3)/2) right $1/2 then left 2*$1 then up $1*(sqrt(3)/2) right $1/2 close color $3 fill $4 -text $2 at last .c color $5 -} -define half_hex_up { -A:line down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \ -then up $1*(sqrt(3)/2) left $1/2 \\ -close color $3 fill $4 -text $2 at last .c color $5 -} -define hex { -A:line down $1*(sqrt(3)/2) right $1/2 \ -then down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \ -then up $1*(sqrt(3)/2) left $1/2 \ -then up $1*(sqrt(3)/2) right $1/2 \ -close color $3 fill $4 -text $2 at last .c color $5 -} -HD: [half_hex_down(lgt , "Rapid", 0x0070c0, white, 0x0070c0)] -HU: [half_hex_up(lgt , "Fuzz" italic, 0x0070c0, 0x0070c0, white)] with .n at .0175 above HD.s -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -lgt = .2 -cor_1 = 0xccd5ae -cor_2 = 0xe9edc9 -cor_3 = 0xfefae0 -cor_4 = 0xfaedcd #d4a373 -cor_5 = 0xd7e3fc -cor_1f = 0x283618 -cor_2f = 0x606c38 -cor_3f = 0xdda15e -cor_4f = 0xbc6c25 -cor_5f = 0x3083dc -passo = .2 -thickness = .01 -define half_hex_down { -A:line down $1*(sqrt(3)/2) right $1/2 then left 2*$1 then up $1*(sqrt(3)/2) right $1/2 close color $3 fill $4 -text $2 at last .c color $5 -} -define half_hex_up { -A:line down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \ -then up $1*(sqrt(3)/2) left $1/2 \ -close color $3 fill $4 -text $2 at last .c color $5 -} -define hex { -A:line down $1*(sqrt(3)/2) right $1/2 \ -then down $1*(sqrt(3)/2) left $1/2 \ -then left $1 \ -then up $1*(sqrt(3)/2) left $1/2 \ -then up $1*(sqrt(3)/2) right $1/2 \ -close color $3 fill $4 -text $2 at last .c color $5 -} -HD: [half_hex_down(lgt , "Rapid", 0x0070c0, white, 0x0070c0)] -HU: [half_hex_up(lgt , "Fuzz" italic, 0x0070c0, 0x0070c0, white)] with .n at .0175 above HD.s -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -line \\ -color blue -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -line \ -color blue -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -' -line \ -color blue -' -pikchr(' -line \\ -color blue -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -line \ -color blue -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -pikchr(' -line \ -color blue -box -', -width = "100%", -height = "auto", -align = "center", -fontFamily = "Aguafina Script") -r"(line \ -color blue -box)" -code <- "(line \ -color blue -box)" -code -## More raw strings: -r"{(\1\2)}" -r"(use both "double" and 'single' quotes)" -r"---(\1--)-)---" -str_replace("line \ -color blue -box", "\\", "_") -stringr::str_replace("line \ -color blue -box", "\\", "_") -"line \ -color blue -box" -stringr::str_replace("line \ -color blue -box", "\\\", "_") -source("~/.active-rstudio-document", echo=TRUE) -stringr::str_replace(string = "line \ -color blue -box", "\\", "_") -stringr::str_replace(string = "line \\ -color blue -box", "\\", "_") -stringr::str_replace(string = "line \\ -color blue -box", "\", "_") -"(line \\ -color blue -box)" -pkgdown::build_site() -usethis::use_vignette() -google_fonts -devtools::build_vignettes() -?family() -?family() -getRversion() -getRversion() -devtools::build_vignettes() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -devtools::build_vignettes() -devtools::build_vignettes() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -google_fonts -pkgdown::build_site() -?rsvg_png -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -usethis::use_logo() -usethis::use_logo("man/figures/pikchrHex.svg") -pkgdown::build_site() -pkgdown::build_site() -usethis::use_logo("man/figures/logo2.png") -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -usethis::use_readme_rmd() -pkgdown::build_site() -usethis::use_readme_rmd() -pkgdown::build_site() -?rsvg_png -pkgdown::build_site() -pkgdown::build_site() -devtools::build_readme() -pkgdown::build_site() -devtools::build_readme() -devtools::build_site() -usethis::use_logo("man/figures/logo.png") -pkgdown::build_site() -tools::showNonASCIIfile(file = "R/engine.R") -devtools::submit_cran() -devtools::build_vignettes() -devtools::build_vignettes() -devtools::build_vignettes() -devtools::submit_cran() -devtools::build_vignettes() -devtools::build_vignettes() -devtools::build_readme() -pkgdown::build_site() -devtools::build_readme() -pkgdown::build_site() -devtools::submit_cran() -devtools::submit_cran() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -pkgdown::build_site() -devtools::submit_cran() -devtools::submit_cran() -devtools::submit_cran() -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -') -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -') -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -') -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -', svgOnly = TRUE) -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -') -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -') -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -') -pikchr(' -arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit -', svgOnly = TRUE) -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit', svgOnly = TRUE) -result <- .Call("pikchr_c", "box", "") -result -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit', svgOnly = TRUE) -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit', svgOnly = TRUE) -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit', svgOnly = TRUE) -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit', svgOnly = TRUE) -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit', svgOnly = TRUE) -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit') -pikchr('arrow right 200% "Rmarkdown" "Source" -box rad 10px "Rmarkdown" "(knitr)" fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" fit') -stringr::str_extract("", "(?<=(viewBox=\")).*?(?=(\"))") -devtools::submit_cran() -pkgdown::build_site() -pkgdown::build_site_github_pages() -pkgdown::build_favicons(overwrite = TRUE) -pkgdown::build_site() -pkgdown::build_favicons(overwrite = TRUE) -pkgdown::build_site() -library(pikchr) -pikchr(' -/* -basic example code -*/ -arrow right 200% "Rmarkdown" "Source" # teste -box rad 10px "Rmarkdown" "(knitr)" bold fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" bold fit -', -width = "75%", -height = "auto", -fontSize = '75%', -fontFamily = "Flamenco") -pikchr(' -/* -basic example code -*/ -arrow right 200% "Rmarkdown" "Source" # teste -box rad 10px "Rmarkdown" "(knitr)" bold fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" bold fit -', -width = "100%", -height = "auto", -fontSize = '75%', -fontFamily = "Flamenco") -pikchr(' -/* -basic example code -*/ -arrow right 200% "Rmarkdown" "Source" # teste -box rad 10px "Rmarkdown" "(knitr)" bold fit -arrow right 200% "HTML+SVG" "Output" -arrow <-> down from last box.s -box same "Pikchr" "(pikchr.c)" bold fit -', -width = "100%", -height = "auto", -fontSize = '90%', -fontFamily = "Flamenco") -pkgdown::build_site() -pkgdown::build_site() diff --git a/.gitignore b/.gitignore index c7868d5..e25ea78 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ README.html docs/ CLAUDE.md .claude/ +.Rhistory diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION index 6ec960a..961dfdd 100644 --- a/CRAN-SUBMISSION +++ b/CRAN-SUBMISSION @@ -1,3 +1,3 @@ -Version: 1.1.0 -Date: 2026-04-07 19:18:28 UTC -SHA: 10242b27ebc1baaed46a559a5181e11a4e20e3fc +Version: 1.1.1 +Date: 2026-06-14 18:27:06 UTC +SHA: 0f73f9d419a2a24b6630dda81034faa81759242b diff --git a/NAMESPACE b/NAMESPACE index cf77e8a..64aec6e 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -12,4 +12,4 @@ importFrom(htmltools,browsable) importFrom(htmltools,tags) importFrom(rsvg,rsvg_png) importFrom(stringr,str_replace) -useDynLib(pikchr) +useDynLib(pikchr, pikchr_c) diff --git a/R/pikchrWrappers.R b/R/pikchrWrappers.R index 8af0f24..dfc42aa 100644 --- a/R/pikchrWrappers.R +++ b/R/pikchrWrappers.R @@ -25,7 +25,7 @@ #' box same "Pikchr" "(pikchr.c)" fit #' ') #' } -#' @useDynLib pikchr +#' @useDynLib pikchr, pikchr_c #' @import htmltools #' @import utils #' @import stringr @@ -47,7 +47,7 @@ pikchr <- function(code, code_clean <- stringr::str_replace_all(code, "\\\\*\\s*\\n\\s*then", " then") - result <- .Call("pikchr_c", code_clean, class) + result <- .Call(pikchr_c, code_clean, class) if (is.null(margin)) {