summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKornelius Kalnbach <murphy@rubychan.de>2017-04-09 18:40:31 +0200
committerKornelius Kalnbach <murphy@rubychan.de>2017-04-09 18:40:31 +0200
commit457ffbf3ee02b1b6f57eacb33df44c80f4bf9d71 (patch)
treec5393da6e221f1b8ab8167e20f478a7830689a36
parent368a28e26944edb5e6a59356d50683400695ab65 (diff)
downloadcoderay-457ffbf3ee02b1b6f57eacb33df44c80f4bf9d71.tar.gz
allow "-" in Haml tags
-rw-r--r--Changes.textile1
-rw-r--r--lib/coderay/scanners/haml.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changes.textile b/Changes.textile
index d77cff2..6b44854 100644
--- a/Changes.textile
+++ b/Changes.textile
@@ -5,6 +5,7 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
h2. Changes in 1.1.2
* C++ scanner: Added C++11 keywords. [#195, thanks to Johnny Willemsen]
+* Haml scanner: Allow @-@ in tags.
h2. Changes in 1.1.1
diff --git a/lib/coderay/scanners/haml.rb b/lib/coderay/scanners/haml.rb
index 5433790..d516ba9 100644
--- a/lib/coderay/scanners/haml.rb
+++ b/lib/coderay/scanners/haml.rb
@@ -75,7 +75,7 @@ module Scanners
tag = false
- if match = scan(/%[\w:]+\/?/)
+ if match = scan(/%[-\w:]+\/?/)
encoder.text_token match, :tag
# if match = scan(/( +)(.+)/)
# encoder.text_token self[1], :space