lib/markdown2confluence/convertor/confluence.rb in markdown2confluence-0.0.1f vs lib/markdown2confluence/convertor/confluence.rb in markdown2confluence-0.0.1g

@@ -97,28 +97,35 @@
       def convert_hr(el, indent)
         "#{' '*indent}----\n"
       end
 
       def convert_ul(el, indent)
-        ""
+        inner(el,indent)
       end
+
       alias :convert_ol :convert_ul
       alias :convert_dl :convert_ul
 
       def convert_li(el, indent)
-        "#{'-'*el.options[:level]} #{inner(el, indent)}\n"
+        "#{'-'}#{inner(el, indent)}"
       end
+
       alias :convert_dd :convert_li
 
       def convert_dt(el, indent)
         inner(el, indent)
       end
 
       def convert_html_element(el, indent)
         markup=case el.value
                when "iframe" then "{iframe:src=#{el.attr["src"]}}"
-               when "pre" then "{code}#{inner(el,indent)}{code}"
+               when "pre" then
+                 if  inner(el,indent).strip.match(/\n/)
+                   "{code}#{inner(el,indent)}{code}"
+                 else
+                   "{{#{inner(el,indent).strip}}}"
+                 end
                else inner(el, indent)
                end
       end
 
       def convert_xml_comment(el, indent)
@@ -170,10 +177,14 @@
       def convert_codeblock(el, indent)
         "{code}#{el.value}{code}\n"
       end
 
       def convert_codespan(el, indent)
-        "{code}#{el.value}{code}\n"
+        if  el.value.strip.match(/\n/)
+          "{code}#{el.value}{code}\n"
+        else
+          "{{#{el.value.strip}}}"
+        end
       end
 
       def convert_footnote(el, indent)
         inner(el, indent)
       end