org-ruby 0.9.1.gh → 0.9.1

data/lib/org-ruby.rb

@@ -24,7 +24,7 @@ require 'org-ruby/tilt'
 module OrgRuby
 
   # :stopdoc:
-  VERSION = '0.9.1.gh'
+  VERSION = '0.9.1'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/org-ruby/html_output_buffer.rb

@@ -1,3 +1,14 @@
+begin
+  require 'pygments'
+rescue LoadError
+  # Pygments is not supported so we try instead with CodeRay
+  begin
+    require 'coderay'
+  rescue LoadError
+    # No code syntax highlighting
+  end
+end
+
 module Orgmode
 
   class HtmlOutputBuffer < OutputBuffer
@@ -40,19 +51,6 @@ module Orgmode
       @footnotes = {}
       @unclosed_tags = []
       @logger.debug "HTML export options: #{@options.inspect}"
-
-      unless @options[:skip_syntax_highlight]
-        begin
-          require 'pygments'
-        rescue LoadError
-          # Pygments is not supported so we try instead with CodeRay
-          begin
-            require 'coderay'
-          rescue LoadError
-            # No code syntax highlighting
-          end
-        end
-      end
     end
 
     # Output buffer is entering a new mode. Use this opportunity to
@@ -63,7 +61,7 @@ module Orgmode
 
       if HtmlBlockTag[mode]
         unless ((mode_is_table?(mode) and skip_tables?) or
-                (mode == :src and !@options[:skip_syntax_highlight] and defined? Pygments))
+                (mode == :src and defined? Pygments))
           css_class = case
                       when (mode == :src and @block_lang.empty?)
                         " class=\"src\""
@@ -94,7 +92,7 @@ module Orgmode
       m = super(mode)
       if HtmlBlockTag[m]
         unless ((mode_is_table?(m) and skip_tables?) or
-                (m == :src and !@options[:skip_syntax_highlight] and defined? Pygments))
+                (m == :src and defined? Pygments))
           add_paragraph if @new_paragraph
           @new_paragraph = true
           @logger.debug "</#{HtmlBlockTag[m]}>"
@@ -113,8 +111,6 @@ module Orgmode
         # NOTE: CodeRay and Pygments already escape the html once, so
         # no need to escapeHTML
         case
-        when (current_mode == :src and @options[:skip_syntax_highlight])
-          @buffer = escapeHTML @buffer
         when (current_mode == :src and defined? Pygments)
           lang = normalize_lang @block_lang
           @output << "\n" unless @new_paragraph == :start

data/lib/org-ruby/parser.rb

@@ -303,11 +303,10 @@ module Orgmode
       export_options = {
         :decorate_title => @in_buffer_settings["TITLE"],
         :export_heading_number => export_heading_number?,
-        :export_todo           => export_todo?,
-        :use_sub_superscripts  => use_sub_superscripts?,
-        :export_footnotes      => export_footnotes?,
-        :link_abbrevs          => @link_abbrevs,
-        :skip_syntax_highlight => @parser_options[:skip_syntax_highlight]
+        :export_todo => export_todo?,
+        :use_sub_superscripts =>  use_sub_superscripts?,
+        :export_footnotes => export_footnotes?,
+        :link_abbrevs => @link_abbrevs
       }
       export_options[:skip_tables] = true if not export_tables?
       output = ""

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: org-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.1.gh
-  prerelease: 6
+  version: 0.9.1
+  prerelease: 
 platform: ruby
 authors:
 - Brian Dewey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypants
-  requirement: &70363196176300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70363196176300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 description: ! 'An org-mode parser written in Ruby. This gem contains Ruby routines
   for parsing org-mode files.The most
 
@@ -79,9 +84,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: org-ruby
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This gem contains Ruby routines for parsing org-mode files.
 test_files: []
-has_rdoc: