rouge 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5383a3f574741c04a723f85f983e87a7962e64
-  data.tar.gz: 67935c3ef91a6c7cbf47a0182aeed7af37dafca5
+  metadata.gz: 6626653a9eced6e141de02204ad519974a33681f
+  data.tar.gz: e3bc6c8899c3477de2fb5df663dff3994abadbee
 SHA512:
-  metadata.gz: 7fb60ad1f8eb796a4da95ae4bbb8b508742d6faa069630feda3ade8de70870e2f0593c776c133f0d36639a1f01f0d8389d4c4b44b9334dbfdbc67bf26e372591
-  data.tar.gz: 72e5e033ef8b39c49a61ccc153a5811d584f5005f71f7cb522245dfdd964650d5c7d18a5bcb6d29ea35537c8cac31cfdd0e6891dbdbf1a868f72d198a118605e
+  metadata.gz: c636bc9ae3a393af8e4a3885d1cbdef9d5fdea28c6d7adcfce158a462bbd0249b338193a8e2b5ad5cd6aa7048b1305127eae33df4e5443da194e6d0e3cfd3d7e
+  data.tar.gz: 75349c93480fc528bc20fa3dc93499a35e9a55956b2efda421c10ba8b991541830f7c7a60808a27d3212492baea3e6f57c32d4e0115277b200681f19413b93e6

data/lib/rouge.rb

@@ -40,7 +40,10 @@ load load_dir.join('rouge/lexer.rb')
 load load_dir.join('rouge/regex_lexer.rb')
 load load_dir.join('rouge/template_lexer.rb')
 
-Dir.glob(load_dir.join('rouge/lexers/*.rb')).each { |f| load f }
+lexers_dir = load_dir.join('rouge/lexers')
+Dir.glob(lexers_dir.join('*.rb')).each do |f|
+  Rouge::Lexers.load_lexer(Pathname.new(f).relative_path_from(lexers_dir).to_s)
+end
 
 load load_dir.join('rouge/formatter.rb')
 load load_dir.join('rouge/formatters/html.rb')

data/lib/rouge/demos/praat

@@ -0,0 +1,26 @@
+form Copy selected files...
+  word Prefix
+  word Suffix _copy
+  boolean Keep_original 1
+endform
+
+total_objects = numberOfSelected()
+for i to total_objects
+  my_object[i] = selected(i)
+endfor
+for i to total_objects
+  selectObject: my_object[i]
+  @copy()
+  new[i] = selected()
+endfor
+if total_objects
+  selectObject: new[1]
+  for i from 2 to total_objects
+    plusObject: new[i]
+  endfor
+endif
+
+procedure copy ()
+  .name$ = extractWord$(selected$(), " ")
+  Copy: prefix$ + .name$ + suffix$
+endproc

data/lib/rouge/lexer.rb

@@ -433,8 +433,11 @@ module Rouge
   end
 
   module Lexers
-    def self.load_const(const_name, relpath)
-      return if const_defined?(const_name)
+    @_loaded_lexers = {}
+
+    def self.load_lexer(relpath)
+      return if @_loaded_lexers.key?(relpath)
+      @_loaded_lexers[relpath] = true
 
       root = Pathname.new(__FILE__).dirname.join('lexers')
       load root.join(relpath)

data/lib/rouge/lexers/common_lisp.rb

@@ -6,7 +6,7 @@ module Rouge
       title "Common Lisp"
       desc "The Common Lisp variant of Lisp (common-lisp.net)"
       tag 'common_lisp'
-      aliases 'cl', 'common-lisp'
+      aliases 'cl', 'common-lisp', 'elisp', 'emacs-lisp'
 
       filenames '*.cl', '*.lisp', '*.el' # used for Elisp too
       mimetypes 'text/x-common-lisp'
