Changeset 6686 in josm


Ignore:
Timestamp:
2014-01-15T01:18:13+01:00 (11 years ago)
Author:
Don-vip
Message:

fix #9575 - support predefined character classes in MapCSS regular expressions (\d, \D, \s, \S, \w, \W)

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r6585 r6686  
    200200            <arg value="-JDK_VERSION=1.6"/>
    201201            <arg value="-GRAMMAR_ENCODING=UTF-8"/>
    202             <arg value="-UNICODE_INPUT"/>
    203202            <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
    204203            <arg value="${mapcss.dir}/MapCSSParser.jj"/>

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj

    r6613 r6686  
    4747|   < UFLOAT: ( ["0"-"9"] )+ ( "." ( ["0"-"9"] )+ )? >
    4848|   < STRING: "\"" ( [" ","!","#"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\\"" | "\\\\" )*  "\"" >
    49 |   < #REGEX_CHAR_WITHOUT_STAR: [" "-")","+"-".","0"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\/" | "\\\\" | "\\[" | "\\]" | "\\+" | "\\." | "\\'" | "\\\"" >
     49|   < #PREDEFINED: "\\" ["d","D","s","S","w","W"] >
     50|   < #REGEX_CHAR_WITHOUT_STAR: [" "-")","+"-".","0"-"[","]"-"~","\u0080"-"\uFFFF"] | "\\/" | "\\\\" | "\\[" | "\\]" | "\\+" | "\\." | "\\'" | "\\\"" | <PREDEFINED> >
    5051|   < REGEX: "/" <REGEX_CHAR_WITHOUT_STAR> ( <REGEX_CHAR_WITHOUT_STAR> | "*" )*  "/" >
    5152|   < #H: ["0"-"9","a"-"f","A"-"F"] >

  • trunk/styles/standard/elemstyles.xml

    r6685 r6686  
    163163        <rule>
    164164                <condition k="access" b="no"/>
    165         <linemod mode="under" width="+2" colour="no#ff8080" dashed="2"/>
     165                <linemod mode="under" width="+2" colour="no#ff8080" dashed="2"/>
    166166                <icon src="vehicle/restriction/access.png" priority="-100"/>
    167167        </rule>
Note: See TracChangeset for help on using the changeset viewer.