From 395e321a5f50908790f31c0400e91a35b0313c66 Mon Sep 17 00:00:00 2001
From: Alexey lexxor Korchagin <lexx-kor@ya.ru>
Date: Fri, 27 Mar 2015 01:36:20 +0700
Subject: [PATCH 1/3] make comments work in office for mac 2015

---
 lib/axlsx/workbook/worksheet/comment.rb |  8 ++---
 lib/schema/sml.xsd                      | 41 +++++++++++++++----------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/lib/axlsx/workbook/worksheet/comment.rb b/lib/axlsx/workbook/worksheet/comment.rb
index e5dbe41c..99cb3ca9 100644
--- a/lib/axlsx/workbook/worksheet/comment.rb
+++ b/lib/axlsx/workbook/worksheet/comment.rb
@@ -66,11 +66,11 @@ def to_xml_string(str = "")
       str << '<text>'
       unless author.to_s == ""
         str << '<r><rPr><b/><color indexed="81"/></rPr>'
-        str << ("<t>" << ::CGI.escapeHTML(author.to_s) << ":\n</t></r>")
+        str << ('<t xml:space="preserve">' << ::CGI.escapeHTML(author.to_s) << ":\n</t></r>")
       end
       str << '<r>'
       str << '<rPr><color indexed="81"/></rPr>'
-      str << ('<t>' << ::CGI.escapeHTML(text) << '</t></r></text>')
+      str << ('<t xml:space="preserve">' << ::CGI.escapeHTML(text) << '</t></r></text>')
       str << '</comment>'
     end
 
@@ -82,9 +82,9 @@ def initialize_vml_shape
       pos = Axlsx::name_to_indices(ref)
       @vml_shape = VmlShape.new(:row => pos[1], :column => pos[0], :visible => @visible) do |vml|
         vml.left_column = vml.column
-        vml.right_column = vml.column + 2 
+        vml.right_column = vml.column + 2
         vml.top_row = vml.row
-         vml.bottom_row = vml.row + 4
+        vml.bottom_row = vml.row + 4
       end
     end
   end
diff --git a/lib/schema/sml.xsd b/lib/schema/sml.xsd
index 3a67d0f2..294959e1 100644
--- a/lib/schema/sml.xsd
+++ b/lib/schema/sml.xsd
@@ -10,11 +10,11 @@
     schemaLocation="shared-relationshipReference.xsd"/>
   <xsd:import namespace="http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"
     schemaLocation="shared-commonSimpleTypes.xsd"/>
-  <xsd:import 
+  <xsd:import
     namespace="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"
     schemaLocation="dml-spreadsheetDrawing.xsd"/>
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
+
   <xsd:complexType name="CT_AutoFilter">
     <xsd:sequence>
       <xsd:element name="filterColumn" minOccurs="0" maxOccurs="unbounded" type="CT_FilterColumn"/>
@@ -1799,7 +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:attribute ref="xml:space"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_PhoneticType">
     <xsd:restriction base="xsd:string">
@@ -1827,7 +1827,7 @@
   <xsd:complexType name="CT_RElt">
     <xsd:sequence>
       <xsd:element name="rPr" type="CT_RPrElt" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="t" type="s:ST_Xstring" minOccurs="1" maxOccurs="1"/>
+      <xsd:element name="t" type="CT_StringWithSpace" minOccurs="1" maxOccurs="1"/>
     </xsd:sequence>
   </xsd:complexType>
   <xsd:complexType name="CT_RPrElt">
@@ -1851,12 +1851,19 @@
   </xsd:complexType>
   <xsd:complexType name="CT_Rst">
     <xsd:sequence>
-      <xsd:element name="t" type="s:ST_Xstring" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="t" type="CT_StringWithSpace" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="r" type="CT_RElt" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="rPh" type="CT_PhoneticRun" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="phoneticPr" minOccurs="0" maxOccurs="1" type="CT_PhoneticPr"/>
     </xsd:sequence>
   </xsd:complexType>
+  <xsd:complexType name="CT_StringWithSpace">
+    <xsd:simpleContent>
+      <xsd:extension base="s:ST_Xstring">
+        <xsd:attribute ref="xml:space"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
   <xsd:complexType name="CT_PhoneticPr">
     <xsd:attribute name="fontId" type="ST_FontId" use="required"/>
     <xsd:attribute name="type" type="ST_PhoneticType" use="optional" default="fullwidthKatakana"/>
@@ -2216,7 +2223,7 @@
       <xsd:element name="tableParts" type="CT_TableParts" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0" maxOccurs="1"/>
     </xsd:sequence>
-    <xsd:attribute ref="xml:space"/>
+    <xsd:attribute ref="xml:space"/>
   </xsd:complexType>
   <xsd:complexType name="CT_SheetData">
     <xsd:sequence>
