powerpoint 1.7 → 1.8

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTIyN2VhNDU0N2I4MTFkZTQxNTBmNzhiZTQ5OTYxMzA1NWFmOTgxNg==
-  data.tar.gz: !binary |-
-    MGNjNGJmODJlNzI2YTFiYzEyMzVlZGYxZTJhMDVmMTAyY2M5NWY0MQ==
+SHA1:
+  metadata.gz: 7a80c6b2960438a7bfd273568aee8700938e7fa0
+  data.tar.gz: 4f93cf34deaed1102e592d65913442fbeef606f4
 SHA512:
-  metadata.gz: !binary |-
-    MWYxMmE0ODg5Y2E1ZWU3MjZiYzhjYzkyYmUxOTlhNGRiZmU1NWM5M2JhZmI1
-    YzUxZjBmZDE0YTVhYTMxNjE1OGZlNjg0OGQ1ODhjZTlmM2EzMDk3N2U3MTYz
-    NGY2OGE0ZjRiMjYwNzI1N2EyNzI4NDNkNzA5NTliYjg1MThhYTA=
-  data.tar.gz: !binary |-
-    MWJkZDI5OTdiYzc5YTBmYmQ4ZTM3NjhiZmJjODk2ODUxNzMwY2E5YTg5YmZi
-    MzlkMjY4ZWZlMmIzNDk0MTAzYTZiYWU1NTUyZmI4YzA4NjViNGMwMWU0MzYw
-    OGNkOThjNmY5OGJhNGUzODRjOTQ0OWVkZjY5ODI4ZDJmMmVmYjE=
+  metadata.gz: b755db84b862f3f3e8a1fa80ed0d76cbaea664c6b6cdda879ba39060b485c31463642854b5c19f64a4603a1e87babde2cbe7bd9b61025ad99653ceccf4bc897d
+  data.tar.gz: e930379e6409787cf768f3011456e60a8eb9382176fa985e04e7f43d0ace1d495a431f080f654dc54ddf8b37ee97c43a52489306e04348290f4488df580896ac

data/lib/powerpoint.rb

@@ -3,6 +3,8 @@ require 'powerpoint/util'
 require 'powerpoint/slide/intro'
 require 'powerpoint/slide/textual'
 require 'powerpoint/slide/pictorial'
+require 'powerpoint/slide/text_picture_split'
+require 'powerpoint/slide/picture_description'
 require 'powerpoint/compression'
 require 'powerpoint/presentation'
 

data/lib/powerpoint/presentation.rb

@@ -30,6 +30,14 @@ module Powerpoint
       @slides << Powerpoint::Slide::Pictorial.new(presentation: self, title: title, image_path: image_path, coords: coords)
     end
 
+    def add_text_picture_slide(title, image_path, content = [])
+      @slides << Powerpoint::Slide::TextPicSplit.new(presentation: self, title: title, image_path: image_path, content: content)
+    end
+
+    def add_picture_description_slide(title, image_path, content = [])
+      @slides << Powerpoint::Slide::DescriptionPic.new(presentation: self, title: title, image_path: image_path, content: content)
+    end
+
     def save(path)
       Dir.mktmpdir do |dir|
         extract_path = "#{dir}/extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}"
@@ -46,6 +54,7 @@ module Powerpoint
         render_view('content_type.xml.erb', "#{extract_path}/[Content_Types].xml")
         render_view('presentation.xml.rel.erb', "#{extract_path}/ppt/_rels/presentation.xml.rels")
         render_view('presentation.xml.erb', "#{extract_path}/ppt/presentation.xml")
+        render_view('app.xml.erb', "#{extract_path}/docProps/app.xml")
 
         # Save slides
         slides.each_with_index do |slide, index|
@@ -61,7 +70,7 @@ module Powerpoint
     end
 
     def file_types
-      slides.select {|slide| slide.class == Powerpoint::Slide::Pictorial}.map(&:file_type).uniq
+      slides.map {|slide| slide.file_type if slide.respond_to? :file_type }.compact.uniq
     end
   end
 end

data/lib/powerpoint/slide/intro.rb

@@ -18,6 +18,10 @@ module Powerpoint
         save_slide_xml(extract_path, index)
       end
 
+      def file_type
+        nil
+      end
+
       def save_rel_xml(extract_path, index)
         render_view('textual_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels")
       end

data/lib/powerpoint/slide/pictorial.rb

@@ -18,7 +18,7 @@ module Powerpoint
       end
 
       def save(extract_path, index)
-        copy_media(extract_path)
+        copy_media(extract_path, @image_path)
         save_rel_xml(extract_path, index)
         save_slide_xml(extract_path, index)
       end
@@ -40,11 +40,6 @@ module Powerpoint
       end
       private :default_coords
 
-      def copy_media(extract_path)
-        FileUtils.copy_file(@image_path, "#{extract_path}/ppt/media/#{@image_name}")
-      end
-      private :copy_media
-
       def save_rel_xml(extract_path, index)
         render_view('pictorial_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels")
       end

data/lib/powerpoint/slide/picture_description.rb

@@ -0,0 +1,63 @@
+require 'zip/filesystem'
+require 'fileutils'
+require 'fastimage'
+require 'erb'
+
+module Powerpoint
+  module Slide
+    class DescriptionPic
+      include Powerpoint::Util
+
+      attr_reader :title, :content, :image_name, :image_path, :coords
+
+      def initialize(options={})
+        require_arguments [:presentation, :title, :image_path, :content], options
+        options.each {|k, v| instance_variable_set("@#{k}", v)}
+        @coords = default_coords
+        @image_name = File.basename(@image_path)
+      end
+
+      def save(extract_path, index)
+        copy_media(extract_path, @image_path)
+        save_rel_xml(extract_path, index)
+        save_slide_xml(extract_path, index)
+      end
+
+      def file_type
+        File.extname(image_name).gsub('.', '')
+      end
+
+      def default_coords
+        slide_width = pixle_to_pt(720)
+        default_width = pixle_to_pt(550)
+        default_height = pixle_to_pt(300)
+
+        return {} unless dimensions = FastImage.size(image_path)
+        image_width, image_height = dimensions.map {|d| pixle_to_pt(d)}
+
+        capped_width = [default_width, image_width].min
+        w_ratio = capped_width / image_width.to_f
+
+        capped_height = [default_height, image_height].min
+        h_ratio = capped_height / image_height.to_f
+
+        ratio = [w_ratio, h_ratio].min
+
+        new_width = (image_width.to_f * ratio).round
+        new_height = (image_height.to_f * ratio).round
+        {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(60), cx: new_width, cy: new_height}
+      end
+      private :default_coords
+
+      def save_rel_xml(extract_path, index)
+        render_view('picture_description_rels.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels")
+      end
+      private :save_rel_xml
+
+      def save_slide_xml(extract_path, index)
+        render_view('picture_description_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml")
+      end
+      private :save_slide_xml
+    end
+  end
+end

data/lib/powerpoint/slide/text_picture_split.rb

@@ -0,0 +1,56 @@
+require 'zip/filesystem'
+require 'fileutils'
+require 'fastimage'
+require 'erb'
+
+module Powerpoint
+  module Slide
+    class TextPicSplit
+      include Powerpoint::Util
+
+      attr_reader :title, :content, :image_name, :image_path, :coords
+
+      def initialize(options={})
+        require_arguments [:presentation, :title, :image_path, :content], options
+        options.each {|k, v| instance_variable_set("@#{k}", v)}
+        @coords = default_coords
+        @image_name = File.basename(@image_path)
+      end
+
+      def save(extract_path, index)
+        copy_media(extract_path, @image_path)
+        save_rel_xml(extract_path, index)
+        save_slide_xml(extract_path, index)
+      end
+
+      def file_type
+        File.extname(image_name).gsub('.', '')
+      end
+
+      def default_coords
+        start_x = pixle_to_pt(360)
+        default_width = pixle_to_pt(300)
+
+        return {} unless dimensions = FastImage.size(image_path)
+        image_width, image_height = dimensions.map {|d| pixle_to_pt(d)}
+        new_width = default_width < image_width ? default_width : image_width
+        ratio = new_width / image_width.to_f
+        new_height = (image_height.to_f * ratio).round
+        {x: start_x, y: pixle_to_pt(120), cx: new_width, cy: new_height}
+      end
+      private :default_coords
+
+      def save_rel_xml(extract_path, index)
+        render_view('text_picture_split_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels")
+      end
+      private :save_rel_xml
+
+      def save_slide_xml(extract_path, index)
+        render_view('text_picture_split_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml")
+      end
+      private :save_slide_xml
+    end
+  end
+
+
+end

data/lib/powerpoint/util.rb

@@ -20,5 +20,11 @@ module Powerpoint
     def require_arguments(required_argements, argements)
       raise ArgumentError unless required_argements.all? {|required_key| argements.keys.include? required_key}
     end
+
+    def copy_media(extract_path, image_path)
+      image_name = File.basename(image_path)
+      dest_path = "#{extract_path}/ppt/media/#{image_name}"
+      FileUtils.copy_file(image_path, dest_path) unless File.exist?(dest_path)
+    end
   end
 end

data/lib/powerpoint/version.rb

@@ -1,3 +1,3 @@
 module Powerpoint
-  VERSION = "1.7"
+  VERSION = "1.8"
 end

data/lib/powerpoint/views/app.xml.erb

@@ -0,0 +1,51 @@
+<?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">
+  <TotalTime>0</TotalTime>
+  <Words>43</Words>
+  <Application>Microsoft Macintosh PowerPoint</Application>
+  <PresentationFormat>On-screen Show (4:3)</PresentationFormat>
+  <Paragraphs>15</Paragraphs>
+  <Slides><%= slides.length %></Slides>
+  <Notes>0</Notes>
+  <HiddenSlides>0</HiddenSlides>
+  <MMClips>0</MMClips>
+  <ScaleCrop>false</ScaleCrop>
+  <HeadingPairs>
+    <vt:vector size="6" baseType="variant">
+      <vt:variant>
+        <vt:lpstr>Fonts Used</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4>2</vt:i4>
+      </vt:variant>
+      <vt:variant>
+        <vt:lpstr>Theme</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4>1</vt:i4>
+      </vt:variant>
+      <vt:variant>
+        <vt:lpstr>Slide Titles</vt:lpstr>
+      </vt:variant>
+      <vt:variant>
+        <vt:i4><%= slides.length %></vt:i4>
+      </vt:variant>
+    </vt:vector>
+  </HeadingPairs>
+  <TitlesOfParts>
+    <vt:vector size="<%= slides.length + 3 %>" baseType="lpstr">
+      <vt:lpstr>Arial</vt:lpstr>
+      <vt:lpstr>Calibri</vt:lpstr>
+      <vt:lpstr>Office Theme</vt:lpstr>
+      <% slides.each do |slide| %>
+      <vt:lpstr><%= slide.title %></vt:lpstr>
+      <% end %>
+    </vt:vector>
+  </TitlesOfParts>
+  <Company></Company>
+  <LinksUpToDate>false</LinksUpToDate>
+  <SharedDoc>false</SharedDoc>
+  <HyperlinksChanged>false</HyperlinksChanged>
+  <AppVersion>15.0000</AppVersion>
+</Properties>

data/lib/powerpoint/views/picture_description_rels.xml.erb

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
+  <Relationship Id="rId1" Target="../slideLayouts/slideLayout9.xml" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout"/>
+  <Relationship Id="rId2" Target="../media/<%= image_name %>" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image"/>
+</Relationships>

data/lib/powerpoint/views/picture_description_slide.xml.erb

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sld xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">
+  <p:cSld>
+    <p:spTree>
+      <p:nvGrpSpPr>
+        <p:cNvPr id="1" name=""/>
+        <p:cNvGrpSpPr/>
+        <p:nvPr/>
+      </p:nvGrpSpPr>
+      <p:grpSpPr>
+        <a:xfrm>
+          <a:off x="0" y="0"/>
+          <a:ext cx="0" cy="0"/>
+          <a:chOff x="0" y="0"/>
+          <a:chExt cx="0" cy="0"/>
+        </a:xfrm>
+      </p:grpSpPr>
+      <p:sp>
+        <p:nvSpPr>
+          <p:cNvPr id="2" name="Title 1"/>
+          <p:cNvSpPr>
+            <a:spLocks noGrp="1"/>
+          </p:cNvSpPr>
+          <p:nvPr>
+            <p:ph type="title"/>
+          </p:nvPr>
+        </p:nvSpPr>
+        <p:spPr/>
+        <p:txBody>
+          <a:bodyPr/>
+          <a:lstStyle/>
+          <a:p>
+            <a:r>
+              <a:rPr lang="en-US" dirty="0" smtClean="0"/>
+              <a:t><%= title %></a:t>
+            </a:r>
+            <a:endParaRPr lang="en-US" dirty="0"/>
+          </a:p>
+        </p:txBody>
+      </p:sp>
+      <p:pic>
+        <p:nvPicPr>
+          <p:cNvPr id="5" name="Picture Placeholder 4"/>
+          <p:cNvPicPr>
+            <a:picLocks noGrp="1" noChangeAspect="1"/>
+          </p:cNvPicPr>
+          <p:nvPr>
+            <p:ph type="pic" idx="1"/>
+          </p:nvPr>
+        </p:nvPicPr>
+        <p:blipFill>
+          <a:blip r:embed="rId2">
+            <a:extLst>
+              <a:ext uri="{28A0092B-C50C-407E-A947-70E740481C1C}">
+                <a14:useLocalDpi xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" val="0"/>
+              </a:ext>
+            </a:extLst>
+          </a:blip>
+          <a:stretch>
+            <a:fillRect/>
+          </a:stretch>
+        </p:blipFill>
+        <% if coords.any? %>
+        <p:spPr>
+          <a:xfrm>
+            <a:off x="<%= coords[:x].to_s %>" y="<%= coords[:y].to_s %>"/>
+            <a:ext cx="<%= coords[:cx].to_s %>" cy="<%= coords[:cy].to_s %>"/>
+          </a:xfrm>
+          <a:prstGeom prst="rect">
+            <a:avLst/>
+          </a:prstGeom>
+        </p:spPr>
+        <% else %>
+        <p:spPr/>
+        <% end %>
+      </p:pic>
+      <p:sp>
+        <p:nvSpPr>
+          <p:cNvPr id="4" name="Text Placeholder 4"/>
+          <p:cNvSpPr>
+            <a:spLocks noGrp="1"/>
+          </p:cNvSpPr>
+          <p:nvPr>
+            <p:ph type="body" sz="half" idx="2"/>
+          </p:nvPr>
+        </p:nvSpPr>
+        <p:spPr/>
+        <p:txBody>
+          <a:bodyPr/>
+          <a:lstStyle/>
+          <% content.each_with_index do |c, index| %>
+          <a:p>
+            <a:r>
+              <a:rPr lang="en-US" dirty="0" smtClean="0"/>
+              <a:t><%= c %></a:t>
+            </a:r>
+          <% if content.length == (index + 1) %>
+          <a:endParaRPr lang="en-US"/>
+          <% end %>
+          </a:p>
+          <% end %>
+        </p:txBody>
+      </p:sp>
+
+    </p:spTree>
+    <p:extLst>
+      <p:ext uri="{BB962C8B-B14F-4D97-AF65-F5344CB8AC3E}">
+        <p14:creationId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="1435759726"/>
+      </p:ext>
+    </p:extLst>
+  </p:cSld>
+  <p:clrMapOvr>
+    <a:masterClrMapping/>
+  </p:clrMapOvr>
+</p:sld>

data/lib/powerpoint/views/text_picture_split_rel.xml.erb

@@ -0,0 +1,5 @@
+<?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/slideLayout" Target="../slideLayouts/slideLayout4.xml" />
+  <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/<%= image_name %>" />
+</Relationships>

data/lib/powerpoint/views/text_picture_split_slide.xml.erb

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<p:sld xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">
+  <p:cSld>
+    <p:spTree>
+      <p:nvGrpSpPr>
+        <p:cNvPr id="1" name=""/>
+        <p:cNvGrpSpPr/>
+        <p:nvPr/>
+      </p:nvGrpSpPr>
+      <p:grpSpPr>
+        <a:xfrm>
+          <a:off x="0" y="0"/>
+          <a:ext cx="0" cy="0"/>
+          <a:chOff x="0" y="0"/>
+          <a:chExt cx="0" cy="0"/>
+        </a:xfrm>
+      </p:grpSpPr>
+      <p:sp>
+        <p:nvSpPr>
+          <p:cNvPr id="2" name="Title 1"/>
+          <p:cNvSpPr>
+            <a:spLocks noGrp="1"/>
+          </p:cNvSpPr>
+          <p:nvPr>
+            <p:ph type="title"/>
+          </p:nvPr>
+        </p:nvSpPr>
+        <p:spPr/>
+        <p:txBody>
+          <a:bodyPr/>
+          <a:lstStyle/>
+          <a:p>
+            <a:r>
+              <a:rPr lang="en-US" dirty="0" smtClean="0"/>
+              <a:t><%= title %></a:t>
+            </a:r>
+            <a:endParaRPr lang="en-US" dirty="0"/>
+          </a:p>
+        </p:txBody>
+      </p:sp>
+      <p:sp>
+        <p:nvSpPr>
+          <p:cNvPr id="3" name="Content Placeholder 2"/>
+          <p:cNvSpPr>
+            <a:spLocks noGrp="1"/>
+          </p:cNvSpPr>
+          <p:nvPr>
+            <p:ph sz="half" idx="1"/>
+          </p:nvPr>
+        </p:nvSpPr>
+        <p:spPr/>
+        <p:txBody>
+          <a:bodyPr/>
+          <a:lstStyle/>
+          <% content.each_with_index do |c, index| %>
+          <a:p>
+            <a:r>
+              <a:rPr lang="en-US" dirty="0" smtClean="0"/>
+              <a:t><%= c %></a:t>
+            </a:r>
+          <% if content.length == (index + 1) %>
+          <a:endParaRPr lang="en-US"/>
+          <% end %>
+          </a:p>
+          <% end %>
+        </p:txBody>
+      </p:sp>
+      <p:pic>
+        <p:nvPicPr>
+          <p:cNvPr id="4" name="Content Placeholder 3"/>
+          <p:cNvPicPr>
+            <a:picLocks noGrp="1" noChangeAspect="1"/>
+          </p:cNvPicPr>
+          <p:nvPr>
+            <p:ph sz="half" idx="2"/>
+          </p:nvPr>
+        </p:nvPicPr>
+        <p:blipFill>
+          <a:blip r:embed="rId2">
+            <a:extLst>
+              <a:ext uri="{28A0092B-C50C-407E-A947-70E740481C1C}">
+                <a14:useLocalDpi xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" val="0"/>
+              </a:ext>
+            </a:extLst>
+          </a:blip>
+          <a:stretch>
+            <a:fillRect/>
+          </a:stretch>
+        </p:blipFill>
+        <% if coords.any? %>
+        <p:spPr>
+          <a:xfrm>
+            <a:off x="<%= coords[:x].to_s %>" y="<%= coords[:y].to_s %>"/>
+            <a:ext cx="<%= coords[:cx].to_s %>" cy="<%= coords[:cy].to_s %>"/>
+          </a:xfrm>
+          <a:prstGeom prst="rect">
+            <a:avLst/>
+          </a:prstGeom>
+        </p:spPr>
+        <% else %>
+        <p:spPr/>
+        <% end %>
+      </p:pic>
+    </p:spTree>
+    <p:extLst>
+      <p:ext uri="{BB962C8B-B14F-4D97-AF65-F5344CB8AC3E}">
+        <p14:creationId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="1435759726"/>
+      </p:ext>
+    </p:extLst>
+  </p:cSld>
+  <p:clrMapOvr>
+    <a:masterClrMapping/>
+  </p:clrMapOvr>
+</p:sld>

data/spec/test_spec.rb

@@ -6,8 +6,11 @@ describe 'Powerpoint parsing a sample PPTX file' do
     @deck.add_intro 'Bicycle Of the Mind', 'created by Steve Jobs'
     @deck.add_textual_slide 'Why Mac?', ['Its cool!', 'Its light!']
     @deck.add_textual_slide 'Why Iphone?', ['Its fast!', 'Its cheap!']
-    @deck.add_pictorial_slide 'JPG Logo', 'samples/images/sample_jpg.jpg'
+    @deck.add_pictorial_slide 'JPG Logo', 'samples/images/sample_png.png'
+    @deck.add_text_picture_slide('Text Pic Split', 'samples/images/sample_png.png', content = ['Here is a string', 'here is another'])
     @deck.add_pictorial_slide 'PNG Logo', 'samples/images/sample_png.png'
+    @deck.add_picture_description_slide('Pic Desc', 'samples/images/sample_png.png', content = ['Here is a string', 'here is another'])
+    @deck.add_picture_description_slide('JPG Logo', 'samples/images/sample_jpg.jpg', content = ['descriptions'])
     @deck.add_pictorial_slide 'GIF Logo', 'samples/images/sample_gif.gif', {x: 124200, y: 3356451, cx: 2895600, cy: 1013460}
     @deck.add_textual_slide 'Why Android?', ['Its great!', 'Its sweet!']
     @deck.save 'samples/pptx/sample.pptx' # Examine the PPTX file

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: powerpoint
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
 platform: ruby
 authors:
 - pythonicrubyist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 description: A Ruby gem that can create a PowerPoint presentation.
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .codeclimate.yml
-- .gitignore
+- ".codeclimate.yml"
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -112,15 +112,22 @@ files:
 - lib/powerpoint/presentation.rb
 - lib/powerpoint/slide/intro.rb
 - lib/powerpoint/slide/pictorial.rb
+- lib/powerpoint/slide/picture_description.rb
+- lib/powerpoint/slide/text_picture_split.rb
 - lib/powerpoint/slide/textual.rb
 - lib/powerpoint/util.rb
 - lib/powerpoint/version.rb
+- lib/powerpoint/views/app.xml.erb
 - lib/powerpoint/views/content_type.xml.erb
 - lib/powerpoint/views/intro_slide.xml.erb
 - lib/powerpoint/views/pictorial_rel.xml.erb
 - lib/powerpoint/views/pictorial_slide.xml.erb
+- lib/powerpoint/views/picture_description_rels.xml.erb
+- lib/powerpoint/views/picture_description_slide.xml.erb
 - lib/powerpoint/views/presentation.xml.erb
 - lib/powerpoint/views/presentation.xml.rel.erb
+- lib/powerpoint/views/text_picture_split_rel.xml.erb
+- lib/powerpoint/views/text_picture_split_slide.xml.erb
 - lib/powerpoint/views/textual_rel.xml.erb
 - lib/powerpoint/views/textual_slide.xml.erb
 - powerpoint.gemspec
@@ -130,7 +137,6 @@ files:
 - samples/pptx/sample.pptx
 - spec/test_spec.rb
 - template/_rels/.rels
-- template/docProps/app.xml
 - template/docProps/core.xml
 - template/ppt/_rels/.keep
 - template/ppt/media/.keep
@@ -173,12 +179,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/template/docProps/app.xml

@@ -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"><TotalTime>0</TotalTime><Words>43</Words><Application>Microsoft Macintosh PowerPoint</Application><PresentationFormat>On-screen Show (4:3)</PresentationFormat><Paragraphs>15</Paragraphs><Slides>8</Slides><Notes>0</Notes><HiddenSlides>0</HiddenSlides><MMClips>0</MMClips><ScaleCrop>false</ScaleCrop><HeadingPairs><vt:vector size="6" baseType="variant"><vt:variant><vt:lpstr>Fonts Used</vt:lpstr></vt:variant><vt:variant><vt:i4>2</vt:i4></vt:variant><vt:variant><vt:lpstr>Theme</vt:lpstr></vt:variant><vt:variant><vt:i4>1</vt:i4></vt:variant><vt:variant><vt:lpstr>Slide Titles</vt:lpstr></vt:variant><vt:variant><vt:i4>8</vt:i4></vt:variant></vt:vector></HeadingPairs><TitlesOfParts><vt:vector size="11" baseType="lpstr"><vt:lpstr>Arial</vt:lpstr><vt:lpstr>Calibri</vt:lpstr><vt:lpstr>Office Theme</vt:lpstr><vt:lpstr>Bicycle Of the Mind</vt:lpstr><vt:lpstr>Why Mac?</vt:lpstr><vt:lpstr>Why Iphone?</vt:lpstr><vt:lpstr>JPG Logo</vt:lpstr><vt:lpstr>PNG Logo</vt:lpstr><vt:lpstr>GIF Logo</vt:lpstr><vt:lpstr>SVG Logo</vt:lpstr><vt:lpstr>Why Android?</vt:lpstr></vt:vector></TitlesOfParts><Company></Company><LinksUpToDate>false</LinksUpToDate><SharedDoc>false</SharedDoc><HyperlinksChanged>false</HyperlinksChanged><AppVersion>15.0000</AppVersion></Properties>