Commit graph

61 commits

Author SHA1 Message Date
Hermann Kraus
25d00ad26f Merge commit '32760318a4905efa45bb459d891e5e7ec1a7bf2a' into harfbuzz
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/text/formatting/base.hpp
	include/mapnik/text/formatting/list.hpp
	include/mapnik/text/text_properties.hpp
	src/font_engine_freetype.cpp
	src/grid/process_shield_symbolizer.cpp
	src/symbolizer_helpers.cpp
	src/text/formatting/expression.cpp
	src/text/formatting/format.cpp
	src/text/formatting/list.cpp
	src/text/text_properties.cpp
2013-03-16 13:19:06 +01:00
Hermann Kraus
c4cdd89076 Merge commit 'b9b97ba6526aebbe920e0bd29b8dc8dc35267cfc' into harfbuzz
Conflicts:
	src/load_map.cpp
2013-03-16 12:31:56 +01:00
Dane Springmeyer
a7eaab9d07 add lexical cast and sstream notes to contributing docs 2013-01-03 18:58:37 -08:00
Dane Springmeyer
e954bb1587 add empty/size==0 to style guide 2012-09-26 12:29:22 -07:00
Hermann Kraus
85e075b8ea Merge branch 'master' into harfbuzz
Conflicts:
	bindings/python/mapnik_text_placement.cpp
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/map.hpp
	include/mapnik/metawriter.hpp
	include/mapnik/metawriter_inmem.hpp
	include/mapnik/metawriter_json.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/symbolizer.hpp
	include/mapnik/symbolizer_helpers.hpp
	include/mapnik/text_properties.hpp
	src/agg/process_shield_symbolizer.cpp
	src/build.py
	src/cairo_renderer.cpp
	src/feature_style_processor.cpp
	src/grid/process_shield_symbolizer.cpp
	src/metawriter.cpp
	src/metawriter_inmem.cpp
	src/placement_finder.cpp
	src/processed_text.cpp
	src/symbolizer_helpers.cpp
	tests/visual_tests/images/lines-shield-200-reference.png
	tests/visual_tests/images/lines-shield-400-reference.png
	tests/visual_tests/images/lines-shield-600-reference.png
	tests/visual_tests/images/lines-shield-800-reference.png
	tests/visual_tests/styles/formatting.xml
	tests/visual_tests/test.py
2012-09-07 19:07:31 +02:00
Dane Springmeyer
4ccf40038e add preferred assignment syntax for zero initialization 2012-08-13 11:27:02 -07:00
Hermann Kraus
dc9106d444 Update docs. 2012-07-07 17:41:31 +02:00
Hermann Kraus
3d2417ddef Add graph showing text_layout dependencies. 2012-07-06 21:41:20 +02:00
Dane Springmeyer
b9f2af6f87 fix typo 2012-03-05 15:48:04 -08:00
Dane Springmeyer
7a9c5ac0ed add note about generally passing built in types by value - for most compilers this should be faster 2012-03-05 11:48:34 -08:00
Dane Springmeyer
6462af3a02 add to c++ style docs note about const& convention 2012-03-05 11:09:34 -08:00
Hermann Kraus
a1d2211060 Update dependency graph. 2012-01-31 17:39:28 +01:00
Hermann Kraus
89ce699616 Update text rendering dependency graph. 2012-01-29 23:17:38 +01:00
Hermann Kraus
37ba77550c More documentation. 2012-01-25 18:46:27 +01:00
Hermann Kraus
469568862b Add documentation. 2012-01-24 23:42:54 +01:00
Dane Springmeyer
1d18a18639 add note to contributing guide about using pull requests for lite code review on big changes 2011-10-25 15:48:33 -07:00
Dane Springmeyer
19665b9bba add details about committing best practices 2011-10-25 15:42:53 -07:00
Dane Springmeyer
255ad2bdf0 add details for brace usage for one lineers to coding style recommendations 2011-10-25 15:15:09 -07:00
Dane Springmeyer
b343663aeb contributing touchups 2011-10-25 15:07:32 -07:00
Dane Springmeyer
e617e340c8 fix formatting of code guidelines 2011-10-12 16:03:04 -07:00
Dane Springmeyer
cd6a649a16 add note about boost::make_shared to coding conventions 2011-10-12 15:56:27 -07:00
Dane Springmeyer
55f572bacb add an initial draft of a contributors guide 2011-10-12 15:55:22 -07:00
Dane Springmeyer
52470c0f60 now that docs/ is wide-open, start out with a design manifesto 2011-10-12 15:14:42 -07:00
Dane Springmeyer
7616cd45db move epydoc stuff out of docs/ folder and into utils 2011-10-12 12:17:26 -07:00
Dane Springmeyer
ed23abf554 remove ogcserver docs - they are now at https://github.com/mapnik/OGCServer 2011-10-11 19:27:42 -07:00
Dane Springmeyer
1070b293ad tabs -> spaces 2011-05-04 15:53:36 +00:00
Dane Springmeyer
df254d09b2 fix spelling 2010-11-08 21:37:16 +00:00
Dane Springmeyer
8767c404c3 apply patch from Herm to update doc scripts to mapnik2, and fix imports for local ogcserver code 2010-05-08 17:07:03 +00:00
Artem Pavlenko
8ec5809a6e (merge 40f3f193337783f07b7691819581541985f5db0c into trunk)
+ remove *.html doc files
+ update epydoc generation script


