lib/rouge/lexers/scheme.rb in rouge-0.0.13 vs lib/rouge/lexers/scheme.rb in rouge-0.0.14

@@ -64,11 +64,11 @@
         rule /'#{id}/i, 'Literal.String.Symbol'
         rule /#\\([()\/'"._!\$%& ?=+-]{1}|[a-z0-9]+)/i,
           'Literal.String.Char'
         rule /#t|#f/, 'Name.Constant'
         rule /(?:'|#|`|,@|,|\.)/, 'Operator'
-        rule /(?:#{keywords.map(&escape).join('|')})/,
+        rule /(?:#{keywords.map(&escape).join('|')})(?=[^\w-])/,
           'Keyword'
 
         rule /(['#])(\s*)(\()/m do
           group 'Literal.String.Symbol'
           group 'Text'
@@ -80,10 +80,10 @@
 
         rule id, 'Name.Variable'
       end
 
       state :command do
-        rule /(?:#{builtins.map(&escape).join('|')})/, 'Name.Builtin', :pop!
+        rule /(?:#{builtins.map(&escape).join('|')})(?=[^\w-])/, 'Name.Builtin', :pop!
         rule id, 'Name.Function', :pop!
         rule(//) { pop! }
       end
 
     end