Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: diagrams/diagrams-lib
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.0.4
Choose a base ref
...
head repository: diagrams/diagrams-lib
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.2
Choose a head ref

Commits on Oct 25, 2013

  1. initial commit

    jeffreyrosenbluth committed Oct 25, 2013
    Copy the full SHA
    6bb1f53 View commit details
  2. 1
    Copy the full SHA
    3be8bdf View commit details
  3. Copy the full SHA
    7c38e90 View commit details

Commits on Oct 28, 2013

  1. Copy the full SHA
    ce57c67 View commit details

Commits on Oct 29, 2013

  1. linear gradient

    jeffreyrosenbluth committed Oct 29, 2013
    Copy the full SHA
    5564200 View commit details

Commits on Oct 30, 2013

  1. transform gradient

    jeffreyrosenbluth committed Oct 30, 2013
    Copy the full SHA
    fe1e279 View commit details

Commits on Oct 31, 2013

  1. work in progress

    jeffreyrosenbluth committed Oct 31, 2013
    Copy the full SHA
    c873735 View commit details

Commits on Nov 4, 2013

  1. more progress

    jeffreyrosenbluth committed Nov 4, 2013
    Copy the full SHA
    1f52aac View commit details

Commits on Nov 8, 2013

  1. there is hope

    jeffreyrosenbluth committed Nov 8, 2013
    Copy the full SHA
    f546b68 View commit details
  2. Copy the full SHA
    88944c6 View commit details

Commits on Nov 10, 2013

  1. 1
    Copy the full SHA
    933a4dd View commit details

Commits on Nov 11, 2013

  1. Copy the full SHA
    977ad18 View commit details

Commits on Nov 13, 2013

  1. bergeys proposal

    jeffreyrosenbluth committed Nov 13, 2013
    8
    Copy the full SHA
    019990d View commit details
  2. appease Travis

    jeffreyrosenbluth committed Nov 13, 2013
    Copy the full SHA
    f7226b4 View commit details

Commits on Nov 14, 2013

  1. merged wtih master

    jeffreyrosenbluth committed Nov 14, 2013
    Copy the full SHA
    685ed07 View commit details

Commits on Nov 15, 2013

  1. haddock docs

    jeffreyrosenbluth committed Nov 15, 2013
    Copy the full SHA
    6317c61 View commit details

Commits on Nov 16, 2013

  1. Copy the full SHA
    3b4eb9d View commit details
  2. for Travis

    jeffreyrosenbluth committed Nov 16, 2013
    Copy the full SHA
    8a372a4 View commit details
  3. Copy the full SHA
    047664f View commit details
  4. Copy the full SHA
    4ab2b26 View commit details

Commits on Dec 10, 2013

  1. Copy the full SHA
    d030a38 View commit details

Commits on Feb 6, 2014

  1. Copy the full SHA
    6bb37b5 View commit details

Commits on Feb 13, 2014

  1. Copy the full SHA
    e42e7d3 View commit details
  2. Merge branch 'master' into units

    enable merege
    jeffreyrosenbluth committed Feb 13, 2014
    Copy the full SHA
    9082fa7 View commit details
  3. working - no arrows

    jeffreyrosenbluth committed Feb 13, 2014
    6
    Copy the full SHA
    8962a52 View commit details
  4. 1
    Copy the full SHA
    8f1328a View commit details

Commits on Feb 14, 2014

  1. Global working

    jeffreyrosenbluth committed Feb 14, 2014
    Copy the full SHA
    f5c2a45 View commit details
  2. Copy the full SHA
    0b60a72 View commit details
  3. remvoed IsPrim

    jeffreyrosenbluth committed Feb 14, 2014
    Copy the full SHA
    680ba8a View commit details

Commits on Feb 16, 2014

  1. Copy the full SHA
    710ca12 View commit details
  2. Copy the full SHA
    2952cf8 View commit details
  3. Copy the full SHA
    4748fe2 View commit details

Commits on Feb 17, 2014

  1. Copy the full SHA
    57a3577 View commit details

Commits on Mar 3, 2014

  1. initial commit

    Jeffrey Rosenbluth committed Mar 3, 2014
    1
    Copy the full SHA
    0cf4726 View commit details

