From noreply at r-forge.r-project.org Fri Mar 6 13:29:03 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 6 Mar 2015 13:29:03 +0100 (CET) Subject: [Soiltexture-commits] r118 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man pkg/soiltexture/tests pkg/soiltexture/vignettes Message-ID: <20150306122903.3CA64186C86@r-forge.r-project.org> Author: jmoeys Date: 2015-03-06 13:29:02 +0100 (Fri, 06 Mar 2015) New Revision: 118 Added: soiltexture_4_RCMDRd2pdf.BAT Modified: pkg/soiltexture/DESCRIPTION pkg/soiltexture/NEWS pkg/soiltexture/R/soiltexture.R pkg/soiltexture/inst/SVN_VERSION pkg/soiltexture/man/TT.DJ.col.Rd pkg/soiltexture/man/TT.add.Rd pkg/soiltexture/man/TT.auto.set.Rd pkg/soiltexture/man/TT.axis.arrows.Rd pkg/soiltexture/man/TT.baseplot.Rd pkg/soiltexture/man/TT.blr.ps.lim.Rd pkg/soiltexture/man/TT.blr.tx.check.Rd pkg/soiltexture/man/TT.check.ps.lim.Rd pkg/soiltexture/man/TT.chemometrics.alr.Rd pkg/soiltexture/man/TT.classes.Rd pkg/soiltexture/man/TT.classes.tbl.Rd pkg/soiltexture/man/TT.col2hsv.Rd pkg/soiltexture/man/TT.contour.Rd pkg/soiltexture/man/TT.css2xy.Rd pkg/soiltexture/man/TT.data.test.Rd pkg/soiltexture/man/TT.data.test.X.Rd pkg/soiltexture/man/TT.dataset.Rd pkg/soiltexture/man/TT.deg2rad.Rd pkg/soiltexture/man/TT.dia2phi.Rd pkg/soiltexture/man/TT.edges.Rd pkg/soiltexture/man/TT.gen.op.set.Rd pkg/soiltexture/man/TT.geo.get.Rd pkg/soiltexture/man/TT.geo.set.Rd pkg/soiltexture/man/TT.get.Rd pkg/soiltexture/man/TT.grid.Rd pkg/soiltexture/man/TT.ifelse.Rd pkg/soiltexture/man/TT.image.Rd pkg/soiltexture/man/TT.iwd.Rd pkg/soiltexture/man/TT.kde2d.Rd pkg/soiltexture/man/TT.lines.Rd pkg/soiltexture/man/TT.locator.Rd pkg/soiltexture/man/TT.mahalanobis.Rd pkg/soiltexture/man/TT.normalise.sum.Rd pkg/soiltexture/man/TT.normalise.sum.X.Rd pkg/soiltexture/man/TT.par.op.set.Rd pkg/soiltexture/man/TT.phi2dia.Rd pkg/soiltexture/man/TT.plot.Rd pkg/soiltexture/man/TT.points.Rd pkg/soiltexture/man/TT.points.in.classes.Rd pkg/soiltexture/man/TT.polygon.area.Rd pkg/soiltexture/man/TT.polygon.centroids.Rd pkg/soiltexture/man/TT.set.Rd pkg/soiltexture/man/TT.str.Rd pkg/soiltexture/man/TT.switch.Rd pkg/soiltexture/man/TT.text.Rd pkg/soiltexture/man/TT.text.transf.Rd pkg/soiltexture/man/TT.text.transf.X.Rd pkg/soiltexture/man/TT.ticks.Rd pkg/soiltexture/man/TT.ticks.lab.Rd pkg/soiltexture/man/TT.vertices.plot.Rd pkg/soiltexture/man/TT.vertices.tbl.Rd pkg/soiltexture/man/TT.xy.grid.Rd pkg/soiltexture/man/TT.xy2css.Rd pkg/soiltexture/man/soiltexture-package.Rd pkg/soiltexture/man/soiltextureInfo.Rd pkg/soiltexture/tests/TT.plot.R pkg/soiltexture/vignettes/soiltexture_vignette.Rnw pkg/soiltexture/vignettes/soiltexture_vignette.bib soiltexture_2_RCMDcheck_noexamples.bat soiltexture_3_RCMDINSTALL_build.BAT soiltexture_compile.R Log: Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/DESCRIPTION 2015-03-06 12:29:02 UTC (rev 118) @@ -1,9 +1,9 @@ Package: soiltexture -Version: 1.2.20 -Date: 2014-10-02 +Version: 1.2.21 +Date: 2015-03-06 Title: Functions for soil texture plot, classification and transformation -Author: Julien Moeys [aut, cre], Wei Shangguan [ctb] -Authors at R: c( person( "Julien", "Moeys", role = c("aut", "cre"), email = "jules_m78-soiltexture at yahoo.fr" ), person( "Wei", "Shangguan", role = "ctb" ) ) +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 Depends: R (>= 3.1.1) Suggests: xtable, tools, utils Modified: pkg/soiltexture/NEWS =================================================================== --- pkg/soiltexture/NEWS 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/NEWS 2015-03-06 12:29:02 UTC (rev 118) @@ -1,9 +1,22 @@ package: 'soiltexture' +CHANGES IN VERSION 1.2.21 + + 2014/03/06 Added a new Brazilian texture triangle: + from Humberto Gon?alves dos Santos [et al.], 2013. + Sistema Brasileiro de Classifica??o de Solos, 3 ed. rev. + ampl. Bras?lia, DF: Embrapa, 2013. + Triangle digitization is a courtesy of Jos? Lucas Safanelli + and Alexandre ten Caten (UFSC Curitibanos, Brasil) + + Added a long list of contributors to the package DESCRIPTION, + that now includes all the people who have helped including + and digitizing new texture triangles. + CHANGES IN VERSION 1.2.20 - 2014/10/02 Packages Dependecies moved from "Depends" to "Imports" + 2014/10/02 Packages dependencies moved from "Depends" to "Imports" in package DESCRIPTION and NAMESPACE CHANGES IN VERSION 1.2.19 Modified: pkg/soiltexture/R/soiltexture.R =================================================================== --- pkg/soiltexture/R/soiltexture.R 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/R/soiltexture.R 2015-03-06 12:29:02 UTC (rev 118) @@ -954,7 +954,7 @@ main = "Autralia (AU)", # # The coordinates of this triangle were kindly provided by Budiman Minasni - # as a replacememnt for the original implementation of the Australian + # as a replacement for the original implementation of the Australian # texture triangle. # # The list below specify the CSS coordinates of the different POINTS @@ -1520,8 +1520,67 @@ unit.tx = quote(bold('%')), # text.sum = 100 - ) # + ), # + "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. + + # Information is a courtesy of Jos? 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? + # + # The list below specify the CSS coordinates of the different POINTS + # that are used to draw soil texture classes. One points can be + # used by several classes : + # = P01 P02 P03 P04 P05 P06 P07 P08 P09 P10 P11 P12 + # = P13 P14 P15 P16 P17 P18 (submits) + "tt.points" = data.frame( + "CLAY" = c( 1.000, 0.600, 0.600, 0.350, 0.350, 0.350, 0.350, 0.200, 0.200, 0.250, 0.150, 0.100, + 0.000, 0.000, 0.000, 0.000, 0.000, 0.000 ), + # + "SILT" = c( 0.000, 0.000, 0.400, 0.000, 0.175, 0.500, 0.650, 0.000, 0.250, 0.275, 0.000, 0.000, + 0.000, 0.150, 0.300, 0.475, 0.850, 1.000 ), + # + "SAND" = c( 0.000, 0.400, 0.000, 0.650, 0.475, 0.150, 0.000, 0.800, 0.550, 0.475, 0.850, 0.900, + 1.000, 0.850, 0.700, 0.525, 0.150, 0.000 ) + ), # + + # Abreviations; Names of the texture cl; Points marking the class limits (points specified above) + "tt.polygons" = list( + "MA" = list( "name" = "muito argilosa", "points" = c(01,02,03) ), + "A" = list( "name" = "argilosa", "points" = c(02,03,07,06,05,04) ), + "S" = list( "name" = "siltosa", "points" = c(06,07,18,17) ), + "MeS" = list( "name" = "media siltosa", "points" = c(05,06,17,16,09,10) ), + "MeA" = list( "name" = "media argilosa", "points" = c(04,05,10,09,08) ), + "MeAr" = list( "name" = "media arenosa", "points" = c(08,09,16,15,11) ), + "ArMe" = list( "name" = "arenosa media", "points" = c(11,15,14,12) ), + "MAr" = list( "name" = "muito arenosa", "points" = c(12,14,13) ) + ), + + # Triangle specific parameters for triangle geometry / appearance + # See general parameters above for detailed description of them + blr.clock = rep(T,3), + tlr.an = c(60,60,60), + + blr.tx = c("SAND","CLAY","SILT"), + + base.css.ps.lim = c(0,2,50,2000), + tri.css.ps.lim = c(0,2,50,2000), + + unit.ps = quote(bold(mu) * bold('m')), + unit.tx = quote(bold('%')), + + text.sum = 100, + + # New parameter + class.lab.cex = 2/3 + ) + # +-------------------------------------------------------------------------+ # | END(SCRIPT PARAMETERS SPECIFICATION) | # +-------------------------------------------------------------------------+ @@ -4981,6 +5040,12 @@ class.lab.col <- class.line.col } # # + if( "class.lab.cex" %in% names(TT.data) ){ # New 2015-03-06 + class.lab.cex <- TT.data[[ "class.lab.cex" ]] + }else{ + class.lab.cex <- 1 + } + # text( x = cent.xy["x",pol], y = cent.xy["y",pol], @@ -4988,7 +5053,7 @@ adj = c(0.5,0.5), offset = 0, col = class.lab.col, - cex = cex.lab, + cex = cex.lab * class.lab.cex, font = font.lab, family = family.op ) # Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/inst/SVN_VERSION 2015-03-06 12:29:02 UTC (rev 118) @@ -1 +1 @@ -105:115M +105:117M Modified: pkg/soiltexture/man/TT.DJ.col.Rd =================================================================== --- pkg/soiltexture/man/TT.DJ.col.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.DJ.col.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -30,7 +30,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.add.Rd =================================================================== --- pkg/soiltexture/man/TT.add.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.add.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -38,7 +38,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.auto.set.Rd =================================================================== --- pkg/soiltexture/man/TT.auto.set.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.auto.set.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -36,7 +36,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.axis.arrows.Rd =================================================================== --- pkg/soiltexture/man/TT.axis.arrows.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.axis.arrows.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -124,7 +124,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.baseplot.Rd =================================================================== --- pkg/soiltexture/man/TT.baseplot.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.baseplot.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -116,7 +116,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.blr.ps.lim.Rd =================================================================== --- pkg/soiltexture/man/TT.blr.ps.lim.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.blr.ps.lim.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -26,7 +26,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.blr.tx.check.Rd =================================================================== --- pkg/soiltexture/man/TT.blr.tx.check.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.blr.tx.check.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -28,7 +28,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.check.ps.lim.Rd =================================================================== --- pkg/soiltexture/man/TT.check.ps.lim.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.check.ps.lim.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -32,7 +32,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.chemometrics.alr.Rd =================================================================== --- pkg/soiltexture/man/TT.chemometrics.alr.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.chemometrics.alr.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -50,7 +50,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.classes.Rd =================================================================== --- pkg/soiltexture/man/TT.classes.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.classes.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -72,7 +72,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.classes.tbl.Rd =================================================================== --- pkg/soiltexture/man/TT.classes.tbl.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.classes.tbl.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -16,7 +16,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.col2hsv.Rd =================================================================== --- pkg/soiltexture/man/TT.col2hsv.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.col2hsv.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -22,7 +22,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.contour.Rd =================================================================== --- pkg/soiltexture/man/TT.contour.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.contour.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -182,7 +182,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.css2xy.Rd =================================================================== --- pkg/soiltexture/man/TT.css2xy.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.css2xy.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -58,7 +58,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.data.test.Rd =================================================================== --- pkg/soiltexture/man/TT.data.test.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.data.test.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -56,7 +56,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.data.test.X.Rd =================================================================== --- pkg/soiltexture/man/TT.data.test.X.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.data.test.X.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -52,7 +52,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.dataset.Rd =================================================================== --- pkg/soiltexture/man/TT.dataset.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.dataset.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -36,7 +36,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.deg2rad.Rd =================================================================== --- pkg/soiltexture/man/TT.deg2rad.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.deg2rad.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -20,7 +20,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.dia2phi.Rd =================================================================== --- pkg/soiltexture/man/TT.dia2phi.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.dia2phi.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -22,7 +22,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.edges.Rd =================================================================== --- pkg/soiltexture/man/TT.edges.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.edges.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -70,7 +70,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.gen.op.set.Rd =================================================================== --- pkg/soiltexture/man/TT.gen.op.set.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.gen.op.set.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -30,7 +30,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.geo.get.Rd =================================================================== --- pkg/soiltexture/man/TT.geo.get.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.geo.get.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -44,7 +44,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.geo.set.Rd =================================================================== --- pkg/soiltexture/man/TT.geo.set.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.geo.set.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -26,7 +26,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.get.Rd =================================================================== --- pkg/soiltexture/man/TT.get.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.get.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -36,7 +36,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.grid.Rd =================================================================== --- pkg/soiltexture/man/TT.grid.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.grid.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -84,7 +84,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.ifelse.Rd =================================================================== --- pkg/soiltexture/man/TT.ifelse.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.ifelse.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -30,7 +30,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.image.Rd =================================================================== --- pkg/soiltexture/man/TT.image.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.image.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -142,7 +142,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.iwd.Rd =================================================================== --- pkg/soiltexture/man/TT.iwd.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.iwd.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -88,7 +88,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.kde2d.Rd =================================================================== --- pkg/soiltexture/man/TT.kde2d.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.kde2d.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -72,7 +72,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.lines.Rd =================================================================== --- pkg/soiltexture/man/TT.lines.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.lines.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -72,7 +72,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.locator.Rd =================================================================== --- pkg/soiltexture/man/TT.locator.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.locator.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -56,7 +56,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.mahalanobis.Rd =================================================================== --- pkg/soiltexture/man/TT.mahalanobis.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.mahalanobis.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -96,7 +96,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.normalise.sum.Rd =================================================================== --- pkg/soiltexture/man/TT.normalise.sum.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.normalise.sum.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -46,7 +46,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.normalise.sum.X.Rd =================================================================== --- pkg/soiltexture/man/TT.normalise.sum.X.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.normalise.sum.X.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -42,7 +42,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.par.op.set.Rd =================================================================== --- pkg/soiltexture/man/TT.par.op.set.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.par.op.set.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -30,7 +30,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.phi2dia.Rd =================================================================== --- pkg/soiltexture/man/TT.phi2dia.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.phi2dia.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -24,7 +24,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} Modified: pkg/soiltexture/man/TT.plot.Rd =================================================================== --- pkg/soiltexture/man/TT.plot.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.plot.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -716,7 +716,7 @@ -\author{Julien MOEYS , contributions from Wei Shangguan.} +\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]} @@ -848,6 +848,10 @@ TT.plot( class.sys = "DE.BK94.TT" ) # Germany +TT.plot( class.sys = "DE.SEA74.TT" ) # German SEA 1974 + +TT.plot( class.sys = "DE.TGL85.TT" ) # German TGL 1985 + TT.plot( class.sys = "UK.SSEW.TT" ) # UK TT.plot( class.sys = "BE.TT" ) # Belgium @@ -862,14 +866,12 @@ TT.plot( class.sys = "ROM.TT" ) # Romanian -TT.plot( class.sys = "DE.SEA74.TT" ) # German SEA 1974 - -TT.plot( class.sys = "DE.TGL85.TT" ) # German TGL 1985 - TT.plot( class.sys = "USDA1911" ) # USDA 1911 (M. Whitney, 1911) TT.plot( class.sys = "BRASIL.TT" ) # Brasil (Lemos & Santos 1996) +TT.plot( class.sys = "SiBCS13.TT" ) # Brasil (Lemos & Santos 1996) + # Triangles with special characters Modified: pkg/soiltexture/man/TT.points.Rd =================================================================== --- pkg/soiltexture/man/TT.points.Rd 2014-10-02 12:09:06 UTC (rev 117) +++ pkg/soiltexture/man/TT.points.Rd 2015-03-06 12:29:02 UTC (rev 118) @@ -138,7 +138,7 @@ [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 118 From noreply at r-forge.r-project.org Fri Mar 6 13:30:16 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 6 Mar 2015 13:30:16 +0100 (CET) Subject: [Soiltexture-commits] r119 - pkg Message-ID: <20150306123017.09B05186C86@r-forge.r-project.org> Author: jmoeys Date: 2015-03-06 13:30:16 +0100 (Fri, 06 Mar 2015) New Revision: 119 Modified: pkg/ Log: exclude pdf files Property changes on: pkg ___________________________________________________________________ Modified: svn:ignore - *.Rcheck *.gz *.zip binaryArchives soiltexture.Rcheck soiltexture.Rcheck.zip soiltexture_1.2.3.tar.gz soiltexture_1.2.3_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.4.tar.gz soiltexture_1.2.4.zip soiltexture_1.2.5.tar.gz soiltexture_1.2.5.zip soiltexture_1.2.6.tar.gz soiltexture_1.2.6.zip soiltexture_1.2.6_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.8.tar.gz soiltexture_1.2.8.zip soiltexture_1.2.9.tar.gz soiltexture_1.2.9.zip + *.Rcheck *.gz *.pdf *.zip binaryArchives soiltexture.Rcheck soiltexture.Rcheck.zip soiltexture_1.2.3.tar.gz soiltexture_1.2.3_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.4.tar.gz soiltexture_1.2.4.zip soiltexture_1.2.5.tar.gz soiltexture_1.2.5.zip soiltexture_1.2.6.tar.gz soiltexture_1.2.6.zip soiltexture_1.2.6_R_i486-pc-linux-gnu.tar.gz soiltexture_1.2.8.tar.gz soiltexture_1.2.8.zip soiltexture_1.2.9.tar.gz soiltexture_1.2.9.zip From noreply at r-forge.r-project.org Fri Mar 6 13:31:10 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 6 Mar 2015 13:31:10 +0100 (CET) Subject: [Soiltexture-commits] r120 - pkg/soiltexture/inst Message-ID: <20150306123110.3B490186C86@r-forge.r-project.org> Author: jmoeys Date: 2015-03-06 13:31:09 +0100 (Fri, 06 Mar 2015) New Revision: 120 Modified: pkg/soiltexture/inst/SVN_VERSION Log: Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-03-06 12:30:16 UTC (rev 119) +++ pkg/soiltexture/inst/SVN_VERSION 2015-03-06 12:31:09 UTC (rev 120) @@ -1 +1 @@ -105:117M +118:119M From noreply at r-forge.r-project.org Mon Mar 9 10:35:22 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 9 Mar 2015 10:35:22 +0100 (CET) Subject: [Soiltexture-commits] r121 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man Message-ID: <20150309093522.D45D5187297@r-forge.r-project.org> Author: jmoeys Date: 2015-03-09 10:35:22 +0100 (Mon, 09 Mar 2015) New Revision: 121 Modified: pkg/soiltexture/DESCRIPTION pkg/soiltexture/NAMESPACE pkg/soiltexture/NEWS pkg/soiltexture/R/soiltextureInfo.R pkg/soiltexture/inst/SVN_VERSION pkg/soiltexture/man/soiltexture-package.Rd soiltexture_2_RCMDcheck_noexamples.bat soiltexture_3_RCMDINSTALL_build.BAT soiltexture_4_RCMDRd2pdf.BAT soiltexture_compile.R Log: Fix package imports (utils, tools) Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2015-03-06 12:31:09 UTC (rev 120) +++ pkg/soiltexture/DESCRIPTION 2015-03-09 09:35:22 UTC (rev 121) @@ -1,13 +1,13 @@ Package: soiltexture -Version: 1.2.21 -Date: 2015-03-06 +Version: 1.2.22 +Date: 2015-03-09 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 Depends: R (>= 3.1.1) -Suggests: xtable, tools, 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. Several texture triangles are predefined: USDA; FAO (which is also the triangle for the soil map of Europe); Aisne (France); GEPPA (France); German triangles "Bodenkundliche Kartieranleitung 1994", "SEA 1974" and "TGL 1985"; Soil Survey of England and Wales; Australian triangle; Belgian triangle; Canadian triangle; ISSS triangle; Romanian triangle; Polish triangle. License: AGPL (>=3) URL: http://soiltexture.r-forge.r-project.org/ -Imports: sp, MASS +Imports: sp, MASS, tools, utils Modified: pkg/soiltexture/NAMESPACE =================================================================== --- pkg/soiltexture/NAMESPACE 2015-03-06 12:31:09 UTC (rev 120) +++ pkg/soiltexture/NAMESPACE 2015-03-09 09:35:22 UTC (rev 121) @@ -3,3 +3,5 @@ importFrom(sp,point.in.polygon) importFrom(MASS,kde2d) importFrom(MASS,mvrnorm) +importFrom(utils,installed.packages) +importFrom(tools,package_dependencies) Modified: pkg/soiltexture/NEWS =================================================================== --- pkg/soiltexture/NEWS 2015-03-06 12:31:09 UTC (rev 120) +++ pkg/soiltexture/NEWS 2015-03-09 09:35:22 UTC (rev 121) @@ -1,6 +1,10 @@ package: 'soiltexture' +CHANGES IN VERSION 1.2.22 + + 2014/03/09 Fix package imports from tools and utils. + CHANGES IN VERSION 1.2.21 2014/03/06 Added a new Brazilian texture triangle: Modified: pkg/soiltexture/R/soiltextureInfo.R =================================================================== --- pkg/soiltexture/R/soiltextureInfo.R 2015-03-06 12:31:09 UTC (rev 120) +++ pkg/soiltexture/R/soiltextureInfo.R 2015-03-09 09:35:22 UTC (rev 121) @@ -92,7 +92,7 @@ loadedPackages <- .packages() - require( "utils" ) + # require( "utils" ) installedPackages <- utils::installed.packages() loadedPackages <- installedPackages[ sort( loadedPackages ), @@ -128,7 +128,7 @@ if( depends ){ # Find dependencies - require( "tools" ) + # require( "tools" ) dep <- unlist( lapply( X = packages, Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-03-06 12:31:09 UTC (rev 120) +++ pkg/soiltexture/inst/SVN_VERSION 2015-03-09 09:35:22 UTC (rev 121) @@ -1 +1 @@ -118:119M +118:120M Modified: pkg/soiltexture/man/soiltexture-package.Rd =================================================================== --- pkg/soiltexture/man/soiltexture-package.Rd 2015-03-06 12:31:09 UTC (rev 120) +++ pkg/soiltexture/man/soiltexture-package.Rd 2015-03-09 09:35:22 UTC (rev 121) @@ -14,9 +14,9 @@ \tabular{ll}{Package: \tab soiltexture\cr -Version: \tab 1.2.21\cr +Version: \tab 1.2.22\cr -Date: \tab 2015-03-06\cr +Date: \tab 2015-03-09\cr Title: \tab Functions for soil texture plot, classification and transformation\cr @@ -28,13 +28,13 @@ Depends: \tab R (>= 3.1.1)\cr -Suggests: \tab xtable, tools, utils\cr +Suggests: \tab xtable\cr License: \tab AGPL (>=3)\cr URL: \tab http://soiltexture.r-forge.r-project.org/\cr -Imports: \tab sp, MASS\cr} +Imports: \tab sp, MASS, tools, utils\cr} } Modified: soiltexture_2_RCMDcheck_noexamples.bat =================================================================== --- soiltexture_2_RCMDcheck_noexamples.bat 2015-03-06 12:31:09 UTC (rev 120) +++ soiltexture_2_RCMDcheck_noexamples.bat 2015-03-09 09:35:22 UTC (rev 121) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.2.21 +set version=1.2.22 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_3_RCMDINSTALL_build.BAT =================================================================== --- soiltexture_3_RCMDINSTALL_build.BAT 2015-03-06 12:31:09 UTC (rev 120) +++ soiltexture_3_RCMDINSTALL_build.BAT 2015-03-09 09:35:22 UTC (rev 121) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.2.21 +set version=1.2.22 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_4_RCMDRd2pdf.BAT =================================================================== --- soiltexture_4_RCMDRd2pdf.BAT 2015-03-06 12:31:09 UTC (rev 120) +++ soiltexture_4_RCMDRd2pdf.BAT 2015-03-09 09:35:22 UTC (rev 121) @@ -1,5 +1,5 @@ set pkgname=soiltexture -set version=1.2.21 +set version=1.2.22 cd /D "%rPackagesDir%\%pkgname%\pkg" Modified: soiltexture_compile.R =================================================================== --- soiltexture_compile.R 2015-03-06 12:31:09 UTC (rev 120) +++ soiltexture_compile.R 2015-03-09 09:35:22 UTC (rev 121) @@ -17,10 +17,10 @@ pkgDescription( pkgName = pkgName, pkgDir = pkgDir, - pkgVersion = "1.2.21", + pkgVersion = "1.2.22", pkgDepends = NULL, - pkgSuggests = c( "xtable", "tools", "utils" ), # c("drc","plotrix"), - pkgImports = c( "sp","MASS" ), + pkgSuggests = c( "xtable" ), # c("drc","plotrix"), + pkgImports = c( "sp", "MASS", "tools", "utils" ), RVersion = NULL ) From noreply at r-forge.r-project.org Mon Mar 9 10:36:26 2015 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Mon, 9 Mar 2015 10:36:26 +0100 (CET) Subject: [Soiltexture-commits] r122 - pkg/soiltexture/inst Message-ID: <20150309093626.E53CF187785@r-forge.r-project.org> Author: jmoeys Date: 2015-03-09 10:36:26 +0100 (Mon, 09 Mar 2015) New Revision: 122 Modified: pkg/soiltexture/inst/SVN_VERSION Log: Modified: pkg/soiltexture/inst/SVN_VERSION =================================================================== --- pkg/soiltexture/inst/SVN_VERSION 2015-03-09 09:35:22 UTC (rev 121) +++ pkg/soiltexture/inst/SVN_VERSION 2015-03-09 09:36:26 UTC (rev 122) @@ -1 +1 @@ -118:120M +118:121M