diff --git a/Graphics/Diagrams.hs b/Graphics/Diagrams.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams.hs
@@ -0,0 +1,6 @@
+module Graphics.Diagrams (module D) where
+
+import Graphics.Diagrams.Core as D
+import Graphics.Diagrams.Path as D
+import Graphics.Diagrams.Point  as D
+import Graphics.Diagrams.Object as D
diff --git a/Graphics/Diagrams/Core.hs b/Graphics/Diagrams/Core.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams/Core.hs
@@ -0,0 +1,333 @@
+{-# LANGUAGE TypeSynonymInstances, FlexibleContexts, FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, RecursiveDo, TypeFamilies, OverloadedStrings, RecordWildCards,UndecidableInstances, PackageImports, TemplateHaskell, RankNTypes, GADTs, ImpredicativeTypes #-}
+
+module Graphics.Diagrams.Core (module Graphics.Diagrams.Core) where
+import Control.Monad.LPMonad
+import Prelude hiding (sum,mapM_,mapM,concatMap)
+import Control.Monad.RWS hiding (forM,forM_,mapM_,mapM)
+import Data.LinearProgram
+import Data.LinearProgram.Common as Graphics.Diagrams.Core (VarKind(..))
+import Data.LinearProgram.LinExpr
+import Data.Map (Map)
+import qualified Data.Map as M
+import Control.Lens hiding (element)
+import Data.Traversable
+import Data.Foldable
+-- import MarXup.MultiRef (BoxSpec)
+-- import MarXup.Tex
+import System.IO.Unsafe
+
+type LPState = LP Var Constant
+
+-- | Solution of the linear programming problem
+type Solution = Map Var Double
+
+
+type Constant = Double
+
+-- | Expressions are linear functions of the variables
+type Expr = LinExpr Var Constant
+
+data Point' a = Point {xpart :: a, ypart :: a}
+  deriving (Eq,Show)
+
+instance Traversable Point' where
+  traverse f (Point x y) = Point <$> f x <*> f y
+
+instance Foldable Point' where
+  foldMap = foldMapDefault
+
+instance Functor Point' where
+  fmap = fmapDefault
+
+instance Applicative Point' where
+  pure x = Point x x
+  Point f g <*> Point x y = Point (f x) (g y)
+
+instance Group a => Num (Point' a) where
+  negate = neg
+  (+) = (^+^)
+  (-) = (^-^)
+
+instance Group v => Group (Point' v) where
+  zero = Point zero zero
+  Point x1 y1 ^+^ Point x2 y2 = Point (x1 ^+^ x2) (y1 ^+^ y2)
+  neg (Point x y) = Point (neg x) (neg y)
+
+instance Module Constant v => Module Constant (Point' v) where
+  k *^ Point x y = Point (k *^ x) (k *^ y)
+
+type Frozen x = x Constant
+type FrozenPoint = Frozen Point'
+type FrozenPath = Frozen Path'
+
+
+data Segment v = CurveTo (Point' v) (Point' v) (Point' v)
+                   | StraightTo (Point' v)
+                   | Cycle
+                     -- Other things also supported by tikz:
+                   --  Rounded (Maybe Constant)
+                   --  HV point | VH point
+  deriving (Show,Eq)
+instance Functor Segment where
+  fmap = fmapDefault
+
+instance Foldable Segment where
+  foldMap = foldMapDefault
+instance Traversable Segment where
+  traverse _ Cycle = pure Cycle
+  traverse f (StraightTo p) = StraightTo <$> traverse f p
+  traverse f (CurveTo c d q) = CurveTo <$> traverse f c <*> traverse f d <*> traverse f q
+
+
+data Path' a
+  = EmptyPath
+  | Path {startingPoint :: Point' a
+         ,segments :: [Segment a]}
+  deriving Show
+-- mapPoints :: (Point' a -> Point' b) -> Path' a -> Path' b
+instance Functor Path' where
+  fmap = fmapDefault
+
+instance Foldable Path' where
+  foldMap = foldMapDefault
+instance Traversable Path' where
+  traverse _ EmptyPath = pure EmptyPath
+  traverse f (Path s ss) = Path <$> traverse f s <*> traverse (traverse f) ss
+
+
+-- | Tikz decoration
+newtype Decoration = Decoration String
+
+
+-- | Tikz line tip
+data LineTip = ToTip | CircleTip | NoTip | StealthTip | LatexTip | ReversedTip LineTip | BracketTip | ParensTip
+
+-- | Tikz color
+type Color = String
+
+-- | Tikz line cap
+data LineCap = ButtCap | RectCap | RoundCap
+
+-- | Tikz line join
+data LineJoin = MiterJoin | RoundJoin | BevelJoin
+
+-- | Tikz dash pattern
+type DashPattern = [(Constant,Constant)]
+
+-- | Path drawing options
+data PathOptions = PathOptions
+                     {_drawColor :: Maybe Color
+                     ,_fillColor :: Maybe Color
+                     ,_lineWidth :: Constant
+                     ,_startTip  :: LineTip
+                     ,_endTip    :: LineTip
+                     ,_lineCap   :: LineCap
+                     ,_lineJoin  :: LineJoin
+                     ,_dashPattern :: DashPattern
+                     ,_decoration :: Decoration
+                     }
+$(makeLenses ''PathOptions)
+
+-- | Size of a box, in points. boxDepth is how far the baseline is
+-- from the bottom. boxHeight is how far the baseline is from the top.
+-- (These are TeX meanings)
+data BoxSpec = BoxSpec {boxWidth, boxHeight, boxDepth :: Double}
+             deriving (Show)
+
+nilBoxSpec :: BoxSpec
+nilBoxSpec = BoxSpec 0 0 0
+
+data Backend lab m =
+                 Backend {_tracePath :: PathOptions -> FrozenPath -> m ()
+                         ,_traceLabel :: forall location (x :: * -> *). Monad x =>
+                                                 (location -> (FrozenPoint -> m ()) -> x ()) -> -- freezer
+                                                 (forall a. m a -> x a) -> -- embedder
+                                                 location ->
+                                                 lab -> -- label specification
+                                                 x BoxSpec
+                         }
+
+
+-- tracePath :: Lens' (Backend m) (PathOptions -> FrozenPath -> m ())
+-- tracePath f (Backend {..}) = fmap (\a -> Backend {_tracePath = a,..}) (f _tracePath)
+
+-- renderLabel :: Lens' (Backend m) (FrozenPoint -> m () -> m ())
+-- renderLabel f (Backend {..}) = fmap (\a -> Backend {_renderLabel = a,..}) (f _renderLabel)
+
+-- declareLabel :: Lens' (Backend m) (FrozenPoint -> m () -> m ())
+-- declareLabel f (Backend {..}) = fmap (\a -> Backend {_declareLabel = a,..}) (f _declareLabel)
+
+$(makeLenses ''Backend) -- does not work due to the existential
+
+data Env lab m = Env {_diaTightness :: Constant -- ^ Multiplicator to minimize constraints
+                     ,_diaPathOptions :: PathOptions
+                     ,_diaBackend :: Backend lab m}
+
+$(makeLenses ''Env)
+
+
+
+defaultPathOptions :: PathOptions
+defaultPathOptions = PathOptions
+  {_drawColor = Nothing
+  ,_fillColor = Nothing
+  ,_lineWidth = 0.4
+  ,_startTip  = NoTip
+  ,_endTip    = NoTip
+  ,_lineCap   = ButtCap
+  ,_lineJoin  = MiterJoin
+  ,_dashPattern = []
+  ,_decoration = Decoration ""
+  }
+
+data Freeze m where
+  Freeze :: forall t m. Functor t => (t Constant -> m ()) -> t Expr -> Freeze m
+
+newtype Diagram lab m a = Dia (RWST (Env lab m) [Freeze m] (Var,LPState) m a)
+  deriving (Monad, Applicative, Functor, MonadReader (Env lab m), MonadWriter [Freeze m])
+
+freeze :: (Functor t, Monad m) => t Expr -> (t Constant -> m ()) -> Diagram lab m ()
+freeze x f = tell [Freeze (\y -> (f y)) x]
+
+instance Monad m => MonadState LPState (Diagram lab m) where
+  get = Dia $ snd <$> get
+  put y = Dia $ do
+    (x,_) <- get
+    put (x,y)
+
+-------------
+-- Diagrams
+
+
+relax :: Monad m => Constant -> Diagram lab m a -> Diagram lab m a
+relax factor = tighten (1/factor)
+
+tighten :: Monad m => Constant -> Diagram lab m a -> Diagram lab m a
+tighten factor = local (over diaTightness (* factor))
+
+-- instance Monoid (Diagram lab m ()) where
+--   mempty = return ()
+--   mappend = (>>)
+
+-- instance IsString (Diagram ()) where
+--   fromString = diaRawTex . tex
+
+--------------
+-- Variables
+
+rawNewVar :: Monad m => Diagram lab m Var
+rawNewVar = Dia $ do
+      (Var x,y) <- get
+      put $ (Var (x+1),y)
+      return $ Var x
+
+newVar :: Monad m => Diagram lab m Expr
+newVar = do
+  [v] <- newVars [ContVar]
+  return v
+
+newVars :: Monad m => [VarKind] -> Diagram lab m [Expr]
+newVars kinds = newVars' (zip kinds (repeat Free))
+
+newVars' :: Monad m => [(VarKind,Bounds Constant)] -> Diagram lab m [Expr]
+newVars' kinds = forM kinds $ \(k,b) -> do
+  v <- rawNewVar
+  setVarKind v k
+  setVarBounds v b
+  return $ variable v
+
+infix 4 <==,===,>==
+
+----------------
+-- Expressions
+instance Fractional Expr where
+  fromRational ratio = constant (fromRational ratio)
+
+instance Num Expr where
+  fromInteger x = LinExpr M.empty (fromInteger x)
+  negate = neg
+  (+) = (^+^)
+  (-) = (^-^)
+
+runDiagram :: Monad m => Backend lab m -> Diagram lab m a -> m a
+runDiagram backend (Dia diag) = do
+  (a,(_,problem),ds) <- runRWST diag (Env 1 defaultPathOptions backend)
+                                        (Var 0,LP Min M.empty [] M.empty M.empty)
+  let solution = case unsafePerformIO $ glpSolveVars simplexDefaults problem of
+        (_retcode,Just (_objFunc,s)) -> s
+        (retcode,Nothing) -> error $ "LP failed ret code = " ++ show retcode
+  -- Raw Normal $ "%problem solved: " ++ show problem ++ "\n"
+  forM_ ds (\(Freeze f x) -> f (fmap (valueIn solution) x))
+  return a
+
+
+valueIn :: Solution -> Expr -> Double
+valueIn sol (LinExpr m c) = sum (c:[scale * varValue v | (v,scale) <- M.assocs m])
+ where varValue v = M.findWithDefault 0 v sol
+
+variable :: Var -> Expr
+variable v = LinExpr (var v) 0
+
+constant :: Constant -> Expr
+constant c = LinExpr M.empty c
+
+(*-) :: Module Constant a => Constant -> a -> a
+(*-) = (*^)
+infixr 6 *-
+
+avg :: Module Constant a => [a] -> a
+avg xs = (1/fromIntegral (length xs)) *- gsum xs
+
+-- | Absolute value, which can be MINIMIZED or put and upper bound on (but not
+-- the other way around).
+absoluteValue :: Monad m => Expr -> Diagram lab m Expr
+absoluteValue x = do
+  [t1,t2] <- newVars' [(ContVar,LBound 0),(ContVar,LBound 0)]
+  t1 - t2 === x
+  return $ t1 + t2
+
+satAll :: Monad m => (Expr -> a -> Diagram lab m b) -> [a] -> Diagram lab m Expr
+satAll p xs = do
+  [m] <- newVars [ContVar]
+  mapM_ (p m) xs
+  return m
+
+-- | Minimum or maximum of a list of expressions.
+maximVar, minimVar :: Monad m => [Expr] -> Diagram lab m Expr
+maximVar = satAll (>==)
+minimVar = satAll (<==)
+
+--------------
+-- Expression constraints
+(===), (>==), (<==) :: Expr -> Expr -> Monad m => Diagram lab m ()
+e1 <== e2 = do
+  let LinExpr f c = e1 - e2
+  leqTo f (negate c)
+
+(>==) = flip (<==)
+
+e1 === e2 = do
+  let LinExpr f c = e1 - e2
+  equalTo f (negate c)
+
+-- | minimize the distance between expressions
+(=~=) :: Monad m => Expr -> Expr -> Diagram lab m ()
+x =~= y = minimize =<< absoluteValue (x-y)
+
+-------------------------
+-- Expression objectives
+
+minimize,maximize :: Monad m => Expr -> Diagram lab m ()
+minimize (LinExpr x _) = do
+  tightness <- view diaTightness
+  addObjective (tightness *- x)
+maximize = minimize . negate
+
+
+drawText :: Monad m => Point' Expr -> lab -> Diagram lab m BoxSpec
+drawText point lab = do
+  tl <- view (diaBackend . traceLabel)
+  tl freeze diaRaw point lab
+
+diaRaw :: Monad m => m a -> Diagram lab m a
+diaRaw = Dia . lift
diff --git a/Graphics/Diagrams/DerivationTrees.hs b/Graphics/Diagrams/DerivationTrees.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams/DerivationTrees.hs
@@ -0,0 +1,199 @@
+{-# LANGUAGE DisambiguateRecordFields, NamedFieldPuns, RecordWildCards, PostfixOperators, LiberalTypeSynonyms, TypeOperators, OverloadedStrings, PackageImports, ScopedTypeVariables #-}
+
+module Graphics.Diagrams.DerivationTrees (
+-- * Basics
+module Data.Monoid,
+module Data.LabeledTree,
+
+-- * Derivation' building
+-- axiom, rule, etc, aborted,
+emptyDrv, haltDrv', delayPre,
+dummy, rule, Derivation, Premise, Rule(..),
+
+-- * Links
+LineStyle,defaultLink,Link(..),
+
+-- * Engine
+derivationTreeDiag, delayD
+
+) where
+
+-- import DerivationTrees.Basics
+import Control.Monad.Writer
+import Data.LabeledTree
+import Data.Monoid
+import Graphics.Diagrams as D
+import qualified Data.Tree as T
+------------------
+--- Basics
+
+type LineStyle = PathOptions -> PathOptions
+
+data Link lab = Link {label :: lab, linkStyle :: LineStyle, steps :: Int}  -- ^ Regular link
+              | Delayed -- ^ automatic delaying
+
+defaultLink :: Monoid lab => Link lab
+defaultLink = Link mempty (denselyDotted . outline "black")  0
+
+
+-------------------
+
+data Rule lab = Rule {ruleStyle :: LineStyle, delimiter :: lab, ruleLabel :: lab, conclusion :: lab}
+--  deriving Show
+
+type Premise lab = Link lab ::> Derivation lab
+type Derivation lab = Tree (Link lab) (Rule lab)
+
+--------------------------------------------------
+-- Delay
+
+depth :: forall lab t. Link lab ::> Tree (Link lab) t -> Int
+depth (Link{steps} ::> Node _ ps) = 1 + steps + maximum (0 : map depth ps)
+
+isDelayed :: Premise lab -> Bool
+isDelayed (Delayed{} ::> _) = True
+isDelayed _ = False
+
+delayPre :: forall lab a. Int -> Link lab ::> a -> Link lab ::> a
+delayPre s (Link {..} ::> j) = Link {steps = s, ..} ::> j
+
+delayD :: Monoid lab => Derivation lab -> Derivation lab
+delayD (Node r ps0) = Node r (map delayP ps)
+    where ps = fmap (fmap delayD) ps0
+          ps' = filter (not . isDelayed) ps
+          delayP (Delayed ::> d) = defaultLink {steps = 1 + maximum (0 : map depth ps')} ::> d
+          delayP p = p
+
+----------------------------------------------------------
+-- Diagramify
+
+derivationTreeDiag :: Monad m => Derivation lab -> Diagram lab m ()
+derivationTreeDiag d = do
+  [h] <- newVars [ContVar] -- the height of a layer in the tree.
+  minimize h
+  h >== 1
+  tree@(T.Node (_,n,_) _) <- toDiagram h d
+  forM_ (T.levels tree) $ \ls ->
+    case ls of
+      [] -> return ()
+      (_:ls') -> forM_ (zip ls ls') $ \((_,_,l),(r,_,_)) ->
+        (l + Point 10 0) `westOf` r
+  let leftFringe = map head nonNilLevs
+      rightFringe = map last nonNilLevs
+      nonNilLevs = filter (not . null) $ T.levels tree
+  [leftMost,rightMost] <- newVars [ContVar,ContVar]
+  forM_ leftFringe $ \(p,_,_) ->
+    leftMost <== xpart p
+  forM_ rightFringe $ \(_,_,p) ->
+    xpart p <== rightMost
+  minimize $ 10 *- (rightMost - leftMost)
+  n # Center .=. Point 0 0
+
+toDiagPart :: Monad m => Expr -> Premise lab -> Diagram lab m (T.Tree (Point,Anchorage,Point))
+toDiagPart layerHeight (Link{..} ::> rul)
+  | steps == 0 = toDiagram layerHeight rul
+  | otherwise = do
+    above@(T.Node (_,concl,_) _) <- toDiagram layerHeight rul
+    ptObj <- vrule
+    let pt = ptObj # S
+    pt `eastOf` (concl # W)
+    pt `westOf` (concl # E)
+    xpart pt =~= xpart (concl # Center)
+    let top = ypart (concl # S)
+    ypart pt + (fromIntegral steps *- layerHeight) === top
+    using linkStyle $ path $ polyline [ptObj # Base,Point (xpart pt) top]
+    let embedPt 1 x = T.Node (concl # W,ptObj,concl # E) [x]
+        embedPt n x = T.Node (pt,ptObj,pt) [embedPt (n-1) x]
+    return $ embedPt steps above
+
+-- | @chainBases distance objects@
+-- - Ensures that all the objects have the same baseline.
+-- - Separates the objects by the given distance
+-- - Returns an object encompassing the group, with a the baseline set correctly.
+-- - Returns the average distance between the objects
+
+chainBases :: Monad m => Expr -> [Anchorage] -> Diagram lab m (Anchorage,Expr)
+chainBases _ [] = do
+  o <- box
+  return (o,0)
+chainBases spacing ls = do
+  grp <- box
+  forM_ [Base,N,S] $ \ anch -> do
+    D.align ypart $ map (# anch) (grp:ls)
+  dxs <- forM (zip ls (tail ls)) $ \(x,y) -> do
+    let dx = xdiff (x # E) (y # W)
+    dx >== spacing
+    return dx
+  D.align xpart [grp # W,head ls # W]
+  D.align xpart [grp # E,last ls # E]
+  return (grp,avg dxs)
+
+-- | Put object in a box of the same vertical extent, and baseline,
+-- but whose height can be bigger.
+relaxHeight :: (Monad m, Anchored a) => a -> Diagram lab m Anchorage
+relaxHeight o = do
+  b <- box
+  -- using (outline "green")$ traceBounds o
+  D.align xpart [b#W,o#W]
+  D.align xpart [b#E,o#E]
+  D.align ypart [b#Base,o#Base]
+  o `fitsVerticallyIn` b
+  return b
+
+toDiagram :: Monad m => Expr -> Derivation lab -> Diagram lab m (T.Tree (Point,Anchorage,Point))
+toDiagram layerHeight (Node Rule{..} premises) = do
+  ps <- mapM (toDiagPart layerHeight) premises
+  concl <- relaxHeight =<< extend 1.5 <$> labelBox conclusion
+  -- using (outline "red")$ traceBounds concl
+  lab <- labelBox ruleLabel
+
+  -- Grouping
+  (psGrp,premisesDist) <- chainBases 10 [p | T.Node (_,p,_) _ <- ps]
+  -- using (outline "blue" . denselyDotted) $ traceBounds psGrp
+  height psGrp === layerHeight
+
+  -- Sepaartion rule
+  separ <- hrule
+  separ # N .=. psGrp # S
+  align ypart [concl # N,separ # S]
+  minimize $ width separ
+  psGrp `fitsHorizontallyIn` separ
+  concl `fitsHorizontallyIn` separ
+
+  -- rule label
+  lab # BaseW .=. separ # E + Point 3 (negate 1)
+
+
+  -- layout hints (not necessary for "correctness")
+  let xd = xdiff (separ # W) (psGrp # W)
+  xd   === xdiff (psGrp # E) (separ # E) 
+  relax 2 $ (2 *- xd) =~= premisesDist
+  -- centering of conclusion
+  xd' <- absoluteValue $ xdiff (separ # Center) (concl # Center)
+  relax 3 $ minimize xd'
+
+  -- draw the rule.
+  using ruleStyle $ path $ polyline [separ # W,separ # E]
+  return $ T.Node (separ # W, concl, lab # E) ps
+
+-----------------------
+
+
+rule :: Monoid lab => lab -> lab -> Rule lab
+rule ruleLabel conclusion = Rule {delimiter = mempty, ruleStyle = outline "black", ..}
+
+dummy :: Monoid lab => Rule lab
+dummy = (rule mempty mempty) {ruleStyle = const defaultPathOptions}
+
+emptyDrv :: forall k lab. Monoid lab => Tree k (Rule lab)
+emptyDrv = Node dummy []
+
+-- abortDrv (Node Rule {..} _) = Node Rule {ruleStyle = Waved, ..} []
+
+-- | Used when the rest of the derivation is known.
+haltDrv' :: forall lab. Monoid lab => lab -> Derivation lab -> Derivation lab
+haltDrv' tex (Node r _) = Node r {ruleStyle = noOutline}
+     [lnk {steps = 1, label = tex} ::> emptyDrv]
+  where lnk :: Link lab
+        lnk = defaultLink
+
diff --git a/Graphics/Diagrams/Graphviz.hs b/Graphics/Diagrams/Graphviz.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams/Graphviz.hs
@@ -0,0 +1,110 @@
+{-# LANGUAGE RecordWildCards, ScopedTypeVariables #-}
+module Graphics.Diagrams.Graphviz (graph) where
+
+import Graphics.Diagrams.Point as D
+import Graphics.Diagrams.Object as D
+import Graphics.Diagrams.Core as D
+import Graphics.Diagrams.Path
+import Data.GraphViz as G
+import Data.GraphViz.Attributes.Complete as G
+import Data.GraphViz.Parsing as G
+import qualified Data.GraphViz.Types.Generalised as Gen
+import Data.GraphViz.Commands.IO as G
+import qualified Data.Text.Lazy as T
+import System.IO.Unsafe (unsafePerformIO)
+import Data.Foldable
+import Control.Lens (set)
+import Graphics.Typography.Geometry.Bezier (Curve)
+
+graph :: (Monad m,PrintDotRepr g n, ParseDot n, PrintDot n) => (String -> lab) -> GraphvizCommand -> g n -> Diagram lab m ()
+graph labFct cmd gr = graphToDiagram labFct $ layout cmd gr
+
+layout :: (PrintDotRepr g n, ParseDot n, PrintDot n) => GraphvizCommand -> g n -> Gen.DotGraph n
+layout command input = parseIt' $ unsafePerformIO $ graphvizWithHandle command input DotOutput hGetStrict 
+
+pos (Pos p) = Just p
+pos _= Nothing
+
+lpos (LPos p) = Just p
+lpos _= Nothing
+
+shapeA (Shape s) = Just s
+shapeA _ = Nothing
+
+widthA (Width s) = Just s
+widthA _ = Nothing
+
+labelA (Label l) = Just l
+labelA _ = Nothing
+
+arrowHeadA (ArrowHead a) = Just a
+arrowHeadA _ = Nothing
+
+readAttr :: Monad m => (Attribute -> Maybe a) -> [Attribute] -> (a -> m ()) -> m ()
+readAttr f as k = readAttr' f as k (return ())
+
+readAttr' :: (Attribute -> Maybe a) -> [Attribute] -> (a -> k) -> k -> k
+readAttr' f as k1 k2 = case [x | Just x <- map f as] of
+  (x:_) -> k1 x
+  _ -> k2
+
+
+pt' (G.Point x y _z _forced) = D.Point x y
+pt = unfreeze . pt'
+
+diaSpline :: [FrozenPoint] -> [Graphics.Typography.Geometry.Bezier.Curve]
+diaSpline (w:x:y:z:rest) = curveSegment w x y z:diaSpline (z:rest)
+diaSpline _ = []
+
+-- ToTip | CircleTip | NoTip | StealthTip | LatexTip | ReversedTip LineTip | BracketTip | ParensTip
+tipTop :: LineTip -> ArrowType -> LineTip
+tipTop def (AType [(_,NoArrow)]) = NoTip
+tipTop def (AType [(_,Normal)]) = LatexTip
+tipTop def (AType [(_,DotArrow)]) = CircleTip
+tipTop def (AType [(_,Vee)]) = StealthTip
+tipTop def _ = def
+
+graphToDiagram :: forall l m n. Monad m => (String -> l) -> Gen.DotGraph n -> Diagram l m ()
+graphToDiagram labFct (Gen.DotGraph _strict _directed _grIdent stmts) = do
+  forM_ stmts $ \ stmt -> case stmt of
+    (Gen.DE (DotEdge _from _to attrs)) -> do
+      -- diaRaw $ tex $ "%Edge: " ++ show attrs ++ "\n"
+      let toTip = readAttr' arrowHeadA attrs (tipTop ToTip) ToTip
+      readAttr labelA attrs $ \(StrLabel l) ->
+        readAttr lpos attrs $ \p -> 
+        renderLab l p
+      readAttr pos attrs $ \(SplinePos splines) ->
+        forM_ splines $ \Spline{..} -> do
+          let mid = diaSpline $ map pt' splinePoints
+          let beg = case (startPoint,splinePoints) of
+                (Just p,q:_) -> [lineSegment (pt' p) (pt' q)]
+                _ -> []
+          let end = case (endPoint,reverse splinePoints) of
+                (Just p,q:_) -> [lineSegment (pt' q) (pt' p)]
+                _ -> []
+          using (set endTip toTip) $
+            draw $ frozenPath' $ fromBeziers (beg ++ mid ++ end)
+
+    (Gen.DN (DotNode _nodeIdent attrs)) -> do
+      -- diaRaw $ tex $ "%Node: " ++ show attrs ++ "\n"
+      readAttr pos   attrs $ \(PointPos p) -> do
+        readAttr labelA attrs $ \l -> do
+          case l of
+            StrLabel l -> renderLab l p
+        readAttr widthA attrs $ \w ->
+         readAttr shapeA attrs $ \s ->
+          case s of
+            Circle -> do
+              draw $ path $ circle (pt p) (constant $ inch (w/2))
+            _ -> return ()
+    _ -> return ()
+  where
+  renderLab :: T.Text -> G.Point -> Diagram l m ()
+  renderLab l p = do
+    l' <- labelObj $ labFct $ T.unpack $ l
+    l' # D.Center .=. pt p
+
+
+inch x = 72 * x
+
+
diff --git a/Graphics/Diagrams/Object.hs b/Graphics/Diagrams/Object.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams/Object.hs
@@ -0,0 +1,305 @@
+{-# LANGUAGE DataKinds, KindSignatures, OverloadedStrings, EmptyDataDecls, MultiParamTypeClasses, FlexibleContexts, TypeSynonymInstances, FlexibleInstances, GADTs, LambdaCase   #-}
+
+module Graphics.Diagrams.Object where
+
+-- import MarXup
+-- import MarXup.Tex
+import Graphics.Diagrams.Path
+import Graphics.Diagrams.Point
+import Graphics.Diagrams.Core
+import Control.Monad
+-- import Control.Applicative
+-- import Data.Algebra
+-- import Data.List (intersperse)
+import Control.Lens (set,view)
+
+data Anchor = Center | N | NW | W | SW | S | SE | E | NE | BaseW | Base | BaseE
+  deriving Show
+
+-- | Box-shaped object. (a subtype)
+type Box = Object
+
+newtype Anchorage = Anchorage {fromAnchorage :: Anchor -> Point}
+data Object = Object {objectOutline :: Path, objectAnchorage :: Anchorage}
+
+class Anchored a where
+  anchors :: a -> Anchorage
+  
+infix 8 #
+
+(#) :: Anchored a => a -> Anchor -> Point
+(#) = fromAnchorage . anchors
+
+instance Anchored Anchorage where
+  anchors = id
+
+instance Anchored Object where
+  anchors = objectAnchorage
+
+instance Anchored Point where
+  anchors p = Anchorage $ \_ -> p
+
+-- | Horizontal distance between objects
+hdist :: Anchored a => a -> a -> Expr
+hdist x y = xpart (y # W - x # E)
+
+-- | Vertical distance between objects
+vdist :: Anchored a => a -> a -> Expr
+vdist x y = ypart (y # S - x # N)
+
+-- | Extend the box boundaries by the given delta
+extend :: Expr -> Anchorage -> Anchorage
+extend e o = Anchorage $ \a -> o # a + shiftInDir a e
+
+-- | Makes a shift of size 'd' in the given direction.
+shiftInDir :: Anchor -> Expr -> Point
+shiftInDir N d = 0 `Point` d
+shiftInDir S d = 0 `Point` negate d
+shiftInDir W d = negate d `Point` 0
+shiftInDir BaseW d = negate d `Point` 0
+shiftInDir E d  = d `Point` 0
+shiftInDir BaseE d  = d `Point` 0
+shiftInDir NW d = negate d `Point` d
+shiftInDir SE d = d `Point` negate d
+shiftInDir SW d = negate d `Point` negate d
+shiftInDir NE d = d `Point` d
+shiftInDir _ _  = 0 `Point` 0
+
+-- | Make a label object. This is just some text surrounded by 4
+-- points of blank.
+mkLabel :: Monad m => lab -> Diagram lab m Anchorage
+mkLabel texCode = extend 4 <$> labelBox texCode
+
+labelObj :: Monad m => lab -> Diagram lab m Box
+labelObj = rectangleShape <=< mkLabel
+
+-- | Label a point by a given TeX expression, at the given anchor.
+labelPt :: Monad m => lab -> Anchor -> Point -> Diagram lab m Box
+labelPt labell anchor labeled  = do
+  t <- labelObj labell
+  t # anchor .=. labeled
+  return t
+
+-- | A free point
+point :: Monad m => Diagram lab m Point
+point = do
+  [x,y] <- newVars (replicate 2 ContVar)
+  return $ Point x y
+
+-- | A point anchorage (similar to a box of zero width and height)
+pointBox :: Monad m => Diagram lab m Anchorage
+pointBox = anchors <$> point
+
+-- | A box. Anchors are aligned along a grid.
+box :: Monad m => Diagram lab m Anchorage
+box = do
+  [n,s,e,w,base,midx,midy] <- newVars (replicate 7 ContVar)
+  n >== base
+  base >== s
+  w <== e
+  
+  midx === avg [w,e]
+  midy === avg [n,s]
+  let pt = flip Point
+  return $ Anchorage $ \anch -> case anch of
+    NW     -> pt n    w
+    N      -> pt n    midx
+    NE     -> pt n    e  
+    E      -> pt midy e
+    SE     -> pt s    e
+    S      -> pt s    midx
+    SW     -> pt s    w
+    W      -> pt midy w
+    Center -> pt midy midx
+    Base   -> pt base midx
+    BaseE  -> pt base e
+    BaseW  -> pt base w
+
+-- | A box of zero width
+vrule :: Monad m => Diagram lab m Anchorage
+vrule = do
+  o <- box
+  align xpart [o # W, o #Center, o#E]
+  return o
+
+-- | A box of zero height
+hrule :: Monad m => Diagram lab m Anchorage
+hrule = do
+  o <- box
+  height o === 0
+  return o
+
+height, width, ascent, descent :: Anchored a => a -> Expr
+height o = ypart (o # N - o # S)
+width o = xpart (o # E - o # W)
+ascent o = ypart (o # N - o # Base)
+descent o = ypart (o # Base - o # S)
+
+-- | Make one object fit (snugly) in the other.
+fitsIn, fitsHorizontallyIn, fitsVerticallyIn :: (Monad m, Anchored a, Anchored b) => a -> b -> Diagram lab m ()
+o `fitsVerticallyIn` o' = do
+  let dyN = ypart $ o' # N - o # N
+      dyS = ypart $ o # S - o' # S
+  minimize dyN
+  dyN >== 0
+  minimize dyS
+  dyS >== 0
+
+o `fitsHorizontallyIn` o' = do
+  let dyW = xpart $ o # W - o' # W
+      dyE = xpart $ o' # E - o # E
+  minimize dyW
+  dyW >== 0
+  minimize dyE
+  dyE >== 0
+
+a `fitsIn` b = do
+  a `fitsHorizontallyIn` b
+  a `fitsVerticallyIn` b
+
+-- | A circle
+circleShape :: Monad m => Diagram lab m Object
+circleShape = do
+  anch <- box
+  width anch === height anch
+  let radius = 0.5 *- width anch
+  let p = circle (anch # Center) radius
+  path p
+  return $ Object p anch
+--   let k1 :: Constant
+--       k1 = sqrt 2 / 2
+--       k = k1 *^ r
+--       p = circle center r
+--   return $ Object p $ Anchorage $ \a -> center + case a of
+--     N -> Point 0 r
+--     S -> Point 0 (-r)
+--     E -> Point r 0
+--     W -> Point (-r) 0
+--     Center -> Point 0 0
+--     NE -> Point k k
+
+rectangleShape :: Monad m => Anchorage -> Diagram lab m Object
+rectangleShape l = do
+  let p = polygon (map (l #) [NW,NE,SE,SW])
+  path p
+  return $ Object p l
+
+traceAnchorage :: (Anchored a, Monad m) => Color -> a -> Diagram lab m ()
+traceAnchorage c l = do
+  stroke c $ path $ polygon (map (l #) [NW,NE,SE,SW])
+  -- TODO: draw the baseline, etc.
+
+-- | Typeset a piece of text and return its bounding box.
+labelBox :: Monad m => lab -> Diagram lab m Anchorage
+labelBox t = do
+  l <- box
+  -- traceAnchorage "red" l
+  BoxSpec wid h desc <- drawText (l # NW) t
+
+  width   l === constant wid
+  descent l === constant desc
+  height  l === constant (h + desc)
+  return l
+
+-- | A vector with an origin
+data OVector = OVector { vectorOrigin, vectorMagnitude :: Point }
+
+-- | Turn the orientation by 180 degrees
+turn180 :: OVector -> OVector
+turn180 (OVector p v) = OVector p (negate v)
+
+data FList xs a where
+  NIL :: FList '[] a
+  (:%>) :: Functor t => t a -> FList fs a -> FList ('(:) t fs) a
+
+infixr :%>
+
+instance Functor (FList xs) where
+  fmap _ NIL = NIL
+  fmap f (x :%> xs) = fmap f x :%> fmap f xs
+  
+-- | Traces a straight edge between two objects.
+-- A vector originated at the midpoint and pointing perpendicular to
+-- the edge is returned.
+edge :: Monad m => Object -> Object -> Diagram lab m OVector
+edge source target = do
+  let points@[a,b] = [source # Center,target # Center]
+      link = polyline points
+      targetArea = objectOutline target
+      sourceArea = objectOutline source
+  options <- view diaPathOptions
+  tracePath' <- view (diaBackend . tracePath)
+  freeze (link :%> sourceArea :%> targetArea :%> NIL) $ \(l' :%> sa' :%> ta' :%> NIL) -> do
+       tracePath' options $ (l' `cutAfter` ta') `cutBefore` sa'
+  return $ OVector (avg points) (rotate90 (b-a))
+
+(.<.) :: Monad m => Point -> Point -> Diagram lab m ()
+Point x1 y1 .<. Point x2 y2 = do
+  x1 <== x2
+  y1 <== y2
+
+-- | Forces the point to be inside the (bounding box) of the object.
+insideBox :: Monad m => Anchored a => Point -> a -> Diagram lab m ()
+insideBox p o = do
+  (o # SW) .<. p
+  p .<. (o # NE)
+
+-- | @autoLabel o i@ Layouts the label object @o@ at the given incidence
+-- vector.
+autoLabelObj :: Monad m => Box -> OVector -> Diagram lab m ()
+autoLabelObj lab (OVector pt norm) = do
+  pt `insideBox` lab
+  minimize =<< orthoDist (lab#Center) (pt + norm)
+
+-- | @autoLabel o i@ Layouts the label object @o@ at the given incidence
+-- vector.
+autoLabel :: Monad m => lab -> OVector -> Diagram lab m ()
+autoLabel lab i = do
+  o <- labelObj lab
+  autoLabelObj o i
+
+-- | @labeledEdge label source target@
+labeledEdge :: Monad m => Object -> Object -> Box -> Diagram lab m ()
+labeledEdge source target lab = autoLabelObj lab =<< edge source target
+
+-------------------
+-- Even higher-level primitives:
+
+nodeDistance :: Expr
+nodeDistance = 5
+
+leftOf :: Monad m => Object -> Object -> Diagram lab m ()
+a `leftOf` b = spread hdist nodeDistance [a,b]
+
+topOf :: Monad m => Object -> Object -> Diagram lab m ()
+a `topOf` b =  spread vdist nodeDistance [b,a]
+
+-- | Spread a number of objects by *minimum* a given distance. example: @spread
+-- hdist 30 ps@
+spread :: Monad m => (t -> t -> Expr) -> Expr -> [t] -> Diagram lab m ()
+spread f d (x:y:xs) = do
+  f x y >== d
+  minimize $ f x y
+  spread f d (y:xs)
+spread _ _ _ = return ()
+
+-- | A node: a labeled circle
+node :: Monad m => lab -> Diagram lab m Object
+node lab = do
+  l <- extend 4 <$> labelBox lab
+  c <- draw $ circleShape
+  l `fitsIn` c
+  l # Center .=. c # Center
+  return c
+
+-- | Draw an arrow between two objects
+arrow :: Monad m => Object -> Object -> Diagram lab m OVector
+arrow src trg = using (outline "black" . set endTip LatexTip) $ do
+  edge src trg
+
+-- | Bounding box of a number of anchored values
+boundingBox :: (Monad m, Anchored a) => [a] -> Diagram lab m Object
+boundingBox os = do
+  bx <- box
+  mapM_ (`fitsIn` bx) os
+  rectangleShape bx
diff --git a/Graphics/Diagrams/Path.hs b/Graphics/Diagrams/Path.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams/Path.hs
@@ -0,0 +1,174 @@
+{-# LANGUAGE TypeSynonymInstances, FlexibleContexts, FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, RecursiveDo, TypeFamilies, OverloadedStrings, RecordWildCards,UndecidableInstances, PackageImports, TemplateHaskell #-}
+
+module Graphics.Diagrams.Path where
+
+import Graphics.Diagrams.Core
+import Graphics.Diagrams.Point
+import Data.Traversable
+import Data.Foldable
+import Data.Algebra
+-- import Data.Traversable
+-- import Data.Foldable
+import Graphics.Typography.Geometry.Bezier
+import Graphics.Typography.Geometry.Bezier as Graphics.Diagrams.Point (Curve) 
+import Control.Applicative
+import Data.List (sort,transpose)
+import Data.Maybe (listToMaybe)
+import Prelude hiding (sum,mapM_,mapM,concatMap,maximum,minimum)
+import qualified Data.Vector.Unboxed as V
+import Algebra.Polynomials.Bernstein (restriction,Bernsteinp(..))
+import Control.Lens (over, set, view)
+import Control.Monad.Reader (local)
+
+unfreeze :: Functor t => t Constant -> t Expr
+unfreeze = fmap constant
+
+toBeziers :: FrozenPath -> [Curve]
+toBeziers EmptyPath = []
+toBeziers (Path start ss) | not (null ss) &&
+                            isCycle (last ss) = toBeziers' start (init ss ++ [StraightTo start])
+                          | otherwise = toBeziers' start ss
+
+curveSegment (Point xa ya) (Point xb yb) (Point xc yc) (Point xd yd) = bezier3 xa ya xb yb xc yc xd yd
+lineSegment (Point xa ya) (Point xb yb) = line xa ya xb yb
+
+toBeziers' :: FrozenPoint -> [Frozen Segment] -> [Curve]
+toBeziers' _ [] = []
+toBeziers' start (StraightTo next:ss) = curveSegment start mid mid next : toBeziers' next ss
+  where mid = avg [start, next]
+toBeziers' p (CurveTo c d q:ss) = curveSegment p c d q : toBeziers' q ss
+
+fromBeziers :: [Curve] -> FrozenPath
+fromBeziers [] = EmptyPath
+fromBeziers (Bezier cx cy t0 t1:bs) = case map toPt $ V.foldr (:) [] cxy of
+      [p,c,d,q] -> Path p (CurveTo c d q:rest)
+      [p,q] -> Path p (StraightTo q:rest)
+  where [cx',cy'] = map (\c -> coefs $ restriction c t0 t1) [cx,cy]
+        cxy = V.zip cx' cy'
+        toPt (x,y) = Point x y
+        rest = pathSegments (fromBeziers bs)
+
+pathSegments :: Path' t -> [Segment t]
+pathSegments EmptyPath = []
+pathSegments (Path _ ss) = ss
+
+isCycle Cycle = True
+isCycle _  = False
+
+frozenPointElim (Point x y) f = f x y
+
+splitBezier (Bezier cx cy t0 t1) (u,v,_,_) = (Bezier cx cy t0 u, Bezier cx cy v t1)
+
+clipOne :: Curve -> [Curve] -> Maybe Curve
+clipOne b cutter = fmap firstPart $ listToMaybe $ sort $ concatMap (inter b) cutter
+  where firstPart t = fst $ splitBezier b t
+
+-- | @cutAfter path area@ cuts the path after its first intersection with the @area@.
+cutAfter', cutBefore' :: [Curve] -> [Curve] -> [Curve]
+cutAfter' [] _cutter = []
+cutAfter' (b:bs) cutter = case clipOne b cutter of
+  Nothing -> b:cutAfter' bs cutter
+  Just b' -> [b']
+ 
+revBernstein (Bernsteinp n c) = Bernsteinp n (V.reverse c)
+revBeziers :: [Curve] -> [Curve]
+revBeziers = reverse . map rev
+  where rev (Bezier cx cy t0 t1) = (Bezier (revBernstein cx) (revBernstein cy) (1-t1) (1-t0))
+
+cutBefore' path area = revBeziers $ cutAfter' (revBeziers path) area
+
+onBeziers :: ([Curve] -> [Curve] -> [Curve])
+             -> FrozenPath -> FrozenPath -> FrozenPath
+onBeziers op p' q' = fromBeziers $ op (toBeziers p') (toBeziers q')
+
+
+cutAfter :: FrozenPath -> FrozenPath -> FrozenPath
+cutAfter = onBeziers cutAfter'
+
+cutBefore :: FrozenPath -> FrozenPath -> FrozenPath
+cutBefore = onBeziers cutBefore'
+
+-----------------
+-- Paths
+
+
+type Path = Path' Expr
+
+polyline :: [Point] -> Path
+polyline [] = EmptyPath
+polyline (x:xs) = Path x (map StraightTo xs)
+
+polygon :: [Point] -> Path
+polygon [] = EmptyPath
+polygon (x:xs) = Path x (map StraightTo xs ++ [Cycle])
+
+
+-- | Circle approximated with 4 cubic bezier curves
+circle :: Point -> Expr -> Path
+circle center r =      Path (pt r 0)
+                         [CurveTo (pt r k) (pt k r) (pt 0 r),
+                          CurveTo (pt (-k) r) (pt (-r) k) (pt (-r) 0),
+                          CurveTo (pt (-r) (-k)) (pt (-k) (-r)) (pt 0 (-r)),
+                          CurveTo (pt k (-r)) (pt r (-k)) (pt r 0),
+                          Cycle]
+ where k1 :: Constant
+       k1 = 4 * (sqrt 2 - 1) / 3
+       k = k1 *^ r
+       pt x y = center ^+^ (Point x y)
+
+
+path :: Monad m => Path -> Diagram lab m ()
+path p = do
+  options <- view diaPathOptions
+  tracePath' <- view (diaBackend . tracePath)
+  freeze p (tracePath' options)
+
+frozenPath' :: Monad m => FrozenPath -> Diagram lab m ()
+frozenPath' p = do
+  options <- view diaPathOptions
+  tracePath' <- view (diaBackend . tracePath)
+  freeze [] $ \_ -> tracePath' options p
+
+stroke :: Monad m => Color -> Diagram lab m a -> Diagram lab m a
+stroke color = using (outline color)
+
+draw :: Monad m => Diagram lab m a -> Diagram lab m a
+draw = stroke "black"
+
+noOutline :: PathOptions -> PathOptions
+noOutline = set drawColor Nothing
+
+outline :: Color -> PathOptions -> PathOptions
+outline color = set drawColor (Just color)
+
+fill :: Color -> PathOptions -> PathOptions
+fill color = set fillColor (Just color)
+
+zigzagDecoration :: PathOptions -> PathOptions
+zigzagDecoration = set decoration (Decoration "zigzag")
+
+using :: Monad m => (PathOptions -> PathOptions) -> Diagram lab m a -> Diagram lab m a
+using f = local (over diaPathOptions f)
+
+ultraThin, veryThin, thin, semiThick, thick, veryThick, ultraThick :: Constant
+ultraThin = 0.1
+veryThin = 0.2
+thin = 0.4
+semiThick = 0.6
+thick = 0.8
+veryThick = 1.2
+ultraThick = 1.6
+
+solid, dotted, denselyDotted, looselyDotted, dashed, denselyDashed,
+  looselyDashed, dashDotted, denselyDashdotted, looselyDashdotted :: PathOptions -> PathOptions
+solid             o@PathOptions{..} = o { _dashPattern = [] }
+dotted            o@PathOptions{..} = o { _dashPattern = [(_lineWidth,2)] }
+denselyDotted     o@PathOptions{..} = o { _dashPattern = [(_lineWidth, 1)] }
+looselyDotted     o@PathOptions{..} = o { _dashPattern = [(_lineWidth, 4)] }
+dashed            o@PathOptions{..} = o { _dashPattern = [(3, 3)] }
+denselyDashed     o@PathOptions{..} = o { _dashPattern = [(3, 2)] }
+looselyDashed     o@PathOptions{..} = o { _dashPattern = [(3, 6)] }
+dashDotted        o@PathOptions{..} = o { _dashPattern = [(3, 2), (_lineWidth, 2)] }
+denselyDashdotted o@PathOptions{..} = o { _dashPattern = [(3, 1), (_lineWidth, 1)] }
+looselyDashdotted o@PathOptions{..} = o { _dashPattern = [(3, 4), (_lineWidth, 4)] }
+
diff --git a/Graphics/Diagrams/Plot.hs b/Graphics/Diagrams/Plot.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams/Plot.hs
@@ -0,0 +1,128 @@
+{-# LANGUAGE FlexibleContexts, RankNTypes, DeriveFunctor #-}
+module Graphics.Diagrams.Plot where
+
+import Graphics.Diagrams.Core
+import Graphics.Diagrams.Path
+import Graphics.Diagrams.Object
+import Graphics.Diagrams.Point
+import Control.Monad (forM_,when)
+
+type Vec2 = Point'
+type Transform a = Iso a Constant
+
+-- | Generic axis rendering. @axisGen origin target anchor labels@
+-- traces an axis from origin to target, attaching the labels at
+-- anchor.
+axisGen :: Monad m => Point -> Point -> Anchor -> [(Constant,lab)] -> Diagram lab m ()
+axisGen origin target anch labels = do
+  draw {- using (set endTip ToTip) -} $ path $ polyline [origin,target]
+  when (not $ null $ labels) $ do
+    forM_ labels $ \(p,txt) -> do
+      l0 <- labelObj txt
+      let l = extend 3 (anchors l0)
+      draw $ path $ polyline [l0 # anch, l # anch]
+      l # anch .=. Point (lint p (xpart origin) (xpart target))
+                         (lint p (ypart origin) (ypart target))
+
+-- | @scale minx maxx@ maps the interval [minx,maxx] to [0,1]
+scale :: forall b. Fractional b => b -> b -> Iso b b
+scale minx maxx = Iso (\x -> (x - minx) / (maxx - minx))
+                      (\x -> x * (maxx - minx) + minx)
+
+-- | Make a number of steps
+mkSteps :: Transform a -> ShowFct lab a -> [a] -> [(Constant,lab)]
+mkSteps tx showFct xs = zip (map (forward tx) xs) (map showFct xs)
+
+-- | render an horizontal axis on the given box
+hAxis :: Monad m => Box -> [(Constant, lab)] -> Diagram lab m ()
+hAxis bx = axisGen (bx # SW) (bx # SE) N
+
+-- | render a vertical axis on the given box
+vAxis :: Monad m => Box -> [(Constant, lab)] -> Diagram lab m ()
+vAxis bx = axisGen (bx # SW) (bx # NW) E
+
+-- | Draw axes. Coordinates in the [0,1] fit the box.
+axes :: Monad m => Box -> Vec2 [(Constant, lab)] -> Diagram lab m ()
+axes bx zs = d1 >> d2
+  where Point d1 d2 = (Point hAxis vAxis) <*> pure bx <*> zs
+
+-- | Multiply the vector (origin --> target) by p.
+lint :: Constant -> Expr -> Expr -> Expr
+lint p origin target = (p*-(target-origin)) + origin
+
+-- | Draw a scatterplot in the given box.
+-- Input data in the [0,1] interval fits the box.
+scatterPlot :: Monad m => PlotCanvas a -> [Vec2 a] -> Diagram lab m ()
+scatterPlot (bx,xform) input = forM_ (map (forward <$> xform <*>) input) $ \z -> do
+  pt <- using (fill "black") $ circleShape
+  width pt === constant 3
+  pt # Center .=. interpBox bx z
+
+interpBox :: forall a. Anchored a => a -> Point' Constant -> Point' Expr
+interpBox bx z = lint <$> z <*> bx#SW <*> bx#NE
+
+-- | @functionPlot c n f@.
+-- Plot the function @f@ on the canvas @c@, using @n@ steps (precision).
+
+functionPlot :: Monad m => Show a => PlotCanvas a -> Int -> (a -> a) -> Diagram lab m ()
+functionPlot (bx,Point tx ty) nsteps f = draw $ path $ polyline points
+  where points = do
+           step <- [0..nsteps]
+           let xi :: Double
+               xi = fromIntegral step / fromIntegral nsteps
+               x = backward tx xi
+               y = f x
+               yi = forward ty y
+           return $ interpBox bx (Point xi yi)
+
+data Iso a b = Iso {forward :: a -> b, backward :: b -> a}
+
+after :: Iso b c -> Iso a b -> Iso a c
+(Iso f g) `after` (Iso h i) = Iso (f . h) (i . g)
+
+axisMarks :: a -> a -> Iso a Constant -> (a,[a],a)
+axisMarks lo hi trans = (u lo',(map u [lo'..hi']),u hi')
+  where u = backward trans
+        t = forward trans
+        lo' = fromIntegral $ (floor (t lo) :: Integer)
+        hi' = fromIntegral $ (ceiling (t hi) :: Integer)
+
+logAxis :: Constant -> Transform Constant
+logAxis base = Iso t u
+     where t x = log x / log base
+           u x = base ** x
+
+simplLinAxis :: Constant -> Transform Constant
+simplLinAxis step = Iso (/step) (*step)
+
+type ShowFct lab a = a -> lab
+
+mkAxes :: Vec2 (Transform a) -> Vec2 a -> Vec2 a -> (Vec2 [a], Vec2 (Transform a))
+mkAxes axesXform lows highs = (mrks <$> axisInfo,
+                               after <$> (scale <$> minz <*> maxz) <*> axesXform)
+  where axisInfo = axisMarks <$> lows <*> highs <*> axesXform
+        minz = t <*> (lo <$> axisInfo)
+        maxz = t <*> (hi <$> axisInfo)
+        t = forward <$> axesXform
+        lo (x,_,_) = x
+        mrks (_,x,_) = x
+        hi (_,_,x) = x
+
+type PlotCanvas a = (Box, Vec2 (Transform a))
+
+preparePlot :: Monad m => Vec2 (ShowFct lab a) -> Vec2 (Transform a) -> Vec2 a -> Vec2 a -> Diagram lab m (PlotCanvas a)
+preparePlot showFct axesXform lo hi = do
+  bx <- rectangleShape =<< box
+  axes bx marks
+  return (bx,xform)
+  where marks = mkSteps <$> xform <*> showFct <*> marks0
+        (marks0,xform) = mkAxes axesXform lo hi
+
+-- | Draw a 2D scatter plot, given an axis specification and a data
+-- set
+simplePlot :: (Ord a, Monad m) => Vec2 (ShowFct lab a) -> Vec2 (Transform a) -> [Vec2 a] -> Diagram lab m (PlotCanvas a)
+simplePlot showFct axesXform input = do
+  canvas <- preparePlot showFct axesXform (minimum <$> input') (maximum <$> input')
+  scatterPlot canvas input
+  return canvas
+  where input' = sequenceA input
diff --git a/Graphics/Diagrams/Point.hs b/Graphics/Diagrams/Point.hs
new file mode 100644
--- /dev/null
+++ b/Graphics/Diagrams/Point.hs
@@ -0,0 +1,71 @@
+{-# LANGUAGE TypeSynonymInstances, FlexibleContexts, FlexibleInstances, GeneralizedNewtypeDeriving, MultiParamTypeClasses, RecursiveDo, TypeFamilies, OverloadedStrings, RecordWildCards,UndecidableInstances, PackageImports, TemplateHaskell #-}
+
+module Graphics.Diagrams.Point where
+
+import Graphics.Diagrams.Core
+import Data.Foldable
+import Control.Applicative
+import Data.List (transpose)
+import Prelude hiding (sum,mapM_,mapM,concatMap,maximum,minimum)
+
+infix 4 .=.
+----------------
+-- Points 
+-- | A point in 2d space
+
+
+type Point = Point' Expr
+
+-- | Orthogonal norm of a vector
+orthonorm :: Monad m => Point -> Diagram lab m Expr
+orthonorm (Point x y) =
+  (+) <$> absoluteValue x <*> absoluteValue y
+
+-- | Orthogonal distance between points.
+orthoDist :: Monad m => Point -> Point -> Diagram lab m Expr
+orthoDist p q = orthonorm (q-p)
+
+-- | Rotate a vector 90 degres in the trigonometric direction.
+rotate90, rotate180 :: Point -> Point
+rotate90 (Point x y) = Point (negate y) x
+
+rotate180 = rotate90 . rotate90
+
+xdiff,ydiff :: Point -> Point -> Expr
+xdiff p q = xpart (q - p)
+ydiff p q = ypart (q - p)
+
+-----------------
+-- Point constraints
+
+(.=.),northOf,southOf,westOf,eastOf :: Monad m => Point -> Point -> Diagram lab m ()
+Point x1 y1 .=. Point x2 y2 = do
+  x1 === x2
+  y1 === y2
+
+northOf (Point _ y1) (Point _ y2) = y2 <== y1
+southOf = flip northOf
+westOf (Point x1 _) (Point x2 _) = x1 <== x2
+eastOf = flip westOf
+
+alignHoriz,alignVert :: Monad m => [Point] -> Diagram lab m ()
+alignHoriz = align ypart
+alignVert = align xpart
+
+align :: Monad m => (a -> Expr) -> [a] -> Diagram lab m ()
+align _ [] = return ()
+align f (p:ps) = forM_ ps $ \p' -> f p === f p'
+
+alignMatrix :: Monad m => [[Point]] -> Diagram lab m ()
+alignMatrix ls = do
+  forM_ ls alignHoriz
+  forM_ (transpose ls) alignVert
+
+---------------------
+-- Point objectives
+
+southwards, northwards, westwards, eastwards :: Monad m => Point -> Diagram lab m ()
+southwards (Point _ y) = minimize y
+westwards (Point x _) = minimize x
+northwards = southwards . negate
+eastwards = westwards . negate
diff --git a/LICENSE b/LICENSE
new file mode 100644
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/lp-diagrams.cabal b/lp-diagrams.cabal
new file mode 100644
--- /dev/null
+++ b/lp-diagrams.cabal
@@ -0,0 +1,40 @@
+name:                lp-diagrams
+version:             1.0
+synopsis:            An EDSL for diagrams based based on linear constraints
+license:             AGPL-3
+license-file:        LICENSE
+author:              Jean-Philippe Bernardy
+maintainer:          jeanphilippe.bernardy@gmail.com
+copyright:           Jean-Philippe Bernardy
+category:            Graphics
+build-type:          Simple
+-- extra-source-files:  
+cabal-version:       >=1.18
+
+Flag graphviz
+  Description: Enable graphviz support
+  Default:     True
+
+library
+  if flag(graphviz)
+    build-depends: graphviz
+    exposed-modules: Graphics.Diagrams.Graphviz
+
+  exposed-modules:     Graphics.Diagrams.Object,
+                       Graphics.Diagrams.Path,
+                       Graphics.Diagrams.Plot,
+                       Graphics.Diagrams.Point,
+                       Graphics.Diagrams.Core,
+                       Graphics.Diagrams.DerivationTrees,
+                       Graphics.Diagrams
+  build-depends:       base >=4.8 && < 666,
+                       lens >=4.12,
+                       text >=1.2 ,
+                       typography-geometry >=1.0 ,
+                       glpk-hs >=0.3 ,
+                       vector,
+                       polynomials-bernstein,
+                       mtl >=2.2 ,
+                       containers >=0.5,
+                       labeled-tree
+  default-language:    Haskell2010