From noreply at r-forge.r-project.org Tue Jun 10 10:18:38 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 10 Jun 2014 10:18:38 +0200 (CEST) Subject: [Soiltexture-commits] r106 - / pkg/soiltexture pkg/soiltexture/R pkg/soiltexture/inst pkg/soiltexture/man pkg/soiltexture/tests pkg/soiltexture/vignettes prepare prepare/specialCharacters prepare/specialCharacters/archives Message-ID: <20140610081838.19DD0186F05@r-forge.r-project.org> Author: jmoeys Date: 2014-06-10 10:18:37 +0200 (Tue, 10 Jun 2014) New Revision: 106 Added: pkg/soiltexture/SVN_VERSION pkg/soiltexture/inst/languages.rds pkg/soiltexture/inst/triangles.rds prepare/specialCharacters/ prepare/specialCharacters/archives/ prepare/specialCharacters/archives/polish_language.r prepare/specialCharacters/archives/polish_language_ANSI.r prepare/specialCharacters/archives/polish_triangle.r prepare/specialCharacters/archives/polish_triangle_ANSI.r prepare/specialCharacters/languages.R prepare/specialCharacters/languagesASCII.R prepare/specialCharacters/source_special.R prepare/specialCharacters/triangles.R prepare/specialCharacters/trianglesASCII.R Removed: pkg/soiltexture/inst/polish_language.r pkg/soiltexture/inst/polish_language_ANSI.r pkg/soiltexture/inst/polish_triangle.r pkg/soiltexture/inst/polish_triangle_ANSI.r Modified: pkg/soiltexture/DESCRIPTION pkg/soiltexture/NEWS pkg/soiltexture/R/onAttach.R pkg/soiltexture/R/soiltexture.R pkg/soiltexture/man/TT.plot.Rd pkg/soiltexture/man/soiltexture-package.Rd pkg/soiltexture/tests/TT.plot.R pkg/soiltexture/vignettes/soiltexture_vignette.Rnw pkg/soiltexture/vignettes/soiltexture_vignette.bib prepare/ soiltexture_1_RCMDBUILD.bat soiltexture_2_RCMDcheck_noexamples.bat soiltexture_3_RCMDINSTALL_build.BAT soiltexture_compile.R Log: Modified: pkg/soiltexture/DESCRIPTION =================================================================== --- pkg/soiltexture/DESCRIPTION 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/DESCRIPTION 2014-06-10 08:18:37 UTC (rev 106) @@ -1,6 +1,6 @@ Package: soiltexture -Version: 1.2.14 -Date: 2014-04-23 +Version: 1.2.16 +Date: 2014-06-10 Title: Functions for soil texture plot, classification and transformation Author: Julien MOEYS , contributions from Wei Shangguan. Maintainer: Julien MOEYS Modified: pkg/soiltexture/NEWS =================================================================== --- pkg/soiltexture/NEWS 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/NEWS 2014-06-10 08:18:37 UTC (rev 106) @@ -3,6 +3,23 @@ Julien MOEYS ----------------------------------------------------------------- +VERSION 1.2.16 + + 2014/06/10 New attempt to fix special characters in languages + and triangles + +VERSION 1.2.15 + + 2014/06/09 Added texture triangle from Lemos & Santos (1996) + (Brasilian triangle). Courtesy of Rodolfo Marcondes + Silva Souza, UFPE, Brasil. Code BRASIL.TT + + Now support Portuguese language (lang = "pt") + + Modified the way to handle languages and triangles + with special characters, but it seems R still + remove some of the characters + VERSION 1.2.14 2014/04/23 Added texture triangle from Whitney 1911 (USDA) Modified: pkg/soiltexture/R/onAttach.R =================================================================== --- pkg/soiltexture/R/onAttach.R 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/R/onAttach.R 2014-06-10 08:18:37 UTC (rev 106) @@ -1,3 +1,4 @@ + .onAttach <- function(# Internal. Message displayed when loading the package. libname, pkgname @@ -7,23 +8,33 @@ # Setup the polish triangle and language setting ## if( !(tolower(Sys.info()["sysname"]) %in% c("mac","darwin")) ) - if( tolower(Sys.info()["sysname"]) %in% c("windows") ){ # "linux", - try( source( system.file( "polish_triangle.r", - package = pkgname ), encoding = "UTF-8" ) ) - tryRes <- try( source( system.file( "polish_language.r", - package = pkgname ), encoding = "UTF-8" ) ) + + # Try to load triangles and languages with special characters + tryRes <- try( lang.par2 <- readRDS( file = system.file( + "languages.rds", package = pkgname ) ) ) + + tryRes2 <- try( triPar2 <- readRDS( file = system.file( + "triangles.rds", package = pkgname ) ) ) + + + # if( tolower(Sys.info()["sysname"]) %in% c("windows") ){ # "linux", + # try( source( system.file( "polish_triangle.r", + # package = pkgname ), encoding = "UTF-8" ) ) + # tryRes <- try( source( system.file( "polish_language.r", + # package = pkgname ), encoding = "UTF-8" ) ) - }else{ - try( source( system.file( "polish_triangle_ANSI.r", - package = pkgname ) ) ) - tryRes <- try( source( system.file( "polish_language_ANSI.r", - package = pkgname ) ) ) - } + # }else{ + # try( source( system.file( "polish_triangle_ANSI.r", + # package = pkgname ) ) ) + # tryRes <- try( source( system.file( "polish_language_ANSI.r", + # package = pkgname ) ) ) + # } # Extend language parameter if the polish triangle was loaded # successfully - if( !("try-error" %in% class( tryRes )) ){ + if( !("try-error" %in% c( class( tryRes ), class( tryRes2 ) ) ) ){ + # Save languages with special characters lang.par <- TT.get( "lang.par" ) lang.par <- rbind( @@ -32,15 +43,22 @@ ) TT.set( "lang.par" = lang.par ) + + + # Save triangles with special characters + for( i in 1:length( triPar2 ) ){ + do.call( what = "TT.add", args = triPar2[ i ] ) + } + }else{ - packageStartupMessage( "soiltexture: The polish triangle could not be loaded" ) + packageStartupMessage( "soiltexture: Languages and triangles with special characters could not be loaded" ) } # Welcome message if( interactive() ){ msg <- sprintf( - "%s %s For help type: help(pack='%s')", + "%s %s. For help type: help(pack='%s')", pkgname, as.character( packageVersion( pkgname ) ), pkgname ) Modified: pkg/soiltexture/R/soiltexture.R =================================================================== --- pkg/soiltexture/R/soiltexture.R 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/R/soiltexture.R 2014-06-10 08:18:37 UTC (rev 106) @@ -279,7 +279,10 @@ # "TT" = c( "\"Texture triangle\"", "\"Triangle de texture\"", "\"Triangolo della tessitura\"", "\"Triangulo de textura\"", "\"Bodenartendiagramm\"", "\"Textuurdriehoek\"", - "\"Texturtriangel\"", "\"Textuurdriehoek\"", "\"Diagrama triunghiulara a texturii\"" ), + "\"Texturtriangel\"", "\"Textuurdriehoek\"", "\"Diagrama triunghiulara a texturii\"" ), + + # NOTE: accents removed! + stringsAsFactors = FALSE ), # # Acknowledgments: Rosca Bogdan, from the Romanian Academy, Iasi Branch, Geography team, provided the Romanian translation (thanks!). @@ -1453,8 +1456,72 @@ "unit.ps" = quote( bold( mu ) * bold( "m" ) ), "unit.tx" = quote( bold( "%" ) ), "text.sum" = 100 - ) + ), + BRASIL.TT = list( # Brazilian Triangle parameters (Lemos and Santos 1996) + # Lemos, R. C. & Santos, R. D. Manual de descricao e + # coleta de solo no campo. 3a ed. Campinas, Sociedade + # Brasileira de Ciencia do solo, 1996. + + # Information is a courtesy of Rodolfo Marcondes Silva + # Souza, UFPE, Brasil (base-triangle is USDA triangle, + # modified for Brasil) + + main = "Brasil - Lemos & Santos (1996)", + # + # 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 P19 P20 P21 P22 P23 + # = P24 P25 P26 P27 (submits) + "tt.points" = data.frame( + "CLAY" = c( 0.550, 0.600, 0.350, 0.350, 0.400, 0.400, 0.400, 0.200, 0.200, 0.275, 0.275, 0.275, + 0.275, 0.150, 0.100, 0.075, 0.075, 0.125, 0.125, 0.000, 0.000, 0.000, 0.000, + 1.000, 0.000, 0.000, 0.600 ), + # + "SILT" = c( 0.000, 0.400, 0.000, 0.200, 0.150, 0.400, 0.600, 0.000, 0.275, 0.275, 0.500, 0.525, + 0.725, 0.000, 0.000, 0.400, 0.500, 0.800, 0.875, 0.150, 0.300, 0.500, 0.800, + 0.000, 0.000, 1.000, 0.000 ), + # + "SAND" = c( 0.450, 0.000, 0.650, 0.450, 0.450, 0.200, 0.000, 0.800, 0.525, 0.450, 0.225, 0.200, + 0.000, 0.850, 0.900, 0.525, 0.425, 0.075, 0.000, 0.850, 0.700, 0.500, 0.200, + 0.000, 1.000, 0.000, 0.400 ) + ), # + # + # Abreviations; Names of the texture cl; Points marking the class limits (points specified above) + "tt.polygons" = list( + "MA" = list( "name" = "muito argilosa", "points" = c(02,24,27) ), + "A" = list( "name" = "argila", "points" = c(27,01,05,06,02) ), + "As" = list( "name" = "argila siltosa", "points" = c(02,06,07) ), + "AAr" = list( "name" = "argila arenosa", "points" = c(01,03,04,05) ), + "FA" = list( "name" = "franco argiloso", "points" = c(05,04,10,11,12,06) ), + "FAS" = list( "name" = "franco argilo siltoso", "points" = c(06,12,13,07) ), + "FAAr" = list( "name" = "franco argilo arenoso", "points" = c(03,08,09,10,04) ), + "F" = list( "name" = "franco", "points" = c(10,09,16,17,11) ), + "FS" = list( "name" = "franco siltoso", "points" = c(11,17,22,23,18,19,13,12) ), + "FAr" = list( "name" = "franco arenoso", "points" = c(08,14,21,22,17,16,09) ), + "S" = list( "name" = "silte", "points" = c(18,23,26,19) ), + "ArF" = list( "name" = "areia franca", "points" = c(14,15,20,21) ), + "Ar" = list( "name" = "areia", "points" = c(15,25,20) ) + ), + # + # 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 + ) # + # +-------------------------------------------------------------------------+ # | END(SCRIPT PARAMETERS SPECIFICATION) | # +-------------------------------------------------------------------------+ Added: pkg/soiltexture/SVN_VERSION =================================================================== --- pkg/soiltexture/SVN_VERSION (rev 0) +++ pkg/soiltexture/SVN_VERSION 2014-06-10 08:18:37 UTC (rev 106) @@ -0,0 +1 @@ +95:105M Added: pkg/soiltexture/inst/languages.rds =================================================================== (Binary files differ) Property changes on: pkg/soiltexture/inst/languages.rds ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: pkg/soiltexture/inst/polish_language.r =================================================================== --- pkg/soiltexture/inst/polish_language.r 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/inst/polish_language.r 2014-06-10 08:18:37 UTC (rev 106) @@ -1,9 +0,0 @@ -lang.par2 <- data.frame( - "lang" = "pl", - "CLAY" = "\"I??\"", - "SILT" = "\"Py??\"", - "SAND" = "\"Piasek\"", - "TT" = "\"Tr??jk??t Fereta\"", - stringsAsFactors = FALSE -) # - Deleted: pkg/soiltexture/inst/polish_language_ANSI.r =================================================================== --- pkg/soiltexture/inst/polish_language_ANSI.r 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/inst/polish_language_ANSI.r 2014-06-10 08:18:37 UTC (rev 106) @@ -1,10 +0,0 @@ -lang.par2 <- data.frame( - "lang" = "pl", - "CLAY" = "\"Il\"", - "SILT" = "\"Pyl\"", - "SAND" = "\"Piasek\"", - "TT" = "\"Trojkat Fereta\"", - stringsAsFactors = FALSE -) - - Deleted: pkg/soiltexture/inst/polish_triangle.r =================================================================== --- pkg/soiltexture/inst/polish_triangle.r 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/inst/polish_triangle.r 2014-06-10 08:18:37 UTC (rev 106) @@ -1,68 +0,0 @@ -TT.add( - "PL.TT" = list( # Polish Triangle parameters according to Systematyka - # gleb Polski (1989) for non-alluvial soils - # - main = "PL", - # - # 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 P19 P20 P21 P22 P23 - # = P24 P25 P26 P27 P28 P29 P30 P31 P32 P33 (submits) - "tt.points" = data.frame( - "CLAY" = c( 1.000, 0.900, 0.750, 0.600, 0.650, 0.500, 0.500, 0.500, 0.500, 0.500, 0.350, 0.350, - 0.350, 0.350, 0.250, 0.250, 0.250, 0.200, 0.200, 0.200, 0.150, 0.150, 0.150, - 0.100, 0.100, 0.100, 0.050, 0.050, 0.050, 0.000, 0.000, 0.000, 0.000 ), - # - "SILT" = c( 0.000, 0.000, 0.250, 0.400, 0.250, 0.000, 0.250, 0.300, 0.400, 0.500, 0.000, 0.250, - 0.400, 0.650, 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, - 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, 1.000 ), - # - "SAND" = c( 0.000, 0.100, 0.000, 0.000, 0.100, 0.500, 0.250, 0.200, 0.100, 0.000, 0.650, 0.400, - 0.250, 0.000, 0.750, 0.500, 0.350, 0.800, 0.550, 0.400, 0.850, 0.600, 0.450, - 0.900, 0.650, 0.500, 0.950, 0.700, 0.550, 1.000, 0.750, 0.600, 0.000 ) - ), # - # - # Abreviations; Names of the texture cl; Points marking the class limits (points specified above) - "tt.polygons" = list( - "i" = list( "name" = "i?? w??a??ciwy", "points" = c(01,03,05,02) ), - "ip" = list( "name" = "i?? pylasty", "points" = c(03,10,09,05) ), - "gc" = list( "name" = "glina ci????ka", "points" = c(02,05,07,06) ), - "gcp" = list( "name" = "glina ci????ka pylasta", "points" = c(05,09,07) ), - "gs" = list( "name" = "glina ??rednia", "points" = c(06,07,12,11) ), - "gsp" = list( "name" = "glina ??rednia pylasta", "points" = c(07,09,13,12) ), - "gl" = list( "name" = "glina lekka silnie spiaszczona", "points" = c(11,12,16,15) ), - "glp" = list( "name" = "glina lekka silnie spiaszczona pylasta", "points" = c(12,13,17,16) ), - "gp" = list( "name" = "glina lekka s??abo spiaszczona", "points" = c(15,16,19,18) ), - "gpp" = list( "name" = "glina lekka s??abo spiaszczona pylasta", "points" = c(16,17,20,19) ), - "pgm" = list( "name" = "piasek gliniasty mocny", "points" = c(18,19,22,21) ), - "pgpm" = list( "name" = "piasek gliniasty mocny pylasty", "points" = c(19,20,23,22) ), - "pgl" = list( "name" = "piasek gliniasty lekki", "points" = c(21,22,25,24) ), - "pglp" = list( "name" = "piasek gliniasty lekki pylasty", "points" = c(22,23,26,25) ), - "ps" = list( "name" = "piasek s??abogliniasty", "points" = c(24,25,28,27) ), - "psp" = list( "name" = "piasek s??abogliniasty pylasty", "points" = c(25,26,29,28) ), - "pl" = list( "name" = "piasek lekki", "points" = c(27,28,31,30) ), - "plp" = list( "name" = "piasek lekki pylasty", "points" = c(28,29,32,31) ), - "p??i" = list( "name" = "py?? ilasty", "points" = c(09,10,14,13) ), - "p??z" = list( "name" = "py?? zwyk??y", "points" = c(13,14,33,32) ) - ), # - # - # 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,20,100,1000), - tri.css.ps.lim = c(0,20,100,1000), - # - unit.ps = quote(bold(mu) * bold('m')), - unit.tx = quote(bold('%')), - # - text.sum = 100 - ) # -) # - - Deleted: pkg/soiltexture/inst/polish_triangle_ANSI.r =================================================================== --- pkg/soiltexture/inst/polish_triangle_ANSI.r 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/inst/polish_triangle_ANSI.r 2014-06-10 08:18:37 UTC (rev 106) @@ -1,68 +0,0 @@ -TT.add( - "PL.TT" = list( # Polish Triangle parameters according to Systematyka - # gleb Polski (1989) for non-alluvial soils - # - main = "PL", - # - # 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 P19 P20 P21 P22 P23 - # = P24 P25 P26 P27 P28 P29 P30 P31 P32 P33 (submits) - "tt.points" = data.frame( - "CLAY" = c( 1.000, 0.900, 0.750, 0.600, 0.650, 0.500, 0.500, 0.500, 0.500, 0.500, 0.350, 0.350, - 0.350, 0.350, 0.250, 0.250, 0.250, 0.200, 0.200, 0.200, 0.150, 0.150, 0.150, - 0.100, 0.100, 0.100, 0.050, 0.050, 0.050, 0.000, 0.000, 0.000, 0.000 ), - # - "SILT" = c( 0.000, 0.000, 0.250, 0.400, 0.250, 0.000, 0.250, 0.300, 0.400, 0.500, 0.000, 0.250, - 0.400, 0.650, 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, - 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, 0.000, 0.250, 0.400, 1.000 ), - # - "SAND" = c( 0.000, 0.100, 0.000, 0.000, 0.100, 0.500, 0.250, 0.200, 0.100, 0.000, 0.650, 0.400, - 0.250, 0.000, 0.750, 0.500, 0.350, 0.800, 0.550, 0.400, 0.850, 0.600, 0.450, - 0.900, 0.650, 0.500, 0.950, 0.700, 0.550, 1.000, 0.750, 0.600, 0.000 ) - ), # - # - # Abreviations; Names of the texture cl; Points marking the class limits (points specified above) - "tt.polygons" = list( - "i" = list( "name" = "il wlasciwy", "points" = c(01,03,05,02) ), - "ip" = list( "name" = "il pylasty", "points" = c(03,10,09,05) ), - "gc" = list( "name" = "glina ciezka", "points" = c(02,05,07,06) ), - "gcp" = list( "name" = "glina ciezka pylasta", "points" = c(05,09,07) ), - "gs" = list( "name" = "glina srednia", "points" = c(06,07,12,11) ), - "gsp" = list( "name" = "glina srednia pylasta", "points" = c(07,09,13,12) ), - "gl" = list( "name" = "glina lekka silnie spiaszczona", "points" = c(11,12,16,15) ), - "glp" = list( "name" = "glina lekka silnie spiaszczona pylasta", "points" = c(12,13,17,16) ), - "gp" = list( "name" = "glina lekka slabo spiaszczona", "points" = c(15,16,19,18) ), - "gpp" = list( "name" = "glina lekka slabo spiaszczona pylasta", "points" = c(16,17,20,19) ), - "pgm" = list( "name" = "piasek gliniasty mocny", "points" = c(18,19,22,21) ), - "pgpm" = list( "name" = "piasek gliniasty mocny pylasty", "points" = c(19,20,23,22) ), - "pgl" = list( "name" = "piasek gliniasty lekki", "points" = c(21,22,25,24) ), - "pglp" = list( "name" = "piasek gliniasty lekki pylasty", "points" = c(22,23,26,25) ), - "ps" = list( "name" = "piasek slabogliniasty", "points" = c(24,25,28,27) ), - "psp" = list( "name" = "piasek slabogliniasty pylasty", "points" = c(25,26,29,28) ), - "pl" = list( "name" = "piasek lekki", "points" = c(27,28,31,30) ), - "plp" = list( "name" = "piasek lekki pylasty", "points" = c(28,29,32,31) ), - "pli" = list( "name" = "pyl ilasty", "points" = c(09,10,14,13) ), - "plz" = list( "name" = "pyl zwykly", "points" = c(13,14,33,32) ) - ), # - # - # 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,20,100,1000), - tri.css.ps.lim = c(0,20,100,1000), - # - unit.ps = quote(bold(mu) * bold('m')), - unit.tx = quote(bold('%')), - # - text.sum = 100 - ) # -) # - - Added: pkg/soiltexture/inst/triangles.rds =================================================================== (Binary files differ) Property changes on: pkg/soiltexture/inst/triangles.rds ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: pkg/soiltexture/man/TT.plot.Rd =================================================================== --- pkg/soiltexture/man/TT.plot.Rd 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/man/TT.plot.Rd 2014-06-10 08:18:37 UTC (rev 106) @@ -836,8 +836,6 @@ # ::: Test all the texture triangles - - TT.plot( class.sys = "none" ) # no classification TT.plot( class.sys = "HYPRES.TT" ) # HYPRES / European Soil Map @@ -864,41 +862,57 @@ TT.plot( class.sys = "ROM.TT" ) # Romanian -try( TT.plot( class.sys = "PL.TT" ) ) # Polish - 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) + +# Triangles with special characters + +# (may not work on all platforms + some accents can be missing) + +try( TT.plot( class.sys = "PL.TT" ) ) # Polish + + + # ::: Test all the languages: - +TT.plot( class.sys = "USDA.TT", lang = "en" ) # English, default -TT.plot( class.sys = "USDA.TT", lang = "en" ) # English, default +TT.plot( class.sys = "USDA.TT", lang = "fr" ) # French -TT.plot( class.sys = "USDA.TT", lang = "fr" ) # French +TT.plot( class.sys = "USDA.TT", lang = "de" ) # German -TT.plot( class.sys = "USDA.TT", lang = "de" ) # German +TT.plot( class.sys = "USDA.TT", lang = "es" ) # Spanish -TT.plot( class.sys = "USDA.TT", lang = "es" ) # Spanish +TT.plot( class.sys = "USDA.TT", lang = "it" ) # Italian -TT.plot( class.sys = "USDA.TT", lang = "it" ) # Italian +TT.plot( class.sys = "USDA.TT", lang = "nl" ) # Dutch -TT.plot( class.sys = "USDA.TT", lang = "nl" ) # Dutch +TT.plot( class.sys = "USDA.TT", lang = "fl" ) # Dutch (Belgium) / Flemish -TT.plot( class.sys = "USDA.TT", lang = "fl" ) # Dutch (Belgian) / Flemmish +TT.plot( class.sys = "USDA.TT", lang = "se" ) # Swedish -TT.plot( class.sys = "USDA.TT", lang = "se" ) # Swedish +TT.plot( class.sys = "USDA.TT", lang = "ro" ) # Romanian -TT.plot( class.sys = "USDA.TT", lang = "ro" ) # Romanian + -try( TT.plot( class.sys = "USDA.TT", lang = "pl" ) ) # Polish +# Languages with special characters -} +# (may not work on all platforms + some accents can be missing) +try( TT.plot( class.sys = "USDA.TT", lang = "pl" ) ) # Polish + +try( TT.plot( class.sys = "USDA.TT", lang = "pt" ) ) # Portuguese + +try( TT.plot( class.sys = "USDA.TT", lang = "es2" ) ) # Spanish + +try( TT.plot( class.sys = "USDA.TT", lang = "ro2" ) ) # Romanian} + Modified: pkg/soiltexture/man/soiltexture-package.Rd =================================================================== --- pkg/soiltexture/man/soiltexture-package.Rd 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/man/soiltexture-package.Rd 2014-06-10 08:18:37 UTC (rev 106) @@ -34,9 +34,9 @@ \tabular{ll}{Package: \tab soiltexture\cr -Version: \tab 1.2.14\cr +Version: \tab 1.2.16\cr -Date: \tab 2014-04-23\cr +Date: \tab 2014-06-10\cr Title: \tab Functions for soil texture plot, classification and transformation\cr Modified: pkg/soiltexture/tests/TT.plot.R =================================================================== --- pkg/soiltexture/tests/TT.plot.R 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/tests/TT.plot.R 2014-06-10 08:18:37 UTC (rev 106) @@ -53,7 +53,6 @@ ) # # ::: Test all the texture triangles - TT.plot( class.sys = "none" ) # no classification TT.plot( class.sys = "HYPRES.TT" ) # HYPRES / European Soil Map TT.plot( class.sys = "USDA.TT" ) # USDA @@ -67,22 +66,30 @@ TT.plot( class.sys = "AU2.TT" ) # Australian TT.plot( class.sys = "ISSS.TT" ) # ISSS TT.plot( class.sys = "ROM.TT" ) # Romanian -try( TT.plot( class.sys = "PL.TT" ) ) # Polish 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) +# Triangles with special characters +# (may not work on all platforms + some accents can be missing) +try( TT.plot( class.sys = "PL.TT" ) ) # Polish + # ::: Test all the languages: +TT.plot( class.sys = "USDA.TT", lang = "en" ) # English, default +TT.plot( class.sys = "USDA.TT", lang = "fr" ) # French +TT.plot( class.sys = "USDA.TT", lang = "de" ) # German +TT.plot( class.sys = "USDA.TT", lang = "es" ) # Spanish +TT.plot( class.sys = "USDA.TT", lang = "it" ) # Italian +TT.plot( class.sys = "USDA.TT", lang = "nl" ) # Dutch +TT.plot( class.sys = "USDA.TT", lang = "fl" ) # Dutch (Belgium) / Flemish +TT.plot( class.sys = "USDA.TT", lang = "se" ) # Swedish +TT.plot( class.sys = "USDA.TT", lang = "ro" ) # Romanian -TT.plot( class.sys = "USDA.TT", lang = "en" ) # English, default -TT.plot( class.sys = "USDA.TT", lang = "fr" ) # French -TT.plot( class.sys = "USDA.TT", lang = "de" ) # German -TT.plot( class.sys = "USDA.TT", lang = "es" ) # Spanish -TT.plot( class.sys = "USDA.TT", lang = "it" ) # Italian -TT.plot( class.sys = "USDA.TT", lang = "nl" ) # Dutch -TT.plot( class.sys = "USDA.TT", lang = "fl" ) # Dutch (Belgian) / Flemmish -TT.plot( class.sys = "USDA.TT", lang = "se" ) # Swedish -TT.plot( class.sys = "USDA.TT", lang = "ro" ) # Romanian -try( TT.plot( class.sys = "USDA.TT", lang = "pl" ) ) # Polish - +# Languages with special characters +# (may not work on all platforms + some accents can be missing) +try( TT.plot( class.sys = "USDA.TT", lang = "pl" ) ) # Polish +try( TT.plot( class.sys = "USDA.TT", lang = "pt" ) ) # Portuguese +try( TT.plot( class.sys = "USDA.TT", lang = "es2" ) ) # Spanish +try( TT.plot( class.sys = "USDA.TT", lang = "ro2" ) ) # Romanian Modified: pkg/soiltexture/vignettes/soiltexture_vignette.Rnw =================================================================== --- pkg/soiltexture/vignettes/soiltexture_vignette.Rnw 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/vignettes/soiltexture_vignette.Rnw 2014-06-10 08:18:37 UTC (rev 106) @@ -1538,6 +1538,44 @@ % +~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ +\subsection{The Brazilian soil texture classification} + +To display a Brazilian texture triangle (Lemos & Santos +1996)\cite{LEMOS1996}, type: + + +<>= +TT.plot( class.sys = "BRASIL.TT" ) +@ + + + +The Brazilian soil texture classification has been built +considering a silt - sand limit of +\Sexpr{TT.get("BRASIL.TT")[["base.css.ps.lim"]][3]}$\mu$meters.\\ + + +See the table for soil texture classes symbols: + + +<>= +tex.tbl <- TT.classes.tbl( class.sys = "BRASIL.TT" ) +xtable( + x = tex.tbl[,-3], # + caption = "Texture classes of the Brazilian system / triangle", + label = NULL +) # +@ + + +Many thanks to Rodolfo Marcondes Silva Souza, UFPE, Brasil, for +providing information and references on the Brasilian triangle.\\ + +\clearpage % otherwise the table may 'eats' next triangle + + + +% +~~~~~~~~~~~~~~~~~~~~~~~~~~~~+ \subsection{Soil texture triangle with a texture classes color gradient} @@ -3367,9 +3405,12 @@ The polish language can be obtained by typing \texttt{lang = "pl"} -on all platforms by Mac.\\ +on all platforms but Mac.\\ +The Portuguese language can be obtained by typing \texttt{lang = "pt"}. + + And finally in English, the default language (\texttt{lang = "en"}): Modified: pkg/soiltexture/vignettes/soiltexture_vignette.bib =================================================================== --- pkg/soiltexture/vignettes/soiltexture_vignette.bib 2014-04-23 13:50:06 UTC (rev 105) +++ pkg/soiltexture/vignettes/soiltexture_vignette.bib 2014-06-10 08:18:37 UTC (rev 106) @@ -337,6 +337,15 @@ url = {http://dx.doi.org/10.1016/S0016-7061(99)00014-2} } + at TECHREPORT{LEMOS1996, + author = {R. C. Lemos and R. D. Santos}, + title = {Manual de descri??o e coleta de solo no campo. 3a ed. Campinas}, + institution = {Sociedade Brasileira de Ci?ncia do solo}, + year = {1996}, + owner = {julienm}, + timestamp = {2014.06.09} +} + @ARTICLE{TEH1996, author = {T.B.S. Christopher and A.M. Mokhtaruddin}, title = {A computer program to determine the soil textural class in 1-2-3 Property changes on: prepare ___________________________________________________________________ Added: svn:ignore + Soil Text Wizard Whitney 1911 Code.jm.R Soil Text Wizard Whitney 1911 Code.txt Whitney 1911 Scan.png Added: prepare/specialCharacters/archives/polish_language.r =================================================================== --- prepare/specialCharacters/archives/polish_language.r (rev 0) +++ prepare/specialCharacters/archives/polish_language.r 2014-06-10 08:18:37 UTC (rev 106) @@ -0,0 +1,9 @@ +lang.par2 <- data.frame( + "lang" = "pl", + "CLAY" = "\"I??\"", + "SILT" = "\"Py??\"", + "SAND" = "\"Piasek\"", + "TT" = "\"Tr??jk??t Fereta\"", + stringsAsFactors = FALSE +) # + Added: prepare/specialCharacters/archives/polish_language_ANSI.r =================================================================== --- prepare/specialCharacters/archives/polish_language_ANSI.r (rev 0) +++ prepare/specialCharacters/archives/polish_language_ANSI.r 2014-06-10 08:18:37 UTC (rev 106) @@ -0,0 +1,10 @@ +lang.par2 <- data.frame( + "lang" = "pl", + "CLAY" = "\"Il\"", + "SILT" = "\"Pyl\"", + "SAND" = "\"Piasek\"", + "TT" = "\"Trojkat Fereta\"", + stringsAsFactors = FALSE +) + + Added: prepare/specialCharacters/archives/polish_triangle.r =================================================================== --- prepare/specialCharacters/archives/polish_triangle.r (rev 0) +++ prepare/specialCharacters/archives/polish_triangle.r 2014-06-10 08:18:37 UTC (rev 106) @@ -0,0 +1,68 @@ +TT.add( + "PL2.TT" = list( # Polish Triangle parameters according to Systematyka + # gleb Polski (1989) for non-alluvial soils + # + main = "PL", + # + # The list below specify the CSS coordinates of the different POINTS [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/soiltexture -r 106 From noreply at r-forge.r-project.org Tue Jun 10 10:24:41 2014 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 10 Jun 2014 10:24:41 +0200 (CEST) Subject: [Soiltexture-commits] r107 - pkg/soiltexture Message-ID: <20140610082441.C46C0187352@r-forge.r-project.org> Author: jmoeys Date: 2014-06-10 10:24:41 +0200 (Tue, 10 Jun 2014) New Revision: 107 Modified: pkg/soiltexture/SVN_VERSION Log: Modified: pkg/soiltexture/SVN_VERSION =================================================================== --- pkg/soiltexture/SVN_VERSION 2014-06-10 08:18:37 UTC (rev 106) +++ pkg/soiltexture/SVN_VERSION 2014-06-10 08:24:41 UTC (rev 107) @@ -1 +1 @@ -95:105M +105:106M