Commits on Mar 4, 2014

  1. change defaults

    Jeffrey Rosenbluth committed Mar 4, 2014
    Copy the full SHA
    8ce0b10 View commit details
  2. handle zero case, add documentation

    Jeffrey Rosenbluth committed Mar 4, 2014
    Copy the full SHA
    4007bdd View commit details

Commits on Mar 9, 2014

  1. 2
    Copy the full SHA
    37e4033 View commit details
  2. 3D colors, material reflectance

    closes #121
    bergey committed Mar 9, 2014
    Copy the full SHA
    2594195 View commit details
  3. simpler angleBetween

    bergey committed Mar 9, 2014
    Copy the full SHA
    d1806e4 View commit details
  4. Copy the full SHA
    26807c2 View commit details
  5. lenses for polar coordinates

    3D: spherical and cylindrical
    2D: using the same type classes as cylindrical
    bergey committed Mar 9, 2014
    Copy the full SHA
    44bdbad View commit details
  6. make R3 strict data like R2

    bergey committed Mar 9, 2014
    Copy the full SHA
    7ff0263 View commit details
  7. Copy the full SHA
    216317f View commit details
  8. Add Box

    bergey committed Mar 9, 2014
    Copy the full SHA
    03833af View commit details
  9. Add Frustum

    bergey committed Mar 9, 2014
    Copy the full SHA
    2e03dec View commit details
  10. Wall: remove extra imports

    bergey committed Mar 9, 2014
    Copy the full SHA
    1229c55 View commit details
  11. Copy the full SHA
    ec8f0a9 View commit details
  12. make HasR _r lens be the vector magnitude

    This definition works in all vector spaces, and is probably more often
    useful.  The cylindrical r is easy to refer to as cylindrical._1; it
    just happens that it was the case that motivated me to write these lenses.
    bergey committed Mar 9, 2014
    Copy the full SHA
    9148c6a View commit details

Commits on Mar 10, 2014

  1. move avgScale to core

    Jeffrey Rosenbluth committed Mar 10, 2014
    Copy the full SHA
    c76595e View commit details

Commits on Mar 11, 2014

  1. clean up R3 instances

    bergey committed Mar 11, 2014
    Copy the full SHA
    debf974 View commit details
