diff --git a/Dockerfile b/Dockerfile index b974b05..721a308 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,9 +45,9 @@ RUN Rscript -e 'library(devtools); install_version("devoid", "0.1.1", repos="htt RUN Rscript -e 'library(devtools); install_version("gridBezier", "1.1-1", repos="https://cran.rstudio.com/")' # Using COPY will update (invalidate cache) if the tar ball has been modified! -COPY dvir_0.3-0.tar.gz /tmp/ -RUN R CMD INSTALL /tmp/dvir_0.3-0.tar.gz -# RUN Rscript -e 'devtools::install_github("pmur002/dvir@v0.3-0")' +# COPY dvir_0.3-0.tar.gz /tmp/ +# RUN R CMD INSTALL /tmp/dvir_0.3-0.tar.gz +RUN Rscript -e 'devtools::install_github("pmur002/dvir@v0.3-0")' RUN apt-get install -y locales && locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/Makefile b/Makefile index 7d4a9bb..f89cf29 100755 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ docker: web: make docker - cp -r ../dvir-tikz-report/* ~/Web/Reports/dvir/luatex/ + cp -r ../dvir-tikz-report/* ~/Web/Reports/dvir/tikz/ zip: make docker diff --git a/Marketing/Rlogo.png b/Marketing/Rlogo.png new file mode 100644 index 0000000..be48e30 Binary files /dev/null and b/Marketing/Rlogo.png differ diff --git a/Marketing/dvir.png b/Marketing/dvir.png index 9518dc8..b141263 100644 Binary files a/Marketing/dvir.png and b/Marketing/dvir.png differ diff --git a/Marketing/image.R b/Marketing/image.R index 6499db1..3ed80c8 100644 --- a/Marketing/image.R +++ b/Marketing/image.R @@ -6,14 +6,47 @@ library(dvir) -png("dvir.png", width=200, height=100) +png("dvir.png", width=200, height=100, bg="white") grid.newpage() grid.tikzpicture(" -\\path (0, 0) node[circle,minimum size=.5in,fill=blue!20,draw,thick] (x) {\\sffamily{R}} - (3, 0) node[circle,minimum size=.5in,fill=blue!20,draw,thick] (y) {Ti{\\it k}Z!}; -\\draw[-{Stealth[length=4mm]}, decorate, decoration={zigzag, post=curveto, post length=5mm}] (x) .. controls (1, 1) and (2, 1) .. (y); -\\draw[-{Stealth[length=4mm]}, decorate, decoration={zigzag, post=curveto, post length=5mm}] (y) .. controls (2, -1) and (1, -1) .. (x); +\\path (0, 0) node[circle,minimum size=.5in,fill=blue!10,draw,thick] (x) {{\\sffamily R}} + (3, 0) node[circle,minimum size=.5in,fill=blue!10,draw,thick] (y) {Ti{\\it k}Z!}; +\\draw[decorate, decoration={zigzag, post=curveto, post length=5mm}] (x) .. controls (1, 1) and (2, 1) .. (y); +\\draw[decorate, decoration={zigzag, post=curveto, post length=5mm}] (y) .. controls (2, -1) and (1, -1) .. (x); ", preamble=tikzpicturePreamble(packages=c("decorations.pathmorphing", "arrows.meta"))) +## Draw R logo over text "R" ? +Rgrob <- grid.get("text", grep=TRUE) +library(png) +logo <- readPNG("Rlogo.png") +downViewport(Rgrob$vp) +grid.raster(logo, + x=Rgrob$x + 0.5*stringWidth("R"), + y=Rgrob$y + 0.5*stringHeight("R"), + height=unit(7, "mm"), + hjust=.55) +upViewport(0) +grid.remove("text", grep=TRUE) +## Draw better arrows ? +library(gridGeometry) +library(vwline) +edges <- grid.get("polyline", grep=TRUE, global=TRUE) +curveArrow <- function(i) { + pts <- grobCoords(edges[[i]], closed=FALSE) + segs <- trim(pts, + from=unit(c(1, -3), c("npc", "mm")), + to=unit(c(-4, -5), c("mm", "mm"))) + arrow1 <- offsetXsplineGrob(segs[[1]]$x, segs[[1]]$y, default.units="in", + shape=1, + w=widthSpline(unit(c(2, 0), "mm"))) + arrow2 <- offsetXsplineGrob(segs[[2]]$x, segs[[2]]$y, default.units="in", + shape=1, + w=widthSpline(unit(c(4, 0), "mm"))) + arrow <- polyclipGrob(arrow1, arrow2, "minus", + gp=gpar(fill="black")) + grid.draw(arrow) +} +curveArrow(1) +curveArrow(2) dev.off() diff --git a/dvir-tikz.Rhtml b/dvir-tikz.Rhtml index 4c9dedf..6927e1d 100644 --- a/dvir-tikz.Rhtml +++ b/dvir-tikz.Rhtml @@ -1163,11 +1163,11 @@ tikz files, causing the LaTeX compilation to fail."

Murrell, P. (2020). "Adding TikZ support to 'dvir'" - Technical Report 2020-??, Department of Statistics, + Technical Report 2020-05, Department of Statistics, The University of Auckland. version 1. [ bib | - DOI | - http ] + DOI | + http ]

9. References

diff --git a/dvir-tikz.cml b/dvir-tikz.cml index c364e08..7b1b984 100755 --- a/dvir-tikz.cml +++ b/dvir-tikz.cml @@ -1197,11 +1197,11 @@ tikz files, causing the LaTeX compilation to fail."

Murrell, P. (2020). "Adding TikZ support to 'dvir'" - Technical Report 2020-??, Department of Statistics, + Technical Report 2020-05, Department of Statistics, The University of Auckland. version 1. [ bib | - DOI | - http ] + DOI | + http ]

References

diff --git a/dvir-tikz.html b/dvir-tikz.html index 3c83fdf..49e25de 100644 --- a/dvir-tikz.html +++ b/dvir-tikz.html @@ -95,7 +95,7 @@

Adding TikZ support to 'dvir'

by Paul Murrellhttp://orcid.org/0000-0002-3224-8858

Version 1: -Wednesday 18 November 2020 +Tuesday 24 November 2020

@@ -664,7 +664,7 @@

Generating DVI output

  pre          version=2, num=25400000, den=473628672, mag=1000,
-               comment= TeX output 2020.11.18:2029
+               comment= TeX output 2020.11.24:2202
   bop          counters=1 0 0 0 0 0 0 0 0 0, p=-1
   down4        a=1069005536
   push
@@ -1288,11 +1288,11 @@ 

How to cite this document

Murrell, P. (2020). "Adding TikZ support to 'dvir'" - Technical Report 2020-??, Department of Statistics, + Technical Report 2020-05, Department of Statistics, The University of Auckland. version 1. [ bib | - DOI | - http ] + DOI | + http ]

9. References

diff --git a/dvir-tikz.xml b/dvir-tikz.xml index c83f7a3..47af7ee 100644 --- a/dvir-tikz.xml +++ b/dvir-tikz.xml @@ -1101,11 +1101,11 @@ tikz files, causing the LaTeX compilation to fail."

Murrell, P. (2020). "Adding TikZ support to 'dvir'" - Technical Report 2020-??, Department of Statistics, + Technical Report 2020-05, Department of Statistics, The University of Auckland. version 1. [ bib | - DOI | - http ] + DOI | + http ]

9. References

diff --git a/dvir_0.3-0.tar.gz b/dvir_0.3-0.tar.gz index 9f1c633..8990d4d 100644 Binary files a/dvir_0.3-0.tar.gz and b/dvir_0.3-0.tar.gz differ diff --git a/how-to-cite.bib b/how-to-cite.bib index 1f2f023..a596bc4 100644 --- a/how-to-cite.bib +++ b/how-to-cite.bib @@ -4,7 +4,7 @@ @techreport{murrell-dvir-tikz-2020 year={2020}, note={version 1}, institution={Department of Statistics, The University of Auckland}, - number={2020-??}, - url={}, - doi={http://dx.doi.org/} + number={2020-05}, + url={https://stattech.blogs.auckland.ac.nz/2020/11/25/2020-05-adding-tikz-support-to-dvir}, + doi={http://dx.doi.org/10.17608/k6.auckland.13283900} } diff --git a/tex.dvi b/tex.dvi index d875c2f..fd3dc4f 100644 Binary files a/tex.dvi and b/tex.dvi differ diff --git a/tex.log b/tex.log index 312a642..0f97322 100644 --- a/tex.log +++ b/tex.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 18 NOV 2020 20:29 +This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 24 NOV 2020 22:02 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/tikz.dvi b/tikz.dvi index 18b5ad4..7daffb5 100644 Binary files a/tikz.dvi and b/tikz.dvi differ diff --git a/tikz.log b/tikz.log index 299d467..f26898d 100644 --- a/tikz.log +++ b/tikz.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 18 NOV 2020 20:29 +This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 24 NOV 2020 22:02 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/tikzR.dvi b/tikzR.dvi index 0cfc451..636fd79 100644 Binary files a/tikzR.dvi and b/tikzR.dvi differ diff --git a/tikzR.log b/tikzR.log index 18d5b67..a3a3b86 100644 --- a/tikzR.log +++ b/tikzR.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 18 NOV 2020 20:29 +This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 24 NOV 2020 22:02 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/tikzRlabel.dvi b/tikzRlabel.dvi index 2d9ed5c..e963b39 100644 Binary files a/tikzRlabel.dvi and b/tikzRlabel.dvi differ diff --git a/tikzRlabel.log b/tikzRlabel.log index 043e988..3472807 100644 --- a/tikzRlabel.log +++ b/tikzRlabel.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 18 NOV 2020 20:29 +This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 24 NOV 2020 22:02 entering extended mode restricted \write18 enabled. %&-line parsing enabled. diff --git a/tikzSVG.dvi b/tikzSVG.dvi index 4acff47..0192404 100644 Binary files a/tikzSVG.dvi and b/tikzSVG.dvi differ diff --git a/tikzSVG.log b/tikzSVG.log index d9fb4e1..4dee244 100644 --- a/tikzSVG.log +++ b/tikzSVG.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 18 NOV 2020 20:29 +This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=latex 2020.11.16) 24 NOV 2020 22:02 entering extended mode restricted \write18 enabled. %&-line parsing enabled.