ydocx 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.7 / 04.05.2012
+
+* Updated chapter list style for fachinfo/patinfo
+* Fixed error at parse_image
+
 === 1.0.6 / 03.05.2012
 
 * Removed RMagick dependency (as optional feature)

data/lib/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Docx2html
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/ydocx/parser.rb

@@ -153,8 +153,8 @@ module YDocx
     def parse_image(r)
       if pict = r.xpath('w:pict') and
          shape = pict.xpath('v:shape') and
-         image = shape.xpath('v:imagedata')
-          id = image.first['id'] # r:id
+         image = shape.xpath('v:imagedata').first
+        if image and id = image['id'] # r:id
           @rel.xpath('/').children.each do |element|
             element.children.each do |rel|
               if rel['Id'] == id and rel['Target']
@@ -174,6 +174,7 @@ module YDocx
               end
             end
           end
+        end
       end
       nil
     end

data/lib/ydocx/templates/fachinfo.rb

@@ -74,7 +74,7 @@ module YDocx
             indices << markup(:li, link)
           end
         end
-        markup(:div, markup(:ul, indices), {:id => 'indecies'})
+        markup(:div, markup(:ol, indices), {:id => 'indecies'})
       end
     end
     def style
@@ -101,17 +101,17 @@ div#indecies {
   padding:  0px;
   margin:   0px;
   float:    left;
-  width:    200px;
+  width:    215px;
 }
-div#indecies ul {
+div#indecies ol {
   margin:  0;
-  padding: 25px 0 0 25px;
+  padding: 25px 0 0 40px;
 }
 div#container {
   position: relative;
-  padding:  5px 0 0 0;
+  padding:  5px;
   float:    top left;
-  margin:   0 0 0 200px;
+  margin:   0 0 0 215px;
 }
       CSS
       if @style == :frame
@@ -130,14 +130,14 @@ body{
 }
 div#indecies {
   position: absolute;
-  padding:  0;
+  padding:  0 0 0 5px;
   height:   100%;
   left:     0;
   top:      0;
 }
 div#container {
   position: absolute;
-  padding:  0;
+  padding:  0 20px 0 5px;
   height:   100%;
   overflow: auto;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydocx
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &16602400 !ruby/object:Gem::Requirement
+  requirement: &23032560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *16602400
+  version_requirements: *23032560
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &16601980 !ruby/object:Gem::Requirement
+  requirement: &23032140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *16601980
+  version_requirements: *23032140
 description: ''
 email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com