Merge remote-tracking branch 'origin/master' into xdite-merge

Conflicts: lib/gollum/markup.rb
2012-04-10 15:16:13 -07:00
parent 7924e8c9a9 c5cc6905de
commit 73cd25b05f
7 changed files with 38 additions and 41 deletions
@@ -53,17 +53,13 @@ module Gollum
        doc  = Nokogiri::HTML::DocumentFragment.parse(data)
        doc  = sanitize.clean_node!(doc) if sanitize
        yield doc if block_given?
-        data = doc_to_html(doc)
+        data = doc.to_html
      end
      data = process_tex(data)
      data.gsub!(/<p><\/p>/, '')
      data
    end

-    def doc_to_html(doc)
-      doc.to_xhtml(:save_with => Nokogiri::XML::Node::SaveOptions::AS_XHTML)
-    end
-
    #########################################################################
    #
    # TeX