diff -Nru r-cran-plotrix-3.8-2/DESCRIPTION r-cran-plotrix-3.8-4/DESCRIPTION --- r-cran-plotrix-3.8-2/DESCRIPTION 2021-09-08 11:00:02.000000000 +0000 +++ r-cran-plotrix-3.8-4/DESCRIPTION 2023-11-10 10:10:02.000000000 +0000 @@ -1,6 +1,6 @@ Package: plotrix -Version: 3.8-2 -Date: 2021-09-08 +Version: 3.8-4 +Date: 2023-11-09 Title: Various Plotting Functions Author: Jim Lemon, Ben Bolker, Sander Oom, Eduardo Klein, Barry Rowlingson, @@ -12,13 +12,16 @@ Christophe Dutang, Peter Solymos, Robby Engelmann, Michael Hecker, Felix Steinbeck, Hans Borchers, Henrik Singmann, Ted Toal, Derek Ogle, Darshan Baral, - Ulrike Groemping, Bill Venables -Maintainer: Jim Lemon + Ulrike Groemping, Bill Venables, The CRAN Team, + Duncan Murdoch +Maintainer: Duncan Murdoch Imports: grDevices, graphics, stats, utils -Description: Lots of plots, various labeling, axis and color scaling functions. +Description: Lots of plots, various labeling, axis and color scaling functions. The author/maintainer died in September 2023. License: GPL (>= 2) NeedsCompilation: no -Packaged: 2021-09-08 10:15:08 UTC; root Depends: R (>= 3.5.0) Repository: CRAN -Date/Publication: 2021-09-08 11:00:02 UTC +Date/Publication: 2023-11-10 10:10:02 UTC +URL: https://github.com/dmurdoch/plotrix +BugReports: https://github.com/dmurdoch/plotrix/issues +Packaged: 2023-11-09 16:39:28 UTC; murdoch diff -Nru r-cran-plotrix-3.8-2/MD5 r-cran-plotrix-3.8-4/MD5 --- r-cran-plotrix-3.8-2/MD5 2021-09-08 11:00:02.000000000 +0000 +++ r-cran-plotrix-3.8-4/MD5 2023-11-10 10:10:02.000000000 +0000 @@ -1,6 +1,6 @@ -5e7492402b9803b372890e5f74e8fbb6 *DESCRIPTION +72800e50c686e07b3d9a5d9c32e5f411 *DESCRIPTION 51cdae9066a4386857ec0a8d0af63b4d *NAMESPACE -58303b8d4d5bee0d9108b27f43b0619e *NEWS +ad04993872ea3f9e561d6cc0238ea02f *NEWS 2c74abe5f355af8948fa9087f56959c9 *R/ablineclip.R 163140184d1f3e7c2ac7d6131086cea4 *R/add.ps.R 76f5fc2c4426b0e082293a71976151e0 *R/addtable2plot.R @@ -82,7 +82,7 @@ d10a37e008c5dd3d32e5701b6da1f153 *R/plotH.R 960aae874cd12958dd6dccde3558879d *R/plot_bg.R f10e1defb3c27cbd4459f322752389f0 *R/polygon.shadow.R -0656a3a9339178d28c7c8f14208d1094 *R/pyramid.plot.R +eda7e7316a7894f3c55c379b4eabb040 *R/pyramid.plot.R a9ca72cae93ae7857215c3c9345424a5 *R/radial.grid.R 4a39b9cf3f827790062a28bba3dcfda4 *R/radial.pie.R 7da2b2490a8e43021f87ee106b6a369c *R/radial.plot.R @@ -123,12 +123,13 @@ 7c9cef5ec0a813acbf2ea12f50fd4e1d *R/weighted.hist.R 481b3f85c721c582bc955c5059ba7c1e *R/windrose.R 52d0de3c89b6d90fe1e9157b0c76f291 *R/zoomInPlot.R +a2a666f4142c6841eb4365cfefcd9b92 *README.md 6c5b0047d50b0d071c9a8162c81ccb31 *data/death_reg.rda db7ccec9c3f56f957ae404ac7eb806ab *data/l2010.rda 28da395b56d0844c2810292c955c8390 *data/soils.rda 271f59ed8376069aee632b80ba619089 *demo/00Index 7d5c62634e9c734037c6e1381b3c246e *demo/plotrix.R -b35ca73e819dbad59881960986301ef3 *inst/CITATION +2bd599b79b6db238ec5ff004e628bae9 *inst/CITATION 18976d8d5ea793f2c57cdc0a6a09d923 *man/ablineclip.Rd 537da0d23075efb4f8a3632aa39f3901 *man/add.ps.Rd 9eee36ce9e1b11859d11f4cd0f713f96 *man/addtable2plot.Rd @@ -136,7 +137,7 @@ a71910a0f86e93cf206486763a59aed8 *man/axis.break.Rd 282b2f8fcd742e3d6a60ab081aaa405b *man/axis.mult.Rd 4a254023ffa5135515e72a183fd8741a *man/barNest.Rd -a5bcd07b2d0f85bbd20a4e0cc2ccf29b *man/barlabels.Rd +4c3e618d95c3f620f3f209fac793d87a *man/barlabels.Rd 309ef3fa24d49f8dbe43eb738b99cf88 *man/barp.Rd be8e61e3b745fbc214f0b4447de98aca *man/battleship.plot.Rd 898f3abab9664c2f87d1a527f622e6ba *man/bin.wind.records.Rd @@ -175,7 +176,7 @@ cb68dd72282e0a252f1689d786a10371 *man/draw.arc.Rd 385b175c50e92fe72d33111d350e702f *man/draw.circle.Rd 4a4c1b00cab07fbe4a3d426c9e99ed6f *man/draw.ellipse.Rd -84e9daf9df6dc02632d28aad82fe552e *man/draw.radial.line.Rd +3728737f7da4b6284c59aabb12a96084 *man/draw.radial.line.Rd c771ff20c909ba6d894c1dd73499b079 *man/draw.tilted.sector.Rd 5f708405095411f3d239bd13c6e37a4e *man/drawNestedBars.Rd e0cf4b49c5d11ec218ef091e3766443c *man/drawSectorAnnulus.Rd @@ -185,7 +186,7 @@ b55609273a2b9957e2c4f963392bb157 *man/fan.plot.Rd fffabb21a837f2c1263dc71d2911f3d0 *man/feather.plot.Rd 7fc047f882280b8673a96f6d21b9a1d9 *man/fill.corner.Rd -65bb7a717f1b836d2357ece04281236c *man/find_max_cell.Rd +3ea877c312d51268a881aaa12db03d89 *man/find_max_cell.Rd a9bb487aa05d672d528cf05c823d4d12 *man/floating.pie.Rd ef0018a2314c3b5bf4d0e953ae036aed *man/fullaxis.Rd 0f87c03e28f4f3528dd031077897cf98 *man/gantt.chart.Rd @@ -226,7 +227,7 @@ 41c1c83e66a33d35bb0f48d9dfd68909 *man/oz.windrose.Rd 00585c01256159f892de1181dd9f63f3 *man/oz.windrose.legend.Rd 6858a19ebe31e922e871d0a66ef5be43 *man/p2p_arrows.Rd -f5f9a3f8fc633f528b69502756b032fe *man/panes.Rd +7f6c01cce5a1311a4a74f9bc3ecd0143 *man/panes.Rd e64d53c83bcdabd46565c0ebee38e23c *man/pasteCols.Rd df16d5a7e051f52e37eb2624bed0abf2 *man/paxis3d.Rd 024a5c644d2982a431cebaa10fd2131f *man/perspx.Rd @@ -237,14 +238,14 @@ 94da9e98fdf1f64739b188fea1f021f6 *man/plotCI.Rd d537e859f11754e2ab779d75c82a0086 *man/plotH.Rd d0be8d8872d21c55c387ed117d60bc92 *man/plot_bg.Rd -0d66618b9edc5d3b02b7037a634bf0cc *man/plotrix-package.Rd +3a5bf5e31224f43b47216c78feca1539 *man/plotrix-package.Rd f99459c22b2d5267043f04a863105042 *man/polar.plot.Rd aacd4acbdc1275ecff45c6d962ae8f16 *man/polygon.shadow.Rd 8d1dc46509d56126301ed969bff3ed8c *man/print.brklist.Rd 3624e09ffd23b05f6681cc1c31734345 *man/propbrk.Rd d3979b4cb2e49006ebd6bc1e2c795fb9 *man/psegments3d.Rd a239386f59c013ebc0e4bf9fcabc5747 *man/ptext3d.Rd -dddf2ba43c782b71e5a155e6a4b2abe5 *man/pyramid.plot.Rd +12a211af405d9057f2df676caf58cacd *man/pyramid.plot.Rd d0f65eab9235a7dc9694916771a796fd *man/radial.grid.Rd e1ecf218a7dd9d4b5bec2a491a079982 *man/radial.pie.Rd 74aeeb71451d6b5d53df4f4959d576e2 *man/radial.plot.Rd @@ -261,7 +262,7 @@ 5e3eaf86657a5d098e9c9c53e783d689 *man/sizetree.Rd 554e180d9da267bedc3ad04b2bd6f4aa *man/sliceArray.Rd 1b6f61faec620b2a1cc2b4c1b95fcc7e *man/smoothColors.Rd -7ac386e8429fc20bed646d98078e267e *man/soil.texture.Rd +62c787d9fcea4beaf91e31b9eb7f7efb *man/soil.texture.Rd 56b0e186a2d31d3f9c4f5a38f54540df *man/soil.texture.uk.Rd 1538a56e8001fbdac5bc6fe59989cb75 *man/soils.Rd 94621600224164995f082b46963b8f87 *man/spread.labels.Rd @@ -277,9 +278,9 @@ ae8f69cda8160327316c915a992151c9 *man/symbolbox.Rd d9f79a0e522fcb9a4d1af0873723a412 *man/tab.title.Rd 76e9e7908a121e2282b6228d3fad3b1e *man/taylor.diagram.Rd -78e9845825dfde81846bdca59142da45 *man/textbox.Rd +e4d86cf7cdc4dbe969fc424d63573244 *man/textbox.Rd d3bceb4fb894f93c0c0d707927aa98e0 *man/thigmophobe.Rd -4f7a77bbf7f29248928acc1e22ab25a3 *man/thigmophobe.labels.Rd +b4246cd3e8e6cdf72a323d82ffbf5614 *man/thigmophobe.labels.Rd ac5071d4a906c8d08c62d24c1059d548 *man/triax.abline.Rd 5fc757905ff2fb69baab63abdba3d364 *man/triax.fill.Rd ef26303ff7d7fca80a4e6aa6a4faface *man/triax.frame.Rd diff -Nru r-cran-plotrix-3.8-2/NEWS r-cran-plotrix-3.8-4/NEWS --- r-cran-plotrix-3.8-2/NEWS 2021-09-04 00:28:17.000000000 +0000 +++ r-cran-plotrix-3.8-4/NEWS 2023-11-09 16:03:48.000000000 +0000 @@ -1,540 +1,571 @@ -version 3.8-2 +Changes in version 3.8-4 (2023-11-09) - fixed showcount option in sizetree - log10 plotting added to radial.plot family (thanks to Keziah Conroy) - added X and Y axis labels in gap.boxplot + - Duncan Murdoch has taken over as maintainer. + + - Source has been moved to Github. + + - A bug in the labels in `pyramid.plot()` reported by `biohisham` + has been fixed. -version 3.8-1 +Changes in version 3.8-3 (2023-11-02) - dropped makeDendrite, plotDendrite and sumDendrite functions + - Prepared by the CRAN team: the package has been orphaned. -version 3.7-8 + - Dr Jim Lemon passed away in September 2023. + + - man/plotrix-package contained old version information + duplicating the DESCRIPTION, so this has been commented out. + + - panes.Rd attempted to plot symbols not available to the pdf() + device used for R CMD check, which should have been in \donttest{}. + + - This file was not in a documented format for a NEWS file. + + - barlabels.Rd, draw.radial.line.Rd, textbox.Rd, thigmophobe.labels.Rd + had 'samp' or 'link' where '\samp' or '\link' was meant, or + '\samp' was missing before braces. + + - soil.texture.Rd contained defunct URLs. + + - Markup in CITATION has been modernized. + +Changes in version 3.8-2 + + - fixed showcount option in sizetree + - log10 plotting added to radial.plot family (thanks to Keziah Conroy) + - added X and Y axis labels in gap.boxplot + +Changes in version 3.8-1 + + - dropped makeDendrite, plotDendrite and sumDendrite functions + +Changes in version 3.7-8 - Either axis in barp can now be omitted using the stax* arguments - HH:MM to decimal hour conversion with hm2dec argument in clock24.plot - Improved the placement of top.labels in pyramid.plot - Fixed color problem in floating.pie when zero or NA present + - Either axis in barp can now be omitted using the stax* arguments + - HH:MM to decimal hour conversion with hm2dec argument in clock24.plot + - Improved the placement of top.labels in pyramid.plot + - Fixed color problem in floating.pie when zero or NA present (thanks to Christoffer Flensburg) - Fixed label problem in radial.plot.labels + - Fixed label problem in radial.plot.labels (thanks to Fabio Parracho Silva) - Added gap_barp function that will eventually replace gap.barplot + - Added gap_barp function that will eventually replace gap.barplot (thanks to Pamela Rueda-Cediel) -version 3.7-7 +Changes in version 3.7-7 - twoord.plot now calls axis.POSIXct for the x-axis if appropriate + - twoord.plot now calls axis.POSIXct for the x-axis if appropriate fixed problem with conditional statements using "class" -version 3.7-6 +Changes in version 3.7-6 - fixed color.axis when "at" values are outside the plot limits + - fixed color.axis when "at" values are outside the plot limits -version 3.7-5 +Changes in version 3.7-5 - fixed the "empty list" bug in listDepth (thanks to Tingting Zhan) - new and elegant thigmophobe function (thanks to Bill Venables) - adjusted text size and placement in taylor.diagram for pos.cor=FALSE - added makeDensityMatrix and densityGrid functions - fixed functions that called 'barplot' (thanks to Martin Maechler) + - fixed the "empty list" bug in listDepth (thanks to Tingting Zhan) + - new and elegant thigmophobe function (thanks to Bill Venables) + - adjusted text size and placement in taylor.diagram for pos.cor=FALSE + - added makeDensityMatrix and densityGrid functions + - fixed functions that called 'barplot' (thanks to Martin Maechler) -version 3.7-4 +Changes in version 3.7-4 - fixed the dimension loss in color.scale when xrange specified + - fixed the dimension loss in color.scale when xrange specified -version 3.7-3 +Changes in version 3.7-3 - enhancement for gradient.rect function (thanks to Rod Lamming) - fix for gantt.chart function (thanks to Andrius Getzinis) - improvement to thigmophobe (thanks to Duncan Murdoch) - fixed specified legend position in the barp function + - enhancement for gradient.rect function (thanks to Rod Lamming) + - fix for gantt.chart function (thanks to Andrius Getzinis) + - improvement to thigmophobe (thanks to Duncan Murdoch) + - fixed specified legend position in the barp function -version 3.7-2 +Changes in version 3.7-2 - align plotrix-package.Rd with DESCRIPTION file - added user-specified labels to bumpchart + - align plotrix-package.Rd with DESCRIPTION file + - added user-specified labels to bumpchart -version 3.7-1 +Changes in version 3.7-1 - fix for the multivari function (thanks to Ulrike Groemping) - added the plotH function (thanks to Derek Ogle) + - fix for the multivari function (thanks to Ulrike Groemping) + - added the plotH function (thanks to Derek Ogle) -version 3.7 +Changes in version 3.7 - fixed brkdnNest due to changes arriving in R-3.4.3 - added the joyPlot function - multivari plot function added (thanks to Ulrike Groemping) + - fixed brkdnNest due to changes arriving in R-3.4.3 + - added the joyPlot function + - multivari plot function added (thanks to Ulrike Groemping) -version 3.6-6 +Changes in version 3.6-6 - added fill arguments to draw.circle (thanks to David Winsemius) - color2D.matplot now adds trailing zeros to values (thanks to Yuan Zhou) - a few ehancements to gantt.chart (thanks to Suman Khanal) - fixed the problem of asking for "l" type in polar.plot (thanks to Alex Pal) - improved version of violin_plot (thanks to Darshan Baral) + - added fill arguments to draw.circle (thanks to David Winsemius) + - color2D.matplot now adds trailing zeros to values (thanks to Yuan Zhou) + - a few ehancements to gantt.chart (thanks to Suman Khanal) + - fixed the problem of asking for "l" type in polar.plot (thanks to Alex Pal) + - improved version of violin_plot (thanks to Darshan Baral) -version 3.6-5 +Changes in version 3.6-5 - added the clustered.dotplots and violin_plot functions - fixed the extra call to plot in soil.texture (thanks to Dylan Beaudette) - added an option to radial.grid to allow it to display a blank grid - fixed a mysterious problem with equating one argument to another + - added the clustered.dotplots and violin_plot functions + - fixed the extra call to plot in soil.texture (thanks to Dylan Beaudette) + - added an option to radial.grid to allow it to display a blank grid + - fixed a mysterious problem with equating one argument to another in the box.heresy function -version 3.6-4 +Changes in version 3.6-4 - fixed a typo in twoord.plot that caused an error when the range + - fixed a typo in twoord.plot that caused an error when the range of the right axis went negative - added the jiggle function - changed the show.nulls argument in intersectDiagram to the nulls label - fixed the "fill" problem in textbox (thanks to Kohleth Chia) - added the placeLabels function - enhancement to raw.means.plot (thanks to Henrik Singmann) - added the binciW function, which fixes an error (thanks to Marc Girondot) - fixed the bug with displaying dispersion in barNest + - added the jiggle function + - changed the show.nulls argument in intersectDiagram to the nulls label + - fixed the "fill" problem in textbox (thanks to Kohleth Chia) + - added the placeLabels function + - enhancement to raw.means.plot (thanks to Henrik Singmann) + - added the binciW function, which fixes an error (thanks to Marc Girondot) + - fixed the bug with displaying dispersion in barNest -version 3.6-3 +Changes in version 3.6-3 - fixed the errant y label in radial.pie - fixed the problem with degrees/radians in draw.ellipse (thanks to Wouter vander Bijl) + - fixed the errant y label in radial.pie + - fixed the problem with degrees/radians in draw.ellipse (thanks to Wouter vander Bijl) -version 3.6-2 +Changes in version 3.6-2 - fixed the call to clip in rectFill (thanks to Cheng Zhou) - fixed the incorrect placing of some text in arctext (thanks to Mark Heckmann) - fixed the misbehaving y axis in brkdn.plot - improved the circumferential labels in clock24.plot + - fixed the call to clip in rectFill (thanks to Cheng Zhou) + - fixed the incorrect placing of some text in arctext (thanks to Mark Heckmann) + - fixed the misbehaving y axis in brkdn.plot + - improved the circumferential labels in clock24.plot -version 3.6-1 +Changes in version 3.6-1 - updated ehplot function (thanks to Robby Englemann) - pyramid.plot now displays trailing zeros (thanks to Simon Thornley) - problem with time/date x values in vectorField fixed - colors and staggering added to plot.dendrite (thanks to Marna Wagley) + - updated ehplot function (thanks to Robby Englemann) + - pyramid.plot now displays trailing zeros (thanks to Simon Thornley) + - problem with time/date x values in vectorField fixed + - colors and staggering added to plot.dendrite (thanks to Marna Wagley) -version 3.6 +Changes in version 3.6 - fixed the missing left axis ticks in pyramid.plot (thanks to Jacob Clark) - corrected addtable2plot for log y plots (thanks to Andrew Metcalfe) - made the axis label and axis tick expansions the same in twoord.plot (thanks to wxj) - made the axis label and tick labels the same color as the axis in twoord.plot - added stack labels to the sizetree function - added imports now necessary for R CMD check + - fixed the missing left axis ticks in pyramid.plot (thanks to Jacob Clark) + - corrected addtable2plot for log y plots (thanks to Andrew Metcalfe) + - made the axis label and axis tick expansions the same in twoord.plot (thanks to wxj) + - made the axis label and tick labels the same color as the axis in twoord.plot + - added stack labels to the sizetree function + - added imports now necessary for R CMD check -version 3.5-12 +Changes in version 3.5-12 - added choice of time axis (1 or 3) to gantt.chart (thanks to Mathias Collins) - added outlined error bars to the dispersion function (thanks to Michael Eisenring) - added a check for no variation in values to color.scale and color2D.matplot (thanks to Diego Calzolari) + - added choice of time axis (1 or 3) to gantt.chart (thanks to Mathias Collins) + - added outlined error bars to the dispersion function (thanks to Michael Eisenring) + - added a check for no variation in values to color.scale and color2D.matplot (thanks to Diego Calzolari) -version 3.5-11 +Changes in version 3.5-11 - changed my email address + - changed my email address -version 3.5-10 +Changes in version 3.5-10 - added calculation method for SD in taylor.diagram (thanks to Melanie Moeller) - added the assembly seat distribution functions "seats" and "election" + - added calculation method for SD in taylor.diagram (thanks to Melanie Moeller) + - added the assembly seat distribution functions "seats" and "election" (thanks to Barry Rowlingson and Duncan Murdoch) - fixed the rectangle border problem in legendg (thanks to Christian Graul) + - fixed the rectangle border problem in legendg (thanks to Christian Graul) -version 3.5-9 +Changes in version 3.5-9 - added tangential labels to radial.plot + - added tangential labels to radial.plot -version 3.5-8 +Changes in version 3.5-8 - fixed the line length bug in feather.plot (thanks to Dr. Kazama) + - fixed the line length bug in feather.plot (thanks to Dr. Kazama) -version 3.5-6 +Changes in version 3.5-6 - added optional radial lines to the radial.grid function (thanks to Darren Obbard) + - added optional radial lines to the radial.grid function (thanks to Darren Obbard) -version 3.5-5 +Changes in version 3.5-5 - fixed the radial label bug in the radial.* functions (thanks to Mayeul Kauffmann) - changed the circumferential label suppress value in the radial.* functions to NULL - added the color.axis function - added log correction for boxed.labels (thanks to Flemming Skjøth) - fixed the breaks bug in histStack.default (thanks to Derek Ogle) - added scaled bar widths to barNest + - fixed the radial label bug in the radial.* functions (thanks to Mayeul Kauffmann) + - changed the circumferential label suppress value in the radial.* functions to NULL + - added the color.axis function + - added log correction for boxed.labels (thanks to Flemming Skjøth) + - fixed the breaks bug in histStack.default (thanks to Derek Ogle) + - added scaled bar widths to barNest -version 3.5-3 +Changes in version 3.5-3 - fixed the problems with data frames and margins in battleship.plot (thanks to David Carlson) - set xpd=TRUE for the boxed.labels function (thanks to Francois Rousseu) - changed the pie.labels function to call text and adjust in x and y - added plain text labelling to pie.labels - tested for a current device in cluster.overplot and count.overplot (thanks to Markus Elze) + - fixed the problems with data frames and margins in battleship.plot (thanks to David Carlson) + - set xpd=TRUE for the boxed.labels function (thanks to Francois Rousseu) + - changed the pie.labels function to call text and adjust in x and y + - added plain text labelling to pie.labels + - tested for a current device in cluster.overplot and count.overplot (thanks to Markus Elze) -version 3.5-2 +Changes in version 3.5-2 - added the get.tablepos function (thanks to Peter Murakami) - passed the ... argument(s) to points and dispersion in brkdn.plot (thanks to Peter Mandeville) - added text adjustment for the circumferential labels to radial.plot - added the fill.corner function to do waffle plots (thanks to Zhao Jin) + - added the get.tablepos function (thanks to Peter Murakami) + - passed the ... argument(s) to points and dispersion in brkdn.plot (thanks to Peter Mandeville) + - added text adjustment for the circumferential labels to radial.plot + - added the fill.corner function to do waffle plots (thanks to Zhao Jin) -version 3.5-1 +Changes in version 3.5-1 - added the tsxpos function (thanks to Prof J C Nash) - added a warning for off-axis labels to staxlab (thanks again to Prof Nash) - added the arrows argument to bumpchart (thanks to Jie) - added the axes argument to gap.boxplot (thanks to Shane Carey) + - added the tsxpos function (thanks to Prof J C Nash) + - added a warning for off-axis labels to staxlab (thanks again to Prof Nash) + - added the arrows argument to bumpchart (thanks to Jie) + - added the axes argument to gap.boxplot (thanks to Shane Carey) -version 3.4-8 +Changes in version 3.4-8 - fixed a minor bug in the ylim argument of gap.plot - twoord.plot had some bugs cleaned up and now has a do.first argument - fixed the missing background colors in addtable2plot - allowed floating.pie to ignore zero and NA values (thanks to Jose deSantos) - added the "stax" argument to gap.plot (thanks to Zheng Lu) - fixed the problem with "yaxlab" in gap.barplot (thanks to Giorgio Galetti) - added the "histStack" and "plotH" functions (thanks to Derek Ogle) + - fixed a minor bug in the ylim argument of gap.plot + - twoord.plot had some bugs cleaned up and now has a do.first argument + - fixed the missing background colors in addtable2plot + - allowed floating.pie to ignore zero and NA values (thanks to Jose deSantos) + - added the "stax" argument to gap.plot (thanks to Zheng Lu) + - fixed the problem with "yaxlab" in gap.barplot (thanks to Giorgio Galetti) + - added the "histStack" and "plotH" functions (thanks to Derek Ogle) -version 3.4-7 +Changes in version 3.4-7 - added automatic spreading out to pie.labels - fixed the "priorities extremes" bug in gantt.chart (thanks to Michael Motta) - pyramid.plot now accepts NA values (thanks to Susumu Tanimura) - radial.plot now does a rank clock plot (thanks to Don Dennerline) + - added automatic spreading out to pie.labels + - fixed the "priorities extremes" bug in gantt.chart (thanks to Michael Motta) + - pyramid.plot now accepts NA values (thanks to Susumu Tanimura) + - radial.plot now does a rank clock plot (thanks to Don Dennerline) -version 3.4-6 +Changes in version 3.4-6 - fixed the kite line positioning in kiteChart (thanks to Justin Dellinger) + - fixed the kite line positioning in kiteChart (thanks to Justin Dellinger) -version 3.4-5 +Changes in version 3.4-5 - fixed the upside down character bug in arctext - fixed the typo in the demo function for kite chart + - fixed the upside down character bug in arctext + - fixed the typo in the demo function for kite chart -version 3.4-4 +Changes in version 3.4-4 - added the radial.grid function to the NAMESPACE + - added the radial.grid function to the NAMESPACE -version 3.4-3 +Changes in version 3.4-3 - minor bug that counted NAs in the propbrk function fixed + - minor bug that counted NAs in the propbrk function fixed -version 3.4-2 +Changes in version 3.4-2 - Character spacing and placement improved in draw.arc and arctext (thanks to Ted Toal) - radialtext and draw.radial.line functions added (also thanks to Ted Toal) - weighted.hist now allows a custom X axis to be displayed (thanks to Ben Graf) - Added the barlabels function + - Character spacing and placement improved in draw.arc and arctext (thanks to Ted Toal) + - radialtext and draw.radial.line functions added (also thanks to Ted Toal) + - weighted.hist now allows a custom X axis to be displayed (thanks to Ben Graf) + - Added the barlabels function -version 3.4-1 +Changes in version 3.4-1 - Fixed the alignment problem in pie3D and rationalized angle increments - Added the raw.means.plot functions contributed by Henrik Singmann - vastly improved the speed of the sizetree function - added the "varpos" argument to the kiteChart function - thanks to Nikolaus Lampardariou) + - Fixed the alignment problem in pie3D and rationalized angle increments + - Added the raw.means.plot functions contributed by Henrik Singmann + - vastly improved the speed of the sizetree function + - added the "varpos" argument to the kiteChart function - thanks to Nikolaus Lampardariou) -version 3.4 +Changes in version 3.4 - added the border argument to the sizetree function - multhist now returns all values from hist - thanks to John Muccigrosso - fixed a bug in addtable2plot that appeared on plots with a log x axis - fixed an almost invisible bug in drawSectorAnnulus - thanks to Denes - added the "mar" argument to pie3D - thanks to Qinghua Zhao + - added the border argument to the sizetree function + - multhist now returns all values from hist - thanks to John Muccigrosso + - fixed a bug in addtable2plot that appeared on plots with a log x axis + - fixed an almost invisible bug in drawSectorAnnulus - thanks to Denes + - added the "mar" argument to pie3D - thanks to Qinghua Zhao -version 3.3-9 +Changes in version 3.3-9 - Fixed the bug in centipede.plot that I introduced in v3.3-8 + - Fixed the bug in centipede.plot that I introduced in v3.3-8 -version 3.3-8 +Changes in version 3.3-8 - added the horizontal grid argument to centipede plot (thanks to Colin Wahl) + - added the horizontal grid argument to centipede plot (thanks to Colin Wahl) -version 3.3-7 +Changes in version 3.3-7 - Fixed a color bug in plotCI (thanks to Daniel Wollschlaeger) + - Fixed a color bug in plotCI (thanks to Daniel Wollschlaeger) -version 3.3-6 +Changes in version 3.3-6 - Added the battleship plot (or Ford curve) thanks to Adam Maltese - Added the box.heresy function - thanks to Gianni Lavaredo + - Added the battleship plot (or Ford curve) thanks to Adam Maltese + - Added the box.heresy function - thanks to Gianni Lavaredo -version 3.3-4 +Changes in version 3.3-4 - Added the display.na argument to the dispersion function (thanks to Lasse Jacobsen) - Removed the "Overall" bar in barNest when counts are being displayed + - Added the display.na argument to the dispersion function (thanks to Lasse Jacobsen) + - Removed the "Overall" bar in barNest when counts are being displayed -version 3.3-3 +Changes in version 3.3-3 - Fixed a bug in the Hinton diagram option (thanks to Xavier Fernández i Marín) + - Fixed a bug in the Hinton diagram option (thanks to Xavier Fernández i Marín) -version 3.3-2 +Changes in version 3.3-2 - color2D.matplot will now display a Hinton diagram - added padding for negative values in twoord.plot (thanks to Hans Borcher) - added the maxEmptyRect function (thanks again to Hans Borchers) + - color2D.matplot will now display a Hinton diagram + - added padding for negative values in twoord.plot (thanks to Hans Borcher) + - added the maxEmptyRect function (thanks again to Hans Borchers) -version 3.3-1 +Changes in version 3.3-1 - expanded the color options and added top labels in sizetree - returned the frequency calculation in weighted.hist to what it used to be + - expanded the color options and added top labels in sizetree + - returned the frequency calculation in weighted.hist to what it used to be -version 3.3 +Changes in version 3.3 - fixed the vertical lines color in addtable2plot - fixed the frequency calculation in weighted.hist (thanks to Jarad Niemi) - added the size_n_color plot + - fixed the vertical lines color in addtable2plot + - fixed the frequency calculation in weighted.hist (thanks to Jarad Niemi) + - added the size_n_color plot -version 3.2-8 +Changes in version 3.2-8 - added partitioning of intersections to intersectDiagram + - added partitioning of intersections to intersectDiagram -version 3.2-7 +Changes in version 3.2-7 - bug fix for the examples in ladderplot + - bug fix for the examples in ladderplot -version 3.2-6 +Changes in version 3.2-6 - added the ruginv function after fixing some encoding problems + - added the ruginv function after fixing some encoding problems -version 3.2-5 +Changes in version 3.2-5 - fixed a color assignment problem in plotCI - added automatic color assignment in sizetree where all levels use the same colors + - fixed a color assignment problem in plotCI + - added automatic color assignment in sizetree where all levels use the same colors -version 3.2-4 +Changes in version 3.2-4 - Fixed the missing "shade" argument in pie3D (thanks to Jesse Brown) - Added specifiable priority legend label and extreme descriptors + - Fixed the missing "shade" argument in pie3D (thanks to Jesse Brown) + - Added specifiable priority legend label and extreme descriptors (thanks to Pedro Reis) - Added the (experimental) radial.pie function + - Added the (experimental) radial.pie function -version 3.2-3 +Changes in version 3.2-3 - Fixed a few warnings from CRAN check (dotplot.mtb, gap.boxplot, symbolbarplot) - Added the ruginv function (thanks to Peter Solymos) + - Fixed a few warnings from CRAN check (dotplot.mtb, gap.boxplot, symbolbarplot) + - Added the ruginv function (thanks to Peter Solymos) -version 3.2-2 +Changes in version 3.2-2 - Added the labbePlot function (thanks to Whitney Melroy) - Fixed the showall argument problem in the barNest function - Fixed the problem with data frame input in the intersectDiagram function + - Added the labbePlot function (thanks to Whitney Melroy) + - Fixed the showall argument problem in the barNest function + - Fixed the problem with data frame input in the intersectDiagram function -version 3.2-1 +Changes in version 3.2-1 - Added the sumbrk function to brkdnNest (thanks to Kevin Burnham) - The dispbars function (just a call to dispersion) is now gone - Added user specified text colors to boxed.labels (thanks to Thorn Thaler) - Added the ehplot function (thanks to Robby, Michael & Felix) + - Added the sumbrk function to brkdnNest (thanks to Kevin Burnham) + - The dispbars function (just a call to dispersion) is now gone + - Added user specified text colors to boxed.labels (thanks to Thorn Thaler) + - Added the ehplot function (thanks to Robby, Michael & Felix) -version 3.2 +Changes in version 3.2 - Rewrote intersectDiagram to use equidistant spacing - Fixed a warning in oz.windrose.legend - Fixed default ordinate scaling in twoord.plot - Major rewrite of brkdnNest, barNest and drawNestedBars functions - Major rewrite of color.scale function - Added sliceArray function for barNest due to the above rewrite + - Rewrote intersectDiagram to use equidistant spacing + - Fixed a warning in oz.windrose.legend + - Fixed default ordinate scaling in twoord.plot + - Major rewrite of brkdnNest, barNest and drawNestedBars functions + - Major rewrite of color.scale function + - Added sliceArray function for barNest due to the above rewrite -version 3.1-2 +Changes in version 3.1-2 - Fixed a minor bug in intersectDiagram + - Fixed a minor bug in intersectDiagram -version 3.1-1 +Changes in version 3.1-1 - Border colors added to gantt.chart (thanks to Brandon Fessler) - Extensive rewrite of the intersectDiagram function and helpers - Rewrite of the dendroPlot function - categoryReshape function added + - Border colors added to gantt.chart (thanks to Brandon Fessler) + - Extensive rewrite of the intersectDiagram function and helpers + - Rewrite of the dendroPlot function + - categoryReshape function added -version 3.1 +Changes in version 3.1 - intersectDiagram zero instance levels fixed - intersectDiagram now invisibly returns the list of intersections - Spacing within levels in intersectDiagram simplified - makeIntersectList now discards empty levels of intersection - makeIntersectList color assignment fixed - dendroPlot function added + - intersectDiagram zero instance levels fixed + - intersectDiagram now invisibly returns the list of intersections + - Spacing within levels in intersectDiagram simplified + - makeIntersectList now discards empty levels of intersection + - makeIntersectList color assignment fixed + - dendroPlot function added -version 3.0-9 +Changes in version 3.0-9 - Fixed the priority coloring problem in gantt.chart - Added optional vertical lines to addtable2plot (thanks to Bill Sperry) - Fixed the overshooting y axis for certain values of y in barp + - Fixed the priority coloring problem in gantt.chart + - Added optional vertical lines to addtable2plot (thanks to Bill Sperry) + - Fixed the overshooting y axis for certain values of y in barp -version 3.0-8 +Changes in version 3.0-8 - Added semi-intelligent cell labelling to the color2D.matplot function + - Added semi-intelligent cell labelling to the color2D.matplot function -version 3.0-7 +Changes in version 3.0-7 - Fixed the right ordinate alignment in twoord.plot + - Fixed the right ordinate alignment in twoord.plot -version 3.0-6 +Changes in version 3.0-6 - Added the "barlabels" argument to drawNestedBars - big fix for the makeDendrite, furc and plot.dendrite functions + - Added the "barlabels" argument to drawNestedBars + - big fix for the makeDendrite, furc and plot.dendrite functions -version 3.0-5 +Changes in version 3.0-5 - added Christophe Dutang's fix for the twoord.stackpoly function - fixed the confidence limit problem in barNest (I sincerely hope) + - added Christophe Dutang's fix for the twoord.stackpoly function + - fixed the confidence limit problem in barNest (I sincerely hope) -version 3.0-4 +Changes in version 3.0-4 - added semi-intelligent bar labelling to the sizetree function - added yaxs="i" to the empty plot in twoord.plot (thanks to Giles Crane) - added the Wilson binomial CI functions for brkdnNest + - added semi-intelligent bar labelling to the sizetree function + - added yaxs="i" to the empty plot in twoord.plot (thanks to Giles Crane) + - added the Wilson binomial CI functions for brkdnNest -version 3.0-3 +Changes in version 3.0-3 - added the ladderplot function (thanks to Peter Solymos) + - added the ladderplot function (thanks to Peter Solymos) -version 3.0-2 +Changes in version 3.0-2 - rewrote intersectDiagram to better display missing intersections - added a correction for character expansion to boxed.labels - fixed the count method for barNest + - rewrote intersectDiagram to better display missing intersections + - added a correction for character expansion to boxed.labels + - fixed the count method for barNest -version 3.0-1 +Changes in version 3.0-1 - competely rewrote the barNest family of functions - removed labels for empty sets in intersectDiagram + - competely rewrote the barNest family of functions + - removed labels for empty sets in intersectDiagram -version 3.0 +Changes in version 3.0 - fixed some minor problems with oz.windrose (thanks to Brad Evans) - added a 'locator' option to zoomInPlot (thanks to Greg Snow) - added the 'padj' argument to stackpoly for more tick label control - made the 'srt' argument work for both x and y axes in staxlab - fixed two little bugs in thigmophobe (thanks to Stephen Milborrow) - added the 'add' argument to radial.plot (thanks to Evan Daugharthy) + - fixed some minor problems with oz.windrose (thanks to Brad Evans) + - added a 'locator' option to zoomInPlot (thanks to Greg Snow) + - added the 'padj' argument to stackpoly for more tick label control + - made the 'srt' argument work for both x and y axes in staxlab + - fixed two little bugs in thigmophobe (thanks to Stephen Milborrow) + - added the 'add' argument to radial.plot (thanks to Evan Daugharthy) -version 2.9-5 +Changes in version 2.9-5 - added the kiteChart function - added the "pos" argument to the getFigCtr function + - added the kiteChart function + - added the "pos" argument to the getFigCtr function -version 2.9-4 +Changes in version 2.9-4 - added a calculated default vector of axis tick positions to twoord.plot - added a "mar" argument to the taylor.diagram function + - added a calculated default vector of axis tick positions to twoord.plot + - added a "mar" argument to the taylor.diagram function -version 2.9-3 +Changes in version 2.9-3 - added the gamma.col argument to taylor.diagram (thanks to Julian Arnold) - added the radial.labels function (thanks to Tali Vardi) - added the multiple colors per labels to gantt.chart (thanks to Nicolas Immelman) - added the rectFill function - added an option to the barp function to use rectFill + - added the gamma.col argument to taylor.diagram (thanks to Julian Arnold) + - added the radial.labels function (thanks to Tali Vardi) + - added the multiple colors per labels to gantt.chart (thanks to Nicolas Immelman) + - added the rectFill function + - added an option to the barp function to use rectFill -version 2.9-2 +Changes in version 2.9-2 - fixed the margin problem in staircase.plot - fixed the default y-axis tick placement in barp + - fixed the margin problem in staircase.plot + - fixed the default y-axis tick placement in barp -version 2.9-1 +Changes in version 2.9-1 - fixed the "big gap" problem in the gap.plot function - added the twoord.stackplot function (thanks to Christophe Dutang) + - fixed the "big gap" problem in the gap.plot function + - added the twoord.stackplot function (thanks to Christophe Dutang) -version 2.9 +Changes in version 2.9 - added the panes function - fixed the border bug in color2D.matplot - fixed the indexing bug in drawNestedBars + - added the panes function + - fixed the border bug in color2D.matplot + - fixed the indexing bug in drawNestedBars -version 2.8-4 +Changes in version 2.8-4 - added the triax.fill function which necessitated... - changed the initial plot call from triax.frame to triax.plot - removed the "main" argument from triax.frame - added brkdnNest to replace hierobrk - rewrote barNest to suit brkdnNest - added drawNestedBars for the display of barNest - changed all remaining hierobarp functions to barNest + - added the triax.fill function which necessitated... + - changed the initial plot call from triax.frame to triax.plot + - removed the "main" argument from triax.frame + - added brkdnNest to replace hierobrk + - rewrote barNest to suit brkdnNest + - added drawNestedBars for the display of barNest + - changed all remaining hierobarp functions to barNest -version 2.8-3 +Changes in version 2.8-3 - radical rewrite of the pyramid.plot function - fixed up barp example mistake - fixed the title position in zoomInPlot - rewrote the hierobarp function as barNest + - radical rewrite of the pyramid.plot function + - fixed up barp example mistake + - fixed the title position in zoomInPlot + - rewrote the hierobarp function as barNest -version 2.8-2 +Changes in version 2.8-2 - added the label.cex argument to the gantt.chart function - changed the name of the hierobarp function to barNest + - added the label.cex argument to the gantt.chart function + - changed the name of the hierobarp function to barNest -version 2.8-1 +Changes in version 2.8-1 - added the calculation of proportions to hierobarp + - added the calculation of proportions to hierobarp -version 2.8 +Changes in version 2.8 - added the cex argument to the staircase.plot function - added a bit to the plotCI function examples - changed \code tags to \samp and removed formatting from \link tags - added the ylog argument to the barp function (thanks to Fatima Kreusch) - added the legendg function (thanks to Primoz Peterlin) - removed the Piper diagram functions until they run correctly + - added the cex argument to the staircase.plot function + - added a bit to the plotCI function examples + - changed \code tags to \samp and removed formatting from \link tags + - added the ylog argument to the barp function (thanks to Fatima Kreusch) + - added the legendg function (thanks to Primoz Peterlin) + - removed the Piper diagram functions until they run correctly -version 2.7-2 +Changes in version 2.7-2 - added the axislab.cex argument to the twoord.plot function + - added the axislab.cex argument to the twoord.plot function -version 2.7-1 +Changes in version 2.7-1 - added the getMarginWidth function - added the bracketing lines and labels to hierobarp - added the hierobarp.svymean and hierobarp.svyprop functions - added the lwd argument to stackpoly (thanks to Vaclav Varvarovsky) - included an example to show how to use gantt.chart without dates - included an example of histogram + density curve in twoord.plot + - added the getMarginWidth function + - added the bracketing lines and labels to hierobarp + - added the hierobarp.svymean and hierobarp.svyprop functions + - added the lwd argument to stackpoly (thanks to Vaclav Varvarovsky) + - included an example to show how to use gantt.chart without dates + - included an example of histogram + density curve in twoord.plot -version 2.7 +Changes in version 2.7 - added the getFigCtr function - removed the final grouping lines from hierobarp + - added the getFigCtr function + - removed the final grouping lines from hierobarp -version 2.6-4 +Changes in version 2.6-4 - fixed the bug in hierobrk and hierobarp that got the order of + - fixed the bug in hierobrk and hierobarp that got the order of breakdown factors wrong -version 2.6-3 +Changes in version 2.6-3 - fixed the bug in gap.plot that lost the high values + - fixed the bug in gap.plot that lost the high values -version 2.6-2 +Changes in version 2.6-2 - complete rewrite of the hierobarp and hierobrk functions - rewrite of barhier function and name changed to sizetree + - complete rewrite of the hierobarp and hierobrk functions + - rewrite of barhier function and name changed to sizetree -version 2.6-1 +Changes in version 2.6-1 - Minor bug fix in the gap.plot function. + - Minor bug fix in the gap.plot function. -Version 2.6 +ChangesiIn Version 2.6 - Improved bar/line plotting in the twoord.plot function. - Added the fullaxis function. + - Improved bar/line plotting in the twoord.plot function. + - Added the fullaxis function. -version 2.5-5 +Changes in version 2.5-5 - Changed the default symbol in count.overplot to "1". - Added bar plotting to the twoord.plot function. - Added fill between the confidence lines to the dispersion function. - Added the bumpchart function. + - Changed the default symbol in count.overplot to "1". + - Added bar plotting to the twoord.plot function. + - Added fill between the confidence lines to the dispersion function. + - Added the bumpchart function. (Thanks to Andreas Christofferson for the idea) - Added the spreadout function to spread out cramped labels. - Added table cell size correction for the cex argument. + - Added the spreadout function to spread out cramped labels. + - Added table cell size correction for the cex argument. (Thanks to Brian Diggs for the patch) -version 2.5-4 +Changes in version 2.5-4 - Fixed the bug in dotplot.mtb function. + - Fixed the bug in dotplot.mtb function. -version 2.5-3 +Changes in version 2.5-3 - Introduced the hierobarp function. - Introduced the zoomInPlot function. - New version of dotplot.mtb (with bug) + - Introduced the hierobarp function. + - Introduced the zoomInPlot function. + - New version of dotplot.mtb (with bug) -previous versions +Changes in version 2.5-2 - You don't expect me to remember all that, do you? + - and earlier. You don't expect me to remember all that, do you? diff -Nru r-cran-plotrix-3.8-2/R/pyramid.plot.R r-cran-plotrix-3.8-4/R/pyramid.plot.R --- r-cran-plotrix-3.8-2/R/pyramid.plot.R 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/R/pyramid.plot.R 2023-11-09 14:42:16.000000000 +0000 @@ -1,127 +1,127 @@ -pyramid.plot<-function (lx, rx, labels = NA, top.labels = c("Male", "Age", - "Female"), main = "", laxlab = NULL, raxlab = NULL, unit = "%", - lxcol, rxcol, gap = 1, space = 0.2, ppmar = c(4, 2, 4, 2), - labelcex = 1, add = FALSE, xlim, show.values = FALSE, ndig = 1, - do.first = NULL) { - - if (any(c(lx, rx) < 0, na.rm = TRUE)) - stop("Negative quantities not allowed") - lxdim <- dim(lx) - rxdim <- dim(rx) - ncats <- ifelse(!is.null(lxdim), dim(lx)[1], length(lx)) - if (length(labels) == 1) - labels <- 1:ncats - ldim <- length(dim(labels)) - nlabels <- ifelse(ldim, length(labels[, 1]), length(labels)) - if (nlabels != ncats) - stop("lx and labels must all be the same length") - if (missing(xlim)) - xlim <- rep(ifelse(!is.null(lxdim), ceiling(max(c(rowSums(lx), - rowSums(rx)), na.rm = TRUE)), ceiling(max(c(lx, rx), - na.rm = TRUE))), 2) - if (!is.null(laxlab) && xlim[1] < max(laxlab)) - xlim[1] <- max(laxlab) - if (!is.null(raxlab) && xlim[2] < max(raxlab)) - xlim[2] <- max(raxlab) - oldmar <- par("mar") - if (!add) { - par(mar = ppmar, cex.axis = labelcex) - plot(0, xlim = c(-(xlim[1] + gap), xlim[2] + gap), ylim = c(0, - ncats + 1), type = "n", axes = FALSE, xlab = "", - ylab = "", xaxs = "i", yaxs = "i", main = main) - if (!is.null(do.first)) - eval(parse(text = do.first)) - if (is.null(laxlab)) { - laxlab <- seq(xlim[1] - gap, 0, by = -1) - axis(1, at = -xlim[1]:-gap, labels = laxlab) - } - else axis(1, at = -(laxlab + gap), labels = laxlab) - if (is.null(raxlab)) { - raxlab <- 0:(xlim[2] - gap) - axis(1, at = gap:xlim[2], labels = raxlab) - } - else axis(1, at = raxlab + gap, labels = raxlab) - if (gap > 0) { - if (!is.null(lxdim)) - axis(2, at = 1:ncats, labels = rep("", ncats), - pos = gap, tcl = -0.25) - else axis(2, at = 1:ncats * as.logical(rx + 1), labels = rep("", - ncats), pos = gap, tcl = -0.25) - if (!is.null(lxdim)) - axis(4, at = 1:ncats, labels = rep("", ncats), - pos = -gap, tcl = -0.25) - else axis(4, at = 1:ncats * as.logical(lx + 1), labels = rep("", - ncats), pos = -gap, tcl = -0.25) - } - if (is.null(dim(labels))) { - if (gap) - text(0, 1:ncats, labels, cex = labelcex) - else { - text(xlim[1], 1:ncats, labels, cex = labelcex, - adj = 0) - text(xlim[2], 1:ncats, labels, cex = labelcex, - adj = 1) - } - } - else { - if (gap) { - lpos <- -gap - rpos <- gap - } - else { - lpos <- -xlim[1] - rpos <- xlim[2] - } - text(lpos, 1:ncats, labels[, 1], pos = 4, cex = labelcex, - adj = 0) - text(rpos, 1:ncats, labels[, 2], pos = 2, cex = labelcex, - adj = 1) - } - cat(xlim,"\n") - mtext(top.labels,side=3,line=0, - at=c(-(xlim[1]+gap)/2,0,(xlim[2]+gap)/2), - adj = 0.5, cex = labelcex) - if(length(unit) == 1) mtext(unit,1,2.5,at=0,cex=labelcex) - else - mtext(c(unit,unit),1,2.5,at=c(-(xlim[1]+gap)/2,(xlim[2]+gap)/2), - cex=labelcex) - } - halfwidth <- 0.5 - space/2 - if (is.null(lxdim)) { - if (missing(lxcol)) - lxcol <- rainbow(ncats) - if (missing(rxcol)) - rxcol <- rainbow(ncats) - rect(-(lx + gap), 1:ncats - halfwidth, rep(-gap, ncats), - 1:ncats + halfwidth, col = lxcol) - rect(rep(gap, ncats), 1:ncats - halfwidth, (rx + gap), - 1:ncats + halfwidth, col = rxcol) - if (show.values) { - par(xpd = TRUE) - lxt <- formatC(lx, format = "f", digits = ndig) - rxt <- formatC(rx, format = "f", digits = ndig) - text(-(gap + lx), 1:ncats, lxt, pos = 2, cex = labelcex) - text(gap + rx, 1:ncats, rxt, pos = 4, cex = labelcex) - par(xpd = FALSE) - } - } - else { - nstack <- dim(lx)[2] - if (missing(lxcol)) - lxcol <- rainbow(nstack) - if (missing(rxcol)) - rxcol <- rainbow(nstack) - lxstart <- rxstart <- rep(gap, ncats) - for (i in 1:nstack) { - lxcolor <- rep(lxcol[i], ncats) - rxcolor <- rep(rxcol[i], ncats) - rect(-(lx[, i] + lxstart), 1:ncats - halfwidth, -lxstart, - 1:ncats + halfwidth, col = lxcolor) - rect(rxstart, 1:ncats - halfwidth, rx[, i] + rxstart, - 1:ncats + halfwidth, col = rxcolor) - lxstart <- lx[, i] + lxstart - rxstart <- rx[, i] + rxstart - } - } - return(oldmar) -} +pyramid.plot<-function (lx, rx, labels = NULL, top.labels = c("Male", "Age", + "Female"), main = "", laxlab = NULL, raxlab = NULL, unit = "%", + lxcol, rxcol, gap = 1, space = 0.2, ppmar = c(4, 2, 4, 2), + labelcex = 1, add = FALSE, xlim, show.values = FALSE, ndig = 1, + do.first = NULL) { + + if (any(c(lx, rx) < 0, na.rm = TRUE)) + stop("Negative quantities not allowed") + lxdim <- dim(lx) + rxdim <- dim(rx) + ncats <- ifelse(!is.null(lxdim), dim(lx)[1], length(lx)) + if ( !length(labels) ) + labels <- 1:ncats + ldim <- length(dim(labels)) + nlabels <- ifelse(ldim, length(labels[, 1]), length(labels)) + if (nlabels != ncats) + stop("lx and labels must all be the same length") + if (missing(xlim)) + xlim <- rep(ifelse(!is.null(lxdim), ceiling(max(c(rowSums(lx), + rowSums(rx)), na.rm = TRUE)), ceiling(max(c(lx, rx), + na.rm = TRUE))), 2) + if (!is.null(laxlab) && xlim[1] < max(laxlab)) + xlim[1] <- max(laxlab) + if (!is.null(raxlab) && xlim[2] < max(raxlab)) + xlim[2] <- max(raxlab) + oldmar <- par("mar") + if (!add) { + par(mar = ppmar, cex.axis = labelcex) + plot(0, xlim = c(-(xlim[1] + gap), xlim[2] + gap), ylim = c(0, + ncats + 1), type = "n", axes = FALSE, xlab = "", + ylab = "", xaxs = "i", yaxs = "i", main = main) + if (!is.null(do.first)) + eval(parse(text = do.first)) + if (is.null(laxlab)) { + laxlab <- seq(xlim[1] - gap, 0, by = -1) + axis(1, at = -xlim[1]:-gap, labels = laxlab) + } + else axis(1, at = -(laxlab + gap), labels = laxlab) + if (is.null(raxlab)) { + raxlab <- 0:(xlim[2] - gap) + axis(1, at = gap:xlim[2], labels = raxlab) + } + else axis(1, at = raxlab + gap, labels = raxlab) + if (gap > 0) { + if (!is.null(lxdim)) + axis(2, at = 1:ncats, labels = rep("", ncats), + pos = gap, tcl = -0.25) + else axis(2, at = 1:ncats * as.logical(rx + 1), labels = rep("", + ncats), pos = gap, tcl = -0.25) + if (!is.null(lxdim)) + axis(4, at = 1:ncats, labels = rep("", ncats), + pos = -gap, tcl = -0.25) + else axis(4, at = 1:ncats * as.logical(lx + 1), labels = rep("", + ncats), pos = -gap, tcl = -0.25) + } + if (is.null(dim(labels))) { + if (gap) + text(0, 1:ncats, labels, cex = labelcex) + else { + text(xlim[1], 1:ncats, labels, cex = labelcex, + adj = 0) + text(xlim[2], 1:ncats, labels, cex = labelcex, + adj = 1) + } + } + else { + if (gap) { + lpos <- -gap + rpos <- gap + } + else { + lpos <- -xlim[1] + rpos <- xlim[2] + } + text(lpos, 1:ncats, labels[, 1], pos = 4, cex = labelcex, + adj = 0) + text(rpos, 1:ncats, labels[, 2], pos = 2, cex = labelcex, + adj = 1) + } + cat(xlim,"\n") + mtext(top.labels,side=3,line=0, + at=c(-(xlim[1]+gap)/2,0,(xlim[2]+gap)/2), + adj = 0.5, cex = labelcex) + if(length(unit) == 1) mtext(unit,1,2.5,at=0,cex=labelcex) + else + mtext(c(unit,unit),1,2.5,at=c(-(xlim[1]+gap)/2,(xlim[2]+gap)/2), + cex=labelcex) + } + halfwidth <- 0.5 - space/2 + if (is.null(lxdim)) { + if (missing(lxcol)) + lxcol <- rainbow(ncats) + if (missing(rxcol)) + rxcol <- rainbow(ncats) + rect(-(lx + gap), 1:ncats - halfwidth, rep(-gap, ncats), + 1:ncats + halfwidth, col = lxcol) + rect(rep(gap, ncats), 1:ncats - halfwidth, (rx + gap), + 1:ncats + halfwidth, col = rxcol) + if (show.values) { + par(xpd = TRUE) + lxt <- formatC(lx, format = "f", digits = ndig) + rxt <- formatC(rx, format = "f", digits = ndig) + text(-(gap + lx), 1:ncats, lxt, pos = 2, cex = labelcex) + text(gap + rx, 1:ncats, rxt, pos = 4, cex = labelcex) + par(xpd = FALSE) + } + } + else { + nstack <- dim(lx)[2] + if (missing(lxcol)) + lxcol <- rainbow(nstack) + if (missing(rxcol)) + rxcol <- rainbow(nstack) + lxstart <- rxstart <- rep(gap, ncats) + for (i in 1:nstack) { + lxcolor <- rep(lxcol[i], ncats) + rxcolor <- rep(rxcol[i], ncats) + rect(-(lx[, i] + lxstart), 1:ncats - halfwidth, -lxstart, + 1:ncats + halfwidth, col = lxcolor) + rect(rxstart, 1:ncats - halfwidth, rx[, i] + rxstart, + 1:ncats + halfwidth, col = rxcolor) + lxstart <- lx[, i] + lxstart + rxstart <- rx[, i] + rxstart + } + } + return(oldmar) +} diff -Nru r-cran-plotrix-3.8-2/README.md r-cran-plotrix-3.8-4/README.md --- r-cran-plotrix-3.8-2/README.md 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-plotrix-3.8-4/README.md 2023-11-09 14:28:58.000000000 +0000 @@ -0,0 +1,20 @@ +# plotrix + +`plotrix` is an `R` package that provides many plotting, labeling, and axis & +color scaling functions. + +Its original author and maintainer, Jim Lemon, passed away in +September 2023. + +Currently it is being maintained by Duncan Murdoch. Please submit +bug reports to https://github.com/dmurdoch/plotrix/issues. + + +## Authors + +Jim Lemon, Ben Bolker, Sander Oom, Eduardo Klein, Barry Rowlingson, Hadley +Wickham, Anupam Tyagi, Olivier Eterradossi, Gabor Grothendieck, Michael Toews, +John Kane, Rolf Turner, Carl Witthoft, Julian Stander, Thomas Petzoldt, Remko +Duursma, Elisa Biancotto, Ofir Levy, Christophe Dutang, Peter Solymos, Robby +Engelmann, Michael Hecker, Felix Steinbeck, Hans Borchers, Henrik Singmann, Ted +Toal, Derek Ogle, Darshan Baral, Ulrike Groemping, Bill Venables diff -Nru r-cran-plotrix-3.8-2/debian/changelog r-cran-plotrix-3.8-4/debian/changelog --- r-cran-plotrix-3.8-2/debian/changelog 2021-09-15 14:58:09.000000000 +0000 +++ r-cran-plotrix-3.8-4/debian/changelog 2023-11-21 14:22:08.000000000 +0000 @@ -1,3 +1,13 @@ +r-cran-plotrix (3.8-4-1) unstable; urgency=medium + + * New upstream version + * Standards-Version: 4.6.2 (routine-update) + * Reorder sequence of d/control fields by cme (routine-update) + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + -- Andreas Tille Tue, 21 Nov 2023 15:22:08 +0100 + r-cran-plotrix (3.8-2-1) unstable; urgency=medium * New upstream version diff -Nru r-cran-plotrix-3.8-2/debian/control r-cran-plotrix-3.8-4/debian/control --- r-cran-plotrix-3.8-2/debian/control 2021-09-15 14:58:09.000000000 +0000 +++ r-cran-plotrix-3.8-4/debian/control 2023-11-21 14:22:08.000000000 +0000 @@ -1,17 +1,17 @@ Source: r-cran-plotrix -Maintainer: Debian R Packages Maintainers -Uploaders: Andreas Tille Section: gnu-r -Testsuite: autopkgtest-pkg-r Priority: optional -Build-Depends: debhelper-compat (= 13), - dh-r, - r-base-dev -Standards-Version: 4.6.0 +Maintainer: Debian R Packages Maintainers +Uploaders: Andreas Tille Vcs-Browser: https://salsa.debian.org/r-pkg-team/r-cran-plotrix Vcs-Git: https://salsa.debian.org/r-pkg-team/r-cran-plotrix.git Homepage: https://cran.r-project.org/package=plotrix +Standards-Version: 4.6.2 Rules-Requires-Root: no +Build-Depends: debhelper-compat (= 13), + dh-r, + r-base-dev +Testsuite: autopkgtest-pkg-r Package: r-cran-plotrix Architecture: all diff -Nru r-cran-plotrix-3.8-2/debian/upstream/metadata r-cran-plotrix-3.8-4/debian/upstream/metadata --- r-cran-plotrix-3.8-2/debian/upstream/metadata 2021-09-15 14:58:09.000000000 +0000 +++ r-cran-plotrix-3.8-4/debian/upstream/metadata 2023-11-21 14:22:08.000000000 +0000 @@ -1,3 +1,5 @@ +Bug-Database: https://github.com/dmurdoch/plotrix/issues +Bug-Submit: https://github.com/dmurdoch/plotrix/issues/new Reference: Author: Jim Lemon Title: "Plotrix: a package in the red light district of R" @@ -9,3 +11,5 @@ URL: http://cran.r-project.org/web/packages/plotrix/ eprint: http://www.r-project.org/doc/Rnews/Rnews_2006-4.pdf Archive: CRAN +Repository: https://github.com/dmurdoch/plotrix.git +Repository-Browse: https://github.com/dmurdoch/plotrix diff -Nru r-cran-plotrix-3.8-2/inst/CITATION r-cran-plotrix-3.8-4/inst/CITATION --- r-cran-plotrix-3.8-2/inst/CITATION 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/inst/CITATION 2023-11-02 05:28:52.000000000 +0000 @@ -1,12 +1,12 @@ citHeader("To cite package 'plotrix' in publications use:") -citEntry(entry="Article", +bibentry(bibtype = "Article", year = 2006, title = "Plotrix: a package in the red light district of R", journal = "R-News", volume = "6", number = "4", pages = "8-12", - author = personList(as.person("Lemon J")), + author = as.person("Lemon J"), textVersion = "Lemon, J. (2006) Plotrix: a package in the red light district of R. R-News, 6(4): 8-12." ) diff -Nru r-cran-plotrix-3.8-2/man/barlabels.Rd r-cran-plotrix-3.8-4/man/barlabels.Rd --- r-cran-plotrix-3.8-2/man/barlabels.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/barlabels.Rd 2023-11-01 21:35:47.000000000 +0000 @@ -15,7 +15,7 @@ \item{miny}{The minimum value at which to display labels.} \item{offset}{Amount to horizontally offset successive labels in case of vertical overlaps.} - \item{nobox}{Whether to call samp{boxed.labels} or \samp{text}.} + \item{nobox}{Whether to call \samp{boxed.labels} or \samp{text}.} \item{...}{Extra arguments passed to \samp{boxed.labels} or \samp{text}.} } \details{ diff -Nru r-cran-plotrix-3.8-2/man/draw.radial.line.Rd r-cran-plotrix-3.8-4/man/draw.radial.line.Rd --- r-cran-plotrix-3.8-2/man/draw.radial.line.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/draw.radial.line.Rd 2023-11-01 21:43:21.000000000 +0000 @@ -36,7 +36,10 @@ lty is ignored. } \author{Ted Toal} -\seealso{\link{lines}, link{draw.arc}} +\seealso{\ + \code{\link{lines}}, + \code{\link{draw.arc}}. +} \examples{ plot(0, xlim=c(1,5), ylim=c(1,5), main="Test of radial lines", xlab="", ylab="", type="n") points(3, 3, pch=20) diff -Nru r-cran-plotrix-3.8-2/man/find_max_cell.Rd r-cran-plotrix-3.8-4/man/find_max_cell.Rd --- r-cran-plotrix-3.8-2/man/find_max_cell.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/find_max_cell.Rd 2023-11-01 21:37:45.000000000 +0000 @@ -14,7 +14,7 @@ A list containing the column (x) and row (y) indices. } \note{ -Intended to enable the user to mark cells in samp{color2D.matplot}. +Intended to enable the user to mark cells in \samp{color2D.matplot}. Remember to subtract 0.5 from both values to center the mark in the cell. } \author{Jim Lemon} diff -Nru r-cran-plotrix-3.8-2/man/panes.Rd r-cran-plotrix-3.8-4/man/panes.Rd --- r-cran-plotrix-3.8-2/man/panes.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/panes.Rd 2023-11-09 16:24:16.000000000 +0000 @@ -73,14 +73,18 @@ par(mar=c(4,2,2,2)) tso<-c(0.2,0.3,0.5,0.4,0.6,0.8,0.1) plot(tso,type="n",axes=FALSE,xlab="") - # the following needs a Unicode locale to work +\dontrun{ + # the following needs a Unicode locale to work (and a suitable font) + # Few devices can plot these -- and not the default pdf() for checking. points(1:7,tso,pch=c(rep(-0x263a,6),-0x2639),cex=2) +} axis(1,at=1:7, labels=c("Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday","Monday")) axis(2,at=seq(0.1,0.9,by=0.2)) box() tab.title("The sad outcome",tab.col="#66ee66") mtext("A lot of malarkey",side=1,line=2.5) + par(oldpar) } \keyword{misc} diff -Nru r-cran-plotrix-3.8-2/man/plotrix-package.Rd r-cran-plotrix-3.8-4/man/plotrix-package.Rd --- r-cran-plotrix-3.8-2/man/plotrix-package.Rd 2021-09-08 09:45:29.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/plotrix-package.Rd 2023-11-02 04:54:18.000000000 +0000 @@ -10,14 +10,14 @@ scaling, text placement and legends. } \details{ -\tabular{ll}{ -Package: \tab plotrix\cr -Version: \tab 3.8-1\cr -Date: \tab 2021-09-08\cr -License: \tab GPL (>=2)\cr -Packaged: \tab 2021-09-08 03:45:00 UTC; root\cr -Built: \tab R 4.0.3; ; 2021-09-08 03:45:00 UTC; linux\cr -} +%% \tabular{ll}{ +%% Package: \tab plotrix\cr +%% Version: \tab 3.8-1\cr +%% Date: \tab 2021-09-08\cr +%% License: \tab GPL (>=2)\cr +%% Packaged: \tab 2021-09-08 03:45:00 UTC; root\cr +%% Built: \tab R 4.0.3; ; 2021-09-08 03:45:00 UTC; linux\cr +%% } The plotrix package is intended to provide a method for getting many sorts of specialized plots quickly, yet allow easy customization of those plots without learning a great deal of specialized syntax. There are three major diff -Nru r-cran-plotrix-3.8-2/man/pyramid.plot.Rd r-cran-plotrix-3.8-4/man/pyramid.plot.Rd --- r-cran-plotrix-3.8-2/man/pyramid.plot.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/pyramid.plot.Rd 2023-11-09 14:42:16.000000000 +0000 @@ -6,7 +6,7 @@ graphics device. } \usage{ - pyramid.plot(lx,rx,labels=NA,top.labels=c("Male","Age","Female"), + pyramid.plot(lx,rx,labels=NULL,top.labels=c("Male","Age","Female"), main="",laxlab=NULL,raxlab=NULL,unit="\%",lxcol,rxcol,gap=1,space=0.2, ppmar=c(4,2,4,2),labelcex=1,add=FALSE,xlim,show.values=FALSE,ndig=1, do.first=NULL) diff -Nru r-cran-plotrix-3.8-2/man/soil.texture.Rd r-cran-plotrix-3.8-4/man/soil.texture.Rd --- r-cran-plotrix-3.8-2/man/soil.texture.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/soil.texture.Rd 2023-11-02 05:21:42.000000000 +0000 @@ -63,11 +63,13 @@ \references{ U.S. Department of Agriculture, Natural Resources Conservation Service, 2007. \emph{National Soil Survey Handbook}, title 430-VI.// - \url{https://www.nrcs.usda.gov/wps/portal/nrcs/detail/soils/survey/class/taxonomy/?cid=nrcs142p2_053577} + formerly + \samp{https://www.nrcs.usda.gov/wps/portal/nrcs/detail/soils/survey/class/taxonomy/?cid=nrcs142p2_053577} U.S. Department of Agriculture, Natural Resources Conservation Service, 2007. \emph{Soil Texture Calculator}// - \url{https://www.nrcs.usda.gov/wps/portal/nrcs/detail/soils/survey/class/taxonomy/?cid=nrcs142p2_053577} + formerly + \samp{https://www.nrcs.usda.gov/wps/portal/nrcs/detail/soils/survey/class/taxonomy/?cid=nrcs142p2_053577} } \seealso{\link{get.soil.texture}, \link{triax.plot}} \examples{ diff -Nru r-cran-plotrix-3.8-2/man/textbox.Rd r-cran-plotrix-3.8-4/man/textbox.Rd --- r-cran-plotrix-3.8-2/man/textbox.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/textbox.Rd 2023-11-01 21:38:10.000000000 +0000 @@ -43,7 +43,7 @@ remaining at (x,y). The \samp{density} and \samp{angle} arguments have the same behavior as in the - \samp{rect} function. The \samp{adj, font} and {vfont} arguments have the same + \samp{rect} function. The \samp{adj, font} and \samp{vfont} arguments have the same behavior as in the \samp{text} function. The \samp{lty} and \samp{lwd} arguments have the same behavior as in the \samp{lines} function. } diff -Nru r-cran-plotrix-3.8-2/man/thigmophobe.labels.Rd r-cran-plotrix-3.8-4/man/thigmophobe.labels.Rd --- r-cran-plotrix-3.8-2/man/thigmophobe.labels.Rd 2021-02-11 06:17:26.000000000 +0000 +++ r-cran-plotrix-3.8-4/man/thigmophobe.labels.Rd 2023-11-01 21:37:12.000000000 +0000 @@ -33,7 +33,7 @@ the nearest neighbors. If you really want to use this with two labels, just eyeball the plot and work out in which direction the labels will go. Then pass the directions to \samp{thigmophobe.labels} as the \samp{text.pos} - argument. When all else fails, look to samp{placeLabels}. + argument. When all else fails, look to \samp{placeLabels}. Both \samp{pointLabel} in the \pkg{maptools} package and \samp{spread.labs} in the \pkg{TeachingDemos} package use more sophisticated algorithms to