org-ruby 0.8.0 → 0.8.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.8.1 / 2013-02-17
+
+* Fix for html escaping when code is inline
+
 == 0.8.0 / 2013-02-10
 
 * A lot of refactoring work and bugfixes contributed by vonavi (many thanks!)

data/lib/org-ruby/html_output_buffer.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 begin
   require 'pygments'
 rescue LoadError
@@ -110,11 +111,12 @@ module Orgmode
         strip_code_block! if mode_is_code? current_mode
 
         # NOTE: CodeRay and Pygments already escape the html once, so
-        # no need to escape_string!(@buffer)
+        # no need to escapeHTML
         case
         when (current_mode == :src and defined? Pygments)
           lang = normalize_lang @block_lang
           @output << "\n" unless @new_paragraph == :start
+          @new_paragraph = true
 
           begin
             @buffer = Pygments.highlight(@buffer, :lexer => lang)
@@ -138,7 +140,8 @@ module Orgmode
           @buffer.gsub!(/\A\n/, "") if @new_paragraph == :start
           @new_paragraph = true
         else
-          escape_string! @buffer
+          # *NOTE* Don't use escape_buffer! through its sensitivity to @<text> forms
+          @buffer = CGI::escapeHTML @buffer
         end
 
         # Whitespace is significant in :code mode. Always output the
@@ -201,8 +204,9 @@ module Orgmode
       @output << "\n<div id=\"footnotes\">\n<h2 class=\"footnotes\">Footnotes:</h2>\n<div id=\"text-footnotes\">\n"
 
       @footnotes.each do |name, defi|
+        @buffer = defi
         @output << "<p class=\"footnote\"><sup><a class=\"footnum\" name=\"fn.#{name}\" href=\"#fnr.#{name}\">#{name}</a></sup>" \
-                << inline_formatting(defi) \
+                << inline_formatting(@buffer) \
                 << "</p>\n"
       end
 
@@ -229,21 +233,21 @@ module Orgmode
     end
 
     # Escapes any HTML content in the output accumulation buffer @buffer.
-    def escape_string! str
-      str.gsub!(/&/, "&amp;")
+    def escape_buffer!
+      @buffer.gsub!(/&/, "&amp;")
       # Escapes the left and right angular brackets but construction
       # @<text> which is formatted to <text>
-      str.gsub! /<([^<>\n]*)/ do |match|
+      @buffer.gsub! /<([^<>\n]*)/ do |match|
         if $`[-1..-1] == "@" and $'[0..0] == ">" then $&
         else "&lt;#{$1}"
         end
       end
-      str.gsub! /([^<>\n]*)>/ do |match|
+      @buffer.gsub! /([^<>\n]*)>/ do |match|
         if $`[-2..-1] == "@<" then $&
         else "#{$1}&gt;"
         end
       end
-      str.gsub!(/@(<[^<>\n]*>)/, "\\1")
+      @buffer.gsub!(/@(<[^<>\n]*>)/, "\\1")
     end
 
     def buffer_indentation
@@ -269,7 +273,12 @@ module Orgmode
     # Applies inline formatting rules to a string.
     def inline_formatting(str)
       @re_help.rewrite_emphasis str do |marker, s|
-        "@<#{Tags[marker][:open]}>#{s}@</#{Tags[marker][:close]}>"
+        if marker == "=" or marker == "~"
+          s = CGI::escapeHTML s
+          "<#{Tags[marker][:open]}>#{s}</#{Tags[marker][:close]}>"
+        else
+          "@<#{Tags[marker][:open]}>#{s}@</#{Tags[marker][:close]}>"
+        end
       end
       if @options[:use_sub_superscripts] then
         @re_help.rewrite_subp str do |type, text|
@@ -319,7 +328,7 @@ module Orgmode
           "@<sup>@<a class=\"footref\" name=\"fnr.#{name}\" href=\"#fn.#{name}\">#{name}@</a>@</sup>"
         end
       end
