[med-svn] [r-cran-scales] 01/06: Imported Upstream version 0.2.4
Benjamin Eikel
benjamin-guest at moszumanska.debian.org
Tue Jun 17 18:30:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
benjamin-guest pushed a commit to branch master
in repository r-cran-scales.
commit e581e4644702cf7baa583e62600e32161a924c28
Author: Benjamin Eikel <debian at eikel.org>
Date: Tue Jun 17 16:46:22 2014 +0200
Imported Upstream version 0.2.4
---
DESCRIPTION | 33 ++--
LICENSE | 2 +
MD5 | 183 ++++++++++++-----------
NAMESPACE | 7 +-
NEWS | 11 +-
R/breaks.r | 31 ++--
R/colour-manip.r | 2 +-
R/documentation.r | 2 +-
R/formatter.r | 25 ++--
R/full-seq.r | 16 +-
R/pal-brewer.r | 29 ++--
R/pal-dichromat.r | 12 +-
R/pal-hue.r | 11 +-
R/range.r | 10 +-
R/scales.r | 4 +-
R/trans-numeric.r | 34 ++---
R/trans.r | 15 +-
README.md | 2 +
build/partial.rdb | Bin 6356 -> 6283 bytes
man/Range-class.Rd | 13 ++
man/Range.Rd | 11 --
man/abs_area.Rd | 8 +-
man/alpha.Rd | 13 +-
man/area_pal.Rd | 9 +-
man/as.trans.Rd | 7 +-
man/asn_trans.Rd | 5 +-
man/atanh_trans.Rd | 5 +-
man/boxcox_trans.Rd | 10 +-
man/brewer_pal.Rd | 15 +-
man/cbreaks.Rd | 29 ++--
man/censor.Rd | 14 +-
man/col2hcl.Rd | 17 ++-
man/comma_format.Rd | 17 +--
man/cscale.Rd | 22 +--
man/date_breaks.Rd | 11 +-
man/date_format.Rd | 10 +-
man/date_trans.Rd | 5 +-
man/dichromat_pal.Rd | 9 +-
man/discard.Rd | 10 +-
man/div_gradient_pal.Rd | 18 +--
man/dollar_format.Rd | 25 ++--
man/dscale.Rd | 11 +-
man/exp_trans.Rd | 8 +-
man/expand_range.Rd | 15 +-
man/extended_breaks.Rd | 19 +--
man/format_format.Rd | 12 +-
man/fullseq.Rd | 13 +-
man/gradient_n_pal.Rd | 20 +--
man/grey_pal.Rd | 11 +-
man/hue_pal.Rd | 20 +--
man/identity_pal.Rd | 6 +-
man/identity_trans.Rd | 5 +-
man/linetype_pal.Rd | 6 +-
man/log1p_trans.Rd | 5 +-
man/log_breaks.Rd | 9 +-
man/log_trans.Rd | 7 +-
man/manual_pal.Rd | 7 +-
man/math_format.Rd | 21 +--
man/muted.Rd | 11 +-
man/package-scales.Rd | 3 +-
man/parse_format.Rd | 11 +-
man/percent_format.Rd | 14 +-
man/pretty_breaks.Rd | 12 +-
man/probability_trans.Rd | 15 +-
man/reciprocal_trans.Rd | 5 +-
man/rescale.Rd | 14 +-
man/rescale_max.Rd | 14 +-
man/rescale_mid.Rd | 17 +--
man/rescale_none.Rd | 9 +-
man/rescale_pal.Rd | 11 +-
man/reverse_trans.Rd | 5 +-
man/scientific_format.Rd | 18 +--
man/seq_gradient_pal.Rd | 15 +-
man/shape_pal.Rd | 7 +-
man/show_col.Rd | 7 +-
man/sqrt_trans.Rd | 5 +-
man/squish.Rd | 16 +-
man/squish_infinite.Rd | 10 +-
man/time_trans.Rd | 10 +-
man/trans_breaks.Rd | 15 +-
man/trans_format.Rd | 14 +-
man/trans_new.Rd | 44 +++---
man/trans_range.Rd | 12 +-
man/zero_range.Rd | 24 +--
tests/{test-all.R => testthat.R} | 2 +-
{inst/tests => tests/testthat}/test-alpha.r | 0
{inst/tests => tests/testthat}/test-bounds.r | 0
{inst/tests => tests/testthat}/test-breaks-log.r | 0
{inst/tests => tests/testthat}/test-formatter.r | 0
{inst/tests => tests/testthat}/test-range.r | 0
{inst/tests => tests/testthat}/test-scale.r | 0
{inst/tests => tests/testthat}/test-trans-date.r | 0
{inst/tests => tests/testthat}/test-trans.r | 0
{inst/tests => tests/testthat}/test-zero-range.r | 0
94 files changed, 640 insertions(+), 607 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 31becb7..7444db0 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,26 +1,23 @@
Package: scales
Type: Package
Title: Scale functions for graphics.
-Version: 0.2.3
+Version: 0.2.4
Author: Hadley Wickham <h.wickham at gmail.com>
Maintainer: Hadley Wickham <h.wickham at gmail.com>
-Description: Scales map data to aesthetics, and provide methods for
- automatically determining breaks and labels for axes and
- legends.
-Depends: R (>= 2.12), methods
-Imports: RColorBrewer, stringr, dichromat, munsell (>= 0.2), plyr (>=
- 1.2), labeling
-Suggests: testthat
-License: MIT
+Description: Scales map data to aesthetics, and provide
+ methods for automatically determining breaks and labels
+ for axes and legends.
+URL: https://github.com/hadley/scales
+BugReports: https://github.com/hadley/scales/issues
+Depends: R (>= 2.13)
+Imports: RColorBrewer, dichromat, munsell (>= 0.2), plyr (>= 1.2),
+ labeling, methods
+Suggests: testthat (>= 0.8)
+License: MIT + file LICENSE
LazyLoad: yes
-Collate: 'bounds.r' 'breaks.r' 'colour-manip.r' 'date-time.r'
- 'documentation.r' 'formatter.r' 'full-seq.r' 'pal-area.r'
- 'pal-brewer.r' 'pal-dichromat.r' 'pal-gradient.r' 'pal-grey.r'
- 'pal-hue.r' 'pal-identity.r' 'pal-linetype.r' 'pal-manual.r'
- 'pal-rescale.r' 'pal-shape.r' 'range.r' 'scale-continuous.r'
- 'scale-discrete.r' 'scales.r' 'trans-date.r' 'trans-numeric.r'
- 'trans.r'
+Roxygen: list(wrap = FALSE)
BuildManual: yes
-Packaged: 2012-12-04 23:13:23 UTC; hadley
+Packaged: 2014-04-21 22:24:36 UTC; hadley
+NeedsCompilation: no
Repository: CRAN
-Date/Publication: 2012-12-05 13:11:38
+Date/Publication: 2014-04-22 10:50:55
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..0b0b02e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,2 @@
+YEAR: 2010-2014
+COPYRIGHT HOLDER: Hadley Wickham
diff --git a/MD5 b/MD5
index 94ddc28..4aa8f7b 100644
--- a/MD5
+++ b/MD5
@@ -1,104 +1,105 @@
-1aea131840b30d24859a2bad5029f2ab *DESCRIPTION
-3f383eadeed5616092c7a4583870f7eb *NAMESPACE
-0b05d80f99c82d12612ec28f211c0bdb *NEWS
+1ba8d7157ea2fc2b12d4f4708b26d9f3 *DESCRIPTION
+42d91d5ce1f6db25d653397ec9da4f25 *LICENSE
+ad819e13163d287a357c7ff9f1a93edd *NAMESPACE
+675f887506fcc8f842ff3eee50a7d1be *NEWS
8f5993ce0966e0ddc628de948c294aae *R/bounds.r
-62c96073a6818d6f57bc4a3b1371389f *R/breaks.r
-35747daa6ccb3410e9cf156b066f0e37 *R/colour-manip.r
+079b8af0d7acb058149e54824572af5a *R/breaks.r
+d3aec579399aabafd0d4a635dfb1c347 *R/colour-manip.r
2f8186364bc82ff1aad0b095bebefaca *R/date-time.r
-f714a10017d93b693f1f6a05250891be *R/documentation.r
-430dd9e4af572dd5bdae1f1673cb8a11 *R/formatter.r
-356f976bfc736122d399a8fe996c56ea *R/full-seq.r
+f967c78e39bbcb23a60709f2a2735dbc *R/documentation.r
+fb428bf4a5535e13eb77bc15fa8f6a21 *R/formatter.r
+4f198007ee8d818bed5a007004f43e65 *R/full-seq.r
932da2aa512e9fefe925ade14e87e30c *R/pal-area.r
-50f86b77b210f3fee4d5ba040bd58f4a *R/pal-brewer.r
-58b53da932f57fd36736c2ad3040206f *R/pal-dichromat.r
+be07befacefc9095d5209249c48e732b *R/pal-brewer.r
+e3e27dccb6da5ed52478799e65843004 *R/pal-dichromat.r
59192407795030694ff12bc1e31a2993 *R/pal-gradient.r
71512f007a23dc9d24abcfed6361dad1 *R/pal-grey.r
-1b11ab9ca6fda8fd14b3826454a5fa9c *R/pal-hue.r
+e3cd2ce2a082f9cb4136697dccf02d66 *R/pal-hue.r
732494f5f4054ca39a7da7731d023add *R/pal-identity.r
a4c1f8acacabe7943df7173df7fe0633 *R/pal-linetype.r
716233051ba6990a7f9df54b51227294 *R/pal-manual.r
8cf6ec1effbef4498ee7d88ce0cbe9e2 *R/pal-rescale.r
bff20c9fef8cae96c082ca8e216f662f *R/pal-shape.r
-8fab297eb9213481f1a881d7f6f23d83 *R/range.r
+6c4b15dde8f951ed9b35431756af8cb8 *R/range.r
15e5251a1e5775a3b081728ac24cd207 *R/scale-continuous.r
56da7559ee91befb22cc28f0c8fa4f55 *R/scale-discrete.r
-5d7e59ffa1523d833bc5a6466eb7e5b4 *R/scales.r
+c401d1f1b3a958d8c5ad032f3f8f6123 *R/scales.r
5726ee3b0cb6c6636338c04d2bb96b39 *R/trans-date.r
-459070db25729d2b6625e1490dfda745 *R/trans-numeric.r
-f0602ad594e96a3b72f1014e9c386e70 *R/trans.r
-bacab3cc444f392056885d3fc7005b74 *README.md
-7308dd715e99af5ff0e58978d57b668c *build/partial.rdb
-41879206aab0f820a4262399a9357faf *inst/tests/test-alpha.r
-210d4b72f91809cb8c82a36d60eff279 *inst/tests/test-bounds.r
-b5bb7a6051319394602be12701d8b845 *inst/tests/test-breaks-log.r
-ebcef8414ebe4ccb27a31661e9430a7c *inst/tests/test-formatter.r
-306be4c95033a6b3d1446644165026eb *inst/tests/test-range.r
-1f4791748d113fc5cf34c84c7325348c *inst/tests/test-scale.r
-cf896ab44315aa38f0b00484b3e3c624 *inst/tests/test-trans-date.r
-13c44729a8f80c2a38ed1be41a85b42c *inst/tests/test-trans.r
-d3d90179f2c34194952dda5dd4d021d7 *inst/tests/test-zero-range.r
-0e5c76149bae28c7bcc36c9a2390eb1a *man/Range.Rd
-1036827aaceb8b7df20a977b48fcdce0 *man/abs_area.Rd
-ebe57519b518b3084df49c0e0dbcf6e6 *man/alpha.Rd
-3fefd22be76243b1aee9716aa40ef1ca *man/area_pal.Rd
-38c932026821c1acd9427bedf1be584c *man/as.trans.Rd
-9af5cbbb9e178a1b8cda6258bf9deb7e *man/asn_trans.Rd
-f97de82d42d7d46df0f2106c1674ff18 *man/atanh_trans.Rd
-59218d2fec0b0e3d8a31bf7affa94d28 *man/boxcox_trans.Rd
-98db8f584532a396f5c011cdc257b474 *man/brewer_pal.Rd
-2bf217b8c33e230c37f1327c02ff5a7b *man/cbreaks.Rd
-920bf92e964a8f6e40df122ce5a9f4a1 *man/censor.Rd
-8b3c4c904e2955eca7d759139afe4c2b *man/col2hcl.Rd
-7129b1ffbe0d76b90ed0a510739c753b *man/comma_format.Rd
-14cd0c6893489c91f0736c5f284f565d *man/cscale.Rd
-bd24361453d4c07b129cc558ebb06d81 *man/date_breaks.Rd
-11c264213343dba37baadd766bf48f36 *man/date_format.Rd
-2cccee0123c32f073c8ed50387d77c53 *man/date_trans.Rd
-2204c7e1522d5902c9708200efee6563 *man/dichromat_pal.Rd
-866e790f5306984fdf9b68e917f730f6 *man/discard.Rd
-1b9b782ff588f04738e3b929589dc778 *man/div_gradient_pal.Rd
-7893c44c1e9838b4f43d648618dc4714 *man/dollar_format.Rd
-5981eb05aa5cf0c24692628bc8687916 *man/dscale.Rd
-46a86db0b8062b90204fc5aaa6c43353 *man/exp_trans.Rd
-710e698e39512458070cc5f022577fff *man/expand_range.Rd
-7143b0112414236cf3acb4a57c8c005a *man/extended_breaks.Rd
-0caa4f7b72c646a66aec8a91ddfc1f34 *man/format_format.Rd
-57e302a8b46136b105e0715e91afea21 *man/fullseq.Rd
-77f9253937e726c610492821b676a263 *man/gradient_n_pal.Rd
-b29c7d4ecc32488b2de1cba3f8db9b0a *man/grey_pal.Rd
-a6422468af2ad2428638c6712d240433 *man/hue_pal.Rd
-c56a6ce7f8357b8164ac6491185bed35 *man/identity_pal.Rd
-4358ad7db9a31ceaecc5aa0e505b96e0 *man/identity_trans.Rd
-f99da345b67d4bffaee9ad786f223979 *man/linetype_pal.Rd
-243415cf0f2a2893685859489a68cb70 *man/log1p_trans.Rd
-69e990c58925e51d970f0db6e1de3234 *man/log_breaks.Rd
-f33bd1fc0e13dadf5236d13a32d05e6f *man/log_trans.Rd
-840d155d2ec4aa901d8394aada77def6 *man/manual_pal.Rd
-6f3b9605bfa09f5b329bd0c859c5c28b *man/math_format.Rd
-410f1304784c551d6985548488e31569 *man/muted.Rd
-a8d2a0739b784a2f5f446e0389cf2b08 *man/package-scales.Rd
-47d8166da895e7c9386cf2d2d80e487a *man/parse_format.Rd
-257040cabd946421bc3f7f1f9ba3f724 *man/percent_format.Rd
-95d3449b550d20af909873d3e1369be4 *man/pretty_breaks.Rd
-4eb3b48c216984ef76bc5b104695e217 *man/probability_trans.Rd
-bf120e809b168c98c7ff6a998f1f84e5 *man/reciprocal_trans.Rd
-b9133c8f477f91fbf1079baf778d53b5 *man/rescale.Rd
-a2d2fc64cd2df7f743faa9c3b79a1871 *man/rescale_max.Rd
-9dd56312a3a12328cd27021de57de94f *man/rescale_mid.Rd
-4011e7c644a5921de8f7894ec0bcb652 *man/rescale_none.Rd
-5d60618f36e09e3fc2f0252c26f240b0 *man/rescale_pal.Rd
-9f6b3320d629cc0af960cd932fbce999 *man/reverse_trans.Rd
-f4682c265ebbc0499de09b3e75a0373f *man/scientific_format.Rd
-cfa46f96e40c0d037c771a39cc6bf3f2 *man/seq_gradient_pal.Rd
-ce35c473bdc021b7675a3ec8a48d35f4 *man/shape_pal.Rd
-9d653aaa7fbc441244c25ed071be188f *man/show_col.Rd
-a8b12322a91cc065488b0946bbe84ce8 *man/sqrt_trans.Rd
-12582d58e0bc7c56c41ec49fa7d2a071 *man/squish.Rd
-89bef1ec3f16653529e1ffe0aea9a0f7 *man/squish_infinite.Rd
-247ab9a1abd955f9c2e21c2b567e3b77 *man/time_trans.Rd
-0fc4a85d4d194654807e086c77292ac8 *man/trans_breaks.Rd
-d4f49c598401a639a23999c5dd83dfcc *man/trans_format.Rd
-6d753fa2ea47ed2dda7b4a47b9e97e16 *man/trans_new.Rd
-05aa4d798731b6c829474a45757f49d0 *man/trans_range.Rd
-723f007e2eddc1470cf0ab2617dc62b4 *man/zero_range.Rd
-8595449c3df146c58b6f4250f2d49ad7 *tests/test-all.R
+031a2b0204cbc710e8ba4fe52eab9efc *R/trans-numeric.r
+7f0e5368736657d377f6b1a77b6e8f84 *R/trans.r
+9d336da792ba088f2d59267c6ff25633 *README.md
+c100cb70c6e4f569e70f3548ee30c784 *build/partial.rdb
+6f0a135e325a8b8465e6abba6c1fdf1c *man/Range-class.Rd
+da4b52b7e5d12d35a54c710981d54063 *man/abs_area.Rd
+bbd79457d65b27004c5a2f36b5ef202b *man/alpha.Rd
+f228408634422228704c3f11a28fbb97 *man/area_pal.Rd
+da56dc3d22721af73e3904bd26534dd4 *man/as.trans.Rd
+a5a01321840e16f941b90144841fdb26 *man/asn_trans.Rd
+f9b876cef286529325ff41f84a3552ae *man/atanh_trans.Rd
+d02bbb63eca869ec46badd66ea51deca *man/boxcox_trans.Rd
+d767f3134e23abc2f99b81244c1afc0e *man/brewer_pal.Rd
+9663fba2431573eea0e21f73842aebc6 *man/cbreaks.Rd
+f87f6992c16f3a32e070425f42d852cd *man/censor.Rd
+cf689a20e79ab92dcbd43e4bf2f87262 *man/col2hcl.Rd
+dcf3bd6ad2118c93a4495f45a59b0857 *man/comma_format.Rd
+b3236d241c358c98a3a686c4aa515ebb *man/cscale.Rd
+56882213b864fc148449433025709a57 *man/date_breaks.Rd
+27aaa204a54c1e0346bdfff3ca27068f *man/date_format.Rd
+51d67856f5c698d66c26805738fc4ed1 *man/date_trans.Rd
+1e8f4420ccddaeee68954e5d82c48906 *man/dichromat_pal.Rd
+9148536a20911b3126a24bf44bbfe99d *man/discard.Rd
+609ea7ae5173cb918752e8a4171f8670 *man/div_gradient_pal.Rd
+f40e4cdf72a4059c7b5257eb1168e6e6 *man/dollar_format.Rd
+0cecccf7eb0f12b15fae10874a3dcf86 *man/dscale.Rd
+f0ab4e4374ffe344142c7b1ff9922705 *man/exp_trans.Rd
+caa3d1db9501b203a44691a6616ca82d *man/expand_range.Rd
+0113fec97bbb9c0451a8d9eae4f509f7 *man/extended_breaks.Rd
+fa164fde9baaeabb19858828ce8c4dcd *man/format_format.Rd
+f0629a989b5e37f3de173429b803bd4b *man/fullseq.Rd
+33c2a19079d757f1c88e2d1ac454975d *man/gradient_n_pal.Rd
+ab0289f49fd83fa5d83def8f191573cd *man/grey_pal.Rd
+ab8360edc93e0f76e07b6ead8b3f2739 *man/hue_pal.Rd
+7ce51b53b33d2079ef08c4607f44e9ae *man/identity_pal.Rd
+ec4be8c7ffae1004aa5ce3a432d9a035 *man/identity_trans.Rd
+c8d3fd514ecb944e6bc708a7d48ea934 *man/linetype_pal.Rd
+e868233a5123034b9e0d3a4178ecb629 *man/log1p_trans.Rd
+a0ed6ad964539ec8e069d28f70d3ab9b *man/log_breaks.Rd
+e78f8fe2edc87c67348575b17a7cfaae *man/log_trans.Rd
+34138dade796d24063794ce55193f796 *man/manual_pal.Rd
+46f262dbd478eada530b9c81188ada0e *man/math_format.Rd
+c14e9f1fa4813fc336796934efa902eb *man/muted.Rd
+d92e19a18d4b01110446e0fb4ece3010 *man/package-scales.Rd
+8f13ed5e537f681885943cfd41f83d31 *man/parse_format.Rd
+8ea452f108fc992f444c41f17011506a *man/percent_format.Rd
+34458dd6bf81990af47a8087629329c2 *man/pretty_breaks.Rd
+01d5717746893307939245fad90dea63 *man/probability_trans.Rd
+fe7909118a7382fdea3b7c6ffae3981a *man/reciprocal_trans.Rd
+390dcae6dacea10dd6028d20084f60ab *man/rescale.Rd
+42adeedc8604aa148feb3df26fac45ed *man/rescale_max.Rd
+2b6b414c8165aa8857969e5b1eff1888 *man/rescale_mid.Rd
+b94f9189ff392dc51b59a68d266e054d *man/rescale_none.Rd
+f35d5b64a5579133d2a8478297910b8d *man/rescale_pal.Rd
+9456aff898ff1647d437f0ad1d510646 *man/reverse_trans.Rd
+4da43ab7c993f521d4e3effac7c35acc *man/scientific_format.Rd
+ff5862ba11ec017e76de787018aef82b *man/seq_gradient_pal.Rd
+64bbfe0e079cccbb3f62f315b2daa86a *man/shape_pal.Rd
+d928592228b6c37eee0ef8e88080e2d9 *man/show_col.Rd
+d83e111d07efd96dfaa92e6d1da2a1dd *man/sqrt_trans.Rd
+1db309a93a9b09d46c1faddf2fcd511c *man/squish.Rd
+444857020e5e04c6cb7b207daa977d40 *man/squish_infinite.Rd
+3b76e826d3205bed7949bc7e7252d889 *man/time_trans.Rd
+7537b357129242a9aa809ce3e174c499 *man/trans_breaks.Rd
+787b3ee0489be64064deeb1bc09122fa *man/trans_format.Rd
+6a8f59cb1a749503142251c58efba26d *man/trans_new.Rd
+f94947db0896a38fddaa6bcc23342e02 *man/trans_range.Rd
+636f4990321ef4c8d6dd72ae37121ed4 *man/zero_range.Rd
+1bc97669868c55fc86b10bffb2010b63 *tests/testthat.R
+41879206aab0f820a4262399a9357faf *tests/testthat/test-alpha.r
+210d4b72f91809cb8c82a36d60eff279 *tests/testthat/test-bounds.r
+b5bb7a6051319394602be12701d8b845 *tests/testthat/test-breaks-log.r
+ebcef8414ebe4ccb27a31661e9430a7c *tests/testthat/test-formatter.r
+306be4c95033a6b3d1446644165026eb *tests/testthat/test-range.r
+1f4791748d113fc5cf34c84c7325348c *tests/testthat/test-scale.r
+cf896ab44315aa38f0b00484b3e3c624 *tests/testthat/test-trans-date.r
+13c44729a8f80c2a38ed1be41a85b42c *tests/testthat/test-trans.r
+d3d90179f2c34194952dda5dd4d021d7 *tests/testthat/test-zero-range.r
diff --git a/NAMESPACE b/NAMESPACE
index afa5d24..50ed812 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,3 +1,5 @@
+# Generated by roxygen2 (4.0.0): do not edit by hand
+
S3method(fullseq,Date)
S3method(fullseq,POSIXt)
S3method(fullseq,numeric)
@@ -75,10 +77,5 @@ export(trans_format)
export(trans_new)
export(trans_range)
export(zero_range)
-import(RColorBrewer)
import(munsell)
import(plyr)
-import(stringr)
-importFrom(dichromat,colorschemes)
-importFrom(grDevices,hcl)
-importFrom(labeling,extended)
diff --git a/NEWS b/NEWS
index efc4bff..417e4fd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Version 0.2.4
+------------------------------------------------------------------------------
+
+* Eliminate stringr dependency.
+
+* Fix outstanding errors in R CMD check
+
Version 0.2.3
------------------------------------------------------------------------------
@@ -67,8 +74,8 @@ Version 0.2.0
method dispatch inside primitive functions (e.g. `[`)
* Simplified algorithm for `discrete_range` that is robust to
- `stringsAsFactors` global option. Now, the order of a factor will only be
- preserved if the full factor is the first object seen, and all subsequent
+ `stringsAsFactors` global option. Now, the order of a factor will only be
+ preserved if the full factor is the first object seen, and all subsequent
inputs are subsets of the levels of the original factor.
* `scientific` ensures output is always in scientific format and off the
diff --git a/R/breaks.r b/R/breaks.r
index ef4e967..361a73d 100644
--- a/R/breaks.r
+++ b/R/breaks.r
@@ -18,7 +18,7 @@ pretty_breaks <- function(n = 5, ...) {
}
#' Extended breaks.
-#' Uses Wilkinson's extended breaks algorithm as implemented in the
+#' Uses Wilkinson's extended breaks algorithm as implemented in the
#' \pkg{labeling} package.
#'
#' @param n desired number of breaks
@@ -26,19 +26,18 @@ pretty_breaks <- function(n = 5, ...) {
#' @references Talbot, J., Lin, S., Hanrahan, P. (2010) An Extension of
#' Wilkinson's Algorithm for Positioning Tick Labels on Axes, InfoVis
#' 2010.
-#' @importFrom labeling extended
#' @export
#' @examples
#' extended_breaks()(1:10)
#' extended_breaks()(1:100)
extended_breaks <- function(n = 5, ...) {
function(x) {
- extended(min(x), max(x), n, only.loose = FALSE, ...)
+ labeling::extended(min(x), max(x), n, only.loose = FALSE, ...)
}
}
#' Log breaks (integer breaks on log-transformed scales).
-#'
+#'
#' @param n desired number of breaks
#' @param base base of logarithm to use
#' @export
@@ -50,18 +49,18 @@ log_breaks <- function(n = 5, base = 10) {
rng <- log(range(x, na.rm = TRUE), base = base)
min <- floor(rng[1])
max <- ceiling(rng[2])
-
+
if (max == min) return(base ^ min)
-
+
by <- floor((max - min) / n) + 1
- base ^ seq(min, max, by = by)
+ base ^ seq(min, max, by = by)
}
}
#' Pretty breaks on transformed scale.
#'
#' These often do not produce very attractive breaks.
-#'
+#'
#' @param trans function of single variable, \code{x}, that given a numeric
#' vector returns the transformed values
#' @param inv inverse of the transformation function
@@ -76,7 +75,7 @@ log_breaks <- function(n = 5, base = 10) {
trans_breaks <- function(trans, inv, n = 5, ...) {
trans <- match.fun(trans)
inv <- match.fun(inv)
-
+
function(x) {
inv(pretty(trans(x), n, ...))
}
@@ -91,7 +90,7 @@ trans_breaks <- function(trans, inv, n = 5, ...) {
#' data
#' @param breaks either a vector of break values, or a break function that
#' will make a vector of breaks when given the range of the data
-#' @param labels either a vector of labels (character vector or list of
+#' @param labels either a vector of labels (character vector or list of
#' expression) or a format function that will make a vector of labels when
#' called with a vector of breaks. Labels can only be specified manually if
#' breaks are - it is extremely dangerous to supply labels if you don't know
@@ -113,23 +112,23 @@ trans_breaks <- function(trans, inv, n = 5, ...) {
#' # You can also specify them manually:
#' cbreaks(c(0, 100), breaks = c(15, 20, 80))
#' cbreaks(c(0, 100), breaks = c(15, 20, 80), labels = c(1.5, 2.0, 8.0))
-#' cbreaks(c(0, 100), breaks = c(15, 20, 80),
+#' cbreaks(c(0, 100), breaks = c(15, 20, 80),
#' labels = expression(alpha, beta, gamma))
cbreaks <- function(range, breaks = extended_breaks(), labels = scientific_format()) {
-
+
if (zero_range(range)) {
return(list(breaks = range[1], labels = format(range[1])))
}
-
+
if (is.function(breaks)) {
breaks <- breaks(range)
if (!is.function(labels)) {
- stop("Labels can only be manually specified in conjunction with breaks",
+ stop("Labels can only be manually specified in conjunction with breaks",
call. = FALSE)
}
}
-
+
if (is.function(labels)) {
labels <- labels(breaks)
} else {
@@ -142,6 +141,6 @@ cbreaks <- function(range, breaks = extended_breaks(), labels = scientific_forma
labels <- as.character(labels)
}
}
-
+
list(breaks = breaks, labels = labels)
}
diff --git a/R/colour-manip.r b/R/colour-manip.r
index f2d451d..f91f101 100644
--- a/R/colour-manip.r
+++ b/R/colour-manip.r
@@ -13,7 +13,7 @@
#' col2hcl(colors())
col2hcl <- function(colour, h, c, l, alpha = 1) {
- rgb <- t(col2rgb(colour)) / 256
+ rgb <- t(col2rgb(colour)) / 255
coords <- convertColor(rgb, "sRGB", "Luv")
# Check for correctness
diff --git a/R/documentation.r b/R/documentation.r
index 6b51b05..6b8fcc6 100644
--- a/R/documentation.r
+++ b/R/documentation.r
@@ -4,7 +4,7 @@
seealso <- function(pattern) {
require("scales")
names <- ls("package:scales", pattern = pattern)
- str_c("\\code{\\link{", names, "}}", collapse = ", ")
+ paste0("\\code{\\link{", names, "}}", collapse = ", ")
}
seealso_trans <- function() seealso("_trans$")
diff --git a/R/formatter.r b/R/formatter.r
index 363901f..010aca1 100644
--- a/R/formatter.r
+++ b/R/formatter.r
@@ -1,5 +1,5 @@
#' Comma formatter: format number with commas separating thousands.
-#'
+#'
#' @param ... other arguments passed on to \code{\link{format}}
#' @param x a numeric vector to format
#' @return a function with single paramater x, a numeric vector, that
@@ -48,7 +48,7 @@ dollar_format <- function(largest_with_cents = 100000) {
x <- round_any(x, 1)
nsmall <- 0L
}
- str_c("$", format(x, nsmall = nsmall, trim = TRUE, big.mark = ",", scientific = FALSE, digits=1L))
+ paste0("$", format(x, nsmall = nsmall, trim = TRUE, big.mark = ",", scientific = FALSE, digits=1L))
}
}
@@ -57,7 +57,7 @@ dollar_format <- function(largest_with_cents = 100000) {
dollar <- dollar_format()
#' Percent formatter: multiply by one hundred and display percent sign.
-#'
+#'
#' @return a function with single paramater x, a numeric vector, that
#' returns a character vector
#' @param x a numeric vector to format
@@ -69,7 +69,7 @@ dollar <- dollar_format()
percent_format <- function() {
function(x) {
x <- round_any(x, precision(x) / 100)
- str_c(comma(x * 100), "%")
+ paste0(comma(x * 100), "%")
}
}
#' @export
@@ -77,7 +77,7 @@ percent_format <- function() {
percent <- percent_format()
#' Scientific formatter.
-#'
+#'
#' @return a function with single paramater x, a numeric vector, that
#' returns a character vector
#' @param digits number of significant digits to show
@@ -103,7 +103,7 @@ scientific <- function(x, digits = 3, ...) {
}
#' Parse a text label to produce expressions for plotmath.
-#'
+#'
#' @seealso \code{\link{plotmath}}
#' @return a function with single paramater x, a character vector, that
#' returns a list of expressions
@@ -112,15 +112,15 @@ scientific <- function(x, digits = 3, ...) {
#' parse_format()(c("alpha", "beta", "gamma"))
parse_format <- function() {
function(x) {
- llply(as.character(x), function(x) parse(text = x, srcfile = NULL))
+ llply(as.character(x), function(x) parse(text = x, srcfile = NULL))
}
}
#' Add arbitrary expression to a label.
#' The symbol that will be replace by the label value is \code{.x}.
-#'
+#'
#' @param expr expression to use
-#' @param format another format function to apply prior to mathematical
+#' @param format another format function to apply prior to mathematical
#' transformation - this makes it easier to use floating point numbers in
#' mathematical expressions.
#' @return a function with single paramater x, a numeric vector, that
@@ -137,12 +137,13 @@ math_format <- function(expr = 10 ^ .x, format = force) {
subs <- function(x) {
do.call("substitute", list(quoted, list(.x = as.name(x))))
}
-
+
function(x) {
x <- format(x)
llply(x, subs)
}
}
+globalVariables(".x")
#' Format labels after transformation.
#'
@@ -156,7 +157,7 @@ math_format <- function(expr = 10 ^ .x, format = force) {
#' tf(10 ^ 1:6)
trans_format <- function(trans, format = scientific_format()) {
if (is.character(trans)) trans <- match.fun(trans)
-
+
function(x) {
x <- trans(x)
format(x)
@@ -181,7 +182,7 @@ format_format <- function(...) {
precision <- function(x) {
rng <- range(x, na.rm = TRUE)
-
+
span <- if (zero_range(rng)) rng[1] else diff(rng)
10 ^ floor(log10(span))
}
diff --git a/R/full-seq.r b/R/full-seq.r
index 2506bd9..1d34e37 100644
--- a/R/full-seq.r
+++ b/R/full-seq.r
@@ -1,5 +1,5 @@
#' Generate sequence of fixed size intervals covering range.
-#'
+#'
#' @param range range
#' @param size interval size
#' @param ... other arguments passed on to methods
@@ -8,30 +8,30 @@
#' @seealso \code{\link[plyr]{round_any}}
fullseq <- function(range, size, ...) UseMethod("fullseq")
-#' @S3method fullseq numeric
+#' @export
fullseq.numeric <- function(range, size, ..., pad = FALSE) {
if (zero_range(range)) return(range + size * c(-1, 1) / 2)
-
+
x <- seq(
round_any(range[1], size, floor),
- round_any(range[2], size, ceiling),
+ round_any(range[2], size, ceiling),
by = size
)
-
+
if (pad) {
# Add extra bin on bottom and on top, to guarantee that we cover complete
# range of data, whether right = T or F
c(min(x) - size, x, max(x) + size)
} else {
x
- }
+ }
}
-#' @S3method fullseq Date
+#' @export
fullseq.Date <- function(range, size, ...) {
seq(floor_date(range[1], size), ceiling_date(range[2], size), by = size)
}
-#' @S3method fullseq POSIXt
+#' @export
fullseq.POSIXt <- function(range, size, ...) {
seq(floor_time(range[1], size), ceiling_time(range[2], size), by = size)
}
diff --git a/R/pal-brewer.r b/R/pal-brewer.r
index 317f858..b840a5b 100644
--- a/R/pal-brewer.r
+++ b/R/pal-brewer.r
@@ -15,7 +15,7 @@
#' show_col(gradient_n_pal(cols)(seq(0, 1, length = 30)))
brewer_pal <- function(type = "seq", palette = 1) {
pal <- pal_name(palette, type)
-
+
# If <3 colors are requested, brewer.pal will return a 3-color palette and
# give a warning. This warning isn't useful, so suppress it.
# If the palette has k colors and >k colors are requested, brewer.pal will
@@ -25,26 +25,31 @@ brewer_pal <- function(type = "seq", palette = 1) {
# number of items.
function(n) {
if (n < 3)
- suppressWarnings(brewer.pal(n, pal))[seq_len(n)]
+ suppressWarnings(RColorBrewer::brewer.pal(n, pal))[seq_len(n)]
else
- brewer.pal(n, pal)[seq_len(n)]
+ RColorBrewer::brewer.pal(n, pal)[seq_len(n)]
}
}
pal_name <- function(palette, type) {
if (is.character(palette)) {
- if (!palette %in% RColorBrewer:::namelist) {
+ if (!palette %in% unlist(brewer)) {
warning("Unknown palette ", palette)
palette <- "Greens"
}
return(palette)
}
-
- switch(type,
- div = RColorBrewer:::divlist,
- qual = RColorBrewer:::quallist,
- seq = RColorBrewer:::seqlist,
- stop("Unknown palette type. Should be 'div', 'qual' or 'seq'",
- call. = FALSE)
- )[palette]
+
+ type <- match.arg(type, c("div", "qual", "seq"))
+ brewer[[type]][palette]
}
+
+brewer <- list(
+ div = c("BrBG", "PiYG", "PRGn", "PuOr", "RdBu", "RdGy", "RdYlBu", "RdYlGn",
+ "Spectral"),
+ qual = c("Accent", "Dark2", "Paired", "Pastel1", "Pastel2", "Set1",
+ "Set2", "Set3"),
+ seq = c("Blues", "BuGn", "BuPu", "GnBu", "Greens", "Greys", "Oranges",
+ "OrRd", "PuBu", "PuBuGn", "PuRd", "Purples", "RdPu", "Reds",
+ "YlGn", "YlGnBu", "YlOrBr", "YlOrRd")
+)
diff --git a/R/pal-dichromat.r b/R/pal-dichromat.r
index 6fedf96..706aac9 100644
--- a/R/pal-dichromat.r
+++ b/R/pal-dichromat.r
@@ -2,7 +2,6 @@
#'
#' @param name Name of colour palette. One of:
#' \Sexpr[results=rd,stage=build]{scales:::dichromat_schemes()}
-#' @importFrom dichromat colorschemes
#' @export
#' @examples
#' show_col(dichromat_pal("BluetoOrange.10")(10))
@@ -12,15 +11,16 @@
#' cols <- dichromat_pal("DarkRedtoBlue.12")(12)
#' show_col(gradient_n_pal(cols)(seq(0, 1, length = 30)))
dichromat_pal <- function(name) {
- if (!any(name == names(colorschemes))) {
- stop("Palette name must be one of ", str_c(names(colorschemes), collapse = ", "), call. = FALSE)
+ if (!any(name == names(dichromat::colorschemes))) {
+ stop("Palette name must be one of ",
+ paste0(names(dichromat::colorschemes), collapse = ", "), call. = FALSE)
}
-
- pal <- colorschemes[[name]]
+
+ pal <- dichromat::colorschemes[[name]]
function(n) pal[seq_len(n)]
}
dichromat_schemes <- function() {
- str_c("\\code{", names(colorschemes), "}", collapse = ", ")
+ paste0("\\code{", names(dichromat::colorschemes), "}", collapse = ", ")
}
diff --git a/R/pal-hue.r b/R/pal-hue.r
index 8ab3e4e..ba8effc 100644
--- a/R/pal-hue.r
+++ b/R/pal-hue.r
@@ -5,26 +5,25 @@
#' @param c chroma (intensity of colour), maximum value varies depending on
# combination of hue and luminance.
#' @param h.start hue to start at
-#' @param direction direction to travel around the colour wheel,
+#' @param direction direction to travel around the colour wheel,
#' 1 = clockwise, -1 = counter-clockwise
-#' @importFrom grDevices hcl
#' @export
#' @examples
#' show_col(hue_pal()(4))
#' show_col(hue_pal()(9))
#' show_col(hue_pal(l = 90)(9))
#' show_col(hue_pal(l = 30)(9))
-#'
+#'
#' show_col(hue_pal()(9))
#' show_col(hue_pal(direction = -1)(9))
-#'
+#'
#' show_col(hue_pal()(9))
#' show_col(hue_pal(h = c(0, 90))(9))
#' show_col(hue_pal(h = c(90, 180))(9))
#' show_col(hue_pal(h = c(180, 270))(9))
#' show_col(hue_pal(h = c(270, 360))(9))
hue_pal <- function(h = c(0, 360) + 15, c = 100, l = 65, h.start = 0, direction = 1) {
-
+
function(n) {
if ((diff(h) %% 360) < 1) {
h[2] <- h[2] - 360 / n
@@ -33,6 +32,6 @@ hue_pal <- function(h = c(0, 360) + 15, c = 100, l = 65, h.start = 0, direction
rotate <- function(x) (x + h.start) %% 360 * direction
hues <- rotate(seq(h[1], h[2], length = n))
- hcl(hues, c, l)
+ grDevices::hcl(hues, c, l)
}
}
diff --git a/R/range.r b/R/range.r
index 1a4ed9e..20f0b94 100644
--- a/R/range.r
+++ b/R/range.r
@@ -5,14 +5,14 @@
#'
#' @aliases DiscreteRange ContinuousRange
#' @export DiscreteRange ContinuousRange
-Range <- setRefClass("Range", fields = "range", methods = list(
+Range <- methods::setRefClass("Range", fields = "range", methods = list(
initialize = function() {
initFields(range = NULL)
})
)
-DiscreteRange <- setRefClass(
- "DiscreteRange", contains = "Range",
+DiscreteRange <- methods::setRefClass(
+ "DiscreteRange", contains = "Range",
methods = list(
train = function(x, drop = FALSE) {
range <<- train_discrete(x, range, drop)
@@ -21,8 +21,8 @@ DiscreteRange <- setRefClass(
)
)
-ContinuousRange <- setRefClass(
- "Continuous", contains = "Range",
+ContinuousRange <- methods::setRefClass(
+ "Continuous", contains = "Range",
methods = list(
train = function(x) range <<- train_continuous(x, range),
reset = function() range <<- NULL
diff --git a/R/scales.r b/R/scales.r
index fe6e359..74bce73 100644
--- a/R/scales.r
+++ b/R/scales.r
@@ -3,5 +3,5 @@
#' @docType package
#' @name package-scales
#' @aliases scales package-scales
-#' @import RColorBrewer stringr munsell plyr
-NULL
+#' @import munsell plyr
+NULL
diff --git a/R/trans-numeric.r b/R/trans-numeric.r
index 5c7de3b..0d06ba4 100644
--- a/R/trans-numeric.r
+++ b/R/trans-numeric.r
@@ -3,8 +3,8 @@
#' @export
asn_trans <- function() {
trans_new(
- "asn",
- function(x) 2 * asin(sqrt(x)),
+ "asn",
+ function(x) 2 * asin(sqrt(x)),
function(x) sin(x / 2) ^ 2)
}
@@ -18,16 +18,16 @@ atanh_trans <- function() {
#' Box-Cox power transformation.
#'
#' @param p Exponent of boxcox transformation.
-#' @references See \url{http://en.wikipedia.org/wiki/Power_transform} for
+#' @references See \url{http://en.wikipedia.org/wiki/Power_transform} for
# more details on method.
#' @export
boxcox_trans <- function(p) {
if (abs(p) < 1e-07) return(log_trans)
trans <- function(x) (x ^ p - 1) / p * sign(x - 1)
- inv <- function(x) (abs(x) * p + 1 * sign(x)) ^ (1 / p)
+ inv <- function(x) (abs(x) * p + 1 * sign(x)) ^ (1 / p)
trans_new(
- str_c("pow-", format(p)), trans, inv)
+ paste0("pow-", format(p)), trans, inv)
}
#' Exponential transformation (inverse of log transformation).
@@ -36,7 +36,7 @@ boxcox_trans <- function(p) {
#' @export
exp_trans <- function(base = exp(1)) {
trans_new(
- str_c("power-", format(base)),
+ paste0("power-", format(base)),
function(x) base ^ x,
function(x) log(x, base = base))
}
@@ -50,15 +50,15 @@ identity_trans <- function() {
#' Log transformation.
-#'
+#'
#' @param base base of logarithm
#' @aliases log_trans log10_trans log2_trans
#' @export log_trans log10_trans log2_trans
log_trans <- function(base = exp(1)) {
trans <- function(x) log(x, base)
inv <- function(x) base ^ x
-
- trans_new(str_c("log-", format(base)), trans, inv,
+
+ trans_new(paste0("log-", format(base)), trans, inv,
log_breaks(base = base), domain = c(1e-100, Inf))
}
log10_trans <- function() {
@@ -76,7 +76,7 @@ log1p_trans <- function() {
}
#' Probability transformation.
-#'
+#'
#' @param distribution probability distribution. Should be standard R
#' abbreviation so that "p" + distribution is a valid probability density
#' function, and "q" + distribution is a valid quantile function.
@@ -84,12 +84,12 @@ log1p_trans <- function() {
#' @aliases probability_trans logit_trans probit_trans
#' @export probability_trans logit_trans probit_trans
probability_trans <- function(distribution, ...) {
- qfun <- match.fun(str_c("q", distribution))
- pfun <- match.fun(str_c("p", distribution))
-
+ qfun <- match.fun(paste0("q", distribution))
+ pfun <- match.fun(paste0("p", distribution))
+
trans_new(
- str_c("prob-", distribution),
- function(x) qfun(x, ...),
+ paste0("prob-", distribution),
+ function(x) qfun(x, ...),
function(x) pfun(x, ...))
}
logit_trans <- function() probability_trans("logis")
@@ -99,8 +99,8 @@ probit_trans <- function() probability_trans("norm")
#'
#' @export
reciprocal_trans <- function() {
- trans_new("reciprocal",
- function(x) 1 / x,
+ trans_new("reciprocal",
+ function(x) 1 / x,
function(x) 1 / x)
}
diff --git a/R/trans.r b/R/trans.r
index 3d47b47..0cad808 100644
--- a/R/trans.r
+++ b/R/trans.r
@@ -4,7 +4,7 @@
#' as the information needed to create pleasing breaks and labels. The breaks
#' function is applied on the transformed range of the range, and it's
#' expected that the labels function will perform some kind of inverse
-#' tranformation on these breaks to give them labels that are meaningful on
+#' tranformation on these breaks to give them labels that are meaningful on
#' the original scale.
#'
#' @param name transformation name
@@ -16,22 +16,23 @@
#' function is applied to the raw data.
#' @param format default format for this transformation. The format is applied
#' to breaks generated to the raw data.
-#' @param domain domain, as numeric vector of length 2, over which
+#' @param domain domain, as numeric vector of length 2, over which
#' transformation is valued
#' @seealso \Sexpr[results=rd,stage=build]{scales:::seealso_trans()}
#' @export trans_new is.trans
#' @aliases trans_new trans is.trans
-#' @S3method print trans
trans_new <- function(name, transform, inverse, breaks = extended_breaks(), format = format_format(), domain = c(-Inf, Inf)) {
if (is.character(transform)) transform <- match.fun(transform)
if (is.character(inverse)) inverse <- match.fun(inverse)
-
+
structure(list(name = name, transform = transform, inverse = inverse,
- breaks = breaks, format = format, domain = domain),
+ breaks = breaks, format = format, domain = domain),
class = "trans")
}
is.trans <- function(x) inherits(x, "trans")
+
+#' @export
print.trans <- function(x, ...) cat("Transformer: ", x$name, "\n")
#' Convert character string to transformer.
@@ -40,8 +41,8 @@ print.trans <- function(x, ...) cat("Transformer: ", x$name, "\n")
#' @export
as.trans <- function(x) {
if (is.trans(x)) return(x)
-
- f <- str_c(x, "_trans")
+
+ f <- paste0(x, "_trans")
match.fun(f)()
}
diff --git a/README.md b/README.md
index 714752c..d6cae00 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# Scales
+[](https://travis-ci.org/hadley/scales)
+
One of the most difficult parts of any graphics package is scaling, converting from data values to perceptual properties. The inverse of scaling, making guides (legends and axes) that can be used to read the graph, is often even harder! The idea of the `scales` package is to implement scales in a way that is graphics system agnostic, so that everyone can benefit by pooling knowledge and resources about this tricky topic.
# Components
diff --git a/build/partial.rdb b/build/partial.rdb
index 0dab688..5ed6d6a 100644
Binary files a/build/partial.rdb and b/build/partial.rdb differ
diff --git a/man/Range-class.Rd b/man/Range-class.Rd
new file mode 100644
index 0000000..40e6d80
--- /dev/null
+++ b/man/Range-class.Rd
@@ -0,0 +1,13 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
+\docType{class}
+\name{Range-class}
+\alias{ContinuousRange}
+\alias{DiscreteRange}
+\alias{Range}
+\alias{Range-class}
+\title{Mutable ranges.}
+\description{
+Mutable ranges have a two methods (\code{train} and \code{reset}), and
+make it possible to build up complete ranges with multiple passes.
+}
+
diff --git a/man/Range.Rd b/man/Range.Rd
deleted file mode 100644
index 7469bb5..0000000
--- a/man/Range.Rd
+++ /dev/null
@@ -1,11 +0,0 @@
-\name{Range}
-\alias{ContinuousRange}
-\alias{DiscreteRange}
-\alias{Range}
-\title{Mutable ranges.}
-\description{
- Mutable ranges have a two methods (\code{train} and
- \code{reset}), and make it possible to build up complete
- ranges with multiple passes.
-}
-
diff --git a/man/abs_area.Rd b/man/abs_area.Rd
index 7ef109d..43c4b22 100644
--- a/man/abs_area.Rd
+++ b/man/abs_area.Rd
@@ -1,14 +1,14 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{abs_area}
\alias{abs_area}
\title{Point area palette (continuous), with area proportional to value.}
\usage{
- abs_area(max)
+abs_area(max)
}
\arguments{
- \item{max}{A number representing the maxmimum size.}
+\item{max}{A number representing the maxmimum size.}
}
\description{
- Point area palette (continuous), with area proportional
- to value.
+Point area palette (continuous), with area proportional to value.
}
diff --git a/man/alpha.Rd b/man/alpha.Rd
index d7bee02..68c9693 100644
--- a/man/alpha.Rd
+++ b/man/alpha.Rd
@@ -1,19 +1,20 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{alpha}
\alias{alpha}
\title{Modify colour transparency.
Vectorised in both colour and alpha.}
\usage{
- alpha(colour, alpha = NA)
+alpha(colour, alpha = NA)
}
\arguments{
- \item{colour}{colour}
+\item{colour}{colour}
- \item{alpha}{new alpha level in [0,1]. If alpha is
- \code{NA}, existing alpha values are preserved.}
+\item{alpha}{new alpha level in [0,1]. If alpha is \code{NA},
+existing alpha values are preserved.}
}
\description{
- Modify colour transparency. Vectorised in both colour and
- alpha.
+Modify colour transparency.
+Vectorised in both colour and alpha.
}
\examples{
alpha("red", 0.1)
diff --git a/man/area_pal.Rd b/man/area_pal.Rd
index d34a06d..8f827cc 100644
--- a/man/area_pal.Rd
+++ b/man/area_pal.Rd
@@ -1,14 +1,15 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{area_pal}
\alias{area_pal}
\title{Point area palette (continuous).}
\usage{
- area_pal(range = c(1, 6))
+area_pal(range = c(1, 6))
}
\arguments{
- \item{range}{Numeric vector of length two, giving range
- of possible sizes. Should be greater than 0.}
+\item{range}{Numeric vector of length two, giving range of possible sizes.
+Should be greater than 0.}
}
\description{
- Point area palette (continuous).
+Point area palette (continuous).
}
diff --git a/man/as.trans.Rd b/man/as.trans.Rd
index d3a24ba..5a58dee 100644
--- a/man/as.trans.Rd
+++ b/man/as.trans.Rd
@@ -1,13 +1,14 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{as.trans}
\alias{as.trans}
\title{Convert character string to transformer.}
\usage{
- as.trans(x)
+as.trans(x)
}
\arguments{
- \item{x}{name of transformer}
+\item{x}{name of transformer}
}
\description{
- Convert character string to transformer.
+Convert character string to transformer.
}
diff --git a/man/asn_trans.Rd b/man/asn_trans.Rd
index d49710d..f6675e4 100644
--- a/man/asn_trans.Rd
+++ b/man/asn_trans.Rd
@@ -1,10 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{asn_trans}
\alias{asn_trans}
\title{Arc-sin square root transformation.}
\usage{
- asn_trans()
+asn_trans()
}
\description{
- Arc-sin square root transformation.
+Arc-sin square root transformation.
}
diff --git a/man/atanh_trans.Rd b/man/atanh_trans.Rd
index b7108b9..387d600 100644
--- a/man/atanh_trans.Rd
+++ b/man/atanh_trans.Rd
@@ -1,10 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{atanh_trans}
\alias{atanh_trans}
\title{Arc-tangent transformation.}
\usage{
- atanh_trans()
+atanh_trans()
}
\description{
- Arc-tangent transformation.
+Arc-tangent transformation.
}
diff --git a/man/boxcox_trans.Rd b/man/boxcox_trans.Rd
index 49e8ddf..88946c7 100644
--- a/man/boxcox_trans.Rd
+++ b/man/boxcox_trans.Rd
@@ -1,17 +1,17 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{boxcox_trans}
\alias{boxcox_trans}
\title{Box-Cox power transformation.}
\usage{
- boxcox_trans(p)
+boxcox_trans(p)
}
\arguments{
- \item{p}{Exponent of boxcox transformation.}
+\item{p}{Exponent of boxcox transformation.}
}
\description{
- Box-Cox power transformation.
+Box-Cox power transformation.
}
\references{
- See \url{http://en.wikipedia.org/wiki/Power_transform}
- for
+See \url{http://en.wikipedia.org/wiki/Power_transform} for
}
diff --git a/man/brewer_pal.Rd b/man/brewer_pal.Rd
index 6fcfba9..a4a5418 100644
--- a/man/brewer_pal.Rd
+++ b/man/brewer_pal.Rd
@@ -1,19 +1,18 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{brewer_pal}
\alias{brewer_pal}
\title{Color Brewer palette (discrete).}
\usage{
- brewer_pal(type = "seq", palette = 1)
+brewer_pal(type = "seq", palette = 1)
}
\arguments{
- \item{type}{One of seq (sequential), div (diverging) or
- qual (qualitative)}
+\item{type}{One of seq (sequential), div (diverging) or qual (qualitative)}
- \item{palette}{If a string, will use that named palette.
- If a number, will index into the list of palettes of
- appropriate \code{type}}
+\item{palette}{If a string, will use that named palette. If a number, will
+index into the list of palettes of appropriate \code{type}}
}
\description{
- Color Brewer palette (discrete).
+Color Brewer palette (discrete).
}
\examples{
show_col(brewer_pal()(10))
@@ -25,6 +24,6 @@ cols <- brewer_pal("div")(5)
show_col(gradient_n_pal(cols)(seq(0, 1, length = 30)))
}
\references{
- \url{http://colorbrewer2.org}
+\url{http://colorbrewer2.org}
}
diff --git a/man/cbreaks.Rd b/man/cbreaks.Rd
index e4f9c23..efe31ae 100644
--- a/man/cbreaks.Rd
+++ b/man/cbreaks.Rd
@@ -1,29 +1,26 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{cbreaks}
\alias{cbreaks}
\title{Compute breaks for continuous scale.}
\usage{
- cbreaks(range, breaks = extended_breaks(),
- labels = scientific_format())
+cbreaks(range, breaks = extended_breaks(), labels = scientific_format())
}
\arguments{
- \item{range}{numeric vector of length 2 giving the range
- of the underlying data}
+\item{range}{numeric vector of length 2 giving the range of the underlying
+data}
- \item{breaks}{either a vector of break values, or a break
- function that will make a vector of breaks when given the
- range of the data}
+\item{breaks}{either a vector of break values, or a break function that
+will make a vector of breaks when given the range of the data}
- \item{labels}{either a vector of labels (character vector
- or list of expression) or a format function that will
- make a vector of labels when called with a vector of
- breaks. Labels can only be specified manually if breaks
- are - it is extremely dangerous to supply labels if you
- don't know what the breaks will be.}
+\item{labels}{either a vector of labels (character vector or list of
+expression) or a format function that will make a vector of labels when
+called with a vector of breaks. Labels can only be specified manually if
+breaks are - it is extremely dangerous to supply labels if you don't know
+what the breaks will be.}
}
\description{
- This function wraps up the components needed to go from a
- continuous range to a set of breaks and labels suitable
- for display on axes or legends.
+This function wraps up the components needed to go from a continuous range
+to a set of breaks and labels suitable for display on axes or legends.
}
\examples{
cbreaks(c(0, 100))
diff --git a/man/censor.Rd b/man/censor.Rd
index 9edaff6..9af74dd 100644
--- a/man/censor.Rd
+++ b/man/censor.Rd
@@ -1,20 +1,20 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{censor}
\alias{censor}
\title{Censor any values outside of range.}
\usage{
- censor(x, range = c(0, 1), only.finite = TRUE)
+censor(x, range = c(0, 1), only.finite = TRUE)
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{range}{numeric vector of length two giving desired
- output range.}
+\item{range}{numeric vector of length two giving desired output range.}
- \item{only.finite}{if \code{TRUE} (the default), will
- only modify finite values.}
+\item{only.finite}{if \code{TRUE} (the default), will only modify
+finite values.}
}
\description{
- Censor any values outside of range.
+Censor any values outside of range.
}
\examples{
censor(c(-1, 0.5, 1, 2, NA))
diff --git a/man/col2hcl.Rd b/man/col2hcl.Rd
index 9d1a405..f52a659 100644
--- a/man/col2hcl.Rd
+++ b/man/col2hcl.Rd
@@ -1,23 +1,24 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{col2hcl}
\alias{col2hcl}
\title{Modify standard R colour in hcl colour space.}
\usage{
- col2hcl(colour, h, c, l, alpha = 1)
+col2hcl(colour, h, c, l, alpha = 1)
}
\arguments{
- \item{colour}{character vector of colours to be modified}
+\item{colour}{character vector of colours to be modified}
- \item{h}{new hue}
+\item{h}{new hue}
- \item{l}{new luminance}
+\item{l}{new luminance}
- \item{c}{new chroma}
+\item{c}{new chroma}
- \item{alpha}{alpha value. Defaults to 1.}
+\item{alpha}{alpha value. Defaults to 1.}
}
\description{
- Transforms rgb to hcl, sets non-missing arguments and
- then backtransforms to rgb.
+Transforms rgb to hcl, sets non-missing arguments and then backtransforms
+to rgb.
}
\examples{
col2hcl(colors())
diff --git a/man/comma_format.Rd b/man/comma_format.Rd
index ae6c208..3b128d2 100644
--- a/man/comma_format.Rd
+++ b/man/comma_format.Rd
@@ -1,25 +1,24 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{comma_format}
\alias{comma}
\alias{comma_format}
\title{Comma formatter: format number with commas separating thousands.}
\usage{
- comma_format(...)
+comma_format(...)
- comma(x, ...)
+comma(x, ...)
}
\arguments{
- \item{...}{other arguments passed on to
- \code{\link{format}}}
+\item{...}{other arguments passed on to \code{\link{format}}}
- \item{x}{a numeric vector to format}
+\item{x}{a numeric vector to format}
}
\value{
- a function with single paramater x, a numeric vector,
- that returns a character vector
+a function with single paramater x, a numeric vector, that
+ returns a character vector
}
\description{
- Comma formatter: format number with commas separating
- thousands.
+Comma formatter: format number with commas separating thousands.
}
\examples{
comma_format()(c(1, 1e3, 2000, 1e6))
diff --git a/man/cscale.Rd b/man/cscale.Rd
index a65bacf..2274397 100644
--- a/man/cscale.Rd
+++ b/man/cscale.Rd
@@ -1,29 +1,29 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{cscale}
\alias{cscale}
\title{Continuous scale.}
\usage{
- cscale(x, palette, na.value = NA_real_,
- trans = identity_trans())
+cscale(x, palette, na.value = NA_real_, trans = identity_trans())
}
\arguments{
- \item{x}{vector of continuous values to scale}
+\item{x}{vector of continuous values to scale}
- \item{palette}{palette to use.
+\item{palette}{palette to use.
Built in palettes:
\Sexpr[results=rd,stage=build]{scales:::seealso_pal()}}
- \item{na.value}{value to use for missing values}
+\item{na.value}{value to use for missing values}
- \item{trans}{transformation object describing the how to
- transform the raw data prior to scaling. Defaults to the
- identity transformation which leaves the data unchanged.
+\item{trans}{transformation object describing the how to transform the
+ raw data prior to scaling. Defaults to the identity transformation which
+ leaves the data unchanged.
- Built in transformations:
- \Sexpr[results=rd,stage=build]{scales:::seealso_trans()}.}
+ Built in transformations:
+ \Sexpr[results=rd,stage=build]{scales:::seealso_trans()}.}
}
\description{
- Continuous scale.
+Continuous scale.
}
\examples{
with(mtcars, plot(disp, mpg, cex = cscale(hp, rescale_pal())))
diff --git a/man/date_breaks.Rd b/man/date_breaks.Rd
index 5871f63..39f6f9e 100644
--- a/man/date_breaks.Rd
+++ b/man/date_breaks.Rd
@@ -1,15 +1,16 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{date_breaks}
\alias{date_breaks}
\title{Regularly spaced dates.}
\usage{
- date_breaks(width = "1 month")
+date_breaks(width = "1 month")
}
\arguments{
- \item{width}{an interval specification, one of "sec",
- "min", "hour", "day", "week", "month", "year". Can be by
- an integer and a space, or followed by "s".}
+\item{width}{an interval specification, one of "sec", "min", "hour",
+"day", "week", "month", "year". Can be by an integer and a space, or
+followed by "s".}
}
\description{
- Regularly spaced dates.
+Regularly spaced dates.
}
diff --git a/man/date_format.Rd b/man/date_format.Rd
index bc967b5..0180c96 100644
--- a/man/date_format.Rd
+++ b/man/date_format.Rd
@@ -1,15 +1,15 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{date_format}
\alias{date_format}
\title{Formatted dates.}
\usage{
- date_format(format = "\%Y-\%m-\%d")
+date_format(format = "\%Y-\%m-\%d")
}
\arguments{
- \item{format}{Date format using standard POSIX
- specification. See \code{\link{strptime}} for possible
- formats.}
+\item{format}{Date format using standard POSIX specification. See
+\code{\link{strptime}} for possible formats.}
}
\description{
- Formatted dates.
+Formatted dates.
}
diff --git a/man/date_trans.Rd b/man/date_trans.Rd
index e6eff54..0cb78eb 100644
--- a/man/date_trans.Rd
+++ b/man/date_trans.Rd
@@ -1,11 +1,12 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{date_trans}
\alias{date_trans}
\title{Transformation for dates (class Date).}
\usage{
- date_trans()
+date_trans()
}
\description{
- Transformation for dates (class Date).
+Transformation for dates (class Date).
}
\examples{
years <- seq(as.Date("1910/1/1"), as.Date("1999/1/1"), "years")
diff --git a/man/dichromat_pal.Rd b/man/dichromat_pal.Rd
index 659bb81..5464c49 100644
--- a/man/dichromat_pal.Rd
+++ b/man/dichromat_pal.Rd
@@ -1,15 +1,16 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{dichromat_pal}
\alias{dichromat_pal}
\title{Dichromat (colour-blind) palette (discrete).}
\usage{
- dichromat_pal(name)
+dichromat_pal(name)
}
\arguments{
- \item{name}{Name of colour palette. One of:
- \Sexpr[results=rd,stage=build]{scales:::dichromat_schemes()}}
+\item{name}{Name of colour palette. One of:
+\Sexpr[results=rd,stage=build]{scales:::dichromat_schemes()}}
}
\description{
- Dichromat (colour-blind) palette (discrete).
+Dichromat (colour-blind) palette (discrete).
}
\examples{
show_col(dichromat_pal("BluetoOrange.10")(10))
diff --git a/man/discard.Rd b/man/discard.Rd
index e7afaf5..70c32c4 100644
--- a/man/discard.Rd
+++ b/man/discard.Rd
@@ -1,17 +1,17 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{discard}
\alias{discard}
\title{Discard any values outside of range.}
\usage{
- discard(x, range = c(0, 1))
+discard(x, range = c(0, 1))
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{range}{numeric vector of length two giving desired
- output range.}
+\item{range}{numeric vector of length two giving desired output range.}
}
\description{
- Discard any values outside of range.
+Discard any values outside of range.
}
\examples{
discard(c(-1, 0.5, 1, 2, NA))
diff --git a/man/div_gradient_pal.Rd b/man/div_gradient_pal.Rd
index 0145d7b..13e4160 100644
--- a/man/div_gradient_pal.Rd
+++ b/man/div_gradient_pal.Rd
@@ -1,23 +1,23 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{div_gradient_pal}
\alias{div_gradient_pal}
\title{Diverging colour gradient (continous).}
\usage{
- div_gradient_pal(low = mnsl("10B 4/6"),
- mid = mnsl("N 8/0"), high = mnsl("10R 4/6"),
- space = "Lab")
+div_gradient_pal(low = mnsl("10B 4/6"), mid = mnsl("N 8/0"),
+ high = mnsl("10R 4/6"), space = "Lab")
}
\arguments{
- \item{low}{colour for low end of gradient.}
+\item{low}{colour for low end of gradient.}
- \item{mid}{colour for mid point}
+\item{mid}{colour for mid point}
- \item{high}{colour for high end of gradient.}
+\item{high}{colour for high end of gradient.}
- \item{space}{colour space in which to calculate gradient.
- "Lab" usually best unless gradient goes through white.}
+\item{space}{colour space in which to calculate gradient. "Lab" usually
+best unless gradient goes through white.}
}
\description{
- Diverging colour gradient (continous).
+Diverging colour gradient (continous).
}
\examples{
x <- seq(-1, 1, length = 100)
diff --git a/man/dollar_format.Rd b/man/dollar_format.Rd
index eed2012..6b51856 100644
--- a/man/dollar_format.Rd
+++ b/man/dollar_format.Rd
@@ -1,29 +1,28 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{dollar_format}
\alias{dollar}
\alias{dollar_format}
\title{Currency formatter: round to nearest cent and display dollar sign.}
\usage{
- dollar_format(largest_with_cents = 1e+05)
+dollar_format(largest_with_cents = 1e+05)
- dollar(x)
+dollar(x)
}
\arguments{
- \item{largest_with_cents}{the value that all values of
- \code{x} must be less than in order for the cents to be
- displayed}
+\item{largest_with_cents}{the value that all values of \code{x} must
+be less than in order for the cents to be displayed}
- \item{x}{a numeric vector to format}
+\item{x}{a numeric vector to format}
}
\value{
- a function with single paramater x, a numeric vector,
- that returns a character vector
+a function with single paramater x, a numeric vector, that
+ returns a character vector
}
\description{
- The returned function will format a vector of values as
- currency. Values are rounded to the nearest cent, and
- cents are displayed if any of the values has a non-zero
- cents and the largest value is less than
- \code{largest_with_cents} which by default is 100000.
+The returned function will format a vector of values as currency.
+Values are rounded to the nearest cent, and cents are displayed if
+any of the values has a non-zero cents and the largest value is less
+than \code{largest_with_cents} which by default is 100000.
}
\examples{
dollar_format()(c(100, 0.23, 1.456565, 2e3))
diff --git a/man/dscale.Rd b/man/dscale.Rd
index 90e4ee8..b4a9146 100644
--- a/man/dscale.Rd
+++ b/man/dscale.Rd
@@ -1,18 +1,19 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{dscale}
\alias{dscale}
\title{Discrete scale.}
\usage{
- dscale(x, palette, na.value = NA)
+dscale(x, palette, na.value = NA)
}
\arguments{
- \item{x}{vector of discrete values to scale}
+\item{x}{vector of discrete values to scale}
- \item{palette}{aesthetic palette to use}
+\item{palette}{aesthetic palette to use}
- \item{na.value}{aesthetic to use for missing values}
+\item{na.value}{aesthetic to use for missing values}
}
\description{
- Discrete scale.
+Discrete scale.
}
\examples{
with(mtcars, plot(disp, mpg, pch = 20, cex = 3,
diff --git a/man/exp_trans.Rd b/man/exp_trans.Rd
index c38a23c..a599168 100644
--- a/man/exp_trans.Rd
+++ b/man/exp_trans.Rd
@@ -1,14 +1,14 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{exp_trans}
\alias{exp_trans}
\title{Exponential transformation (inverse of log transformation).}
\usage{
- exp_trans(base = exp(1))
+exp_trans(base = exp(1))
}
\arguments{
- \item{base}{Base of logarithm}
+\item{base}{Base of logarithm}
}
\description{
- Exponential transformation (inverse of log
- transformation).
+Exponential transformation (inverse of log transformation).
}
diff --git a/man/expand_range.Rd b/man/expand_range.Rd
index 6bf69c1..c35168b 100644
--- a/man/expand_range.Rd
+++ b/man/expand_range.Rd
@@ -1,21 +1,20 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{expand_range}
\alias{expand_range}
\title{Expand a range with a multiplicative or additive constant.}
\usage{
- expand_range(range, mul = 0, add = 0, zero_width = 1)
+expand_range(range, mul = 0, add = 0, zero_width = 1)
}
\arguments{
- \item{range}{range of data, numeric vector of length 2}
+\item{range}{range of data, numeric vector of length 2}
- \item{mul}{multiplicative constract}
+\item{mul}{multiplicative constract}
- \item{add}{additive constant}
+\item{add}{additive constant}
- \item{zero_width}{distance to use if range has zero
- width}
+\item{zero_width}{distance to use if range has zero width}
}
\description{
- Expand a range with a multiplicative or additive
- constant.
+Expand a range with a multiplicative or additive constant.
}
diff --git a/man/extended_breaks.Rd b/man/extended_breaks.Rd
index 235682e..cd4d864 100644
--- a/man/extended_breaks.Rd
+++ b/man/extended_breaks.Rd
@@ -1,28 +1,29 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{extended_breaks}
\alias{extended_breaks}
\title{Extended breaks.
Uses Wilkinson's extended breaks algorithm as implemented in the
\pkg{labeling} package.}
\usage{
- extended_breaks(n = 5, ...)
+extended_breaks(n = 5, ...)
}
\arguments{
- \item{n}{desired number of breaks}
+\item{n}{desired number of breaks}
- \item{...}{other arguments passed on to
- \code{\link[labeling]{extended}}}
+\item{...}{other arguments passed on to \code{\link[labeling]{extended}}}
}
\description{
- Extended breaks. Uses Wilkinson's extended breaks
- algorithm as implemented in the \pkg{labeling} package.
+Extended breaks.
+Uses Wilkinson's extended breaks algorithm as implemented in the
+\pkg{labeling} package.
}
\examples{
extended_breaks()(1:10)
extended_breaks()(1:100)
}
\references{
- Talbot, J., Lin, S., Hanrahan, P. (2010) An Extension of
- Wilkinson's Algorithm for Positioning Tick Labels on
- Axes, InfoVis 2010.
+Talbot, J., Lin, S., Hanrahan, P. (2010) An Extension of
+ Wilkinson's Algorithm for Positioning Tick Labels on Axes, InfoVis
+ 2010.
}
diff --git a/man/format_format.Rd b/man/format_format.Rd
index 9b2f4c9..d62e8f7 100644
--- a/man/format_format.Rd
+++ b/man/format_format.Rd
@@ -1,19 +1,19 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{format_format}
\alias{format_format}
\title{Format with using any arguments to \code{\link{format}}.}
\usage{
- format_format(...)
+format_format(...)
}
\arguments{
- \item{...}{other arguments passed on to
- \code{\link{format}}.}
+\item{...}{other arguments passed on to \code{\link{format}}.}
}
\description{
- If the breaks have names, they will be used in preference
- to formatting the breaks.
+If the breaks have names, they will be used in preference to formatting
+the breaks.
}
\seealso{
- \code{\link{format}}, \code{\link{format.Date}},
+\code{\link{format}}, \code{\link{format.Date}},
\code{\link{format.POSIXct}}
}
diff --git a/man/fullseq.Rd b/man/fullseq.Rd
index 80c67bc..51c5426 100644
--- a/man/fullseq.Rd
+++ b/man/fullseq.Rd
@@ -1,21 +1,22 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{fullseq}
\alias{fullseq}
\title{Generate sequence of fixed size intervals covering range.}
\usage{
- fullseq(range, size, ...)
+fullseq(range, size, ...)
}
\arguments{
- \item{range}{range}
+\item{range}{range}
- \item{size}{interval size}
+\item{size}{interval size}
- \item{...}{other arguments passed on to methods}
+\item{...}{other arguments passed on to methods}
}
\description{
- Generate sequence of fixed size intervals covering range.
+Generate sequence of fixed size intervals covering range.
}
\seealso{
- \code{\link[plyr]{round_any}}
+\code{\link[plyr]{round_any}}
}
\keyword{internal}
diff --git a/man/gradient_n_pal.Rd b/man/gradient_n_pal.Rd
index 7910417..28e5d14 100644
--- a/man/gradient_n_pal.Rd
+++ b/man/gradient_n_pal.Rd
@@ -1,22 +1,22 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{gradient_n_pal}
\alias{gradient_n_pal}
\title{Arbitrary colour gradient palette (continous).}
\usage{
- gradient_n_pal(colours, values = NULL, space = "Lab")
+gradient_n_pal(colours, values = NULL, space = "Lab")
}
\arguments{
- \item{colours}{vector of colours}
+\item{colours}{vector of colours}
- \item{values}{if colours should not be evenly positioned
- along the gradient this vector gives the position
- (between 0 and 1) for each colour in the \code{colours}
- vector. See \code{\link{rescale}} for a convience
- function to map an arbitrary range to between 0 and 1.}
+\item{values}{if colours should not be evenly positioned along the gradient
+this vector gives the position (between 0 and 1) for each colour in the
+\code{colours} vector. See \code{\link{rescale}} for a convience function
+to map an arbitrary range to between 0 and 1.}
- \item{space}{colour space in which to calculate gradient.
- "Lab" usually best unless gradient goes through white.}
+\item{space}{colour space in which to calculate gradient. "Lab" usually
+best unless gradient goes through white.}
}
\description{
- Arbitrary colour gradient palette (continous).
+Arbitrary colour gradient palette (continous).
}
diff --git a/man/grey_pal.Rd b/man/grey_pal.Rd
index 12576de..d67404c 100644
--- a/man/grey_pal.Rd
+++ b/man/grey_pal.Rd
@@ -1,22 +1,23 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{grey_pal}
\alias{grey_pal}
\title{Grey scale palette (discrete).}
\usage{
- grey_pal(start = 0.2, end = 0.8)
+grey_pal(start = 0.2, end = 0.8)
}
\arguments{
- \item{start}{gray value at low end of palette}
+\item{start}{gray value at low end of palette}
- \item{end}{gray value at high end of palette}
+\item{end}{gray value at high end of palette}
}
\description{
- Grey scale palette (discrete).
+Grey scale palette (discrete).
}
\examples{
show_col(grey_pal()(25))
show_col(grey_pal(0, 1)(25))
}
\seealso{
- \code{\link{seq_gradient_pal}} for continuous version
+\code{\link{seq_gradient_pal}} for continuous version
}
diff --git a/man/hue_pal.Rd b/man/hue_pal.Rd
index 89a4021..d068f5e 100644
--- a/man/hue_pal.Rd
+++ b/man/hue_pal.Rd
@@ -1,25 +1,25 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{hue_pal}
\alias{hue_pal}
\title{Hue palette (discrete).}
\usage{
- hue_pal(h = c(0, 360) + 15, c = 100, l = 65, h.start = 0,
- direction = 1)
+hue_pal(h = c(0, 360) + 15, c = 100, l = 65, h.start = 0,
+ direction = 1)
}
\arguments{
- \item{h}{range of hues to use, in [0, 360]}
+\item{h}{range of hues to use, in [0, 360]}
- \item{l}{luminance (lightness), in [0, 100]}
+\item{l}{luminance (lightness), in [0, 100]}
- \item{c}{chroma (intensity of colour), maximum value
- varies depending on}
+\item{c}{chroma (intensity of colour), maximum value varies depending on}
- \item{h.start}{hue to start at}
+\item{h.start}{hue to start at}
- \item{direction}{direction to travel around the colour
- wheel, 1 = clockwise, -1 = counter-clockwise}
+\item{direction}{direction to travel around the colour wheel,
+1 = clockwise, -1 = counter-clockwise}
}
\description{
- Hue palette (discrete).
+Hue palette (discrete).
}
\examples{
show_col(hue_pal()(4))
diff --git a/man/identity_pal.Rd b/man/identity_pal.Rd
index 916fd08..f182585 100644
--- a/man/identity_pal.Rd
+++ b/man/identity_pal.Rd
@@ -1,11 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{identity_pal}
\alias{identity_pal}
\title{Identity palette.}
\usage{
- identity_pal()
+identity_pal()
}
\description{
- Leaves values unchanged - useful when the data is already
- scaled.
+Leaves values unchanged - useful when the data is already scaled.
}
diff --git a/man/identity_trans.Rd b/man/identity_trans.Rd
index 6abc730..512966d 100644
--- a/man/identity_trans.Rd
+++ b/man/identity_trans.Rd
@@ -1,10 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{identity_trans}
\alias{identity_trans}
\title{Identity transformation (do nothing).}
\usage{
- identity_trans()
+identity_trans()
}
\description{
- Identity transformation (do nothing).
+Identity transformation (do nothing).
}
diff --git a/man/linetype_pal.Rd b/man/linetype_pal.Rd
index c400a18..3fba6d0 100644
--- a/man/linetype_pal.Rd
+++ b/man/linetype_pal.Rd
@@ -1,11 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{linetype_pal}
\alias{linetype_pal}
\title{Line type palette (discrete).}
\usage{
- linetype_pal()
+linetype_pal()
}
\description{
- Based on a set supplied by Richard Pearson, University of
- Manchester
+Based on a set supplied by Richard Pearson, University of Manchester
}
diff --git a/man/log1p_trans.Rd b/man/log1p_trans.Rd
index e1761d5..7079d76 100644
--- a/man/log1p_trans.Rd
+++ b/man/log1p_trans.Rd
@@ -1,10 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{log1p_trans}
\alias{log1p_trans}
\title{Log plus one transformation.}
\usage{
- log1p_trans()
+log1p_trans()
}
\description{
- Log plus one transformation.
+Log plus one transformation.
}
diff --git a/man/log_breaks.Rd b/man/log_breaks.Rd
index d34f711..819a93e 100644
--- a/man/log_breaks.Rd
+++ b/man/log_breaks.Rd
@@ -1,16 +1,17 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{log_breaks}
\alias{log_breaks}
\title{Log breaks (integer breaks on log-transformed scales).}
\usage{
- log_breaks(n = 5, base = 10)
+log_breaks(n = 5, base = 10)
}
\arguments{
- \item{n}{desired number of breaks}
+\item{n}{desired number of breaks}
- \item{base}{base of logarithm to use}
+\item{base}{base of logarithm to use}
}
\description{
- Log breaks (integer breaks on log-transformed scales).
+Log breaks (integer breaks on log-transformed scales).
}
\examples{
log_breaks()(c(1, 1e6))
diff --git a/man/log_trans.Rd b/man/log_trans.Rd
index 94548c5..57052d8 100644
--- a/man/log_trans.Rd
+++ b/man/log_trans.Rd
@@ -1,15 +1,16 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{log_trans}
\alias{log10_trans}
\alias{log2_trans}
\alias{log_trans}
\title{Log transformation.}
\usage{
- log_trans(base = exp(1))
+log_trans(base = exp(1))
}
\arguments{
- \item{base}{base of logarithm}
+\item{base}{base of logarithm}
}
\description{
- Log transformation.
+Log transformation.
}
diff --git a/man/manual_pal.Rd b/man/manual_pal.Rd
index 41017ad..46e1b4c 100644
--- a/man/manual_pal.Rd
+++ b/man/manual_pal.Rd
@@ -1,13 +1,14 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{manual_pal}
\alias{manual_pal}
\title{Manual palette (manual).}
\usage{
- manual_pal(values)
+manual_pal(values)
}
\arguments{
- \item{values}{vector of values to be used as a palette.}
+\item{values}{vector of values to be used as a palette.}
}
\description{
- Manual palette (manual).
+Manual palette (manual).
}
diff --git a/man/math_format.Rd b/man/math_format.Rd
index 11f7a7d..bd1ab58 100644
--- a/man/math_format.Rd
+++ b/man/math_format.Rd
@@ -1,24 +1,25 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{math_format}
\alias{math_format}
\title{Add arbitrary expression to a label.
The symbol that will be replace by the label value is \code{.x}.}
\usage{
- math_format(expr = 10^.x, format = force)
+math_format(expr = 10^.x, format = force)
}
\arguments{
- \item{expr}{expression to use}
+\item{expr}{expression to use}
- \item{format}{another format function to apply prior to
- mathematical transformation - this makes it easier to use
- floating point numbers in mathematical expressions.}
+\item{format}{another format function to apply prior to mathematical
+transformation - this makes it easier to use floating point numbers in
+mathematical expressions.}
}
\value{
- a function with single paramater x, a numeric vector,
- that returns a list of expressions
+a function with single paramater x, a numeric vector, that
+ returns a list of expressions
}
\description{
- Add arbitrary expression to a label. The symbol that will
- be replace by the label value is \code{.x}.
+Add arbitrary expression to a label.
+The symbol that will be replace by the label value is \code{.x}.
}
\examples{
math_format()(1:10)
@@ -27,6 +28,6 @@ math_format()(runif(10))
math_format(format = percent)(runif(10))
}
\seealso{
- \code{\link{plotmath}}
+\code{\link{plotmath}}
}
diff --git a/man/muted.Rd b/man/muted.Rd
index f453c29..64e8919 100644
--- a/man/muted.Rd
+++ b/man/muted.Rd
@@ -1,18 +1,19 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{muted}
\alias{muted}
\title{Mute standard colour.}
\usage{
- muted(colour, l = 30, c = 70)
+muted(colour, l = 30, c = 70)
}
\arguments{
- \item{colour}{character vector of colours to modify}
+\item{colour}{character vector of colours to modify}
- \item{l}{new luminance}
+\item{l}{new luminance}
- \item{c}{new chroma}
+\item{c}{new chroma}
}
\description{
- Mute standard colour.
+Mute standard colour.
}
\examples{
muted("red")
diff --git a/man/package-scales.Rd b/man/package-scales.Rd
index cc4045f..9d87e67 100644
--- a/man/package-scales.Rd
+++ b/man/package-scales.Rd
@@ -1,3 +1,4 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\docType{package}
\name{package-scales}
\alias{package-scales}
@@ -5,6 +6,6 @@
\alias{scales}
\title{Generic plot scaling methods}
\description{
- Generic plot scaling methods
+Generic plot scaling methods
}
diff --git a/man/parse_format.Rd b/man/parse_format.Rd
index c40a838..37d2d97 100644
--- a/man/parse_format.Rd
+++ b/man/parse_format.Rd
@@ -1,20 +1,21 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{parse_format}
\alias{parse_format}
\title{Parse a text label to produce expressions for plotmath.}
\usage{
- parse_format()
+parse_format()
}
\value{
- a function with single paramater x, a character vector,
- that returns a list of expressions
+a function with single paramater x, a character vector, that
+ returns a list of expressions
}
\description{
- Parse a text label to produce expressions for plotmath.
+Parse a text label to produce expressions for plotmath.
}
\examples{
parse_format()(c("alpha", "beta", "gamma"))
}
\seealso{
- \code{\link{plotmath}}
+\code{\link{plotmath}}
}
diff --git a/man/percent_format.Rd b/man/percent_format.Rd
index 6f42193..24c2bf3 100644
--- a/man/percent_format.Rd
+++ b/man/percent_format.Rd
@@ -1,22 +1,22 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{percent_format}
\alias{percent}
\alias{percent_format}
\title{Percent formatter: multiply by one hundred and display percent sign.}
\usage{
- percent_format()
+percent_format()
- percent(x)
+percent(x)
}
\arguments{
- \item{x}{a numeric vector to format}
+\item{x}{a numeric vector to format}
}
\value{
- a function with single paramater x, a numeric vector,
- that returns a character vector
+a function with single paramater x, a numeric vector, that
+ returns a character vector
}
\description{
- Percent formatter: multiply by one hundred and display
- percent sign.
+Percent formatter: multiply by one hundred and display percent sign.
}
\examples{
percent_format()(runif(10))
diff --git a/man/pretty_breaks.Rd b/man/pretty_breaks.Rd
index 8867d51..83e6312 100644
--- a/man/pretty_breaks.Rd
+++ b/man/pretty_breaks.Rd
@@ -1,19 +1,19 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{pretty_breaks}
\alias{pretty_breaks}
\title{Pretty breaks.
Uses default R break algorithm as implemented in \code{\link{pretty}}.}
\usage{
- pretty_breaks(n = 5, ...)
+pretty_breaks(n = 5, ...)
}
\arguments{
- \item{n}{desired number of breaks}
+\item{n}{desired number of breaks}
- \item{...}{other arguments passed on to
- \code{\link{pretty}}}
+\item{...}{other arguments passed on to \code{\link{pretty}}}
}
\description{
- Pretty breaks. Uses default R break algorithm as
- implemented in \code{\link{pretty}}.
+Pretty breaks.
+Uses default R break algorithm as implemented in \code{\link{pretty}}.
}
\examples{
pretty_breaks()(1:10)
diff --git a/man/probability_trans.Rd b/man/probability_trans.Rd
index 38a50b3..7114be8 100644
--- a/man/probability_trans.Rd
+++ b/man/probability_trans.Rd
@@ -1,21 +1,20 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{probability_trans}
\alias{logit_trans}
\alias{probability_trans}
\alias{probit_trans}
\title{Probability transformation.}
\usage{
- probability_trans(distribution, ...)
+probability_trans(distribution, ...)
}
\arguments{
- \item{distribution}{probability distribution. Should be
- standard R abbreviation so that "p" + distribution is a
- valid probability density function, and "q" +
- distribution is a valid quantile function.}
+\item{distribution}{probability distribution. Should be standard R
+abbreviation so that "p" + distribution is a valid probability density
+function, and "q" + distribution is a valid quantile function.}
- \item{...}{other arguments passed on to distribution and
- quantile functions}
+\item{...}{other arguments passed on to distribution and quantile functions}
}
\description{
- Probability transformation.
+Probability transformation.
}
diff --git a/man/reciprocal_trans.Rd b/man/reciprocal_trans.Rd
index 2b8963e..80a88f8 100644
--- a/man/reciprocal_trans.Rd
+++ b/man/reciprocal_trans.Rd
@@ -1,10 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{reciprocal_trans}
\alias{reciprocal_trans}
\title{Reciprocal transformation.}
\usage{
- reciprocal_trans()
+reciprocal_trans()
}
\description{
- Reciprocal transformation.
+Reciprocal transformation.
}
diff --git a/man/rescale.Rd b/man/rescale.Rd
index 051f7fa..14718d2 100644
--- a/man/rescale.Rd
+++ b/man/rescale.Rd
@@ -1,20 +1,20 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{rescale}
\alias{rescale}
\title{Rescale numeric vector to have specified minimum and maximum.}
\usage{
- rescale(x, to = c(0, 1), from = range(x, na.rm = TRUE))
+rescale(x, to = c(0, 1), from = range(x, na.rm = TRUE))
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{to}{output range (numeric vector of length two)}
+\item{to}{output range (numeric vector of length two)}
- \item{from}{input range (numeric vector of length two).
- If not given, is calculated from the range of \code{x}}
+\item{from}{input range (numeric vector of length two). If not given, is
+calculated from the range of \code{x}}
}
\description{
- Rescale numeric vector to have specified minimum and
- maximum.
+Rescale numeric vector to have specified minimum and maximum.
}
\examples{
rescale(1:100)
diff --git a/man/rescale_max.Rd b/man/rescale_max.Rd
index 5209808..5ec4131 100644
--- a/man/rescale_max.Rd
+++ b/man/rescale_max.Rd
@@ -1,20 +1,20 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{rescale_max}
\alias{rescale_max}
\title{Rescale numeric vector to have specified maximum.}
\usage{
- rescale_max(x, to = c(0, 1),
- from = range(x, na.rm = TRUE))
+rescale_max(x, to = c(0, 1), from = range(x, na.rm = TRUE))
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{to}{output range (numeric vector of length two)}
+\item{to}{output range (numeric vector of length two)}
- \item{from}{input range (numeric vector of length two).
- If not given, is calculated from the range of \code{x}}
+\item{from}{input range (numeric vector of length two). If not given, is
+calculated from the range of \code{x}}
}
\description{
- Rescale numeric vector to have specified maximum.
+Rescale numeric vector to have specified maximum.
}
\examples{
rescale_max(1:100)
diff --git a/man/rescale_mid.Rd b/man/rescale_mid.Rd
index 48f8210..56e6fd9 100644
--- a/man/rescale_mid.Rd
+++ b/man/rescale_mid.Rd
@@ -1,23 +1,22 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{rescale_mid}
\alias{rescale_mid}
\title{Rescale numeric vector to have specified minimum, midpoint, and maximum.}
\usage{
- rescale_mid(x, to = c(0, 1),
- from = range(x, na.rm = TRUE), mid = 0)
+rescale_mid(x, to = c(0, 1), from = range(x, na.rm = TRUE), mid = 0)
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{to}{output range (numeric vector of length two)}
+\item{to}{output range (numeric vector of length two)}
- \item{from}{input range (numeric vector of length two).
- If not given, is calculated from the range of \code{x}}
+\item{from}{input range (numeric vector of length two). If not given, is
+calculated from the range of \code{x}}
- \item{mid}{mid-point of input range}
+\item{mid}{mid-point of input range}
}
\description{
- Rescale numeric vector to have specified minimum,
- midpoint, and maximum.
+Rescale numeric vector to have specified minimum, midpoint, and maximum.
}
\examples{
rescale_mid(1:100, mid = 50.5)
diff --git a/man/rescale_none.Rd b/man/rescale_none.Rd
index 4c9c679..2e3972b 100644
--- a/man/rescale_none.Rd
+++ b/man/rescale_none.Rd
@@ -1,16 +1,17 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{rescale_none}
\alias{rescale_none}
\title{Don't peform rescaling}
\usage{
- rescale_none(x, ...)
+rescale_none(x, ...)
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{...}{all other arguments ignored}
+\item{...}{all other arguments ignored}
}
\description{
- Don't peform rescaling
+Don't peform rescaling
}
\examples{
rescale_none(1:100)
diff --git a/man/rescale_pal.Rd b/man/rescale_pal.Rd
index 1344bba..f6691b2 100644
--- a/man/rescale_pal.Rd
+++ b/man/rescale_pal.Rd
@@ -1,15 +1,16 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{rescale_pal}
\alias{rescale_pal}
\title{Rescale palette (continuous).}
\usage{
- rescale_pal(range = c(0.1, 1))
+rescale_pal(range = c(0.1, 1))
}
\arguments{
- \item{range}{Numeric vector of length two, giving range
- of possible values. Should be between 0 and 1.}
+\item{range}{Numeric vector of length two, giving range of possible
+values. Should be between 0 and 1.}
}
\description{
- Just rescales the input to the specific output range.
- Useful for alpha, size, and continuous position.
+Just rescales the input to the specific output range. Useful for
+alpha, size, and continuous position.
}
diff --git a/man/reverse_trans.Rd b/man/reverse_trans.Rd
index e69383e..6c4dbfa 100644
--- a/man/reverse_trans.Rd
+++ b/man/reverse_trans.Rd
@@ -1,10 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{reverse_trans}
\alias{reverse_trans}
\title{Reverse transformation.}
\usage{
- reverse_trans()
+reverse_trans()
}
\description{
- Reverse transformation.
+Reverse transformation.
}
diff --git a/man/scientific_format.Rd b/man/scientific_format.Rd
index 0f4daa5..f20da18 100644
--- a/man/scientific_format.Rd
+++ b/man/scientific_format.Rd
@@ -1,26 +1,26 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{scientific_format}
\alias{scientific}
\alias{scientific_format}
\title{Scientific formatter.}
\usage{
- scientific_format(digits = 3, ...)
+scientific_format(digits = 3, ...)
- scientific(x, digits = 3, ...)
+scientific(x, digits = 3, ...)
}
\arguments{
- \item{digits}{number of significant digits to show}
+\item{digits}{number of significant digits to show}
- \item{...}{other arguments passed on to
- \code{\link{format}}}
+\item{...}{other arguments passed on to \code{\link{format}}}
- \item{x}{a numeric vector to format}
+\item{x}{a numeric vector to format}
}
\value{
- a function with single paramater x, a numeric vector,
- that returns a character vector
+a function with single paramater x, a numeric vector, that
+ returns a character vector
}
\description{
- Scientific formatter.
+Scientific formatter.
}
\examples{
scientific_format()(1:10)
diff --git a/man/seq_gradient_pal.Rd b/man/seq_gradient_pal.Rd
index c952369..7fd45d9 100644
--- a/man/seq_gradient_pal.Rd
+++ b/man/seq_gradient_pal.Rd
@@ -1,20 +1,21 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{seq_gradient_pal}
\alias{seq_gradient_pal}
\title{Sequential colour gradient palette (continous).}
\usage{
- seq_gradient_pal(low = mnsl("10B 4/6"),
- high = mnsl("10R 4/6"), space = "Lab")
+seq_gradient_pal(low = mnsl("10B 4/6"), high = mnsl("10R 4/6"),
+ space = "Lab")
}
\arguments{
- \item{low}{colour for low end of gradient.}
+\item{low}{colour for low end of gradient.}
- \item{high}{colour for high end of gradient.}
+\item{high}{colour for high end of gradient.}
- \item{space}{colour space in which to calculate gradient.
- "Lab" usually best unless gradient goes through white.}
+\item{space}{colour space in which to calculate gradient. "Lab" usually
+best unless gradient goes through white.}
}
\description{
- Sequential colour gradient palette (continous).
+Sequential colour gradient palette (continous).
}
\examples{
x <- seq(0, 1, length = 25)
diff --git a/man/shape_pal.Rd b/man/shape_pal.Rd
index f519c74..c1d275f 100644
--- a/man/shape_pal.Rd
+++ b/man/shape_pal.Rd
@@ -1,13 +1,14 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{shape_pal}
\alias{shape_pal}
\title{Shape palette (discrete).}
\usage{
- shape_pal(solid = TRUE)
+shape_pal(solid = TRUE)
}
\arguments{
- \item{solid}{should shapes be solid or not?}
+\item{solid}{should shapes be solid or not?}
}
\description{
- Shape palette (discrete).
+Shape palette (discrete).
}
diff --git a/man/show_col.Rd b/man/show_col.Rd
index c296a28..2604bd6 100644
--- a/man/show_col.Rd
+++ b/man/show_col.Rd
@@ -1,13 +1,14 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{show_col}
\alias{show_col}
\title{Show colours.}
\usage{
- show_col(colours)
+show_col(colours)
}
\arguments{
- \item{colours}{a character vector of colours}
+\item{colours}{a character vector of colours}
}
\description{
- A quick and dirty way to show colours in a plot.
+A quick and dirty way to show colours in a plot.
}
diff --git a/man/sqrt_trans.Rd b/man/sqrt_trans.Rd
index dddf207..9e45fa4 100644
--- a/man/sqrt_trans.Rd
+++ b/man/sqrt_trans.Rd
@@ -1,10 +1,11 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{sqrt_trans}
\alias{sqrt_trans}
\title{Square-root transformation.}
\usage{
- sqrt_trans()
+sqrt_trans()
}
\description{
- Square-root transformation.
+Square-root transformation.
}
diff --git a/man/squish.Rd b/man/squish.Rd
index d49c11b..a48266b 100644
--- a/man/squish.Rd
+++ b/man/squish.Rd
@@ -1,26 +1,26 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{squish}
\alias{squish}
\title{Squish values into range.}
\usage{
- squish(x, range = c(0, 1), only.finite = TRUE)
+squish(x, range = c(0, 1), only.finite = TRUE)
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{range}{numeric vector of length two giving desired
- output range.}
+\item{range}{numeric vector of length two giving desired output range.}
- \item{only.finite}{if \code{TRUE} (the default), will
- only modify finite values.}
+\item{only.finite}{if \code{TRUE} (the default), will only modify
+finite values.}
}
\description{
- Squish values into range.
+Squish values into range.
}
\examples{
squish(c(-1, 0.5, 1, 2, NA))
squish(c(-1, 0, 0.5, 1, 2))
}
\author{
- Homer Strong <homer.strong at gmail.com>
+Homer Strong <homer.strong at gmail.com>
}
diff --git a/man/squish_infinite.Rd b/man/squish_infinite.Rd
index ca8b25b..811ca63 100644
--- a/man/squish_infinite.Rd
+++ b/man/squish_infinite.Rd
@@ -1,17 +1,17 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{squish_infinite}
\alias{squish_infinite}
\title{Squish infinite values to range.}
\usage{
- squish_infinite(x, range = c(0, 1))
+squish_infinite(x, range = c(0, 1))
}
\arguments{
- \item{x}{numeric vector of values to manipulate.}
+\item{x}{numeric vector of values to manipulate.}
- \item{range}{numeric vector of length two giving desired
- output range.}
+\item{range}{numeric vector of length two giving desired output range.}
}
\description{
- Squish infinite values to range.
+Squish infinite values to range.
}
\examples{
squish_infinite(c(-Inf, -1, 0, 1, 2, Inf))
diff --git a/man/time_trans.Rd b/man/time_trans.Rd
index f2068af..b906a83 100644
--- a/man/time_trans.Rd
+++ b/man/time_trans.Rd
@@ -1,16 +1,16 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{time_trans}
\alias{time_trans}
\title{Transformation for times (class POSIXt).}
\usage{
- time_trans(tz = NULL)
+time_trans(tz = NULL)
}
\arguments{
- \item{tz}{Optionally supply the time zone. If
- \code{NULL}, the default, the time zone will be extracted
- from first input with a non-null tz.}
+\item{tz}{Optionally supply the time zone. If \code{NULL}, the default,
+the time zone will be extracted from first input with a non-null tz.}
}
\description{
- Transformation for times (class POSIXt).
+Transformation for times (class POSIXt).
}
\examples{
hours <- seq(ISOdate(2000,3,20, tz = ""), by = "hour", length.out = 10)
diff --git a/man/trans_breaks.Rd b/man/trans_breaks.Rd
index 7cce6e5..bd228a5 100644
--- a/man/trans_breaks.Rd
+++ b/man/trans_breaks.Rd
@@ -1,21 +1,22 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{trans_breaks}
\alias{trans_breaks}
\title{Pretty breaks on transformed scale.}
\usage{
- trans_breaks(trans, inv, n = 5, ...)
+trans_breaks(trans, inv, n = 5, ...)
}
\arguments{
- \item{trans}{function of single variable, \code{x}, that
- given a numeric vector returns the transformed values}
+\item{trans}{function of single variable, \code{x}, that given a numeric
+vector returns the transformed values}
- \item{inv}{inverse of the transformation function}
+\item{inv}{inverse of the transformation function}
- \item{n}{desired number of ticks}
+\item{n}{desired number of ticks}
- \item{...}{other arguments passed on to pretty}
+\item{...}{other arguments passed on to pretty}
}
\description{
- These often do not produce very attractive breaks.
+These often do not produce very attractive breaks.
}
\examples{
trans_breaks("log10", function(x) 10 ^ x)(c(1, 1e6))
diff --git a/man/trans_format.Rd b/man/trans_format.Rd
index e701f12..fc15849 100644
--- a/man/trans_format.Rd
+++ b/man/trans_format.Rd
@@ -1,21 +1,21 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{trans_format}
\alias{trans_format}
\title{Format labels after transformation.}
\usage{
- trans_format(trans, format = scientific_format())
+trans_format(trans, format = scientific_format())
}
\arguments{
- \item{trans}{transformation to apply}
+\item{trans}{transformation to apply}
- \item{format}{additional formatter to apply after
- transformation}
+\item{format}{additional formatter to apply after transformation}
}
\value{
- a function with single paramater x, a numeric vector,
- that returns a character vector of list of expressions
+a function with single paramater x, a numeric vector, that
+ returns a character vector of list of expressions
}
\description{
- Format labels after transformation.
+Format labels after transformation.
}
\examples{
tf <- trans_format("log10", scientific_format())
diff --git a/man/trans_new.Rd b/man/trans_new.Rd
index 2d81bc1..219cd68 100644
--- a/man/trans_new.Rd
+++ b/man/trans_new.Rd
@@ -1,42 +1,40 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{trans_new}
\alias{is.trans}
\alias{trans}
\alias{trans_new}
\title{Create a new transformation object.}
\usage{
- trans_new(name, transform, inverse,
- breaks = extended_breaks(), format = format_format(),
- domain = c(-Inf, Inf))
+trans_new(name, transform, inverse, breaks = extended_breaks(),
+ format = format_format(), domain = c(-Inf, Inf))
}
\arguments{
- \item{name}{transformation name}
+\item{name}{transformation name}
- \item{transform}{function, or name of function, that
- performs the transformation}
+\item{transform}{function, or name of function, that performs the
+transformation}
- \item{inverse}{function, or name of function, that
- performs the inverse of the transformation}
+\item{inverse}{function, or name of function, that performs the
+inverse of the transformation}
- \item{breaks}{default breaks function for this
- transformation. The breaks function is applied to the raw
- data.}
+\item{breaks}{default breaks function for this transformation. The breaks
+function is applied to the raw data.}
- \item{format}{default format for this transformation. The
- format is applied to breaks generated to the raw data.}
+\item{format}{default format for this transformation. The format is applied
+to breaks generated to the raw data.}
- \item{domain}{domain, as numeric vector of length 2, over
- which transformation is valued}
+\item{domain}{domain, as numeric vector of length 2, over which
+transformation is valued}
}
\description{
- A transformation encapsulates a transformation and its
- inverse, as well as the information needed to create
- pleasing breaks and labels. The breaks function is
- applied on the transformed range of the range, and it's
- expected that the labels function will perform some kind
- of inverse tranformation on these breaks to give them
- labels that are meaningful on the original scale.
+A transformation encapsulates a transformation and its inverse, as well
+as the information needed to create pleasing breaks and labels. The breaks
+function is applied on the transformed range of the range, and it's
+expected that the labels function will perform some kind of inverse
+tranformation on these breaks to give them labels that are meaningful on
+the original scale.
}
\seealso{
- \Sexpr[results=rd,stage=build]{scales:::seealso_trans()}
+\Sexpr[results=rd,stage=build]{scales:::seealso_trans()}
}
diff --git a/man/trans_range.Rd b/man/trans_range.Rd
index 92fbd5d..f8c8df0 100644
--- a/man/trans_range.Rd
+++ b/man/trans_range.Rd
@@ -1,17 +1,17 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{trans_range}
\alias{trans_range}
\title{Compute range of transformed values.}
\usage{
- trans_range(trans, x)
+trans_range(trans, x)
}
\arguments{
- \item{trans}{a transformation object, or the name of a
- transformation object given as a string.}
+\item{trans}{a transformation object, or the name of a transformation object
+given as a string.}
- \item{x}{a numeric vector to compute the rande of}
+\item{x}{a numeric vector to compute the rande of}
}
\description{
- Silently drops any ranges outside of the domain of
- \code{trans}.
+Silently drops any ranges outside of the domain of \code{trans}.
}
diff --git a/man/zero_range.Rd b/man/zero_range.Rd
index 74f4c66..4dafbd2 100644
--- a/man/zero_range.Rd
+++ b/man/zero_range.Rd
@@ -1,26 +1,26 @@
+% Generated by roxygen2 (4.0.0): do not edit by hand
\name{zero_range}
\alias{zero_range}
\title{Determine if range of vector is close to zero, with a specified tolerance}
\usage{
- zero_range(x, tol = .Machine$double.eps * 100)
+zero_range(x, tol = .Machine$double.eps * 100)
}
\arguments{
- \item{x}{numeric range: vector of length 2}
+\item{x}{numeric range: vector of length 2}
- \item{tol}{A value specifying the tolerance. Defaults to
- \code{.Machine$double.eps * 100}.}
+\item{tol}{A value specifying the tolerance. Defaults to
+\code{.Machine$double.eps * 100}.}
}
\value{
- logical \code{TRUE} if the relative difference of the
- endpoints of the range are not distinguishable from 0.
+logical \code{TRUE} if the relative difference of the endpoints of
+the range are not distinguishable from 0.
}
\description{
- The machine epsilon is the difference between 1.0 and the
- next number that can be represented by the machine. By
- default, this function uses epsilon * 100 as the
- tolerance. First it scales the values so that they have a
- mean of 1, and then it checks if the difference between
- them is larger than the tolerance.
+The machine epsilon is the difference between 1.0 and the next number
+that can be represented by the machine. By default, this function
+uses epsilon * 100 as the tolerance. First it scales the values so that
+they have a mean of 1, and then it checks if the difference between
+them is larger than the tolerance.
}
\examples{
eps <- .Machine$double.eps
diff --git a/tests/test-all.R b/tests/testthat.R
similarity index 61%
rename from tests/test-all.R
rename to tests/testthat.R
index 521d217..bc68830 100644
--- a/tests/test-all.R
+++ b/tests/testthat.R
@@ -1,4 +1,4 @@
library(testthat)
library(scales)
-test_package("scales")
\ No newline at end of file
+test_check("scales")
diff --git a/inst/tests/test-alpha.r b/tests/testthat/test-alpha.r
similarity index 100%
rename from inst/tests/test-alpha.r
rename to tests/testthat/test-alpha.r
diff --git a/inst/tests/test-bounds.r b/tests/testthat/test-bounds.r
similarity index 100%
rename from inst/tests/test-bounds.r
rename to tests/testthat/test-bounds.r
diff --git a/inst/tests/test-breaks-log.r b/tests/testthat/test-breaks-log.r
similarity index 100%
rename from inst/tests/test-breaks-log.r
rename to tests/testthat/test-breaks-log.r
diff --git a/inst/tests/test-formatter.r b/tests/testthat/test-formatter.r
similarity index 100%
rename from inst/tests/test-formatter.r
rename to tests/testthat/test-formatter.r
diff --git a/inst/tests/test-range.r b/tests/testthat/test-range.r
similarity index 100%
rename from inst/tests/test-range.r
rename to tests/testthat/test-range.r
diff --git a/inst/tests/test-scale.r b/tests/testthat/test-scale.r
similarity index 100%
rename from inst/tests/test-scale.r
rename to tests/testthat/test-scale.r
diff --git a/inst/tests/test-trans-date.r b/tests/testthat/test-trans-date.r
similarity index 100%
rename from inst/tests/test-trans-date.r
rename to tests/testthat/test-trans-date.r
diff --git a/inst/tests/test-trans.r b/tests/testthat/test-trans.r
similarity index 100%
rename from inst/tests/test-trans.r
rename to tests/testthat/test-trans.r
diff --git a/inst/tests/test-zero-range.r b/tests/testthat/test-zero-range.r
similarity index 100%
rename from inst/tests/test-zero-range.r
rename to tests/testthat/test-zero-range.r
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-cran-scales.git
More information about the debian-med-commit
mailing list