Modify emphasis regexp to fix #48. Clean some code.

Author: ricardoricho

lib/org-ruby/html_output_buffer.rb

@@ -460,6 +460,8 @@ def strip_code_block!
       end
     end
 
+    private
+
     # The CGI::escapeHTML function backported from the Ruby standard library
     # as of commit fd2fc885b43283aa3d76820b2dfa9de19a77012f
     #
@@ -474,14 +476,14 @@ def strip_code_block!
       '&' => '&',
       '"' => '"',
       '<' => '&lt;',
-      '>' => '&gt;',
-    }
+      '>' => '&gt;'
+    }.freeze
+
     # Escape special characters in HTML, namely &\"<>
     #   escapeHTML('Usage: foo "bar" <baz>')
     #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
-    private
     def escapeHTML(string)
-      string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+      string.gsub(/['&"<>]/, TABLE_FOR_ESCAPE_HTML__)
     end
-  end                           # class HtmlOutputBuffer
-end                             # module Orgmode
+  end
+end

lib/org-ruby/regexp_helper.rb

@@ -44,18 +44,9 @@ class RegexpHelper
 
     def initialize
       # Set up the emphasis regular expression.
-      @pre_emphasis = ' \t\(\'"\{'
-      @post_emphasis = '- \t\.,:!\?;\'"\)\}\\\\'
-      @border_forbidden = ' \t\r\n'
-      @body_regexp = '.*?'
-      @max_newlines = 1
-      @body_regexp = "#{@body_regexp}" +
-                     "(?:\\n#{@body_regexp}){0,#{@max_newlines}}" if @max_newlines > 0
-      @markers = '\*\/_=~\+'
       @code_snippet_stack = []
       @logger = Logger.new(STDERR)
       @logger.level = Logger::WARN
-      build_org_emphasis_regexp
       build_org_link_regexp
       @org_subp_regexp = /([_^])\{(.*?)\}/
       @org_footnote_regexp = /\[fn:(.+?)(:(.*))?\]/
@@ -65,8 +56,8 @@ def initialize
     # Finds all emphasis matches in a string.
     # Supply a block that will get the marker and body as parameters.
     def match_all(str)
-      str.scan(@org_emphasis_regexp) do |match|
-        yield $2, $3
+      str.scan(org_emphasis_regexp) do |_match|
+        yield Regexp.last_match[2], Regexp.last_match[3]
       end
     end
 
@@ -95,39 +86,38 @@ def rewrite_emphasis(str)
       # escape the percent signs for safe restoring code snippets
       str.gsub!(/%/, "%%")
       format_str = "%s"
-      str.gsub! @org_emphasis_regexp do |match|
-        pre = $1
+      str.gsub!(org_emphasis_regexp) do |_match|
+        pre = Regexp.last_match(1)
         # preserve the code snippet from further formatting
-        if $2 == "=" or $2 == "~"
-          inner = yield $2, $3
+        inner = yield Regexp.last_match(2), Regexp.last_match(3)
+        if %w[= ~].include?(Regexp.last_match(2))
           # 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
 
     # rewrite subscript and superscript (_{foo} and ^{bar})
-    def rewrite_subp str # :yields: type ("_" for subscript and "^" for superscript), text
-      str.gsub! @org_subp_regexp do |match|
-        yield $1, $2
+    def rewrite_subp(str) # :yields: type ("_" for subscript and "^" for superscript), text
+      str.gsub! @org_subp_regexp do |_match|
+        yield Regexp.last_match(1), Regexp.last_match(2)
       end
     end
 
     # rewrite footnotes
-    def rewrite_footnote str # :yields: name, definition or nil
-      str.gsub! @org_footnote_regexp do |match|
-        yield $1, $3
+    def rewrite_footnote(str) # :yields: name, definition or nil
+      str.gsub! @org_footnote_regexp do |_match|
+        yield Regexp.last_match(1), Regexp.last_match(3)
       end
     end
 
-    def rewrite_footnote_definition str
-      str.gsub! @org_footnote_def_regexp do |match|
-        yield $1, $5
+    def rewrite_footnote_definition(str)
+      str.gsub! @org_footnote_def_regexp do |_match|
+        yield Regexp.last_match(1), Regexp.last_match(5)
       end
     end
 
@@ -156,33 +146,52 @@ def rewrite_footnote_definition str
     # +http://www.hotmail.com+. In both cases, the block returns an
     # HTML-style link, and that is how things will get recorded in
     # +result+.
-    def rewrite_links str # :yields: link, text
-      str.gsub! @org_link_regexp do |match|
-        yield $1, $3
+    def rewrite_links(str)
+      str.gsub! @org_link_regexp do |_match|
+        yield Regexp.last_match(1), Regexp.last_match(3)
       end
-      str.gsub! @org_angle_link_text_regexp do |match|
-        yield $1, nil
+      str.gsub! @org_angle_link_text_regexp do |_match|
+        yield Regexp.last_match(1), nil
       end
 
       str # for testing
     end
 
-    def restore_code_snippets str
+    def restore_code_snippets(str)
       str = str % @code_snippet_stack
       @code_snippet_stack = []
       str
     end
 
+    def org_emphasis_regexp
+      Regexp.new("(#{pre_emphasis_regexp})" \
+                 "(#{markers_regexp})" \
+                 "(#{border_forbidden}|" \
+                 "#{border_forbidden}#{body_regexp}" \
+                 "#{border_forbidden})\\2" \
+                 "(?=#{post_emphasis})")
+    end
+
     private
 
-    def build_org_emphasis_regexp
-      @org_emphasis_regexp = Regexp.new("([#{@pre_emphasis}]|^)" +
-                                        "([#{@markers}])(?!\\2)" +
-                                        "([^#{@border_forbidden}]|" +
-                                        "[^#{@border_forbidden}]#{@body_regexp}" +
-                                        "[^#{@border_forbidden}])\\2" +
-                                        "(?=[#{@post_emphasis}]|$)")
-      @logger.debug "Just created regexp: #{@org_emphasis_regexp}"
+    def pre_emphasis_regexp
+      '^|\s|[\(\'"\{]'
+    end
+
+    def markers_regexp
+      '[\*\/_=~\+]'
+    end
+
+    def border_forbidden
+      '\S'
+    end
+
+    def post_emphasis
+      '\s|[-,\.;:!\?\'"\)\}]|$'
+    end
+
+    def body_regexp
+      '.*?(?:\\n.*?){0,1}'
     end
 
     def build_org_link_regexp
@@ -194,5 +203,5 @@ def build_org_link_regexp
       @org_angle_link_text_regexp = /<(\w+:[^\]\s<>]+)>/
       @org_image_file_regexp = /\.(gif|jpe?g|p(?:bm|gm|n[gm]|pm)|svgz?|tiff?|x[bp]m)/i
     end
-  end                           # class Emphasis
-end                             # module Orgmode
+  end
+end

spec/html_examples/emphasis.html

@@ -1,4 +1,5 @@
 <h1>Inline Formatting test for emphasis</h1>
+<p>Fix issue <a href="https://github.com/wallyqs/org-ruby/issues/48">#48</a> <code>~/.bash</code> and <code>C-&#39;</code></p>
 <h2>Simple feature test</h2>
 <p><b>bold</b></p>
 <p><i>italic</i></p>