rouge 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 348faa966dfc41fca0cc87eab6a2cd724bad6a6d
-  data.tar.gz: 02e5a8446ac380f2ee75df978e4573c53fd461bc
+  metadata.gz: 7271e7e935f4e3a5e38187c5d53cd71578453f30
+  data.tar.gz: 1bd9cdf5744f515565f86602c0d6ac7b382d1afc
 SHA512:
-  metadata.gz: 7ff37b2f1dd11e918dea989ac0eaaf34a2fbc80fc8285e6c25fcd4c14f3ae83e0243f83e04f69c0270102efe4dd247717b1cb6f77f187580943b73e3eaaaeed8
-  data.tar.gz: a3a9c6256ec0a898fa7e284988625406f605d90ae8414a481cde2911a02291f3c967e0ced5637905aba5b60f5972e2e297ca0f88608b4455f4771227f913877e
+  metadata.gz: 4d8b40f7d369bab8e223ffa6cbea7742a707e849e9dc3f11a88eb30fd6c23accaf2b43a9176bdeae1cf671901fc61f9379897c220e0d0fc2ec124e2a851d07fe
+  data.tar.gz: 4a4541ed068a997755964649ed02d56e332609877f1282d4ded0e84073fb867ae14021470f9bf6e8740885f71ead3f8b551028dc0cfd80c1266c49b1d1f9a248

data/lib/rouge/cli.rb

@@ -272,6 +272,9 @@ module Rouge
         yield %||
         yield %|options:|
         yield %|  --scope	(default: .highlight) a css selector to scope by|
+        yield %||
+        yield %|available themes:|
+        yield %|  #{Theme.registry.keys.sort.join(', ')}|
       end
 
       def self.parse(argv)

data/lib/rouge/formatters/html.rb

@@ -23,8 +23,13 @@ module Rouge
       # not) with the given `:css_class` unless `:wrap` is set to `false`.
       def initialize(opts={})
         @css_class = opts.fetch(:css_class, 'highlight')
+        @css_class = " class=#{@css_class.inspect}" if @css_class
+
         @line_numbers = opts.fetch(:line_numbers, false)
+        @start_line = opts.fetch(:start_line, 1)
         @inline_theme = opts.fetch(:inline_theme, nil)
+        @inline_theme = Theme.find(@inline_theme).new if @inline_theme.is_a? String
+
         @wrap = opts.fetch(:wrap, true)
       end
 
@@ -39,11 +44,9 @@ module Rouge
 
     private
       def stream_untableized(tokens, &b)
-        yield "<pre class=#{@css_class.inspect}>" if @wrap
-        tokens.each do |tok, val|
-          span(tok, val, &b)
-        end
-        yield "</pre>\n" if @wrap
+        yield "<pre><code#@css_class>" if @wrap
+        tokens.each{ |tok, val| span(tok, val, &b) }
+        yield "</code></pre>\n" if @wrap
       end
 
       def stream_tableized(tokens)
@@ -63,12 +66,11 @@ module Rouge
           span(Token::Tokens::Text::Whitespace, "\n") { |str| formatted << str }
         end
 
-        # generate a string of newline-separated line numbers for the gutter
-        numbers = num_lines.times.map do |x|
-          %<<pre class="lineno">#{x+1}</pre>>
-        end.join
+        # generate a string of newline-separated line numbers for the gutter>
+        numbers = %<<pre class="lineno">#{(@start_line..num_lines+@start_line-1)
+          .to_a.join("\n")}</pre>>
 
-        yield "<div class=#{@css_class.inspect}>" if @wrap
+        yield "<div#@css_class>" if @wrap
         yield '<table style="border-spacing: 0"><tbody><tr>'
 
         # the "gl" class applies the style for Generic.Lineno

data/lib/rouge/themes/monokai.rb

@@ -19,6 +19,79 @@ module Rouge
       palette :soft_yellow    => '#e6db74'
       palette :very_dark      => '#1e0010'
       palette :whitish        => '#f8f8f2'
+      palette :orange         => '#f6aa11'
+      palette :white          => '#ffffff'
+
+      extend HasModes
+
+      def self.sublime!
+        mode! :sublime
+      end
+
+      def self.make_sublime!
+        style Generic::Heading,                 :fg => :grey
+        style Literal::String::Regex,           :fg => :orange
+        style Generic::Output,                  :fg => :dark_grey
+        style Generic::Prompt,                  :fg => :emperor
+        style Generic::Strong,                  :bold => false
+        style Generic::Subheading,              :fg => :light_grey
+        style Name::Builtin,                    :fg => :orange
+        style Comment::Multiline,
+              Comment::Preproc,
+              Comment::Single,
+              Comment::Special,
+              Comment,                          :fg => :dimgrey
+        style Error,
+        Generic::Error,
+        Generic::Traceback,                     :fg => :carmine
+        style Generic::Deleted,
+              Generic::Inserted,
+              Generic::Emph,                    :fg => :dark
+        style Keyword::Constant,
+              Keyword::Declaration,
+              Keyword::Reserved,
+              Name::Constant,
+              Keyword::Type,                    :fg => :soft_cyan
+        style Literal::Number::Float,
+              Literal::Number::Hex,
+              Literal::Number::Integer::Long,
+              Literal::Number::Integer,
+              Literal::Number::Oct,
+              Literal::Number,
+              Literal::String::Char,
+              Literal::String::Escape,
+              Literal::String::Symbol,          :fg => :light_violet
+        style Literal::String::Doc,
+              Literal::String::Double,
+              Literal::String::Backtick,
+              Literal::String::Heredoc,
+              Literal::String::Interpol,
+              Literal::String::Other,
+              Literal::String::Single,
+              Literal::String,                  :fg => :soft_yellow
+        style Name::Attribute,
+              Name::Class,
+              Name::Decorator,
+              Name::Exception,
+              Name::Function,                   :fg => :bright_green
+        style Name::Variable::Class,
+              Name::Namespace,
+              Name::Label,
+              Name::Entity,
+              Name::Builtin::Pseudo,
+              Name::Variable::Global,
+              Name::Variable::Instance,
+              Name::Variable,
+              Text::Whitespace,
+              Text,
+              Name,                             :fg => :white
+        style Operator::Word,
+              Name::Tag,
+              Keyword,
+              Keyword::Namespace,
+              Keyword::Pseudo,
+              Operator,                         :fg => :bright_pink
+      end
 
       style Comment,
             Comment::Multiline,

data/lib/rouge/version.rb

@@ -1,5 +1,5 @@
 module Rouge
   def self.version
-    "1.3.4"
+    "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Jay Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -199,9 +199,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rouge
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A pure-ruby colorizer based on pygments
 test_files: []
-has_rdoc: