make fit_to_page MOAR readable

Implement some of the feedback from devolves session on readable code -
and remove some garbage that found its way into the repo --- github.app
you are too convenient.

17 files changed, 38 insertions, 64 deletions

diff --git a/.rvmrc b/.rvmrc
new file mode 100644
index 00000000..ebac5ed5
--- /dev/null
+++ b/.rvmrc
@@ -0,0 +1 @@
+rvm use 1.9.3@axlsx
diff --git a/lib/axlsx/workbook/worksheet/page_setup.rb b/lib/axlsx/workbook/worksheet/page_setup.rb
index 10cba403..4a06e1be 100644
--- a/lib/axlsx/workbook/worksheet/page_setup.rb
+++ b/lib/axlsx/workbook/worksheet/page_setup.rb
@@ -92,6 +92,15 @@ module Axlsx
       [@fit_to_width, @fit_to_height]
     end
 
+
+    # helper method for worksheet to determine if the page setup is configured for fit to page printing
+    # We treat any page set up that has a value set for fit_to_width or fit_to_height value as fit_to_page. 
+    # @return [Boolean]
+    def fit_to_page?
+       # is there some better what to express this?
+       (fit_to_width != nil || fit_to_height != nil)
+    end
+
     # Serializes the page settings element.
     # @param [String] str
     # @return [String]
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index 5959f039..3d1bdb6c 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -89,8 +89,9 @@ module Axlsx
     # If you want the worksheet to fit on more pages (e.g. 2x2), set {PageSetup#fit_to_width} and {PageSetup#fit_to_height} accordingly.
     # @return Boolean
     # @see #page_setup
-    def fit_to_page
-      (@page_setup != nil && (@page_setup.fit_to_width != nil || @page_setup.fit_to_height != nil))
+    def fit_to_page?
+      return false unless @page_setup
+      @page_setup.fit_to_page?
     end
 
 
@@ -303,7 +304,7 @@ module Axlsx
     # @return [Boolean]
     def fit_to_page=(v)
       warn('axlsx::DEPRECIATED: Worksheet#fit_to_page has been depreciated. This value will automatically be set for you when you use PageSetup#fit_to.')
-      fit_to_page
+      fit_to_page?
     end
 
 
@@ -530,7 +531,7 @@ module Axlsx
       rels = relationships
       str = '<?xml version="1.0" encoding="UTF-8"?>'
       str.concat "<worksheet xmlns=\"%s\" xmlns:r=\"%s\">" % [XML_NS, XML_NS_R]
-      str.concat "<sheetPr><pageSetUpPr fitToPage=\"%s\"></pageSetUpPr></sheetPr>" % fit_to_page if fit_to_page
+      str.concat "<sheetPr><pageSetUpPr fitToPage=\"%s\"></pageSetUpPr></sheetPr>" % fit_to_page? if fit_to_page?
       str.concat "<dimension ref=\"%s\"></dimension>" % dimension unless rows.size == 0
       @sheet_view.to_xml_string(str) if @sheet_view
       if @column_info.size > 0
diff --git a/test/workbook/worksheet/tc_page_setup.rb b/test/workbook/worksheet/tc_page_setup.rb
index cdf94b65..2fdbab59 100644
--- a/test/workbook/worksheet/tc_page_setup.rb
+++ b/test/workbook/worksheet/tc_page_setup.rb
@@ -54,6 +54,23 @@ class TestPageSetup < Test::Unit::TestCase
     assert_equal(nil, @ps.scale)
   end
 
