rouge 3.11.1 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6194cfb5ce21bf2ed70d2204150a338095ad016b480801c970995c3ecf9cebde
-  data.tar.gz: 6999fdfdc81eeb5aaa808934d27288af6f40280146b13c03ba6d404f1ed73320
+  metadata.gz: 627bdb5578c0590a77e598473fcbe69330f21066cb87bd3463c2acabf31ac950
+  data.tar.gz: d28c6ae9d3a94d4cd81e1e7cd4ba883aa6a41d011569cd3051f140288bed70d8
 SHA512:
-  metadata.gz: f85788d5d1c66521b7b554717d8d1d6b48c7455d01e2e32f13a48d0af26d358b9f1eb66ae0de614b9983d568383f28946add9061aea7ac31e1172d7c09c13f1a
-  data.tar.gz: 790a1f59fc106f19b8ce33ef5df8d3f7255fadcd667cce2dabb38dff424f52df1193c5ac135093ecf3fced1f1f11b924c3c8f158454075dbaf2ae6b02b8f5d5b
+  metadata.gz: 27fc73f1c40e471cb1120f6dab17700fb8155b1a4518c783374088725d35afe896a382e2ec2dd8690505bbe8eaf519396a4e5b4b6154816455b5865be7275244
+  data.tar.gz: 46e1d31f4df9486d498b8bc91b9fee28bfac7681b4acd276bbd084baf5a186ee2324c3fe16626f59df054e43e332b4fbb865115e7fb440b3acb4b3a6a0c0465e

data/lib/rouge/demos/minizinc

@@ -0,0 +1,23 @@
+% from MiniZinc Handbook:
+% https://www.minizinc.org/doc-latest/en/modelling.html
+
+% Colouring Australia using nc colours
+int: nc = 3;
+
+var 1..nc: wa;   var 1..nc: nt;  var 1..nc: sa;   var 1..nc: q;
+var 1..nc: nsw;  var 1..nc: v;   var 1..nc: t;
+
+constraint wa != nt;
+constraint wa != sa;
+constraint nt != sa;
+constraint nt != q;
+constraint sa != q;
+constraint sa != nsw;
+constraint sa != v;
+constraint q != nsw;
+constraint nsw != v;
+solve satisfy;
+
+output ["wa=\(wa)\t nt=\(nt)\t sa=\(sa)\n",
+        "q=\(q)\t nsw=\(nsw)\t v=\(v)\n",
+         "t=", show(t),  "\n"];

data/lib/rouge/lexer.rb

@@ -49,6 +49,9 @@ module Rouge
       #
       #     Lexer.find_fancy('guess', "#!/bin/bash\necho Hello, world")
       #
+      #   If the code matches more than one lexer then Guesser::Ambiguous
+      #   is raised.
+      #
       # This is used in the Redcarpet plugin as well as Rouge's own
       # markdown lexer for highlighting internal code blocks.
       #

data/lib/rouge/lexers/eex.rb

@@ -7,8 +7,9 @@ module Rouge
       desc "Embedded Elixir"
 
       tag 'eex'
+      aliases 'leex'
 
-      filenames '*.eex'
+      filenames '*.eex', '*.leex'
 
       def initialize(opts={})
         @elixir_lexer = Elixir.new(opts)

data/lib/rouge/lexers/markdown.rb

