rouge 1.7.7 → 1.8.0

data/lib/rouge/lexers/literate_coffeescript.rb

@@ -4,6 +4,7 @@ module Rouge
   module Lexers
     class LiterateCoffeescript < RegexLexer
       tag 'literate_coffeescript'
+      title "Literate CoffeeScript"
       desc 'Literate coffeescript'
       aliases 'litcoffee'
       filenames '*.litcoffee'

data/lib/rouge/lexers/literate_haskell.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class LiterateHaskell < RegexLexer
+      title "Literate Haskell"
       desc 'Literate haskell'
       tag 'literate_haskell'
       aliases 'lithaskell', 'lhaskell', 'lhs'
@@ -16,7 +17,6 @@ module Rouge
       start { haskell.reset! }
 
       # TODO: support TeX versions as well.
-      # TODO: enforce a blank line before and after code
       state :root do
         rule /\s*?\n(?=>)/, Text, :code
         rule /.*?\n/, Text
@@ -24,7 +24,7 @@ module Rouge
       end
 
       state :code do
-        rule /(>)( .*?\n)/ do |m|
+        rule /(>)( .*?(\n|\z))/ do |m|
           token Name::Label, m[1]
           delegate haskell, m[2]
         end

data/lib/rouge/lexers/llvm.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class LLVM < RegexLexer
+      title "LLVM"
       desc 'The LLVM Compiler Infrastructure (http://llvm.org/)'
       tag 'llvm'
 

data/lib/rouge/lexers/lua.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Lua < RegexLexer
+      title "Lua"
       desc "Lua (http://www.lua.org)"
       tag 'lua'
       filenames '*.lua', '*.wlua'

data/lib/rouge/lexers/make.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Make < RegexLexer
+      title "Make"
       desc "Makefile syntax"
       tag 'make'
       aliases 'makefile', 'mf', 'gnumake', 'bsdmake'

data/lib/rouge/lexers/markdown.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Markdown < RegexLexer
+      title "Markdown"
       desc "Markdown, a light-weight markup language for authors"
 
       tag 'markdown'

data/lib/rouge/lexers/matlab.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Matlab < RegexLexer
+      title "MATLAB"
       desc "Matlab"
       tag 'matlab'
       aliases 'm'

data/lib/rouge/lexers/moonscript.rb

@@ -5,6 +5,7 @@ module Rouge
     load_const :Lua, 'lua.rb'
 
     class Moonscript < RegexLexer
+      title "MoonScript"
       desc "Moonscript (http://www.moonscript.org)"
       tag 'moonscript'
       aliases 'moon'

data/lib/rouge/lexers/nginx.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Nginx < RegexLexer
+      title "nginx"
       desc 'configuration files for the nginx web server (nginx.org)'
       tag 'nginx'
       mimetypes 'text/x-nginx-conf'

data/lib/rouge/lexers/nim.rb

@@ -4,6 +4,7 @@ module Rouge
   module Lexers
     class Nim < RegexLexer
       # This is pretty much a 1-1 port of the pygments NimrodLexer class
+      title "Nim"
       desc "The Nim programming language (http://nim-lang.org/)"
 
       tag 'nim'
@@ -13,8 +14,8 @@ module Rouge
       KEYWORDS = %w(
         addr as asm atomic bind block break case cast const continue
         converter defer discard distinct do elif else end enum except export
-        func finally for from generic if import include interface iterator let 
-        macro method mixin nil object of out proc ptr raise ref return static 
+        func finally for from generic if import include interface iterator let
+        macro method mixin nil object of out proc ptr raise ref return static
         template try tuple type using var when while with without yield
       )
 
