Revert "DocBook: add new layout parameter DocBookWrapperMergeWithPrevious."

[lyx.git] / lib / scripts / lyxknitr.R

diff --git a/lib/scripts/lyxknitr.R b/lib/scripts/lyxknitr.R
index 7c029ead06adf29de3f7dc406d38db139472ab75..438b40a3e7df7fdde0773d11d75c164213e55019 100644 (file)
--- a/lib/scripts/lyxknitr.R
+++ b/lib/scripts/lyxknitr.R
@@ -21,12 +21,8 @@
 ## $$e encoding (e.g. 'UTF-8')
 
 library(knitr)
-
 .cmdargs = commandArgs(TRUE)
 
-.orig.enc = getOption("encoding")
-options(encoding = .cmdargs[3])
-
 ## the working directory is the same with the original .lyx file; you
 ## can put your data files there and functions like read.table() can
 ## work correctly without specifying the full path
@@ -34,4 +30,11 @@ setwd(.cmdargs[4])
 opts_knit$set(root.dir = getwd())
 
 ## run knit() to get .tex or .R
-knit(.cmdargs[1], output = .cmdargs[2], tangle = 'tangle' %in% .cmdargs)
+if (is.null(formals(knit)$encoding)) {
+  .orig.enc = getOption("encoding")
+  options(encoding = .cmdargs[3])
+  knit(.cmdargs[1], output = .cmdargs[2], tangle = 'tangle' %in% .cmdargs)
+} else {
+  knit(.cmdargs[1], output = .cmdargs[2], encoding = .cmdargs[3],
+       tangle = 'tangle' %in% .cmdargs)
+}