pdf-core 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f20557e9a614c10244d01e2b1ed78d4434cef6c
-  data.tar.gz: 8668979b6592e45d81d8274e8acd387642e5a3fb
+  metadata.gz: 50239bf1d5c19e31512ccee0e9d69a73734d022e
+  data.tar.gz: a3ca5e4b7607e24dc7bb6d5a9b9a9e8e80a0ef8d
 SHA512:
-  metadata.gz: 68d6e43d2579ff909d9cabc4a9d641648e9830685a2d2b76d24fe85046e48ea22fb7bbb4bf005d3442d4595b44b18dddd29dad37f99ecd32a3b9fa515490503e
-  data.tar.gz: f6f49f285719b0d72d3113bc465db2e588d52c2b1c096c7285cb56f43744a31122d4a0c8338ab88353b29555bb352d4c2cc662eac2c73164948dda3ca5c72933
+  metadata.gz: 6098bf18e958d0d6aa0a496a0ddaadef7925e2b94016511f99d62d94b5b6ac395fcc82c1d924a9b8e14ebd56bff8cc5c91805732c5cb1a9b5b1620a674df9036
+  data.tar.gz: 8c77d27a7da4cf581d7311030f5dc28b41447137dcfff66e1d3989a05d1354f9b237fcc6e46cead04ad9476f6cb984c505cefbe2d896769dd7a39d59a9a00145

data/lib/pdf/core/graphics_state.rb

@@ -63,11 +63,17 @@ module PDF
       end
 
       def dash_setting
+        return "[] 0 d" unless @dash[:dash]
+
         if @dash[:dash].kind_of?(Array)
-          "[#{@dash[:dash].join(' ')}] #{@dash[:phase]} d"
+          array = @dash[:dash]
         else
-          "[#{@dash[:dash]} #{@dash[:space]}] #{@dash[:phase]} d"
+          array = [@dash[:dash], @dash[:space]]
         end
+        
+        
+        "[#{PDF::Core.real_params(array)}] "+
+        "#{PDF::Core.real(@dash[:phase])} d"
       end
 
       private

data/lib/pdf/core/pdf_object.rb

@@ -12,6 +12,14 @@ module PDF
   module Core
     module_function
 
+    def real(num)
+      num.to_f.round(4)
+    end
+
+    def real_params(array)
+      array.map { |e| real(e) }.join(" ")
+    end
+
     def utf8_to_utf16(str)
       "\xFE\xFF".force_encoding(::Encoding::UTF_16BE) + str.encode(::Encoding::UTF_16BE)
     end
@@ -43,12 +51,10 @@ module PDF
       when TrueClass  then "true"
       when FalseClass then "false"
       when Numeric
-        if (str = String(obj)) =~ /e/i
-          # scientific notation is not supported in PDF
-          sprintf("%.16f", obj).gsub(/\.?0+\z/, "")
-        else
-          str
-        end
+        obj = real(obj) unless obj.kind_of?(Integer)
+
+        String(obj) # NOTE: this can fail on huge floating point numbers,
+                    # but it seems unlikely to ever happen in practice.
       when Array
         "[" << obj.map { |e| PdfObject(e, in_content_stream) }.join(' ') << "]"
       when PDF::Core::LiteralString

data/lib/pdf/core/renderer.rb

@@ -47,8 +47,9 @@ module PDF
       #
       #  # Raw line drawing example:
       #  x1,y1,x2,y2 = 100,500,300,550
-      #  pdf.add_content("%.3f %.3f m" % [ x1, y1 ])  # move
-      #  pdf.add_content("%.3f %.3f l" % [ x2, y2 ])  # draw path
+      #
+      #  pdf.add_content("#{PDF::Core.real_params([x1, y1])} m")   # move
+      #  pdf.add_content("#{PDF::Core.real_params([ x2, y2 ])} l") # draw path
       #  pdf.add_content("S") # stroke
       #
       def add_content(str)

data/lib/pdf/core/text.rb

@@ -204,9 +204,9 @@ module PDF
           yield
         else
           @character_spacing = amount
-          add_content "\n%.3f Tc" % amount
+          add_content "\n#{PDF::Core.real(amount)} Tc"
           yield
-          add_content "\n%.3f Tc" % original_character_spacing
+          add_content "\n#{PDF::Core.real(original_character_spacing)} Tc"
           @character_spacing = original_character_spacing
         end
       end
@@ -222,9 +222,10 @@ module PDF
           yield
         else
           @word_spacing = amount
-          add_content "\n%.3f Tw" % amount
+          add_content "\n#{PDF::Core.real(amount)} Tw"
           yield
-          add_content "\n%.3f Tw" % original_word_spacing
+          add_content "\n#{PDF::Core.real(original_word_spacing)} Tw"
+
           @word_spacing = original_word_spacing
         end
       end
@@ -237,7 +238,7 @@ module PDF
         if options[:rotate]
           rad = options[:rotate].to_f * Math::PI / 180
           arr = [ Math.cos(rad), Math.sin(rad), -Math.sin(rad), Math.cos(rad), x, y ]
-          add_content "%.3f %.3f %.3f %.3f %.3f %.3f Tm" % arr
+          add_content "#{PDF::Core.real_params(array)} Tm"
         else
           add_content "#{x} #{y} Td"
         end

data/spec/decimal_rounding_spec.rb

@@ -0,0 +1,12 @@
+# encoding: binary
+require_relative "spec_helper"
+
+describe "Decimal rounding" do
+  it "should round floating point numbers to four decimal places" do
+    PDF::Core.real(1.23456789).should == 1.2346
+  end
+
+  it "should be able to create a PDF parameter list of rounded decimals" do
+    PDF::Core.real_params([1,2.34567,Math::PI]).should == "1.0 2.3457 3.1416"
+  end
+end

data/spec/pdf_object_spec.rb

@@ -14,10 +14,10 @@ describe "PDF Object Serialization" do
   end
 
   it "should convert a Ruby number to PDF number" do
-    PDF::Core::PdfObject(1).should == "1"
-    PDF::Core::PdfObject(1.214112421).should == "1.214112421"
-    # scientific notation is not valid in PDF
-    PDF::Core::PdfObject(0.000005).should == "0.000005"
+    PDF::Core::PdfObject(42).should == "42"
+
+    # numbers are rounded to four decimal places
+    PDF::Core::PdfObject(1.214112421).should == "1.2141"
   end
 
   it "should convert a Ruby time object to a PDF timestamp" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pdf-core
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Gregory Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pdf-reader
@@ -122,6 +122,7 @@ files:
 - lib/pdf/core/stream.rb
 - lib/pdf/core/text.rb
 - pdf-core.gemspec
+- spec/decimal_rounding_spec.rb
 - spec/filters_spec.rb
 - spec/name_tree_spec.rb
 - spec/object_store_spec.rb