From e49aee3e2f700569a519c5346746d239a05383cf Mon Sep 17 00:00:00 2001
From: Randy Morgan <digital.ipseity@gmail.com>
Date: Sun, 28 Apr 2013 12:55:46 +0900
Subject: Refactored and renamed space preservation

preserve_spaces has been moved to the workbook and renamed xml_space as
that provides a good reference for people trying to figure out what it
does, and let's the author specify space preservation for
serializations using the shared strings table as well as the default
inline serialization in cells.
---
 lib/axlsx/workbook/shared_strings_table.rb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'lib/axlsx/workbook/shared_strings_table.rb')

diff --git a/lib/axlsx/workbook/shared_strings_table.rb b/lib/axlsx/workbook/shared_strings_table.rb
index 43e8a1a8..f1bee3ae 100644
--- a/lib/axlsx/workbook/shared_strings_table.rb
+++ b/lib/axlsx/workbook/shared_strings_table.rb
@@ -26,10 +26,16 @@ module Axlsx
     # @see Cell#sharable
     attr_reader :unique_cells
 
+    # The xml:space attribute
+    # @see Workbook#xml_space
+    attr_reader :xml_space
+
     # Creates a new Shared Strings Table agains an array of cells
     # @param [Array] cells This is an array of all of the cells in the workbook
-    def initialize(cells)
+    # @param [Symbol] xml_space The xml:space behavior for the shared string table.
+    def initialize(cells, xml_space=:preserve)
       @index = 0
+      @xml_space = xml_space
       @unique_cells = {}
       @shared_xml_string = ""
       shareable_cells = cells.flatten.select{ |cell| cell.plain_string? }
@@ -40,8 +46,10 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string
-      '<?xml version="1.0" encoding="UTF-8"?><sst xmlns="' << XML_NS << '" count="' << @count.to_s << '" uniqueCount="' << unique_count.to_s << '">' << @shared_xml_string << '</sst>'
+    def to_xml_string(str='')
+      str << '<?xml version="1.0" encoding="UTF-8"?><sst xmlns="' << XML_NS << '"'
+      str << ' count="' << @count.to_s << '" uniqueCount="' << unique_count.to_s << '"'
+      str << 'xml:space="' << xml_space.to_s << '>' << @shared_xml_string << '</sst>'
     end
 
     private
-- 
cgit v1.2.3


From 7caf2ea9dfe92fa418f40132ea3c94d3da109f2c Mon Sep 17 00:00:00 2001
From: Randy Morgan <digital.ipseity@gmail.com>
Date: Tue, 14 May 2013 18:17:42 +0100
Subject: correct shared strings table xml:space attribute parsing and schema

---
 lib/axlsx/workbook/shared_strings_table.rb | 2 +-
 lib/schema/sml.xsd                         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/axlsx/workbook/shared_strings_table.rb')

diff --git a/lib/axlsx/workbook/shared_strings_table.rb b/lib/axlsx/workbook/shared_strings_table.rb
index f1bee3ae..7c08205e 100644
--- a/lib/axlsx/workbook/shared_strings_table.rb
+++ b/lib/axlsx/workbook/shared_strings_table.rb
@@ -49,7 +49,7 @@ module Axlsx
     def to_xml_string(str='')
       str << '<?xml version="1.0" encoding="UTF-8"?><sst xmlns="' << XML_NS << '"'
       str << ' count="' << @count.to_s << '" uniqueCount="' << unique_count.to_s << '"'
-      str << 'xml:space="' << xml_space.to_s << '>' << @shared_xml_string << '</sst>'
+      str << ' xml:space="' << xml_space.to_s << '">' << @shared_xml_string << '</sst>'
     end
 
     private
diff --git a/lib/schema/sml.xsd b/lib/schema/sml.xsd
index f3994e0a..3a67d0f2 100644
--- a/lib/schema/sml.xsd
+++ b/lib/schema/sml.xsd
@@ -1799,6 +1799,7 @@
     </xsd:sequence>
     <xsd:attribute name="count" type="xsd:unsignedInt" use="optional"/>
     <xsd:attribute name="uniqueCount" type="xsd:unsignedInt" use="optional"/>
+    <xsd:attribute ref="xml:space"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_PhoneticType">
     <xsd:restriction base="xsd:string">
-- 
cgit v1.2.3