@@ -29,7 +30,7 @@ module Rouge
       TYPES = %w(
        int int8 int16 int32 int64 float float32 float64 bool char range array
        seq set string
-      ) 
+      )
 
       NAMESPACE = %w(
         from import include
@@ -133,7 +134,7 @@ module Rouge
         #       since we can't pass array of states like w/ Pygments.
         rule(/[0-9][0-9_]*(?=([eE.]|'?[fF](32|64)))/) do |number|
          push :floatsuffix
-         push :floatnumber 
+         push :floatnumber
          token Num::Float
         end
         rule(/0[xX][a-fA-F0-9][a-fA-F0-9_]*/, Num::Hex,     :intsuffix)

data/lib/rouge/lexers/objective_c.rb

@@ -6,6 +6,7 @@ module Rouge
 
     class ObjectiveC < C
       tag 'objective_c'
+      title "Objective-C"
       desc 'an extension of C commonly used to write Apple software'
       aliases 'objc'
       filenames '*.m', '*.h'
@@ -187,4 +188,3 @@ module Rouge
     end
   end
 end
-

data/lib/rouge/lexers/ocaml.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class OCaml < RegexLexer
+      title "OCaml"
       desc 'Objective CAML (ocaml.org)'
       tag 'ocaml'
       filenames '*.ml', '*.mli', '*.mll', '*.mly'
@@ -108,4 +109,3 @@ module Rouge
     end
   end
 end
-

data/lib/rouge/lexers/perl.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Perl < RegexLexer
+      title "Perl"
       desc "The Perl scripting language (perl.org)"
 
       tag 'perl'

data/lib/rouge/lexers/php.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class PHP < TemplateLexer
+      title "PHP"
       desc "The PHP scripting language (php.net)"
       tag 'php'
       aliases 'php', 'php3', 'php4', 'php5'

data/lib/rouge/lexers/plain_text.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class PlainText < Lexer
+      title "Plain Text"
       desc "A boring lexer that doesn't highlight anything"
 
       tag 'plaintext'

data/lib/rouge/lexers/prolog.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Prolog < RegexLexer
+      title "Prolog"
       desc "The Prolog programming language (http://en.wikipedia.org/wiki/Prolog)"
       tag 'prolog'
       aliases 'prolog'

data/lib/rouge/lexers/properties.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Properties < RegexLexer
+      title ".properties"
       desc '.properties config files for Java'
       tag 'properties'
 

data/lib/rouge/lexers/puppet.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Puppet < RegexLexer
+      title "Puppet"
       desc 'The Puppet configuration management language (puppetlabs.org)'
       tag 'puppet'
       aliases 'pp'

data/lib/rouge/lexers/python.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Python < RegexLexer
+      title "Python"
       desc "The Python programming language (python.org)"
       tag 'python'
       aliases 'py'

data/lib/rouge/lexers/qml.rb

@@ -4,6 +4,7 @@ module Rouge
   module Lexers
     load_const :Javascript, 'javascript.rb'
     class Qml < Javascript
+      title "QML"
       desc 'QML, a UI markup language'
       tag 'qml'
       aliases 'qml'
@@ -69,4 +70,3 @@ module Rouge
     end
   end
 end
-

data/lib/rouge/lexers/r.rb

@@ -3,10 +3,11 @@
 module Rouge
   module Lexers
     class R < RegexLexer
+      title "R"
       desc 'The R statistics language (r-project.org)'
       tag 'r'
       aliases 'r', 'R', 's', 'S'
-      filenames '*.R', '*.S', '.Rhistory', '.Rprofile'
+      filenames '*.R', '.Rhistory', '.Rprofile'
       mimetypes 'text/x-r-source', 'text/x-r', 'text/x-R'
 
       mimetypes 'text/x-r', 'application/x-r'
@@ -19,7 +20,6 @@ module Rouge
 
       def self.analyze_text(text)
         return 1 if text.shebang? 'Rscript'
-        return 0.1 if text.include? '->'
       end
 
       state :root do

data/lib/rouge/lexers/racket.rb

@@ -2,6 +2,7 @@
 module Rouge
   module Lexers
     class Racket < RegexLexer
+      title "Racket"
       desc "Racket is a Lisp descended from Scheme (racket-lang.org)"
 
       tag 'racket'

data/lib/rouge/lexers/ruby.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Ruby < RegexLexer
+      title "Ruby"
       desc "The Ruby programming language (ruby-lang.org)"
       tag 'ruby'
       aliases 'rb'
@@ -108,8 +109,8 @@ module Rouge
 
       keywords_pseudo = %w(
         initialize new loop include extend raise attr_reader attr_writer
-        attr_accessor attr catch throw private module_function public
-        protected true false nil __FILE__ __LINE__
+        attr_accessor alias_method attr catch throw private module_function
+        public protected true false nil __FILE__ __LINE__
       )
 
       builtins_g = %w(

data/lib/rouge/lexers/rust.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Rust < RegexLexer
+      title "Rust"
       desc 'The Rust programming language (rust-lang.org)'
       tag 'rust'
       aliases 'rs'

data/lib/rouge/lexers/sass.rb

@@ -7,6 +7,7 @@ module Rouge
     class Sass < SassCommon
       include Indentation
 
+      title "Sass"
       desc 'The Sass stylesheet language language (sass-lang.com)'
 
       tag 'sass'

data/lib/rouge/lexers/scala.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Scala < RegexLexer
+      title "Scala"
       desc "The Scala programming language (scala-lang.org)"
       tag 'scala'
       aliases 'scala'

data/lib/rouge/lexers/scheme.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Scheme < RegexLexer
+      title "Scheme"
       desc "The Scheme variant of Lisp"
 
       tag 'scheme'

data/lib/rouge/lexers/scss.rb

@@ -5,6 +5,7 @@ module Rouge
     load_const :SassCommon, 'sass/common.rb'
 
     class Scss < SassCommon
+      title "SCSS"
       desc "SCSS stylesheets (sass-lang.com)"
       tag 'scss'
       filenames '*.scss'

data/lib/rouge/lexers/sed.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Sed < RegexLexer
+      title "sed"
       desc 'sed, the ultimate stream editor'
 
       tag 'sed'

data/lib/rouge/lexers/shell.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Shell < RegexLexer
+      title "shell"
       desc "Various shell languages, including sh and bash"
 
       tag 'shell'

data/lib/rouge/lexers/slim.rb

@@ -7,6 +7,7 @@ module Rouge
     class Slim < RegexLexer
       include Indentation
 
+      title "Slim"
       desc 'The Slim template language'
 
       tag 'slim'
@@ -151,8 +152,8 @@ module Rouge
       end
 
       state :css do
-        rule(/\.\w+/) { token Name::Class; goto :tag }
-        rule(/#\w+/) { token Name::Function; goto :tag }
+        rule(/\.[\w-]*/) { token Name::Class; goto :tag }
+        rule(/#[a-zA-Z][\w:-]*/) { token Name::Function; goto :tag }
       end
 
       state :html_attr do

data/lib/rouge/lexers/smalltalk.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class Smalltalk < RegexLexer
+      title "Smalltalk"
       desc 'The Smalltalk programming language'
 
       tag 'smalltalk'

data/lib/rouge/lexers/sml.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class SML < RegexLexer
+      title "SML"
       desc 'Standard ML'
       tag 'sml'
       aliases 'ml'
@@ -344,4 +345,3 @@ module Rouge
     end
   end
 end
-

data/lib/rouge/lexers/sql.rb

@@ -3,6 +3,7 @@
 module Rouge
   module Lexers
     class SQL < RegexLexer
+      title "SQL"
       desc "Structured Query Language, for relational databases"
       tag 'sql'
       filenames '*.sql'

data/lib/rouge/lexers/swift.rb

@@ -6,12 +6,13 @@ module Rouge
       tag 'swift'
       filenames '*.swift'
 
+      title "Swift"
       desc 'Multi paradigm, compiled programming language developed by Apple for iOS and OS X development. (developer.apple.com/swift)'
 
       id_head = /_|(?!\p{Mc})\p{Alpha}|[^\u0000-\uFFFF]/
       id_rest = /[\p{Alnum}_]|[^\u0000-\uFFFF]/
       id = /#{id_head}#{id_rest}*/
-      
+
       keywords = Set.new %w(
         break case continue default do else fallthrough if in for return switch where while
 
@@ -25,19 +26,35 @@ module Rouge
       )
 
       attributes = Set.new %w(
-        autoclosure IBAction IBDesignable IBInspectable IBOutlet noreturn NSCopying NSManaged objc UIApplicationMain NSApplicationMain
+        autoclosure IBAction IBDesignable IBInspectable IBOutlet noreturn NSCopying NSManaged objc UIApplicationMain NSApplicationMain objc_block
       )
 
       constants = Set.new %w(
         true false nil
       )
 
-      state :whitespace do
+      start { push :bol }
+
+      # beginning of line
+      state :bol do
+        rule /#.*/, Comment::Preproc
+
+        mixin :inline_whitespace
+
+        rule(//) { pop! }
+      end
+
+      state :inline_whitespace do
         rule /\s+/m, Text
-        rule %r(\/\/.*?\n), Comment::Single
         rule %r((?<re>\/\*(?:(?>[^\/\*\*\/]+)|\g<re>)*\*\/))m, Comment::Multiline
       end
 
+      state :whitespace do
+        rule /\n+/m, Text, :bol
+        rule %r(\/\/.*?$), Comment::Single, :bol
+        mixin :inline_whitespace
+      end
+
       state :root do
         mixin :whitespace
         rule /\$(([1-9]\d*)?\d)/, Name::Variable
@@ -52,7 +69,7 @@ module Rouge
         rule /0x[0-9A-Fa-f]+(?:_[0-9A-Fa-f]+)*/, Num::Hex
         rule /0b[01]+(?:_[01]+)*/, Num::Bin
         rule %r{[\d]+(?:_\d+)*}, Num::Integer
-                
+
         rule /@availability[(][^)]+[)]/, Keyword::Declaration
 
         rule /(@objc[(])([^)]+)([)])/ do
@@ -82,11 +99,11 @@ module Rouge
             groups Keyword::Declaration, Error, Keyword::Declaration
           end
         end
-        
+
         rule /(let|var)\b(\s*)(#{id})/ do
           groups Keyword, Text, Name::Variable
         end
-        
+
         rule /(?!\b(if|while|for|private|internal|unowned|switch|case)\b)\b#{id}(?=(\?|!)?\s*[(])/ do |m|
           if m[0] =~ /^[[:upper:]]/
             token Keyword::Type