More traditional names for unquoting macros.

15 files changed, 30 insertions, 68 deletions

diff --git a/stdlib/source/documentation/lux/data/collection/array.lux b/stdlib/source/documentation/lux/data/collection/array.lux
index b6bc74a63..29416d649 100644
--- a/stdlib/source/documentation/lux/data/collection/array.lux
+++ b/stdlib/source/documentation/lux/data/collection/array.lux
@@ -6,8 +6,9 @@
     ["[0]" text (.only \n)
      ["%" \\format (.only format)]]]
    [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+    ["[0]" template]]
+   [meta
+    ["[0]" code]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/documentation/lux/data/collection/bits.lux b/stdlib/source/documentation/lux/data/collection/bits.lux
index 55d0354b0..522f7eccd 100644
--- a/stdlib/source/documentation/lux/data/collection/bits.lux
+++ b/stdlib/source/documentation/lux/data/collection/bits.lux
@@ -1,13 +1,7 @@
 (.require
  [library
-  [lux (.except or and not)
-   ["$" documentation]
-   [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+  [lux (.except)
+   ["$" documentation]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary.lux b/stdlib/source/documentation/lux/data/collection/dictionary.lux
index 342d79f15..99f6342b4 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary.lux
@@ -1,13 +1,10 @@
 (.require
  [library
-  [lux (.except has revised)
+  [lux (.except)
    ["$" documentation]
    [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+    [text (.only \n)
+     ["%" \\format (.only format)]]]]]
  [\\library
   ["[0]" /]]
  ["[0]" /
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
index a946434d6..74381c580 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
@@ -3,10 +3,9 @@
   [lux (.except has revised)
    ["$" documentation]
    [data
-    ["[0]" text (.only \n)
+    [text
      ["%" \\format (.only format)]]]
    [macro
-    ["[0]" code]
     ["[0]" template]]]]
  [\\library
   ["[0]" /]])
@@ -36,9 +35,9 @@
                    ""
                    [(key? dict key)])
 
-                 (~~ (with_template [<name>]
+                 (,, (with_template [<name>]
                        [(`` ($.documentation <name>
-                              (format "Yields value under the " (~~ (template.text [<name>])) "imum key.")))]
+                              (format "Yields value under the " (,, (template.text [<name>])) "imum key.")))]
 
                        [/.min]
                        [/.max]
diff --git a/stdlib/source/documentation/lux/data/collection/list.lux b/stdlib/source/documentation/lux/data/collection/list.lux
index d3fb2c080..60c60b480 100644
--- a/stdlib/source/documentation/lux/data/collection/list.lux
+++ b/stdlib/source/documentation/lux/data/collection/list.lux
@@ -3,11 +3,8 @@
   [lux (.except all)
    ["$" documentation]
    [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+    [text (.only \n)
+     ["%" \\format (.only format)]]]]]
  [\\library
   ["[0]" /]]
  ["[0]" /
@@ -111,7 +108,7 @@
                    ""
                    [(member? eq xs x)])
 
-                 (~~ (with_template [<name> <doc>]
+                 (,, (with_template [<name> <doc>]
                        [($.documentation <name>
                           <doc>)]
 
diff --git a/stdlib/source/documentation/lux/data/collection/list/property.lux b/stdlib/source/documentation/lux/data/collection/list/property.lux
index 99e2faf06..b94d44263 100644
--- a/stdlib/source/documentation/lux/data/collection/list/property.lux
+++ b/stdlib/source/documentation/lux/data/collection/list/property.lux
@@ -1,13 +1,10 @@
 (.require
  [library
-  [lux (.except has revised)
+  [lux (.except)
    ["$" documentation]
    [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+    [text (.only \n)
+     ["%" \\format (.only format)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/documentation/lux/data/collection/queue.lux b/stdlib/source/documentation/lux/data/collection/queue.lux
index 963776aa5..935b0dfc3 100644
--- a/stdlib/source/documentation/lux/data/collection/queue.lux
+++ b/stdlib/source/documentation/lux/data/collection/queue.lux
@@ -1,13 +1,7 @@
 (.require
  [library
   [lux (.except list)
-   ["$" documentation]
-   [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+   ["$" documentation]]]
  [\\library
   ["[0]" /]]
  ["[0]" /
diff --git a/stdlib/source/documentation/lux/data/collection/queue/priority.lux b/stdlib/source/documentation/lux/data/collection/queue/priority.lux
index 4952a6954..4c6303902 100644
--- a/stdlib/source/documentation/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/documentation/lux/data/collection/queue/priority.lux
@@ -1,13 +1,7 @@
 (.require
  [library
   [lux (.except list)
-   ["$" documentation]
-   [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+   ["$" documentation]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/documentation/lux/data/collection/sequence.lux b/stdlib/source/documentation/lux/data/collection/sequence.lux
index 283eca310..9bc09f736 100644
--- a/stdlib/source/documentation/lux/data/collection/sequence.lux
+++ b/stdlib/source/documentation/lux/data/collection/sequence.lux
@@ -1,13 +1,7 @@
 (.require
  [library
   [lux (.except list has revised)
-   ["$" documentation]
-   [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+   ["$" documentation]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/documentation/lux/data/collection/stream.lux b/stdlib/source/documentation/lux/data/collection/stream.lux
index 5a5021150..393765c2f 100644
--- a/stdlib/source/documentation/lux/data/collection/stream.lux
+++ b/stdlib/source/documentation/lux/data/collection/stream.lux
@@ -3,11 +3,8 @@
   [lux (.except list pattern)
    ["$" documentation]
    [data
-    ["[0]" text (.only \n)
-     ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]]]
+    [text (.only \n)
+     ["%" \\format (.only format)]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/documentation/lux/data/color.lux b/stdlib/source/documentation/lux/data/color.lux
index fade67993..c76cf4c45 100644
--- a/stdlib/source/documentation/lux/data/color.lux
+++ b/stdlib/source/documentation/lux/data/color.lux
@@ -7,7 +7,8 @@
      ["%" \\format (.only format)]]]
    [macro
     [syntax (.only syntax)]
-    ["[0]" template]
+    ["[0]" template]]
+   [meta
     ["[0]" code (.only)
      ["<[1]>" \\parser]]]]]
  [\\library
@@ -91,10 +92,10 @@
                  ($.documentation /.Pigment
                    "A color with some degree of transparency.")
 
-                 (~~ (with_template [<name>]
+                 (,, (with_template [<name>]
                        [(`` ($.documentation <name>
                               (format "A "
-                                      (text.replaced "_" "-" (~~ (template.text [<name>])))
+                                      (text.replaced "_" "-" (,, (template.text [<name>])))
                                       " color scheme.")))]
 
                        [/.triad]
diff --git a/stdlib/source/documentation/lux/data/color/named.lux b/stdlib/source/documentation/lux/data/color/named.lux
index 94f5df07b..f7da245b1 100644
--- a/stdlib/source/documentation/lux/data/color/named.lux
+++ b/stdlib/source/documentation/lux/data/color/named.lux
@@ -5,9 +5,6 @@
    [data
     ["[0]" text (.only)
      ["%" \\format (.only format)]]]
-   [macro
-    ["[0]" code]
-    ["[0]" template]]
    [math
     [number
      ["[0]" nat (.use "hex#[0]" hex)]]]]]
@@ -19,7 +16,7 @@
       (.List $.Module)
       ($.module /._
                 ""
-                [(~~ (with_template [<name>]
+                [(,, (with_template [<name>]
                        [($.documentation <name>
                           (let [[red green blue] (//.rgb <name>)
                                 [_ name] (symbol <name>)]
diff --git a/stdlib/source/documentation/lux/data/format/json.lux b/stdlib/source/documentation/lux/data/format/json.lux
index 2051ee55c..ccf18365e 100644
--- a/stdlib/source/documentation/lux/data/format/json.lux
+++ b/stdlib/source/documentation/lux/data/format/json.lux
@@ -55,7 +55,7 @@
                    "A JSON object field setter."
                    [(has key value json)])
 
-                 (~~ (with_template [<name> <desc>]
+                 (,, (with_template [<name> <desc>]
                        [($.documentation <name>
                           (format "A JSON object field getter for " <desc> "."))]
 
diff --git a/stdlib/source/documentation/lux/data/text/encoding.lux b/stdlib/source/documentation/lux/data/text/encoding.lux
index 6a8652b67..42b3ff87e 100644
--- a/stdlib/source/documentation/lux/data/text/encoding.lux
+++ b/stdlib/source/documentation/lux/data/text/encoding.lux
@@ -21,7 +21,7 @@
                  ($.documentation /.Encoding
                    "Encoding formats for text.")
 
-                 (~~ (with_template [<name>]
+                 (,, (with_template [<name>]
                        [($.documentation <name>
                           (format "'" (/.name <name>) "' text encoding. "))]
 
diff --git a/stdlib/source/documentation/lux/data/text/unicode/block.lux b/stdlib/source/documentation/lux/data/text/unicode/block.lux
index 0ee609dd9..2021ce0d1 100644
--- a/stdlib/source/documentation/lux/data/text/unicode/block.lux
+++ b/stdlib/source/documentation/lux/data/text/unicode/block.lux
@@ -35,7 +35,7 @@
                    ""
                    [(within? block char)])
 
-                 (~~ (with_template [<name>]
+                 (,, (with_template [<name>]
                        [($.documentation <name>
                           (let [[_ name] (symbol <name>)]
                             (format (hex#encoded (/.start <name>))