@@ -3776,7 +3783,7 @@
     <xsd:choice maxOccurs="unbounded">
       <xsd:element name="name" type="CT_FontName" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="charset" type="CT_IntProperty" minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="family" type="CT_FontFamily" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="family" type="CT_FontFamily" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="b" type="CT_BooleanProperty" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="i" type="CT_BooleanProperty" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="strike" type="CT_BooleanProperty" minOccurs="0" maxOccurs="1"/>
@@ -3791,15 +3798,15 @@
       <xsd:element name="scheme" type="CT_FontScheme" minOccurs="0" maxOccurs="1"/>
     </xsd:choice>
   </xsd:complexType>
-  <xsd:complexType name="CT_FontFamily">
-    <xsd:attribute name="val" type="ST_FontFamily" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_FontFamily">
-    <xsd:restriction base="xsd:integer">
-      <xsd:minInclusive value="0"/>
-      <xsd:maxInclusive value="14"/>
-    </xsd:restriction>
-  </xsd:simpleType>
+  <xsd:complexType name="CT_FontFamily">
+    <xsd:attribute name="val" type="ST_FontFamily" use="required"/>
+  </xsd:complexType>
+  <xsd:simpleType name="ST_FontFamily">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="0"/>
+      <xsd:maxInclusive value="14"/>
+    </xsd:restriction>
+  </xsd:simpleType>
   <xsd:attributeGroup name="AG_AutoFormat">
     <xsd:attribute name="autoFormatId" type="xsd:unsignedInt"/>
     <xsd:attribute name="applyNumberFormats" type="xsd:boolean"/>

From 1adf8ebe0abf4c72892889075a529d568600e127 Mon Sep 17 00:00:00 2001
From: Alexey lexxor Korchagin <lexx-kor@ya.ru>
Date: Fri, 27 Mar 2015 15:28:53 +0700
Subject: [PATCH 2/3] remove excess attribute

---
 lib/axlsx/workbook/worksheet/comment.rb | 2 +-
 lib/schema/sml.xsd                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/axlsx/workbook/worksheet/comment.rb b/lib/axlsx/workbook/worksheet/comment.rb
index 99cb3ca9..1c5e220c 100644
--- a/lib/axlsx/workbook/worksheet/comment.rb
+++ b/lib/axlsx/workbook/worksheet/comment.rb
@@ -66,7 +66,7 @@ def to_xml_string(str = "")
       str << '<text>'
       unless author.to_s == ""
         str << '<r><rPr><b/><color indexed="81"/></rPr>'
-        str << ('<t xml:space="preserve">' << ::CGI.escapeHTML(author.to_s) << ":\n</t></r>")
+        str << ('<t>' << ::CGI.escapeHTML(author.to_s) << ":\n</t></r>")
       end
       str << '<r>'
       str << '<rPr><color indexed="81"/></rPr>'
diff --git a/lib/schema/sml.xsd b/lib/schema/sml.xsd
index 294959e1..71726af9 100644
--- a/lib/schema/sml.xsd
+++ b/lib/schema/sml.xsd
@@ -1851,7 +1851,7 @@
   </xsd:complexType>
   <xsd:complexType name="CT_Rst">
     <xsd:sequence>
-      <xsd:element name="t" type="CT_StringWithSpace" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="t" type="s:ST_Xstring" minOccurs="0" maxOccurs="1"/>
       <xsd:element name="r" type="CT_RElt" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="rPh" type="CT_PhoneticRun" minOccurs="0" maxOccurs="unbounded"/>
       <xsd:element name="phoneticPr" minOccurs="0" maxOccurs="1" type="CT_PhoneticPr"/>

From 9eccf0173931677046ad447058f70da8ae703771 Mon Sep 17 00:00:00 2001
From: Alexey lexxor Korchagin <lexx-kor@ya.ru>
Date: Fri, 27 Mar 2015 15:41:32 +0700
Subject: [PATCH 3/3] specs for xml:space attribute

---
 test/workbook/worksheet/tc_comment.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/workbook/worksheet/tc_comment.rb b/test/workbook/worksheet/tc_comment.rb
index e66abb9a..4d4eabe4 100644
--- a/test/workbook/worksheet/tc_comment.rb
+++ b/test/workbook/worksheet/tc_comment.rb
@@ -55,6 +55,7 @@ def test_to_xml_string
     assert_equal(doc.xpath("//comment[@authorId='#{@c1.author_index.to_s}']").size, 1)
     assert_equal(doc.xpath("//t[text()='#{@c1.author}:\n']").size, 1)
     assert_equal(doc.xpath("//t[text()='#{@c1.text}']").size, 1)
+    assert_equal(doc.xpath("//t[text()='#{@c1.text}'][@xml:space='preserve']").size, 1)
   end
 
   def test_comment_text_contain_author_and_text