openxml-docx 0.10.1 → 0.10.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openxml-docx (0.10.1)
+    openxml-docx (0.10.2)
       nokogiri
       openxml-package (>= 0.2.2)
 

data/examples/booklet-printing

@@ -0,0 +1,55 @@
+#!/usr/bin/env ruby
+
+# require "rails" # workaround: openxml-package uses `extract_options!`
+$:.push Dir.pwd + "/lib"
+require "ox"
+require "openxml/docx"
+
+package = OpenXml::Docx::Package.new
+
+include OpenXml::Docx::Elements
+
+lorem_ipsum = [
+  "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ullamcorper arcu nunc, eget maximus mi elementum ut. Nulla facilisi. Morbi eget augue tristique, aliquet purus quis, mollis eros. Maecenas massa purus, vehicula vel tellus eget, feugiat cursus metus. Vivamus consequat leo leo. Quisque interdum gravida placerat. Praesent auctor vestibulum nisi, quis viverra diam luctus interdum. Vivamus eu massa non tortor gravida ultrices. Nulla dapibus porta ipsum, et dignissim metus ultricies accumsan. In hac habitasse platea dictumst. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.",
+  "Integer dapibus ac velit finibus elementum. Curabitur vel lacus mauris. Quisque diam diam, commodo at consectetur at, consectetur ut orci. Suspendisse nec nulla eu quam ullamcorper dignissim. Morbi et ligula non dolor scelerisque commodo vel nec tortor. Integer molestie lobortis elementum. Aenean vehicula turpis nulla, in viverra ex lacinia ac. Nam consectetur ante id velit vehicula, a tincidunt ex auctor. Nunc sodales tempus tristique. Aliquam nunc risus, pretium at lorem in, varius accumsan est. Mauris vel dolor eget lectus auctor malesuada. Aenean interdum dignissim hendrerit. Nullam vulputate mi nec massa pretium, at maximus arcu sodales. Mauris vitae neque sit amet urna facilisis rutrum id et lacus. Aliquam pretium orci nec auctor interdum. Nulla egestas mauris turpis, vel accumsan sem volutpat quis.",
+  "Integer tristique magna eu tellus cursus gravida. Fusce scelerisque ipsum eu odio malesuada faucibus. Proin malesuada, purus id eleifend facilisis, massa diam pellentesque libero, ac semper nisl turpis vel eros. Donec faucibus faucibus lectus sed vehicula. Vivamus sed tempus dui. Aliquam volutpat risus bibendum blandit sollicitudin. Mauris vitae rhoncus ipsum. Morbi id tempus ex, et consectetur nibh. Curabitur massa leo, fringilla vel pulvinar non, convallis ac justo. Ut non lobortis ante, ut rutrum arcu. Duis laoreet varius orci non gravida. Phasellus luctus elementum nunc, malesuada congue lorem viverra maximus. Donec ornare rhoncus nibh faucibus congue. Nulla placerat eros eu elit auctor ultricies. Phasellus pretium accumsan bibendum.",
+  "Nulla hendrerit augue a felis placerat, id luctus enim sagittis. Proin id arcu et sem dignissim elementum eu at nibh. Quisque enim augue, porttitor et auctor a, mollis in ante. Donec tempus volutpat volutpat. Donec ipsum magna, pellentesque vitae libero id, vestibulum ullamcorper lacus. Maecenas elit velit, scelerisque ut suscipit vitae, gravida ac neque. Phasellus nisl dui, feugiat et dapibus vel, feugiat quis nunc. Maecenas non bibendum augue, eget sagittis dolor.",
+  "Donec malesuada est enim, sed finibus massa sollicitudin a. Mauris leo eros, euismod eget nisi sed, bibendum egestas magna. Proin vel nulla in dolor dictum suscipit. Praesent tincidunt dictum metus ac ornare. Sed quis arcu nibh. Vestibulum faucibus lobortis condimentum. Cras id elementum risus, id faucibus ipsum. Suspendisse sed ante eu lacus ornare ultrices. Nullam erat nunc, volutpat eu odio quis, facilisis congue justo. Nulla facilisis sagittis mauris at imperdiet. Nulla facilisi. Morbi ornare aliquet tempus. Suspendisse eu tincidunt mauris. In hac habitasse platea dictumst.",
+  "Vestibulum elementum velit quis consequat cursus. Donec sagittis vitae massa eget accumsan. Donec pellentesque elementum risus at pulvinar. Proin dignissim aliquet purus in viverra. Ut ut quam sed leo porttitor sagittis sed quis arcu. Etiam feugiat leo ex. Nullam volutpat sapien nisi, vitae tristique metus sodales et. Duis eu ligula in turpis fermentum finibus eget sed est. In blandit, lectus non pharetra consectetur, neque augue rhoncus lorem, at convallis justo neque vel purus. Vestibulum purus erat, pretium vel ex sit amet, eleifend accumsan massa. Aliquam vel augue maximus, pharetra leo a, commodo ante. Integer efficitur dapibus nibh, at mattis tellus molestie sit amet.",
+  "Nunc aliquam ultricies libero, non egestas nisl ultricies ut. Nulla augue ante, interdum non suscipit vitae, ullamcorper nec mauris. Praesent feugiat interdum mauris, ut ornare nibh lacinia sed. Mauris eget porta ipsum. Aliquam vitae pretium augue. Sed molestie est sit amet ex tempus, vitae facilisis eros malesuada. Curabitur mollis sagittis mauris, id iaculis ex sodales a. Nunc in nunc vitae tortor rhoncus ultrices. Vivamus aliquet purus at lacus sodales maximus.",
+  "Quisque ullamcorper dolor nunc, nec accumsan massa dignissim ac. Maecenas porta eros vel venenatis consequat. Vestibulum nec erat eget ipsum interdum blandit quis non justo. Integer condimentum, neque non molestie laoreet, augue purus porta risus, dapibus bibendum tellus mauris ac arcu. Mauris a elementum nibh. Praesent ullamcorper ligula et justo viverra rhoncus. Nullam eget convallis velit. Nulla ullamcorper id tellus interdum mollis. Fusce ac aliquet ipsum. Quisque luctus cursus massa, tincidunt pharetra ante porta pellentesque. Praesent in diam quam. Nullam hendrerit quam malesuada venenatis finibus. Curabitur diam purus, luctus sed dictum sit amet, tristique sit amet est. Aenean pulvinar pulvinar velit, vitae vehicula est luctus ac. Morbi libero urna, tempor sed urna id, interdum ultrices orci.",
+  "Cras id nisi sagittis, tincidunt purus quis, porta est. Integer cursus leo risus, in pellentesque dui consectetur at. Sed convallis nulla id magna laoreet pretium. Suspendisse lacus metus, efficitur quis convallis nec, maximus dictum mi. Duis quis sodales velit. Integer ornare tincidunt condimentum. Proin dignissim mauris sed tortor maximus, vitae vestibulum urna volutpat. Morbi ornare velit at lacinia porttitor. In posuere volutpat ex non mollis. Phasellus diam est, lacinia quis consectetur eu, semper in justo. Quisque quis elementum tortor.",
+  "Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Pellentesque id lacus consequat, viverra augue vitae, tristique ex. Vivamus convallis metus odio, in cursus sem semper quis. Fusce blandit eget dolor sit amet tempus. Sed lobortis ipsum sit amet elementum dapibus. Ut orci leo, porta maximus nisi eu, efficitur viverra odio. Nunc sed posuere felis."
+]
+
+lorem_ipsum.each do |lorem|
+  text = Text.new(lorem)
+  run = Run.new
+  run << text
+  paragraph = Paragraph.new
+  paragraph << run
+  package.document << paragraph
+end
+
+section_properties = SectionProperties.new
+
+page_size = OpenXml::Docx::Properties::PageSize.new
+page_size.height = 12240
+page_size.width = 7920
+page_size.orientation = :landscape
+section_properties << page_size
+
+package.document << section_properties
+
+booklet_print = BookFoldPrinting.new
+booklet_print.value = true
+package.settings << booklet_print
+
+booklet_print_page_count = BookFoldPrintingSheets.new
+booklet_print_page_count.value = 4
+package.settings << booklet_print_page_count
+
+filename = "docx_booklet_test.docx"
+system "rm -f ~/Desktop/#{filename}" # -f so that we don't have an error if the file doesn't exist
+package.save File.expand_path("~/Desktop/#{filename}")
+exec "open ~/Desktop/#{filename}"

