dyi 1.2.0 → 1.2.1

data/CHANGES

@@ -1,5 +1,11 @@
 = DYI Changelog
 
+== Version 1.2.1 / 2012-05-01
+* Bug Fixes
+  * A name of marker-option of LineChart is wrong.
+  * A create option name of Text is wrong.
+  * An operation of the link element.
+
 == Version 1.2.0 / 2012-04-02
 * Minor Enhancement
   * Marker support.

data/lib/dyi.rb

@@ -24,7 +24,7 @@
 module DYI
 
   # DYI program version
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   # URL of DYI Project
   # @since 0.0.2

data/lib/dyi/chart/line_chart.rb

@@ -31,7 +31,7 @@ module DYI
       CHART_TYPES = [:line, :area, :bar, :stackedbar]
 
       # @since 1.2.0
-      DEFAULT_MARKERS = [:circle, :square, :traiangle, :pentagon, :rhombus, :inverted_triangle]
+      DEFAULT_MARKERS = [:circle, :square, :triangle, :pentagon, :rhombus, :inverted_triangle]
 
       attr_reader :axis_back_canvas, :chart_back_canvas, :scale_canvas, :chart_front_canvas, :axis_front_canvas, :legend_canvas
       # @since 1.2.0

data/lib/dyi/drawing/pen.rb

@@ -469,7 +469,7 @@ module DYI
       #   text relative to _point_ argument. specifies one of the following
       #   vlaues: <tt>"start"</tt>, <tt>"middle"</tt>, <tt>"end"</tt>
       # @option options [Length] :text_length the length of the displayed text
-      # @option options [String] :text_adjust the way of adjustments to make the
+      # @option options [String] :length_adjust the way of adjustments to make the
       #   rendered length of the text match _text_length_ option. specifies one
       #   of the following vlaues: <tt>"spacing"</tt>, <tt>"spacingAndGlyphs"</tt>
       # @option options [String] :text_decoration the decorations that are
@@ -484,6 +484,10 @@ module DYI
       # @option options [Length] :border_rx the x-axis radius of the ellipse
       #   used to round off the corners of the rectangle when the rounded border
       #   is shown
+      # @option options [Length] :vertical_padding the interval of vertical
+      #   border line and text area
+      # @option options [Length] :horizontal_padding the interval of horizontal
+      #   border line and text area
       # @option options [Length] :border_ry the y-axis radius of the ellipse
       #   used to round off the corners of the rectangle when the rounded border
       #   is shown

data/lib/dyi/formatter/svg_formatter.rb

@@ -244,6 +244,7 @@ module DYI
 
       def write_text(shape, io)
         attrs = common_attributes(shape)
+        txt_attrs = {}
         if shape.attributes[:text_decoration]
           attrs[:"text-decoration"] = shape.attributes[:text_decoration]
         end
@@ -253,11 +254,11 @@ module DYI
         if shape.attributes[:writing_mode]
           attrs[:"writing-mode"] = shape.attributes[:writing_mode]
         end
-        if shape.attributes[:textLength]
-          attrs[:textLength] = shape.attributes[:textLength]
+        if shape.attributes[:text_length]
+          txt_attrs[:textLength] = shape.attributes[:text_length]
         end
-        if shape.attributes[:lengthAdjust]
-          attrs[:lengthAdjust] = shape.attributes[:lengthAdjust]
+        if shape.attributes[:length_adjust]
+          txt_attrs[:lengthAdjust] = shape.attributes[:length_adjust]
         end
 
         text = shape.formated_text
@@ -267,7 +268,7 @@ module DYI
             create_node(io, tag_name, attrs) {
               create_border_node(shape, io)
               line_number = 0
-              txt_attrs = {:x => shape.point.x, :y => shape.point.y}
+              txt_attrs.merge!(:x => shape.point.x, :y => shape.point.y)
               # FIXME: Implementation of baseline attribute are not suitable
               case shape.attributes[:alignment_baseline]
                 when 'top' then txt_attrs[:y] += shape.font_height * 0.85
@@ -289,6 +290,7 @@ module DYI
           if shape.anchor_href
             attrs[:'xlink:href'] = shape.anchor_href
             attrs[:target] = shape.anchor_target if shape.anchor_target
+            attrs[:'pointer-events'] = 'visiblePainted'
             create_text_group.call('a', attrs)
           else
             create_text_group.call('g', attrs)
@@ -302,11 +304,12 @@ module DYI
               when 'middle' then attrs[:y] += shape.font_height * 0.35
               when 'bottom' then attrs[:y] -= shape.font_height * 0.15
             end
-            create_leaf_node(io, 'text', text, attrs)
+            create_leaf_node(io, 'text', text, attrs.merge(txt_attrs))
           }
           if shape.anchor_href
             link_attrs = {:'xlink:href' => shape.anchor_href}
             link_attrs[:target] = shape.anchor_target if shape.anchor_target
+            link_attrs[:'pointer-events'] = 'visiblePainted'
             create_node(io, 'a', link_attrs) {
               create_text_group.call
             }
@@ -451,6 +454,7 @@ module DYI
         if shape.anchor_href
           link_attrs = {:'xlink:href' => shape.anchor_href}
           link_attrs[:target] = shape.anchor_target if shape.anchor_target
+          link_attrs[:'pointer-events'] = 'visiblePainted'
           create_node(io, 'a', link_attrs) {
              write_shape_node(shape, io, attrs, tag_name, &create_child_node)
           }

data/lib/dyi/length.rb

@@ -336,7 +336,7 @@ module DYI
     def to_s(format=nil)
       fmts = (format || @@default_format).split('\\\\')
       fmts = fmts.map do |fmt|
-        fmt.gsub(/(?!\\U)(.|\G)U/, '\\1' + @unit.to_s).gsub(/(?!\\u)(.|\G)u/, '\\1' + unit)
+        fmt.gsub(/(?!\\U)(.|\G)U/, '\\1' + (@unit == '%' ? '\\%' : @unit.to_s)).gsub(/(?!\\u)(.|\G)u/, '\\1' + (@unit == '%' ? '\\%' : unit))
       end
       @value.strfnum(fmts.join('\\\\'))
     end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dyi
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors: 
 - Mamoru Yuo
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 +09:00
-default_executable: 
+date: 2012-05-01 00:00:00 Z
 dependencies: []
 
 description: "    DYI is a 2D graphics library, very rich and expressive.\n    DYI have been optimized for SVG format, but it is also possible\n    to output other format; for example, EPS.\n"
@@ -28,70 +22,69 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/ironruby.rb
+- CHANGES
+- COPYING
+- examples/animation.rb
+- examples/class_diagram.rb
+- examples/css.rb
+- examples/data/03311056.xlsx
+- examples/data/currency.xlsx
+- examples/data/money.csv
+- examples/line_and_bar.rb
+- examples/line_chart.rb
+- examples/logo.rb
+- examples/pie_chart.rb
+- examples/simple_shapes.rb
+- lib/dyi/animation.rb
 - lib/dyi/canvas.rb
+- lib/dyi/chart/array_reader.rb
+- lib/dyi/chart/axis_util.rb
+- lib/dyi/chart/base.rb
+- lib/dyi/chart/csv_reader.rb
+- lib/dyi/chart/excel_reader.rb
+- lib/dyi/chart/legend.rb
+- lib/dyi/chart/line_chart.rb
+- lib/dyi/chart/pie_chart.rb
+- lib/dyi/chart/table.rb
 - lib/dyi/chart.rb
-- lib/dyi/stylesheet.rb
-- lib/dyi/event.rb
+- lib/dyi/color.rb
+- lib/dyi/coordinate.rb
 - lib/dyi/drawing/clipping.rb
-- lib/dyi/drawing/filter.rb
 - lib/dyi/drawing/color_effect.rb
-- lib/dyi/drawing/pen_3d.rb
+- lib/dyi/drawing/filter.rb
 - lib/dyi/drawing/pen.rb
-- lib/dyi/script/simple_script.rb
-- lib/dyi/script/ecmascript.rb
-- lib/dyi/color.rb
+- lib/dyi/drawing/pen_3d.rb
+- lib/dyi/drawing.rb
 - lib/dyi/element.rb
-- lib/dyi/shape/base.rb
-- lib/dyi/shape/marker.rb
-- lib/dyi/shape/path.rb
+- lib/dyi/event.rb
+- lib/dyi/font.rb
+- lib/dyi/formatter/base.rb
 - lib/dyi/formatter/emf_formatter.rb
+- lib/dyi/formatter/eps_formatter.rb
+- lib/dyi/formatter/svg_formatter.rb
 - lib/dyi/formatter/svg_reader.rb
 - lib/dyi/formatter/xaml_formatter.rb
-- lib/dyi/formatter/base.rb
-- lib/dyi/formatter/svg_formatter.rb
-- lib/dyi/formatter/eps_formatter.rb
-- lib/dyi/script.rb
-- lib/dyi/drawing.rb
-- lib/dyi/animation.rb
+- lib/dyi/formatter.rb
+- lib/dyi/length.rb
 - lib/dyi/matrix.rb
-- lib/dyi/coordinate.rb
-- lib/dyi/chart/array_reader.rb
-- lib/dyi/chart/csv_reader.rb
-- lib/dyi/chart/table.rb
-- lib/dyi/chart/line_chart.rb
-- lib/dyi/chart/pie_chart.rb
-- lib/dyi/chart/legend.rb
-- lib/dyi/chart/base.rb
-- lib/dyi/chart/axis_util.rb
-- lib/dyi/chart/excel_reader.rb
-- lib/dyi/shape.rb
-- lib/dyi/util.rb
 - lib/dyi/painting.rb
-- lib/dyi/type.rb
-- lib/dyi/length.rb
-- lib/dyi/font.rb
-- lib/dyi/formatter.rb
+- lib/dyi/script/ecmascript.rb
+- lib/dyi/script/simple_script.rb
+- lib/dyi/script.rb
+- lib/dyi/shape/base.rb
+- lib/dyi/shape/marker.rb
+- lib/dyi/shape/path.rb
+- lib/dyi/shape.rb
+- lib/dyi/stylesheet.rb
 - lib/dyi/svg_element.rb
+- lib/dyi/type.rb
+- lib/dyi/util.rb
 - lib/dyi.rb
+- lib/ironruby.rb
 - lib/util.rb
-- CHANGES
+- README
 - test/path_command_test.rb
 - test/test_length.rb
-- examples/class_diagram.rb
-- examples/line_and_bar.rb
-- examples/line_chart.rb
-- examples/data/money.csv
-- examples/data/currency.xlsx
-- examples/data/03311056.xlsx
-- examples/simple_shapes.rb
-- examples/pie_chart.rb
-- examples/animation.rb
-- examples/css.rb
-- examples/logo.rb
-- README
-- COPYING
-has_rdoc: true
 homepage: https://sourceforge.net/projects/dyi/
 licenses: 
 - GPL-3
@@ -105,25 +98,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: 2D graphics library