Merge branch 'master' of https://github.com/benbalter/word-to-markdown

Author: benbalter

README.md

@@ -2,7 +2,7 @@
 
 A Ruby gem to liberate content from [the jail that is Word documents](http://ben.balter.com/2012/10/19/we-ve-been-trained-to-make-paper/#jailbreaking-content)
 
-[![Build Status](https://travis-ci.org/benbalter/word-to-markdown.svg?branch=master)](https://travis-ci.org/benbalter/word-to-markdown) [![Gem Version](https://badge.fury.io/rb/word-to-markdown.png)](http://badge.fury.io/rb/word-to-markdown)
+[![Build Status](https://travis-ci.org/benbalter/word-to-markdown.svg?branch=master)](https://travis-ci.org/benbalter/word-to-markdown) [![Gem Version](https://badge.fury.io/rb/word-to-markdown.png)](http://badge.fury.io/rb/word-to-markdown) [![Inline docs](http://inch-pages.github.io/github/benbalter/word-to-markdown.png)](http://inch-pages.github.io/github/benbalter/word-to-markdown)
 
 ## The problem
 

lib/word-to-markdown.rb

@@ -92,6 +92,7 @@ def scrub_whitespace(string)
     string.gsub!(/^-[[:space:]·]*/,"- ")            # Unnumbered lists
     string.gsub!(/\u00A0/, "")                      # Unicode non-breaking spaces, injected as tabs
     string.gsub!(/^ /, "")                          # Leading spaces
+    string.gsub!(/^- (\d+)\./, "\\1.")              # OL's wrapped in UL's see http://bit.ly/1ivqxy8
     string
   end
 

public/assets/style.css

@@ -1,5 +1,5 @@
 body {font-size: 2em;  padding: 25px 100px 25px 100px; text-align: center; }
-footer { position: absolute; bottom: 15px; right: 15px; }
+footer { margin: 40px 0 20px; }
 .moar {text-align: center; margin-top: 100px; }
 .md-preview, pre { text-align: left; }
 .rendered-preview { border: 1px solid #ccc; padding: 15px; text-align: left; }

test/fixtures/ul-ol.htm

@@ -0,0 +1,9 @@
+<p class=MsoListParagraphCxSpMiddle style='text-indent:-.25in;mso-list:l0 level1 lfo1'><![if !supportLists]><span
+style='mso-fareast-font-family:Cambria;mso-fareast-theme-font:minor-latin;
+mso-bidi-font-family:Cambria;mso-bidi-theme-font:minor-latin'><span
+style='mso-list:Ignore'>1.<span style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>One</p>
+
+<p class=MsoListParagraphCxSpMiddle style='text-indent:-.25in;mso-list:l0 level1 lfo1'><![if !supportLists]><span
+style='mso-fareast-font-family:Cambria;mso-fareast-theme-font:minor-latin;
+mso-bidi-font-family:Cambria;mso-bidi-theme-font:minor-latin'><span
+style='mso-list:Ignore'>2.<span style='font:7.0pt "Times New Roman"'> </span></span></span><![endif]>Two</p>

test/test_word_to_markdown.rb

@@ -35,6 +35,10 @@ class TestWordToMarkdown < Test::Unit::TestCase
     validate_fixture "ol", "1. One\n\n2. Two\n\n3. Three"
   end
 
+  should "not wrap ol in uls" do
+    validate_fixture "ul-ol", "1. One\n2. Two"
+  end
+
   should "parse tables" do
     validate_fixture "table", "| **Foo** | **Bar** |\n| One | Two |\n| Three | Four |"
   end