Merge remote-tracking branch 'origin/master' into alex/tokenization

This commit is contained in:
Alex Dima
2017-01-06 17:06:26 +01:00
63 changed files with 448 additions and 1256 deletions

View File

@@ -355,7 +355,7 @@
</dict>
<dict>
<key>begin</key>
<string>(^|\G)\s*(?=(&lt;[a-zA-Z0-9\-].*&gt;|&lt;/[a-zA-Z0-9\-]&gt;)\s*$)</string>
<string>(^|\G)\s*(?=(&lt;[a-zA-Z0-9\-](/?&gt;|\s.*?&gt;)|&lt;/[a-zA-Z0-9\-]&gt;)\s*$)</string>
<key>patterns</key>
<array>
<dict>