Merge pull request 'Fix bullet lists in desktop Word' (#11) from fix/word-desktop-list-numbering into main

Reviewed-on: #11

lib/notare/xml/numbering.rb

@@ -16,11 +16,8 @@ module Notare
           xml.numbering("xmlns:w" => NAMESPACE) do
             xml.parent.namespace = xml.parent.namespace_definitions.find { |ns| ns.prefix == "w" }
 
-            @lists.each do |list|
+            render_abstract_nums(xml)
-              render_abstract_num(xml, list)
+            render_nums(xml)
-
-              render_num(xml, list)
-            end
           end
         end
         builder.to_xml
@@ -28,6 +25,14 @@ module Notare
 
       private
 
+      def render_abstract_nums(xml)
+        @lists.each { |list| render_abstract_num(xml, list) }
+      end
+
+      def render_nums(xml)
+        @lists.each { |list| render_num(xml, list) }
+      end
+
       def render_abstract_num(xml, list)
         xml["w"].abstractNum("w:abstractNumId" => list.num_id.to_s) do
           9.times do |level|

test/list_test.rb

@@ -115,6 +115,10 @@ class ListTest < Minitest::Test
     assert_includes doc_xml, "List 1 Item 1"
     assert_includes doc_xml, "List 2 Item 1"
     assert_includes doc_xml, "Separator paragraph"
+
+    numbering_xml = Nokogiri::XML(xml_files["word/numbering.xml"])
+    child_names = numbering_xml.root.element_children.map(&:name)
+    assert_equal %w[abstractNum abstractNum num num], child_names
   end
 
   def test_mixed_list_types