Merge pull request #5 from mameier/master

clear \ul with \ul0

lib/ruby-rtf/parser.rb

@@ -152,7 +152,13 @@ def handle_control(name, val, src, current_pos)
           add_section!(:italic => true)
         end
 
-      when :ul then add_section!(:underline => true)
+      when :ul then
+        if val
+          @formatting_stack.pop
+          add_section!
+        else
+          add_section!(:underline => true)
+        end
       when :ulnone then
         current_section[:modifiers][:underline] = false
         @formatting_stack.pop

spec/parser_spec.rb

@@ -93,6 +93,18 @@
       section[2][:modifiers].has_key?(:italic).should be_false
       section[2][:text].should == 'Goodbye, cruel world.'
     end
+
+    it 'clears ul with ul0' do
+      src = '{\rtf1 \ul\b Hello\b0\ul0 World}'
+      section = parser.parse(src).sections
+      section[0][:modifiers][:bold].should be_true
+      section[0][:modifiers][:underline].should be_true
+      section[0][:text].should == 'Hello'
+
+      section[1][:modifiers].has_key?(:bold).should be_false
+      section[1][:modifiers].has_key?(:underline).should be_false
+      section[1][:text].should == 'World'
+    end
   end
 
   context '#parse_control' do