rubyXL 3.4.23 → 3.4.24

data/lib/rubyXL/objects/document_properties.rb

@@ -3,11 +3,10 @@ require 'rubyXL/objects/container_nodes'
 require 'time'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-extended-properties_Properties.html
   class DocumentPropertiesFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.extended-properties+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.extended-properties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties'.freeze
 
     attr_accessor :workbook
 
@@ -39,7 +38,7 @@ module RubyXL
     define_child_node(RubyXL::StringNode,  :node_name => :AppVersion)
     define_child_node(RubyXL::IntegerNode, :node_name => :DocSecurity)
     set_namespaces('http://schemas.openxmlformats.org/officeDocument/2006/extended-properties' => nil,
-                   'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes' => 'vt')
+                   'http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes'      => 'vt')
     define_element_name 'Properties'
 
     def add_parts_count(name, count)
@@ -84,13 +83,12 @@ module RubyXL
     def xlsx_path
       ROOT.join('docProps', 'app.xml')
     end
-
   end
 
 
   class CorePropertiesFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-package.core-properties+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-package.core-properties+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties'.freeze
 
     attr_accessor :workbook
 
@@ -112,10 +110,10 @@ module RubyXL
     define_child_node(RubyXL::StringNode,    :node_name => 'cp:version')
 
     set_namespaces('http://schemas.openxmlformats.org/package/2006/metadata/core-properties' => 'cp',
-                   'http://purl.org/dc/elements/1.1/' => 'dc',
-                   'http://purl.org/dc/terms/' => 'dcterms',
-                   'http://purl.org/dc/dcmitype/' => 'dcmitype',
-                   'http://www.w3.org/2001/XMLSchema-instance' => 'xsi')
+                   'http://purl.org/dc/elements/1.1/'                                        => 'dc',
+                   'http://purl.org/dc/terms/'                                               => 'dcterms',
+                   'http://purl.org/dc/dcmitype/'                                            => 'dcmitype',
+                   'http://www.w3.org/2001/XMLSchema-instance'                               => 'xsi')
     define_element_name 'cp:coreProperties'
 
     def xlsx_path
@@ -153,7 +151,5 @@ module RubyXL
     def modified_at=(v)
       self.dcterms_modified = RubyXL::StringNodeW3C.default(v)
     end
-
   end
-
 end

data/lib/rubyXL/objects/extensions.rb

@@ -1,7 +1,6 @@
 require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_ext-1.html
   class RawOOXML < OOXMLObject
     attr_accessor :raw_xml
@@ -49,5 +48,4 @@ module RubyXL
   class RevisionPointer < OOXMLIgnored
     define_element_name 'xr:revisionPtr'
   end
-
 end

data/lib/rubyXL/objects/external_links.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetName-1.html
   class SheetName < OOXMLObject
     define_attribute(:val, :string)
@@ -89,21 +88,20 @@ module RubyXL
   end
 
   class ExternalLinksFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/externalLink'.freeze
 
     include RubyXL::RelationshipSupport
     define_child_node(RubyXL::ExternalBook)
     define_child_node(RubyXL::OleLink)
 
     define_element_name 'externalLink'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
-                   'http://schemas.openxmlformats.org/markup-compatibility/2006' => 'mc',
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
+                   'http://schemas.openxmlformats.org/markup-compatibility/2006'         => 'mc',
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     def xlsx_path
       ROOT.join('xl', 'externalLinks', "externalLink#{file_index}.xml")
     end
   end
-
 end

data/lib/rubyXL/objects/fill.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_stop-1.html
   class Stop < OOXMLObject
     define_attribute(:position, :double, :required => true)
@@ -13,8 +12,8 @@ module RubyXL
   # http://www.datypic.com/sc/ooxml/e-ssml_patternFill-1.html
   class PatternFill < OOXMLObject
     define_attribute(:patternType, RubyXL::ST_PatternType)
-    define_child_node(RubyXL::Color, :node_name => :fgColor )
-    define_child_node(RubyXL::Color, :node_name => :bgColor )
+    define_child_node(RubyXL::Color, :node_name => :fgColor)
+    define_child_node(RubyXL::Color, :node_name => :bgColor)
     define_element_name 'patternFill'
   end
 
