Merge pull request #29 from cpsievert/linking

2nd edition

.gitignore

@@ -9,7 +9,14 @@ crc/*
 tmp.*
 vignettes/
 rsconnect/
-plotly_book.*
+plotly_book.knit.md
+plotly_book.utf8.md
+plotly_book.log
 screenshots/
+videos/
+.httr-oauth
+crossfilter/
+crossfilter-compare/
+crossfilter-reactlog/
 images/
 !docs/images

DESCRIPTION

@@ -1,20 +1,47 @@
 Package: plotlyBook
 Title: This is not really an R package, but this is here to list the dependencies for building the output from source.
 Version: 0.1
-Authors@R: person("First", "Last", email = "first.last@example.com",
+Authors@R: person("Carson", "Sievert", email = "cpsievert1@gmail.com",
                   role = c("aut", "cre"))
 Depends: R (>= 3.1.0)
 URL: https://github.com/cpsievert/plotly_book
 Imports:
+  tidyverse,
+  shiny,
+  plotly,
+  reactR,
   broom,
   forecast,
-  shiny,
-  dplyr,
   quantmod,
-  rmarkdown,
   bookdown,
-  tidyr,
-  webshot
+  sf,
+  rnaturalearth,
+  cartogram,
+  albersusa,
+  geojsonio,
+  rsvg,
+  withr,
+  USAboundaries,
+  tidycensus,
+  nycflights13,
+  babynames,
+  trelliscopejs,
+  ggstat,
+  ggforce,
+  ggmosaic,
+  ggalt,
+  GGally,
+  naniar,
+  leaflet,
+  colorspace,
+  idbr,
+  emo
 SystemRequirements: pandoc (>= 1.12.3) - http://johnmacfarlane.net/pandoc
 Remotes:
-  ropensci/plotly
+  ropensci/plotly,
+  ramnathv/htmlwidgets,
+  react-R/reactR,
+  yihui/knitr#1650,
+  hadley/ggstat,
+  hadley/emo,
+  hrbrmstr/albersusa

Makefile

@@ -6,9 +6,10 @@ gitbook:
 pdf:
 	mkdir -p docs/images && cp images/* docs/images
 	Rscript --quiet _render.R "bookdown::pdf_book"
-	# copy over final tex/images for thesis
-	cp docs/plotly_book.tex ../phd-thesis/
-	mkdir -p ../phd-thesis/images && cp docs/images/*.pdf ../phd-thesis/images
+
+dashboard:
+	Rscript -e "rmarkdown::render('flexdashboard/index.Rmd')"
+	cp flexdashboard/index.html docs/flexdashboard.html
 
 clean:
 	rm -r _bookdown_files/

_bookdown.yml

@@ -3,13 +3,29 @@ chapter_name: ""
 repo: https://github.com/cpsievert/plotly_book
 output_dir: docs
 clean: [packages.bib, bookdown.bbl]
+delete_merged_file: true
 rmd_files: [
   "index.Rmd",
-  "ggplotly-vs-plotly.Rmd",
-  "plotly-cookbook.Rmd",
+  "introduction.Rmd",
+  "creating-overview.Rmd",
+  "creating-scatter.Rmd",
+  "creating-maps.Rmd",
+  "creating-bars.Rmd",
+  "creating-other.Rmd",
+  "publishing.Rmd",
   "arranging.Rmd",
-  "linked-views.Rmd",
   "animation.Rmd",
-  "advanced.Rmd",
-  "references.Rmd"
-]
+  "linked-views.Rmd",
+  "linked-views-examples.Rmd",
+  "linked-views-shiny.Rmd",
+  #"scaling.Rmd",
+  "javascript.Rmd",
+  "topics.Rmd",
+  #"develop.Rmd",
+  "references.Rmd",
+  "figure-refs.Rmd"
+]
+language:
+  label:
+    fig: "FIGURE "
+    tab: "TABLE "

_output.yml

@@ -1,28 +1,37 @@
 bookdown::gitbook:
-  css: [css/plotly.css, css/style.css]
-  split_by: section
+  css: [css/plotly.css, css/style.css, css/summary-fix.css]
+  split_by: chapter
   config:
     toc:
-      collapse: subsection
-      before: |
-        <li><a href="https://consulting.cpsievert.me">Need help? Work with Carson!</a></li>
-      after: |
-        <li><a href="https://bookdown.org" target="blank">Published with bookdown</a></li>
+      collapse: section
     download: no
     edit:
       link: https://github.com/cpsievert/plotly_book/edit/master/%s
       text: "Edit"
     sharing: no
   includes:
     after_body:
+      - includes/rstudio-cloud.html
       - includes/ga.html
 
 bookdown::html_chapters:
   css: [css/style.css, css/toc.css]
 
 bookdown::pdf_book:
   includes:
-    in_header: preamble.tex
-  keep_tex: yes
+    in_header: latex/preamble.tex
+    before_body: latex/before_body.tex
+    after_body: latex/after_body.tex
+  keep_tex: true
+  dev: "cairo_pdf"
   latex_engine: xelatex
-  citation_package: natbib
+  citation_package: natbib
+  template: null
+  pandoc_args: --top-level-division=chapter
+  toc_depth: 3
+  toc_unnumbered: false
+  toc_appendix: true
+  quote_footer: ["\\VA{", "}{}"]
+
+bookdown::epub_book:
+  stylesheet: css/style.css

_redirects

@@ -1 +1,12 @@
 https://plotly-book.cpsievert.me/* https://plotly-r.com/:splat 301!
+
+# redirect some links from from the 1st edition
+https://plotly-r.com/plot-ly-for-collaboration.html https://plotly-r.com
+
+https://plotly-r.com/extending-ggplotly.html https://plotly-r.com/improving-ggplotly.html
+
+https://plotly-r.com/the-plotly-cookbook.html https://plotly-r.com/overview.html
+
+https://plotly-r.com/installation.html https://plotly-r.com/introduction.html#run-code-examples
+
+https://plotly-r.com/merging-plotly-objects.html https://plotly-r.com/arranging-views.html#arranging-plotly-objects