rouge 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f1f405b49dcc56dd2d919c21abea6d7585897d5
-  data.tar.gz: ce71ccd69a02ce176750e6aa420e1f161e5b2b0c
+  metadata.gz: c642d8b27b75da850a03e347206247e0396cb3cf
+  data.tar.gz: 94198b0ec1e78e10120292d2a909879f440fc6ec
 SHA512:
-  metadata.gz: e7e99a7b930bdb47b7cee04576f298a6a0381e41820fb70562d0376706f1da978dfd5c3416e0b4f3068fc71bfce2a376bcf48d0d9eed78a7b28ac7ce3b7c15e6
-  data.tar.gz: efe32d1995ea498fb419e86e5ccd8f117b047c06050de26ee2086417cbbe9ef3de92f60c9ca571d533fa510e3073791a4ebbe8fa6966974219ab90dfb4fa88f7
+  metadata.gz: 1d36907f61fb6045cd4c0437870f98871c855ab29d1ba4a3ebc30f5f9bb33bf270e0081ff31d7e69c7bdb0536a5bdcc959c15c8dc88249a21eac45795eebe3ce
+  data.tar.gz: ed6572d2000df7e7ccf125634e4cfa4fd2d7487015a1c082b6b787784e710622004eb59b39b22750ef3fba8dcab1d230551344832828446676b153f315ac7c30

data/bin/rougify

@@ -4,6 +4,7 @@ require 'pathname'
 ROOT_DIR = Pathname.new(__FILE__).dirname.parent
 load ROOT_DIR.join('lib/rouge.rb')
 load ROOT_DIR.join('lib/rouge/cli.rb')
+Signal.trap('SIGPIPE', 'SYSTEM_DEFAULT')
 
 begin
   Rouge::CLI.parse(ARGV).run

data/lib/rouge/demos/abap

@@ -0,0 +1,6 @@
+lo_obj ?= lo_obj->do_nothing( 'Char' && ` String` ).
+
+SELECT SINGLE * FROM mara INTO ls_mara WHERE matkl EQ '1324'.
+LOOP AT lt_mara ASSIGNING <mara>.
+  CHECK <mara>-mtart EQ '0001'.
+ENDLOOP.

data/lib/rouge/demos/coq

@@ -8,4 +8,6 @@ Section with_T.
     | nil => 0
     | _ :: ls => S (length ls)
     end.
-End with_T.
+End with_T.
+
+Definition a_string := "hello \" world".

data/lib/rouge/demos/vue

@@ -0,0 +1,11 @@
+<template>
+  <div id="app">
+    {{ message }}
+  </div>
+</template>
+
+<script lang=coffee>
+  app = new Vue
+    el: '#app'
+    data: { message: 'Hello Vue!' }
+</script>

data/lib/rouge/lexers/abap.rb

