rubyvis 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/History.txt +6 -1
- data/Manifest.txt +421 -1
- data/README.txt +12 -10
- data/examples/first.rb +2 -2
- data/examples/second.rb +6 -3
- data/lib/rubyvis.rb +18 -3
- data/lib/rubyvis/mark.rb +101 -83
- data/lib/rubyvis/mark/anchor.rb +5 -7
- data/lib/rubyvis/mark/area.rb +19 -17
- data/lib/rubyvis/mark/bar.rb +3 -10
- data/lib/rubyvis/mark/label.rb +3 -4
- data/lib/rubyvis/mark/line.rb +20 -4
- data/lib/rubyvis/mark/panel.rb +31 -6
- data/lib/rubyvis/mark/rule.rb +8 -4
- data/lib/rubyvis/property.rb +11 -0
- data/lib/rubyvis/scene/svg_label.rb +1 -1
- data/lib/rubyvis/scene/svg_scene.rb +2 -1
- data/lib/rubyvis/sceneelement.rb +2 -0
- data/spec/bar_spec.rb +50 -0
- data/spec/label_spec.rb +41 -0
- data/spec/mark_spec.rb +16 -0
- data/spec/panel_spec.rb +22 -4
- data/spec/spec_helper.rb +1 -0
- data/vendor/FUTURE +62 -0
- data/vendor/Makefile +138 -0
- data/vendor/TODO +22 -0
- data/vendor/examples/antibiotics/antibiotics-scatter.html +113 -0
- data/vendor/examples/antibiotics/antibiotics.html +140 -0
- data/vendor/examples/antibiotics/antibiotics.js +20 -0
- data/vendor/examples/barley/barley.html +102 -0
- data/vendor/examples/barley/barley.js +122 -0
- data/vendor/examples/cars/cars.html +90 -0
- data/vendor/examples/cars/cars.js +408 -0
- data/vendor/examples/clock/clock.html +91 -0
- data/vendor/examples/crimea/crimea-grouped-bar.html +65 -0
- data/vendor/examples/crimea/crimea-line.html +61 -0
- data/vendor/examples/crimea/crimea-stacked-area.html +61 -0
- data/vendor/examples/crimea/crimea-stacked-bar.html +60 -0
- data/vendor/examples/crimea/crimea.html +100 -0
- data/vendor/examples/crimea/crimea.js +33 -0
- data/vendor/examples/downloadify/LICENSE.txt +22 -0
- data/vendor/examples/downloadify/download.png +0 -0
- data/vendor/examples/downloadify/downloadify.html +57 -0
- data/vendor/examples/downloadify/downloadify.min.js +3 -0
- data/vendor/examples/downloadify/downloadify.swf +0 -0
- data/vendor/examples/downloadify/swfobject.js +4 -0
- data/vendor/examples/ex.css +17 -0
- data/vendor/examples/eyes/eyes.html +53 -0
- data/vendor/examples/eyes/matrix.html +44 -0
- data/vendor/examples/flowers/flowers.html +109 -0
- data/vendor/examples/flowers/flowers.js +154 -0
- data/vendor/examples/group-stack/group-stack.html +79 -0
- data/vendor/examples/group-stack/headcount.js +23 -0
- data/vendor/examples/hotel/hotel.html +76 -0
- data/vendor/examples/hotel/hotel.js +245 -0
- data/vendor/examples/jobs/jobs.html +71 -0
- data/vendor/examples/jobs/jobs.js +1024 -0
- data/vendor/examples/jquery-1.4.2.min.js +154 -0
- data/vendor/examples/nba/nba.html +83 -0
- data/vendor/examples/nba/nba.js +53 -0
- data/vendor/examples/nba/nba2.html +82 -0
- data/vendor/examples/sankey/gdp2009.js +184 -0
- data/vendor/examples/sankey/sankey.html +77 -0
- data/vendor/examples/slider/cell.html +112 -0
- data/vendor/examples/slider/cell.js +31 -0
- data/vendor/examples/slider/horizon.html +85 -0
- data/vendor/examples/slider/jquery-ui-1.8rc3.custom.min.js +71 -0
- data/vendor/examples/slider/slider.html +50 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_flat_10_000000_40x100.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png +0 -0
- data/vendor/examples/slider/ui-lightness/images/ui-icons_222222_256x240.png +2 -0
- data/vendor/examples/slider/ui-lightness/images/ui-icons_228ef1_256x240.png +2 -0
- data/vendor/examples/slider/ui-lightness/images/ui-icons_ef8c08_256x240.png +2 -0
- data/vendor/examples/slider/ui-lightness/images/ui-icons_ffd27a_256x240.png +2 -0
- data/vendor/examples/slider/ui-lightness/images/ui-icons_ffffff_256x240.png +2 -0
- data/vendor/examples/slider/ui-lightness/jquery-ui-1.8rc3.custom.css +302 -0
- data/vendor/examples/tipsy/jquery.tipsy.js +198 -0
- data/vendor/examples/tipsy/tipsy-bar.html +65 -0
- data/vendor/examples/tipsy/tipsy-line.html +67 -0
- data/vendor/examples/tipsy/tipsy.css +12 -0
- data/vendor/examples/tipsy/tipsy.gif +0 -0
- data/vendor/examples/tipsy/tipsy.js +66 -0
- data/vendor/examples/weather/weather.html +86 -0
- data/vendor/examples/weather/weather.js +42 -0
- data/vendor/examples/wheat/wheat.html +130 -0
- data/vendor/examples/wheat/wheat.js +70 -0
- data/vendor/lib/google-compiler/COPYING +202 -0
- data/vendor/lib/google-compiler/README +224 -0
- data/vendor/lib/google-compiler/compiler-20100201.jar +0 -0
- data/vendor/protovis-d3.3.js +15726 -0
- data/vendor/protovis-r3.3.js +287 -0
- data/vendor/src/behavior/Behavior.js +32 -0
- data/vendor/src/behavior/Drag.js +112 -0
- data/vendor/src/behavior/Pan.js +110 -0
- data/vendor/src/behavior/Point.js +157 -0
- data/vendor/src/behavior/Resize.js +104 -0
- data/vendor/src/behavior/Select.js +100 -0
- data/vendor/src/behavior/Zoom.js +85 -0
- data/vendor/src/color/Color.js +598 -0
- data/vendor/src/color/Colors.js +135 -0
- data/vendor/src/color/Ramp.js +17 -0
- data/vendor/src/data/Arrays.js +277 -0
- data/vendor/src/data/Dom.js +380 -0
- data/vendor/src/data/Flatten.js +146 -0
- data/vendor/src/data/Histogram.js +120 -0
- data/vendor/src/data/LinearScale.js +54 -0
- data/vendor/src/data/LogScale.js +142 -0
- data/vendor/src/data/Nest.js +257 -0
- data/vendor/src/data/Numbers.js +313 -0
- data/vendor/src/data/Objects.js +78 -0
- data/vendor/src/data/OrdinalScale.js +267 -0
- data/vendor/src/data/QuantileScale.js +180 -0
- data/vendor/src/data/QuantitativeScale.js +440 -0
- data/vendor/src/data/RootScale.js +55 -0
- data/vendor/src/data/Scale.js +86 -0
- data/vendor/src/data/Transform.js +109 -0
- data/vendor/src/data/Tree.js +124 -0
- data/vendor/src/data/Vector.js +118 -0
- data/vendor/src/geo/Geo.js +5 -0
- data/vendor/src/geo/GeoScale.js +307 -0
- data/vendor/src/geo/LatLng.js +23 -0
- data/vendor/src/geo/Projection.js +43 -0
- data/vendor/src/geo/Projections.js +117 -0
- data/vendor/src/lang/Array.js +112 -0
- data/vendor/src/lang/init.js +26 -0
- data/vendor/src/layout/Arc.js +178 -0
- data/vendor/src/layout/Bullet.js +164 -0
- data/vendor/src/layout/Cluster.js +205 -0
- data/vendor/src/layout/Force.js +309 -0
- data/vendor/src/layout/Grid.js +119 -0
- data/vendor/src/layout/Hierarchy.js +249 -0
- data/vendor/src/layout/Horizon.js +159 -0
- data/vendor/src/layout/Indent.js +83 -0
- data/vendor/src/layout/Layout.js +56 -0
- data/vendor/src/layout/Matrix.js +177 -0
- data/vendor/src/layout/Network.js +302 -0
- data/vendor/src/layout/Pack.js +323 -0
- data/vendor/src/layout/Partition.js +203 -0
- data/vendor/src/layout/Rollup.js +203 -0
- data/vendor/src/layout/Stack.js +391 -0
- data/vendor/src/layout/Tree.js +282 -0
- data/vendor/src/layout/Treemap.js +347 -0
- data/vendor/src/mark/Anchor.js +81 -0
- data/vendor/src/mark/Area.js +268 -0
- data/vendor/src/mark/Bar.js +93 -0
- data/vendor/src/mark/Dot.js +212 -0
- data/vendor/src/mark/Ease.js +150 -0
- data/vendor/src/mark/Image.js +154 -0
- data/vendor/src/mark/Label.js +155 -0
- data/vendor/src/mark/Line.js +195 -0
- data/vendor/src/mark/Mark.js +1237 -0
- data/vendor/src/mark/Panel.js +273 -0
- data/vendor/src/mark/Rule.js +143 -0
- data/vendor/src/mark/Transient.js +7 -0
- data/vendor/src/mark/Transition.js +195 -0
- data/vendor/src/mark/Wedge.js +244 -0
- data/vendor/src/physics/BoundConstraint.js +75 -0
- data/vendor/src/physics/ChargeForce.js +184 -0
- data/vendor/src/physics/CollisionConstraint.js +113 -0
- data/vendor/src/physics/Constraint.js +26 -0
- data/vendor/src/physics/DragForce.js +49 -0
- data/vendor/src/physics/Force.js +25 -0
- data/vendor/src/physics/Particle.js +81 -0
- data/vendor/src/physics/PositionConstraint.js +72 -0
- data/vendor/src/physics/Quadtree.js +195 -0
- data/vendor/src/physics/Simulation.js +159 -0
- data/vendor/src/physics/SpringForce.js +141 -0
- data/vendor/src/pv-internals.js +154 -0
- data/vendor/src/pv.js +95 -0
- data/vendor/src/scene/SvgArea.js +172 -0
- data/vendor/src/scene/SvgBar.js +28 -0
- data/vendor/src/scene/SvgCurve.js +354 -0
- data/vendor/src/scene/SvgDot.js +81 -0
- data/vendor/src/scene/SvgImage.js +45 -0
- data/vendor/src/scene/SvgLabel.js +46 -0
- data/vendor/src/scene/SvgLine.js +159 -0
- data/vendor/src/scene/SvgPanel.js +126 -0
- data/vendor/src/scene/SvgRule.js +26 -0
- data/vendor/src/scene/SvgScene.js +185 -0
- data/vendor/src/scene/SvgWedge.js +66 -0
- data/vendor/src/text/DateFormat.js +262 -0
- data/vendor/src/text/Format.js +78 -0
- data/vendor/src/text/NumberFormat.js +227 -0
- data/vendor/src/text/TimeFormat.js +115 -0
- data/vendor/test1.html +30 -0
- data/vendor/tests/behavior/drag-events.html +47 -0
- data/vendor/tests/behavior/drag.html +32 -0
- data/vendor/tests/behavior/drag2.html +33 -0
- data/vendor/tests/behavior/point-area-stacked.html +73 -0
- data/vendor/tests/behavior/point-area-stacked2.html +70 -0
- data/vendor/tests/behavior/point-area.html +67 -0
- data/vendor/tests/behavior/point-bar.html +62 -0
- data/vendor/tests/behavior/point-dot.html +60 -0
- data/vendor/tests/behavior/point-line.html +62 -0
- data/vendor/tests/behavior/point-lines-grid.html +65 -0
- data/vendor/tests/behavior/point-lines.html +61 -0
- data/vendor/tests/behavior/point-wedge.html +43 -0
- data/vendor/tests/behavior/resize.html +69 -0
- data/vendor/tests/behavior/select.html +37 -0
- data/vendor/tests/bzr.js +62 -0
- data/vendor/tests/center.js +13 -0
- data/vendor/tests/data/deviation.html +54 -0
- data/vendor/tests/data/histogram-discrete.html +50 -0
- data/vendor/tests/data/histogram.html +56 -0
- data/vendor/tests/data/log-adjusted.html +48 -0
- data/vendor/tests/data/log-ceil.html +48 -0
- data/vendor/tests/data/log-floor.html +48 -0
- data/vendor/tests/data/log-symmetric.html +48 -0
- data/vendor/tests/data/log.html +48 -0
- data/vendor/tests/data/max-index.html +36 -0
- data/vendor/tests/data/max.html +36 -0
- data/vendor/tests/data/min-index.html +36 -0
- data/vendor/tests/data/min.html +36 -0
- data/vendor/tests/data/ordinal-split-banded.html +45 -0
- data/vendor/tests/data/ordinal-split-banded2.html +45 -0
- data/vendor/tests/data/ordinal-split-flush.html +51 -0
- data/vendor/tests/data/ordinal-split.html +51 -0
- data/vendor/tests/data/range.html +105 -0
- data/vendor/tests/data/scale-date.html +46 -0
- data/vendor/tests/data/scale-date2.html +38 -0
- data/vendor/tests/data/scale-date3.html +38 -0
- data/vendor/tests/data/scale-date4.html +38 -0
- data/vendor/tests/data/scale-degenerate.html +143 -0
- data/vendor/tests/data/scale-linear.html +59 -0
- data/vendor/tests/data/scale-log.html +60 -0
- data/vendor/tests/data/scale-log2.html +60 -0
- data/vendor/tests/data/scale-log3.html +60 -0
- data/vendor/tests/data/scale-log4.html +60 -0
- data/vendor/tests/data/scale-log5.html +60 -0
- data/vendor/tests/data/scale-log6.html +60 -0
- data/vendor/tests/data/scale-quantile.html +47 -0
- data/vendor/tests/data/scale-quantile2.html +50 -0
- data/vendor/tests/data/scale-quantile3.html +48 -0
- data/vendor/tests/data/scale-root.html +60 -0
- data/vendor/tests/data/scale-root2.html +39 -0
- data/vendor/tests/data/scale-tick-format.html +54 -0
- data/vendor/tests/data/scale-ticks.html +45 -0
- data/vendor/tests/data/sum.html +42 -0
- data/vendor/tests/data/variance.html +42 -0
- data/vendor/tests/diamond.js +40 -0
- data/vendor/tests/flare-imports.js +222 -0
- data/vendor/tests/flare.js +284 -0
- data/vendor/tests/geo/countries-hires.js +257 -0
- data/vendor/tests/geo/countries-lores.js +197 -0
- data/vendor/tests/geo/population.js +250 -0
- data/vendor/tests/geo/scale-aitoff.html +58 -0
- data/vendor/tests/geo/scale-gall-peters.html +56 -0
- data/vendor/tests/geo/scale-hammer.html +58 -0
- data/vendor/tests/geo/scale-identity.html +56 -0
- data/vendor/tests/geo/scale-mercator.html +56 -0
- data/vendor/tests/geo/scale-sinusoidal.html +57 -0
- data/vendor/tests/geo/scale-smart-domain.html +58 -0
- data/vendor/tests/geo/scale.html +55 -0
- data/vendor/tests/geo/scale2.html +40 -0
- data/vendor/tests/geo/us-states.js +61 -0
- data/vendor/tests/heatmap.js +63 -0
- data/vendor/tests/lang/globals.html +41 -0
- data/vendor/tests/lang/init.html +31 -0
- data/vendor/tests/layers.js +28 -0
- data/vendor/tests/layout/arc-directed.html +33 -0
- data/vendor/tests/layout/arc-radial.html +36 -0
- data/vendor/tests/layout/arc-undirected.html +32 -0
- data/vendor/tests/layout/arc.html +33 -0
- data/vendor/tests/layout/arc2.html +32 -0
- data/vendor/tests/layout/bullet-multiples.html +60 -0
- data/vendor/tests/layout/bullet.html +45 -0
- data/vendor/tests/layout/bullets.js +37 -0
- data/vendor/tests/layout/cluster-fill-group.html +24 -0
- data/vendor/tests/layout/cluster-fill.html +28 -0
- data/vendor/tests/layout/cluster-partition-radial-fill.html +43 -0
- data/vendor/tests/layout/cluster-radial-fill-radius.html +26 -0
- data/vendor/tests/layout/cluster-radial-fill.html +29 -0
- data/vendor/tests/layout/cluster-radial-group-fill.html +30 -0
- data/vendor/tests/layout/cluster-radial-radius.html +30 -0
- data/vendor/tests/layout/cluster-radial.html +28 -0
- data/vendor/tests/layout/cluster-radial2.html +33 -0
- data/vendor/tests/layout/cluster.html +34 -0
- data/vendor/tests/layout/cluster2.html +32 -0
- data/vendor/tests/layout/force-toggle.html +46 -0
- data/vendor/tests/layout/force.html +45 -0
- data/vendor/tests/layout/force2.html +58 -0
- data/vendor/tests/layout/force3.html +41 -0
- data/vendor/tests/layout/force4.html +45 -0
- data/vendor/tests/layout/force5.html +53 -0
- data/vendor/tests/layout/grid-cols.html +31 -0
- data/vendor/tests/layout/grid-heatmap.html +25 -0
- data/vendor/tests/layout/grid-rows.html +31 -0
- data/vendor/tests/layout/grid.html +34 -0
- data/vendor/tests/layout/horizon-color.html +31 -0
- data/vendor/tests/layout/horizon.html +31 -0
- data/vendor/tests/layout/indent-toggle.html +62 -0
- data/vendor/tests/layout/indent.html +25 -0
- data/vendor/tests/layout/indent2.html +33 -0
- data/vendor/tests/layout/matrix-sort.html +28 -0
- data/vendor/tests/layout/matrix.html +35 -0
- data/vendor/tests/layout/network.html +43 -0
- data/vendor/tests/layout/pack-bubble.html +45 -0
- data/vendor/tests/layout/pack.html +26 -0
- data/vendor/tests/layout/pack2.html +32 -0
- data/vendor/tests/layout/partition-fill.html +27 -0
- data/vendor/tests/layout/partition-fill2.html +22 -0
- data/vendor/tests/layout/partition-fill3.html +27 -0
- data/vendor/tests/layout/partition-radial-fill-radius.html +25 -0
- data/vendor/tests/layout/partition-radial-fill.html +26 -0
- data/vendor/tests/layout/partition-radial-fill2.html +23 -0
- data/vendor/tests/layout/partition-radial-fill3.html +29 -0
- data/vendor/tests/layout/partition-radial-radius.html +29 -0
- data/vendor/tests/layout/partition-radial.html +30 -0
- data/vendor/tests/layout/partition-radial2.html +33 -0
- data/vendor/tests/layout/partition.html +33 -0
- data/vendor/tests/layout/partition2.html +32 -0
- data/vendor/tests/layout/rollup.html +50 -0
- data/vendor/tests/layout/stack-empty.html +27 -0
- data/vendor/tests/layout/stack-expand.html +41 -0
- data/vendor/tests/layout/stack-reverse.html +42 -0
- data/vendor/tests/layout/stack-right.html +42 -0
- data/vendor/tests/layout/stack-rule.html +61 -0
- data/vendor/tests/layout/stack-visible.html +43 -0
- data/vendor/tests/layout/stack.html +53 -0
- data/vendor/tests/layout/tree-radial.html +31 -0
- data/vendor/tests/layout/tree-radial2.html +34 -0
- data/vendor/tests/layout/tree-toggle.html +36 -0
- data/vendor/tests/layout/tree.html +31 -0
- data/vendor/tests/layout/tree2.html +35 -0
- data/vendor/tests/layout/treemap-hierarchy.html +40 -0
- data/vendor/tests/layout/treemap-margin.html +26 -0
- data/vendor/tests/layout/treemap-round.html +40 -0
- data/vendor/tests/layout/treemap-slice.html +34 -0
- data/vendor/tests/layout/treemap.html +37 -0
- data/vendor/tests/life.js +212 -0
- data/vendor/tests/mark/anchor.html +25 -0
- data/vendor/tests/mark/area-anchor-chain.html +42 -0
- data/vendor/tests/mark/area-anchor-line.html +57 -0
- data/vendor/tests/mark/area-anchor-stack.html +35 -0
- data/vendor/tests/mark/area-anchor.html +43 -0
- data/vendor/tests/mark/area-anchor2.html +33 -0
- data/vendor/tests/mark/area-cardinal.html +57 -0
- data/vendor/tests/mark/area-monotone.html +57 -0
- data/vendor/tests/mark/area-segmented-basis.html +30 -0
- data/vendor/tests/mark/area-segmented-cardinal.html +30 -0
- data/vendor/tests/mark/area-segmented-monotone.html +30 -0
- data/vendor/tests/mark/area-segmented-step.html +44 -0
- data/vendor/tests/mark/area-segmented.html +29 -0
- data/vendor/tests/mark/area-stacked-cardinal.html +54 -0
- data/vendor/tests/mark/area-stacked-monotone.html +54 -0
- data/vendor/tests/mark/area-stacked.html +53 -0
- data/vendor/tests/mark/area-step.html +43 -0
- data/vendor/tests/mark/area-zero.html +32 -0
- data/vendor/tests/mark/area.html +57 -0
- data/vendor/tests/mark/bar-anchor-stack.html +51 -0
- data/vendor/tests/mark/bar-anchor.html +44 -0
- data/vendor/tests/mark/bar-column-grouped.html +63 -0
- data/vendor/tests/mark/bar-column-stacked.html +56 -0
- data/vendor/tests/mark/bar-column.html +54 -0
- data/vendor/tests/mark/bar-grouped.html +63 -0
- data/vendor/tests/mark/bar-stacked.html +57 -0
- data/vendor/tests/mark/bar.html +54 -0
- data/vendor/tests/mark/cursor.html +41 -0
- data/vendor/tests/mark/def-type.html +23 -0
- data/vendor/tests/mark/dot-anchor.html +33 -0
- data/vendor/tests/mark/dot-radius.html +22 -0
- data/vendor/tests/mark/dot-stroke.html +43 -0
- data/vendor/tests/mark/dot.html +52 -0
- data/vendor/tests/mark/dot2.html +61 -0
- data/vendor/tests/mark/ease.html +90 -0
- data/vendor/tests/mark/event-dblclick.html +30 -0
- data/vendor/tests/mark/event-prototype.html +45 -0
- data/vendor/tests/mark/event-render.html +45 -0
- data/vendor/tests/mark/event.html +24 -0
- data/vendor/tests/mark/image-color-inherit.html +33 -0
- data/vendor/tests/mark/image-color.html +35 -0
- data/vendor/tests/mark/image-color2.html +35 -0
- data/vendor/tests/mark/image-heatmap.html +29 -0
- data/vendor/tests/mark/image.html +32 -0
- data/vendor/tests/mark/label-break.html +54 -0
- data/vendor/tests/mark/label-decoration.html +22 -0
- data/vendor/tests/mark/label-events.html +32 -0
- data/vendor/tests/mark/line-anchor.html +42 -0
- data/vendor/tests/mark/line-basis.html +54 -0
- data/vendor/tests/mark/line-brownian.html +57 -0
- data/vendor/tests/mark/line-cardinal.html +77 -0
- data/vendor/tests/mark/line-catmull-rom.html +78 -0
- data/vendor/tests/mark/line-curve.html +65 -0
- data/vendor/tests/mark/line-eccentricity.html +39 -0
- data/vendor/tests/mark/line-fill.html +24 -0
- data/vendor/tests/mark/line-join.html +51 -0
- data/vendor/tests/mark/line-monotone-non-monotone.html +53 -0
- data/vendor/tests/mark/line-monotone-two-way.html +61 -0
- data/vendor/tests/mark/line-monotone.html +53 -0
- data/vendor/tests/mark/line-polar.html +36 -0
- data/vendor/tests/mark/line-segmented-basis.html +57 -0
- data/vendor/tests/mark/line-segmented-cardinal.html +80 -0
- data/vendor/tests/mark/line-segmented-join.html +52 -0
- data/vendor/tests/mark/line-segmented-monotone.html +56 -0
- data/vendor/tests/mark/line-segmented-polar.html +30 -0
- data/vendor/tests/mark/line-segmented-step.html +41 -0
- data/vendor/tests/mark/line-segmented-step2.html +32 -0
- data/vendor/tests/mark/line-segmented.html +30 -0
- data/vendor/tests/mark/line-step.html +39 -0
- data/vendor/tests/mark/line-tension.html +59 -0
- data/vendor/tests/mark/line.html +51 -0
- data/vendor/tests/mark/panel-anchor.html +37 -0
- data/vendor/tests/mark/panel-anchor2.html +31 -0
- data/vendor/tests/mark/panel-anchor3.html +22 -0
- data/vendor/tests/mark/panel-anchor4.html +28 -0
- data/vendor/tests/mark/panel-anchor5.html +28 -0
- data/vendor/tests/mark/panel-append.html +29 -0
- data/vendor/tests/mark/panel-canvas.html +107 -0
- data/vendor/tests/mark/panel-fill.html +50 -0
- data/vendor/tests/mark/panel-mouse.html +53 -0
- data/vendor/tests/mark/panel-transform.html +67 -0
- data/vendor/tests/mark/property-cast.html +24 -0
- data/vendor/tests/mark/render-partial.html +42 -0
- data/vendor/tests/mark/rule-anchor.html +29 -0
- data/vendor/tests/mark/title.html +41 -0
- data/vendor/tests/mark/transition-anchor.html +47 -0
- data/vendor/tests/mark/transition-wedge.html +47 -0
- data/vendor/tests/mark/transition.html +106 -0
- data/vendor/tests/mark/wedge-donut.html +35 -0
- data/vendor/tests/mark/wedge-implied.html +42 -0
- data/vendor/tests/mark/wedge-pie.html +37 -0
- data/vendor/tests/mark/wedge-ring.html +27 -0
- data/vendor/tests/miserables.js +348 -0
- data/vendor/tests/physics/dorling.html +70 -0
- data/vendor/tests/physics/simulation.html +56 -0
- data/vendor/tests/social.js +28 -0
- data/vendor/tests/stanford.png +0 -0
- data/vendor/tests/style.css +5 -0
- data/vendor/tests/testify.css +29 -0
- data/vendor/tests/testify.js +16 -0
- data/vendor/tests/text/format-number.html +75 -0
- data/web/first.svg +1 -0
- data/web/index.html +48 -0
- metadata +434 -31
- data.tar.gz.sig +0 -0
- metadata.gz.sig +0 -2
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Panel Transform</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
</head>
|
|
6
|
+
<body>
|
|
7
|
+
<script type="text/javascript+protovis">
|
|
8
|
+
|
|
9
|
+
var w = 800,
|
|
10
|
+
h = 800,
|
|
11
|
+
t = pv.Transform.identity, // the inverted transform
|
|
12
|
+
x = pv.Scale.linear(0, w).range(0, w),
|
|
13
|
+
y = pv.Scale.linear(0, h).range(0, h);
|
|
14
|
+
|
|
15
|
+
var vis = new pv.Panel()
|
|
16
|
+
.width(w)
|
|
17
|
+
.height(h)
|
|
18
|
+
.top(30)
|
|
19
|
+
.left(40)
|
|
20
|
+
.right(20)
|
|
21
|
+
.bottom(20)
|
|
22
|
+
.strokeStyle("#ccc");
|
|
23
|
+
|
|
24
|
+
vis.add(pv.Rule)
|
|
25
|
+
.data(function() x.domain(t.x, w * t.k + t.x).ticks())
|
|
26
|
+
.strokeStyle("#ccc")
|
|
27
|
+
.left(x)
|
|
28
|
+
.anchor("bottom").add(pv.Label);
|
|
29
|
+
|
|
30
|
+
vis.add(pv.Rule)
|
|
31
|
+
.data(function() y.domain(t.y, h * t.k + t.y).ticks())
|
|
32
|
+
.strokeStyle("#ccc")
|
|
33
|
+
.top(y)
|
|
34
|
+
.anchor("left").add(pv.Label);
|
|
35
|
+
|
|
36
|
+
var view = vis.add(pv.Panel)
|
|
37
|
+
.overflow("hidden")
|
|
38
|
+
.events("all")
|
|
39
|
+
.event("mousedown", pv.Behavior.pan().bound(true))
|
|
40
|
+
.event("mousewheel", pv.Behavior.zoom().bound(true));
|
|
41
|
+
|
|
42
|
+
view.add(pv.Dot)
|
|
43
|
+
.data(pv.range(100).map(function() ({x:Math.random(), y:Math.random()})))
|
|
44
|
+
.left(function(d) d.x * w)
|
|
45
|
+
.top(function(d) d.y * h)
|
|
46
|
+
.fillStyle(pv.rgb(255, 255, 255, .5))
|
|
47
|
+
.shapeRadius(function() 5 / this.scale);
|
|
48
|
+
|
|
49
|
+
/* Hack! Need a way get the transform as it is set. */
|
|
50
|
+
view.transform = function() {
|
|
51
|
+
var f = view.transform;
|
|
52
|
+
return function(v) {
|
|
53
|
+
if (v) t = v.invert();
|
|
54
|
+
return f.apply(this, arguments);
|
|
55
|
+
};
|
|
56
|
+
}();
|
|
57
|
+
|
|
58
|
+
/* Hack! Need a way to control which panel gets rendered with pan & zoom! */
|
|
59
|
+
view.render = function() {
|
|
60
|
+
vis.render();
|
|
61
|
+
};
|
|
62
|
+
|
|
63
|
+
vis.render();
|
|
64
|
+
|
|
65
|
+
</script>
|
|
66
|
+
</body>
|
|
67
|
+
</html>
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Property</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
</head>
|
|
6
|
+
<body>
|
|
7
|
+
<script type="text/javascript+protovis">
|
|
8
|
+
|
|
9
|
+
var vis = new pv.Panel()
|
|
10
|
+
.width(200)
|
|
11
|
+
.height(200)
|
|
12
|
+
.top(10)
|
|
13
|
+
.bottom(10)
|
|
14
|
+
.left(10)
|
|
15
|
+
.right(10)
|
|
16
|
+
.lineWidth(10)
|
|
17
|
+
.strokeStyle("#ccc")
|
|
18
|
+
.fillStyle(function() this.strokeStyle().darker());
|
|
19
|
+
|
|
20
|
+
vis.render();
|
|
21
|
+
|
|
22
|
+
</script>
|
|
23
|
+
</body>
|
|
24
|
+
</html>
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Mark Render</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
</head>
|
|
6
|
+
<body>
|
|
7
|
+
<script type="text/javascript+protovis">
|
|
8
|
+
|
|
9
|
+
var vis = new pv.Panel()
|
|
10
|
+
.width(200)
|
|
11
|
+
.height(200);
|
|
12
|
+
|
|
13
|
+
var panel1 = vis.add(pv.Panel)
|
|
14
|
+
.top(0)
|
|
15
|
+
.height(20);
|
|
16
|
+
|
|
17
|
+
panel1.add(pv.Label)
|
|
18
|
+
.top(0)
|
|
19
|
+
.left(0)
|
|
20
|
+
.textBaseline("top")
|
|
21
|
+
.text(function() "render 1: " + (++panel1.count || (panel1.count = 1)));
|
|
22
|
+
|
|
23
|
+
var panel2 = panel1.add(pv.Panel)
|
|
24
|
+
.top(20)
|
|
25
|
+
.height(20);
|
|
26
|
+
|
|
27
|
+
panel2.add(pv.Label)
|
|
28
|
+
.top(0)
|
|
29
|
+
.left(0)
|
|
30
|
+
.textBaseline("top")
|
|
31
|
+
.text(function() "render 2: " + (++panel2.count || (panel2.count = 1)));
|
|
32
|
+
|
|
33
|
+
vis.render();
|
|
34
|
+
panel1.render();
|
|
35
|
+
panel1.render();
|
|
36
|
+
panel2.render();
|
|
37
|
+
vis.render();
|
|
38
|
+
vis.render();
|
|
39
|
+
|
|
40
|
+
</script>
|
|
41
|
+
</body>
|
|
42
|
+
</html>
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Rule Anchor</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
<style type="text/css">span { display: block !important; }</style>
|
|
6
|
+
</head>
|
|
7
|
+
<body>
|
|
8
|
+
<script type="text/javascript+protovis">
|
|
9
|
+
|
|
10
|
+
var vis = new pv.Panel()
|
|
11
|
+
.data(["left", "top", "right", "bottom", "center"])
|
|
12
|
+
.width(400)
|
|
13
|
+
.height(40)
|
|
14
|
+
.left(30)
|
|
15
|
+
.right(30)
|
|
16
|
+
.top(9.5)
|
|
17
|
+
.bottom(9.5);
|
|
18
|
+
|
|
19
|
+
var rule = vis.add(pv.Rule)
|
|
20
|
+
.bottom(20);
|
|
21
|
+
|
|
22
|
+
rule.anchor(function(d, p) p).add(pv.Label)
|
|
23
|
+
.text(function(d, p) p);
|
|
24
|
+
|
|
25
|
+
vis.render();
|
|
26
|
+
|
|
27
|
+
</script>
|
|
28
|
+
</body>
|
|
29
|
+
</html>
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Title</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
</head>
|
|
6
|
+
<body>
|
|
7
|
+
<script type="text/javascript+protovis">
|
|
8
|
+
|
|
9
|
+
var vis = new pv.Panel()
|
|
10
|
+
.width(300)
|
|
11
|
+
.height(300);
|
|
12
|
+
|
|
13
|
+
vis.add(pv.Bar)
|
|
14
|
+
.top(0)
|
|
15
|
+
.height(100)
|
|
16
|
+
.fillStyle("brown")
|
|
17
|
+
.title("Hello, world!")
|
|
18
|
+
.anchor("center").add(pv.Label)
|
|
19
|
+
.text("I HAS A TITLE");
|
|
20
|
+
|
|
21
|
+
vis.add(pv.Bar)
|
|
22
|
+
.top(100)
|
|
23
|
+
.height(100)
|
|
24
|
+
.fillStyle("orange")
|
|
25
|
+
.title(0)
|
|
26
|
+
.anchor("center").add(pv.Label)
|
|
27
|
+
.text("I HAS A 0 TITLE");
|
|
28
|
+
|
|
29
|
+
vis.add(pv.Bar)
|
|
30
|
+
.top(200)
|
|
31
|
+
.height(100)
|
|
32
|
+
.fillStyle("steelblue")
|
|
33
|
+
.title("")
|
|
34
|
+
.anchor("center").add(pv.Label)
|
|
35
|
+
.text("I HAS AN EMPTY TITLE");
|
|
36
|
+
|
|
37
|
+
vis.render();
|
|
38
|
+
|
|
39
|
+
</script>
|
|
40
|
+
</body>
|
|
41
|
+
</html>
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Transition</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
<link type="text/css" href="../style.css" rel="stylesheet"/>
|
|
6
|
+
</head>
|
|
7
|
+
<body>
|
|
8
|
+
<input type="button" onclick="start();" value="Transition">
|
|
9
|
+
<p>
|
|
10
|
+
<script type="text/javascript+protovis">
|
|
11
|
+
|
|
12
|
+
var w = 500,
|
|
13
|
+
h = 500,
|
|
14
|
+
i = 0;
|
|
15
|
+
|
|
16
|
+
var vis = new pv.Panel()
|
|
17
|
+
.width(w)
|
|
18
|
+
.height(h)
|
|
19
|
+
.margin(30);
|
|
20
|
+
|
|
21
|
+
var rule = vis.add(pv.Rule)
|
|
22
|
+
.data(function() i & 1 ? [0.25, 0.75] : [0.5])
|
|
23
|
+
.id(function(d) d.toFixed(2))
|
|
24
|
+
.bottom(function(d) d * h);
|
|
25
|
+
|
|
26
|
+
rule.on("enter")
|
|
27
|
+
.bottom(0)
|
|
28
|
+
.left(0)
|
|
29
|
+
.width(0)
|
|
30
|
+
.on("exit")
|
|
31
|
+
.top(0)
|
|
32
|
+
.left(0)
|
|
33
|
+
.width(0);
|
|
34
|
+
|
|
35
|
+
rule.anchor("left").add(pv.Label)
|
|
36
|
+
.text(function(d) d.toFixed(2));
|
|
37
|
+
|
|
38
|
+
vis.render();
|
|
39
|
+
|
|
40
|
+
function start() {
|
|
41
|
+
i++;
|
|
42
|
+
vis.transition().duration(2500).start();
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
</script>
|
|
46
|
+
</body>
|
|
47
|
+
</html>
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Donut</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
<link type="text/css" href="../style.css" rel="stylesheet"/>
|
|
6
|
+
</head>
|
|
7
|
+
<body>
|
|
8
|
+
<input type="button" onclick="start();" value="Transition">
|
|
9
|
+
<p>
|
|
10
|
+
<script type="text/javascript+protovis">
|
|
11
|
+
|
|
12
|
+
var w = 400,
|
|
13
|
+
h = 400,
|
|
14
|
+
r = w / 2,
|
|
15
|
+
t = 30,
|
|
16
|
+
i = 0,
|
|
17
|
+
a = pv.Scale.linear().range(0, 2 * Math.PI);
|
|
18
|
+
|
|
19
|
+
var vis = new pv.Panel()
|
|
20
|
+
.width(w)
|
|
21
|
+
.height(h);
|
|
22
|
+
|
|
23
|
+
vis.add(pv.Wedge)
|
|
24
|
+
.data(function() {
|
|
25
|
+
var data = pv.range(10).map(Math.random);
|
|
26
|
+
a.domain(0, pv.sum(data));
|
|
27
|
+
return data;
|
|
28
|
+
})
|
|
29
|
+
.innerRadius(r - t)
|
|
30
|
+
.outerRadius(r)
|
|
31
|
+
.angle(a)
|
|
32
|
+
.title(function(d) d)
|
|
33
|
+
.anchor("outer").add(pv.Label)
|
|
34
|
+
.visible(function(d) d > .05)
|
|
35
|
+
.textMargin(t + 5)
|
|
36
|
+
.text(function(d) d.toFixed(2));
|
|
37
|
+
|
|
38
|
+
vis.render();
|
|
39
|
+
|
|
40
|
+
function start() {
|
|
41
|
+
i++;
|
|
42
|
+
vis.transition().duration(250).start();
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
</script>
|
|
46
|
+
</body>
|
|
47
|
+
</html>
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Transition</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
<link type="text/css" href="../style.css" rel="stylesheet"/>
|
|
6
|
+
</head>
|
|
7
|
+
<body>
|
|
8
|
+
<select id="menu" onchange="ease = pv.ease(this.value); start();">
|
|
9
|
+
<option value="linear">linear</option>
|
|
10
|
+
<option value="quad-in">quad-in</option>
|
|
11
|
+
<option value="quad-out">quad-out</option>
|
|
12
|
+
<option value="quad-in-out">quad-in-out</option>
|
|
13
|
+
<option value="quad-out-in">quad-out-in</option>
|
|
14
|
+
<option value="cubic-in">cubic-in</option>
|
|
15
|
+
<option value="cubic-out">cubic-out</option>
|
|
16
|
+
<option selected value="cubic-in-out">cubic-in-out</option>
|
|
17
|
+
<option value="cubic-out-in">cubic-out-in</option>
|
|
18
|
+
<option value="sin-in">sin-in</option>
|
|
19
|
+
<option value="sin-out">sin-out</option>
|
|
20
|
+
<option value="sin-in-out">sin-in-out</option>
|
|
21
|
+
<option value="sin-out-in">sin-out-in</option>
|
|
22
|
+
<option value="exp-in">exp-in</option>
|
|
23
|
+
<option value="exp-out">exp-out</option>
|
|
24
|
+
<option value="exp-in-out">exp-in-out</option>
|
|
25
|
+
<option value="exp-out-in">exp-out-in</option>
|
|
26
|
+
<option value="circle-in">circle-in</option>
|
|
27
|
+
<option value="circle-out">circle-out</option>
|
|
28
|
+
<option value="circle-in-out">circle-in-out</option>
|
|
29
|
+
<option value="circle-out-in">circle-out-in</option>
|
|
30
|
+
<option value="elastic-in">elastic-in</option>
|
|
31
|
+
<option value="elastic-out">elastic-out</option>
|
|
32
|
+
<option value="elastic-in-out">elastic-in-out</option>
|
|
33
|
+
<option value="elastic-out-in">elastic-out-in</option>
|
|
34
|
+
<option value="back-in">back-in</option>
|
|
35
|
+
<option value="back-out">back-out</option>
|
|
36
|
+
<option value="back-in-out">back-in-out</option>
|
|
37
|
+
<option value="back-out-in">back-out-in</option>
|
|
38
|
+
<option value="bounce-in">bounce-in</option>
|
|
39
|
+
<option value="bounce-out">bounce-out</option>
|
|
40
|
+
<option value="bounce-in-out">bounce-in-out</option>
|
|
41
|
+
<option value="bounce-out-in">bounce-out-in</option>
|
|
42
|
+
</select>
|
|
43
|
+
<input type="checkbox" id="slow" onchange="slow = this.checked;"
|
|
44
|
+
><label for="slow">Slow</label>
|
|
45
|
+
<input type="button" onclick="start();" value="Transition">
|
|
46
|
+
<p>
|
|
47
|
+
<script type="text/javascript+protovis">
|
|
48
|
+
|
|
49
|
+
var slow = false,
|
|
50
|
+
ease = pv.ease("cubic-in-out"),
|
|
51
|
+
tx;
|
|
52
|
+
|
|
53
|
+
var w = 500,
|
|
54
|
+
h = 750,
|
|
55
|
+
i = 0,
|
|
56
|
+
c = pv.Colors.category10(),
|
|
57
|
+
x = pv.Scale.ordinal(pv.range(20)).splitBanded(0, w, 4/5),
|
|
58
|
+
y1 = pv.Scale.linear(-.25, 1.25).range(0, h), // current scale
|
|
59
|
+
y2 = pv.Scale.linear(-2, 3).range(0, h); // previous scale
|
|
60
|
+
|
|
61
|
+
var vis = new pv.Panel()
|
|
62
|
+
.width(w)
|
|
63
|
+
.height(h)
|
|
64
|
+
.margin(30);
|
|
65
|
+
|
|
66
|
+
var rule = vis.add(pv.Rule)
|
|
67
|
+
.data(function() y1.ticks(20))
|
|
68
|
+
.id(function(d) d.toFixed(1))
|
|
69
|
+
.bottom(function(d) y1(d))
|
|
70
|
+
.strokeStyle("#ddd");
|
|
71
|
+
|
|
72
|
+
rule.on("enter")
|
|
73
|
+
.bottom(function(d) y2(d));
|
|
74
|
+
|
|
75
|
+
rule.anchor("left").add(pv.Label)
|
|
76
|
+
.text(function(d) y1.tickFormat(d));
|
|
77
|
+
|
|
78
|
+
vis.add(pv.Bar)
|
|
79
|
+
.data(pv.range(20).map(function(d) (d >= 10 ? .55 : .05) + .45 * Math.random()))
|
|
80
|
+
.left(function() x(i & 1 ? ((this.index % 10) * 2 + (this.index >= 10)) : this.index))
|
|
81
|
+
.width(function() x.range().band)
|
|
82
|
+
.bottom(function() y1(0))
|
|
83
|
+
.height(function(d) y1(d) - y1(0))
|
|
84
|
+
.fillStyle(c.by(function() this.index < 10));
|
|
85
|
+
|
|
86
|
+
vis.add(pv.Rule)
|
|
87
|
+
.data([0, 1])
|
|
88
|
+
.id(function(d) d.toFixed(1))
|
|
89
|
+
.bottom(function(d) y1(d))
|
|
90
|
+
.strokeStyle("#000");
|
|
91
|
+
|
|
92
|
+
vis.render();
|
|
93
|
+
menu.focus();
|
|
94
|
+
|
|
95
|
+
function start() {
|
|
96
|
+
i++;
|
|
97
|
+
var y = y1; y1 = y2; y2 = y; // swap scales
|
|
98
|
+
vis.transition()
|
|
99
|
+
.duration(slow ? 5000 : 500)
|
|
100
|
+
.ease(ease)
|
|
101
|
+
.start();
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
</script>
|
|
105
|
+
</body>
|
|
106
|
+
</html>
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
<html>
|
|
2
|
+
<head>
|
|
3
|
+
<title>Donut</title>
|
|
4
|
+
<script type="text/javascript" src="../../protovis-d3.3.js"></script>
|
|
5
|
+
</head>
|
|
6
|
+
<body>
|
|
7
|
+
<script type="text/javascript+protovis">
|
|
8
|
+
|
|
9
|
+
var data = pv.range(10).map(Math.random).sort(pv.reverseOrder),
|
|
10
|
+
w = 400,
|
|
11
|
+
h = 400,
|
|
12
|
+
r = w / 2,
|
|
13
|
+
t = 30,
|
|
14
|
+
a = pv.Scale.linear(0, pv.sum(data)).range(0, 2 * Math.PI);
|
|
15
|
+
|
|
16
|
+
var vis = new pv.Panel()
|
|
17
|
+
.width(w)
|
|
18
|
+
.height(h);
|
|
19
|
+
|
|
20
|
+
vis.add(pv.Wedge)
|
|
21
|
+
.data(data)
|
|
22
|
+
.innerRadius(r - t)
|
|
23
|
+
.outerRadius(r)
|
|
24
|
+
.angle(a)
|
|
25
|
+
.title(function(d) d)
|
|
26
|
+
.anchor("outer").add(pv.Label)
|
|
27
|
+
.visible(function(d) d > .05)
|
|
28
|
+
.textMargin(t + 5)
|
|
29
|
+
.text(function(d) d.toFixed(2));
|
|
30
|
+
|
|
31
|
+
vis.render();
|
|
32
|
+
|
|
33
|
+
</script>
|
|
34
|
+
</body>
|
|
35
|
+
</html>
|