lib/caracal/renderers/styles_renderer.rb in caracal-0.1.8 vs lib/caracal/renderers/styles_renderer.rb in caracal-0.2.0

@@ -41,11 +41,11 @@
               xml.send 'w:pPrDefault' do
                 xml.send 'w:pPr' do
                   xml.send 'w:keepNext',     { 'w:val' => '0' }
                   xml.send 'w:keepLines',    { 'w:val' => '0' }
                   xml.send 'w:widowControl', { 'w:val' => '1' }
-                  xml.send 'w:spacing',      { 'w:lineRule' => 'auto', 'w:line' => s.style_line, 'w:before' => '0', 'w:after' => '0' }
+                  xml.send 'w:spacing',      spacing_options(s, true)
                   xml.send 'w:ind',          { 'w:left' => '0', 'w:firstLine' => '0', 'w:right' => '0' }
                   xml.send 'w:jc',           { 'w:val' => s.style_align.to_s }
                 end
               end
             end
@@ -67,12 +67,13 @@
               xml.send 'w:style', { 'w:styleId' => s.style_id, 'w:type' => 'paragraph' } do
                 xml.send 'w:name',    { 'w:val' => s.style_name }
                 xml.send 'w:basedOn', { 'w:val' => s.style_base }
                 xml.send 'w:next',    { 'w:val' => s.style_next }
                 xml.send 'w:pPr' do
-                  xml.send 'w:keepNext',          { 'w:val' => '1' }
-                  xml.send 'w:keepLines',         { 'w:val' => '1' }
+                  xml.send 'w:keepNext',          { 'w:val' => '0' }
+                  xml.send 'w:keepLines',         { 'w:val' => '0' }
+                  xml.send 'w:widowControl',      { 'w:val' => '1' }
                   xml.send 'w:spacing',           spacing_options(s)                              unless spacing_options(s).nil?
                   xml.send 'w:contextualSpacing', { 'w:val' => '1' }
                   xml.send 'w:jc',                { 'w:val' => s.style_align.to_s }               unless s.style_align.nil?
                 end
                 xml.send 'w:rPr' do
@@ -120,12 +121,12 @@
       def font_options(style)
         name = style.style_font
         { 'w:cs' => name, 'w:hAnsi' => name, 'w:eastAsia' => name, 'w:ascii' => name }
       end
       
-      def spacing_options(style)
-        top     = style.style_top
-        bottom  = style.style_bottom
+      def spacing_options(style, default=false)
+        top     = (default) ? style.style_top.to_i    : style.style_top
+        bottom  = (default) ? style.style_bottom.to_i : style.style_bottom
         line    = style.style_line
         
         options = nil
         if [top, bottom, line].compact.size > 0
           options               = {}
\ No newline at end of file