The Prettifier works.

2 files changed, 197 insertions, 225 deletions

diff --git a/tile/pattern/global.m4.conf b/tile/pattern/global.m4.conf
new file mode 100644
index 0000000..724bfcc
--- /dev/null
+++ b/tile/pattern/global.m4.conf
@@ -0,0 +1,38 @@
+m4_define(
+   `__TILE_PATTERN_CHOOSE_STYLE',
+   `m4_define(
+      `__TILE_PATTERN',
+      m4_defn(`$1'))m4_dnl
+      m4_undefine(`$1')')m4_dnl
+m4_define(
+   `__TILE_PATTERN_NOT',
+   `{"c": "n"`,' "i": `$1'}')m4_dnl
+m4_define(
+   `__TILE_PATTERN_ANY',
+   `{"c": "n"`,' "i": -1}')m4_dnl
+m4_define(
+   `__TILE_PATTERN_JUST',
+   `{"c": "e"`,' "i": `$1'}')m4_dnl
+m4_define(
+   `__TILE_PATTERN_HEADER',
+   `m4_define(
+      `not',
+      m4_defn(`__TILE_PATTERN_NOT'))m4_dnl
+   m4_define(`TODO',`-1')m4_dnl
+   m4_define(
+      `any',
+      m4_defn(`__TILE_PATTERN_ANY'))m4_dnl
+   m4_define(
+      `just',
+      m4_defn(`__TILE_PATTERN_JUST'))m4_dnl')m4_dnl
+m4_define(`__TILE_PATTERN_JSON_STYLE',`   {
+      "msg": "add_tile_pattern",
+      "s": `$5',
+      "t": `$10',
+      "p": [`$1', `$2', `$3', `$4', `$6', `$7', `$8', `$9']
+   },')m4_dnl
+m4_define(
+   `__TILE_PATTERN_FOOTER',
+   `m4_undefine(not)m4_undefine(`???')m4_undefine(any)m4_undefine(just)')m4_dnl
+m4_define(`__TILE_PATTERN_CATEGORY',`m4_define(`__TILE_PATTERN_CATEGORY_NAME', `$1')')m4_dnl
+m4_define(`__TILE_PATTERN_USE_JSON_STYLE',`__TILE_PATTERN_CHOOSE_STYLE(`__TILE_PATTERN_JSON_STYLE')')m4_dnl
diff --git a/tile/pattern/grassland.m4d b/tile/pattern/grassland.m4d
index 0c910be..504dec2 100644
--- a/tile/pattern/grassland.m4d
+++ b/tile/pattern/grassland.m4d
@@ -6,228 +6,162 @@ m4_ifelse(`
    g, h, i,
    new_e
     A -> anything
-    ~X -> anything but X
-')
-__TILE_PATTERN(
-    A, ~3,  A,
-   ~3, ~3, ~3,
-    A, ~3,  A,
-  ~3
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-   ~3,  3, ~3,
-    A, ~3,  A,
-   ???
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-    3,  3, ~3,
-    A, ~3,  A,
-   ???
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-    3,  3, ~3,
-    A,  3,  A,
-   9
-)
-
-__TILE_PATTERN(
-    A,  3,  A,
-    3,  3, ~3,
-    A, ~3,  A,
-   10
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-    3,  3,  3,
-    A, ~3,  A,
-   13
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-    3,  3,  3,
-    A,  3,  A,
-   6
-)
-
-__TILE_PATTERN(
-    A,  3,  A,
-    3,  3, ~3,
-    A,  3,  A,
-   5
-)
-
-__TILE_PATTERN(
-    A,  3,  A,
-    3,  3,  3,
-    A, ~3,  A,
-   7
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-   ~3,  3, ~3,
-    A,  3,  A,
-   ???
-)
-
-__TILE_PATTERN(
-    A,  3,  A,
-   ~3,  3, ~3,
-    A,  3,  A,
-   12
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-   ~3,  3,  3,
-    A,  3,  A,
-   8
-)
-
-__TILE_PATTERN(
-    A,  3,  A,
-   ~3,  3,  3,
-    A,  3,  A,
-   4
-)
-
-__TILE_PATTERN(
-    A,  3,  A,
-   ~3,  3, ~3,
-    A, ~3,  A,
-   ???
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-   ~3,  3,  3,
-    A, ~3,  A,
-   ???
-)
-
-__TILE_PATTERN(
-    A,  3,  A,
-   ~3,  3,  3,
-    A, ~3,  A,
-   11
-)
-
-__TILE_PATTERN(
-    A, ~3,  A,
-   ~3,  3,  3,
-    A, ~3,  A,
-   ???
-)
-
-__TILE_PATTERN(
-   ~3,  3, ~3,
-    3,  3,  3,
-   ~3,  3, ~3,
-   20
-)
-
-__TILE_PATTERN(
-    3,  3, ~3,
-    3,  3,  3,
-   ~3,  3, ~3,
-    19
-)
-
-__TILE_PATTERN(
-   ~3,  3,  3,
-    3,  3,  3,
-   ~3,  3, ~3,
-    28
-)
-
-__TILE_PATTERN(
-   ~3,  3, ~3,
-    3,  3,  3,
-   ~3,  3,  3,
-    22
-)
-
-__TILE_PATTERN(
-   ~3,  3, ~3,
-    3,  3,  3,
-    3,  3, ~3,
-    27
-)
-
-__TILE_PATTERN(
-    3,  3, ~3,
-    3,  3,  3,
-    3,  3, ~3,
-    23
-)
-
-__TILE_PATTERN(
-    3,  3,  3,
-    3,  3,  3,
-   ~3,  3, ~3,
-    25
-)
-
-__TILE_PATTERN(
-    3,  3, ~3,
-    3,  3,  3,
-   ~3,  3,  3,
-    18
-)
-
-__TILE_PATTERN(
-   ~3,  3,  3,
-    3,  3,  3,
-   ~3,  3,  3,
-    21
-)
-
-__TILE_PATTERN(
-   ~3,  3,  3,
-    3,  3,  3,
-    3,  3, ~3,
-    24
-)
-
-__TILE_PATTERN(
-   ~3,  3, ~3,
-    3,  3,  3,
-    3,  3,  3,
-    26
-)
-
-__TILE_PATTERN(
-    3,  3, ~3,
-    3,  3,  3,
-    3,  3,  3,
-    17
-)
-
-__TILE_PATTERN(
-   ~3,  3,  3,
-    3,  3,  3,
-    3,  3,  3,
-    16
-)
-
-__TILE_PATTERN(
-    3,  3,  3,
-    3,  3,  3,
-    3,  3, ~3,
-    15
-)
-
-__TILE_PATTERN(
-   ~3,  3,  3,
-    3,  3,  3,
-    3,  3,  3,
-    15
-)
+    not(X) -> anything but X
+')m4_dnl
+__TILE_PATTERN_HEADER
+__TILE_PATTERN(
+    any, not(3),  any,
+   not(3),  just(3), not(3),
+    any, not(3),  any,
+   TODO)
+__TILE_PATTERN(
+    any, not(3),  any,
+    just(3),  just(3), not(3),
+    any, not(3),  any,
+   TODO)
+__TILE_PATTERN(
+    any, not(3),  any,
+    just(3),  just(3), not(3),
+    any,  just(3),  any,
+   9)
+__TILE_PATTERN(
+    any,  just(3),  any,
+    just(3),  just(3), not(3),
+    any, not(3),  any,
+   10)
+__TILE_PATTERN(
+    any, not(3),  any,
+    just(3),  just(3),  just(3),
+    any, not(3),  any,
+   13)
+__TILE_PATTERN(
+    any, not(3),  any,
+    just(3),  just(3),  just(3),
+    any,  just(3),  any,
+   6)
+__TILE_PATTERN(
+    any,  just(3),  any,
+    just(3),  just(3), not(3),
+    any,  just(3),  any,
+   5)
+__TILE_PATTERN(
+    any,  just(3),  any,
+    just(3),  just(3),  just(3),
+    any, not(3),  any,
+   7)
+__TILE_PATTERN(
+    any, not(3),  any,
+   not(3),  just(3), not(3),
+    any,  just(3),  any,
+   TODO)
+__TILE_PATTERN(
+    any,  just(3),  any,
+   not(3),  just(3), not(3),
+    any,  just(3),  any,
+   12)
+__TILE_PATTERN(
+    any, not(3),  any,
+   not(3),  just(3),  just(3),
+    any,  just(3),  any,
+   8)
+__TILE_PATTERN(
+    any,  just(3),  any,
+   not(3),  just(3),  just(3),
+    any,  just(3),  any,
+   4)
+__TILE_PATTERN(
+    any,  just(3),  any,
+   not(3),  just(3), not(3),
+    any, not(3),  any,
+   TODO)
+__TILE_PATTERN(
+    any, not(3),  any,
+   not(3),  just(3),  just(3),
+    any, not(3),  any,
+   TODO)
+__TILE_PATTERN(
+    any,  just(3),  any,
+   not(3),  just(3),  just(3),
+    any, not(3),  any,
+   11)
+__TILE_PATTERN(
+    any, not(3),  any,
+   not(3),  just(3),  just(3),
+    any, not(3),  any,
+   TODO)
+__TILE_PATTERN(
+   not(3),  just(3), not(3),
+   just(3),  just(3),  just(3),
+   not(3),  just(3), not(3),
+   20)
+__TILE_PATTERN(
+    just(3),  just(3), not(3),
+    just(3),  just(3),  just(3),
+   not(3),  just(3), not(3),
+    19)
+__TILE_PATTERN(
+   not(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+   not(3),  just(3), not(3),
+    28)
+__TILE_PATTERN(
+   not(3),  just(3), not(3),
+    just(3),  just(3),  just(3),
+   not(3),  just(3),  just(3),
+    22)
+__TILE_PATTERN(
+   not(3),  just(3), not(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3), not(3),
+    27)
+__TILE_PATTERN(
+    just(3),  just(3), not(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3), not(3),
+    23)
+__TILE_PATTERN(
+    just(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+   not(3),  just(3), not(3),
+    25)
+__TILE_PATTERN(
+    just(3),  just(3), not(3),
+    just(3),  just(3),  just(3),
+   not(3),  just(3),  just(3),
+    18)
+__TILE_PATTERN(
+   not(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+   not(3),  just(3),  just(3),
+    21)
+__TILE_PATTERN(
+   not(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3), not(3),
+    24)
+__TILE_PATTERN(
+   not(3),  just(3), not(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    26)
+__TILE_PATTERN(
+    just(3),  just(3), not(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    17)
+__TILE_PATTERN(
+   not(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    16)
+__TILE_PATTERN(
+    just(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3), not(3),
+    15)
+__TILE_PATTERN(
+   not(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    just(3),  just(3),  just(3),
+    15)
+__TILE_PATTERN_FOOTER