data/lib/openxml/docx/attribute_builder.rb

@@ -203,7 +203,7 @@ module OpenXml
       end
 
       module ClassMethods
-        def attribute(name, expects: nil, one_of: nil,  displays_as: nil, namespace: nil)
+        def attribute(name, expects: nil, one_of: nil, displays_as: nil, namespace: nil, matches: nil, deprecated: false)
           bad_names = %w(tag name namespace properties_tag)
           raise ArgumentError if bad_names.member? name
 
@@ -212,6 +212,7 @@ module OpenXml
           define_method "#{name}=" do |value|
             valid_in?(value, one_of) unless one_of.nil?
             send(expects, value) unless expects.nil?
+            matches?(value, matches) unless matches.nil?
             instance_variable_set "@#{name}", value
           end
 
@@ -249,24 +250,24 @@ module OpenXml
         end
       end
 
-      def true_or_false(value)
+      def boolean(value)
         message = "Invalid #{name}: frame must be true or false"
         raise ArgumentError, message unless [true, false].member? value
       end
 
       def hex_color(value)
         message = "Invalid #{name}: must be :auto or a hex color, e.g. 4F1B8C"
-        raise ArgumentError, message unless value == :auto || value =~ /[0-9A-F]{6}/
+        raise ArgumentError, message unless value == :auto || value =~ /^[0-9A-F]{6}$/
       end
 
       def hex_digit(value)
         message = "Invalid #{name}: must be a two-digit hex number, e.g. BF"
-        raise ArgumentError, message unless value =~ /[0-9A-F]{2}/
+        raise ArgumentError, message unless value =~ /^[0-9A-F]{2}$/
       end
 
       def hex_digit_4(value)
         message = "Invalid #{name}: must be a four-digit hex number, e.g. BF12"
-        raise ArgumentError, message unless value =~ /[0-9A-F]{4}/
+        raise ArgumentError, message unless value =~ /^[0-9A-F]{4}$/
       end
 
       def long_hex_number(value)
@@ -316,6 +317,11 @@ module OpenXml
         raise ArgumentError, message unless list.member?(value)
       end
 
+      def matches?(value, regexp)
+        message = "Value does not match #{regexp}"
+        raise ArgumentError, message unless value =~ regexp
+      end
+
     end
   end
 end

data/lib/openxml/docx/elements/absolute_position_tab.rb

@@ -7,7 +7,7 @@ module OpenXml
         with_namespace :w do
           attribute :alignment, one_of: %i(center left right)
           attribute :leader, one_of: %i(dot hyphen middleDot none underscore)
-          attribute :relativeTo, one_of: %i(indent margin)
+          attribute :relative_to, one_of: %i(indent margin), displays_as: :relativeTo
         end
 
       end

data/lib/openxml/docx/elements/background.rb

@@ -0,0 +1,16 @@
+module OpenXml
+  module Docx
+    module Elements
+      class Background < Container
+
+        with_namespace :w do
+          attribute :color, expects: :hex_color
+          attribute :theme_color, expects: :valid_theme_color, displays_as: :themeColor
+          attribute :theme_shade, expects: :hex_digit, displays_as: :themeShade
+          attribute :theme_tint, expects: :hex_digit, displays_as: :themeTint
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/book_fold_printing.rb

@@ -4,7 +4,7 @@ module OpenXml
       class BookFoldPrinting < Element
         tag :bookFoldPrinting
 
-        attribute :value, expects: :true_or_false, displays_as: :val, namespace: :w
+        attribute :value, expects: :boolean, displays_as: :val, namespace: :w
 
       end
     end

data/lib/openxml/docx/elements/book_fold_reverse_printing.rb

@@ -4,7 +4,7 @@ module OpenXml
       class BookFoldReversePrinting < Element
         tag :bookFoldRevPrinting
 
-        attribute :value, expects: :true_or_false, displays_as: :val, namespace: :w
+        attribute :value, expects: :boolean, displays_as: :val, namespace: :w
 
       end
     end

data/lib/openxml/docx/elements/compatibility_setting.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Elements
+      class CompatibilitySettings < Container
+        tag :compat
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/compatibility_settings.rb

@@ -0,0 +1,15 @@
+module OpenXml
+  module Docx
+    module Elements
+      class CompatibilitySetting < Container
+        tag :compatSetting
+
+        with_namespace :w do
+          attribute :setting_name, expects: :string, displays_as: :name
+          attribute :uri, expects: :string
+          attribute :value, expects: :string, displays_as: :val
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/embed_bold.rb

@@ -5,20 +5,12 @@ module OpenXml
         namespace :w
 
         with_namespace :w do
-          attribute :font_key, expects: :bracketed_guid, displays_as: :fontKey
-          attribute :subsetted, expects: :true_or_false
+          attribute :font_key, displays_as: :fontKey, matches: /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          attribute :subsetted, expects: :boolean
         end
 
         attribute :relationship_id, expects: :string, displays_as: :id, namespace: :r
 
-
-      private
-
-        def bracketed_guid(value)
-          guid_regex = /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
-          raise ArgumentError, "Not a validly-formatted GUID" unless value =~ guid_regex
-        end
-
       end
     end
   end

data/lib/openxml/docx/elements/embed_bold_italic.rb

@@ -5,20 +5,12 @@ module OpenXml
         namespace :w
 
         with_namespace :w do
-          attribute :font_key, expects: :bracketed_guid, displays_as: :fontKey
-          attribute :subsetted, expects: :true_or_false
+          attribute :font_key, displays_as: :fontKey, matches: /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          attribute :subsetted, expects: :boolean
         end
 
         attribute :relationship_id, expects: :string, displays_as: :id, namespace: :r
 
-
-      private
-
-        def bracketed_guid(value)
-          guid_regex = /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
-          raise ArgumentError, "Not a validly-formatted GUID" unless value =~ guid_regex
-        end
-
       end
     end
   end

data/lib/openxml/docx/elements/embed_italic.rb

@@ -5,20 +5,12 @@ module OpenXml
         namespace :w
 
         with_namespace :w do
-          attribute :font_key, expects: :bracketed_guid, displays_as: :fontKey
-          attribute :subsetted, expects: :true_or_false
+          attribute :font_key, displays_as: :fontKey, matches: /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          attribute :subsetted, expects: :boolean
         end
 
         attribute :relationship_id, expects: :string, displays_as: :id, namespace: :r
 
-
-      private
-
-        def bracketed_guid(value)
-          guid_regex = /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
-          raise ArgumentError, "Not a validly-formatted GUID" unless value =~ guid_regex
-        end
-
       end
     end
   end

data/lib/openxml/docx/elements/embed_regular.rb

@@ -5,8 +5,8 @@ module OpenXml
         namespace :w
 
         with_namespace :w do
-          attribute :font_key, expects: :bracketed_guid, displays_as: :fontKey
-          attribute :subsetted, expects: :true_or_false
+          attribute :font_key, displays_as: :fontKey, matches: /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          attribute :subsetted, expects: :boolean
         end
 
         attribute :relationship_id, expects: :string, displays_as: :id, namespace: :r
@@ -15,7 +15,7 @@ module OpenXml
       private
 
         def bracketed_guid(value)
-          guid_regex = /\{[0-9A-F]{8}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{4}\-[0-9A-F]{12}\}/ # Regex taken from spec section 22.9.2.4
+          guid_regex =
           raise ArgumentError, "Not a validly-formatted GUID (#{value})" unless value =~ guid_regex
         end
 

data/lib/openxml/docx/elements/embed_system_fonts.rb

@@ -5,7 +5,7 @@ module OpenXml
         namespace :w
 
         with_namespace :w do
-          attribute :value, expects: :true_or_false, displays_as: :val
+          attribute :value, expects: :boolean, displays_as: :val
         end
 
       end

data/lib/openxml/docx/elements/embed_true_type_fonts.rb

@@ -5,7 +5,7 @@ module OpenXml
         namespace :w
 
         with_namespace :w do
-          attribute :value, expects: :true_or_false, displays_as: :val
+          attribute :value, expects: :boolean, displays_as: :val
         end
 
       end

data/lib/openxml/docx/elements/even_and_odd_headers.rb

@@ -0,0 +1,11 @@
+module OpenXml
+  module Docx
+    module Elements
+      class EvenAndOddHeaders < Element
+
+        attribute :value, expects: :boolean, displays_as: :val, namespace: :w
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/family.rb

@@ -13,7 +13,7 @@ module OpenXml
         def valid_font_family(value)
           ok_values = %i(auto decorative modern roman script swiss) # From the spec section 17.18.30
           message = "Invalid font family type (#{value}). Valid options are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.inculde? value
+          raise ArgumentError, message unless ok_values.include? value
         end
 
       end

data/lib/openxml/docx/elements/markup_compatibility_choice.rb

@@ -5,7 +5,7 @@ module OpenXml
         tag :Choice
         namespace :mc
 
-        attribute :Required, expects: :string
+        attribute :requires, expects: :string, displays_as: :Requires
 
       end
     end

data/lib/openxml/docx/elements/paragraph.rb

@@ -38,6 +38,7 @@ module OpenXml
         property :shading
         property :spacing
         property :tabs
+        property :section
 
         def section_properties=(section)
           raise ArgumentError, "Section properties must be an instance of OpenXml::Docx::Section" unless section.is_a?(OpenXml::Docx::Section)

data/lib/openxml/docx/elements/save_subset_fonts.rb

@@ -5,7 +5,7 @@ module OpenXml
         namespace :w
 
         with_namespace :w do
-          attribute :value, expects: :true_or_false, displays_as: :val
+          attribute :value, expects: :boolean, displays_as: :val
         end
 
       end

data/lib/openxml/docx/elements/table_cell.rb

@@ -13,6 +13,7 @@ module OpenXml
         value_property :table_cell_fit_text
         value_property :text_direction
         value_property :v_align
+        value_property :vertical_merge
 
         property :conditional_formatting
         property :headers

data/lib/openxml/docx/elements/textbox_content.rb

@@ -0,0 +1,9 @@
+module OpenXml
+  module Docx
+    module Elements
+      class TextboxContent < Container
+        tag :txbxContent
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_anchor.rb

@@ -5,17 +5,17 @@ module OpenXml
         tag :anchor
         namespace :wp
 
-        attribute :allow_overlap, expects: :true_or_false, displays_as: :allowOverlap         # Required
-        attribute :behind_document, expects: :true_or_false, displays_as: :behindDoc          # Required
+        attribute :allow_overlap, expects: :boolean, displays_as: :allowOverlap               # Required
+        attribute :behind_document, expects: :boolean, displays_as: :behindDoc                # Required
         attribute :distance_from_bottom, expects: :positive_integer, displays_as: :distB      # Optional
         attribute :distance_from_left, expects: :positive_integer, displays_as: :distL        # Optional
         attribute :distance_from_right, expects: :positive_integer, displays_as: :distR       # Optional
         attribute :distance_from_top, expects: :positive_integer, displays_as: :distT         # Optional
-        attribute :hidden, expects: :true_or_false                                            # Optional
-        attribute :layout_in_cell, expects: :true_or_false, displays_as: :layoutInCell        # Required
-        attribute :locked, expects: :true_or_false                                            # Required
+        attribute :hidden, expects: :boolean                                                  # Optional
+        attribute :layout_in_cell, expects: :boolean, displays_as: :layoutInCell              # Required
+        attribute :locked, expects: :boolean                                                  # Required
         attribute :z_index, expects: :positive_integer, displays_as: :relativeHeight          # Required
-        attribute :simple_position, expects: :true_or_false, displays_as: :simplePos          # Optional
+        attribute :simple_position, expects: :boolean, displays_as: :simplePos                # Optional
 
         # Children elements required by spec: <docPr>, <a:graphic>, <wp:simplePos>, <wp:positionH>, <wp:positionV>, <wp:extent>, and one of the wp: wrap type tags
 

