rouge 3.5.1 → 3.6.0

data/lib/rouge/lexers/xquery.rb

@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    load_lexer 'xpath.rb'
+    class XQuery < XPath
+      title 'XQuery'
+      desc 'XQuery 3.1: An XML Query Language'
+      tag 'xquery'
+      filenames '*.xquery', '*.xq'
+      mimetypes 'application/xquery'
+
+      def self.keywords
+        @keywords ||= Regexp.union super, Regexp.union(%w(
+          xquery encoding version declare module
+          namespace copy-namespaces boundary-space construction
+          default collation base-uri preserve strip
+          ordering ordered unordered order empty greatest least
+          preserve no-preserve inherit no-inherit
+          decimal-format decimal-separator grouping-separator
+          infinity minus-sign NaN percent per-mille
+          zero-digit digit pattern-separator exponent-separator
+          import schema at element option
+          function external context item
+          typeswitch switch case
+          try catch
+          validate lax strict type
+          document element attribute text comment processing-instruction
+          for let where order group by return
+          allowing tumbling stable sliding window
+          start end only when previous next count collation
+          ascending descending
+        ))
+      end
+
+      # Mixin states:
+
+      state :tags do
+        rule %r/<#{XPath.qName}/, Name::Tag, :start_tag
+        rule %r/<!--/, Comment, :xml_comment
+        rule %r/<\?.*?\?>/, Comment::Preproc
+        rule %r/<!\[CDATA\[.*?\]\]>/, Comment::Preproc
+        rule %r/&\S*?;/, Name::Entity
+      end
+
+      # Lexical states:
+
+      prepend :root do
+        mixin :tags
+
+        rule %r/\{/, Punctuation
+        rule %r/\}`?/ do
+          token Punctuation
+          if stack.length > 1
+            pop!
+          end
+        end
+
+        rule %r/(namespace)(\s+)(#{XPath.ncName})/ do
+          groups Keyword, Text::Whitespace, Name::Namespace
+        end
+
+        rule %r/(#{XQuery.keywords})\b/, Keyword
+        rule %r/;/, Punctuation
+        rule %r/%/, Keyword::Declaration, :annotation
+
+        rule %r/(\(#)(\s*)(#{XPath.eqName})/ do
+          groups Comment::Preproc, Text::Whitespace, Name::Tag
+          push :pragma
+        end
+
+        rule %r/``\[/, Str, :str_constructor
+      end
+
+      state :annotation do
+        mixin :commentsAndWhitespace
+        rule XPath.eqName, Keyword::Declaration, :pop!
+      end
+
+      state :pragma do
+        mixin :commentsAndWhitespace
+        rule %r/#\)/, Comment::Preproc, :pop!
+        rule %r/./, Comment::Preproc
+      end
+
+      # https://www.w3.org/TR/xquery-31/#id-string-constructors
+      state :str_constructor do
+        rule %r/`\{/, Punctuation, :root
+        rule %r/\]``/, Str, :pop!
+        rule %r/[^`\]]+/m, Str
+        rule %r/[`\]]/, Str
+      end
+
+      state :xml_comment do
+        rule %r/[^-]+/m, Comment
+        rule %r/-->/, Comment, :pop!
+        rule %r/-/, Comment
+      end
+
+      state :start_tag do
+        rule %r/\s+/m, Text::Whitespace
+        rule %r/([\w.:-]+\s*=)(")/m do
+          groups Name::Attribute, Str
+          push :quot_attr
+        end
+        rule %r/([\w.:-]+\s*=)(')/m do
+          groups Name::Attribute, Str
+          push :apos_attr
+        end
+        rule %r/>/, Name::Tag, :tag_content
+        rule %r(/>), Name::Tag, :pop!
+      end
+
+      state :quot_attr do
+        rule %r/"/, Str, :pop!
+        rule %r/\{\{/, Str
+        rule %r/\{/, Punctuation, :root
+        rule %r/[^"{>]+/m, Str
+      end
+
+      state :apos_attr do
+        rule %r/'/, Str, :pop!
+        rule %r/\{\{/, Str
+        rule %r/\{/, Punctuation, :root
+        rule %r/[^'{>]+/m, Str
+      end
+
+      state :tag_content do
+        rule %r/\s+/m, Text::Whitespace
+        mixin :tags
+
+        rule %r/(\{\{|\}\})/, Text
+        rule %r/\{/, Punctuation, :root
+
+        rule %r/[^{}<&]/, Text
+
+        rule %r(</#{XPath.qName}(\s*)>) do
+          token Name::Tag
+          pop! 2 # pop self and tag_start
+        end
+      end
+    end
+  end
+end

data/lib/rouge/lexers/yaml.rb

@@ -179,7 +179,7 @@ module Rouge
         end
 
         # literal and folded scalars
-        rule %r/[\|>]/ do
+        rule %r/[\|>][+-]?/ do
           token Punctuation::Indicator
           push :block_scalar_content
           push :block_scalar_header
@@ -246,7 +246,7 @@ module Rouge
           end
         end
 
-        rule %r/[^\n\r\f\v]+/, Name::Constant
+        rule %r/[^\n\r\f\v]+/, Str
       end
 
       state :block_scalar_header do
@@ -328,7 +328,7 @@ module Rouge
       state :plain_scalar_in_block_context do
         # the : indicator ends a scalar
         rule %r/[ ]*(?=:[ \n]|:$)/, Text, :pop!
-        rule %r/[ ]*:/, Str
+        rule %r/[ ]*:\S+/, Str
         rule %r/[ ]+(?=#)/, Text, :pop!
         rule %r/[ ]+$/, Text
         # check for new documents or dedents at the new line
@@ -339,6 +339,8 @@ module Rouge
 
         rule %r/[ ]+/, Str
         rule SPECIAL_VALUES, Name::Constant
+        rule %r/\d+(?:\.\d+)?(?=(\r?\n)| +#)/, Literal::Number, :pop!
+
         # regular non-whitespace characters
         rule %r/[^\s:]+/, Str
       end

data/lib/rouge/regex_lexer.rb

@@ -102,21 +102,21 @@ module Rouge
         callback ||= case next_state
         when :pop!
           proc do |stream|
-            puts "    yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
+            puts "    yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
             @output_stream.call(tok, stream[0])
             puts "    popping stack: 1" if @debug
             @stack.pop or raise 'empty stack!'
           end
         when :push
           proc do |stream|
-            puts "    yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
+            puts "    yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
             @output_stream.call(tok, stream[0])
             puts "    pushing :#{@stack.last.name}" if @debug
             @stack.push(@stack.last)
           end
         when Symbol
           proc do |stream|
-            puts "    yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
+            puts "    yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
             @output_stream.call(tok, stream[0])
             state = @states[next_state] || self.class.get_state(next_state)
             puts "    pushing :#{state.name}" if @debug
@@ -124,7 +124,7 @@ module Rouge
           end
         when nil
           proc do |stream|
-            puts "    yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
+            puts "    yielding: #{tok.qualname}, #{stream[0].inspect}" if @debug
             @output_stream.call(tok, stream[0])
           end
         else
@@ -263,6 +263,7 @@ module Rouge
 
       until stream.eos?
         if @debug
+          puts
           puts "lexer: #{self.class.tag}"
           puts "stack: #{stack.map(&:name).map(&:to_sym).inspect}"
           puts "stream: #{stream.peek(20).inspect}"
@@ -289,11 +290,11 @@ module Rouge
     def step(state, stream)
       state.rules.each do |rule|
         if rule.is_a?(State)
-          puts "  entering mixin #{rule.name}" if @debug
+          puts "  entering: mixin :#{rule.name}" if @debug
           return true if step(rule, stream)
-          puts "  exiting  mixin #{rule.name}" if @debug
+          puts "  exiting: mixin :#{rule.name}" if @debug
         else
-          puts "  trying #{rule.inspect}" if @debug
+          puts "  trying: #{rule.inspect}" if @debug
 
           # XXX HACK XXX
           # StringScanner's implementation of ^ is b0rken.
@@ -303,14 +304,14 @@ module Rouge
           next if rule.beginning_of_line && !stream.beginning_of_line?
 
           if (size = stream.skip(rule.re))
-            puts "    got #{stream[0].inspect}" if @debug
+            puts "    got: #{stream[0].inspect}" if @debug
 
             instance_exec(stream, &rule.callback)
 
             if size.zero?
               @null_steps += 1
               if @null_steps > MAX_NULL_SCANS
-                puts "    too many scans without consuming the string!" if @debug
+                puts "    warning: too many scans without consuming the string!" if @debug
                 return false
               end
             else
@@ -362,7 +363,7 @@ module Rouge
     # @param [String] text
     #   The text to delegate.  This defaults to the last matched string.
     def delegate(lexer, text=nil)
-      puts "    delegating to #{lexer.inspect}" if @debug
+      puts "    delegating to: #{lexer.inspect}" if @debug
       text ||= @current_stream[0]
 
       lexer.continue_lex(text) do |tok, val|
@@ -388,7 +389,7 @@ module Rouge
         self.state
       end
 
-      puts "    pushing :#{push_state.name}" if @debug
+      puts "    pushing: :#{push_state.name}" if @debug
       stack.push(push_state)
     end
 
@@ -408,7 +409,7 @@ module Rouge
     def goto(state_name)
       raise 'empty stack!' if stack.empty?
 
-      puts "    going to state :#{state_name} " if @debug
+      puts "    going to: state :#{state_name} " if @debug
       stack[-1] = get_state(state_name)
     end
 
@@ -435,7 +436,7 @@ module Rouge
   private
     def yield_token(tok, val)
       return if val.nil? || val.empty?
-      puts "    yielding #{tok.qualname}, #{val.inspect}" if @debug
+      puts "    yielding: #{tok.qualname}, #{val.inspect}" if @debug
       @output_stream.yield(tok, val)
     end
   end

data/lib/rouge/tex_theme_renderer.rb

@@ -35,8 +35,8 @@ module Rouge
 END
 
       base = @theme.class.base_style
-      yield "\\definecolor{#{@prefix}@fgcolor}{HTML}{#{inline_name(base.fg)}}"
-      yield "\\definecolor{#{@prefix}@bgcolor}{HTML}{#{inline_name(base.bg)}}"
+      yield "\\definecolor{#{@prefix}@fgcolor}{HTML}{#{inline_name(base.fg || '#000000')}}"
+      yield "\\definecolor{#{@prefix}@bgcolor}{HTML}{#{inline_name(base.bg || '#FFFFFF')}}"
 
       render_palette(@theme.palette, &b)
 

data/lib/rouge/themes/monokai_sublime.rb

@@ -11,6 +11,7 @@ module Rouge
       palette :bright_pink    => '#f92672'
       palette :carmine        => '#960050'
       palette :dark           => '#49483e'
+      palette :dark_graphite  => '#272822'
       palette :dark_grey      => '#888888'
       palette :dark_red       => '#aa0000'
       palette :dimgrey        => '#75715e'
@@ -80,7 +81,7 @@ module Rouge
             Name::Variable,
             Text::Whitespace,
             Text,
-            Name,                             :fg => :white
+            Name,                             :fg => :white, :bg => :dark_graphite
       style Operator::Word,
             Name::Tag,
             Keyword,

data/lib/rouge/themes/pastie.rb

@@ -6,7 +6,7 @@ module Rouge
     # A port of the pastie style from Pygments.
     # See https://bitbucket.org/birkenfeld/pygments-main/src/default/pygments/styles/pastie.py
     class Pastie < CSSTheme
-      name 'pastie' 
+      name 'pastie'
 
       style Comment,                   :fg => '#888888'
       style Comment::Preproc,          :fg => '#cc0000', :bold => true

data/lib/rouge/util.rb

@@ -75,13 +75,13 @@ module Rouge
     def starts_block(block_state)
       @block_state = block_state
       @block_indentation = @last_indentation || ''
-      puts "    starts_block #{block_state.inspect}" if @debug
+      puts "    starts_block: #{block_state.inspect}" if @debug
       puts "    block_indentation: #{@block_indentation.inspect}" if @debug
     end
 
     # handle a single indented line
     def indentation(indent_str)
-      puts "    indentation #{indent_str.inspect}" if @debug
+      puts "    indentation: #{indent_str.inspect}" if @debug
       puts "    block_indentation: #{@block_indentation.inspect}" if @debug
       @last_indentation = indent_str
 

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "3.5.1"
+    "3.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -113,6 +113,7 @@ files:
 - lib/rouge/demos/nix
 - lib/rouge/demos/objective_c
 - lib/rouge/demos/ocaml
+- lib/rouge/demos/openedge
 - lib/rouge/demos/pascal
 - lib/rouge/demos/perl
 - lib/rouge/demos/php
@@ -167,11 +168,14 @@ files:
 - lib/rouge/demos/wollok
 - lib/rouge/demos/xml
 - lib/rouge/demos/xojo
+- lib/rouge/demos/xpath
+- lib/rouge/demos/xquery
 - lib/rouge/demos/yaml
 - lib/rouge/formatter.rb
 - lib/rouge/formatters/html.rb
 - lib/rouge/formatters/html_inline.rb
 - lib/rouge/formatters/html_legacy.rb
+- lib/rouge/formatters/html_line_table.rb
 - lib/rouge/formatters/html_linewise.rb
 - lib/rouge/formatters/html_pygments.rb
 - lib/rouge/formatters/html_table.rb
@@ -282,6 +286,7 @@ files:
 - lib/rouge/lexers/nix.rb
 - lib/rouge/lexers/objective_c.rb
 - lib/rouge/lexers/ocaml.rb
+- lib/rouge/lexers/openedge.rb
 - lib/rouge/lexers/pascal.rb
 - lib/rouge/lexers/perl.rb
 - lib/rouge/lexers/php.rb
@@ -341,6 +346,8 @@ files:
 - lib/rouge/lexers/wollok.rb
 - lib/rouge/lexers/xml.rb
 - lib/rouge/lexers/xojo.rb
+- lib/rouge/lexers/xpath.rb
+- lib/rouge/lexers/xquery.rb
 - lib/rouge/lexers/yaml.rb
 - lib/rouge/plugins/redcarpet.rb
 - lib/rouge/regex_lexer.rb
@@ -387,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments