rouge 3.3.0 → 3.4.0

data/lib/rouge/regex_lexer.rb

@@ -183,18 +183,18 @@ module Rouge
     # Define a new state for this lexer with the given name.
     # The block will be evaluated in the context of a {StateDSL}.
     def self.state(name, &b)
-      name = name.to_s
+      name = name.to_sym
       state_definitions[name] = StateDSL.new(name, &b)
     end
 
     def self.prepend(name, &b)
-      name = name.to_s
+      name = name.to_sym
       dsl = state_definitions[name] or raise "no such state #{name.inspect}"
       replace_state(name, dsl.prepended(&b))
     end
 
     def self.append(name, &b)
-      name = name.to_s
+      name = name.to_sym
       dsl = state_definitions[name] or raise "no such state #{name.inspect}"
       replace_state(name, dsl.appended(&b))
     end
@@ -204,7 +204,7 @@ module Rouge
       return name if name.is_a? State
 
       states[name.to_sym] ||= begin
-        defn = state_definitions[name.to_s] or raise "unknown state: #{name.inspect}"
+        defn = state_definitions[name.to_sym] or raise "unknown state: #{name.inspect}"
         defn.to_state(self)
       end
     end
@@ -352,10 +352,10 @@ module Rouge
       end
     end
 
-    # Delegate the lex to another lexer.  The #lex method will be called
-    # with `:continue` set to true, so that #reset! will not be called.
-    # In this way, a single lexer can be repeatedly delegated to while
-    # maintaining its own internal state stack.
+    # Delegate the lex to another lexer. We use the `continue_lex` method
+    # so that #reset! will not be called.  In this way, a single lexer
+    # can be repeatedly delegated to while maintaining its own internal
+    # state stack.
     #
     # @param [#lex] lexer
     #   The lexer or lexer class to delegate to
@@ -365,7 +365,7 @@ module Rouge
       puts "    delegating to #{lexer.inspect}" if @debug
       text ||= @current_stream[0]
 
-      lexer.lex(text, :continue => true) do |tok, val|
+      lexer.continue_lex(text) do |tok, val|
         puts "    delegated token: #{tok.inspect}, #{val.inspect}" if @debug
         yield_token(tok, val)
       end
@@ -421,15 +421,15 @@ module Rouge
 
     # Check if `state_name` is in the state stack.
     def in_state?(state_name)
-      state_name = state_name.to_s
+      state_name = state_name.to_sym
       stack.any? do |state|
-        state.name == state_name.to_s
+        state.name == state_name.to_sym
       end
     end
 
     # Check if `state_name` is the state on top of the state stack.
     def state?(state_name)
-      state_name.to_s == state.name
+      state_name.to_sym == state.name
     end
 
   private

data/lib/rouge/themes/bw.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Themes
+    # A port of the bw style from Pygments.
+    # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/bw.py
+    class BlackWhiteTheme < CSSTheme
+      name 'bw'
+
+      style Text,                        :fg => '#000000', :bg => '#ffffff'
+
+      style Comment,                     :italic => true
+      style Comment::Preproc,            :italic => false
+
+      style Keyword,                     :bold => true
+      style Keyword::Pseudo,             :bold => false
+      style Keyword::Type,               :bold => false
+
+      style Operator,                    :bold => true
+
+      style Name::Class,                 :bold => true
+      style Name::Namespace,             :bold => true
+      style Name::Exception,             :bold => true
+      style Name::Entity,                :bold => true
+      style Name::Tag,                   :bold => true
+
+      style Literal::String,             :italic => true
+      style Literal::String::Interpol,   :bold => true
+      style Literal::String::Escape,     :bold => true
+
+      style Generic::Heading,            :bold => true
+      style Generic::Subheading,         :bold => true
+      style Generic::Emph,               :italic => true
+      style Generic::Strong,             :bold => true
+      style Generic::Prompt,             :bold => true
+
+      style Error,                       :fg => '#FF0000'
+    end
+  end
+end

data/lib/rouge/token.rb

@@ -80,8 +80,9 @@ module Rouge
         token :Whitespace, 'w'
       end
 
-      token :Error, 'err'
-      token :Other, 'x'
+      token :Escape, 'esc'
+      token :Error,  'err'
+      token :Other,  'x'
 
       token :Keyword, 'k' do
         token :Constant,    'kc'
@@ -103,7 +104,9 @@ module Rouge
         token :Decorator,    'nd'
         token :Entity,       'ni'
         token :Exception,    'ne'
-        token :Function,     'nf'
+        token :Function,     'nf' do
+          token :Magic,      'fm'
+        end
         token :Property,     'py'
         token :Label,        'nl'
         token :Namespace,    'nn'
