Commit 26fbce29 authored by Greg Wilson's avatar Greg Wilson
Browse files

Updating mailmap

parents b5b5777d 83a83c87

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ Francois Michonneau <francois.michonneau@gmail.com> <francois.michonneau@gmail.C 
Raniere Silva <raniere@ime.unicamp.br> <ra092767@ime.unicamp.br>

Amy Brown <arbrown@latte.ca> <amyrhoda@gmail.com>

Ivan Gonzalez <iglpdc@gmail.com> <iglpdc@users.noreply.github.com>

Michael Jackson <michaelj@epcc.ed.ac.uk>

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ preview : $(DST_ALL) 
%.html : %.md _layouts/page.html $(FILTERS)

	${PANDOC} -s -t html \

	    ${PANDOC_FLAGS} \

	    --mathjax \

	    --template=_layouts/page \

	    --filter=tools/filters/blockquote2div.py \

	    --filter=tools/filters/id4glossary.py \
@@ -55,7 +56,8 @@ preview : $(DST_ALL) 
	    -o $@ $<



# Pattern to convert R Markdown to Markdown.

%.md: %.Rmd $(R_CHUNK_OPTS)

%.md: %.Rmd $(R_CHUNK_OPTS) tools/check_knitr_version.R

	Rscript -e "source('tools/check_knitr_version.R')"

	Rscript -e "knitr::knit('$$(basename $<)', output = '$$(basename $@)')"



## commands : Display available commands.

_includes/javascript.html

+11 −0
Original line number Diff line number Diff line 
<!-- Javascript placed at the end of the document so the pages load faster -->

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>

<script src="css/bootstrap/bootstrap-js/bootstrap.js"></script>

<script src='https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'></script>

<script>

  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');



  ga('create', 'UA-37305346-2', 'auto');

  ga('send', 'pageview');



</script>

tools/check_knitr_version.R

0 → 100644
+5 −0
Original line number Diff line number Diff line 
if (require("knitr")) {

    if (packageVersion("knitr") < '1.9.19') {

        stop("knitr must be version 1.9.20 or higher")

    }

} else stop("knitr 1.9.20 or above is needed to build the lessons.")

tools/chunk-options.R

+9 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ opts_chunk$set(tidy = FALSE, results = "markup", comment = NA, 
               fig.align = "center", fig.path = "fig/")



# The hooks below add html tags to the code chunks and their output so that they

# are properly formatted when the site is built with jekyll.

# are properly formatted when the site is built.

hook_in <- function(x, options) {

  stringr::str_c("\n\n~~~{.r}\n",

                 paste0(x, collapse="\n"),
@@ -22,5 +22,11 @@ hook_out <- function(x, options) { 
                 "\n~~~\n\n")

}



knit_hooks$set(source = hook_in, output = hook_out, warning = hook_out,

               error = hook_out, message = hook_out)
 
hook_error <- function(x, options) {

  stringr::str_c("\n\n~~~{.error}\n",

                 paste0(x, collapse="\n"),

                 "\n~~~\n\n")

}



knit_hooks$set(source = hook_in, output = hook_out, warning = hook_error,

               error = hook_error, message = hook_out)