[Soiltexture-commits] r138 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Apr 17 13:45:32 CEST 2015
Author: jmoeys
Date: 2015-04-17 13:45:32 +0200 (Fri, 17 Apr 2015)
New Revision: 138
Modified:
pkg/soiltexture/DESCRIPTION
pkg/soiltexture/NEWS
pkg/soiltexture/R/soiltexture.R
pkg/soiltexture/inst/SVN_VERSION
soiltexture_2_RCMDcheck_noexamples.bat
soiltexture_3_RCMDINSTALL_build.BAT
soiltexture_4_RCMDRd2pdf.BAT
soiltexture_compile.R
Log:
Now compiled for R 3.2.0 RC
Modified: pkg/soiltexture/DESCRIPTION
===================================================================
--- pkg/soiltexture/DESCRIPTION 2015-04-17 11:44:41 UTC (rev 137)
+++ pkg/soiltexture/DESCRIPTION 2015-04-17 11:45:32 UTC (rev 138)
@@ -1,13 +1,13 @@
Package: soiltexture
-Version: 1.3.0
-Date: 2015-04-14
-Title: Functions for soil texture plot, classification and transformation
+Version: 1.3.1
+Date: 2015-04-17
+Title: Functions for Soil Texture Plot, Classification and Transformation
Author: Julien Moeys [aut, cre], Wei Shangguan [ctb], Rainer Petzold [ctb], Budiman Minasny [ctb], Bogdan Rosca [ctb], Nic Jelinski [ctb], Wiktor Zelazny [ctb], Rodolfo Marcondes Silva Souza [ctb], Jose Lucas Safanelli [ctb], Alexandre ten Caten [ctb]
Authors at R: c( person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), person( "Wei", "Shangguan", role = "ctb" ), person( "Rainer", "Petzold", role = "ctb" ), person( "Budiman", "Minasny", role = "ctb" ), person( "Bogdan", "Rosca", role = "ctb" ), person( "Nic", "Jelinski", role = "ctb" ), person( "Wiktor", "Zelazny", role = "ctb" ), person( "Rodolfo", "Marcondes Silva Souza", role = "ctb" ), person( "Jose Lucas", "Safanelli", role = "ctb" ), person( "Alexandre", "ten Caten", role = "ctb" ) )
Maintainer: Julien Moeys <jules_m78-soiltexture at yahoo.fr>
-Depends: R (>= 3.1.1), utils
+Depends: R (>= 3.2.0), utils
Suggests: xtable
-Description: "The Soil Texture Wizard" is a set of R functions designed to produce texture triangles (also called texture plots, texture diagrams, texture ternary plots), classify and transform soil textures data. These functions virtually allows to plot any soil texture triangle / classification into any triangle geometry (isosceles, right-angled triangles, etc.). This set of function is expected to be useful to people using soil textures data from different soil texture classification or different particle size systems. Many (> 15) texture triangles from all around the world are predefined in the package.
+Description: "The Soil Texture Wizard" is a set of R functions designed to produce texture triangles (also called texture plots, texture diagrams, texture ternary plots), classify and transform soil textures data. These functions virtually allows to plot any soil texture triangle (classification) into any triangle geometry (isosceles, right-angled triangles, etc.). This set of function is expected to be useful to people using soil textures data from different soil texture classification or different particle size systems. Many (> 15) texture triangles from all around the world are predefined in the package. A simple text based graphical user interface is provided: soiltexture_gui().
License: AGPL (>=3)
URL: http://soiltexture.r-forge.r-project.org/
Imports: sp, MASS, tools, tcltk
Modified: pkg/soiltexture/NEWS
===================================================================
--- pkg/soiltexture/NEWS 2015-04-17 11:44:41 UTC (rev 137)
+++ pkg/soiltexture/NEWS 2015-04-17 11:45:32 UTC (rev 138)
@@ -1,6 +1,12 @@
package: 'soiltexture'
+CHANGES IN VERSION 1.3.1
+
+ 2015/04/17 Compiled for R 3.2.0 RC (r68178). Inlinedocs
+ documentation still generated with R 3.1.1
+ (inlinedocs 2013.9.3).
+
CHANGES IN VERSION 1.3.0
2015/04/11 Implements a new text-based graphical user
Modified: pkg/soiltexture/R/soiltexture.R
===================================================================
--- pkg/soiltexture/R/soiltexture.R 2015-04-17 11:44:41 UTC (rev 137)
+++ pkg/soiltexture/R/soiltexture.R 2015-04-17 11:45:32 UTC (rev 138)
@@ -1370,15 +1370,15 @@
"SiBCS13.TT" = list(
# Subagrupamento Textural SiBCS 2013 parameters (Embrapa 2013)
- # Embrapa. Sistema Brasileiro de Classificação de Solos /
- # Humberto Golçalves dos Santos ... [et al.]. 3a ed. rev. ampl.
- # Brasília, DF: Embrapa, 2013.
+ # Embrapa. Sistema Brasileiro de Classificacao de Solos /
+ # Humberto Golcalves dos Santos ... [et al.]. 3a ed. rev. ampl.
+ # Brasilia, DF: Embrapa, 2013.
- # Information is a courtesy of José Lucas Safanelli and
+ # Information is a courtesy of Jose Lucas Safanelli and
# Alexandre ten Caten, UFSC Curitibanos, Brasil.
# main = "Subagrupamento textural SiBCS 2013 - Embrapa 2013",
- main = "SiBCS 2013 (Embrapa)", # Shoter title and more international?
+ main = "SiBCS 2013 (Embrapa)", # Shorter title and more international?
#
# The list below specify the CSS coordinates of the different POINTS
# that are used to draw soil texture classes. One points can be
@@ -2942,7 +2942,7 @@
) )
} #
#
- # Check for tlr.an: angle sum must be 180°
+ # Check for tlr.an: angle sum must be 180 degrees
if( sum(tlr.an) != 180 )
{ #
stop( paste(
@@ -5729,7 +5729,7 @@
a.h.s = TT.get("arrows.head.shift"),
a.t.s = TT.get("arrows.text.shift"),
a.b.s = TT.get("arrows.base.shift"),
- text.tol = text.tol, # useless¨
+ text.tol = text.tol, # useless
base.css.ps.lim = base.css.ps.lim,
tlr.an = tlr.an,
lwd.lab = lwd.lab,
@@ -6299,7 +6299,7 @@
) )
} #
#
- # Check for tlr.an: angle sum must be 180°
+ # Check for tlr.an: angle sum must be 180 degrees
if( sum(tlr.an) != 180 )
{ #
stop( paste(
Modified: pkg/soiltexture/inst/SVN_VERSION
===================================================================
--- pkg/soiltexture/inst/SVN_VERSION 2015-04-17 11:44:41 UTC (rev 137)
+++ pkg/soiltexture/inst/SVN_VERSION 2015-04-17 11:45:32 UTC (rev 138)
@@ -1 +1 @@
-122:133M
+122:135M
Modified: soiltexture_2_RCMDcheck_noexamples.bat
===================================================================
--- soiltexture_2_RCMDcheck_noexamples.bat 2015-04-17 11:44:41 UTC (rev 137)
+++ soiltexture_2_RCMDcheck_noexamples.bat 2015-04-17 11:45:32 UTC (rev 138)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.0
+set version=1.3.1
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_3_RCMDINSTALL_build.BAT
===================================================================
--- soiltexture_3_RCMDINSTALL_build.BAT 2015-04-17 11:44:41 UTC (rev 137)
+++ soiltexture_3_RCMDINSTALL_build.BAT 2015-04-17 11:45:32 UTC (rev 138)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.0
+set version=1.3.1
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_4_RCMDRd2pdf.BAT
===================================================================
--- soiltexture_4_RCMDRd2pdf.BAT 2015-04-17 11:44:41 UTC (rev 137)
+++ soiltexture_4_RCMDRd2pdf.BAT 2015-04-17 11:45:32 UTC (rev 138)
@@ -1,5 +1,5 @@
set pkgname=soiltexture
-set version=1.3.0
+set version=1.3.1
cd /D "%rPackagesDir%\%pkgname%\pkg"
Modified: soiltexture_compile.R
===================================================================
--- soiltexture_compile.R 2015-04-17 11:44:41 UTC (rev 137)
+++ soiltexture_compile.R 2015-04-17 11:45:32 UTC (rev 138)
@@ -14,19 +14,19 @@
# Change the description file:
-pkgDescription(
+pkgDescription( # Done with R 3.2.0 RC
pkgName = pkgName,
pkgDir = pkgDir,
- pkgVersion = "1.3.0",
- pkgDepends = "utils", # In Depends because can not importFrom Windows only functions
- pkgSuggests = c( "xtable" ), # c("drc","plotrix"),
- pkgImports = c( "sp", "MASS", "tools", "tcltk" ), # "utils",
+ pkgVersion = "1.3.1",
+ pkgDepends = "utils", # In Depends because can not importFrom Windows only functions
+ pkgSuggests = c( "xtable" ), #
+ pkgImports = c( "sp", "MASS", "tools", "tcltk" ),
RVersion = NULL
)
-package.skeleton.dx(
+package.skeleton.dx( # Done under R 3.1.1, with inlinedocs 2013.9.3 # Errors appear with R 3.2.0 RC
pkgdir = file.path( pkgDir, pkgName ),
namespace = FALSE # Must be edited manually!
)
More information about the Soiltexture-commits
mailing list