@@ -34,7 +34,13 @@ module Rouge
 
         rule %r/^([ \t]*)(```|~~~)([^\n]*\n)((.*?)(\2))?/m do |m|
           name = m[3].strip
-          sublexer = Lexer.find_fancy(name.empty? ? "guess" : name, m[5], @options)
+          sublexer =
+            begin
+              Lexer.find_fancy(name.empty? ? "guess" : name, m[5], @options)
+            rescue Guesser::Ambiguous => e
+              e.alternatives.first.new(@options)
+            end
+
           sublexer ||= PlainText.new(@options.merge(:token => Str::Backtick))
           sublexer.reset!
 

data/lib/rouge/lexers/mason.rb

@@ -15,11 +15,6 @@ module Rouge
         @perl = Perl.new
       end
   
-      def self.detect?(text)
-        return false if text.doctype?(/((?:ht|x)ml)/)
-        return true if text.doctype?
-      end
-
       # Note: If you add a tag in the lines below, you also need to modify "disambiguate '*.m'" in file disambiguation.rb
       TEXT_BLOCKS = %w(text doc)
       PERL_BLOCKS = %w(args flags attr init once shared perl cleanup filter)

data/lib/rouge/lexers/minizinc.rb

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+# Based on Chroma's MiniZinc lexer:
+# https://github.com/alecthomas/chroma/blob/5152194c717b394686d3d7a7e1946a360ec0728f/lexers/m/minizinc.go
+
+module Rouge
+  module Lexers
+    class MiniZinc < RegexLexer
+      title "MiniZinc"
+      desc "MiniZinc is a free and open-source constraint modeling language (minizinc.org)"
+      tag 'minizinc'
+      filenames '*.mzn', '*.fzn', '*.dzn'
+      mimetypes 'text/minizinc'
+
+      def self.builtins
+        @builtins = Set.new %w[
+          abort abs acosh array_intersect array_union array1d array2d array3d
+          array4d array5d array6d asin assert atan bool2int card ceil concat
+          cos cosh dom dom_array dom_size fix exp floor index_set
+          index_set_1of2 index_set_2of2 index_set_1of3 index_set_2of3
+          index_set_3of3 int2float is_fixed join lb lb_array length ln log log2
+          log10 min max pow product round set2array show show_int show_float
+          sin sinh sqrt sum tan tanh trace ub ub_array
+        ]
+      end
+
+      def self.keywords
+        @keywords = Set.new %w[
+          ann annotation any constraint else endif function for forall if
+          include list of op output minimize maximize par predicate record
+          satisfy solve test then type var where
+        ]
+      end
+
+      def self.keywords_type
+        @keywords_type ||= Set.new %w(
+          array set bool enum float int string tuple
+        )
+      end
+
+      def self.operators
+        @operators ||= Set.new %w(
+          in subset superset union diff symdiff intersect
+        )
+      end
+
+      id = /[$a-zA-Z_]\w*/
+
+      state :root do
+        rule %r(\s+)m, Text::Whitespace
+        rule %r(\\\n)m, Text::Whitespace
+        rule %r(%.*), Comment::Single
+        rule %r(/(\\\n)?[*](.|\n)*?[*](\\\n)?/)m, Comment::Multiline
+        rule %r/"(\\\\|\\"|[^"])*"/, Literal::String
+
+        rule %r(not|<->|->|<-|\\/|xor|/\\), Operator
+        rule %r(<|>|<=|>=|==|=|!=), Operator
+        rule %r(\+|-|\*|/|div|mod), Operator
+        rule %r(\\|\.\.|\+\+), Operator
+        rule %r([|()\[\]{},:;]), Punctuation
+        rule %r((true|false)\b), Keyword::Constant
+        rule %r(([+-]?)\d+(\.(?!\.)\d*)?([eE][-+]?\d+)?), Literal::Number
+
+        rule id do |m|
+          if self.class.keywords.include? m[0]
+            token Keyword
+          elsif self.class.keywords_type.include? m[0]
+            token Keyword::Type
+          elsif self.class.builtins.include? m[0]
+            token Name::Builtin
+          elsif self.class.operators.include? m[0]
+            token Operator
+          else
+            token Name::Other
+          end
+        end
+
+        rule %r(::\s*([^\W\d]\w*)(\s*\([^\)]*\))?), Name::Decorator
+        rule %r(\b([^\W\d]\w*)\b(\()) do
+          groups Name::Function, Punctuation
+        end
+        rule %r([^\W\d]\w*), Name::Other
+      end
+    end
+  end
+end

data/lib/rouge/plugins/redcarpet.rb

@@ -9,7 +9,13 @@ module Rouge
   module Plugins
     module Redcarpet
       def block_code(code, language)
-        lexer = Lexer.find_fancy(language, code) || Lexers::PlainText
+        lexer =
+          begin
+            Lexer.find_fancy(language, code)
+          rescue Guesser::Ambiguous => e
+            e.alternatives.first
+          end
+        lexer ||= Lexers::PlainText
 
         # XXX HACK: Redcarpet strips hard tabs out of code blocks,
         # so we assume you're not using leading spaces that aren't tabs,

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "3.11.1"
+    "3.12.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.12.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -124,6 +124,7 @@ files:
 - lib/rouge/demos/mason
 - lib/rouge/demos/mathematica
 - lib/rouge/demos/matlab
+- lib/rouge/demos/minizinc
 - lib/rouge/demos/moonscript
 - lib/rouge/demos/mosel
 - lib/rouge/demos/msgtrans
@@ -323,6 +324,7 @@ files:
 - lib/rouge/lexers/mathematica/builtins.rb
 - lib/rouge/lexers/matlab.rb
 - lib/rouge/lexers/matlab/builtins.yml
+- lib/rouge/lexers/minizinc.rb
 - lib/rouge/lexers/moonscript.rb
 - lib/rouge/lexers/mosel.rb
 - lib/rouge/lexers/msgtrans.rb