@@ -0,0 +1,238 @@
+# -*- coding: utf-8 -*- #
+# ABAP elements taken from http://help.sap.com/abapdocu_750/en/index.htm?file=abapdo.htm
+
+module Rouge
+  module Lexers
+    class ABAP < RegexLexer
+      title "ABAP"
+      desc "SAP - Advanced Business Application Programming"
+      tag 'abap'
+      filenames '*.abap'
+      mimetypes 'text/x-abap'
+
+      def self.keywords
+        @keywords = Set.new %w(
+          *-INPUT ?TO ABAP-SOURCE ABBREVIATED ABS ABSTRACT ACCEPT ACCEPTING
+          ACCORDING ACCP ACTIVATION ACTUAL ADD ADD-CORRESPONDING ADJACENT
+          AFTER ALIAS ALIASES ALIGN ALL ALLOCATE ALPHA ANALYSIS ANALYZER AND
+          ANY APPEND APPENDAGE APPENDING APPLICATION ARCHIVE AREA ARITHMETIC
+          AS ASCENDING ASPECT ASSERT ASSIGN ASSIGNED ASSIGNING ASSOCIATION
+          ASYNCHRONOUS AT ATTRIBUTES AUTHORITY AUTHORITY-CHECK AVG BACK
+          BACKGROUND BACKUP BACKWARD BADI BASE BEFORE BEGIN BETWEEN BIG BINARY
+          BINTOHEX BIT BIT-AND BIT-NOT BIT-OR BIT-XOR BLACK BLANK BLANKS BLOB
+          BLOCK BLOCKS BLUE BOUND BOUNDARIES BOUNDS BOXED BREAK-POINT BT
+          BUFFER BY BYPASSING BYTE BYTE-CA BYTE-CN BYTE-CO BYTE-CS BYTE-NA
+          BYTE-NS BYTE-ORDER CA CALL CALLING CASE CAST CASTING CATCH CEIL
+          CENTER CENTERED CHAIN CHAIN-INPUT CHAIN-REQUEST CHANGE CHANGING
+          CHANNELS CHAR CHAR-TO-HEX CHARACTER CHECK CHECKBOX CIRCULAR CLASS
+          CLASS-CODING CLASS-DATA CLASS-EVENTS CLASS-METHODS CLASS-POOL
+          CLEANUP CLEAR CLIENT CLNT CLOB CLOCK CLOSE CN CO COALESCE CODE
+          CODING COLLECT COLOR COLUMN COLUMNS COL_BACKGROUND COL_GROUP
+          COL_HEADING COL_KEY COL_NEGATIVE COL_NORMAL COL_POSITIVE COL_TOTAL
+          COMMENT COMMENTS COMMIT COMMON COMMUNICATION COMPARING COMPONENT
+          COMPONENTS COMPRESSION COMPUTE CONCAT CONCATENATE CONCAT_WITH_SPACE
+          COND CONDENSE CONDITION CONNECT CONNECTION CONSTANTS CONTEXT
+          CONTEXTS CONTINUE CONTROL CONTROLS CONV CONVERSION CONVERT COPIES
+          COPY CORRESPONDING COUNT COUNTRY COVER CP CPI CREATE CREATING
+          CRITICAL CS CUKY CURR CURRENCY CURRENCY_CONVERSION CURRENT CURSOR
+          CURSOR-SELECTION CUSTOMER CUSTOMER-FUNCTION CX_DYNAMIC_CHECK
+          CX_NO_CHECK CX_ROOT CX_SQL_EXCEPTION CX_STATIC_CHECK DANGEROUS DATA
+          DATABASE DATAINFO DATASET DATE DATS DATS_ADD_DAYS DATS_ADD_MONTHS
+          DATS_DAYS_BETWEEN DATS_IS_VALID DAYLIGHT DD/MM/YY DD/MM/YYYY DDMMYY
+          DEALLOCATE DEC DECIMALS DECIMAL_SHIFT DECLARATIONS DEEP DEFAULT
+          DEFERRED DEFINE DEFINING DEFINITION DELETE DELETING DEMAND
+          DEPARTMENT DESCENDING DESCRIBE DESTINATION DETAIL DF16_DEC DF16_RAW
+          DF16_SCL DF34_DEC DF34_RAW DF34_SCL DIALOG DIRECTORY DISCONNECT
+          DISPLAY DISPLAY-MODE DISTANCE DISTINCT DIV DIVIDE
+          DIVIDE-CORRESPONDING DIVISION DO DUMMY DUPLICATE DUPLICATES DURATION
+          DURING DYNAMIC DYNPRO E EDIT EDITOR-CALL ELSE ELSEIF EMPTY ENABLED
+          ENABLING ENCODING END END-ENHANCEMENT-SECTION END-LINES
+          END-OF-DEFINITION END-OF-FILE END-OF-PAGE END-OF-SELECTION
+          END-TEST-INJECTION END-TEST-SEAM ENDAT ENDCASE ENDCATCH ENDCHAIN
+          ENDCLASS ENDDO ENDENHANCEMENT ENDEXEC ENDFORM ENDFUNCTION ENDIAN
+          ENDIF ENDING ENDINTERFACE ENDLOOP ENDMETHOD ENDMODULE ENDON
+          ENDPROVIDE ENDSELECT ENDTRY ENDWHILE ENDWITH ENGINEERING ENHANCEMENT
+          ENHANCEMENT-POINT ENHANCEMENT-SECTION ENHANCEMENTS ENTRIES ENTRY
+          ENVIRONMENT EQ EQUIV ERRORMESSAGE ERRORS ESCAPE ESCAPING EVENT
+          EVENTS EXACT EXCEPT EXCEPTION EXCEPTION-TABLE EXCEPTIONS EXCLUDE
+          EXCLUDING EXEC EXECUTE EXISTS EXIT EXIT-COMMAND EXPAND EXPANDING
+          EXPIRATION EXPLICIT EXPONENT EXPORT EXPORTING EXTEND EXTENDED
+          EXTENSION EXTRACT FAIL FETCH FIELD FIELD-GROUPS FIELD-SYMBOL
+          FIELD-SYMBOLS FIELDS FILE FILTER FILTER-TABLE FILTERS FINAL FIND
+          FIRST FIRST-LINE FIXED-POINT FKEQ FKGE FLOOR FLTP FLUSH FONT FOR
+          FORM FORMAT FORWARD FOUND FRAME FRAMES FREE FRIENDS FROM FUNCTION
+          FUNCTION-POOL FUNCTIONALITY FURTHER GAPS GE GENERATE GET
+          GET_PRINT_PARAMETERS GIVING GKEQ GKGE GLOBAL GRANT GREEN GROUP
+          GROUPS GT HANDLE HANDLER HARMLESS HASHED HAVING HDB HEAD-LINES
+          HEADER HEADERS HEADING HELP-ID HELP-REQUEST HEXTOBIN HIDE HIGH HINT
+          HOLD HOTSPOT I ICON ID IDENTIFICATION IDENTIFIER IDS IF
+          IF_ABAP_CLOSE_RESOURCE IF_ABAP_CODEPAGE IF_ABAP_DB_BLOB_HANDLE
+          IF_ABAP_DB_CLOB_HANDLE IF_ABAP_DB_LOB_HANDLE IF_ABAP_DB_READER
+          IF_ABAP_DB_WRITER IF_ABAP_READER IF_ABAP_WRITER IF_MESSAGE
+          IF_OS_CA_INSTANCE IF_OS_CA_PERSISTENCY IF_OS_FACTORY IF_OS_QUERY
+          IF_OS_QUERY_MANAGER IF_OS_QUERY_OPTIONS IF_OS_STATE
+          IF_OS_TRANSACTION IF_OS_TRANSACTION_MANAGER IF_SERIALIZABLE_OBJECT
+          IF_SHM_BUILD_INSTANCE IF_SYSTEM_UUID IF_T100_DYN_MSG IF_T100_MESSAGE
+          IGNORE IGNORING IMMEDIATELY IMPLEMENTATION IMPLEMENTATIONS
+          IMPLEMENTED IMPLICIT IMPORT IMPORTING IN INACTIVE INCL INCLUDE
+          INCLUDES INCLUDING INCREMENT INDEX INDEX-LINE INFOTYPES INHERITING
+          INIT INITIAL INITIALIZATION INNER INOUT INPUT INSERT INSTANCE
+          INSTANCES INSTR INT1 INT2 INT4 INT8 INTENSIFIED INTERFACE
+          INTERFACE-POOL INTERFACES INTERNAL INTERVALS INTO INVERSE
+          INVERTED-DATE IS ISO ITNO JOB JOIN KEEP KEEPING KERNEL KEY KEYS
+          KEYWORDS KIND LANG LANGUAGE LAST LATE LAYOUT LCHR LDB_PROCESS LE
+          LEADING LEAVE LEFT LEFT-JUSTIFIED LEFTPLUS LEFTSPACE LEGACY LENGTH
+          LET LEVEL LEVELS LIKE LINE LINE-COUNT LINE-SELECTION LINE-SIZE
+          LINEFEED LINES LIST LIST-PROCESSING LISTBOX LITTLE LLANG LOAD
+          LOAD-OF-PROGRAM LOB LOCAL LOCALE LOCATOR LOG-POINT LOGFILE LOGICAL
+          LONG LOOP LOW LOWER LPAD LPI LRAW LT LTRIM M MAIL MAIN MAJOR-ID
+          MAPPING MARGIN MARK MASK MATCH MATCHCODE MAX MAXIMUM MEDIUM MEMBERS
+          MEMORY MESH MESSAGE MESSAGE-ID MESSAGES MESSAGING METHOD METHODS MIN
+          MINIMUM MINOR-ID MM/DD/YY MM/DD/YYYY MMDDYY MOD MODE MODIF MODIFIER
+          MODIFY MODULE MOVE MOVE-CORRESPONDING MULTIPLY
+          MULTIPLY-CORRESPONDING NA NAME NAMETAB NATIVE NB NE NESTED NESTING
+          NEW NEW-LINE NEW-PAGE NEW-SECTION NEXT NO NO-DISPLAY NO-EXTENSION
+          NO-GAP NO-GAPS NO-GROUPING NO-HEADING NO-SCROLLING NO-SIGN NO-TITLE
+          NO-TOPOFPAGE NO-ZERO NODE NODES NON-UNICODE NON-UNIQUE NOT NP NS
+          NULL NUMBER NUMC O OBJECT OBJECTS OBLIGATORY OCCURRENCE OCCURRENCES
+          OCCURS OF OFF OFFSET ON ONLY OPEN OPTION OPTIONAL OPTIONS OR ORDER
+          OTHER OTHERS OUT OUTER OUTPUT OUTPUT-LENGTH OVERFLOW OVERLAY PACK
+          PACKAGE PAD PADDING PAGE PAGES PARAMETER PARAMETER-TABLE PARAMETERS
+          PART PARTIALLY PATTERN PERCENTAGE PERFORM PERFORMING PERSON PF
+          PF-STATUS PINK PLACES POOL POSITION POS_HIGH POS_LOW PRAGMAS PREC
+          PRECOMPILED PREFERRED PRESERVING PRIMARY PRINT PRINT-CONTROL
+          PRIORITY PRIVATE PROCEDURE PROCESS PROGRAM PROPERTY PROTECTED
+          PROVIDE PUBLIC PUSH PUSHBUTTON PUT QUAN QUEUE-ONLY QUICKINFO
+          RADIOBUTTON RAISE RAISING RANGE RANGES RAW RAWSTRING READ READ-ONLY
+          READER RECEIVE RECEIVED RECEIVER RECEIVING RED REDEFINITION REDUCE
+          REDUCED REF REFERENCE REFRESH REGEX REJECT REMOTE RENAMING REPLACE
+          REPLACEMENT REPLACING REPORT REQUEST REQUESTED RESERVE RESET
+          RESOLUTION RESPECTING RESPONSIBLE RESULT RESULTS RESUMABLE RESUME
+          RETRY RETURN RETURNCODE RETURNING RETURNS RIGHT RIGHT-JUSTIFIED
+          RIGHTPLUS RIGHTSPACE RISK RMC_COMMUNICATION_FAILURE
+          RMC_INVALID_STATUS RMC_SYSTEM_FAILURE ROLE ROLLBACK ROUND ROWS RPAD
+          RTRIM RUN SAP SAP-SPOOL SAVING SCALE_PRESERVING
+          SCALE_PRESERVING_SCIENTIFIC SCAN SCIENTIFIC
+          SCIENTIFIC_WITH_LEADING_ZERO SCREEN SCROLL SCROLL-BOUNDARY SCROLLING
+          SEARCH SECONDARY SECONDS SECTION SELECT SELECT-OPTIONS SELECTION
+          SELECTION-SCREEN SELECTION-SET SELECTION-SETS SELECTION-TABLE
+          SELECTIONS SEND SEPARATE SEPARATED SET SHARED SHIFT SHORT
+          SHORTDUMP-ID SIGN SIGN_AS_POSTFIX SIMPLE SINGLE SIZE SKIP SKIPPING
+          SMART SOME SORT SORTABLE SORTED SOURCE SPACE SPECIFIED SPLIT SPOOL
+          SPOTS SQL SQLSCRIPT SSTRING STABLE STAMP STANDARD START-OF-SELECTION
+          STARTING STATE STATEMENT STATEMENTS STATIC STATICS STATUSINFO
+          STEP-LOOP STOP STRING STRUCTURE STRUCTURES STYLE SUBKEY SUBMATCHES
+          SUBMIT SUBROUTINE SUBSCREEN SUBSTRING SUBTRACT
+          SUBTRACT-CORRESPONDING SUFFIX SUM SUMMARY SUMMING SUPPLIED SUPPLY
+          SUPPRESS SWITCH SWITCHSTATES SYMBOL SYNCPOINTS SYNTAX SYNTAX-CHECK
+          SYNTAX-TRACE SYST SYSTEM-CALL SYSTEM-EXCEPTIONS SYSTEM-EXIT TAB
+          TABBED TABLE TABLES TABLEVIEW TABSTRIP TARGET TASK TASKS TEST
+          TEST-INJECTION TEST-SEAM TESTING TEXT TEXTPOOL THEN THROW TIME TIMES
+          TIMESTAMP TIMEZONE TIMS TIMS_IS_VALID TITLE TITLE-LINES TITLEBAR TO
+          TOKENIZATION TOKENS TOP-LINES TOP-OF-PAGE TRACE-FILE TRACE-TABLE
+          TRAILING TRANSACTION TRANSFER TRANSFORMATION TRANSLATE TRANSPORTING
+          TRMAC TRUNCATE TRUNCATION TRY TSTMP_ADD_SECONDS
+          TSTMP_CURRENT_UTCTIMESTAMP TSTMP_IS_VALID TSTMP_SECONDS_BETWEEN TYPE
+          TYPE-POOL TYPE-POOLS TYPES ULINE UNASSIGN UNDER UNICODE UNION UNIQUE
+          UNIT UNIT_CONVERSION UNIX UNPACK UNTIL UNWIND UP UPDATE UPPER USER
+          USER-COMMAND USING UTF-8 VALID VALUE VALUE-REQUEST VALUES VARC VARY
+          VARYING VERIFICATION-MESSAGE VERSION VIA VIEW VISIBLE WAIT WARNING
+          WHEN WHENEVER WHERE WHILE WIDTH WINDOW WINDOWS WITH WITH-HEADING
+          WITH-TITLE WITHOUT WORD WORK WRITE WRITER XML XSD YELLOW YES YYMMDD
+          Z ZERO ZONE
+        )
+      end
+
+      def self.builtins
+        @keywords = Set.new %w(
+          acos apply asin assign atan attribute bit-set boolc boolx call
+          call-method cast ceil cfunc charlen char_off class_constructor clear
+          cluster cmax cmin cnt communication_failure concat_lines_of cond
+          cond-var condense constructor contains contains_any_not_of
+          contains_any_of copy cos cosh count count_any_not_of count_any_of
+          create cursor data dbmaxlen dbtab deserialize destructor distance
+          empty error_message escape exp extensible find find_any_not_of
+          find_any_of find_end floor frac from_mixed group hashed header idx
+          include index insert ipow itab key lax lines line_exists line_index
+          log log10 loop loop_key match matches me mesh_path namespace nmax
+          nmin node numeric numofchar object parameter primary_key read ref
+          repeat replace rescale resource_failure reverse root round segment
+          sender serialize shift_left shift_right sign simple sin sinh skip
+          sorted space sqrt standard strlen substring substring_after
+          substring_before substring_from substring_to sum switch switch-var
+          system_failure table table_line tan tanh template text to_lower
+          to_mixed to_upper transform translate trunc type value variable write
+          xsdbool xsequence xstrlen
+        )
+      end
+
+      def self.types
+        @types = Set.new %w(
+         b c d decfloat16 decfloat34 f i int8 n p s t x
+         clike csequence decfloat string xstring
+        )
+      end
+
+      def self.new_keywords
+        @types = Set.new %w(
+          DATA FIELD-SYMBOL
+        )
+      end
+
+      state :root do
+        rule /\s+/m, Text
+
+        rule /".*/, Comment::Single
+        rule %r(^\*.*), Comment::Multiline
+        rule /\d+/, Num::Integer
+        rule /('|`)/, Str::Single, :single_string
+        rule /[\[\]\(\)\{\}\[\]\.,:\|]/, Punctuation
+
+        # builtins / new ABAP 7.40 keywords (@DATA(), ...)
+        rule /(->|=>)?([A-Za-z][A-Za-z0-9_\-]*)(\()/ do |m|
+          if m[1] != ''
+            token Operator, m[1]
+          end
+
+          if (self.class.new_keywords.include? m[2].upcase) && m[1].nil?
+            token Keyword, m[2]
+          elsif (self.class.builtins.include? m[2].downcase) && m[1].nil?
+            token Name::Builtin, m[2]
+          else
+            token Name, m[2]
+          end
+          token Punctuation, m[3]
+        end
+
+        # keywords, types and normal text
+        rule /\w[\w\d]*/ do |m|
+          if self.class.keywords.include? m[0].upcase
+            token Keyword
+          elsif self.class.types.include? m[0].downcase
+            token Keyword::Type
+          else
+            token Name
+          end
+        end
+
+        # operators
+        rule %r((->|->>|=>)), Operator
+        rule %r([-\*\+%/~=&\?<>!#@\^]+), Operator
+
+      end
+
+      state :operators do
+        rule %r((->|->>|=>)), Operator
+        rule %r([-\*\+%/~=&\?<>!#@\^]+), Operator
+      end
+
+      state :single_string do
+        rule /\\./, Str::Escape
+        rule /(''|``)/, Str::Escape
+        rule /['`]/, Str::Single, :pop!
+        rule /[^\\'`]+/, Str::Single
+      end
+
+    end
+  end
+end

data/lib/rouge/lexers/clojure.rb

@@ -9,7 +9,7 @@ module Rouge
       tag 'clojure'
       aliases 'clj', 'cljs'
 
-      filenames '*.clj', '*.cljs', '*.cljc'
+      filenames '*.clj', '*.cljs', '*.cljc', 'build.boot'
 
       mimetypes 'text/x-clojure', 'application/x-clojure'
 
@@ -73,7 +73,7 @@ module Rouge
       end
 
       state :root do
-        rule /;.*?\n/, Comment::Single
+        rule /;.*?$/, Comment::Single
         rule /\s+/m, Text::Whitespace
 
         rule /-?\d+\.\d+/, Num::Float

data/lib/rouge/lexers/coq.rb

@@ -150,6 +150,10 @@ module Rouge
         rule /"/, Str::Double, :pop!
       end
 
+      state :escape_sequence do
+        rule /\\[\\"'ntbr]/, Str::Escape
+      end
+
       state :continue_id do
         # the stream starts with an id (stored in @name) and continues here
         rule dot_id do |m|

data/lib/rouge/lexers/cpp.rb

@@ -15,15 +15,16 @@ module Rouge
                 '*.c++', '*.h++',
                 '*.cc',  '*.hh',
                 '*.cxx', '*.hxx',
-                '*.pde', '*.ino'
+                '*.pde', '*.ino',
+                '*.tpp'
       mimetypes 'text/x-c++hdr', 'text/x-c++src'
 
       def self.keywords
         @keywords ||= super + Set.new(%w(
-          asm catch const_cast delete dynamic_cast explicit export
+          asm auto catch const_cast delete dynamic_cast explicit export
           friend mutable namespace new operator private protected public
-          reinterpret_cast restrict static_cast template this throw
-          throws typeid typename using virtual
+          reinterpret_cast restrict size_of static_cast template this throw
+          throws typeid typename using virtual final override
 
           alignas alignof constexpr decltype noexcept static_assert
           thread_local try

data/lib/rouge/lexers/haml.rb

@@ -45,6 +45,11 @@ module Rouge
         @html ||= HTML.new(options)
       end
 
+      def ruby!(state)
+        ruby.reset!
+        push state
+      end
+
       def filters
         @filters ||= {
           'javascript' => Javascript.new(options),
@@ -104,7 +109,7 @@ module Rouge
         rule /-/ do
           token Punctuation
           reset_stack
-          push :ruby_line
+          ruby! :ruby_line
         end
 
         # filters
@@ -131,8 +136,9 @@ module Rouge
 
       state :tag do
         mixin :css
-        rule(/\{#{comma_dot}*?\}/) { delegate ruby }
+        rule(/[{]/) { token Punctuation; ruby! :ruby_tag }
         rule(/\[#{dot}*?\]/) { delegate ruby }
+
         rule /\(/, Punctuation, :html_attributes
         rule /\s*\n/, Text, :pop!
 
@@ -153,7 +159,7 @@ module Rouge
         rule /[&!]?[=!]/ do
           token Punctuation
           reset_stack
-          push :ruby_line
+          ruby! :ruby_line
         end
 
         rule(//) { push :plain }
@@ -166,6 +172,10 @@ module Rouge
         rule(/.*?(?=(,$| \|)?[ \t]*$)/) { delegate ruby }
       end
 
+      state :ruby_tag do
+        mixin :ruby_inner
+      end
+
       state :html_attributes do
         rule /\s+/, Text
         rule /#{identifier}\s*=/, Name::Attribute, :html_attribute_value

data/lib/rouge/lexers/html.rb

@@ -85,7 +85,7 @@ module Rouge
 
       state :style_content do
         rule %r(<\s*/\s*style\s*>)m, Name::Tag, :pop!
-        rule %r(.*(?=<\s*/\s*style\s*>))m do
+        rule %r(.*?(?=<\s*/\s*style\s*>))m do
           delegate CSS
         end
       end

data/lib/rouge/lexers/javascript.rb

@@ -160,6 +160,11 @@ module Rouge
           push :expr_start
         end
 
+        rule /(\@)(\w+)?/ do
+          groups Punctuation, Name::Decorator
+          push :expr_start
+        end
+
         rule /[{}]/, Punctuation, :statement
 
         rule id do |m|
@@ -241,7 +246,7 @@ module Rouge
       state :template_string do
         rule /\${/, Punctuation, :template_string_expr
         rule /`/, Str::Double, :pop!
-        rule /(\\\\|\\[\$`]|[^\$`]|\$[^{])*/, Str::Double
+        rule /(\\\\|\\[\$`]|[^\$`]|\$(?!{))*/, Str::Double
       end
 
       state :template_string_expr do
@@ -249,45 +254,5 @@ module Rouge
         mixin :root
       end
     end
-
-    class JSON < RegexLexer
-      desc "JavaScript Object Notation (json.org)"
-      tag 'json'
-      filenames '*.json'
-      mimetypes 'application/json', 'application/vnd.api+json',
-                'application/hal+json'
-
-      # TODO: is this too much of a performance hit?  JSON is quite simple,
-      # so I'd think this wouldn't be too bad, but for large documents this
-      # could mean doing two full lexes.
-      def self.analyze_text(text)
-        return 0.8 if text =~ /\A\s*{/m && text.lexes_cleanly?(self)
-      end
-
-      state :root do
-        rule /\s+/m, Text::Whitespace
-        rule /"/, Str::Double, :string
-        rule /(?:true|false|null)\b/, Keyword::Constant
-        rule /[{},:\[\]]/, Punctuation
-        rule /-?(?:0|[1-9]\d*)\.\d+(?:e[+-]\d+)?/i, Num::Float
-        rule /-?(?:0|[1-9]\d*)(?:e[+-]\d+)?/i, Num::Integer
-      end
-
-      state :string do
-        rule /[^\\"]+/, Str::Double
-        rule /\\./, Str::Escape
-        rule /"/, Str::Double, :pop!
-      end
-    end
-
-    class JSONDOC < JSON
-      desc "JavaScript Object Notation with extenstions for documentation"
-      tag 'json-doc'
-
-      prepend :root do
-        rule %r(//.*?$), Comment::Single
-        rule /(\.\.\.)/, Comment::Single
-      end
-    end
   end
 end

data/lib/rouge/lexers/json.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    class JSON < RegexLexer
+      desc "JavaScript Object Notation (json.org)"
+      tag 'json'
+      filenames '*.json'
+      mimetypes 'application/json', 'application/vnd.api+json',
+                'application/hal+json'
+
+      state :root do
+        rule /\s+/m, Text::Whitespace
+        rule /"/, Str::Double, :string
+        rule /(?:true|false|null)\b/, Keyword::Constant
+        rule /[{},:\[\]]/, Punctuation
+        rule /-?(?:0|[1-9]\d*)\.\d+(?:e[+-]\d+)?/i, Num::Float
+        rule /-?(?:0|[1-9]\d*)(?:e[+-]\d+)?/i, Num::Integer
+      end
+
+      state :string do
+        rule /[^\\"]+/, Str::Double
+        rule /\\./, Str::Escape
+        rule /"/, Str::Double, :pop!
+      end
+    end
+  end
+end

data/lib/rouge/lexers/json_doc.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    load_lexer 'json.rb'
+
+    class JSONDOC < JSON
+      desc "JavaScript Object Notation with extenstions for documentation"
+      tag 'json-doc'
+
+      prepend :root do
+        rule %r(//.*?$), Comment::Single
+        rule /(\.\.\.)/, Comment::Single
+      end
+    end
+  end
+end

data/lib/rouge/lexers/perl.rb

@@ -66,7 +66,7 @@ module Rouge
 
       state :root do
         rule /#.*?$/, Comment::Single
-        rule /^=[a-zA-Z0-9]+\s+.*?\n=cut/, Comment::Multiline
+        rule /^=[a-zA-Z0-9]+\s+.*?\n=cut/m, Comment::Multiline
         rule /(?:#{keywords.join('|')})\b/, Keyword
 
         rule /(format)(\s+)([a-zA-Z0-9_]+)(\s*)(=)(\s*\n)/ do

data/lib/rouge/lexers/python.rb

@@ -82,6 +82,7 @@ module Rouge
                  Text,
                  Keyword::Namespace
         end
+
         rule /(import)(\s+)(#{dotted_identifier})/ do
           groups Keyword::Namespace, Text, Name::Namespace
         end
@@ -155,24 +156,6 @@ module Rouge
         mixin :raise
       end
 
-      state :import do
-        # non-line-terminating whitespace
-        rule /(?:[ \t]|\\\n)+/, Text
-
-        rule /as\b/, Keyword::Namespace
-        rule /,/, Operator
-        rule dotted_identifier, Name::Namespace
-        rule(//) { pop! } # anything else -> go back
-      end
-
-      state :fromimport do
-        # non-line-terminating whitespace
-        rule /(?:[ \t]|\\\n)+/, Text
-
-        rule /import\b/, Keyword::Namespace, :pop!
-        rule dotted_identifier, Name::Namespace
-      end
-
       state :strings do
         rule /%(\([a-z0-9_]+\))?[-#0 +]*([0-9]+|[*])?(\.([0-9]+|[*]))?/i, Str::Interpol
       end

data/lib/rouge/lexers/ruby.rb

@@ -79,7 +79,7 @@ module Rouge
 
       state :strings do
         mixin :symbols
-        rule /\b[a-z_]\w*?:\s+/, Str::Symbol, :expr_start
+        rule /\b[a-z_]\w*?[?!]?:\s+/, Str::Symbol, :expr_start
         rule /'(\\\\|\\'|[^'])*'/, Str::Single
         rule /"/, Str::Double, :simple_string
         rule /(?<!\.)`/, Str::Backtick, :simple_backtick

data/lib/rouge/lexers/rust.rb

@@ -86,7 +86,7 @@ module Rouge
         rule %r([=-]>), Keyword
         rule %r(<->), Keyword
         rule /[()\[\]{}|,:;]/, Punctuation
-        rule /[*!@~&+%^<>=-]/, Operator
+        rule /[*!@~&+%^<>=-\?]/, Operator
 
         rule /([.]\s*)?#{id}(?=\s*[(])/m, Name::Function
         rule /[.]\s*#{id}/, Name::Property

data/lib/rouge/lexers/tex.rb

@@ -8,14 +8,11 @@ module Rouge
       tag 'tex'
       aliases 'TeX', 'LaTeX', 'latex'
 
-      filenames '*.tex', '*.aux', '*.toc'
+      filenames '*.tex', '*.aux', '*.toc', '*.sty', '*.cls'
       mimetypes 'text/x-tex', 'text/x-latex'
 
       def self.analyze_text(text)
-        return 1 if text =~ /\A\s*\\documentclass/
-        return 1 if text =~ /\A\s*\\input/
-        return 1 if text =~ /\A\s*\\documentstyle/
-        return 1 if text =~ /\A\s*\\relax/
+        return 1 if text =~ /\A\s*\\(documentclass|input|documentstyle|relax|ProvidesPackage|ProvidesClass)/
       end
 
       command = /\\([a-z]+|\s+|.)/i

data/lib/rouge/lexers/turtle.rb

@@ -63,8 +63,8 @@ module Rouge
 
         rule /\s+/, Text::Whitespace
 
-        rule /[^:;<>#@"\(\).\[\]\{\} ]+:/, Name::Namespace
-        rule /[^:;<>#@"\(\).\[\]\{\} ]+/, Name
+        rule /[^:;<>#\@"\(\).\[\]\{\} ]+:/, Name::Namespace
+        rule /[^:;<>#\@"\(\).\[\]\{\} ]+/, Name
         
       end
     end

data/lib/rouge/lexers/typescript.rb

@@ -10,9 +10,9 @@ module Rouge
 
       tag 'typescript'
       aliases 'ts'
-      
+
       filenames '*.ts', '*.d.ts'
-                
+
       mimetypes 'text/typescript'
 
       def self.keywords
@@ -22,7 +22,7 @@ module Rouge
           super async await extends implements readonly
         ))
       end
-      
+
       def self.declarations
         @declarations ||= super + Set.new(%w(
           const type constructor abstract
@@ -32,10 +32,10 @@ module Rouge
       def self.reserved
         @reserved ||= super + Set.new(%w(
           string any number namespace module
-          declare default interface         
+          declare default interface
         ))
       end
-      
+
       def self.builtins
         @builtins ||= super + %w(
           Promise Set Map WeakSet WeakMap Symbol

data/lib/rouge/lexers/vue.rb

@@ -0,0 +1,124 @@
+module Rouge
+  module Lexers
+    load_lexer 'html.rb'
+
+    class Vue < HTML
+      desc 'Vue.js single-file components'
+      tag 'vue'
+      aliases 'vuejs'
+      filenames '*.vue'
+
+      mimetypes 'text/x-vue', 'application/x-vue'
+
+      def initialize(*)
+        super
+        @js = Javascript.new(options)
+      end
+
+      def self.analyze_text(text)
+        return 0
+      end
+
+      def lookup_lang(lang)
+        case lang
+        when 'html' then HTML
+        when 'css' then CSS
+        when 'javascript' then Javascript
+        when 'sass' then Sass
+        when 'scss' then Scss
+        when 'coffee' then CoffeeScript
+          # TODO: add more when the lexers are done
+        else
+          PlainText
+        end
+      end
+
+      start { @js.reset! }
+
+      prepend :root do
+        rule /(<)(\s*)(template)/ do
+          groups Name::Tag, Text, Keyword
+          @lang = HTML
+          push :template
+          push :lang_tag
+        end
+
+        rule /(<)(\s*)(style)/ do
+          groups Name::Tag, Text, Keyword
+          @lang = CSS
+          push :style
+          push :lang_tag
+        end
+
+        rule /(<)(\s*)(script)/ do
+          groups Name::Tag, Text, Keyword
+          @lang = Javascript
+          push :script
+          push :lang_tag
+        end
+      end
+
+      state :style do
+        rule /(<\s*\/\s*)(style)(\s*>)/ do
+          groups Name::Tag, Keyword, Name::Tag
+          pop!
+        end
+
+        mixin :style_content
+        mixin :embed
+      end
+
+      state :script do
+        rule /(<\s*\/\s*)(script)(\s*>)/ do
+          groups Name::Tag, Keyword, Name::Tag
+          pop!
+        end
+
+        mixin :script_content
+        mixin :embed
+      end
+
+      state :lang_tag do
+        rule /(lang\s*=)(\s*)("(?:\\.|[^\\])*?"|'(\\.|[^\\])*?'|[^\s>]+)/ do |m|
+          groups Name::Attribute, Text, Str
+          @lang = lookup_lang(m[2])
+        end
+
+        mixin :tag
+      end
+
+      state :template do
+        rule %r((<\s*/\s*)(template)(\s*>)) do
+          groups Name::Tag, Keyword, Name::Tag
+          pop!
+        end
+
+        rule /{{/ do
+          token Str::Interpol
+          push :template_interpol
+          @js.reset!
+        end
+
+        mixin :embed
+      end
+
+      state :template_interpol do
+        rule /}}/, Str::Interpol, :pop!
+        rule /}/, Error
+        mixin :template_interpol_inner
+      end
+
+      state :template_interpol_inner do
+        rule(/{/) { delegate @js; push }
+        rule(/}/) { delegate @js; pop! }
+        rule(/[^{}]+/) { delegate @js }
+      end
+
+      state :embed do
+        rule(/[^{<]+/) { delegate @lang }
+        rule(/[<{][^<{]*/) { delegate @lang }
+      end
+    end
+  end
+end
+

data/lib/rouge/lexers/xml.rb

@@ -6,7 +6,7 @@ module Rouge
       title "XML"
       desc %q(<desc for="this-lexer">XML</desc>)
       tag 'xml'
-      filenames *%w(*.xml *.xsl *.rss *.xslt *.xsd *.wsdl)
+      filenames *%w(*.xml *.xsl *.rss *.xslt *.xsd *.wsdl *.svg)
       mimetypes *%w(
         text/xml
         application/xml

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "2.0.6"
+    "2.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -23,6 +23,7 @@ files:
 - bin/rougify
 - lib/rouge.rb
 - lib/rouge/cli.rb
+- lib/rouge/demos/abap
 - lib/rouge/demos/actionscript
 - lib/rouge/demos/apache
 - lib/rouge/demos/apiblueprint
@@ -132,6 +133,7 @@ files:
 - lib/rouge/demos/verilog
 - lib/rouge/demos/vhdl
 - lib/rouge/demos/viml
+- lib/rouge/demos/vue
 - lib/rouge/demos/xml
 - lib/rouge/demos/yaml
 - lib/rouge/formatter.rb
@@ -150,6 +152,7 @@ files:
 - lib/rouge/guessers/modeline.rb
 - lib/rouge/guessers/source.rb
 - lib/rouge/lexer.rb
+- lib/rouge/lexers/abap.rb
 - lib/rouge/lexers/actionscript.rb
 - lib/rouge/lexers/apache.rb
 - lib/rouge/lexers/apache/keywords.yml
@@ -197,6 +200,8 @@ files:
 - lib/rouge/lexers/java.rb
 - lib/rouge/lexers/javascript.rb
 - lib/rouge/lexers/jinja.rb
+- lib/rouge/lexers/json.rb
+- lib/rouge/lexers/json_doc.rb
 - lib/rouge/lexers/jsonnet.rb
 - lib/rouge/lexers/jsx.rb
 - lib/rouge/lexers/julia.rb
@@ -264,6 +269,7 @@ files:
 - lib/rouge/lexers/vhdl.rb
 - lib/rouge/lexers/viml.rb
 - lib/rouge/lexers/viml/keywords.rb
+- lib/rouge/lexers/vue.rb
 - lib/rouge/lexers/xml.rb
 - lib/rouge/lexers/yaml.rb
 - lib/rouge/plugins/redcarpet.rb