Merge branch 'master' into multiline-inline-diff

korny · korny · commit 5c5954d3dbcb · 2012-06-25T09:56:30.000+02:00
diff --git a/Changes.textile b/Changes.textile
@@ -6,7 +6,9 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
  
 h2. Changes in 1.0.7
  
+* Changed license from LGPL to MIT. [GH-25, thanks to jessehu]
 * Fix issue with plugin files not being loaded. [GH-20, thanks to Will Read]
+* Fix HTML scanner bug: Don't choke on boolean attributes. [GH-26, thanks to jugglinmike]
 
 h2. Changes in 1.0.6
  
diff --git a/LICENSE b/LICENSE
diff --git a/MIT-LICENSE.txt b/MIT-LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (C) 2005-2012 Kornelius Kalnbach <murphy@rubychan.de> (@murphy_karasu)
+
+http://coderay.rubychan.de/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/coderay.gemspec b/coderay.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
     # thanks to @Argorak for this solution
     # revision = 134 + (`git log --oneline | wc -l`.to_i)
     # s.version = "#{CodeRay::VERSION}.#{revision}rc1"
-    s.version = "#{CodeRay::VERSION}.rc1"
+    s.version = "#{CodeRay::VERSION}.rc2"
   end
   
   s.authors     = ['Kornelius Kalnbach']
diff --git a/lib/coderay.rb b/lib/coderay.rb
@@ -78,12 +78,12 @@
 # Read this to get a general view what CodeRay provides.
 # 
 # == Scanning
-#  
-#  Scanning means analysing an input string, splitting it up into Tokens.
-#  Each Token knows about what type it is: string, comment, class name, etc.
+# 
+# Scanning means analysing an input string, splitting it up into Tokens.
+# Each Token knows about what type it is: string, comment, class name, etc.
 #
-#  Each +lang+ (language) has its own Scanner; for example, <tt>:ruby</tt> code is
-#  handled by CodeRay::Scanners::Ruby.
+# Each +lang+ (language) has its own Scanner; for example, <tt>:ruby</tt> code is
+# handled by CodeRay::Scanners::Ruby.
 # 
 # CodeRay.scan:: Scan a string in a given language into Tokens.
 #                This is the most common method to use.
diff --git a/lib/coderay/helpers/word_list.rb b/lib/coderay/helpers/word_list.rb
@@ -4,11 +4,6 @@ module CodeRay
   # 
   # <b>A Hash subclass designed for mapping word lists to token types.</b>
   # 
-  # Copyright (c) 2006-2011 by murphy (Kornelius Kalnbach) <murphy rubychan de>
-  #
-  # License:: LGPL / ask the author
-  # Version:: 2.0 (2011-05-08)
-  #
   # A WordList is a Hash with some additional features.
   # It is intended to be used for keyword recognition.
   #
diff --git a/lib/coderay/scanners/html.rb b/lib/coderay/scanners/html.rb
@@ -149,12 +149,9 @@ def scan_tokens encoder, options
             if match = scan(/=/)  #/
               encoder.text_token match, :operator
               state = :attribute_value
-            elsif scan(/#{ATTR_NAME}/o) || scan(/#{TAG_END}/o)
-              state = :attribute
-              next
             else
-              encoder.text_token getch, :error
               state = :attribute
+              next
             end
             
           when :attribute_value

Original file line number	Diff line number	Diff line change
`@@ -78,12 +78,12 @@`
`78`	`78`	`# Read this to get a general view what CodeRay provides.`
`79`	`79`	`#`
`80`	`80`	`# == Scanning`
`81`		`-#`
`82`		`-# Scanning means analysing an input string, splitting it up into Tokens.`
`83`		`-# Each Token knows about what type it is: string, comment, class name, etc.`
	`81`	`+#`
	`82`	`+# Scanning means analysing an input string, splitting it up into Tokens.`
	`83`	`+# Each Token knows about what type it is: string, comment, class name, etc.`
`84`	`84`	`#`
`85`		`-# Each +lang+ (language) has its own Scanner; for example, <tt>:ruby</tt> code is`
`86`		`-# handled by CodeRay::Scanners::Ruby.`
	`85`	`+# Each +lang+ (language) has its own Scanner; for example, <tt>:ruby</tt> code is`
	`86`	`+# handled by CodeRay::Scanners::Ruby.`
`87`	`87`	`#`
`88`	`88`	`# CodeRay.scan:: Scan a string in a given language into Tokens.`
`89`	`89`	`# This is the most common method to use.`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,6 @@ module CodeRay`
`4`	`4`	`#`
`5`	`5`	`# <b>A Hash subclass designed for mapping word lists to token types.</b>`
`6`	`6`	`#`
`7`		`- # Copyright (c) 2006-2011 by murphy (Kornelius Kalnbach) <murphy rubychan de>`
`8`		`- #`
`9`		`- # License:: LGPL / ask the author`
`10`		`- # Version:: 2.0 (2011-05-08)`
`11`		`- #`
`12`	`7`	`# A WordList is a Hash with some additional features.`
`13`	`8`	`# It is intended to be used for keyword recognition.`
`14`	`9`	`#`