@@ -270,7 +270,7 @@ module Rouge
 
         # arrays and structures
         rule /(#(?:\d+a|s))(\()/i do
-          groups Literal::Other, Punctuation
+          groups Str::Other, Punctuation
           push :root
         end
 

data/lib/rouge/lexers/cpp.rb

@@ -2,7 +2,7 @@
 
 module Rouge
   module Lexers
-    load_const :C, 'c.rb'
+    load_lexer 'c.rb'
 
     class Cpp < C
       title "C++"

data/lib/rouge/lexers/glsl.rb

@@ -2,8 +2,8 @@
 
 module Rouge
   module Lexers
-    load_const :C, 'c.rb'
-    
+    load_lexer 'c.rb'
+
     # This file defines the GLSL language lexer to the Rouge
     # syntax highlighter.
     #

data/lib/rouge/lexers/matlab.rb

@@ -53,7 +53,7 @@ module Rouge
 
         rule %r{[(){};:,\/\\\]\[]}, Punctuation
 
-        rule /~=|==|<<|>>|[-~+\/*%=<>&^|.]/, Operator
+        rule /~=|==|<<|>>|[-~+\/*%=<>&^|.@]/, Operator
 
 
         rule /(\d+\.\d*|\d*\.\d+)(e[+-]?[0-9]+)?/i, Num::Float
@@ -61,7 +61,8 @@ module Rouge
         rule /\d+L/, Num::Integer::Long
         rule /\d+/, Num::Integer
 
-        rule /'/, Str::Single, :string
+        rule /'(?=(.*'))/, Str::Single, :string
+        rule /'/, Operator
       end
 
       state :string do

data/lib/rouge/lexers/moonscript.rb

@@ -2,7 +2,7 @@
 
 module Rouge
   module Lexers
-    load_const :Lua, 'lua.rb'
+    load_lexer 'lua.rb'
 
     class Moonscript < RegexLexer
       title "MoonScript"

data/lib/rouge/lexers/objective_c.rb

@@ -2,7 +2,7 @@
 
 module Rouge
   module Lexers
-    load_const :C, 'c.rb'
+    load_lexer 'c.rb'
 
     class ObjectiveC < C
       tag 'objective_c'

data/lib/rouge/lexers/powershell.rb

@@ -2,7 +2,7 @@
 
 module Rouge
   module Lexers
-    load_const :Shell, 'shell.rb'
+    load_lexer 'shell.rb'
 
     class Powershell < Shell
       title 'powershell'

data/lib/rouge/lexers/praat.rb

@@ -0,0 +1,340 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    class Praat < RegexLexer
+      title "Praat"
+      desc "The Praat scripting language (praat.org)"
+
+      tag 'praat'
+
+      filenames '*.praat', '*.proc', '*.psc'
+
+      def self.analyze_text(text)
+        return 1 if text.shebang? 'praat'
+      end
+
+      keywords = %w(
+        if then else elsif elif endif fi for from to endfor endproc while
+        endwhile repeat until select plus minus demo assert stopwatch 
+        nocheck nowarn noprogress editor endeditor clearinfo
+      )
+
+      functions_string = %w(
+        backslashTrigraphsToUnicode chooseDirectory chooseReadFile
+        chooseWriteFile date demoKey do environment extractLine extractWord
+        fixed info left mid percent readFile replace replace_regex right
+        selected string unicodeToBackslashTrigraphs
+      )
+
+      functions_numeric = %w(
+        abs appendFile appendFileLine appendInfo appendInfoLine arccos arccosh
+        arcsin arcsinh arctan arctan2 arctanh barkToHertz beginPause
+        beginSendPraat besselI besselK beta beta2 binomialP binomialQ boolean
+        ceiling chiSquareP chiSquareQ choice comment cos cosh createDirectory
+        deleteFile demoClicked demoClickedIn demoCommandKeyPressed
+        demoExtraControlKeyPressed demoInput demoKeyPressed
+        demoOptionKeyPressed demoShiftKeyPressed demoShow demoWaitForInput
+        demoWindowTitle demoX demoY differenceLimensToPhon do editor endPause
+        endSendPraat endsWith erb erbToHertz erf erfc exitScript exp
+        extractNumber fileReadable fisherP fisherQ floor gaussP gaussQ
+        hertzToBark hertzToErb hertzToMel hertzToSemitones imax imin
+        incompleteBeta incompleteGammaP index index_regex invBinomialP
+        invBinomialQ invChiSquareQ invFisherQ invGaussQ invSigmoid invStudentQ
+        length ln lnBeta lnGamma log10 log2 max melToHertz min minusObject
+        natural number numberOfColumns numberOfRows numberOfSelected
+        objectsAreIdentical option optionMenu pauseScript
+        phonToDifferenceLimens plusObject positive randomBinomial randomGauss
+        randomInteger randomPoisson randomUniform real readFile removeObject
+        rindex rindex_regex round runScript runSystem runSystem_nocheck
+        selectObject selected semitonesToHertz sentencetext sigmoid sin sinc
+        sincpi sinh soundPressureToPhon sqrt startsWith studentP studentQ tan
+        tanh variableExists word writeFile writeFileLine writeInfo
+        writeInfoLine
+      )
+
+      functions_array = %w(
+        linear randomGauss randomInteger randomUniform zero
+      )
+
+      objects = %w(
+        Activation AffineTransform AmplitudeTier Art Artword Autosegment
+        BarkFilter BarkSpectrogram CCA Categories Cepstrogram Cepstrum
+        Cepstrumc ChebyshevSeries ClassificationTable Cochleagram Collection
+        ComplexSpectrogram Configuration Confusion ContingencyTable Corpus
+        Correlation Covariance CrossCorrelationTable CrossCorrelationTables DTW
+        DataModeler Diagonalizer Discriminant Dissimilarity Distance
+        Distributions DurationTier EEG ERP ERPTier EditCostsTable
+        EditDistanceTable Eigen Excitation Excitations ExperimentMFC FFNet
+        FeatureWeights FileInMemory FilesInMemory Formant FormantFilter
+        FormantGrid FormantModeler FormantPoint FormantTier GaussianMixture HMM
+        HMM_Observation HMM_ObservationSequence HMM_State HMM_StateSequence
+        Harmonicity ISpline Index Intensity IntensityTier IntervalTier KNN
+        KlattGrid KlattTable LFCC LPC Label LegendreSeries LinearRegression
+        LogisticRegression LongSound Ltas MFCC MSpline ManPages Manipulation
+        Matrix MelFilter MelSpectrogram MixingMatrix Movie Network OTGrammar
+        OTHistory OTMulti PCA PairDistribution ParamCurve Pattern Permutation
+        Photo Pitch PitchModeler PitchTier PointProcess Polygon Polynomial
+        PowerCepstrogram PowerCepstrum Procrustes RealPoint RealTier ResultsMFC
+        Roots SPINET SSCP SVD Salience ScalarProduct Similarity SimpleString
+        SortedSetOfString Sound Speaker Spectrogram Spectrum SpectrumTier
+        SpeechSynthesizer SpellingChecker Strings StringsIndex Table
+        TableOfReal TextGrid TextInterval TextPoint TextTier Tier Transition
+        VocalTract VocalTractTier Weight WordList
+      )
+
+      variables_numeric = %w(
+        macintosh windows unix praatVersion pi e undefined
+      )
+
+      variables_string = %w(
+        praatVersion tab shellDirectory homeDirectory
+        preferencesDirectory newline temporaryDirectory
+        defaultDirectory
+      )
+
+      state :root do
+        rule /(\s+)(#.*?$)/ do
+          groups Text, Comment::Single
+        end
+
+        rule /^#.*?$/,        Comment::Single
+        rule /;[^\n]*/,       Comment::Single
+        rule /\s+/,           Text
+        rule /\bprocedure\b/, Keyword,        :procedure_definition
+        rule /\bcall\b/,      Keyword,        :procedure_call
+        rule /@/,             Name::Function, :procedure_call
+
+        mixin :function_call
+
+        rule /\b(?:#{keywords.join('|')})\b/, Keyword
+
+        rule /(\bform\b)(\s+)([^\n]+)/ do
+          groups Keyword, Text, Literal::String
+          push :old_form
+        end
+
+        rule /(print(?:line|tab)?|echo|exit|asserterror|pause|send(?:praat|socket)|include|execute|system(?:_nocheck)?)(\s+)/ do
+          groups Keyword, Text
+          push :string_unquoted
+        end
+
+        rule /(goto|label)(\s+)(\w+)/ do
+          groups Keyword, Text, Name::Label
+        end
+
+        mixin :variable_name
+        mixin :number
+
+        rule /"/, Literal::String, :string
+
+        rule /\b(?:#{objects.join('|')})(?=\s+\S+\n)/, Name::Class, :string_unquoted
+
+        rule /\b(?=[A-Z])/, Text, :command
+        rule /(\.{3}|[)(,\$])/, Punctuation
+        rule /./, Generic::Error
+      end
+
+      state :command do
+        rule /( ?[\w()-]+ ?)/, Keyword
+        rule /'(?=.*')/,  Literal::String::Interpol, :string_interpolated
+        rule /\.{3}/,     Keyword, :old_arguments
+        rule /:/,         Keyword, :comma_list
+        rule /[\s\n]/,    Text, :pop!
+      end
+
+      state :function_call do
+        rule /\b(#{functions_string.join('|')})\$(?=\s*[:(])/, Name::Function, :function
+        rule /\b(#{functions_array.join('|')})#(?=\s*[:(])/,   Name::Function, :function
+        rule /\b(#{functions_numeric.join('|')})(?=\s*[:(])/,  Name::Function, :function
+      end
+
+      state :old_arguments do
+        rule /\n/ do
+          token Text
+          pop!
+          pop! unless state? :root
+        end
+
+        mixin :function_call
+        mixin :operator
+        mixin :number
+
+        rule /"/, Literal::String, :string
+        rule /[^\n]/, Text
+      end
+
+      state :function do
+        rule /\s+/, Text
+
+        rule /:/ do
+          token Punctuation
+          push :comma_list
+        end
+
+        rule /\s*\(/ do
+          token Punctuation
+          pop!
+          push :comma_list
+        end
+      end
+
+      state :procedure_call do
+        rule /\s+/, Text
+
+        rule /([\w.]+)(:|\s*\()/ do
+          groups Name::Function, Punctuation
+          push :comma_list
+        end
+
+        rule /([\w.]+)/, Name::Function, :old_arguments
+      end
+
+      state :procedure_definition do
+        rule /\s/, Text
+
+        rule /([\w.]+)(\s*?[(:])/ do
+          groups Name::Function, Text
+          pop!
+        end
+
+        rule /([\w.]+)([^\n]*)/ do
+          groups Name::Function, Text
+          pop!
+        end
+      end
+
+      state :comma_list do
+        rule /(\s*\n\s*)(\.{3})/ do
+          groups Text, Punctuation
+        end
+
+        rule /\s*(\)|\]|\n)/ do
+          token Punctuation
+          pop!
+          pop! unless state? :root
+        end
+
+        rule /\s+/, Text
+        rule /"/,   Literal::String, :string
+        rule /\b(if|then|else|fi|endif)\b/, Keyword
+
+        mixin :function_call
+        mixin :variable_name
+        mixin :operator
+        mixin :number
+
+        rule /,/, Punctuation
+      end
+
+      state :number do
+        rule /\n/, Text, :pop!
+        rule /\b\d+(\.\d*)?([eE][-+]?\d+)?%?/, Literal::Number
+      end
+
+      state :variable_name do
+        mixin :operator
+        mixin :number
+
+        rule /\b(?:#{variables_string.join('|')})\$/,  Name::Builtin
+        rule /\b(?:#{variables_numeric.join('|')})\b/, Name::Builtin
+
+        rule /\b(Object|#{objects.join('|')})_\w+/, Name::Builtin, :object_attributes
+
+        rule /\b((?:Object|#{objects.join('|')})_)(')/ do
+          groups Name::Builtin, Literal::String::Interpol
+          push :object_attributes
+          push :string_interpolated
+        end
+
+        rule /\.?[a-z][a-zA-Z0-9_.]*(\$|#)?/, Text
+        rule /[\[\]]/, Punctuation
+        rule /'(?=.*')/, Literal::String::Interpol, :string_interpolated
+      end
+
+      state :object_attributes do
+        rule /\.?(n(col|row)|[xy]min|[xy]max|[nd][xy])\b/, Name::Builtin, :pop!
+        rule /(\.?(?:col|row)\$)(\[)/ do
+          groups Name::Builtin, Punctuation
+          push :variable_name
+        end
+        rule /(\$?)(\[)/ do
+          groups Name::Builtin, Punctuation
+          push :comma_list
+        end
+      end
+
+      state :string_interpolated do
+        rule /\.?[_a-z][a-zA-Z0-9_.]*(?:[\$#]?(?:\[[a-zA-Z0-9,]+\])?|:[0-9]+)?/, Literal::String::Interpol
+        rule /'/, Literal::String::Interpol, :pop!
+      end
+
+      state :string_unquoted do
+        rule /\n\s*\.{3}/, Punctuation
+        rule /\n/,         Text, :pop!
+        rule /\s/,         Text
+        rule /'(?=.*')/,   Literal::String::Interpol, :string_interpolated
+        rule /'/,          Literal::String
+        rule /[^'\n]+/,    Literal::String
+      end
+
+      state :string do
+        rule /\n\s*\.{3}/, Punctuation
+        rule /"/,          Literal::String,           :pop!
+        rule /'(?=.*')/,   Literal::String::Interpol, :string_interpolated
+        rule /'/,          Literal::String
+        rule /[^'"\n]+/,   Literal::String
+      end
+
+      state :old_form do
+        rule /\s+/, Text
+
+        rule /(optionmenu|choice)([ \t]+\S+:[ \t]+)/ do
+          groups Keyword, Text
+          push :number
+        end
+
+        rule /(option|button)([ \t]+)/ do
+          groups Keyword, Text
+          push :number
+        end
+
+        rule /(option|button)([ \t]+)/ do
+          groups Keyword, Text
+          push :string_unquoted
+        end
+
+        rule /(sentence|text)([ \t]+\S+)/ do
+          groups Keyword, Text
+          push :string_unquoted
+        end
+
+        rule /(word)([ \t]+\S+[ \t]*)(\S+)?([ \t]+.*)?/ do
+          groups Keyword, Text, Literal::String, Generic::Error
+        end
+
+        rule /(boolean)(\s+\S+\s*)(0|1|"?(?:yes|no)"?)/ do
+          groups Keyword, Text, Name::Variable
+        end
+
+        rule /(real|natural|positive|integer)([ \t]+\S+[ \t]*)([+-]?)/ do
+          groups Keyword, Text, Operator
+          push :number
+        end
+
+        rule /(comment)(\s+)/ do
+          groups Keyword, Text
+          push :string_unquoted
+        end
+
+        rule /\bendform\b/, Keyword, :pop!
+      end
+
+      state :operator do
+        # This rule incorrectly matches === or +++++, which are not operators
+        rule /([+\/*<>=!-]=?|[&*|][&*|]?|\^|<>)/, Operator
+        rule /\b(and|or|not|div|mod)\b/,          Operator::Word
+      end
+    end
+  end
+end

data/lib/rouge/lexers/qml.rb

@@ -2,7 +2,8 @@
 
 module Rouge
   module Lexers
-    load_const :Javascript, 'javascript.rb'
+    load_lexer 'javascript.rb'
+
     class Qml < Javascript
       title "QML"
       desc 'QML, a UI markup language'

data/lib/rouge/lexers/rust.rb

@@ -7,8 +7,7 @@ module Rouge
       desc 'The Rust programming language (rust-lang.org)'
       tag 'rust'
       aliases 'rs'
-      # TODO: *.rc conflicts with the rc shell...
-      filenames '*.rs', '*.rc'
+      filenames '*.rs'
       mimetypes 'text/x-rust'
 
       def self.analyze_text(text)

data/lib/rouge/lexers/sass.rb

@@ -2,7 +2,7 @@
 
 module Rouge
   module Lexers
-    load_const :SassCommon, 'sass/common.rb'
+    load_lexer 'sass/common.rb'
 
     class Sass < SassCommon
       include Indentation

data/lib/rouge/lexers/scss.rb

@@ -2,7 +2,7 @@
 
 module Rouge
   module Lexers
-    load_const :SassCommon, 'sass/common.rb'
+    load_lexer 'sass/common.rb'
 
     class Scss < SassCommon
       title "SCSS"

data/lib/rouge/lexers/swift.rb

@@ -14,21 +14,17 @@ module Rouge
       id = /#{id_head}#{id_rest}*/
 
       keywords = Set.new %w(
-        break case continue default do else fallthrough if in for return switch where while
+        break case continue default do else fallthrough if in for return switch where while try catch throw guard defer repeat
 
         as dynamicType is new super self Self Type __COLUMN__ __FILE__ __FUNCTION__ __LINE__
 
-        associativity didSet get infix inout left mutating none nonmutating operator override postfix precedence prefix right set unowned weak willSet
+        associativity didSet get infix inout left mutating none nonmutating operator override postfix precedence prefix right set unowned weak willSet throws rethrows
       )
 
       declarations = Set.new %w(
         class deinit enum extension final func import init internal lazy let optional private protocol public required static struct subscript typealias var dynamic
       )
 
-      attributes = Set.new %w(
-        autoclosure IBAction IBDesignable IBInspectable IBOutlet noreturn NSCopying NSManaged objc UIApplicationMain NSApplicationMain objc_block noescape
-      )
-
       constants = Set.new %w(
         true false nil
       )
@@ -70,21 +66,7 @@ module Rouge
         rule /0b[01]+(?:_[01]+)*/, Num::Bin
         rule %r{[\d]+(?:_\d+)*}, Num::Integer
 
-        rule /@availability[(][^)]+[)]/, Keyword::Declaration
-
-        rule /(@objc[(])([^)]+)([)])/ do
-          groups Keyword::Declaration, Name::Class, Keyword::Declaration
-        end
-        
-        rule /@autoclosure\(escaping\)/, Keyword::Declaration
-
-        rule /@(#{id})/ do |m|
-          if attributes.include? m[1]
-            token Keyword
-          else
-            token Error
-          end
-        end
+        rule /@#{id}(\([^)]+\))?/, Keyword::Declaration
 
         rule /(private|internal)(\([ ]*)(\w+)([ ]*\))/ do |m|
           if m[3] == 'set'
@@ -101,6 +83,8 @@ module Rouge
             groups Keyword::Declaration, Error, Keyword::Declaration
           end
         end
+        
+        rule /#available\([^)]+\)/, Keyword::Declaration
 
         rule /(let|var)\b(\s*)(#{id})/ do
           groups Keyword, Text, Name::Variable
@@ -115,6 +99,7 @@ module Rouge
         end
         
         rule /as[?!]?/, Keyword
+        rule /try[!]?/, Keyword
 
         rule /(#?(?!default)(?![[:upper:]])#{id})(\s*)(:)/ do
           groups Name::Variable, Text, Punctuation

data/lib/rouge/lexers/vb.rb

@@ -7,7 +7,7 @@ module Rouge
       desc "Visual Basic"
       tag 'vb'
       aliases 'visualbasic'
-      filenames '*.vbs'
+      filenames '*.vbs', '*.vb'
       mimetypes 'text/x-visualbasic', 'application/x-visualbasic'
 
       def self.keywords

data/lib/rouge/theme.rb

@@ -84,7 +84,7 @@ module Rouge
       end
 
       def get_own_style(token)
-        token.token_chain.each do |anc|
+        token.token_chain.reverse_each do |anc|
           return styles[anc] if styles[anc]
         end
 

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "1.9.1"
+    "1.10.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -71,6 +71,7 @@ files:
 - lib/rouge/demos/php
 - lib/rouge/demos/plaintext
 - lib/rouge/demos/powershell
+- lib/rouge/demos/praat
 - lib/rouge/demos/prolog
 - lib/rouge/demos/properties
 - lib/rouge/demos/puppet
@@ -157,6 +158,7 @@ files:
 - lib/rouge/lexers/php/builtins.rb
 - lib/rouge/lexers/plain_text.rb
 - lib/rouge/lexers/powershell.rb
+- lib/rouge/lexers/praat.rb
 - lib/rouge/lexers/prolog.rb
 - lib/rouge/lexers/properties.rb
 - lib/rouge/lexers/puppet.rb