Merge branch 'master' into feature/summary-2D

Conflicts:
	NEWS

Author: kohske

DESCRIPTION

@@ -14,23 +14,27 @@ Description: An implementation of the grammar of graphics
     data to aesthetic attributes. See the ggplot2 website
     for more information, documentation and examples.
 Depends:
-    R (>= 2.14)
+    R (>= 2.14),
+    stats,
+    methods
 Imports:
     plyr (>= 1.0),
     digest,
     grid,
     reshape2,
     scales,
     memoise,
-    proto
+    proto,
+    MASS
 Suggests:
     quantreg,
     Hmisc,
     mapproj,
     maps,
     hexbin,
     gpclib,
-    maptools
+    maptools,
+    multcomp
 Extends:
     sp
 License: GPL-2
@@ -39,7 +43,6 @@ LazyData: true
 Collate:
     'aaa-.r'
     'aaa-constants.r'
-    'aaa-html.r'
     'aes-colour-fill-alpha.r'
     'aes-linetype-size-shape.r'
     'aes.r'
@@ -99,6 +102,7 @@ Collate:
     'geom-smooth.r'
     'geom-text.r'
     'geom-tile.r'
+    'geom-violin.r'
     'geom-vline.r'
     'ggplot2.r'
     'grob-absolute.r'
@@ -167,14 +171,13 @@ Collate:
     'stat-summary.r'
     'stat-unique.r'
     'stat-vline.r'
+    'stat-ydensity.r'
     'summary.r'
     'templates.r'
     'theme-defaults.r'
     'theme-elements.r'
     'theme.r'
     'utilities-break.r'
-    'utilities-discrete.r'
-    'utilities-facet.r'
     'utilities-grid.r'
     'utilities-layer.r'
     'utilities-matrix.r'
@@ -188,3 +191,6 @@ Collate:
     'geom-raster.r'
     'annotation-raster.r'
     'annotation-map.r'
+    'autoplot.r'
+    'zzz.r'
+    'fortify-multcomp.r'

NAMESPACE

@@ -5,7 +5,9 @@ export(aes)
 export(annotate)
 export(annotation_map)
 export(annotation_raster)
+export(autoplot)
 export(benchplot)
+export(borders)
 export(continuous_scale)
 export(coord_cartesian)
 export(coord_equal)
@@ -58,6 +60,7 @@ export(geom_smooth)
 export(geom_step)
 export(geom_text)
 export(geom_tile)
+export(geom_violin)
 export(geom_vline)
 export(ggfluctuation)
 export(ggmissing)
@@ -69,6 +72,7 @@ export(ggplot)
 export(ggsave)
 export(ggstructure)
 export(guide_colorbar)
+export(guide_colourbar)
 export(guide_legend)
 export(guides)
 export(is.coord)
@@ -79,6 +83,7 @@ export(label_parsed)
 export(label_value)
 export(labs)
 export(last_plot)
+export(layer)
 export(map_data)
 export(mean_cl_boot)
 export(mean_cl_normal)
@@ -104,6 +109,8 @@ export(scale_color_brewer)
 export(scale_color_continuous)
 export(scale_color_discrete)
 export(scale_color_gradient)
+export(scale_color_gradient2)
+export(scale_color_gradientn)
 export(scale_color_grey)
 export(scale_color_hue)
 export(scale_color_identity)
@@ -179,6 +186,7 @@ export(stat_summary)
 export(stat_summary2d)
 export(stat_unique)
 export(stat_vline)
+export(stat_ydensity)
 export(theme_blank)
 export(theme_bw)
 export(theme_get)
@@ -191,7 +199,10 @@ export(theme_set)
 export(theme_text)
 export(theme_update)
 export(update_element)
+export(update_geom_defaults)
 export(update_labels)
+export(update_stat_defaults)
+export(waiver)
 export(xlab)
 export(xlim)
 export(ylab)
@@ -203,17 +214,21 @@ import(plyr)
 import(proto)
 import(reshape2)
 import(scales)
+importFrom(MASS,kde2d)
 S3method("[",uneval)
 S3method("+",ggplot)
 S3method(as.character,uneval)
+S3method(autoplot,default)
 S3method(cbind,gtable)
+S3method(coord_aspect,default)
 S3method(coord_aspect,fixed)
 S3method(coord_aspect,map)
 S3method(coord_aspect,polar)
 S3method(coord_distance,cartesian)
 S3method(coord_distance,map)
 S3method(coord_distance,polar)
 S3method(coord_distance,trans)
+S3method(coord_labels,default)
 S3method(coord_labels,flip)
 S3method(coord_render_axis_h,default)
 S3method(coord_render_axis_h,map)
@@ -224,6 +239,7 @@ S3method(coord_render_axis_v,polar)
 S3method(coord_render_bg,default)
 S3method(coord_render_bg,map)
 S3method(coord_render_bg,polar)
+S3method(coord_render_fg,default)
 S3method(coord_render_fg,polar)
 S3method(coord_train,cartesian)
 S3method(coord_train,flip)
@@ -239,18 +255,32 @@ S3method(cweave,list)
 S3method(cweave,matrix)
 S3method(dim,gtable)
 S3method(drawDetails,zeroGrob)
+S3method(facet_axes,grid)
+S3method(facet_axes,wrap)
 S3method(facet_map_layout,grid)
 S3method(facet_map_layout,null)
 S3method(facet_map_layout,wrap)
+S3method(facet_panels,grid)
+S3method(facet_panels,wrap)
 S3method(facet_render,grid)
 S3method(facet_render,null)
 S3method(facet_render,wrap)
+S3method(facet_strips,grid)
+S3method(facet_strips,wrap)
 S3method(facet_train_layout,grid)
 S3method(facet_train_layout,null)
 S3method(facet_train_layout,wrap)
+S3method(facet_vars,grid)
+S3method(facet_vars,null)
+S3method(facet_vars,wrap)
+S3method(finite.cases,data.frame)
+S3method(format,facet)
 S3method(fortify,"NULL")
+S3method(fortify,cld)
+S3method(fortify,confint.glht)
 S3method(fortify,data.frame)
 S3method(fortify,default)
+S3method(fortify,glht)
 S3method(fortify,Line)
 S3method(fortify,Lines)
 S3method(fortify,lm)
@@ -259,6 +289,8 @@ S3method(fortify,Polygon)
 S3method(fortify,Polygons)
 S3method(fortify,SpatialLinesDataFrame)
 S3method(fortify,SpatialPolygons)
+S3method(fortify,SpatialPolygonsDataFrame)
+S3method(fortify,summary.glht)
 S3method(ggplot,data.frame)
 S3method(ggplot,default)
 S3method(grid.draw,absoluteGrob)
@@ -289,6 +321,11 @@ S3method(limits,factor)
 S3method(limits,numeric)
 S3method(limits,POSIXct)
 S3method(limits,POSIXlt)
+S3method(predictdf,default)
+S3method(predictdf,glm)
+S3method(predictdf,locfit)
+S3method(predictdf,loess)
+S3method(print,facet)
 S3method(print,ggplot)
 S3method(print,gtable)
 S3method(print,proto)
@@ -304,13 +341,17 @@ S3method(scale_breaks,continuous)
 S3method(scale_breaks,discrete)
 S3method(scale_clone,continuous)
 S3method(scale_clone,discrete)
+S3method(scale_clone,position_d)
 S3method(scale_dimension,continuous)
 S3method(scale_dimension,discrete)
 S3method(scale_dimension,position_d)
 S3method(scale_labels,continuous)
 S3method(scale_labels,discrete)
+S3method(scale_limits,default)
 S3method(scale_limits,position_d)
 S3method(scale_map,continuous)
+S3method(scale_map,date)
+S3method(scale_map,datetime)
 S3method(scale_map,discrete)
 S3method(scale_map,identity)
 S3method(scale_map,position_c)