org-ruby 0.7.1 → 0.7.2

data/History.txt

@@ -1,3 +1,10 @@
+== 0.7.2 / 2012-10-07
+
+* Many fixes to the regular expressions used for emphasis, contributed by [[http://github.com/vonavi][vonavi]]
+* Bug fix for when a table starts with a headline, thanks to [[http://github/til][til]]
+* Asterisk can be used for definition lists too
+* Use text lexer as default option for Pygments and Coderay when no language is specified
+
 == 0.7.1 / 2012-08-04
 
 * Make source code blocks from lisp dialects use Pygments scheme lexer

data/lib/org-ruby.rb

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

data/lib/org-ruby/headline.rb

@@ -85,13 +85,6 @@ module Orgmode
       :"heading#{@level}"
     end
 
-    # Converts this headline and its body to textile.
-    def to_textile
-      output = "h#{@level}. #{@headline_text}\n"
-      output << Line.to_textile(@body_lines[1..-1])
-      output
-    end
-
     ######################################################################
     private
 

data/lib/org-ruby/html_output_buffer.rb

@@ -109,14 +109,14 @@ module Orgmode
 
         # Only try to colorize #+BEGIN_SRC blocks with a specified language,
         # but we still have to catch the cases when a lexer for the language was not available
-        if not @block_lang.empty? and (defined? Pygments or defined? CodeRay)
+        if defined? Pygments or defined? CodeRay
           lang = normalize_lang(@block_lang)
 
           # NOTE: CodeRay and Pygments already escape the html once, so no need to escape_buffer!
           if defined? Pygments
             begin
               @buffer = Pygments.highlight(@buffer, :lexer => lang)
-            rescue ::RubyPython::PythonError
+            rescue
               # Not supported lexer from Pygments, we fallback on using the text lexer
               @buffer = Pygments.highlight(@buffer, :lexer => 'text')
             end
@@ -347,6 +347,8 @@ module Orgmode
       case lang
       when 'emacs-lisp', 'common-lisp', 'lisp'
         'scheme'
+      when ''
+        'text'
       else
         lang
       end

data/lib/org-ruby/line.rb

@@ -78,7 +78,7 @@ module Orgmode
       ordered_list? or unordered_list? or definition_list?
     end
 
-    UnorderedListRegexp = /^\s*(-|\+)\s+/
+    UnorderedListRegexp = /^\s*(-|\+|\s+[*])\s+/
 
     def unordered_list?
       check_assignment_or_regexp(:unordered_list, UnorderedListRegexp)
@@ -88,7 +88,7 @@ module Orgmode
       @line.sub(UnorderedListRegexp, "")
     end
 
-    DefinitionListRegexp = /^\s*(-|\+)\s*(.*?)::/
+    DefinitionListRegexp = /^\s*(-|\+|\s+[*])\s*(.*?)::/
 
     def definition_list?
       check_assignment_or_regexp(:definition_list, DefinitionListRegexp)
@@ -223,12 +223,6 @@ module Orgmode
       return :paragraph
     end
 
-    def self.to_textile(lines)
-      output = ""
-      output_buffer = TextileOutputBuffer.new(output)
-      Parser.translate(lines, output_buffer)
-    end
-
     ######################################################################
     private
 

data/lib/org-ruby/parser.rb

@@ -99,15 +99,16 @@ module Orgmode
       mode = :normal
       previous_line = nil
       table_header_set = false
-      @lines.each do |line|
+      @lines.each do |text|
+        line = Line.new text, self
+
         case mode
         when :normal
 
-          if (Headline.headline? line) then
-            @current_headline = Headline.new line, self, offset
+          if (Headline.headline? line.line) then
+            @current_headline = Headline.new line.line, self, offset
             @headlines << @current_headline
           else
-            line = Line.new line, self
             # If there is a setting on this line, remember it.
             line.in_buffer_setting? do |key, value|
               store_in_buffer_setting key, value
@@ -131,7 +132,7 @@ module Orgmode
           end
 
         when :block_comment
-          line = Line.new line, self
+
           if line.end_block? and line.block_type == "COMMENT"
             mode = :normal
           else
@@ -142,7 +143,6 @@ module Orgmode
 
           # As long as we stay in code mode, force lines to be either blank or paragraphs.
           # Don't try to interpret structural items, like headings and tables.
-          line = Line.new line, self
           if line.end_block? and line.code_block?
             mode = :normal
           else
@@ -156,9 +156,8 @@ module Orgmode
 
         when :src_code
 
-          line = Line.new line, self
           if line.end_block? and line.code_block?
-            mode = :normal            
+            mode = :normal
           else
             line.assigned_paragraph_type = :src
           end
@@ -170,7 +169,6 @@ module Orgmode
 
         when :property_drawer
 
-          line = Line.new line, self
           if line.property_drawer_end_block?
             mode = :normal
           else
@@ -182,6 +180,7 @@ module Orgmode
             @header_lines << line
           end
         end                     # case
+
         previous_line = line
       end                       # @lines.each
     end                         # initialize
@@ -195,9 +194,11 @@ module Orgmode
     # Saves the loaded orgmode file as a textile file.
     def to_textile
       output = ""
-      output << Line.to_textile(@header_lines)
+      output_buffer = TextileOutputBuffer.new(output)
+
+      Parser.translate(@header_lines, output_buffer)
       @headlines.each do |headline|
-        output << headline.to_textile
+        Parser.translate(headline.body_lines, output_buffer)
       end
       output
     end
@@ -248,6 +249,7 @@ module Orgmode
     # Converts an array of lines to the appropriate format.
     # Writes the output to +output_buffer+.
     def self.translate(lines, output_buffer)
+      output_buffer.output_type = :start
       lines.each do |line|
 
         # See if we're carrying paragraph payload, and output

data/lib/org-ruby/regexp_helper.rb

@@ -52,11 +52,11 @@ module Orgmode
 
     def initialize
       # Set up the emphasis regular expression.
-      @pre_emphasis = " \t\\('\""
-      @post_emphasis = "- \t.,:!?;'\"\\)"
+      @pre_emphasis = " \t\\('\"\\{"
+      @post_emphasis = "- \t\\.,:!\\?;'\"\\)\\}\\\\"
       @border_forbidden = " \t\r\n,\"'"
       @body_regexp = ".*?"
-      @markers = "*/_=~+"
+      @markers = "\\*\\/_=~\\+"
       @logger = Logger.new(STDERR)
       @logger.level = Logger::WARN
       build_org_emphasis_regexp
@@ -97,7 +97,7 @@ module Orgmode
     def rewrite_emphasis(str)
       str.gsub(@org_emphasis_regexp) do |match|
         inner = yield $2, $3
-        "#{$1}#{inner}#{$4}"
+        "#{$1}#{inner}"
       end
     end
 
@@ -161,11 +161,11 @@ module Orgmode
 
     def build_org_emphasis_regexp
       @org_emphasis_regexp = Regexp.new("([#{@pre_emphasis}]|^)\n" +
-                                        "(  [#{@markers}]  )\n" +
-                                        "(  [^#{@border_forbidden}]  | " +
-                                        "  [^#{@border_forbidden}]#{@body_regexp}[^#{@border_forbidden}]  )\n" +
+                                        "( [#{@markers}] ) (?!\\2)\n" +
+                                        "( [^#{@border_forbidden}] | " +
+                                        "[^#{@border_forbidden}]#{@body_regexp}[^#{@border_forbidden}] )\n" +
                                         "\\2\n" +
-                                        "([#{@post_emphasis}]|$)\n", Regexp::EXTENDED)
+                                        "(?=[#{@post_emphasis}]|$)\n", Regexp::EXTENDED)
       @logger.debug "Just created regexp: #{@org_emphasis_regexp}"
     end
 

data/lib/org-ruby/textile_output_buffer.rb

@@ -92,7 +92,13 @@ module Orgmode
             (@output_type == :definition_list and not @support_definition_list) then
           @output << "*" * @list_indent_stack.length << " "
         end
-        @output << inline_formatting(@buffer) << "\n"
+        if (@buffered_lines[0].kind_of?(Headline)) then
+          headline = @buffered_lines[0]
+          raise "Cannot be more than one headline!" if @buffered_lines.length > 1
+          @output << "h#{headline.level}. #{headline.headline_text}\n"
+        else
+          @output << inline_formatting(@buffer) << "\n"
+        end
       end
       clear_accumulation_buffer!
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: org-ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000Z
+date: 2012-10-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypants
-  requirement: &70185642496880 !ruby/object:Gem::Requirement
+  requirement: &70185810847640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185642496880
+  version_requirements: *70185810847640
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &70185642496060 !ruby/object:Gem::Requirement
+  requirement: &70185810846040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.8.0
   type: :development
   prerelease: false
-  version_requirements: *70185642496060
+  version_requirements: *70185810846040
 description: ! 'This gem contains Ruby routines for parsing org-mode files.The most
 
   significant thing this library does today is convert org-mode files to