artemp
|
04755f1a9b
|
Merge branch 'master' into spirit-x3
|
2016-02-15 16:24:25 +01:00 |
|
artemp
|
349b7e6786
|
Merge branch 'master' into spirit-x3
|
2016-02-15 16:11:18 +01:00 |
|
Mickey Rose
|
5d1fd56cef
|
csv_grammar: make csv_white_space_skipper a primitive_parser
|
2016-02-15 15:17:26 +01:00 |
|
Mickey Rose
|
ccf579f450
|
csv_grammar: simplify csv_line_grammar
|
2016-02-15 15:15:51 +01:00 |
|
artemp
|
ff54a14e34
|
update deps
|
2016-02-15 13:57:54 +01:00 |
|
artemp
|
ca0c0e5888
|
csv_util - combine auto-decting separator/quote/newline into one method std::tuple<char, bool, char, char> autodect_csv_flavour(T & stream, std::size_t file_length)
|
2016-02-15 13:55:06 +01:00 |
|
artemp
|
a9e1388b3b
|
csv_grammar - always requre matching closing quoting character
|
2016-02-15 12:02:45 +01:00 |
|
artemp
|
5994eb463a
|
Merge branch 'master' into spirit-x3
|
2016-02-15 09:56:50 +01:00 |
|
lightmare
|
f4bb28b2c1
|
Merge pull request #3292 from lightmare/to-string
to_expression_string should re-escape backslashes and quotes
|
2016-02-15 04:10:36 +01:00 |
|
Mickey Rose
|
2d88fec458
|
to_expression_string: fix backslash-escapes in strings
|
2016-02-15 02:45:29 +01:00 |
|
Mickey Rose
|
f19b8e8eff
|
test/expressions: add checks for backslash-escapes in strings
|
2016-02-15 02:23:19 +01:00 |
|
artemp
|
c60f9d1b63
|
Revert "json - split/refactor geojson grammars more" as it's not helping with improving compilation times, rather opposite.
This reverts commit 8102827215.
|
2016-02-12 10:37:22 +01:00 |
|
artemp
|
c07f23dc7c
|
Revert "add missing *.cpp"
This reverts commit cca2a33acd.
|
2016-02-12 10:20:24 +01:00 |
|
artemp
|
bd6445cedc
|
update deps - variant
|
2016-02-11 16:27:19 +01:00 |
|
artemp
|
bfb93c7222
|
Merge branch 'lightmare-trim-filter-grammar'
|
2016-02-11 15:43:28 +01:00 |
|
artemp
|
edc2e75474
|
Merge branch 'trim-filter-grammar' of https://github.com/lightmare/mapnik into lightmare-trim-filter-grammar
|
2016-02-11 15:43:18 +01:00 |
|
artemp
|
f2c4ec86ea
|
Merge branch 'master' into spirit-x3
|
2016-02-11 10:19:01 +01:00 |
|
artemp
|
fa6376d9a1
|
update variant submodule
|
2016-02-11 10:18:16 +01:00 |
|
artemp
|
d5c0cfc9e8
|
update variant submodule
|
2016-02-11 10:14:42 +01:00 |
|
Dane Springmeyer
|
10bd37ddd7
|
avoid unneccesary dependence on << operator of mapnik::enumeration
|
2016-02-09 10:09:12 -08:00 |
|
Dane Springmeyer
|
8ecb42894f
|
restore << operator for mapnik::enumeration + add unit test
|
2016-02-09 10:08:29 -08:00 |
|
Dane Springmeyer
|
6c1b6e301d
|
gradient does not need to be a fancy enumeration
|
2016-02-09 09:56:57 -08:00 |
|
artemp
|
668f708308
|
Merge branch 'master' into spirit-x3
|
2016-02-09 16:28:27 +01:00 |
|
Blake Thompson
|
1d981e899b
|
Merge pull request #3289 from lightmare/lts
bootstrap: relieve leaning toothpick syndrome
|
2016-02-09 09:26:26 -06:00 |
|
artemp
|
561fadd4ff
|
expression grammar - sync with master (https://github.com/mapnik/mapnik/pull/3287)
|
2016-02-09 16:24:37 +01:00 |
|
artemp
|
7811b779a0
|
Merge branch 'master' into spirit-x3
|
2016-02-09 16:02:35 +01:00 |
|
Mickey Rose
|
dea4a73927
|
bootstrap: relieve leaning toothpick syndrome
|
2016-02-09 15:06:09 +01:00 |
|
artemp
|
87c3032e63
|
Merge branch 'lightmare-expr-no-barewords'
|
2016-02-09 14:15:35 +01:00 |
|
artemp
|
f0cc65958f
|
Merge branch 'expr-no-barewords' of https://github.com/lightmare/mapnik into lightmare-expr-no-barewords
|
2016-02-09 14:15:22 +01:00 |
|
artemp
|
5aaf82b1b5
|
fix naming clash (color_blind_filter)
|
2016-02-09 13:44:34 +01:00 |
|
artemp
|
cca2a33acd
|
add missing *.cpp
|
2016-02-09 13:22:56 +01:00 |
|
artemp
|
8102827215
|
json - split/refactor geojson grammars more
|
2016-02-09 13:21:20 +01:00 |
|
artemp
|
6f33b8a5f1
|
Merge branch 'master' into spirit-x3
|
2016-02-09 11:45:37 +01:00 |
|
artemp
|
c53b4cdeda
|
update test data ref #3288
|
2016-02-09 11:44:55 +01:00 |
|
Mickey Rose
|
15f841213a
|
expression_grammar: restrict unquoted strings to single-atom expressions
- fixes #3017
- closes #3214
|
2016-02-08 17:15:13 +01:00 |
|
artemp
|
33bf3a009d
|
Merge branch 'master' into spirit-x3
|
2016-02-08 15:51:31 +01:00 |
|
artemp
|
2b725dd257
|
shapeindex - skip 'null' shapes (ref #3288)
|
2016-02-08 15:51:13 +01:00 |
|
artemp
|
1c1817ddc1
|
shapeindex - skip 'null' shapes (ref #3288)
|
2016-02-08 15:45:03 +01:00 |
|
bergwerkgis
|
9e7b67e35d
|
Merge branch 'master' of https://github.com/mapnik/mapnik
|
2016-02-08 13:55:25 +00:00 |
|
bergwerkgis
|
643391ba20
|
Windows: props file to override solution settings for /MP
|
2016-02-08 13:55:08 +00:00 |
|
artemp
|
2a3248cfaa
|
image_filters_grammar_x3 - initial port to x3 + remove unused grammars (css_color_grammar,image_filter_grammar)
|
2016-02-08 12:49:13 +01:00 |
|
artemp
|
b84eb8f2b0
|
Merge branch 'master' into spirit-x3
|
2016-02-08 08:53:25 +01:00 |
|
Mickey Rose
|
8da250a0ee
|
show build status badges for master (svg)
- Travis badge URL was .png
- AppVeyor badge used latest build (any branch)
- [skip ci]
|
2016-02-07 14:22:44 +01:00 |
|
Mickey Rose
|
ed8c8df738
|
expression_grammar: use one symbol table for all constants
|
2016-02-06 18:40:33 +01:00 |
|
Mickey Rose
|
ae39d48b86
|
test/expressions: add checks for logical operator precedence
|
2016-02-06 14:26:57 +01:00 |
|
Mickey Rose
|
959d4ded23
|
image_filter_grammar: rewrite using Nabialek trick
|
2016-02-06 02:03:55 +01:00 |
|
Mickey Rose
|
401dfacfc5
|
test/image_filter: prevent SIGSEGV when parsing fails
|
2016-02-06 01:56:05 +01:00 |
|
lightmare
|
b24f520439
|
Merge pull request #3239 from lightmare/expr-test
condense expressions tests
|
2016-02-06 00:37:05 +01:00 |
|
Mickey Rose
|
5764d619f3
|
expressions test: move expression strings into Catch calls, continue on failure
|
2016-02-05 17:22:01 +01:00 |
|
Mickey Rose
|
53bb55eade
|
rename expresssions_test.cpp, didn't pass spell check
|
2016-02-05 17:22:01 +01:00 |
|