-      escape_string! str
+      escape_buffer!
       Orgmode.special_symbols_to_html str
       str = @re_help.restore_code_snippets str
     end
@@ -346,6 +355,7 @@ module Orgmode
     end
 
     def strip_code_block!
+      @code_block_indent ||= 0
       strip_regexp = Regexp.new("^" + " " * @code_block_indent)
       @buffer.gsub!(strip_regexp, "")
       @code_block_indent = nil

data/lib/org-ruby/line.rb

@@ -3,9 +3,6 @@ module Orgmode
   # Represents a single line of an orgmode file.
   class Line
 
-    # This is the line itself.
-    attr_reader :line
-
     # The indent level of this line. this is important to properly translate
     # nested lists from orgmode to textile.
     # TODO 2009-12-20 bdewey: Handle tabs
@@ -125,7 +122,7 @@ module Orgmode
       return strip_unordered_list_tag if unordered_list?
       return @line.sub(InlineExampleRegexp, "") if inline_example?
       return strip_raw_text_tag if raw_text?
-      return line
+      return @line
     end
 
     def plain_text?

data/lib/org-ruby/output_buffer.rb

@@ -91,10 +91,12 @@ module Orgmode
       if mode_is_code? current_mode and not line.block_type
         # Determines the amount of whitespaces to be stripped at the
         # beginning of each line in code block.
-        if @code_block_indent
-          @code_block_indent = [@code_block_indent, line.indent].min
-        else
-          @code_block_indent = line.indent
+        if line.paragraph_type != :blank
+          if @code_block_indent
+            @code_block_indent = [@code_block_indent, line.indent].min
+          else
+            @code_block_indent = line.indent
+          end
         end
       end
 

data/lib/org-ruby/parser.rb

@@ -106,8 +106,8 @@ module Orgmode
 
         case mode
         when :normal, :quote, :center
-          if Headline.headline? line.line
-            line = Headline.new line.line, self, offset
+          if Headline.headline? line.to_s
+            line = Headline.new line.to_s, self, offset
           elsif line.table_separator?
             if previous_line and previous_line.paragraph_type == :table_row and !table_header_set
               previous_line.assigned_paragraph_type = :table_header
@@ -123,7 +123,7 @@ module Orgmode
         end
 
         if mode == :normal
-          @headlines << @current_headline = line if Headline.headline? line.line
+          @headlines << @current_headline = line if Headline.headline? line.to_s
           # If there is a setting on this line, remember it.
           line.in_buffer_setting? do |key, value|
             store_in_buffer_setting key.upcase, value

data/lib/org-ruby/regexp_helper.rb

@@ -95,14 +95,18 @@ module Orgmode
       str.gsub!(/%/, "%%")
       format_str = "%s"
       str.gsub! @org_emphasis_regexp do |match|
+        pre = $1
         # preserve the code snippet from further formatting
-        inner = if $2 == "=" or $2 == "~"
-                  @code_snippet_stack.push $3
-                  yield $2, format_str
-                else
-                  yield $2, $3
-                end
-        "#{$1}#{inner}"
+        if $2 == "=" or $2 == "~"
+          inner = yield $2, $3
+          # code is not formatted, so turn to single percent signs
+          inner.gsub!(/%%/, "%")
+          @code_snippet_stack.push inner
+          "#{pre}#{format_str}"
+        else
+          inner = yield $2, $3
+          "#{pre}#{inner}"
+        end
       end
     end
 

data/lib/org-ruby.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: org-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000Z
+date: 2013-02-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypants
-  requirement: &70363076442520 !ruby/object:Gem::Requirement
+  requirement: &70245565801460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,8 +21,9 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70363076442520
-description: ! 'This gem contains Ruby routines for parsing org-mode files.The most
+  version_requirements: *70245565801460
+description: ! 'An org-mode parser written in Ruby. This gem contains Ruby routines
+  for parsing org-mode files.The most
 
   significant thing this library does today is convert org-mode files to