rouge 1.11.0 → 1.11.1

data/lib/rouge/theme.rb

@@ -63,6 +63,8 @@ module Rouge
       end
     end
 
+    def palette(*a) self.class.palette(*a) end
+
     @styles = {}
     def self.styles
       @styles ||= InheritableHash.new(superclass.styles)
@@ -76,8 +78,6 @@ module Rouge
       def style(*tokens)
         style = tokens.last.is_a?(Hash) ? tokens.pop : {}
 
-        style = Style.new(self, style)
-
         tokens.each do |tok|
           styles[tok] = style
         end
@@ -85,7 +85,7 @@ module Rouge
 
       def get_own_style(token)
         token.token_chain.reverse_each do |anc|
-          return styles[anc] if styles[anc]
+          return Style.new(self, styles[anc]) if styles[anc]
         end
 
         nil
@@ -96,7 +96,7 @@ module Rouge
       end
 
       def base_style
-        styles[Token::Tokens::Text]
+        get_own_style(Token::Tokens::Text)
       end
 
       def name(n=nil)
@@ -150,7 +150,7 @@ module Rouge
       yield "#{@scope} table pre { margin: 0; }"
 
       styles.each do |tok, style|
-        style.render(css_selector(tok), &b)
+        Style.new(self, style).render(css_selector(tok), &b)
       end
     end
 

data/lib/rouge/themes/gruvbox.rb

@@ -0,0 +1,167 @@
+# -*- coding: utf-8 -*- #
+
+# TODO how are we going to handle soft/hard contrast?
+
+module Rouge
+  module Themes
+    # Based on https://github.com/morhetz/gruvbox, with help from
+    # https://github.com/daveyarwood/gruvbox-pygments
+    class Gruvbox < CSSTheme
+      name 'gruvbox'
+
+      # global Gruvbox colours {{{
+      C_dark0_hard = '#1d2021'
+      C_dark0 ='#282828'
+      C_dark0_soft = '#32302f'
+      C_dark1 = '#3c3836'
+      C_dark2 = '#504945'
+      C_dark3 = '#665c54'
+      C_dark4 = '#7c6f64'
+      C_dark4_256 = '#7c6f64'
+
+      C_gray_245 = '#928374'
+      C_gray_244 = '#928374'
+
+      C_light0_hard = '#f9f5d7'
+      C_light0 = '#fbf1c7'
+      C_light0_soft = '#f2e5bc'
+      C_light1 = '#ebdbb2'
+      C_light2 = '#d5c4a1'
+      C_light3 = '#bdae93'
+      C_light4 = '#a89984'
+      C_light4_256 = '#a89984'
+
+      C_bright_red = '#fb4934'
+      C_bright_green = '#b8bb26'
+      C_bright_yellow = '#fabd2f'
+      C_bright_blue = '#83a598'
+      C_bright_purple = '#d3869b'
+      C_bright_aqua = '#8ec07c'
+      C_bright_orange = '#fe8019'
+
+      C_neutral_red = '#cc241d'
+      C_neutral_green = '#98971a'
+      C_neutral_yellow = '#d79921'
+      C_neutral_blue = '#458588'
+      C_neutral_purple = '#b16286'
+      C_neutral_aqua = '#689d6a'
+      C_neutral_orange = '#d65d0e'
+
+      C_faded_red = '#9d0006'
+      C_faded_green = '#79740e'
+      C_faded_yellow = '#b57614'
+      C_faded_blue = '#076678'
+      C_faded_purple = '#8f3f71'
+      C_faded_aqua = '#427b58'
+      C_faded_orange = '#af3a03'
+      # }}}
+
+      extend HasModes
+
+      def self.light!
+        mode :dark # indicate that there is a dark variant
+        mode! :light
+      end
+
+      def self.dark!
+        mode :light # indicate that there is a light variant
+        mode! :dark
+      end
+
+      def self.make_dark!
+        palette bg0: C_dark0
+        palette bg1: C_dark1
+        palette bg2: C_dark2
+        palette bg3: C_dark3
+        palette bg4: C_dark4
+
+        palette gray: C_gray_245
+
+        palette fg0: C_light0
+        palette fg1: C_light1
+        palette fg2: C_light2
+        palette fg3: C_light3
+        palette fg4: C_light4
+
+        palette fg4_256: C_light4_256
+
+        palette red: C_bright_red
+        palette green: C_bright_green
+        palette yellow: C_bright_yellow
+        palette blue: C_bright_blue
+        palette purple: C_bright_purple
+        palette aqua: C_bright_aqua
+        palette orange: C_bright_orange
+
+      end
+
+      def self.make_light!
+        palette bg0: C_light0
+        palette bg1: C_light1
+        palette bg2: C_light2
+        palette bg3: C_light3
+        palette bg4: C_light4
+
+        palette gray: C_gray_244
+
+        palette fg0: C_dark0
+        palette fg1: C_dark1
+        palette fg2: C_dark2
+        palette fg3: C_dark3
+        palette fg4: C_dark4
+
+        palette fg4_256: C_dark4_256
+
+        palette red: C_faded_red
+        palette green: C_faded_green
+        palette yellow: C_faded_yellow
+        palette blue: C_faded_blue
+        palette purple: C_faded_purple
+        palette aqua: C_faded_aqua
+        palette orange: C_faded_orange
+      end
+
+      dark!
+      mode :light
+
+      style Text, :fg => :fg0, :bg => :bg0
+      style Error, :fg => :red, :bg => :bg0, :bold => true
+      style Comment, :fg => :gray, :italic => true
+
+      style Comment::Preproc, :fg => :aqua
+
+      style Name::Tag, :fg => :red
+
+      style Operator,
+            Punctuation, :fg => :fg0
+
+      style Generic::Inserted, :fg => :green, :bg => :bg0
+      style Generic::Deleted, :fg => :red, :bg => :bg0
+      style Generic::Heading, :fg => :green, :bold => true
+
+      style Keyword, :fg => :red
+      style Keyword::Constant, :fg => :purple
+      style Keyword::Type, :fg => :yellow
+
+      style Keyword::Declaration, :fg => :orange
+
+      style Literal::String,
+            Literal::String::Interpol,
+            Literal::String::Regex, :fg => :green, :italic => true
+
+      style Literal::String::Escape, :fg => :orange
+
+      style Name::Namespace,
+            Name::Class, :fg => :aqua
+
+      style Name::Constant, :fg => :purple
+
+      style Name::Attribute, :fg => :green
+
+      style Literal::Number, :fg => :purple
+
+      style Literal::String::Symbol, :fg => :blue
+
+    end
+  end
+end

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "1.11.0"
+    "1.11.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -30,6 +30,7 @@ files:
 - lib/rouge/demos/biml
 - lib/rouge/demos/c
 - lib/rouge/demos/ceylon
+- lib/rouge/demos/cfscript
 - lib/rouge/demos/clojure
 - lib/rouge/demos/cmake
 - lib/rouge/demos/coffeescript
@@ -67,6 +68,7 @@ files:
 - lib/rouge/demos/json-doc
 - lib/rouge/demos/jsonnet
 - lib/rouge/demos/julia
+- lib/rouge/demos/kotlin
 - lib/rouge/demos/liquid
 - lib/rouge/demos/literate_coffeescript
 - lib/rouge/demos/literate_haskell
@@ -81,6 +83,7 @@ files:
 - lib/rouge/demos/nim
 - lib/rouge/demos/objective_c
 - lib/rouge/demos/ocaml
+- lib/rouge/demos/pascal
 - lib/rouge/demos/perl
 - lib/rouge/demos/php
 - lib/rouge/demos/plaintext
@@ -123,9 +126,14 @@ files:
 - lib/rouge/demos/yaml
 - lib/rouge/formatter.rb
 - lib/rouge/formatters/html.rb
-- lib/rouge/formatters/html_wrapper.rb
 - lib/rouge/formatters/null.rb
 - lib/rouge/formatters/terminal256.rb
+- lib/rouge/guesser.rb
+- lib/rouge/guessers/filename.rb
+- lib/rouge/guessers/glob_mapping.rb
+- lib/rouge/guessers/mimetype.rb
+- lib/rouge/guessers/modeline.rb
+- lib/rouge/guessers/source.rb
 - lib/rouge/lexer.rb
 - lib/rouge/lexers/actionscript.rb
 - lib/rouge/lexers/apache.rb
@@ -135,6 +143,7 @@ files:
 - lib/rouge/lexers/biml.rb
 - lib/rouge/lexers/c.rb
 - lib/rouge/lexers/ceylon.rb
+- lib/rouge/lexers/cfscript.rb
 - lib/rouge/lexers/clojure.rb
 - lib/rouge/lexers/cmake.rb
 - lib/rouge/lexers/coffeescript.rb
@@ -171,6 +180,7 @@ files:
 - lib/rouge/lexers/jinja.rb
 - lib/rouge/lexers/jsonnet.rb
 - lib/rouge/lexers/julia.rb
+- lib/rouge/lexers/kotlin.rb
 - lib/rouge/lexers/liquid.rb
 - lib/rouge/lexers/literate_coffeescript.rb
 - lib/rouge/lexers/literate_haskell.rb
@@ -187,6 +197,7 @@ files:
 - lib/rouge/lexers/nim.rb
 - lib/rouge/lexers/objective_c.rb
 - lib/rouge/lexers/ocaml.rb
+- lib/rouge/lexers/pascal.rb
 - lib/rouge/lexers/perl.rb
 - lib/rouge/lexers/php.rb
 - lib/rouge/lexers/php/builtins.rb
@@ -238,6 +249,7 @@ files:
 - lib/rouge/themes/base16.rb
 - lib/rouge/themes/colorful.rb
 - lib/rouge/themes/github.rb
+- lib/rouge/themes/gruvbox.rb
 - lib/rouge/themes/molokai.rb
 - lib/rouge/themes/monokai.rb
 - lib/rouge/themes/monokai_sublime.rb

data/lib/rouge/formatters/html_wrapper.rb

@@ -1,11 +0,0 @@
-module Rouge
-  module Formatters
-    class HTMLWrapper
-      def initialize(open, formatter, close)
-        @open = open
-        @formatter = formatter
-        @close = close
-      end
-    end
-  end
-end