From 11baec45a3bb5e4c7a12f0ca626f1f58d203cc2e Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Thu, 2 May 2019 15:08:57 +0200
Subject: [PATCH 1/3] qualify import of Data.Elements

---
 src/Parse/Component.hs | 79 +++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/Parse/Component.hs b/src/Parse/Component.hs
index b899273..30158eb 100644
--- a/src/Parse/Component.hs
+++ b/src/Parse/Component.hs
@@ -5,7 +5,7 @@ module Parse.Component where
 import           Data.Yaml
 import qualified Data.Map.Strict               as Map
 
-import           Data.Elements
+import qualified Data.Elements                 as E
 import           Data.Component
 import           Data.Grid
 import           Data.GridShape
@@ -133,10 +133,10 @@ parseDecorationWithReplacements repl c = case Map.lookup c repl of
 parseDecoration :: Char -> Parser Decoration
 parseDecoration c = return $ case c of
   '.'  -> Blank
-  'o'  -> DecKropkiDot KWhite
-  '*'  -> DecKropkiDot KBlack
-  '/'  -> DarkDiagonal $ PrimeDiag (True, False)
-  '\\' -> DarkDiagonal $ PrimeDiag (False, True)
+  'o'  -> DecKropkiDot E.KWhite
+  '*'  -> DecKropkiDot E.KBlack
+  '/'  -> DarkDiagonal $ E.PrimeDiag (True, False)
+  '\\' -> DarkDiagonal $ E.PrimeDiag (False, True)
   '#'  -> Shade
   '-'  -> Edge Horiz
   '|'  -> Edge Vert
@@ -147,40 +147,41 @@ parseDecoration c = return $ case c of
 parseExtendedDecoration :: Util.IntString -> Parser Decoration
 parseExtendedDecoration (Util.IntString s) = case words s of
   [w1] -> case w1 of
-    "kropki-white"           -> pure $ DecKropkiDot KWhite
-    "kropki-black"           -> pure $ DecKropkiDot KBlack
-    "small-pearl-white"      -> pure $ SmallPearl MWhite
-    "small-pearl-black"      -> pure $ SmallPearl MBlack
-    "pearl-white"            -> pure $ Pearl MWhite
-    "pearl-black"            -> pure $ Pearl MBlack
-    "blank"                  -> pure Blank
-    "afternoon-west"         -> pure $ AfternoonWest
-    "afternoon-south"        -> pure $ AfternoonSouth
-    "light-diagonal-forward" -> pure $ LightDiagonal $ PrimeDiag (True, False)
-    "light-diagonal-back"    -> pure $ LightDiagonal $ PrimeDiag (False, True)
-    "light-diagonal-both"    -> pure $ LightDiagonal $ PrimeDiag (True, True)
-    "dark-diagonal-forward"  -> pure $ DarkDiagonal $ PrimeDiag (True, False)
-    "dark-diagonal-back"     -> pure $ DarkDiagonal $ PrimeDiag (False, True)
-    "dark-diagonal-both"     -> pure $ DarkDiagonal $ PrimeDiag (True, True)
-    "edge-horiz"             -> pure $ Edge Horiz
-    "edge-vert"              -> pure $ Edge Vert
-    "thin-edge-horiz"        -> pure $ ThinEdge Horiz
-    "thin-edge-vert"         -> pure $ ThinEdge Vert
-    "sol-edge-horiz"         -> pure $ SolEdge Horiz
-    "sol-edge-vert"          -> pure $ SolEdge Vert
-    "dot"                    -> pure $ Dot
-    "small-dot"              -> pure $ SmallDot
-    "shade"                  -> pure $ Shade
-    "light-shade"            -> pure $ LightShade
-    "triangle-right"         -> pure $ TriangleRight
-    "triangle-down"          -> pure $ TriangleDown
-    "miniloop"               -> pure $ MiniLoop
-    "ship-square"            -> pure $ ShipSquare
-    "ship-end-left"          -> pure $ Ship R
-    "ship-end-right"         -> pure $ Ship L
-    "ship-end-top"           -> pure $ Ship D
-    "ship-end-bottom"        -> pure $ Ship U
-    _                        -> pure $ Letters s
+    "kropki-white"      -> pure $ DecKropkiDot E.KWhite
+    "kropki-black"      -> pure $ DecKropkiDot E.KBlack
+    "small-pearl-white" -> pure $ SmallPearl E.MWhite
+    "small-pearl-black" -> pure $ SmallPearl E.MBlack
+    "pearl-white"       -> pure $ Pearl E.MWhite
+    "pearl-black"       -> pure $ Pearl E.MBlack
+    "blank"             -> pure Blank
+    "afternoon-west"    -> pure $ AfternoonWest
+    "afternoon-south"   -> pure $ AfternoonSouth
+    "light-diagonal-forward" ->
+      pure $ LightDiagonal $ E.PrimeDiag (True, False)
+    "light-diagonal-back"   -> pure $ LightDiagonal $ E.PrimeDiag (False, True)
+    "light-diagonal-both"   -> pure $ LightDiagonal $ E.PrimeDiag (True, True)
+    "dark-diagonal-forward" -> pure $ DarkDiagonal $ E.PrimeDiag (True, False)
+    "dark-diagonal-back"    -> pure $ DarkDiagonal $ E.PrimeDiag (False, True)
+    "dark-diagonal-both"    -> pure $ DarkDiagonal $ E.PrimeDiag (True, True)
+    "edge-horiz"            -> pure $ Edge Horiz
+    "edge-vert"             -> pure $ Edge Vert
+    "thin-edge-horiz"       -> pure $ ThinEdge Horiz
+    "thin-edge-vert"        -> pure $ ThinEdge Vert
+    "sol-edge-horiz"        -> pure $ SolEdge Horiz
+    "sol-edge-vert"         -> pure $ SolEdge Vert
+    "dot"                   -> pure $ Dot
+    "small-dot"             -> pure $ SmallDot
+    "shade"                 -> pure $ Shade
+    "light-shade"           -> pure $ LightShade
+    "triangle-right"        -> pure $ TriangleRight
+    "triangle-down"         -> pure $ TriangleDown
+    "miniloop"              -> pure $ MiniLoop
+    "ship-square"           -> pure $ ShipSquare
+    "ship-end-left"         -> pure $ Ship R
+    "ship-end-right"        -> pure $ Ship L
+    "ship-end-top"          -> pure $ Ship D
+    "ship-end-bottom"       -> pure $ Ship U
+    _                       -> pure $ Letters s
   [w1, w2] -> case w1 of
     "triangle-right" -> pure $ LabeledTriangleRight w2
     "triangle-down"  -> pure $ LabeledTriangleDown w2

From 7339bdc743edc45dd3a8f9db20631e126763a561 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Thu, 2 May 2019 15:09:27 +0200
Subject: [PATCH 2/3] split out tent drawing

---
 src/Draw/Elements.hs | 45 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/Draw/Elements.hs b/src/Draw/Elements.hs
index f5cef86..5b51935 100644
--- a/src/Draw/Elements.hs
+++ b/src/Draw/Elements.hs
@@ -308,28 +308,29 @@ drawTent (Tent d) = draw $ tent <> lwG linewidth (stroke conn)
       L -> (-1, 0)
     )
 
-  tent = fit 0.7 $ centerXY $ lwG 0 $ mconcat
-    [ rect 10 (1 / 4) # fc black
-    , shape [(-2, 0), (0, 4), (2, 0), (-2, 0)] # fc white
-    , shape [(-4, 0), (0, 8), (4, 0), (-4, 0)] # fc black
-    , shape
-        [ (0     , 8)
-        , (-1 / 2, 8 + 1)
-        , (-1    , 8 + 1 - 1 / 4)
-        , (0     , 8 + 1 - 1 / 4 - 2)
-        , (0     , 8)
-        ]
-      # fc black
-    , shape
-        [ (0    , 8)
-        , (1 / 2, 8 + 1)
-        , (1    , 8 + 1 - 1 / 4)
-        , (0    , 8 + 1 - 1 / 4 - 2)
-        , (0    , 8)
-        ]
-      # fc black
-    ]
-  shape = strokeLocLoop . fromVertices . map p2
+tent :: Backend' b => Diagram b
+tent = fit 0.7 $ centerXY $ lwG 0 $ mconcat
+  [ rect 10 (1 / 4) # fc black
+  , shape [(-2, 0), (0, 4), (2, 0), (-2, 0)] # fc white
+  , shape [(-4, 0), (0, 8), (4, 0), (-4, 0)] # fc black
+  , shape
+      [ (0     , 8)
+      , (-1 / 2, 8 + 1)
+      , (-1    , 8 + 1 - 1 / 4)
+      , (0     , 8 + 1 - 1 / 4 - 2)
+      , (0     , 8)
+      ]
+    # fc black
+  , shape
+      [ (0    , 8)
+      , (1 / 2, 8 + 1)
+      , (1    , 8 + 1 - 1 / 4)
+      , (0    , 8 + 1 - 1 / 4 - 2)
+      , (0    , 8)
+      ]
+    # fc black
+  ]
+  where shape = strokeLocLoop . fromVertices . map p2
 
 vertexLoop :: VertexLoop -> Located (Trail' Loop V2 Double)
 vertexLoop = mapLoc closeLine . fromVertices . map toPoint

From 56a52da08521053855a761abe20721edc44bcfa3 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Thu, 2 May 2019 15:09:59 +0200
Subject: [PATCH 3/3] pzg: add symbols: tent, tree

---
 src/Data/Component.hs                   |   3 +-
 src/Draw/Component.hs                   |   8 +++--
 src/Parse/Component.hs                  |   2 ++
 tests/examples/snake-forest-example.png | Bin 0 -> 3488 bytes
 tests/examples/snake-forest-example.pzg |  37 ++++++++++++++++++++++++
 5 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 tests/examples/snake-forest-example.png
 create mode 100644 tests/examples/snake-forest-example.pzg

diff --git a/src/Data/Component.hs b/src/Data/Component.hs
index 73c9929..8e40969 100644
--- a/src/Data/Component.hs
+++ b/src/Data/Component.hs
@@ -89,4 +89,5 @@ data Decoration =
   | Ship Dir'
   | ShipSquare
   | LabeledArrow Dir' String
-
+  | Tent
+  | Tree
diff --git a/src/Draw/Component.hs b/src/Draw/Component.hs
index 415a60e..887fae1 100644
--- a/src/Draw/Component.hs
+++ b/src/Draw/Component.hs
@@ -9,7 +9,10 @@ import           Diagrams.Prelude        hiding ( dot
                                                 )
 
 import           Data.Component
-import           Data.Elements
+import           Data.Elements           hiding ( Tent
+                                                , Tree
+                                                )
+import qualified Data.Elements
 import           Data.Grid
 import           Data.GridShape
 import           Draw.Lib
@@ -95,4 +98,5 @@ drawDecoration d = case d of
   ShipSquare             -> shipSquare
   Ship dir               -> shipEnd dir
   LabeledArrow dir w     -> labeledArrow dir $ text' w
-
+  Tent                   -> draw tent
+  Tree                   -> drawTree Data.Elements.Tree
diff --git a/src/Parse/Component.hs b/src/Parse/Component.hs
index 30158eb..2f5480b 100644
--- a/src/Parse/Component.hs
+++ b/src/Parse/Component.hs
@@ -181,6 +181,8 @@ parseExtendedDecoration (Util.IntString s) = case words s of
     "ship-end-right"        -> pure $ Ship L
     "ship-end-top"          -> pure $ Ship D
     "ship-end-bottom"       -> pure $ Ship U
+    "tent"                  -> pure $ Tent
+    "tree"                  -> pure $ Tree
     _                       -> pure $ Letters s
   [w1, w2] -> case w1 of
     "triangle-right" -> pure $ LabeledTriangleRight w2
diff --git a/tests/examples/snake-forest-example.png b/tests/examples/snake-forest-example.png
new file mode 100644
index 0000000000000000000000000000000000000000..df0ca6940e1a8bd9d693f35b9e368e8efa786142
GIT binary patch
literal 3488
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

literal 0
HcmV?d00001

diff --git a/tests/examples/snake-forest-example.pzg b/tests/examples/snake-forest-example.pzg
new file mode 100644
index 0000000..6c537d8
--- /dev/null
+++ b/tests/examples/snake-forest-example.pzg
@@ -0,0 +1,37 @@
+
+- type: cells
+  grid: |
+    B...
+    O...
+  substitute:
+    O: pearl-black
+    B: tree
+- type: cells
+  tag: solution
+  grid: |
+    .Z.#
+    ####
+  substitute:
+    Z: tent
+- type: cells
+  tag: solution
+  grid: |
+    ...O
+    O...
+  substitute:
+    O: pearl-black
+- type: edges
+  tag: solution
+  grid: |
+    o o o o o
+      -
+    o o o o o
+
+    o o o o o
+  substitute:
+    o: .
+- type: grid
+  style: default
+  grid: |
+    ....
+    ....