Conflicts:

	docs/api_docs/python/api-objects.txt
	docs/api_docs/python/class-tree.html
	docs/api_docs/python/help.html
	docs/api_docs/python/identifier-index.html
	docs/api_docs/python/index.html
	docs/api_docs/python/mapnik-module.html
	docs/api_docs/python/mapnik.Coord-class.html
	docs/api_docs/python/mapnik.Envelope-class.html
	docs/api_docs/python/mapnik.Feature-class.html
	docs/api_docs/python/mapnik.Projection-class.html
	docs/api_docs/python/mapnik.Symbolizer-class.html
	docs/api_docs/python/mapnik._mapnik-module.html
	docs/api_docs/python/mapnik._mapnik.Color-class.html
	docs/api_docs/python/mapnik._mapnik.DatasourceCache-class.html
	docs/api_docs/python/mapnik._mapnik.Featureset-class.html
	docs/api_docs/python/mapnik._mapnik.FontEngine-class.html
	docs/api_docs/python/mapnik._mapnik.Geometry2d-class.html
	docs/api_docs/python/mapnik._mapnik.Image-class.html
	docs/api_docs/python/mapnik._mapnik.ImageView-class.html
	docs/api_docs/python/mapnik._mapnik.Layer-class.html
	docs/api_docs/python/mapnik._mapnik.Layers-class.html
	docs/api_docs/python/mapnik._mapnik.LinePatternSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.LineSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.Map-class.html
	docs/api_docs/python/mapnik._mapnik.Names-class.html
	docs/api_docs/python/mapnik._mapnik.Parameter-class.html
	docs/api_docs/python/mapnik._mapnik.Parameters-class.html
	docs/api_docs/python/mapnik._mapnik.PointDatasource-class.html
	docs/api_docs/python/mapnik._mapnik.PointSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.PolygonPatternSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.PolygonSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.ProjTransform-class.html
	docs/api_docs/python/mapnik._mapnik.Properties-class.html
	docs/api_docs/python/mapnik._mapnik.Query-class.html
	docs/api_docs/python/mapnik._mapnik.RasterSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.Rule-class.html
	docs/api_docs/python/mapnik._mapnik.Rules-class.html
	docs/api_docs/python/mapnik._mapnik.ShieldSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.Singleton-class.html
	docs/api_docs/python/mapnik._mapnik.Stroke-class.html
	docs/api_docs/python/mapnik._mapnik.Style-class.html
	docs/api_docs/python/mapnik._mapnik.Symbolizers-class.html
	docs/api_docs/python/mapnik._mapnik.TextSymbolizer-class.html
	docs/api_docs/python/mapnik._mapnik.ViewTransform-class.html
	docs/api_docs/python/mapnik._mapnik.aspect_fix_mode-class.html
	docs/api_docs/python/mapnik._mapnik.horizontal_alignment-class.html
	docs/api_docs/python/mapnik._mapnik.justify_alignment-class.html
	docs/api_docs/python/mapnik._mapnik.label_placement-class.html
	docs/api_docs/python/mapnik._mapnik.line_cap-class.html
	docs/api_docs/python/mapnik._mapnik.line_join-class.html
	docs/api_docs/python/mapnik._mapnik.text_convert-class.html
	docs/api_docs/python/mapnik._mapnik.vertical_alignment-class.html
	docs/api_docs/python/mapnik.ogcserver-module.html
	docs/api_docs/python/mapnik.ogcserver.WMS-module.html
	docs/api_docs/python/mapnik.ogcserver.WMS.BaseWMSFactory-class.html
	docs/api_docs/python/mapnik.ogcserver.cgiserver-module.html
	docs/api_docs/python/mapnik.ogcserver.cgiserver.Handler-class.html
	docs/api_docs/python/mapnik.ogcserver.common-module.html
	docs/api_docs/python/mapnik.ogcserver.common.BaseExceptionHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.common.BaseServiceHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.common.CRS-class.html
	docs/api_docs/python/mapnik.ogcserver.common.CRSFactory-class.html
	docs/api_docs/python/mapnik.ogcserver.common.ListFactory-class.html
	docs/api_docs/python/mapnik.ogcserver.common.ParameterDefinition-class.html
	docs/api_docs/python/mapnik.ogcserver.common.Projection-class.html
	docs/api_docs/python/mapnik.ogcserver.common.Response-class.html
	docs/api_docs/python/mapnik.ogcserver.common.TextFeatureInfo-class.html
	docs/api_docs/python/mapnik.ogcserver.common.Version-class.html
	docs/api_docs/python/mapnik.ogcserver.common.WMSBaseServiceHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.common.XMLFeatureInfo-class.html
	docs/api_docs/python/mapnik.ogcserver.configparser-module.html
	docs/api_docs/python/mapnik.ogcserver.configparser.SafeConfigParser-class.html
	docs/api_docs/python/mapnik.ogcserver.exceptions-module.html
	docs/api_docs/python/mapnik.ogcserver.exceptions.OGCException-class.html
	docs/api_docs/python/mapnik.ogcserver.exceptions.ServerConfigurationError-class.html
	docs/api_docs/python/mapnik.ogcserver.modserver-module.html
	docs/api_docs/python/mapnik.ogcserver.modserver.ModHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.wms111-module.html
	docs/api_docs/python/mapnik.ogcserver.wms111.ExceptionHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.wms111.ServiceHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.wms130-module.html
	docs/api_docs/python/mapnik.ogcserver.wms130.ExceptionHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.wms130.ServiceHandler-class.html
	docs/api_docs/python/mapnik.ogcserver.wsgi-module.html
	docs/api_docs/python/mapnik.ogcserver.wsgi.WSGIApp-class.html
	docs/api_docs/python/mapnik.paths-module.html
	docs/api_docs/python/module-tree.html
	docs/api_docs/python/redirect.html
