+ improve c++ style
+ formatting
add missing attribute collector for markers symbolizer path expression - closes #1952
Merge branch 'master' into skia-renderer
+ implement assignment operator in terms of a copy construction and a swap.
+ trying to fix text rendering ... sigh