@@ -39,7 +38,6 @@ module RubyXL
     def self.default(pattern_type)
       self.new(:pattern_fill => RubyXL::PatternFill.new(:pattern_type => pattern_type))
     end
-
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_fills-1.html
@@ -51,5 +49,4 @@ module RubyXL
       self.new(:_ => [ RubyXL::Fill.default('none'), RubyXL::Fill.default('gray125') ])
     end
   end
-
 end

data/lib/rubyXL/objects/filters.rb

@@ -3,7 +3,6 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_dateGroupItem-1.html
   class DateGroupItem < OOXMLObject
     define_attribute(:year,   :int, :required => true)
@@ -18,7 +17,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_filters-1.html
   class FilterContainer < OOXMLObject
-    define_attribute(:blank,        :bool,  :default  => false)
+    define_attribute(:blank,        :bool, :default => false)
     define_attribute(:calendarType, RubyXL::ST_CalendarType, :default => 'none')
     define_child_node(RubyXL::StringValue,   :collection => true, :accessor => :filters, :node_name => :filter)
     define_child_node(RubyXL::DateGroupItem, :collection => true, :accessor => :date_group_items)
@@ -43,7 +42,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_customFilters-1.html
   class CustomFilters < OOXMLContainerObject
-    define_attribute(:and, :bool,  :default => false)
+    define_attribute(:and, :bool, :default => false)
     define_child_node(RubyXL::CustomFilter, :collection => true)
     define_element_name 'customFilters'
   end
@@ -87,9 +86,9 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_sortCondition-1.html
   class SortCondition < OOXMLObject
-    define_attribute(:descending, :bool,   :default  => false)
+    define_attribute(:descending, :bool, :default => false)
     define_attribute(:sortBy,     RubyXL::ST_SortBy, :default => 'value')
-    define_attribute(:ref,        :ref,    :required => true)
+    define_attribute(:ref,        :ref, :required => true)
     define_attribute(:customList, :string)
     define_attribute(:dxfId,      :int)
     define_attribute(:iconSet,    RubyXL::ST_IconSetType, :required => true, :default => '3Arrows')
@@ -116,5 +115,4 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'autoFilter'
   end
-
-end
+end

data/lib/rubyXL/objects/font.rb

@@ -3,7 +3,6 @@ require 'rubyXL/objects/container_nodes'
 require 'rubyXL/objects/color'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_font-1.html
   class Font < OOXMLObject
     # Since we have no capability to load the actual fonts, we'll have to live with the default.
@@ -28,7 +27,7 @@ module RubyXL
 
     def self.default(size = 10)
       self.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),
-               :sz   => RubyXL::FloatValue.new(:val => size) )
+               :sz   => RubyXL::FloatValue.new(:val => size))
     end
   end
 
@@ -41,5 +40,4 @@ module RubyXL
       self.new(:_ => [ RubyXL::Font.default(10), RubyXL::Font.default(8) ])
     end
   end
-
 end

data/lib/rubyXL/objects/formula.rb

@@ -2,12 +2,11 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/simple_types'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_f-1.html
   class Formula < OOXMLObject
     define_attribute(:_,    :string, :accessor => :expression)
     define_attribute(:t,    RubyXL::ST_CellFormulaType, :default => 'normal')
-    define_attribute(:aca,  :bool,   :default => false)
+    define_attribute(:aca,  :bool, :default => false)
     define_attribute(:ref,  :ref)
     define_attribute(:dt2D, :bool,   :default => false)
     define_attribute(:dtr,  :bool,   :default => false)
@@ -15,10 +14,9 @@ module RubyXL
     define_attribute(:del2, :bool,   :default => false)
     define_attribute(:r1,   :ref)
     define_attribute(:r2,   :ref)
-    define_attribute(:ca,   :bool,   :default => false)
+    define_attribute(:ca,   :bool, :default => false)
     define_attribute(:si,   :int)
-    define_attribute(:bx,   :bool,   :default => false)
+    define_attribute(:bx,   :bool, :default => false)
     define_element_name 'f'
   end
