From f0083d0dd498cf11c64d9a276b46e0c445a46f1c Mon Sep 17 00:00:00 2001
From: Raphael Winkelmann <raphael.winkelmann@gmx.de>
Date: Wed, 15 Jun 2016 15:12:22 +0200
Subject: [PATCH 1/2] added git & RStudio project files

---
 .Rbuildignore |  2 ++
 .gitignore    |  4 ++++
 PraatR.Rproj  | 17 +++++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 .Rbuildignore
 create mode 100644 .gitignore
 create mode 100644 PraatR.Rproj

diff --git a/.Rbuildignore b/.Rbuildignore
new file mode 100644
index 0000000..91114bf
--- /dev/null
+++ b/.Rbuildignore
@@ -0,0 +1,2 @@
+^.*\.Rproj$
+^\.Rproj\.user$
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5b6a065
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.Rproj.user
+.Rhistory
+.RData
+.Ruserdata
diff --git a/PraatR.Rproj b/PraatR.Rproj
new file mode 100644
index 0000000..b1ded45
--- /dev/null
+++ b/PraatR.Rproj
@@ -0,0 +1,17 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: knitr
+LaTeX: pdfLaTeX
+
+BuildType: Package
+PackageUseDevtools: Yes
+PackageInstallArgs: --no-multiarch --with-keep.source

From 67938fe6fc24a4752d0c0cabc1ce4c8c0026926a Mon Sep 17 00:00:00 2001
From: Raphael Winkelmann <raphael.winkelmann@gmx.de>
Date: Wed, 15 Jun 2016 15:15:27 +0200
Subject: [PATCH 2/2] as praatcon.exe doesn't exist any more use praat.exe
 instead

bit hacky as PraatR/praat.exe is probably not a good place for people
to have their default praat.ext installed. (Will probably lead to
multiple praat versions on the same system... using
Programs/Programs(x86) Folder is probably a better option in my opinion)
---
 R/praat.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/R/praat.R b/R/praat.R
index 0f24a72..84d5fbf 100644
--- a/R/praat.R
+++ b/R/praat.R
@@ -381,7 +381,7 @@ SystemName = Sys.info()["sysname"] # "Windows", "Linux", or "Darwin" (=Mac)
 if( OSType=="windows" & SystemName=="Windows" ){
 	UserOS = "Windows" # For later down below in the code
 	# Make list of possible file paths and find which ones exist
-	PossiblePraatPaths = paste(LibraryDirectories,InterveningSlashes,"PraatR/praatcon.exe",sep="")
+	PossiblePraatPaths = paste(LibraryDirectories,InterveningSlashes,"PraatR/praat.exe",sep="")
 	ExistingPraatPaths = file.exists(PossiblePraatPaths)
 	# If praatcon.exe can't be found anywhere, issue an error message and stop computation
 	if( sum(ExistingPraatPaths)==0 ){ stop("Could not find praatcon.exe. Make sure PraatR is properly installed.") }