Merge upstream

Merge branch 'djnavarro-master' # Conflicts: # _book/navarro2_files/figure-html/corr-1.png # _book/navarro2_files/figure-html/kurtosis-1.png # _book/navarro2_files/figure-html/skewness-1.png # _book/search_index.json # _bookdown_files/navarro2_files/figure-html/corr-1.png # _bookdown_files/navarro2_files/figure-html/kurtosis-1.png # _bookdown_files/navarro2_files/figure-html/skewness-1.png # bookdown/_book/anova2.html # bookdown/_book/chisquare.html # bookdown/_book/datahandling.html # bookdown/_book/descriptives.html # bookdown/_book/graphics.html # bookdown/_book/index.html # bookdown/_book/mechanics.html # bookdown/_book/scripting.html # bookdown/_book/ttest.html
snowdj · Dec 31, 2018 · dbb47ea · dbb47ea
2 parents 4b8eb20 + 8aeeb95
commit dbb47ea
Show file tree

Hide file tree

Showing 2,837 changed files with 57,624 additions and 102,781 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,12 @@
-# tex output to ignore
-lsr.ps
-lsr.aux
-lsr.bbl
-lsr.brf
-lsr.log
-lsr.out
-lsr.synctex.gz
-lst.toc
+# tex output to ignore from "original"
+original/lsr.ps
+original/lsr.aux
+original/lsr.bbl
+original/lsr.brf
+original/lsr.log
+original/lsr.out
+original/lsr.synctex.gz
+original/lst.toc
 
 # History files
 .Rhistory

diff --git a/README.Rmd b/README.Rmd
@@ -0,0 +1,28 @@
+---
+output: github_document
+---
+
+<!-- README.md is generated from README.Rmd. Please edit that file -->
+
+```{r setup, include = FALSE}
+knitr::opts_chunk$set(
+  collapse = TRUE,
+  comment = "#>"
+)
+```
+
+# Learning statistics with R
+
+This repository contains all the source materials for *Learning Statistics with R*. There are two versions of the content, the `original` version (LSR v0.6) written in LaTeX and the `bookdown` adaptation (LSR v0.6.1). The two versions are kept in distinct folders to ensure they share no dependencies.
+
+## Bookdown
+
+To generate the bookdown version, source the `bookdown/serve_book.R` script. The generated book appears in the `bookdown/_book` subdirectory. 
+
+## Original
+
+To typeset the original LaTeX version, the root file is `original/pdf/lsr.tex`, and the generated file is the `original/pdf/lsr.pdf` file it produces. 
+
+## Docs
+
+GitHub pages deploys the site from the `docs` directory; to publish an updated version of the bookdown version to https://learningstatisticswithr.com just copy the entire contents of `bookdown/_book` to `docs/book`, and push to GitHub. 
diff --git a/README.md b/README.md
@@ -1,7 +1,21 @@
-# Learning statistics with R
 
-Contains LaTeX source for:
+<!-- README.md is generated from README.Rmd. Please edit that file -->
+Learning statistics with R
+==========================
 
-DJ Navarro (2018). *Learning statistics with R: A tutorial for psychology students and other beginners.* (Version 0.6). https://learningstatisticswithr.com
+This repository contains all the source materials for *Learning Statistics with R*. There are two versions of the content, the `original` version (LSR v0.6) written in LaTeX and the `bookdown` adaptation (LSR v0.6.1). The two versions are kept in distinct folders to ensure they share no dependencies.
 
-Scripts to generate the images are included, as are the data sets from which they are drawn. In principle, this repository and the `lsr` package itself should include everything needed to reproduce the book from scratch. The book is open access, and released under a creative commons [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) licence.
+Bookdown
+--------
+
+To generate the bookdown version, source the `bookdown/serve_book.R` script. The generated book appears in the `bookdown/_book` subdirectory.
+
+Original
+--------
+
+To typeset the original LaTeX version, the root file is `original/pdf/lsr.tex`, and the generated file is the `original/pdf/lsr.pdf` file it produces.
+
+Docs
+----
+
+GitHub pages deploys the site from the `docs` directory; to publish an updated version of the bookdown version to <https://learningstatisticswithr.com> just copy the entire contents of `bookdown/_book` to `docs/book`, and push to GitHub.
diff --git a/_book/01.00-Part1.md b/_book/01.00-Part1.md
diff --git a/_book/01.01-intro.md b/_book/01.01-intro.md
diff --git a/_book/01.02-studydesign.md b/_book/01.02-studydesign.md
diff --git a/_book/02.00-Part2.md b/_book/02.00-Part2.md
diff --git a/_book/02.03-introR.md b/_book/02.03-introR.md
diff --git a/_book/02.04-mechanics.md b/_book/02.04-mechanics.md
diff --git a/_book/03.00-Part3.md b/_book/03.00-Part3.md
diff --git a/_book/03.05-descriptives.md b/_book/03.05-descriptives.md
diff --git a/_book/03.05-descriptives_files/figure-html/corr-1.png b/_book/03.05-descriptives_files/figure-html/corr-1.png
diff --git a/_book/03.05-descriptives_files/figure-html/kurtosis-1.png b/_book/03.05-descriptives_files/figure-html/kurtosis-1.png
diff --git a/_book/03.05-descriptives_files/figure-html/skewness-1.png b/_book/03.05-descriptives_files/figure-html/skewness-1.png
diff --git a/_book/03.06-graphics.md b/_book/03.06-graphics.md
diff --git a/_book/03.07-datahandling.md b/_book/03.07-datahandling.md
diff --git a/_book/03.08-scripting.md b/_book/03.08-scripting.md
diff --git a/_book/04.00-Part4.md b/_book/04.00-Part4.md