Showing with 2,037 additions and 1,221 deletions.
  1. +2 −2 .travis.yml
  2. +108 −0 CHANGES.markdown
  3. +12 −8 diagrams-lib.cabal
  4. +1 −1 diagrams/src_Diagrams_Combinators_appendsEx.svg
  5. +1 −1 diagrams/src_Diagrams_Combinators_besideEx.svg
  6. +1 −1 diagrams/src_Diagrams_Combinators_positionEx.svg
  7. +1 −1 diagrams/src_Diagrams_Combinators_strutEx.svg
  8. +1 −1 diagrams/src_Diagrams_Combinators_withEnvelopeEx.svg
  9. +1 −1 diagrams/src_Diagrams_CubicSpline_cubicSplineEx.svg
  10. +1 −1 diagrams/src_Diagrams_TrailLike_explodeTrailEx.svg
  11. +1 −1 diagrams/src_Diagrams_TrailLike_fromOffsetsEx.svg
  12. +1 −1 diagrams/src_Diagrams_TrailLike_fromSegmentsEx.svg
  13. +1 −1 diagrams/src_Diagrams_TrailLike_fromVerticesEx.svg
  14. +1 −1 diagrams/src_Diagrams_TrailLike_twiddleEx.svg
  15. +1 −1 diagrams/src_Diagrams_Trail_closeLineEx.svg
  16. +1 −1 diagrams/src_Diagrams_Trail_glueLineEx.svg
  17. +1 −1 diagrams/src_Diagrams_Trail_lineFromOffsetsEx.svg
  18. +1 −1 diagrams/src_Diagrams_Trail_lineFromVerticesEx.svg
  19. +1 −1 diagrams/src_Diagrams_Trail_trailOffsetEx.svg
  20. +1 −1 diagrams/src_Diagrams_TwoD_Arc_annularWedgeEx.svg
  21. +1 −1 diagrams/src_Diagrams_TwoD_Arc_arc'Ex.svg
  22. +1 −1 diagrams/src_Diagrams_TwoD_Arc_arcBetweenEx.svg
  23. +1 −1 diagrams/src_Diagrams_TwoD_Arc_wedgeEx.svg
  24. +1 −1 diagrams/src_Diagrams_TwoD_Arrow_example1.svg
  25. +1 −1 diagrams/src_Diagrams_TwoD_Arrow_example2.svg
  26. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_blockEx.svg
  27. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_dart'Ex.svg
  28. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_dartEx.svg
  29. +0 −4 diagrams/src_Diagrams_TwoD_Arrowheads_missile'Ex.svg
  30. +0 −4 diagrams/src_Diagrams_TwoD_Arrowheads_missileEx.svg
  31. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_quillEx.svg
  32. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_spike'Ex.svg
  33. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_spikeEx.svg
  34. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_thorn'Ex.svg
  35. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_thornEx.svg
  36. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_tri'Ex.svg
  37. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_tri25Ex.svg
  38. +1 −1 diagrams/src_Diagrams_TwoD_Arrowheads_triEx.svg
  39. +1 −1 diagrams/src_Diagrams_TwoD_Curvature_diagramA.svg
  40. +1 −1 diagrams/src_Diagrams_TwoD_Curvature_diagramNeg.svg
  41. +1 −1 diagrams/src_Diagrams_TwoD_Curvature_diagramPos.svg
  42. +1 −1 diagrams/src_Diagrams_TwoD_Curvature_diagramZero.svg
  43. +1 −1 diagrams/src_Diagrams_TwoD_Offset_cubicOffsetExample.svg
  44. +1 −1 diagrams/src_Diagrams_TwoD_Offset_expandLoopExample.svg
  45. +1 −1 diagrams/src_Diagrams_TwoD_Offset_expandTrailExample.svg
  46. +1 −1 diagrams/src_Diagrams_TwoD_Offset_offsetTrailExample.svg
  47. +1 −1 diagrams/src_Diagrams_TwoD_Offset_offsetTrailLeftExample.svg
  48. +1 −1 diagrams/src_Diagrams_TwoD_Offset_offsetTrailOuterExample.svg
  49. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_decagonEx.svg
  50. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_dodecagonEx.svg
  51. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_hendecagonEx.svg
  52. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_heptagonEx.svg
  53. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_hexagonEx.svg
  54. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_hruleEx.svg
  55. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_nonagonEx.svg
  56. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_octagonEx.svg
  57. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_pentagonEx.svg
  58. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_rectEx.svg
  59. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_roundedRectEx.svg
  60. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_squareEx.svg
  61. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_triangleEx.svg
  62. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_unitSquareEx.svg
  63. +1 −1 diagrams/src_Diagrams_TwoD_Shapes_vruleEx.svg
  64. +113 −0 src/Diagrams/Angle.hs
  65. +4 −213 src/Diagrams/Attributes.hs
  66. +1 −1 src/Diagrams/Attributes/Compile.hs
  67. +20 −14 src/Diagrams/Backend/CmdLine.hs
  68. +0 −68 src/Diagrams/Backend/Show.hs
  69. +16 −9 src/Diagrams/Combinators.hs
  70. +6 −1 src/Diagrams/Coordinates.hs
  71. +2 −2 src/Diagrams/CubicSpline.hs
  72. +20 −19 src/Diagrams/Deform.hs
  73. +1 −1 src/Diagrams/Parametric.hs
  74. +6 −3 src/Diagrams/Path.hs
  75. +4 −1 src/Diagrams/Prelude.hs
  76. +5 −1 src/Diagrams/Prelude/ThreeD.hs
  77. +3 −3 src/Diagrams/Segment.hs
  78. +100 −31 src/Diagrams/Solve.hs
  79. +4 −1 src/Diagrams/ThreeD.hs
  80. +104 −0 src/Diagrams/ThreeD/Attributes.hs
  81. +4 −5 src/Diagrams/ThreeD/Camera.hs
  82. +2 −6 src/Diagrams/ThreeD/Light.hs
  83. +110 −4 src/Diagrams/ThreeD/Shapes.hs
  84. +9 −10 src/Diagrams/ThreeD/Transform.hs
  85. +105 −62 src/Diagrams/ThreeD/Types.hs
  86. +1 −38 src/Diagrams/ThreeD/Vector.hs
  87. +11 −9 src/Diagrams/Trail.hs
  88. +3 −1 src/Diagrams/Transform.hs
  89. +47 −14 src/Diagrams/TwoD.hs
  90. +41 −51 src/Diagrams/TwoD/Adjust.hs
  91. +8 −7 src/Diagrams/TwoD/Arc.hs
  92. +163 −146 src/Diagrams/TwoD/Arrow.hs
  93. +92 −126 src/Diagrams/TwoD/Arrowheads.hs
  94. +514 −0 src/Diagrams/TwoD/Attributes.hs
  95. +7 −6 src/Diagrams/TwoD/Combinators.hs
  96. +4 −4 src/Diagrams/TwoD/Curvature.hs
  97. +1 −0 src/Diagrams/TwoD/Ellipse.hs
  98. +103 −55 src/Diagrams/TwoD/Image.hs
  99. +2 −2 src/Diagrams/TwoD/Model.hs
  100. +8 −8 src/Diagrams/TwoD/Offset.hs
  101. +3 −3 src/Diagrams/TwoD/Path.hs
  102. +1 −0 src/Diagrams/TwoD/Polygons.hs
  103. +2 −1 src/Diagrams/TwoD/Shapes.hs
  104. +8 −1 src/Diagrams/TwoD/Size.hs
  105. +67 −29 src/Diagrams/TwoD/Text.hs
  106. +1 −39 src/Diagrams/TwoD/Transform.hs
  107. +0 −18 src/Diagrams/TwoD/Transform/ScaleInv.hs
  108. +17 −60 src/Diagrams/TwoD/Types.hs
  109. +2 −10 src/Diagrams/TwoD/Vector.hs
  110. +64 −62 test/Arrowtest.hs
  111. +13 −0 test/Gradient/Ball.hs
  112. +35 −0 test/Gradient/rectGrad.hs
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -6,10 +6,10 @@ env:
- HPVER=2013.2.0.0
- GHCVER=7.4.2
- GHCVER=7.6.3
- GHCVER=7.8.1
- GHCVER=7.8.2
- GHCVER=head
global:
- CABALVER=1.18
- CABALVER=1.20
- HEAD_DEPS="diagrams-core"

matrix:
108 changes: 108 additions & 0 deletions CHANGES.markdown
Original file line number Diff line number Diff line change
@@ -1,3 +1,111 @@
1.2 (27 May 2014)
-----------------

* **New features**

- Several attributes (such as line width, dashing size, arrowhead
size, and font size) that formerly had a value of type `Double`
now have the more general type `Measure R2`. This allows the
attributes to be specified relative to one of four measurement
frames: `Local`, `Global`, `Normalized`, and `Output`.

- New DSL for specifying measurements.

- New synonyms for specifying measurements, *e.g.* `thin`,
`thick`, and `medium`, `large`.

- Support for radial and linear gradients for fills and strokes.

- New `DImage` type that supports both embedded and external images in
Backends that support them.

- New `lengths` Traversal for setting `headLength` and `tailLength`
simultaneously.

- `Frustrum` and `Box` shapes added to `Diagrams.ThreeD.Shapes`.

- New function `quartForm` to find roots of quartic polynomials.

- New Lenses for polar coordinates.

- New trig functions, `sinA`, `atanA`, etc. which take `Angle` as
input or output.

* **New instances**

- `Transformable` instances for `LineWidth`, `Dashing`,
`LineTexture`, and `FillTexture`.

* **API changes**

- `FillColor` and `LineColor` attributes have been replaced with
the more general `FillTexture` and `LineTexture`. Use the `solid`
function to convert a color to a texture.

- The size of arrow heads and tails is now specified in terms of
length instead of the radius of their circumcircle.

- Gaps at the ends of arrows are now specified using `Measure R2`.

- The `gap` traversal has been replaced by `gaps` for consistency
in naming, though `gap` is still provided for backwards compatibility.

- `fontSize` now takes a value of type `Measure R2`.

- Get rid of (bitrotted) `Show` backend.

- Functions in `TwoD.Adjust` now return the adjustment
transformation itself in addition to the resized `Diagram` and
`Options` record; this can be used, *e.g.* to convert screen
coordinates back into diagram coordinates.

- Export `pathLocSegments`.