data/lib/openxml/docx/elements/word_processing_drawing_inline.rb

@@ -0,0 +1,16 @@
+module OpenXml
+  module Docx
+    module Elements
+      class WordProcessingDrawingInline < Container
+        tag :inline
+        namespace :wp
+
+        attribute :distance_from_bottom, expects: :positive_integer, displays_as: :distB
+        attribute :distance_from_left, expects: :positive_integer, displays_as: :distL
+        attribute :distance_from_right, expects: :positive_integer, displays_as: :distR
+        attribute :distance_from_top, expects: :positive_integer, displays_as: :distT
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/word_processing_drawing_object_nv_properties.rb

@@ -6,7 +6,7 @@ module OpenXml
         namespace :wp
 
         attribute :description, expects: :string, displays_as: :descr
-        attribute :hidden, expects: :true_or_false
+        attribute :hidden, expects: :boolean
         attribute :id, expects: :positive_integer
         attribute :object_name, expects: :string, displays_as: :name
         attribute :title, expects: :string

data/lib/openxml/docx/elements/word_processing_drawing_wrap_polygon.rb

@@ -5,7 +5,7 @@ module OpenXml
         tag :wrapPolygon
         namespace :wp
 
-        attribute :edited, expects: :true_or_false
+        attribute :edited, expects: :boolean
 
       end
     end

data/lib/openxml/docx/elements/word_processing_shapes_body_properties.rb

@@ -6,23 +6,23 @@ module OpenXml
         namespace :wps
 
         attribute :anchor, expects: :anchor_value
-        attribute :anchorCtr, expects: :true_or_false
+        attribute :anchor_center, expects: :boolean, displays_as: :anchorCtr
         attribute :bottom_inset, expects: :positive_integer, displays_as: :bIns
-        attribute :compatible_line_spacing, expects: :true_or_false, displays_as: :compatLnSpc
-        attribute :force_anti_alias, expects: :true_or_false, displays_as: :forceAA
-        attribute :fromWordArt, expects: :true_or_false
-        attribute :horzOverflow, expects: :horizontal_overflow_value
+        attribute :compatible_line_spacing, expects: :boolean, displays_as: :compatLnSpc
+        attribute :force_anti_alias, expects: :boolean, displays_as: :forceAA
+        attribute :from_word_art, expects: :boolean, displays_as: :fromWordArt
+        attribute :horizontal_overflow, expects: :horizontal_overflow_value, displays_as: :horzOverflow
         attribute :left_inset, expects: :positive_integer, displays_as: :lIns
-        attribute :numCol, expects: :number_of_columns
+        attribute :number_of_columns, expects: :valid_number_of_columns, displays_as: :numCol
         attribute :right_inset, expects: :positive_integer, displays_as: :rIns
         attribute :rotation, expects: :integer, displays_as: :rot
-        attribute :right_to_left_columns, expects: :true_or_false, displays_as: :rtlCol
+        attribute :right_to_left_columns, expects: :boolean, displays_as: :rtlCol
         attribute :space_between_columns, expects: :positive_integer, displays_as: :spcCol
-        attribute :paragraph_spacing, expects: :true_or_false, displays_as: :spcFirstLastPara
+        attribute :paragraph_spacing, expects: :boolean, displays_as: :spcFirstLastPara
         attribute :top_inset, expects: :positive_integer, displays_as: :tIns
-        attribute :upright, expects: :true_or_false
-        attribute :vert, expects: :vertical_value
-        attribute :vertOverflow, expects: :vertical_overflow_value
+        attribute :upright, expects: :boolean
+        attribute :vertical, expects: :vertical_value, displays_as: :vert
+        attribute :vertical_overflow, expects: :vertical_overflow_value, displays_as: :vertOverflow
         attribute :wrap, expects: :wrap_value
 
       private
@@ -35,7 +35,7 @@ module OpenXml
           raise ArgumentError unless %i(clip overflow).include? value
         end
 
-        def number_of_columns(value)
+        def valid_number_of_columns(value)
           raise ArgumentError unless (1..16).to_a.include? value
         end