+  def test_default_fit_to_page?
+    assert(@ps.fit_to_width == nil && @ps.fit_to_height == nil)
+    assert(@ps.fit_to_page? == false)
+  end
+
+  def test_with_height_fit_to_page?
+    assert(@ps.fit_to_width == nil && @ps.fit_to_height == nil)
+    @ps.set(:fit_to_height => 1)
+    assert(@ps.fit_to_page?)
+  end
+
+  def test_with_width_fit_to_page?
+    assert(@ps.fit_to_width == nil && @ps.fit_to_height == nil)
+    @ps.set(:fit_to_width => 1)
+    assert(@ps.fit_to_page?)
+  end
+
   def test_to_xml_all_values
     @ps.set(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
     doc = Nokogiri::XML.parse(@ps.to_xml_string)
@@ -106,7 +123,7 @@ class TestPageSetup < Test::Unit::TestCase
     assert_nothing_raised { @ps.scale = 99 }
     assert_equal(99, @ps.scale)
   end
-  
+
   def test_fit_to
     fits = @ps.fit_to(:width => 1)
     assert_equal([1, 9999], fits)
@@ -115,7 +132,7 @@ class TestPageSetup < Test::Unit::TestCase
     fits = @ps.fit_to :height => 7, :width => 2
     assert_equal(fits, [2, 7])
     assert_raise(ArgumentError) { puts @ps.fit_to(:width => true)}
-    
-    
+
+
   end
 end
diff --git a/test/workbook/worksheet/tc_worksheet.rb b/test/workbook/worksheet/tc_worksheet.rb
index 931ec51b..ed3fdfe6 100644
--- a/test/workbook/worksheet/tc_worksheet.rb
+++ b/test/workbook/worksheet/tc_worksheet.rb
@@ -201,8 +201,9 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_fit_to_page_assignation_does_nothing
-    @ws.fit_to_page = false
-    assert_equal(@ws.fit_to_page, false)
+    @ws.fit_to_page = true
+    assert_equal(@ws.fit_to_page?, false)
+
   end
 
   def test_to_xml_string_selected
diff --git a/unzip_excel/_rels/.rels b/unzip_excel/_rels/.rels
deleted file mode 100644
index 0eb5a3ed..00000000
--- a/unzip_excel/_rels/.rels
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties" Target="docProps/app.xml"/><Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/metadata/core-properties" Target="docProps/core0.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" Target="xl/workbook.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" Target="docProps/core.xml"/></Relationships>
\ No newline at end of file
diff --git a/unzip_excel/docProps/app.xml b/unzip_excel/docProps/app.xml
deleted file mode 100644
index 660058a0..00000000
--- a/unzip_excel/docProps/app.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<Properties xmlns="http://schemas.openxmlformats.org/officeDocument/2006/extended-properties" xmlns:vt="http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"><Application>Microsoft Macintosh Excel</Application><DocSecurity>0</DocSecurity><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="2" baseType="variant"><vt:variant><vt:lpstr>Arbeitsblätter</vt:lpstr></vt:variant><vt:variant><vt:i4>4</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="4" baseType="lpstr"><vt:lpstr>Deckblatt</vt:lpstr><vt:lpstr>Meeting-Minuten gesamt</vt:lpstr><vt:lpstr>Meeting-Minuten pro Account</vt:lpstr><vt:lpstr>Bestandszahlen pro Account</vt:lpstr></vt:vector></TitlesOfParts><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>14.0300</AppVersion></Properties>
\ No newline at end of file
diff --git a/unzip_excel/xl/_rels/workbook.xml.rels b/unzip_excel/xl/_rels/workbook.xml.rels
deleted file mode 100644
index 56a547ee..00000000
--- a/unzip_excel/xl/_rels/workbook.xml.rels
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId3" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet3.xml"/><Relationship Id="rId4" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet4.xml"/><Relationship Id="rId5" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" Target="theme/theme1.xml"/><Relationship Id="rId6" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles" Target="styles.xml"/><Relationship Id="rId7" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings" Target="sharedStrings.xml"/><Relationship Id="rId8" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/calcChain" Target="calcChain.xml"/><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet2.xml"/></Relationships>
\ No newline at end of file
diff --git a/unzip_excel/xl/calcChain.xml b/unzip_excel/xl/calcChain.xml
deleted file mode 100644
index c1e8aa1e..00000000
--- a/unzip_excel/xl/calcChain.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<calcChain xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main"><c r="D2" i="2" l="1"/><c r="C2" i="2"/></calcChain>
\ No newline at end of file
diff --git a/unzip_excel/xl/charts/chart2.xml b/unzip_excel/xl/charts/chart2.xml
deleted file mode 100644
index 604904b3..00000000
--- a/unzip_excel/xl/charts/chart2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><c:date1904 val="0"/><c:lang val="de-DE"/><c:roundedCorners val="1"/><c:style val="18"/><c:chart><c:title><c:tx><c:rich><a:bodyPr/><a:lstStyle/><a:p><a:r><a:rPr lang="de-DE"/><a:t>Geplante und aktive Meeting-Minuten (pro Account)</a:t></a:r></a:p></c:rich></c:tx><c:layout/><c:overlay val="0"/></c:title><c:autoTitleDeleted val="0"/><c:view3D><c:rotX val="10"/><c:rotY val="30"/><c:rAngAx val="1"/></c:view3D><c:floor><c:thickness val="0"/></c:floor><c:sideWall><c:thickness val="0"/></c:sideWall><c:backWall><c:thickness val="0"/></c:backWall><c:plotArea><c:layout/><c:bar3DChart><c:barDir val="col"/><c:grouping val="clustered"/><c:varyColors val="1"/><c:ser><c:idx val="0"/><c:order val="0"/><c:tx><c:v>geplant</c:v></c:tx><c:invertIfNegative val="1"/><c:cat><c:strRef><c:f>'Meeting-Minuten pro Account'!$A$3:$A$10</c:f><c:strCache><c:ptCount val="8"/><c:pt idx="0"><c:v>ACME Corp</c:v></c:pt><c:pt idx="1"><c:v>MobiSave</c:v></c:pt><c:pt idx="2"><c:v>LiveSein</c:v></c:pt><c:pt idx="3"><c:v>Udo Schork</c:v></c:pt><c:pt idx="4"><c:v>IT and Media 2012</c:v></c:pt><c:pt idx="5"><c:v>Nolte Home Studio</c:v></c:pt><c:pt idx="6"><c:v>Landesvorstand WJ NRW</c:v></c:pt><c:pt idx="7"><c:v>Michael Gauder</c:v></c:pt></c:strCache></c:strRef></c:cat><c:val><c:numRef><c:f>'Meeting-Minuten pro Account'!$B$3:$B$10</c:f><c:numCache><c:formatCode>General</c:formatCode><c:ptCount val="8"/><c:pt idx="0"><c:v>1230.0</c:v></c:pt><c:pt idx="1"><c:v>1500.0</c:v></c:pt><c:pt idx="2"><c:v>930.0</c:v></c:pt><c:pt idx="3"><c:v>450.0</c:v></c:pt><c:pt idx="4"><c:v>60.0</c:v></c:pt><c:pt idx="5"><c:v>60.0</c:v></c:pt><c:pt idx="6"><c:v>60.0</c:v></c:pt><c:pt idx="7"><c:v>510.0</c:v></c:pt></c:numCache></c:numRef></c:val></c:ser><c:ser><c:idx val="1"/><c:order val="1"/><c:tx><c:v>aktiv</c:v></c:tx><c:invertIfNegative val="1"/><c:cat><c:strRef><c:f>'Meeting-Minuten pro Account'!$A$3:$A$10</c:f><c:strCache><c:ptCount val="8"/><c:pt idx="0"><c:v>ACME Corp</c:v></c:pt><c:pt idx="1"><c:v>MobiSave</c:v></c:pt><c:pt idx="2"><c:v>LiveSein</c:v></c:pt><c:pt idx="3"><c:v>Udo Schork</c:v></c:pt><c:pt idx="4"><c:v>IT and Media 2012</c:v></c:pt><c:pt idx="5"><c:v>Nolte Home Studio</c:v></c:pt><c:pt idx="6"><c:v>Landesvorstand WJ NRW</c:v></c:pt><c:pt idx="7"><c:v>Michael Gauder</c:v></c:pt></c:strCache></c:strRef></c:cat><c:val><c:numRef><c:f>'Meeting-Minuten pro Account'!$C$3:$C$10</c:f><c:numCache><c:formatCode>General</c:formatCode><c:ptCount val="8"/><c:pt idx="0"><c:v>77.0</c:v></c:pt><c:pt idx="1"><c:v>75.0</c:v></c:pt><c:pt idx="2"><c:v>251.0</c:v></c:pt><c:pt idx="3"><c:v>152.0</c:v></c:pt><c:pt idx="4"><c:v>0.0</c:v></c:pt><c:pt idx="5"><c:v>0.0</c:v></c:pt><c:pt idx="6"><c:v>0.0</c:v></c:pt><c:pt idx="7"><c:v>267.0</c:v></c:pt></c:numCache></c:numRef></c:val></c:ser><c:dLbls><c:showLegendKey val="0"/><c:showVal val="0"/><c:showCatName val="0"/><c:showSerName val="0"/><c:showPercent val="0"/><c:showBubbleSize val="0"/></c:dLbls><c:gapWidth val="150"/><c:shape val="box"/><c:axId val="-2138685352"/><c:axId val="-2138722408"/><c:axId val="0"/></c:bar3DChart><c:catAx><c:axId val="-2138685352"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="0"/><c:axPos val="b"/><c:majorGridlines/><c:numFmt formatCode="General" sourceLinked="1"/><c:majorTickMark val="none"/><c:minorTickMark val="none"/><c:tickLblPos val="nextTo"/><c:txPr><a:bodyPr rot="0"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr lang="de-DE"/></a:p></c:txPr><c:crossAx val="-2138722408"/><c:crosses val="autoZero"/><c:auto val="1"/><c:lblAlgn val="ctr"/><c:lblOffset val="100"/><c:tickLblSkip val="1"/><c:tickMarkSkip val="1"/><c:noMultiLvlLbl val="1"/></c:catAx><c:valAx><c:axId val="-2138722408"/><c:scaling><c:orientation val="minMax"/></c:scaling><c:delete val="0"/><c:axPos val="l"/><c:majorGridlines/><c:numFmt formatCode="General" sourceLinked="1"/><c:majorTickMark val="none"/><c:minorTickMark val="none"/><c:tickLblPos val="low"/><c:txPr><a:bodyPr rot="0"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr lang="de-DE"/></a:p></c:txPr><c:crossAx val="-2138685352"/><c:crosses val="autoZero"/><c:crossBetween val="between"/></c:valAx></c:plotArea><c:legend><c:legendPos val="r"/><c:layout/><c:overlay val="0"/></c:legend><c:plotVisOnly val="1"/><c:dispBlanksAs val="zero"/><c:showDLblsOverMax val="1"/></c:chart><c:printSettings><c:headerFooter/><c:pageMargins b="1.0" l="0.75" r="0.75" t="1.0" header="0.5" footer="0.5"/><c:pageSetup/></c:printSettings></c:chartSpace>
\ No newline at end of file
diff --git a/unzip_excel/xl/drawings/_rels/drawing1.xml.rels b/unzip_excel/xl/drawings/_rels/drawing1.xml.rels
deleted file mode 100644
index abab7803..00000000
--- a/unzip_excel/xl/drawings/_rels/drawing1.xml.rels
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart" Target="../charts/chart1.xml"/></Relationships>
\ No newline at end of file
diff --git a/unzip_excel/xl/drawings/_rels/drawing2.xml.rels b/unzip_excel/xl/drawings/_rels/drawing2.xml.rels
deleted file mode 100644
index a3fb1398..00000000
--- a/unzip_excel/xl/drawings/_rels/drawing2.xml.rels
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart" Target="../charts/chart2.xml"/></Relationships>
\ No newline at end of file
diff --git a/unzip_excel/xl/drawings/drawing2.xml b/unzip_excel/xl/drawings/drawing2.xml
deleted file mode 100644
index 35577167..00000000
--- a/unzip_excel/xl/drawings/drawing2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<xdr:wsDr xmlns:xdr="http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">

-  <xdr:twoCellAnchor>

-    <xdr:from>

-      <xdr:col>4</xdr:col>

-      <xdr:colOff>0</xdr:colOff>

-      <xdr:row>2</xdr:row>

-      <xdr:rowOff>0</xdr:rowOff>

-    </xdr:from>

-    <xdr:to>

-      <xdr:col>30</xdr:col>

-      <xdr:colOff>0</xdr:colOff>

-      <xdr:row>50</xdr:row>

-      <xdr:rowOff>0</xdr:rowOff>

-    </xdr:to>

-    <xdr:graphicFrame macro="">

-      <xdr:nvGraphicFramePr>

-        <xdr:cNvPr id="2" name="item_1"/>

-        <xdr:cNvGraphicFramePr/>

-      </xdr:nvGraphicFramePr>

-      <xdr:xfrm>

-        <a:off x="0" y="0"/>

-        <a:ext cx="0" cy="0"/>

-      </xdr:xfrm>

-      <a:graphic>

-        <a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart">

-          <c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="rId1"/>

-        </a:graphicData>

-      </a:graphic>

-    </xdr:graphicFrame>

-    <xdr:clientData/>

-  </xdr:twoCellAnchor>

-</xdr:wsDr>

diff --git a/unzip_excel/xl/styles.xml b/unzip_excel/xl/styles.xml
deleted file mode 100644
index 3d2677c1..00000000
--- a/unzip_excel/xl/styles.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac"><fonts count="5" x14ac:knownFonts="1"><font><sz val="11"/><name val="Arial"/><family val="1"/></font><font><sz val="24"/><name val="Arial"/></font><font><sz val="10"/><name val="Arial"/></font><font><sz val="18"/><name val="Arial"/></font><font><sz val="5"/><name val="Arial"/></font></fonts><fills count="2"><fill><patternFill patternType="none"/></fill><fill><patternFill patternType="gray125"/></fill></fills><borders count="1"><border><left/><right/><top/><bottom/><diagonal/></border></borders><cellStyleXfs count="1"><xf numFmtId="0" fontId="0" fillId="0" borderId="0"/></cellStyleXfs><cellXfs count="2"><xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/><xf numFmtId="14" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/></cellXfs><cellStyles count="1"><cellStyle name="Standard" xfId="0" builtinId="0"/></cellStyles><dxfs count="0"/><tableStyles count="0" defaultTableStyle="TableStyleMedium9" defaultPivotStyle="PivotStyleLight16"/></styleSheet>
\ No newline at end of file
diff --git a/unzip_excel/xl/theme/theme1.xml b/unzip_excel/xl/theme/theme1.xml
deleted file mode 100644
index a7d01483..00000000
--- a/unzip_excel/xl/theme/theme1.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office-Design"><a:themeElements><a:clrScheme name="Office"><a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1><a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1><a:dk2><a:srgbClr val="1F497D"/></a:dk2><a:lt2><a:srgbClr val="EEECE1"/></a:lt2><a:accent1><a:srgbClr val="4F81BD"/></a:accent1><a:accent2><a:srgbClr val="C0504D"/></a:accent2><a:accent3><a:srgbClr val="9BBB59"/></a:accent3><a:accent4><a:srgbClr val="8064A2"/></a:accent4><a:accent5><a:srgbClr val="4BACC6"/></a:accent5><a:accent6><a:srgbClr val="F79646"/></a:accent6><a:hlink><a:srgbClr val="0000FF"/></a:hlink><a:folHlink><a:srgbClr val="800080"/></a:folHlink></a:clrScheme><a:fontScheme name="Office"><a:majorFont><a:latin typeface="Cambria"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Times New Roman"/><a:font script="Hebr" typeface="Times New Roman"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="MoolBoran"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Times New Roman"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/></a:majorFont><a:minorFont><a:latin typeface="Calibri"/><a:ea typeface=""/><a:cs typeface=""/><a:font script="Jpan" typeface="ＭＳ Ｐゴシック"/><a:font script="Hang" typeface="맑은 고딕"/><a:font script="Hans" typeface="宋体"/><a:font script="Hant" typeface="新細明體"/><a:font script="Arab" typeface="Arial"/><a:font script="Hebr" typeface="Arial"/><a:font script="Thai" typeface="Tahoma"/><a:font script="Ethi" typeface="Nyala"/><a:font script="Beng" typeface="Vrinda"/><a:font script="Gujr" typeface="Shruti"/><a:font script="Khmr" typeface="DaunPenh"/><a:font script="Knda" typeface="Tunga"/><a:font script="Guru" typeface="Raavi"/><a:font script="Cans" typeface="Euphemia"/><a:font script="Cher" typeface="Plantagenet Cherokee"/><a:font script="Yiii" typeface="Microsoft Yi Baiti"/><a:font script="Tibt" typeface="Microsoft Himalaya"/><a:font script="Thaa" typeface="MV Boli"/><a:font script="Deva" typeface="Mangal"/><a:font script="Telu" typeface="Gautami"/><a:font script="Taml" typeface="Latha"/><a:font script="Syrc" typeface="Estrangelo Edessa"/><a:font script="Orya" typeface="Kalinga"/><a:font script="Mlym" typeface="Kartika"/><a:font script="Laoo" typeface="DokChampa"/><a:font script="Sinh" typeface="Iskoola Pota"/><a:font script="Mong" typeface="Mongolian Baiti"/><a:font script="Viet" typeface="Arial"/><a:font script="Uigh" typeface="Microsoft Uighur"/><a:font script="Geor" typeface="Sylfaen"/></a:minorFont></a:fontScheme><a:fmtScheme name="Office"><a:fillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="1"/></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="100000"/><a:shade val="100000"/><a:satMod val="130000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="50000"/><a:shade val="100000"/><a:satMod val="350000"/></a:schemeClr></a:gs></a:gsLst><a:lin ang="16200000" scaled="0"/></a:gradFill></a:fillStyleLst><a:lnStyleLst><a:ln w="9525" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="25400" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln><a:ln w="38100" cap="flat" cmpd="sng" algn="ctr"><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:prstDash val="solid"/></a:ln></a:lnStyleLst><a:effectStyleLst><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst></a:effectStyle><a:effectStyle><a:effectLst><a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="0"><a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr></a:outerShdw></a:effectLst><a:scene3d><a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera><a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig></a:scene3d><a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d></a:effectStyle></a:effectStyleLst><a:bgFillStyleLst><a:solidFill><a:schemeClr val="phClr"/></a:solidFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path></a:gradFill><a:gradFill rotWithShape="1"><a:gsLst><a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs><a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs></a:gsLst><a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme></a:themeElements><a:objectDefaults><a:spDef><a:spPr/><a:bodyPr/><a:lstStyle/><a:style><a:lnRef idx="1"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="3"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="2"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="minor"><a:schemeClr val="lt1"/></a:fontRef></a:style></a:spDef><a:lnDef><a:spPr/><a:bodyPr/><a:lstStyle/><a:style><a:lnRef idx="2"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="0"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="1"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="minor"><a:schemeClr val="tx1"/></a:fontRef></a:style></a:lnDef></a:objectDefaults><a:extraClrSchemeLst/></a:theme>
\ No newline at end of file
diff --git a/unzip_excel/xl/worksheets/_rels/sheet2.xml.rels b/unzip_excel/xl/worksheets/_rels/sheet2.xml.rels
deleted file mode 100644
index 4babdeca..00000000
--- a/unzip_excel/xl/worksheets/_rels/sheet2.xml.rels
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing" Target="../drawings/drawing1.xml"/></Relationships>
\ No newline at end of file
diff --git a/unzip_excel/xl/worksheets/_rels/sheet3.xml.rels b/unzip_excel/xl/worksheets/_rels/sheet3.xml.rels
deleted file mode 100644
index 27e1d83c..00000000
--- a/unzip_excel/xl/worksheets/_rels/sheet3.xml.rels
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships"><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing" Target="../drawings/drawing2.xml"/></Relationships>
\ No newline at end of file