- The `avgScale` function has been moved to `Diagrams.Core`.

- The `Angle` definition and related functions (*e.g.*
`angleBetween`) have moved to a separate module, `Diagrams.Angle`.

- A separate `Diagrams.TwoD.Attributes` module now contains most
of the attributes that require 2D transformation instances.

- The `splitColorFills` function has been replaced by `splitTextureFills`.

* **Dependency/version changes**

- Allow `semigroups-0.15`

- Allow `opt-parse-applicative-0.9.0

- Allow `lens-4.2`

1.1.0.7 (15 May 2014)
------------------------

- Allow `semigroups-0.14`

1.1.0.6 (10 April 2014)
------------------------

- Allow `semigroups-0.13`

1.1.0.4 (4 April 2014)
----------------------

- Require `intervals-0.7`
- Give `connectOutside` a reasonable behavior even when one or both
endpoints has no trace

1.1.0.3 (19 March 2014)
----------------------

- Allow `lens-4.1`

1.1.0.2 (18 March 2014)
-----------------------

- Allow `optparse-applicative-0.8`

1.1.0.1 (9 March 2014)
----------------------

20 changes: 12 additions & 8 deletions diagrams-lib.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: diagrams-lib
Version: 1.1.0.1
Version: 1.2
Synopsis: Embedded domain-specific language for declarative graphics
Description: Diagrams is a flexible, extensible EDSL for creating
graphics of many types. Graphics can be created
@@ -28,6 +28,7 @@ Library
Exposed-modules: Diagrams.Prelude,
Diagrams.Prelude.ThreeD,
Diagrams.Align,
Diagrams.Angle,
Diagrams.Combinators,
Diagrams.Coordinates,
Diagrams.Attributes,
@@ -56,6 +57,7 @@ Library
Diagrams.TwoD.Align,
Diagrams.TwoD.Arrow,
Diagrams.TwoD.Arrowheads,
Diagrams.TwoD.Attributes,
Diagrams.TwoD.Combinators,
Diagrams.TwoD.Deform,
Diagrams.TwoD.Transform,
@@ -75,6 +77,7 @@ Library
Diagrams.TwoD.Image,
Diagrams.TwoD.Adjust,
Diagrams.ThreeD.Align,
Diagrams.ThreeD.Attributes,
Diagrams.ThreeD.Camera,
Diagrams.ThreeD.Deform,
Diagrams.ThreeD.Light,
@@ -86,30 +89,31 @@ Library
Diagrams.Animation,
Diagrams.Animation.Active,
Diagrams.Util,
Diagrams.Backend.Show,
Diagrams.Backend.CmdLine
Build-depends: base >= 4.2 && < 4.8,
containers >= 0.3 && < 0.6,
array >= 0.3 && < 0.6,
semigroups >= 0.3.4 && < 0.13,
semigroups >= 0.3.4 && < 0.16,
monoid-extras >= 0.3 && < 0.4,
diagrams-core >= 1.1 && < 1.2,
dual-tree >= 0.2 && < 0.3,
diagrams-core >= 1.2 && < 1.3,
active >= 0.1 && < 0.2,
vector-space >= 0.7.7 && < 0.9,
vector-space-points >= 0.1.2 && < 0.3,
MemoTrie >= 0.6 && < 0.7,
colour >= 2.3.2 && < 2.4,
data-default-class < 0.1,
pretty >= 1.0.1.2 && < 1.2,
fingertree >= 0.1 && < 0.2,
intervals >= 0.3 && < 0.5,
lens >= 4.0 && < 4.1,
intervals >= 0.7 && < 0.8,
lens >= 4.0 && < 4.3,
tagged >= 0.7,
optparse-applicative >= 0.7 && < 0.8,
optparse-applicative >= 0.7 && < 0.10,
filepath,
safe >= 0.2 && < 0.4,
JuicyPixels >= 3.1.5 && < 3.2,
hashable >= 1.1 && < 1.3
if impl(ghc < 7.6)
Build-depends: ghc-prim
Hs-source-dirs: src
ghc-options: -Wall
default-language: Haskell2010
2 changes: 1 addition & 1 deletion diagrams/src_Diagrams_Combinators_appendsEx.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion diagrams/src_Diagrams_Combinators_besideEx.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading