Rename AbstractNumber/Number to AbstractNumbering/Numbering

Author: dmpotter44

examples/numbering

@@ -33,10 +33,10 @@ package.styles << list_style
 
 # Each list needs a numbering within the numbering part of the document.
 
-# Create an abstract number that describes a bulleted list:
-abstract_number = AbstractNumber.new(0)
+# Create an abstract numbering that describes a bulleted list:
+abstract_numbering = AbstractNumbering.new(0)
 
-# Each number can have multiple levels. Define the first level as a bulleted list:
+# Each numbering can have multiple levels. Define the first level as a bulleted list:
 level_0 = Level.new
 level_0.level = 0
 level_0.start = 1
@@ -49,27 +49,28 @@ level_0.character_style.font.high_ansi = "Symbol"
 level_0.character_style.font.hint = :default
 level_0.paragraph_style.indentation.left = 720
 level_0.paragraph_style.indentation.hanging = 360
-abstract_number << level_0
+abstract_numbering << level_0
 
-package.numbering << abstract_number
+package.numbering << abstract_numbering
 
 package.document << create_paragraph("Example of adding a list to a document")
 
 list_item = create_paragraph("First list item")
 list_item.paragraph_style = 'ListParagraph'
-# Say that this list item belongs to our first abstract number:
+# Say that this list item belongs to our first abstract numbering:
 list_item.numbering.level = 0
 list_item.numbering.id = 1
 # This ID is NOT the numbering ID we created above. Instead, it is a concrete
 # numbering that defines an instance of a list in the document. To link it to
-# our existing abstract number, we need to create a concrete number instance:
+# our existing abstract numbering, we need to create a concrete numbering
+# instance:
 
-number = Number.new(1)
-# Setting the abstract number ID here links it to a given abstract number
-number.abstract_number_id = 0
+numbering = Numbering.new(1)
+# Setting the abstract numbering ID here links it to a given abstract numbering
+numbering.abstract_numbering_id = 0
 
 # And add this number to the numbering
-package.numbering << number
+package.numbering << numbering
 
 # All that allows us to finally add the item to the document.
 
@@ -89,7 +90,7 @@ package.document << create_paragraph("Outline Example")
 # Lists with numbers are a bit more complicated. The following creates an
 # "outline" list:
 
-abstract_number = AbstractNumber.new(1)
+abstract_numbering = AbstractNumbering.new(1)
 
 [:upperRoman, :upperLetter, :decimal, :lowerLetter, :lowerRoman, :decimal, :lowerLetter].each.with_index do |number_format, index|
   level = Level.new
@@ -102,15 +103,15 @@ abstract_number = AbstractNumber.new(1)
   level.alignment = :left
   level.paragraph_style.indentation.left = (360 * (index+1))
   level.paragraph_style.indentation.hanging = 360
-  abstract_number << level
+  abstract_numbering << level
 end
 
-package.numbering << abstract_number
+package.numbering << abstract_numbering
 
-number = Number.new(2)
-number.abstract_number_id = 1
+numbering = Numbering.new(2)
+numbering.abstract_numbering_id = 1
 
-package.numbering << number
+package.numbering << numbering
 
 (0..6).each do |level|
   list_item = create_paragraph("Level #{level+1}")

…openxml/docx/elements/abstract_number.rb …nxml/docx/elements/abstract_numbering.rblib/openxml/docx/elements/abstract_number.rb renamed to lib/openxml/docx/elements/abstract_numbering.rb lib/openxml/docx/elements/abstract_number.rb renamed to lib/openxml/docx/elements/abstract_numbering.rb

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class AbstractNumber < OpenXml::Docx::Element
+      class AbstractNumbering < OpenXml::Docx::Element
         include HasChildren, HasProperties
         tag :abstractNum
 

lib/openxml/docx/elements/level.rb

@@ -16,7 +16,7 @@ class Level < OpenXml::Docx::Element
         value_property :start
         value_property :number_format
         value_property :level_restart
-        value_property :paragraph_style
+        value_property :associated_paragraph_style, as: :paragraph_style
         value_property :legal_numbering
         value_property :suffix
         value_property :level_text

lib/openxml/docx/elements/number.rb lib/openxml/docx/elements/numbering.rblib/openxml/docx/elements/number.rb renamed to lib/openxml/docx/elements/numbering.rb

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class Number < OpenXml::Docx::Element
+      class Numbering < OpenXml::Docx::Element
         include HasChildren, HasProperties
         tag :num
 
@@ -15,7 +15,7 @@ def initialize(id)
           attribute :id, expects: :integer, displays_as: :numId#, required: true
         end
 
-        value_property :abstract_number_id
+        value_property :abstract_numbering_id
 
         def property_xml(xml)
           props = properties.keys.map(&method(:send)).compact

lib/openxml/docx/parts/numbering.rb

@@ -15,9 +15,9 @@ def initialize
         end
 
         def <<(child)
-          if child.is_a?(OpenXml::Docx::Elements::AbstractNumber)
+          if child.is_a?(OpenXml::Docx::Elements::AbstractNumbering)
             abstractNumbers << child
-          elsif child.is_a?(OpenXml::Docx::Elements::Number)
+          elsif child.is_a?(OpenXml::Docx::Elements::Numbering)
             numbers << child
           end
         end

lib/openxml/docx/properties/abstract_number_id.rb

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Properties
-      class AbstractNumberId < IntegerProperty
+      class AbstractNumberingId < IntegerProperty
         tag :abstractNumId
 
       end