-
 end

data/lib/rubyXL/objects/ooxml_object.rb

@@ -85,7 +85,7 @@ module RubyXL
       accessor = (extra_params[:accessor] || accessorize(child_node_name)).to_sym
 
       child_nodes[child_node_name] = {
-        :class => klass,
+        :class    => klass,
         :is_array => extra_params[:collection],
         :accessor => accessor
       }
@@ -148,7 +148,6 @@ module RubyXL
         known_namespaces ||= obtain_class_variable(:@@ooxml_namespaces)
 
         node.element_children.each { |child_node|
-
           ns = child_node.namespace
           prefix = if known_namespaces.has_key?(ns.href) then known_namespaces[ns.href]
                    else ns.prefix
@@ -186,21 +185,21 @@ module RubyXL
     private
     def accessorize(str)
       acc = str.to_s.dup
-      acc.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-      acc.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      acc.gsub!(':','_')
+      acc.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+      acc.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      acc.gsub!(':', '_')
       acc.downcase.to_sym
     end
 
     def process_attribute(obj, raw_value, params)
       val = raw_value &&
               case params[:attr_type]
-              when :double then Float(raw_value)  # http://www.datypic.com/sc/xsd/t-xsd_double.html
+              when :double then Float(raw_value) # http://www.datypic.com/sc/xsd/t-xsd_double.html
               when :string then raw_value
               when Array   then raw_value # Case of Simple Types
               when :sqref  then RubyXL::Sqref.new(raw_value)
               when :ref    then RubyXL::Reference.new(raw_value)
-              when :bool   then ['1', 'true'].include?(raw_value)  # http://www.datypic.com/sc/xsd/t-xsd_boolean.html
+              when :bool   then ['1', 'true'].include?(raw_value) # http://www.datypic.com/sc/xsd/t-xsd_boolean.html
               when :int    then Integer(raw_value)
               when :uint   then
                 v = Integer(raw_value)
@@ -209,7 +208,6 @@ module RubyXL
               end
       obj.send("#{params[:accessor]}=", val)
     end
-
   end
 
 
@@ -238,7 +236,6 @@ module RubyXL
 
     def init_child_nodes(params)
       obtain_class_variable(:@@ooxml_child_nodes).each_value { |v|
-
         initial_value =
           if params.has_key?(v[:accessor]) then params[v[:accessor]]
           elsif v[:is_array] then []
@@ -363,7 +360,6 @@ module RubyXL
       }
       true
     end
-
   end
 
   # Parent class for defining OOXML based objects (not unlike Rails' +ActiveRecord+!)
@@ -417,7 +413,6 @@ module RubyXL
       end
       protected :define_count_attribute
     end
-
   end
 
   # Extension class providing functionality for top-level OOXML objects that are represented by
@@ -468,7 +463,5 @@ module RubyXL
     def file_index
       root.rels_hash[self.class].index{ |f| f.equal?(self) }.to_i + 1
     end
-
   end
-
 end

data/lib/rubyXL/objects/query_table.rb

@@ -62,8 +62,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_queryTable.html
   class QueryTable < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.queryTable+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/queryTable'.freeze
 
     include RubyXL::RelationshipSupport
 
@@ -94,7 +94,7 @@ module RubyXL
     define_child_node(RubyXL::ExtensionStorageArea)
 
     define_element_name 'queryTable'
-    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main' => nil,
+    set_namespaces('http://schemas.openxmlformats.org/spreadsheetml/2006/main'           => nil,
                    'http://schemas.openxmlformats.org/officeDocument/2006/relationships' => 'r')
 
     def xlsx_path

data/lib/rubyXL/objects/reference.rb

@@ -29,6 +29,10 @@ module RubyXL
       (@row_range.begin == @row_range.end) && (@col_range.begin == @col_range.end)
     end
 
+    def valid?
+      !(row_range.begin.negative? || col_range.begin.negative?)
+    end
+
     def first_row
       @row_range.begin
     end
@@ -88,13 +92,11 @@ module RubyXL
     # Converts Excel-style cell reference to +row+ and +col+ zero-based indices.
     def self.ref2ind(str)
       return [ -1, -1 ] unless str =~ /\A([A-Z]+)(\d+)\Z/
-      [ $2.to_i - 1, $1.each_byte.inject(0) { |col, chr| col * 26 + (chr - 64) } - 1 ]
+      [ Regexp.last_match(2).to_i - 1, Regexp.last_match(1).each_byte.inject(0) { |col, chr| col * 26 + (chr - 64) } - 1 ]
     end
-
   end
 
   class Sqref < Array
-
     def initialize(str)
       str.split.each { |ref_str| self << RubyXL::Reference.new(ref_str) }
     end
@@ -102,6 +104,5 @@ module RubyXL
     def to_s
       self.collect{ |ref| ref.to_s }.join(' ')
     end
-
   end
 end

data/lib/rubyXL/objects/relationships.rb

@@ -2,7 +2,6 @@ require 'pathname'
 require 'rubyXL/objects/ooxml_object'
 
 module RubyXL
-
   class RID < OOXMLObject
     define_relationship(:required => true)
   end
@@ -16,7 +15,7 @@ module RubyXL
   end
 
   class OOXMLRelationshipsFile < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-package.relationships+xml'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-package.relationships+xml'.freeze
     SAVE_ORDER = 100
 
     define_child_node(RubyXL::Relationship, :collection => true, :accessor => :relationships)
@@ -28,8 +27,8 @@ module RubyXL
     @@debug_indent = ($DEBUG ? 0 : nil)
 
     def new_relationship(target, type)
-      RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
-                               :type => type,
+      RubyXL::Relationship.new(:id     => "rId#{relationships.size + 1}",
+                               :type   => type,
                                :target => target)
     end
     protected :new_relationship
@@ -37,8 +36,8 @@ module RubyXL
     def add_relationship(obj)
       return if obj.nil? || !defined?(obj.class::REL_TYPE) || (obj.respond_to?(:empty?) && obj.empty?)
 
-      relationships << RubyXL::Relationship.new(:id => "rId#{relationships.size + 1}",
-                                                :type => obj.class::REL_TYPE,
+      relationships << RubyXL::Relationship.new(:id     => "rId#{relationships.size + 1}",
+                                                :type   => obj.class::REL_TYPE,
                                                 :target => obj.xlsx_path.relative_path_from(owner.xlsx_path.dirname))
     end
     protected :add_relationship
@@ -131,12 +130,10 @@ module RubyXL
       basename = base_file_path.root? ? '' : base_file_path.basename
       base_file_path.dirname.join('_rels', "#{basename}.rels").cleanpath
     end
-
   end
 
   # +RelationshipSupport+ module enables automatic loading and saving of _rels for the respective file
   module RelationshipSupport
-
     module ClassMehods
       def define_relationship(klass, accessor = nil)
         class_variable_get(:@@ooxml_relationships)[klass] = accessor
@@ -212,7 +209,5 @@ module RubyXL
       end
       self.generic_storage << related_file
     end
-
   end
-
 end

data/lib/rubyXL/objects/root.rb

@@ -5,7 +5,6 @@ require 'rubyXL/objects/content_types'
 require 'rubyXL/objects/workbook'
 
 module RubyXL
-
   class WorkbookRoot
     @@debug = $DEBUG
 
@@ -82,5 +81,4 @@ module RubyXL
       root
     end
   end
-
 end

data/lib/rubyXL/objects/shared_strings.rb

@@ -3,15 +3,14 @@ require 'rubyXL/objects/text'
 require 'rubyXL/objects/extensions'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_sst.html
   class SharedStringsTable < OOXMLTopLevelObject
-    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'
-    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'
+    CONTENT_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml'.freeze
+    REL_TYPE     = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings'.freeze
 
     # According to http://msdn.microsoft.com/en-us/library/office/gg278314.aspx,
     # +count+ and +uniqueCount+ may be either both missing, or both present. Need to validate.
-    define_attribute(:uniqueCount,  :int)
+    define_attribute(:uniqueCount, :int)
     define_child_node(RubyXL::RichText, :collection => :with_count, :node_name => 'si', :accessor => :strings)
     define_child_node(RubyXL::ExtensionStorageArea)
     define_element_name 'sst'
@@ -64,7 +63,5 @@ module RubyXL
     def xlsx_path
       ROOT.join('xl', 'sharedStrings.xml')
     end
-
   end
-
 end

data/lib/rubyXL/objects/sheet_common.rb

@@ -2,7 +2,6 @@ require 'rubyXL/objects/ooxml_object'
 require 'rubyXL/objects/storage'
 
 module RubyXL
-
   # http://www.datypic.com/sc/ooxml/e-ssml_webPublishItem-1.html
   class WebPublishingItem < OOXMLObject
     define_attribute(:id,              :int,    :required => true)
@@ -12,7 +11,7 @@ module RubyXL
     define_attribute(:sourceObject,    :string)
     define_attribute(:destinationFile, :string, :required => true)
     define_attribute(:title,           :string)
-    define_attribute(:autoRepublish,   :bool,   :default => false)
+    define_attribute(:autoRepublish,   :bool, :default => false)
     define_element_name 'webPublishItem'
   end
 
@@ -47,5 +46,4 @@ module RubyXL
     define_child_node(RubyXL::StringNode, :node_name => :firstFooter)
     define_element_name 'headerFooter'
   end
-
 end

data/lib/rubyXL/objects/sheet_data.rb

@@ -5,7 +5,6 @@ require 'rubyXL/objects/formula'
 require 'rubyXL/cell'
 
 module RubyXL
-
   # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.cellvalues(v=office.14).aspx
   module DataType
     SHARED_STRING = 's'
@@ -14,7 +13,7 @@ module RubyXL
     ERROR         = 'e'
     BOOLEAN       = 'b'
     NUMBER        = 'n'
-    DATE          = 'd'  # Only available in Office2010.
+    DATE          = 'd' # Only available in Office2010.
   end
 
   # http://www.datypic.com/sc/ooxml/e-ssml_v-1.html
@@ -35,13 +34,13 @@ module RubyXL
 
     define_attribute(:r,   :ref)
     define_attribute(:s,   :int,  :default => 0, :accessor => :style_index)
-    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n' )
+    define_attribute(:t,   RubyXL::ST_CellType,  :accessor => :datatype, :default => 'n')
     define_attribute(:cm,  :int,  :default => 0)
     define_attribute(:vm,  :int,  :default => 0)
     define_attribute(:ph,  :bool, :default => false)
     define_child_node(RubyXL::Formula,   :accessor => :formula)
     define_child_node(RubyXL::CellValue, :accessor => :value_container)
-    define_child_node(RubyXL::RichText)    # is
+    define_child_node(RubyXL::RichText) # is
     define_element_name 'c'
 
     attr_accessor :worksheet
@@ -116,7 +115,7 @@ module RubyXL
         if is then is.to_s
         elsif is_date? then workbook.num_to_date(r.to_f)
         elsif r.is_a?(String) && (r =~ NUMBER_REGEXP) then # Numeric
-          if $1 != '' then r.to_f
+          if Regexp.last_match(1) != '' then r.to_f
           else r.to_i
           end
         else r
@@ -216,7 +215,5 @@ module RubyXL
     def size
       rows.size
     end
-
   end
-
 end

data/lib/rubyXL/objects/simple_types.rb

@@ -140,7 +140,7 @@ module RubyXL
   ST_TextHorzOverflowType = %w{ overflow clip }
   ST_TextVerticalType     = %w{ horz vert vert270 wordArtVert eaVert mongolianVert wordArtVertRtl }
   ST_TextWrappingType     = %w{ none square }
-  ST_TextAnchoringType	  = %w{ t ctr b just dist }
+  ST_TextAnchoringType = %w{ t ctr b just dist }
   ST_TextShapeType        = %w{ textNoShape textPlain textStop textTriangle textTriangleInverted textChevron
                                 textChevronInverted textRingInside textRingOutside textArchUp textArchDown
                                 textCircle textButton textArchUpPour textArchDownPour textCirclePour textButtonPour