rouge 4.2.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37949922e331ce08a0d8270560930eca1a9b5b0f2c7a4beb8a0c70c47e39e9ac
-  data.tar.gz: 2a9bcecc9809c7211f74be3d294cf21408f76539b804733299b4a54f808a5d0a
+  metadata.gz: 0edd954634b90e384ace60c0f23cc8eb60b53eb25600105b2e235e74edf38008
+  data.tar.gz: 8b3c50c71ca796236f2326a60ff0d84e5b2076fe6314a48c5393d1419e448c9d
 SHA512:
-  metadata.gz: a2f8da79bd3fcf3c5449a2cc4ccd3a2fdaca4c0bbc33748f3d4552061771f458d9b2fc890d72445576240a446672aa09fea559ed5eb7c65f68f700bf8c1999ed
-  data.tar.gz: f0908d8e6ad216c960496da16778ce6c2e5ff4762a4cf8e1de71b4a68c2d113293462a0186bcbee83280da6c1ef5c6fa8ef9456899e14aad8f9a2bafd903e7f0
+  metadata.gz: 671d9550dc89a8aef885d3efe1fd31f1cabeabaff551574f6cf9aac15fae73b03f2483ae3436c267685175500dc728d5dc8326e183d6bca0fa79b4fdf8eb712f
+  data.tar.gz: 4ee512eb60833a549e3ce3e3234857f4c547b143eb563dce090db626769f99a2386a8dbb06ca4e0fcc54fa8c4d3931fb8c2e904200b408d6b8ad3699da4f841c

data/lib/rouge/demos/iecst

@@ -0,0 +1,21 @@
+// first-order lag derivative term
+(*
+  Parameter K must be set to T / (T + T1)
+*)
+FUNCTION_BLOCK DT2
+
+VAR_INPUT
+  IN : REAL;
+  K : REAL;
+END_VAR
+VAR_OUTPUT
+  Q : REAL;
+END_VAR
+VAR
+  H : REAL := 0.0;
+END_VAR
+
+BEGIN
+  Q := IN - H;
+  H := H + K * Q;
+END_FUNCTION_BLOCK

data/lib/rouge/demos/mojo

@@ -0,0 +1,10 @@
+fn fib(n: Int): # write Fibonacci series up to n
+    """Print a Fibonacci series up to n."""
+    var a = 0
+    var b = 1
+    while a < n:
+        print(a)
+        a, b = b, a+b
+
+fn main():
+    fib(10)

data/lib/rouge/demos/p4

@@ -0,0 +1,99 @@
+#include <core.p4>
+#include <v1model.p4>
+
+const bit<16> TYPE_IPV4 = 0x800;
+typedef bit<9>  egressSpec_t;
+typedef bit<48> macAddr_t;
+typedef bit<32> ip4Addr_t;
+
+header ethernet_t {
+    macAddr_t dstAddr;
+    macAddr_t srcAddr;
+    bit<16>   etherType;
+}
+
+header ipv4_t {
+    bit<4>    version;
+    bit<4>    ihl;
+    bit<8>    diffserv;
+    bit<16>   totalLen;
+    bit<16>   identification;
+    bit<3>    flags;
+    bit<13>   fragOffset;
+    bit<8>    ttl;
+    bit<8>    protocol;
+    bit<16>   hdrChecksum;
+    ip4Addr_t srcAddr;
+    ip4Addr_t dstAddr;
+}
+
+struct metadata { /* empty */ }
+
+struct headers {
+    ethernet_t   ethernet;
+    ipv4_t       ipv4;
+}
+
+parser MyParser(packet_in packet,
+                out headers hdr,
+                inout metadata meta,
+                inout standard_metadata_t standard_metadata) {
+
+    state start { transition parse_ethernet; }
+
+    state parse_ethernet {
+        packet.extract(hdr.ethernet);
+        transition select(hdr.ethernet.etherType) {
+            TYPE_IPV4: parse_ipv4;
+            default: accept;
+        }
+    }
+
+    state parse_ipv4 {
+        packet.extract(hdr.ipv4);
+        transition accept;
+    }
+
+}
+
+control MyIngress(inout headers hdr,
+                  inout metadata meta,
+                  inout standard_metadata_t standard_metadata) {
+    action drop() {
+        mark_to_drop(standard_metadata);
+    }
+
+    action ipv4_forward(macAddr_t dstAddr, egressSpec_t port) {
+        standard_metadata.egress_spec = port;
+        hdr.ethernet.srcAddr = hdr.ethernet.dstAddr;
+        hdr.ethernet.dstAddr = dstAddr;
+        hdr.ipv4.ttl = hdr.ipv4.ttl - 1;
+    }
+
+    table ipv4_lpm {
+        key = { hdr.ipv4.dstAddr: lpm; }
+        actions = { ipv4_forward; drop; NoAction; }
+        size = 1024;
+        default_action = drop();
+    }
+
+    apply {
+        if (hdr.ipv4.isValid()) {
+            ipv4_lpm.apply();
+        }
+    }
+}
+
+
+control MyDeparser(packet_out packet, in headers hdr) {
+    apply {
+        packet.emit(hdr.ethernet);
+        packet.emit(hdr.ipv4);
+    }
+}
+
+V1Switch(
+MyParser(),
+MyIngress(),
+MyDeparser()
+) main;

data/lib/rouge/guessers/disambiguation.rb

@@ -140,12 +140,17 @@ module Rouge
 
         Puppet
       end
-      
+
       disambiguate '*.p' do
         next Prolog if contains?(':-')
         next Prolog if matches?(/\A\w+(\(\w+\,\s*\w+\))*\./)
         next OpenEdge
       end
