From 15310e262a7970e3eb4996d8857ab3d8732f3f17 Mon Sep 17 00:00:00 2001 From: sagirumati Date: Tue, 24 Oct 2023 08:57:30 +0300 Subject: [PATCH] updated --- DESCRIPTION | 8 ++++---- NEWS.md | 3 +-- R/eviews_graph.R | 2 ++ R/import_graph.R | 2 +- man/EviewsR-package.Rd | 2 +- man/import_kable.Rd | 10 +++++----- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7636c09..77d1519 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,10 +1,10 @@ Package: EviewsR Type: Package Title: A Seamless Integration of 'EViews' and R -Version: 0.1.5 +Version: 0.1.6 Authors@R: c( - person("Sagiru", "Mati", role = c("aut", "cre"), email = "smati@smati.com.ng",comment=c(ORCID="0000-0003-1413-3974"))) -Maintainer: Sagiru Mati + person("Sagiru", "Mati", role = c("aut", "cre"), email = "sagirumati@gmail.com",comment=c(ORCID="0000-0003-1413-3974"))) +Maintainer: Sagiru Mati Description: It allows running 'EViews'() program from R, R Markdown and Quarto documents. 'EViews' (Econometric Views) is a statistical software for Econometric analysis. This package integrates 'EViews' and R and also serves as an 'EViews' Knit-Engine for 'knitr' package. Write all your 'EViews' commands in R, R Markdown or Quarto documents. Depends: R (>= 3.4.0) Imports: knitr (>= 1.20), magrittr, xts, zoo @@ -15,7 +15,7 @@ URL: https://CRAN.R-project.org/package=EviewsR BugReports: https://github.com/sagirumati/EviewsR/issues Encoding: UTF-8 VignetteBuilder: knitr -RoxygenNote: 7.2.1 +RoxygenNote: 7.2.3 NeedsCompilation: no Packaged: 2022-08-08 15:31:44 UTC; Sagiru Repository: CRAN diff --git a/NEWS.md b/NEWS.md index 974bbb5..7e0c991 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,8 +2,7 @@ What's new? -* `import_graph`function now uses chunk option `graph_procs`, however the chunk option is overwritten by `graph_procs` function argument. -* Bug fixes: `graph_procs` is now working in import_graph function +* `import_graph()` and `eviews_graph()` functions now use chunk option `graph_procs`, if the function argument `graph_procs=""`. * Bug fixes: `graph_procs` is now working in chunk options diff --git a/R/eviews_graph.R b/R/eviews_graph.R index bbb553a..c24a583 100644 --- a/R/eviews_graph.R +++ b/R/eviews_graph.R @@ -40,6 +40,8 @@ #' @export eviews_graph=function(wf="",page="*",series="*",group=FALSE,graph_command="line",graph_options="",mode="overwrite",graph_procs="",datelabel="",save_options='',save_path="",frequency="m",start_date="",save_copy=TRUE){ + if(identical(graph_procs,"") && !is.null(opts_current$get('graph_procs'))) graph_procs=opts_current$get('graph_procs') + if(is.xts(series)) series=data.frame(date=index(series),coredata(series)) if(wf!="" && save_path=="") save_path=dirname(wf) diff --git a/R/import_graph.R b/R/import_graph.R index 027d042..e596ae8 100644 --- a/R/import_graph.R +++ b/R/import_graph.R @@ -44,7 +44,7 @@ import_graph=function(wf="",page="*",graph="*",graph_procs="",save_options="",sa chunkLabel=opts_current$get("label") dev=opts_current$get('dev') - if(graph_procs=="" && !is.null(opts_current$get('graph_procs'))) graph_procs=opts_current$get('graph_procs') + if(identical(graph_procs,"") && !is.null(opts_current$get('graph_procs'))) graph_procs=opts_current$get('graph_procs') graph1=graph diff --git a/man/EviewsR-package.Rd b/man/EviewsR-package.Rd index f312e80..581ab7c 100644 --- a/man/EviewsR-package.Rd +++ b/man/EviewsR-package.Rd @@ -38,7 +38,7 @@ Other important functions: \code{\link{set_eviews_path}()} } \author{ -\strong{Maintainer}: Sagiru Mati \email{smati@smati.com.ng} (\href{https://orcid.org/0000-0003-1413-3974}{ORCID}) +\strong{Maintainer}: Sagiru Mati \email{sagirumati@gmail.com} (\href{https://orcid.org/0000-0003-1413-3974}{ORCID}) } \concept{important functions} diff --git a/man/import_kable.Rd b/man/import_kable.Rd index 2fa5b0d..6ae9b88 100644 --- a/man/import_kable.Rd +++ b/man/import_kable.Rd @@ -48,11 +48,11 @@ import_kable( \item{format}{A character string. Possible values are \code{latex}, \code{html}, \code{pipe} (Pandoc's pipe tables), \code{simple} (Pandoc's -simple tables), and \code{rst}. The value of this argument will be -automatically determined if the function is called within a \pkg{knitr} -document. The \code{format} value can also be set in the global option -\code{knitr.table.format}. If \code{format} is a function, it must return a -character string.} +simple tables), \code{rst}, \code{jira}, and \code{org} (Emacs Org-mode). +The value of this argument will be automatically determined if the function +is called within a \pkg{knitr} document. The \code{format} value can also +be set in the global option \code{knitr.table.format}. If \code{format} is +a function, it must return a character string.} \item{digits}{Maximum number of digits for numeric columns, passed to \code{round()}. This can also be a vector of length \code{ncol(x)}, to set