From 442ffbe911bd233bf3b9f48bff861ce80d6e335b Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 4 Dec 2013 11:44:18 +0000
Subject: [PATCH] expression grammar : allow '-' in @attribute     e.g
 ```@water-fill``` note: this might clash with subtraction ops (fixme)

---
 include/mapnik/expression_grammar_impl.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/mapnik/expression_grammar_impl.hpp b/include/mapnik/expression_grammar_impl.hpp
index 8c66cf351..b760d5232 100644
--- a/include/mapnik/expression_grammar_impl.hpp
+++ b/include/mapnik/expression_grammar_impl.hpp
@@ -185,13 +185,13 @@ expression_grammar<Iterator>::expression_grammar(mapnik::transcoder const& tr)
         >> *(unesc_char | "\\x" >> hex | (char_ - lit(_a)))
         >> lit(_a);
     attr %= '[' >> no_skip[+~char_(']')] >> ']';
-    global_attr %= '@' >> no_skip[alpha >> *alnum];
+    global_attr %= '@' >> no_skip[alpha >> * (alnum | char_('-'))];
 #else
     quoted_ustring %= lit('\'')
         >> *(unesc_char | "\\x" >> hex | (char_ - lit('\'')))
         >> lit('\'');
     attr %= '[' >> lexeme[+(char_ - ']')] >> ']';
-    global_attr %= '@' >> no_skip[alpha >> *alnum];
+    global_attr %= '@' >> no_skip[alpha >> * (alnum | char_('-'))];
 #endif
 
 }