[Pkg-javascript-commits] [node-carto] 11/18: Merge tag 'upstream/0.9.5'
Jérémy Lal
kapouer at alioth.debian.org
Fri Oct 25 22:59:51 UTC 2013
This is an automated email from the git hooks/post-receive script.
kapouer pushed a commit to branch master
in repository node-carto.
commit c911888b2c9756b3624ecb962000cf127755af8f
Merge: 09f2d0f bb9dcd7
Author: Jérémy Lal <kapouer at melix.org>
Date: Sat Oct 26 00:12:09 2013 +0200
Merge tag 'upstream/0.9.5'
Upstream version 0.9.5
# gpg: Signature faite le sam. 26 oct. 2013 00:12:06 CEST avec la clef RSA d'identifiant DD39F374
# gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
# gpg: alias « Jérémy Lal <jerry at edagames.com> »
.gitignore | 5 +
.travis.yml | 7 +
CHANGELOG.md | 108 +
DEVELOPING.md | 34 +
Makefile | 10 +-
README.md | 114 +-
bin/carto | 203 +-
bin/mml2json.js | 22 +-
build/carto.tmbundle/Commands/preview.tmCommand | 40 +
build/carto.tmbundle/Syntaxes/carto.tmLanguage | 351 ++
build/carto.tmbundle/Syntaxes/mml.tmLanguage | 287 ++
build/carto.tmbundle/info.plist | 15 +
build/syntaxgenerate | 47 +
build/tmlanguage_template.js | 133 +
build/vim-carto/ftdetect/carto.vim | 1 +
build/vim-carto/syntax/carto.vim | 160 +
build/vimsyntax_template.js | 160 +
lib/carto/functions.js | 79 +-
lib/carto/index.js | 37 +-
lib/carto/parser.js | 627 +--
lib/carto/renderer.js | 275 +-
lib/carto/tree/alpha.js | 14 -
lib/carto/tree/anonymous.js | 13 -
lib/carto/tree/call.js | 86 +-
lib/carto/tree/color.js | 29 +-
lib/carto/tree/comment.js | 3 +-
lib/carto/tree/definition.js | 127 +-
lib/carto/tree/dimension.js | 80 +-
lib/carto/tree/directive.js | 33 -
lib/carto/tree/element.js | 31 +-
lib/carto/tree/expression.js | 13 +-
lib/carto/tree/field.js | 17 +
lib/carto/tree/filter.js | 72 +-
lib/carto/tree/filterset.js | 421 +-
lib/carto/tree/fontset.js | 37 +-
lib/carto/tree/imagefilter.js | 22 +
lib/carto/tree/import.js | 77 -
lib/carto/tree/invalid.js | 4 +-
lib/carto/tree/javascript.js | 38 -
lib/carto/tree/keyword.js | 4 +-
lib/carto/tree/layer.js | 35 +-
lib/carto/tree/literal.js | 20 +
lib/carto/tree/mixin.js | 99 -
lib/carto/tree/operation.js | 55 +-
lib/carto/tree/quoted.js | 22 +-
lib/carto/tree/reference.js | 257 +-
lib/carto/tree/reference.json | 1002 ----
lib/carto/tree/rule.js | 87 +-
lib/carto/tree/ruleset.js | 95 +-
lib/carto/tree/selector.js | 14 +-
lib/carto/tree/style.js | 61 +-
lib/carto/tree/url.js | 21 +-
lib/carto/tree/value.js | 15 +-
lib/carto/tree/variable.js | 16 +-
lib/carto/tree/zoom.js | 61 +-
man/carto.1 | 24 +
package.json | 26 +-
test/benchmark/opened.mml | 15 +
test/benchmark/opened.mss | 2392 +++++++++
test/benchmark/opened.result | 2014 ++++++++
test/errorhandling.test.js | 94 +
test/errorhandling/color_functions.mml | 15 +
test/errorhandling/color_functions.mss | 4 +
test/errorhandling/color_functions.result | 1 +
test/errorhandling/contradiction.mml | 15 +
test/errorhandling/contradiction.mss | 3 +
test/errorhandling/contradiction.result | 1 +
test/errorhandling/contradiction_2.mss | 3 +
test/errorhandling/contradiction_2.result | 1 +
test/errorhandling/function_args.mml | 15 +
test/errorhandling/function_args.mss | 4 +
test/errorhandling/function_args.result | 1 +
test/errorhandling/invalid_color_in_fn.mss | 3 +
test/errorhandling/invalid_color_in_fn.result | 1 +
test/errorhandling/invalid_property.mml | 15 +
test/errorhandling/invalid_property.mss | 4 +
test/errorhandling/invalid_property.result | 1 +
test/errorhandling/invalid_value.mml | 15 +
test/errorhandling/invalid_value.mss | 5 +
test/errorhandling/invalid_value.result | 2 +
test/errorhandling/issue119.mml | 14 +
test/errorhandling/issue119.mss | 3 +
test/errorhandling/issue123.mml | 14 +
test/errorhandling/issue123.mss | 8 +
test/errorhandling/issue123.result | 1 +
test/errorhandling/issue124.mml | 14 +
test/errorhandling/issue124.mss | 5 +
test/errorhandling/issue297.mml | 8 +
test/errorhandling/issue297.mss | 4 +
test/errorhandling/issue297.result | 1 +
test/errorhandling/issue_204_a.mss | 3 +
test/errorhandling/issue_204_b.mss | 3 +
test/errorhandling/issue_204_c.mss | 3 +
test/errorhandling/issue_218.mss | 5 +
test/errorhandling/mapnik_keyword.mml | 14 +
test/errorhandling/mapnik_keyword.mss | 3 +
test/errorhandling/mapnik_keyword.result | 1 +
test/errorhandling/missing_close.mml | 14 +
test/errorhandling/missing_close.mss | 4 +
test/errorhandling/missing_close.result | 1 +
test/errorhandling/multi_stylesheets.mml | 16 +
test/errorhandling/multi_stylesheets_a.mss | 6 +
test/errorhandling/multi_stylesheets_b.mss | 3 +
test/errorhandling/nopound.mml | 15 +
test/errorhandling/nopound.mss | 8 +
test/errorhandling/notenoughargs.mml | 15 +
test/errorhandling/notenoughargs.mss | 8 +
test/errorhandling/undefined_variable.mml | 15 +
test/errorhandling/undefined_variable.mss | 5 +
test/errorhandling/undefined_variable.result | 3 +
test/errorhandling/zoom_as_var.mml | 15 +
test/errorhandling/zoom_as_var.mss | 3 +
test/errorhandling/zoom_as_var.result | 1 +
test/errorhandling/zoommax.mml | 15 +
test/errorhandling/zoommax.mss | 3 +
test/errorhandling/zoommax.result | 1 +
test/field.test.js | 18 +
test/filter.test.js | 24 +
test/filterset.test.js | 280 ++
test/operation.test.js | 45 +
test/quoted.test.js | 23 +
test/rendering-mss.test.js | 45 +
test/rendering-mss/basic_attachment_internal.mss | 9 +
test/rendering-mss/basic_attachment_internal.xml | 10 +
.../basic_attachment_internal_before.mss | 9 +
.../basic_attachment_internal_before.xml | 10 +
.../basic_attachment_internal_before_and_after.mss | 12 +
.../basic_attachment_internal_before_and_after.xml | 15 +
.../basic_attachment_internal_double.mss | 10 +
.../basic_attachment_internal_double.xml | 11 +
.../basic_attachment_internal_with_label.mss | 11 +
.../basic_attachment_internal_with_label.xml | 10 +
test/rendering-mss/basic_attachment_separate.mss | 9 +
test/rendering-mss/basic_attachment_separate.xml | 10 +
.../basic_attachment_separate_before.mss | 9 +
.../basic_attachment_separate_before.xml | 10 +
.../basic_attachment_separate_before_and_after.mss | 12 +
.../basic_attachment_separate_before_and_after.xml | 15 +
.../basic_attachment_separate_double.mss | 8 +
.../basic_attachment_separate_double.xml | 10 +
.../basic_attachment_separate_with_label.mss | 11 +
.../basic_attachment_separate_with_label.xml | 10 +
test/rendering-mss/empty_name.mss | 6 +
test/rendering-mss/empty_name.xml | 5 +
test/rendering-mss/image-filters.mss | 4 +
test/rendering-mss/image-filters.xml | 2 +
test/rendering-mss/issue_197.mss | 5 +
test/rendering-mss/issue_197.xml | 11 +
test/rendering-mss/issue_247_1.mss | 12 +
test/rendering-mss/issue_247_1.xml | 11 +
test/rendering-mss/issue_247_2.mss | 12 +
test/rendering-mss/issue_247_2.xml | 15 +
test/rendering-mss/issue_284.mss | 17 +
test/rendering-mss/issue_284.xml | 28 +
test/rendering-mss/issue_284_b.mss | 18 +
test/rendering-mss/issue_284_b.xml | 28 +
test/rendering-mss/issue_284_c.mss | 18 +
test/rendering-mss/issue_284_c.xml | 14 +
test/rendering-mss/quoted_attr.mss | 3 +
test/rendering-mss/quoted_attr.xml | 6 +
test/rendering-mss/scale-hsla-filter.mss | 5 +
test/rendering-mss/scale-hsla-filter.xml | 5 +
.../should-discard-empty-style-and-attach.mss | 4 +
.../should-discard-empty-style-and-attach.xml | 1 +
test/rendering-mss/should-discard-empty-style.mss | 2 +
test/rendering-mss/should-discard-empty-style2.mss | 8 +
test/rendering-mss/should-discard-empty-style2.xml | 2 +
test/rendering-mss/style-level-prop-only.mss | 3 +
test/rendering-mss/style-level-prop-only.xml | 2 +
test/rendering-mss/style-level-prop-only2.mss | 3 +
test/rendering-mss/style-level-prop-only2.xml | 2 +
test/rendering-mss/style-level-prop-only3.mss | 3 +
test/rendering-mss/style-level-prop-only3.xml | 2 +
test/rendering-mss/zoom-like-field-name.mss | 3 +
test/rendering-mss/zoom_space.mss | 3 +
test/rendering-mss/zoom_space.xml | 6 +
test/rendering.test.js | 71 +
test/rendering/afghanistan_votes.mml | 15 +
test/rendering/afghanistan_votes.mss | 75 +
test/rendering/afghanistan_votes.result | 41 +
test/rendering/background_attributes.mml | 7 +
test/rendering/background_attributes.mss | 3 +
test/rendering/background_attributes.result | 7 +
test/rendering/buffersize.mml | 14 +
test/rendering/buffersize.mss | 10 +
test/rendering/buffersize.result | 23 +
test/rendering/building_height.mml | 14 +
test/rendering/building_height.mss | 4 +
test/rendering/building_height.result | 20 +
test/rendering/color_variable.mml | 14 +
test/rendering/color_variable.mss | 4 +
test/rendering/color_variable.result | 21 +
test/rendering/combined_class.mml | 27 +
test/rendering/combined_class.mss | 11 +
test/rendering/combined_class.result | 36 +
test/rendering/complex_cascades.mml | 23 +
test/rendering/complex_cascades.mss | 31 +
test/rendering/complex_cascades.result | 71 +
test/rendering/complexfontset.mml | 23 +
test/rendering/complexfontset.mss | 11 +
test/rendering/complexfontset.result | 37 +
test/rendering/cross_stylesheet_variable.mml | 15 +
test/rendering/cross_stylesheet_variable.result | 21 +
test/rendering/cross_stylesheet_variable_a.mss | 1 +
test/rendering/cross_stylesheet_variable_b.mss | 3 +
test/rendering/data_only.mml | 12 +
test/rendering/data_only.result | 14 +
test/rendering/empty_style.mml | 14 +
test/rendering/empty_style.mss | 8 +
test/rendering/empty_style.result | 26 +
test/rendering/empty_url.mml | 14 +
test/rendering/empty_url.mss | 3 +
test/rendering/empty_url.result | 20 +
test/rendering/external_image.mml | 14 +
test/rendering/external_image.mss | 3 +
test/rendering/external_image.result | 21 +
test/rendering/fadeout.mml | 14 +
test/rendering/fadeout.mss | 3 +
test/rendering/fadeout.result | 20 +
test/rendering/field.mml | 14 +
test/rendering/field.mss | 6 +
test/rendering/field.result | 23 +
test/rendering/field_advanced.mml | 14 +
test/rendering/field_advanced.mss | 6 +
test/rendering/field_advanced.result | 23 +
test/rendering/filter_comparing_fields.mml | 15 +
test/rendering/filter_comparing_fields.mss | 23 +
test/rendering/filter_comparing_fields.result | 32 +
test/rendering/filterquote.mml | 15 +
test/rendering/filterquote.mss | 3 +
test/rendering/filterquote.result | 21 +
test/rendering/filters.mml | 14 +
test/rendering/filters.mss | 5 +
test/rendering/filters.result | 22 +
test/rendering/filtervariable.mml | 15 +
test/rendering/filtervariable.mss | 9 +
test/rendering/filtervariable.result | 26 +
test/rendering/fontset-duplication.mml | 30 +
test/rendering/fontset-duplication.mss | 141 +
test/rendering/fontset-duplication.result | 5228 ++++++++++++++++++++
test/rendering/gray_function.mml | 14 +
test/rendering/gray_function.mss | 3 +
test/rendering/gray_function.result | 20 +
test/rendering/highzooms.mml | 14 +
test/rendering/highzooms.mss | 9 +
test/rendering/highzooms.result | 51 +
test/rendering/identity.mml | 14 +
test/rendering/identity.mss | 5 +
test/rendering/identity.result | 21 +
test/rendering/image_filters.mml | 14 +
test/rendering/image_filters.mss | 8 +
test/rendering/image_filters.result | 21 +
test/rendering/imagefilter-duplication.mml | 15 +
test/rendering/imagefilter-duplication.mss | 5 +
test/rendering/imagefilter-duplication.result | 27 +
test/rendering/instance_names.mml | 14 +
test/rendering/instance_names.mss | 15 +
test/rendering/instance_names.result | 38 +
test/rendering/issue294.mml | 11 +
test/rendering/issue294.result | 15 +
test/rendering/issue32.mml | 15 +
test/rendering/issue32.mss | 4 +
test/rendering/issue32.result | 26 +
test/rendering/issue32a.mss | 8 +
test/rendering/issue60.mml | 14 +
test/rendering/issue60.mss | 6 +
test/rendering/issue60.result | 40 +
test/rendering/issue_100_filters.mml | 14 +
test/rendering/issue_100_filters.mss | 16 +
test/rendering/issue_100_filters.result | 56 +
test/rendering/issue_239.mml | 38 +
test/rendering/issue_239.result | 36 +
test/rendering/issue_239_a.mss | 7 +
test/rendering/issue_239_b.mss | 5 +
test/rendering/layer_nodatasource.mml | 10 +
test/rendering/layer_nodatasource.mss | 4 +
test/rendering/layer_nodatasource.result | 17 +
test/rendering/layer_properties.mml | 17 +
test/rendering/layer_properties.mss | 4 +
test/rendering/layer_properties.result | 22 +
test/rendering/mapnik_keyword.mml | 14 +
test/rendering/mapnik_keyword.mss | 3 +
test/rendering/mapnik_keyword.result | 21 +
test/rendering/modulus.mml | 14 +
test/rendering/modulus.mss | 6 +
test/rendering/modulus.result | 23 +
test/rendering/multiple_symbolizers.mml | 14 +
test/rendering/multiple_symbolizers.mss | 5 +
test/rendering/multiple_symbolizers.result | 23 +
test/rendering/nesting_class.mml | 27 +
test/rendering/nesting_class.mss | 10 +
test/rendering/nesting_class.result | 36 +
test/rendering/nominzoom.mml | 14 +
test/rendering/nominzoom.mss | 3 +
test/rendering/nominzoom.result | 21 +
test/rendering/noquote_font.mml | 14 +
test/rendering/noquote_font.mss | 4 +
test/rendering/noquote_font.result | 20 +
test/rendering/parameters.mml | 24 +
test/rendering/parameters.result | 23 +
test/rendering/partial_overrides.mml | 16 +
test/rendering/partial_overrides.mss | 35 +
test/rendering/partial_overrides.result | 106 +
test/rendering/raster-mesh-size.mml | 14 +
test/rendering/raster-mesh-size.mss | 4 +
test/rendering/raster-mesh-size.result | 21 +
test/rendering/raster.mml | 14 +
test/rendering/raster.mss | 4 +
test/rendering/raster.result | 21 +
test/rendering/raster_colorizer.mml | 14 +
test/rendering/raster_colorizer.mss | 12 +
test/rendering/raster_colorizer.result | 25 +
test/rendering/raster_colorizer_comma.mml | 14 +
test/rendering/raster_colorizer_comma.mss | 8 +
test/rendering/raster_colorizer_comma.result | 25 +
test/rendering/raster_colorizer_onestop.mml | 14 +
test/rendering/raster_colorizer_onestop.mss | 7 +
test/rendering/raster_colorizer_onestop.result | 21 +
test/rendering/rastercolorizer.mml | 14 +
test/rendering/rastercolorizer.mss | 10 +
test/rendering/rastercolorizer.result | 23 +
test/rendering/regex.mml | 14 +
test/rendering/regex.mss | 5 +
test/rendering/regex.result | 22 +
test/rendering/regex_nest.mml | 14 +
test/rendering/regex_nest.mss | 6 +
test/rendering/regex_nest.result | 21 +
test/rendering/selector_comment.mml | 21 +
test/rendering/selector_comment.mss | 6 +
test/rendering/selector_comment.result | 34 +
test/rendering/sharedclass.mml | 31 +
test/rendering/sharedclass.mss | 11 +
test/rendering/sharedclass.result | 36 +
test/rendering/simplefontset.mml | 15 +
test/rendering/simplefontset.mss | 5 +
test/rendering/simplefontset.result | 25 +
test/rendering/simplevariabletest.mml | 15 +
test/rendering/simplevariabletest.mss | 5 +
test/rendering/simplevariabletest.result | 21 +
test/rendering/style_level_opacity.mml | 14 +
test/rendering/style_level_opacity.mss | 6 +
test/rendering/style_level_opacity.result | 23 +
test/rendering/support4504.mml | 15 +
test/rendering/support4504.mss | 7 +
test/rendering/support4504.result | 21 +
test/rendering/symbolizer_order.mml | 14 +
test/rendering/symbolizer_order.mss | 4 +
test/rendering/symbolizer_order.result | 22 +
test/rendering/text_property_overrides.mml | 15 +
test/rendering/text_property_overrides.mss | 9 +
test/rendering/text_property_overrides.result | 40 +
test/rendering/transforms.mml | 14 +
test/rendering/transforms.mss | 5 +
test/rendering/transforms.result | 20 +
test/rendering/transforms_backwards.mml | 14 +
test/rendering/transforms_backwards.mss | 4 +
test/rendering/transforms_backwards.result | 20 +
test/rendering/transforms_field.mml | 14 +
test/rendering/transforms_field.mss | 4 +
test/rendering/transforms_field.result | 20 +
test/rendering/transforms_single.mml | 14 +
test/rendering/transforms_single.mss | 3 +
test/rendering/transforms_single.result | 20 +
test/rendering/units.mml | 14 +
test/rendering/units.mss | 6 +
test/rendering/units.result | 22 +
test/rendering/unsigned.mml | 14 +
test/rendering/unsigned.mss | 8 +
test/rendering/unsigned.result | 20 +
test/rendering/var_concat.mml | 14 +
test/rendering/var_concat.mss | 6 +
test/rendering/var_concat.result | 20 +
test/rendering/weird_comments.mml | 14 +
test/rendering/weird_comments.mss | 12 +
test/rendering/weird_comments.result | 19 +
test/rendering/weird_comments_2.mml | 14 +
test/rendering/weird_comments_2.mss | 7 +
test/rendering/weird_comments_2.result | 25 +
test/rendering/weird_simple_comments.mml | 14 +
test/rendering/weird_simple_comments.mss | 1 +
test/rendering/weird_simple_comments.result | 23 +
test/rendering/zoomlevels.mml | 23 +
test/rendering/zoomlevels.mss | 26 +
test/rendering/zoomlevels.result | 103 +
test/rendering/zoomselector.mml | 16 +
test/rendering/zoomselector.mss | 6 +
test/rendering/zoomselector.result | 32 +
test/specificity.test.js | 55 +
test/specificity/classes.mss | 7 +
test/specificity/classes.result | 9 +
test/specificity/demo.mss | 24 +
test/specificity/demo.result | 10 +
test/specificity/filters_and_ids.mss | 7 +
test/specificity/filters_and_ids.result | 8 +
test/specificity/issue60.mml | 14 +
test/specificity/issue60.mss | 6 +
test/specificity/issue60.result | 6 +
test/support/diff.js | 185 +
test/support/helper.js | 208 +
test/version.test.js | 17 +
400 files changed, 18612 insertions(+), 2550 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/node-carto.git
More information about the Pkg-javascript-commits
mailing list