@@ -113,34 +116,37 @@ module Rouge
           token :Class,      'vc'
           token :Global,     'vg'
           token :Instance,   'vi'
+          token :Magic,      'vm'
         end
       end
 
       token :Literal,      'l' do
         token :Date,       'ld'
 
-        token :String,     's' do
-          token :Backtick, 'sb'
-          token :Char,     'sc'
-          token :Doc,      'sd'
-          token :Double,   's2'
-          token :Escape,   'se'
-          token :Heredoc,  'sh'
-          token :Interpol, 'si'
-          token :Other,    'sx'
-          token :Regex,    'sr'
-          token :Single,   's1'
-          token :Symbol,   'ss'
+        token :String,      's' do
+          token :Affix,     'sa'
+          token :Backtick,  'sb'
+          token :Char,      'sc'
+          token :Delimiter, 'dl'
+          token :Doc,       'sd'
+          token :Double,    's2'
+          token :Escape,    'se'
+          token :Heredoc,   'sh'
+          token :Interpol,  'si'
+          token :Other,     'sx'
+          token :Regex,     'sr'
+          token :Single,    's1'
+          token :Symbol,    'ss'
         end
 
         token :Number,     'm' do
+          token :Bin,      'mb'
           token :Float,    'mf'
           token :Hex,      'mh'
           token :Integer,  'mi' do
             token :Long,   'il'
           end
           token :Oct,      'mo'
-          token :Bin,      'mb'
           token :Other,    'mx'
         end
       end
@@ -153,12 +159,14 @@ module Rouge
         token :Indicator, 'pi'
       end
 
-      token :Comment,     'c' do
-        token :Doc,       'cd'
-        token :Multiline, 'cm'
-        token :Preproc,   'cp'
-        token :Single,    'c1'
-        token :Special,   'cs'
+      token :Comment,       'c' do
+        token :Hashbang,    'ch'
+        token :Doc,         'cd'
+        token :Multiline,   'cm'
+        token :Preproc,     'cp'
+        token :PreprocFile, 'cpf'
+        token :Single,      'c1'
+        token :Special,     'cs'
       end
 
       token :Generic,      'g' do

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "3.3.0"
+    "3.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2019-06-11 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -56,6 +56,7 @@ files:
 - lib/rouge/demos/elm
 - lib/rouge/demos/erb
 - lib/rouge/demos/erlang
+- lib/rouge/demos/escape
 - lib/rouge/demos/factor
 - lib/rouge/demos/fortran
 - lib/rouge/demos/fsharp
@@ -142,6 +143,7 @@ files:
 - lib/rouge/demos/sml
 - lib/rouge/demos/sqf
 - lib/rouge/demos/sql
+- lib/rouge/demos/supercollider
 - lib/rouge/demos/swift
 - lib/rouge/demos/tap
 - lib/rouge/demos/tcl
@@ -161,6 +163,7 @@ files:
 - lib/rouge/demos/vue
 - lib/rouge/demos/wollok
 - lib/rouge/demos/xml
+- lib/rouge/demos/xojo
 - lib/rouge/demos/yaml
 - lib/rouge/formatter.rb
 - lib/rouge/formatters/html.rb
@@ -214,6 +217,7 @@ files:
 - lib/rouge/lexers/elm.rb
 - lib/rouge/lexers/erb.rb
 - lib/rouge/lexers/erlang.rb
+- lib/rouge/lexers/escape.rb
 - lib/rouge/lexers/factor.rb
 - lib/rouge/lexers/fortran.rb
 - lib/rouge/lexers/fsharp.rb
@@ -307,6 +311,7 @@ files:
 - lib/rouge/lexers/sqf.rb
 - lib/rouge/lexers/sqf/commands.rb
 - lib/rouge/lexers/sql.rb
+- lib/rouge/lexers/supercollider.rb
 - lib/rouge/lexers/swift.rb
 - lib/rouge/lexers/tap.rb
 - lib/rouge/lexers/tcl.rb
@@ -328,6 +333,7 @@ files:
 - lib/rouge/lexers/vue.rb
 - lib/rouge/lexers/wollok.rb
 - lib/rouge/lexers/xml.rb
+- lib/rouge/lexers/xojo.rb
 - lib/rouge/lexers/yaml.rb
 - lib/rouge/plugins/redcarpet.rb
 - lib/rouge/regex_lexer.rb
@@ -335,6 +341,7 @@ files:
 - lib/rouge/text_analyzer.rb
 - lib/rouge/theme.rb
 - lib/rouge/themes/base16.rb
+- lib/rouge/themes/bw.rb
 - lib/rouge/themes/colorful.rb
 - lib/rouge/themes/github.rb
 - lib/rouge/themes/gruvbox.rb
@@ -371,8 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rouge
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments