tweaks

trinker · Jun 15, 2014 · 92ab433 · 92ab433
1 parent 18b9e0c
commit 92ab433
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 421 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -6,8 +6,6 @@ qdap.Rproj
 ^\.gitattributes
 tools.R
 maintenance.R
-extra_statdoc
-pdf_gen
 ^\.Rprofile
 style.R
 inst/polarity
@@ -35,7 +33,7 @@ NEWS.md
 FAQ.md
 NEWS.html
 FAQ.html
-demos
+inst/demos
 ^\.travis\.yml$
 inst/qdap_Demonstration
 inst/staticdocs
@@ -59,5 +57,15 @@ inst/Rmd_vignette/qdap_vignette.html
 inst/Rmd_vignette/qdap_vignette.md
 inst/Rmd_vignette/qdap_vignette.Rproj
 inst/Rmd_vignette/figure
+inst/extra_statdoc
+inst/polarity
+inst/qdap_Demonstration
+inst/Scraping_Word_Lists
+inst/staticdocs
+inst/web
+inst/pdf_gen
+inst/demos/discoursemap
+
+
 
 
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,7 +28,7 @@ Imports:
     reports,
     reshape2,
     scales,
-    tm,
+    tm (>= 0.6),
     tools,
     venneuler,
     wordcloud,

diff --git a/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_NEW_VERSION/new_project.R b/inst/AFTER_REPORTS_UPDATES/NEWPROJECT_NEW_VERSION/new_project.R