Switches the formatting of image links to default Org-mode behavior.

Author: vonavi

lib/org-ruby/html_output_buffer.rb

@@ -275,11 +275,7 @@ def inline_formatting(str)
           end
         end
       end
-      @re_help.rewrite_images str do |link|
-        "@<a href=\"#{link}\">@<img src=\"#{link}\" />@</a>"
-      end
       @re_help.rewrite_links str do |link, text|
-        text ||= link
         link = link.sub(/^file:(.*)::(.*?)$/) do
 
           # We don't support search links right now. Get rid of it.
@@ -292,10 +288,19 @@ def inline_formatting(str)
 
         link = link.sub(/^file:/i, "") # will default to HTTP
 
-        text = text.gsub(/([^\]]*\.(jpg|jpeg|gif|png))/xi) do |img_link|
-          "@<img src=\"#{img_link}\" />"
+        # We don't add a description for images in links, because its
+        # empty value forces the image to be inlined.
+        text ||= link unless link =~ @re_help.org_image_file_regexp
+
+        if text =~ @re_help.org_image_file_regexp
+          text = "@<img src=\"#{text}\" alt=\"#{text}\" />"
+        end
+
+        if text
+          "@<a href=\"#{link}\">#{text}@</a>"
+        else
+          "@<img src=\"#{link}\" alt=\"#{link}\" />"
         end
-        "@<a href=\"#{link}\">#{text}@</a>"
       end
       if @output_type == :table_row
         str.gsub!(/^\|\s*/, "@<td>")

lib/org-ruby/regexp_helper.rb

@@ -39,14 +39,8 @@ class RegexpHelper
     # body-regexp  A regexp like \".\" to match a body character.  Don't use
     #              non-shy groups here, and don't allow newline here.
     # newline      The maximum number of newlines allowed in an emphasis exp.
-    attr_reader   :pre_emphasis
-    attr_reader   :post_emphasis
-    attr_reader   :border_forbidden
-    attr_reader   :body_regexp
-    attr_reader   :max_newlines
-    attr_reader   :markers
 
-    attr_reader   :org_emphasis_regexp
+    attr_reader :org_image_file_regexp
 
     def initialize
       # Set up the emphasis regular expression.
@@ -162,13 +156,6 @@ def rewrite_links str # :yields: link, text
       str # for testing
     end
 
-    # Rewrites all of the inline image tags.
-    def rewrite_images str # :yields: image_link
-      str.gsub! @org_img_regexp do |match|
-        yield $1
-      end
-    end
-
     def restore_code_snippets str
       str = str % @code_snippet_stack
       @code_snippet_stack = []
@@ -193,10 +180,8 @@ def build_org_link_regexp
                           \](\[
                              ([^\]\[]+) # This is the friendly text
                           \])?\]/x
-      @org_img_regexp = /\[\[
-          ([^\]\[]+\.(jpg|jpeg|gif|png)) # Like a normal URL, but must end with a specified extension
-        \]\]/xi
       @org_angle_link_text_regexp = /<(\w+:[^\]\s<>]+)>/
+      @org_image_file_regexp = /\.(gif|jpe?g|p(?:bm|gm|n[gm]|pm)|svg|tiff?|x[bp]m)/i
     end
   end                           # class Emphasis
 end                             # module Orgmode

lib/org-ruby/textile_output_buffer.rb

@@ -55,9 +55,22 @@ def inline_formatting(input)
         end
       end
       @re_help.rewrite_links input do |link, text|
-        text ||= link
+        # We don't add a description for images in links, because its
+        # empty value forces the image to be inlined.
+        text ||= link unless link =~ @re_help.org_image_file_regexp
         link = link.gsub(/ /, "%%20")
-        "\"#{text}\":#{link}"
+
+        if text =~ @re_help.org_image_file_regexp
+          text = "!#{text}(#{text})!"
+        else
+          text = "\"#{text}\"" if text
+        end
+
+        if text
+          "#{text}:#{link}"
+        else
+          "!#{link}(#{link})!"
+        end
       end
       @re_help.rewrite_footnote input do |name, definition|
         # textile only support numerical names, so we need to do some conversion