2010-01-12 00:09:24 +00:00
Dane Springmeyer
abffe8ef60 update python api docs in trunk 2010-01-11 19:03:54 +00:00
Dane Springmeyer
782e0449e8 update python api docs and toch up formatting of __init__.py 2009-11-08 17:02:17 +00:00
Dane Springmeyer
a4245a9b4a clear out test_api folder when test python api docs are rebuilt 2009-09-27 17:46:18 +00:00
Dane Springmeyer
c1bebb79e4 add scripts to re-generate and test python api documentation 2009-09-25 03:55:04 +00:00
Dane Springmeyer
038739ef3e fix svn mime types and add missing api doc 2009-07-09 18:16:27 +00:00
Dane Springmeyer
19ce9bc442 update python api docs via epydoc 2009-07-08 22:33:16 +00:00
Dane Springmeyer
e59f8ec4f4 fix typos in OgcServer setup document 2009-06-29 00:11:14 +00:00
Dane Springmeyer
52166debe6 + update python api docs 2009-04-12 21:37:42 +00:00
Dane Springmeyer
af5a5b61ed formatting 2009-04-01 18:37:05 +00:00
Dane Springmeyer
03e7dc35ad missed this one 2009-04-01 01:17:32 +00:00
Dane Springmeyer
35d38f9b0d refresh python api docs 2009-04-01 00:47:05 +00:00
Dane Springmeyer
57a18dc6ca ogcserver: quick update of docs for 0.6.0 release - closes #266 2009-03-31 22:23:18 +00:00
Dane Springmeyer
13709f4ed9 removed non-usable doxygen files until proper api docs can be rebuilt 2009-03-30 06:14:39 +00:00
Dane Springmeyer
eb492f01e7 replaced 'epydocs' folder with 'api_docs/python' using revised api docstrings and custom css with epydoc 2009-03-30 05:20:00 +00:00
Dane Springmeyer
689cfa45d5 A start at updating the ogcserver docs, clarifying dependencies and adding more detail to installation section - TODO: add docs for load_map() 2009-03-28 01:51:59 +00:00
Dane Springmeyer
9e3ee460a1 Minor edits to ogcserver readme for reST format 2008-11-15 01:24:19 +00:00
Andreas Volz
59977745a0 - doxygen documentation files
- added first docs to map.hpp
2007-08-12 21:05:45 +00:00
Jean-Francois Doyon
560a875a88 - Edit ogcserver docs to mention GetFeatureInfo support. 2007-01-25 02:07:00 +00:00
Jean-Francois Doyon
85f1d27a12 - Add projection support to the WMS server and edit ogcserver readme accordingly.
NOTE: WMS 1.1.1 not tested, WMS 1.3.0 lightly tested.
2006-10-19 01:25:24 +00:00
Jean-Francois Doyon
9d9d441239 Added support for associating multiple named styles to a layer
and specifying one using the STYLES= WMS request argument.
2006-07-23 19:50:52 +00:00
Jean-Francois Doyon
1c8aca919f - Added support for complete service metadata
- refactored some code for optimization
- cusomtized the config parser
2006-07-22 18:54:53 +00:00