+
+      disambiguate '*.st' do
+        next IecST if matches?(/^\s*END_/i)
+        next Smalltalk
+      end
     end
   end
 end

data/lib/rouge/lexers/brainfuck.rb

@@ -9,6 +9,7 @@ module Rouge
       mimetypes 'text/x-brainfuck'
 
       title "Brainfuck"
+      aliases "bf"
       desc "The Brainfuck programming language"
 
       start { push :bol }

data/lib/rouge/lexers/crystal.rb

@@ -21,7 +21,7 @@ module Rouge
         rule %r(
           :  # initial :
           @{0,2} # optional ivar, for :@foo and :@@foo
-          [a-z_]\w*[!?]? # the symbol
+          [\p{Ll}_]\p{Word}*[!?]? # the symbol
         )xi, Str::Symbol
 
         # special symbols
@@ -35,7 +35,7 @@ module Rouge
         # %-sigiled strings
         # %(abc), %[abc], %<abc>, %.abc., %r.abc., etc
         delimiter_map = { '{' => '}', '[' => ']', '(' => ')', '<' => '>' }
-        rule %r/%([rqswQWxiI])?([^\w\s}])/ do |m|
+        rule %r/%([rqswQWxiI])?([^\p{Word}\s}])/ do |m|
           open = Regexp.escape(m[2])
           close = Regexp.escape(delimiter_map[m[2]] || m[2])
           interp = /[rQWxI]/ === m[1]
@@ -77,7 +77,7 @@ module Rouge
 
       state :strings do
         mixin :symbols
-        rule %r/\b[a-z_]\w*?[?!]?:\s+/, Str::Symbol, :expr_start
+        rule %r/\b[\p{Ll}_]\p{Word}*?[?!]?:\s+/, Str::Symbol, :expr_start
         rule %r/"/, Str::Double, :simple_string
         rule %r/(?<!\.)`/, Str::Backtick, :simple_backtick
         rule %r/(')(\\u[a-fA-F0-9]{4}|\\u\{[a-fA-F0-9]{1,6}\}|\\[abefnrtv])?(\\\\|\\'|[^'])*(')/ do
@@ -166,9 +166,9 @@ module Rouge
         rule %r/@\[([^\]]+)\]/, Name::Decorator
 
         # names
-        rule %r/@@[a-z_]\w*/i, Name::Variable::Class
-        rule %r/@[a-z_]\w*/i, Name::Variable::Instance
-        rule %r/\$\w+/, Name::Variable::Global
+        rule %r/@@[\p{Ll}_]\p{Word}*/i, Name::Variable::Class
+        rule %r/@[\p{Ll}_]\p{Word}*/i, Name::Variable::Instance
+        rule %r/\$\p{Word}+/, Name::Variable::Global
         rule %r(\$[!@&`'+~=/\\,;.<>_*\$?:"]), Name::Variable::Global
         rule %r/\$-[0adFiIlpvw]/, Name::Variable::Global
         rule %r/::/, Operator
@@ -181,7 +181,7 @@ module Rouge
         rule %r(
           (module)
           (\s+)
-          ([a-zA-Z_][a-zA-Z0-9_]*(::[a-zA-Z_][a-zA-Z0-9_]*)*)
+          ([\p{L}_][\p{L}0-9_]*(::[\p{L}_][\p{L}0-9_]*)*)
         )x do
           groups Keyword, Text, Name::Namespace
         end
@@ -207,14 +207,14 @@ module Rouge
         # Otherwise, they will be parsed as :method_call
         rule %r/\.{2,3}/, Operator, :expr_start
 
-        rule %r/[A-Z][a-zA-Z0-9_]*/, Name::Constant, :method_call
-        rule %r/(\.|::)(\s*)([a-z_]\w*[!?]?|[*%&^`~+-\/\[<>=])/ do
+        rule %r/[\p{Lu}][\p{L}0-9_]*/, Name::Constant, :method_call
+        rule %r/(\.|::)(\s*)([\p{Ll}_]\p{Word}*[!?]?|[*%&^`~+-\/\[<>=])/ do
           groups Punctuation, Text, Name::Function
           push :method_call
         end
 
-        rule %r/[a-zA-Z_]\w*[?!]/, Name, :expr_start
-        rule %r/[a-zA-Z_]\w*/, Name, :method_call
+        rule %r/[\p{L}_]\p{Word}*[?!]/, Name, :expr_start
+        rule %r/[\p{L}_]\p{Word}*/, Name, :method_call
         rule %r/\*\*|\/\/|>=|<=|<=>|<<?|>>?|=~|={3}|!~|&&?|\|\||\./,
           Operator, :expr_start
         rule %r/{%|%}/, Punctuation
@@ -225,7 +225,7 @@ module Rouge
       end
 
       state :has_heredocs do
-        rule %r/(?<!\w)(<<[-~]?)(["`']?)([a-zA-Z_]\w*)(\2)/ do |m|
+        rule %r/(?<!\p{Word})(<<[-~]?)(["`']?)([\p{L}_]\p{Word}*)(\2)/ do |m|
           token Operator, m[1]
           token Name::Constant, "#{m[2]}#{m[3]}#{m[4]}"
           @heredoc_queue << [['<<-', '<<~'].include?(m[1]), m[3]]
@@ -282,9 +282,9 @@ module Rouge
         rule %r/\s+/, Text
         rule %r/\(/, Punctuation, :defexpr
         rule %r(
-          (?:([a-zA-Z_]\w*)(\.))?
+          (?:([\p{L}_]\p{Word}*)(\.))?
           (
-            [a-zA-Z_]\w*[!?]? |
+            [\p{L}_]\p{Word}*[!?]? |
             \*\*? | [-+]@? | [/%&\|^`~] | \[\]=? |
             <<? | >>? | <=>? | >= | ===?
           )
@@ -311,7 +311,7 @@ module Rouge
           goto :expr_start
         end
 
-        rule %r/[A-Z_]\w*/, Name::Class, :pop!
+        rule %r/[\p{Lu}_]\p{Word}*/, Name::Class, :pop!
 
         rule(//) { pop! }
       end
@@ -343,7 +343,7 @@ module Rouge
 
       state :string_intp do
         rule %r/[#][{]/, Str::Interpol, :in_interp
-        rule %r/#(@@?|\$)[a-z_]\w*/i, Str::Interpol
+        rule %r/#(@@?|\$)[\p{Ll}_]\p{Word}*/i, Str::Interpol
       end
 
       state :string_intp_escaped do
@@ -399,7 +399,7 @@ module Rouge
         rule %r(
           [?](\\[MC]-)*     # modifiers
           (\\([\\abefnrstv\#"']|x[a-fA-F0-9]{1,2}|[0-7]{1,3})|\S)
-          (?!\w)
+          (?!\p{Word})
         )x, Str::Char, :pop!
 
         # special case for using a single space.  Ruby demands that

data/lib/rouge/lexers/docker.rb

@@ -7,8 +7,8 @@ module Rouge
       title "Docker"
       desc "Dockerfile syntax"
       tag 'docker'
-      aliases 'dockerfile', 'Dockerfile'
-      filenames 'Dockerfile', '*.Dockerfile', '*.docker'
+      aliases 'dockerfile', 'Dockerfile', 'containerfile', 'Containerfile'
+      filenames 'Dockerfile', '*.Dockerfile', '*.docker', 'Containerfile', '*.Containerfile'
       mimetypes 'text/x-dockerfile-config'
 
       KEYWORDS = %w(

data/lib/rouge/lexers/eiffel.rb

@@ -44,7 +44,7 @@ module Rouge
         rule %r/(?:\d(?:_*\d)*)?\.(?:(?:\d(?:_*\d)*)?[eE][+-]?)?\d(?:_*\d)*|\d(?:_*\d)*\.?/, Num::Float
 
         rule %r/:=|<<|>>|\(\||\|\)|->|\.|[{}\[\];(),:?]/, Punctuation::Indicator
-        rule %r/\\\\|\|\.\.\||\.\.|\/[~\/]?|[><\/]=?|[-+*^=~]/, Operator
+        rule %r/\\\\|\|\.\.\||\.\.|\/[~\/]?|[><\/]=?|[-+*^=~≤≥−∀∃¦⟳⟲]/, Operator
 
         rule %r/[A-Z][\dA-Z_]*/, Name::Class
         rule %r/[A-Za-z][\dA-Za-z_]*/, Name

data/lib/rouge/lexers/hcl.rb

@@ -26,6 +26,7 @@ module Rouge
       state :primitives do
         rule %r/[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?([kKmMgG]b?)?/, Num::Float
         rule %r/[0-9]+([kKmMgG]b?)?/, Num::Integer
+        rule %r/[-+*\/!%&<>|=:?]/, Operator
 
         rule %r/"/, Str::Double, :dq
         rule %r/'/, Str::Single, :sq

data/lib/rouge/lexers/iecst.rb

@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class IecST < RegexLexer
+      tag 'iecst'
+      title "IEC 61131-3 Structured Text"
+      desc 'Structured text is a programming language for PLCs (programmable logic controllers).'
+      filenames '*.awl', '*.scl', '*.st'
+
+      mimetypes 'text/x-iecst'
+
+      def self.keywords
+        blocks = %w(
+          PROGRAM CONFIGURATION INITIAL_STEP INTERFACE FUNCTION_BLOCK FUNCTION ACTION TRANSITION
+          TYPE STRUCT STEP NAMESPACE LIBRARY CHANNEL FOLDER RESOURCE
+          VAR_ACCESS VAR_CONFIG VAR_EXTERNAL VAR_GLOBAL VAR_INPUT VAR_IN_OUT VAR_OUTPUT VAR_TEMP VAR
+          CONST METHOD PROPERTY
+          CASE FOR IF REPEAT WHILE
+        )
+        @keywords ||= Set.new %w(
+          AT BEGIN BY CONSTANT CONTINUE DO ELSE ELSIF EXIT EXTENDS FROM GET GOTO IMPLEMENTS JMP
+          NON_RETAIN OF PRIVATE PROTECTED PUBLIC RETAIN RETURN SET TASK THEN TO UNTIL USING WITH
+          __CATCH __ENDTRY __FINALLY __TRY
+        ) + blocks + blocks.map {|kw| "END_" + kw}
+      end
+
+      def self.types
+        @types ||= Set.new %w(
+          ANY ARRAY BOOL BYTE POINTER STRING
+          DATE DATE_AND_TIME DT TIME TIME_OF_DAY TOD
+          INT DINT LINT SINT UINT UDINT ULINT USINT
+          WORD DWORD LWORD
+          REAL LREAL
+        )
+      end
+
+      def self.literals
+        @literals ||= Set.new %w(TRUE FALSE NULL)
+      end
+
+      def self.operators
+        @operators ||= Set.new %w(AND EQ EXPT GE GT LE LT MOD NE NOT OR XOR)
+      end
+
+      state :whitespace do
+        # Spaces
+        rule %r/\s+/m, Text
+        # // Comments
+        rule %r((//).*$\n?), Comment::Single
+        # (* Comments *)
+        rule %r(\(\*.*?\*\))m, Comment::Multiline
+        # { Comments }
+        rule %r(\{.*?\})m, Comment::Special
+      end
+
+      state :root do
+        mixin :whitespace
+
+        rule %r/'[^']+'/, Literal::String::Single
+        rule %r/"[^"]+"/, Literal::String::Symbol
+        rule %r/%[IQM][XBWDL][\d.]*|%[IQ][\d.]*/, Name::Variable::Magic
+        rule %r/\b(?:D|DT|T|TOD)#[\d_shmd:]*/i, Literal::Date
+        rule %r/\b(?:16#[\d_a-f]+|0x[\d_a-f]+)\b/i, Literal::Number::Hex
+        rule %r/\b2#[01_]+/, Literal::Number::Bin
+        rule %r/(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:e[+-]?\d+)?/i, Literal::Number::Float
+        rule %r/\b[\d.,_]+/, Literal::Number
+
+        rule %r/\b[A-Z_]+\b/i do |m|
+          name = m[0].upcase
+          if self.class.keywords.include?(name)
+            token Keyword
+          elsif self.class.types.include?(name)
+            token Keyword::Type
+          elsif self.class.literals.include?(name)
+            token Literal
+          elsif self.class.operators.include?(name)
+            token Operator
+          else
+            token Name
+          end
+        end
+
+        rule %r/S?R?:?=>?|&&?|\*\*?|<[=>]?|>=?|[-:^\/+#]/, Operator
+        rule %r/\b[a-z_]\w*(?=\s*\()/i, Name::Function
+        rule %r/\b[a-z_]\w*\b/i, Name
+        rule %r/[()\[\].,;]/, Punctuation
+      end
+    end
+  end
+end

data/lib/rouge/lexers/javascript.rb

@@ -100,7 +100,7 @@ module Rouge
 
       def self.keywords
         @keywords ||= Set.new %w(
-          as async await break case catch continue debugger default delete
+          async await break case catch continue debugger default delete
           do else export finally from for if import in instanceof new of
           return super switch this throw try typeof void while yield
         )

data/lib/rouge/lexers/make.rb

@@ -40,6 +40,10 @@ module Rouge
           groups Keyword, Text, Name::Variable
         end
 
+        rule %r/(else\b)([\t ]+)((?:ifn?def|ifn?eq)\b)([\t ]+)([^#\n]+)/ do
+          groups Keyword, Text, Keyword, Text, Name::Variable
+        end
+
         rule %r/(?:else|endif|endef|endfor)[\t ]*(?=[#\n])/, Keyword
 
         rule %r/(export)([\t ]+)(?=[\w\${}()\t -]+\n)/ do

data/lib/rouge/lexers/markdown.rb

@@ -107,7 +107,8 @@ module Rouge
           push :link
         end
 
-        rule %r/[*][*]#{edot}*?[*][*]/, Generic::Strong
+        rule %r/[*]{2}[^* \n][^*\n]*[*]{2}/, Generic::Strong
+        rule %r/[*]{3}[^* \n][^*\n]*[*]{3}/, Generic::EmphStrong
         rule %r/__#{edot}*?__/, Generic::Strong
 
         rule %r/[*]#{edot}*?[*]/, Generic::Emph

data/lib/rouge/lexers/mathematica.rb

@@ -7,7 +7,7 @@ module Rouge
       title "Mathematica"
       desc "Wolfram Mathematica, the world's definitive system for modern technical computing."
       tag 'mathematica'
-      aliases 'wl'
+      aliases 'wl', 'wolfram'
       filenames '*.m', '*.wl'
       mimetypes 'application/vnd.wolfram.mathematica.package', 'application/vnd.wolfram.wl'
 

data/lib/rouge/lexers/mojo.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    load_lexer 'python.rb'
+    
+    class Mojo < Python
+      title "Mojo"
+      desc "The Mojo programming language (modular.com)"
+      tag 'mojo'
+      aliases 'mojo'
+      filenames '*.mojo', '*.🔥'
+      mimetypes 'text/x-mojo', 'application/x-mojo'
+
+      def self.detect?(text)
+        return true if text.shebang?(/mojow?(?:[23](?:\.\d+)?)?/)
+      end
+
+      def self.keywords
+        @keywords ||= super + %w(
+          fn self alias inout borrowed owned ref var
+          struct trait raises with in match case
+        )
+      end
+
+      def self.builtins
+        @builtins ||= super + %w(
+          __mlir_attr __mlir_type __mlir_op parameter alwaysinline
+          register_passable
+        )
+      end
+    end
+  end
+end

data/lib/rouge/lexers/objective_c.rb

@@ -12,7 +12,7 @@ module Rouge
       tag 'objective_c'
       title "Objective-C"
       desc 'an extension of C commonly used to write Apple software'
-      aliases 'objc', 'obj-c', 'obj_c', 'objectivec'
+      aliases 'objc', 'obj-c', 'obj_c', 'objectivec', 'objective-c'
       filenames '*.m', '*.h'
 
       mimetypes 'text/x-objective_c', 'application/x-objective_c'

data/lib/rouge/lexers/p4.rb

@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*- #
+# frozen_string_literal: true
+
+module Rouge
+  module Lexers
+    class P4 < RegexLexer
+      tag 'p4'
+      title 'P4'
+      desc 'The P4 programming language'
+      filenames '*.p4'
+      mimetypes 'text/x-p4'
+
+      def self.keywords
+        @keywords ||= %w(
+          abstract action actions apply const default default_action else enum
+          entries extern exit if in inout key list out package packet_in
+          packet_out return size select switch this transition tuple type
+          typedef
+        )
+      end
+
+      def self.operators
+        @operators ||= %w(
+          \|\+\| \|-\| \? \& \&\&\& < > << >> \* \| ~ \^ - \+ /
+          \# \. = != <= >= \+\+
+        )
+      end
+
+      def self.decls
+        @decls ||= %w(
+          control header header_union parser state struct table
+          value_set
+        )
+      end
+
+      def self.builtins
+        @builtins ||= %w(
+          bit bool error extract int isValid setValid setInvalid match_kind
+          string varbit verify void
+        )
+      end
+
+      state :whitespace do
+        rule %r/\s+/m, Text
+      end
+
+      state :comment do
+        rule %r((//).*$\n?), Comment::Single
+        rule %r/\/\*(?:(?!\*\/).)*\*\//m, Comment::Multiline
+      end
+
+      state :number do
+        rule %r/([0-9]+[sw])?0[oO][0-7_]+/, Num
+        rule %r/([0-9]+[sw])?0[xX][0-9a-fA-F_]+/, Num
+        rule %r/([0-9]+[sw])?0[bB][01_]+/, Num
+        rule %r/([0-9]+[sw])?0[dD][0-9_]+/, Num
+        rule %r/([0-9]+[sw])?[0-9_]+/, Num
+      end
+
+      id = /[\p{XID_Start}_]\p{XID_Continue}*/
+      string_element  = /\\"|[^"]/x
+
+      state :root do
+        mixin :whitespace
+        mixin :comment
+
+        rule %r/#\s*#{id}/, Comment::Preproc
+        rule %r/\b(?:#{P4.keywords.join('|')})\b/, Keyword
+        rule %r/\b(?:#{P4.decls.join('|')})\b/, Keyword::Declaration
+        rule %r/\b(?:#{P4.builtins.join('|')})\b/, Name::Builtin
+        rule %r/\b#{id}_[th]\b/x, Name::Class
+        rule %r/(?:#{P4.operators.join('|')})/x, Operator
+        rule %r/[(){}\[\]<>,:;\.]/, Punctuation
+        mixin :number
+        rule %r/@#{id}/x, Name::Label
+        rule %r/#{id}/x, Text
+        rule %r/"(?: #{string_element} )*"/x, Str::String
+      end
+    end
+  end
+end

data/lib/rouge/lexers/ruby.rb

@@ -24,7 +24,7 @@ module Rouge
         rule %r(
           :  # initial :
           @{0,2} # optional ivar, for :@foo and :@@foo
-          [a-z_]\w*[!?]? # the symbol
+          [\p{Ll}_]\p{Word}*[!?]? # the symbol
         )xi, Str::Symbol
 
         # special symbols
@@ -39,7 +39,7 @@ module Rouge
         # %-sigiled strings
         # %(abc), %[abc], %<abc>, %.abc., %r.abc., etc
         delimiter_map = { '{' => '}', '[' => ']', '(' => ')', '<' => '>' }
-        rule %r/%([rqswQWxiI])?([^\w\s])/ do |m|
+        rule %r/%([rqswQWxiI])?([^\p{Word}\s])/ do |m|
           open = Regexp.escape(m[2])
           close = Regexp.escape(delimiter_map[m[2]] || m[2])
           interp = /[rQWxI]/ === m[1] || !m[1]
@@ -83,7 +83,7 @@ module Rouge
 
       state :strings do
         mixin :symbols
-        rule %r/\b[a-z_]\w*?[?!]?:\s+/, Str::Symbol, :expr_start
+        rule %r/\b[\p{Ll}_]\p{Word}*?[?!]?:\s+/, Str::Symbol, :expr_start
         rule %r/'(\\\\|\\'|[^'])*'/, Str::Single
         rule %r/"/, Str::Double, :simple_string
         rule %r/(?<!\.)`/, Str::Backtick, :simple_backtick
@@ -177,9 +177,9 @@ module Rouge
         rule decimal, Num::Integer
 
         # names
-        rule %r/@@[a-z_]\w*/i, Name::Variable::Class
-        rule %r/@[a-z_]\w*/i, Name::Variable::Instance
-        rule %r/\$\w+/, Name::Variable::Global
+        rule %r/@@[\p{Ll}_]\p{Word}*/i, Name::Variable::Class
+        rule %r/@[\p{Ll}_]\p{Word}*/i, Name::Variable::Instance
+        rule %r/\$\p{Word}+/, Name::Variable::Global
         rule %r(\$[!@&`'+~=/\\,;.<>_*\$?:"]), Name::Variable::Global
         rule %r/\$-[0adFiIlpvw]/, Name::Variable::Global
         rule %r/::/, Operator
@@ -193,7 +193,7 @@ module Rouge
         rule %r(
           (module)
           (\s+)
-          ([a-zA-Z_][a-zA-Z0-9_]*(::[a-zA-Z_][a-zA-Z0-9_]*)*)
+          ([\p{L}_][\p{L}0-9_]*(::[\p{L}_][\p{L}0-9_]*)*)
         )x do
           groups Keyword, Text, Name::Namespace
         end
@@ -219,14 +219,14 @@ module Rouge
         # Otherwise, they will be parsed as :method_call
         rule %r/\.{2,3}/, Operator, :expr_start
 
-        rule %r/[A-Z][a-zA-Z0-9_]*/, Name::Constant, :method_call
-        rule %r/(\.|::)(\s*)([a-z_]\w*[!?]?|[*%&^`~+-\/\[<>=])/ do
+        rule %r/[\p{Lu}][\p{L}0-9_]*/, Name::Constant, :method_call
+        rule %r/(\.|::)(\s*)([\p{Ll}_]\p{Word}*[!?]?|[*%&^`~+-\/\[<>=])/ do
           groups Punctuation, Text, Name::Function
           push :method_call
         end
 
-        rule %r/[a-zA-Z_]\w*[?!]/, Name, :expr_start
-        rule %r/[a-zA-Z_]\w*/, Name, :method_call
+        rule %r/[\p{L}_]\p{Word}*[?!]/, Name, :expr_start
+        rule %r/[\p{L}_]\p{Word}*/, Name, :method_call
         rule %r/\*\*|<<?|>>?|>=|<=|<=>|=~|={3}|!~|&&?|\|\||\./,
           Operator, :expr_start
         rule %r/[-+\/*%=<>&!^|~]=?/, Operator, :expr_start
@@ -236,7 +236,7 @@ module Rouge
       end
 
       state :has_heredocs do
-        rule %r/(?<!\w)(<<[-~]?)(["`']?)([a-zA-Z_]\w*)(\2)/ do |m|
+        rule %r/(?<!\p{Word})(<<[-~]?)(["`']?)([\p{L}_]\p{Word}*)(\2)/ do |m|
           token Operator, m[1]
           token Name::Constant, "#{m[2]}#{m[3]}#{m[4]}"
           @heredoc_queue << [['<<-', '<<~'].include?(m[1]), m[3]]
@@ -293,9 +293,9 @@ module Rouge
         rule %r/\s+/, Text
         rule %r/\(/, Punctuation, :defexpr
         rule %r(
-          (?:([a-zA-Z_]\w*)(\.))?
+          (?:([\p{L}_]\p{Word}*)(\.))?
           (
-            [a-zA-Z_]\w*[!?]? |
+            [\p{L}_]\p{Word}*[!?]? |
             \*\*? | [-+]@? | [/%&\|^`~] | \[\]=? |
             <<? | >>? | <=>? | >= | ===?
           )
@@ -310,7 +310,7 @@ module Rouge
 
       state :classname do
         rule %r/\s+/, Text
-        rule %r/\w+(::\w+)+/, Name::Class
+        rule %r/\p{Word}+(::\p{Word}+)+/, Name::Class
 
         rule %r/\(/ do
           token Punctuation
@@ -324,7 +324,7 @@ module Rouge
           goto :expr_start
         end
 
-        rule %r/[A-Z_]\w*/, Name::Class, :pop!
+        rule %r/[\p{Lu}_]\p{Word}*/, Name::Class, :pop!
 
         rule(//) { pop! }
       end
@@ -364,7 +364,7 @@ module Rouge
 
       state :string_intp do
         rule %r/[#][{]/, Str::Interpol, :in_interp
-        rule %r/#(@@?|\$)[a-z_]\w*/i, Str::Interpol
+        rule %r/#(@@?|\$)[\p{Ll}_]\p{Word}*/i, Str::Interpol
       end
 
       state :string_intp_escaped do
@@ -419,7 +419,7 @@ module Rouge
         rule %r(
           [?](\\[MC]-)*     # modifiers
           (\\([\\abefnrstv\#"']|x[a-fA-F0-9]{1,2}|[0-7]{1,3})|\S)
-          (?!\w)
+          (?!\p{Word})
         )x, Str::Char, :pop!
 
         # special case for using a single space.  Ruby demands that

data/lib/rouge/lexers/tcl.rb

@@ -57,9 +57,9 @@ module Rouge
 
       def self.gen_command_state(name='')
         state(:"command#{name}") do
-          mixin :word
+          rule %r/#/, Comment, :comment
 
-          rule %r/##{NOT_CHARS[END_LINE]}+/, Comment::Single
+          mixin :word
 
           rule %r/(?=#{CHARS[END_WORD]})/ do
             push :"params#{name}"
@@ -163,6 +163,11 @@ module Rouge
         rule %r/\\./m, Str::Escape
       end
 
+      state :comment do
+        rule %r/.*[^\\]\n/, Comment, :pop!
+        rule %r/.*\\\n/, Comment
+      end
+
       state :string do
         rule %r/"/, Str::Double, :pop!
         mixin :interp

data/lib/rouge/lexers/toml.rb

@@ -48,7 +48,8 @@ module Rouge
           groups Name::Property, Text, Punctuation
         end
 
-        rule %r/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z/, Literal::Date
+        rule %r/\d{4}-\d{2}-\d{2}(?:[Tt ]\d{2}:\d{2}:\d{2}(?:[Zz]|[+-]\d{2}:\d{2})?)?/, Literal::Date
+        rule %r/\d{2}:\d{2}:\d{2}/, Literal::Date
 
         rule %r/[+-]?\d+(?:_\d+)*\.\d+(?:_\d+)*(?:[eE][+-]?\d+(?:_\d+)*)?/, Num::Float
         rule %r/[+-]?\d+(?:_\d+)*[eE][+-]?\d+(?:_\d+)*/, Num::Float

data/lib/rouge/lexers/typescript/common.rb

@@ -37,6 +37,15 @@ module Rouge
         base.prepend :root do
           rule %r/[?][.]/, base::Punctuation
           rule %r/[?]{2}/, base::Operator
+
+          # Positive Examples:
+          # const cat = { name: "Garfield" } satisfies Person;
+          # import {something as thingy} from 'module'
+          # export { foo as default }
+          # ...spreadOperator as const;
+          # Negative Example:
+          # cy.get('kitten').as('friend')
+          rule %r{(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))(?:(as)|(satisfies))\s+}, base::Keyword::Declaration
         end
 
         base.prepend :statement do

data/lib/rouge/themes/base16.rb

@@ -3,27 +3,28 @@
 
 module Rouge
   module Themes
-    # default base16 theme
-    # by Chris Kempson (http://chriskempson.com)
+    # author Chris Kempson
+    # base16 default dark
+    # https://github.com/chriskempson/base16-default-schemes
     class Base16 < CSSTheme
       name 'base16'
 
-      palette base00: "#151515"
-      palette base01: "#202020"
-      palette base02: "#303030"
-      palette base03: "#505050"
-      palette base04: "#b0b0b0"
-      palette base05: "#d0d0d0"
-      palette base06: "#e0e0e0"
-      palette base07: "#f5f5f5"
-      palette base08: "#ac4142"
-      palette base09: "#d28445"
-      palette base0A: "#f4bf75"
-      palette base0B: "#90a959"
-      palette base0C: "#75b5aa"
-      palette base0D: "#6a9fb5"
-      palette base0E: "#aa759f"
-      palette base0F: "#8f5536"
+      palette base00: "#181818"
+      palette base01: "#282828"
+      palette base02: "#383838"
+      palette base03: "#585858"
+      palette base04: "#b8b8b8"
+      palette base05: "#d8d8d8"
+      palette base06: "#e8e8e8"
+      palette base07: "#f8f8f8"
+      palette base08: "#ab4642"
+      palette base09: "#dc9656"
+      palette base0A: "#f7ca88"
+      palette base0B: "#a1b56c"
+      palette base0C: "#86c1b9"
+      palette base0D: "#7cafc2"
+      palette base0E: "#ba8baf"
+      palette base0F: "#a16946"
 
       extend HasModes
 
@@ -60,6 +61,10 @@ module Rouge
       style Generic::Deleted, :fg => :base08
       style Generic::Heading, :fg => :base0D, :bg => :base00, :bold => true
 
+      style Generic::Emph, :italic => true
+      style Generic::EmphStrong, :italic => true, :bold => true
+      style Generic::Strong, :bold => true
+
       style Keyword, :fg => :base0E
       style Keyword::Constant,
             Keyword::Type, :fg => :base09

data/lib/rouge/themes/bw.rb

@@ -33,6 +33,7 @@ module Rouge
       style Generic::Heading,            :bold => true
       style Generic::Subheading,         :bold => true
       style Generic::Emph,               :italic => true
+      style Generic::EmphStrong,         :italic => true, :bold => true
       style Generic::Strong,             :bold => true
       style Generic::Prompt,             :bold => true
 

data/lib/rouge/themes/colorful.rb

@@ -58,6 +58,7 @@ module Rouge
       style Generic::Inserted,           :fg => "#00A000"
       style Generic::Error,              :fg => "#FF0000"
       style Generic::Emph,               :italic => true
+      style Generic::EmphStrong,         :italic => true, :bold => true
       style Generic::Strong,             :bold => true
       style Generic::Prompt,             :fg => "#c65d09", :bold => true
       style Generic::Output,             :fg => "#888"

data/lib/rouge/themes/github.rb

@@ -111,6 +111,7 @@ module Rouge
             Name::Tag,                  :fg => :tag
 
       style Generic::Inserted,          :fg => :fgInserted, :bg => :bgInserted
+      style Generic::EmphStrong, :italic => true, :bold => true
 
       style Keyword::Constant,
             Literal,

data/lib/rouge/themes/gruvbox.rb

@@ -140,6 +140,10 @@ module Rouge
       style Generic::Deleted, :fg => :red, :bg => :bg0
       style Generic::Heading, :fg => :green, :bold => true
 
+      style Generic::Emph, :italic => true
+      style Generic::EmphStrong, :italic => true, :bold => true
+      style Generic::Strong, :bold => true
+
       style Keyword, :fg => :red
       style Keyword::Constant, :fg => :purple
       style Keyword::Type, :fg => :yellow
@@ -164,7 +168,6 @@ module Rouge
       style Literal::Number, :fg => :purple
 
       style Literal::String::Symbol, :fg => :blue
-
     end
   end
 end

data/lib/rouge/themes/igor_pro.rb

@@ -10,6 +10,9 @@ module Rouge
       style Comment::Preproc,                 :fg => '#CC00A3'
       style Comment::Special,                 :fg => '#CC00A3'
       style Comment,                          :fg => '#FF0000'
+      style Generic::Emph,                    :italic => true
+      style Generic::EmphStrong,              :italic => true, :bold => true
+      style Generic::Strong,                  :bold => true
       style Keyword::Constant,                :fg => '#C34E00'
       style Keyword::Declaration,             :fg => '#0000FF'
       style Keyword::Reserved,                :fg => '#007575'

data/lib/rouge/themes/magritte.rb

@@ -41,6 +41,7 @@ module Rouge
       style Generic::Deleted,             :fg => :cherry
       style Generic::Inserted,            :fg => :forest
       style Generic::Emph,                :italic => true
+      style Generic::EmphStrong,          :italic => true, :bold => true
       style Generic::Strong,              :bold => true
       style Generic::Traceback,           :fg => :black, :bg => :lavender
       style Keyword::Constant,            :fg => :forest, :bold => true

data/lib/rouge/themes/molokai.rb

@@ -25,7 +25,8 @@ module Rouge
       style Error,                            :fg => :white, :bg => :grey
       style Generic::Inserted,                :fg => :green
       style Generic::Deleted,                 :fg => :red
-      style Generic::Emph,                    :fg => :black, :italic => true
+      style Generic::Emph,                    :italic => true
+      style Generic::EmphStrong,              :italic => true, :bold => true
       style Generic::Error,
             Generic::Traceback,               :fg => :red
       style Generic::Heading,                 :fg => :grey

data/lib/rouge/themes/monokai.rb

@@ -35,7 +35,8 @@ module Rouge
       style Error,                            :fg => :carmine, :bg => :very_dark
       style Generic::Inserted,                :fg => :white, :bg => :dimgreen
       style Generic::Deleted,                 :fg => :white, :bg => :dimred
-      style Generic::Emph,                    :fg => :black, :italic => true
+      style Generic::Emph,                    :italic => true
+      style Generic::EmphStrong,              :italic => true, :bold => true
       style Generic::Error,
             Generic::Traceback,               :fg => :dark_red
       style Generic::Heading,                 :fg => :grey

data/lib/rouge/themes/monokai_sublime.rb

@@ -30,7 +30,9 @@ module Rouge
       style Literal::String::Regex,           :fg => :orange
       style Generic::Output,                  :fg => :dark_grey
       style Generic::Prompt,                  :fg => :emperor
-      style Generic::Strong,                  :bold => false
+      style Generic::Emph,                    :italic => true
+      style Generic::EmphStrong,              :italic => true, :bold => true
+      style Generic::Strong,                  :bold => true
       style Generic::Subheading,              :fg => :light_grey
       style Name::Builtin,                    :fg => :orange
       style Comment::Multiline,
@@ -42,8 +44,7 @@ module Rouge
             Generic::Error,
             Generic::Traceback,               :fg => :carmine
       style Generic::Deleted,
-            Generic::Inserted,
-            Generic::Emph,                    :fg => :dark
+            Generic::Inserted,                :fg => :dark
       style Keyword::Constant,
             Keyword::Declaration,
             Keyword::Reserved,

data/lib/rouge/themes/pastie.rb

@@ -22,6 +22,7 @@ module Rouge
       style Generic::Inserted,         :fg => '#000000', :bg => '#ddffdd'
 
       style Generic::Emph,             :italic => true
+      style Generic::EmphStrong,       :italic => true, :bold => true
       style Generic::Strong,           :bold => true
 
       style Generic::Lineno,           :fg => '#888888'

data/lib/rouge/themes/thankful_eyes.rb

@@ -38,6 +38,7 @@ module Rouge
       style Generic::Deleted, :fg => :scarletred2
       style Generic::Inserted, :fg => :go_get_it
       style Generic::Emph, :italic => true
+      style Generic::EmphStrong, :italic => true, :bold => true
       style Generic::Strong, :bold => true
       style Generic::Traceback, :fg => :eggshell_cloud, :bg => :slate_blue
       style Keyword::Constant, :fg => :pink_merengue, :bold => true

data/lib/rouge/themes/tulip.rb

@@ -33,6 +33,7 @@ module Rouge
       style Generic::Deleted, :fg => :red
       style Generic::Inserted, :fg => :green
       style Generic::Emph, :italic => true
+      style Generic::EmphStrong, :italic => true, :bold => true
       style Generic::Strong, :bold => true
       style Generic::Traceback,
             Generic::Lineno, :fg => :white, :bg => :purple

data/lib/rouge/token.rb

@@ -172,15 +172,16 @@ module Rouge
       token :Generic,      'g' do
         token :Deleted,    'gd'
         token :Emph,       'ge'
+        token :EmphStrong, 'ges'
         token :Error,      'gr'
         token :Heading,    'gh'
         token :Inserted,   'gi'
+        token :Lineno,     'gl'
         token :Output,     'go'
         token :Prompt,     'gp'
         token :Strong,     'gs'
         token :Subheading, 'gu'
         token :Traceback,  'gt'
-        token :Lineno,     'gl'
       end
 
       # convenience

data/lib/rouge/version.rb

@@ -3,6 +3,6 @@
 
 module Rouge
   def self.version
-    "4.2.1"
+    "4.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-09-17 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -109,6 +109,7 @@ files:
 - lib/rouge/demos/hylang
 - lib/rouge/demos/idlang
 - lib/rouge/demos/idris
+- lib/rouge/demos/iecst
 - lib/rouge/demos/igorpro
 - lib/rouge/demos/ini
 - lib/rouge/demos/io
@@ -148,6 +149,7 @@ files:
 - lib/rouge/demos/matlab
 - lib/rouge/demos/meson
 - lib/rouge/demos/minizinc
+- lib/rouge/demos/mojo
 - lib/rouge/demos/moonscript
 - lib/rouge/demos/mosel
 - lib/rouge/demos/msgtrans
@@ -164,6 +166,7 @@ files:
 - lib/rouge/demos/ocl
 - lib/rouge/demos/openedge
 - lib/rouge/demos/opentype_feature_file
+- lib/rouge/demos/p4
 - lib/rouge/demos/pascal
 - lib/rouge/demos/perl
 - lib/rouge/demos/php
@@ -353,6 +356,7 @@ files:
 - lib/rouge/lexers/hylang.rb
 - lib/rouge/lexers/idlang.rb
 - lib/rouge/lexers/idris.rb
+- lib/rouge/lexers/iecst.rb
 - lib/rouge/lexers/igorpro.rb
 - lib/rouge/lexers/ini.rb
 - lib/rouge/lexers/io.rb
@@ -398,6 +402,7 @@ files:
 - lib/rouge/lexers/matlab/keywords.rb
 - lib/rouge/lexers/meson.rb
 - lib/rouge/lexers/minizinc.rb
+- lib/rouge/lexers/mojo.rb
 - lib/rouge/lexers/moonscript.rb
 - lib/rouge/lexers/mosel.rb
 - lib/rouge/lexers/msgtrans.rb
@@ -416,6 +421,7 @@ files:
 - lib/rouge/lexers/ocl.rb
 - lib/rouge/lexers/openedge.rb
 - lib/rouge/lexers/opentype_feature_file.rb
+- lib/rouge/lexers/p4.rb
 - lib/rouge/lexers/pascal.rb
 - lib/rouge/lexers/perl.rb
 - lib/rouge/lexers/php.rb