aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/documentation
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source/documentation')
-rw-r--r--stdlib/source/documentation/lux.lux31
-rw-r--r--stdlib/source/documentation/lux/control/concatenative.lux4
-rw-r--r--stdlib/source/documentation/lux/control/parser/analysis.lux2
-rw-r--r--stdlib/source/documentation/lux/control/parser/binary.lux6
-rw-r--r--stdlib/source/documentation/lux/control/parser/code.lux6
-rw-r--r--stdlib/source/documentation/lux/control/parser/json.lux4
-rw-r--r--stdlib/source/documentation/lux/control/parser/synthesis.lux2
-rw-r--r--stdlib/source/documentation/lux/control/parser/text.lux12
-rw-r--r--stdlib/source/documentation/lux/control/parser/tree.lux2
-rw-r--r--stdlib/source/documentation/lux/control/parser/type.lux4
-rw-r--r--stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux2
-rw-r--r--stdlib/source/documentation/lux/data/collection/list.lux2
-rw-r--r--stdlib/source/documentation/lux/data/color.lux2
-rw-r--r--stdlib/source/documentation/lux/data/color/named.lux2
-rw-r--r--stdlib/source/documentation/lux/data/format/json.lux2
-rw-r--r--stdlib/source/documentation/lux/data/text/encoding.lux2
-rw-r--r--stdlib/source/documentation/lux/data/text/unicode/block.lux2
-rw-r--r--stdlib/source/documentation/lux/ffi.jvm.lux6
-rw-r--r--stdlib/source/documentation/lux/ffi.old.lux2
-rw-r--r--stdlib/source/documentation/lux/math/number.lux2
-rw-r--r--stdlib/source/documentation/lux/math/number/frac.lux6
-rw-r--r--stdlib/source/documentation/lux/math/number/i64.lux4
-rw-r--r--stdlib/source/documentation/lux/math/number/int.lux4
-rw-r--r--stdlib/source/documentation/lux/math/number/nat.lux4
-rw-r--r--stdlib/source/documentation/lux/math/number/rev.lux4
-rw-r--r--stdlib/source/documentation/lux/static.lux4
-rw-r--r--stdlib/source/documentation/lux/time.lux2
-rw-r--r--stdlib/source/documentation/lux/type.lux8
-rw-r--r--stdlib/source/documentation/lux/type/primitive.lux2
-rw-r--r--stdlib/source/documentation/lux/type/resource.lux4
-rw-r--r--stdlib/source/documentation/lux/type/unit.lux4
-rw-r--r--stdlib/source/documentation/lux/world/net/http/client.lux2
-rw-r--r--stdlib/source/documentation/lux/world/net/http/status.lux2
-rw-r--r--stdlib/source/documentation/lux/world/output/video/resolution.lux2
34 files changed, 75 insertions, 74 deletions
diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux
index 59a5159b4..25389845a 100644
--- a/stdlib/source/documentation/lux.lux
+++ b/stdlib/source/documentation/lux.lux
@@ -284,7 +284,7 @@
(documentation: /.template
""
["By specifying a pattern (with holes), and the input data to fill those holes, repeats the pattern as many times as necessary."
- (template [<name> <diff>]
+ (with_template [<name> <diff>]
[(def: .public <name>
(-> Int Int)
(+ <diff>))]
@@ -433,9 +433,9 @@
[(def: .public symbol
(macro (_ tokens)
(case tokens
- (^template [<tag>]
- [(pattern (list [_ {<tag> [module name]}]))
- (in (list (` [(~ (text$ module)) (~ (text$ name))])))])
+ (^with_template [<tag>]
+ [(pattern (list [_ {<tag> [module name]}]))
+ (in (list (` [(~ (text$ module)) (~ (text$ name))])))])
([#Symbol])
_
@@ -516,7 +516,7 @@
(is (-> a a Bit)
<)))])
-(.template [<name>]
+(.with_template [<name>]
[(documentation: <name>
"Safe type-casting for I64 values.")]
@@ -642,17 +642,17 @@
... {.#Primitive name params}
... {.#Primitive name (list#each (reduced env) params)}
-... (^template [<tag>]
+... (^with_template [<tag>]
... [{<tag> left right}
... {<tag> (reduced env left) (reduced env right)}])
... ([.#Sum] [.#Product])
-... (^template [<tag>]
+... (^with_template [<tag>]
... [{<tag> left right}
... {<tag> (reduced env left) (reduced env right)}])
... ([.#Function] [.#Apply])
-... (^template [<tag>]
+... (^with_template [<tag>]
... [{<tag> old_env def}
... (case old_env
... {.#End}
@@ -669,7 +669,7 @@
... type
... ))])
-(.template [<name> <doc>]
+(.with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
@@ -699,7 +699,7 @@
[(def: test
Test
(with_expansions
- [<tests> (template [<function> <parameter> <expected>]
+ [<tests> (with_template [<function> <parameter> <expected>]
[(cover [<function>]
(compare <text>
(at codec encoded <function> <parameter>)))]
@@ -825,11 +825,12 @@
"=="
Int])
-(documentation: /.template:
- (format "Define macros in the style of template and ^template."
+(documentation: /.template
+ (format "Define macros in the style of with_template."
\n "For simple macros that do not need any fancy features.")
- [(template: (square x)
- (* x x))])
+ [(def: square
+ (template (square x)
+ (* x x)))])
(documentation: /.these
(format "Given a (potentially empty) list of codes, just returns them immediately, without any work done."
@@ -999,7 +1000,7 @@
..as_expected
..undefined
..type_of
- ..template:
+ ..template
..these
..char
..for
diff --git a/stdlib/source/documentation/lux/control/concatenative.lux b/stdlib/source/documentation/lux/control/concatenative.lux
index 635d0ab7e..aa750bda1 100644
--- a/stdlib/source/documentation/lux/control/concatenative.lux
+++ b/stdlib/source/documentation/lux/control/concatenative.lux
@@ -51,7 +51,7 @@
[(is (=> [Nat] [Nat])
((apply 1) ++))])
-(template [<arity>]
+(with_template [<arity>]
[(with_expansions [<name> (template.symbol [/._] ["apply_" <arity>])
<doc> (template.text ["Lift a function of arity " <arity>
" into a concatenative function of arity " <arity> "."])]
@@ -92,7 +92,7 @@
(documentation: /.||R
"Right-injects the top into sum.")
-(template [<input> <word> <func>]
+(with_template [<input> <word> <func>]
[(`` (documentation: (~~ (template.symbol [/._] [<word>]))
(~~ (template.text [<func> " for " <input> " arithmetic."]))))]
diff --git a/stdlib/source/documentation/lux/control/parser/analysis.lux b/stdlib/source/documentation/lux/control/parser/analysis.lux
index 4eeb442fe..7f61c1dca 100644
--- a/stdlib/source/documentation/lux/control/parser/analysis.lux
+++ b/stdlib/source/documentation/lux/control/parser/analysis.lux
@@ -26,7 +26,7 @@
(documentation: /.end?
"Checks whether there are no more inputs.")
-(template [<query> <assertion>]
+(with_template [<query> <assertion>]
[(`` (these (`` (documentation: <query>
(format "Queries for a " (~~ (template.text [<query>])) " value.")))
(`` (documentation: <assertion>
diff --git a/stdlib/source/documentation/lux/control/parser/binary.lux b/stdlib/source/documentation/lux/control/parser/binary.lux
index 42a25e1e3..7a890c827 100644
--- a/stdlib/source/documentation/lux/control/parser/binary.lux
+++ b/stdlib/source/documentation/lux/control/parser/binary.lux
@@ -42,7 +42,7 @@
"Parses a chunk of data of a given size."
[(segment size)])
-(template [<size> <name>]
+(with_template [<size> <name>]
[(documentation: <name>
(format "Parses a block of data prefixed with a size that is " (%.nat <size>) " bytes long."))]
@@ -52,7 +52,7 @@
[64 /.binary_64]
)
-(template [<size> <name>]
+(with_template [<size> <name>]
[(documentation: <name>
(format "Parses a block of (UTF-8 encoded) text prefixed with a size that is " (%.nat <size>) " bytes long."))]
@@ -62,7 +62,7 @@
[64 /.utf8_64]
)
-(template [<size> <name>]
+(with_template [<size> <name>]
[(documentation: <name>
(format "Parses a sequence of values prefixed with a size that is " (%.nat <size>) " bytes long."))]
diff --git a/stdlib/source/documentation/lux/control/parser/code.lux b/stdlib/source/documentation/lux/control/parser/code.lux
index fe1136b89..a742e1bbb 100644
--- a/stdlib/source/documentation/lux/control/parser/code.lux
+++ b/stdlib/source/documentation/lux/control/parser/code.lux
@@ -16,7 +16,7 @@
(documentation: /.any
"Yields the next input without applying any logic.")
-(template [<query> <check>]
+(with_template [<query> <check>]
[(`` (documentation: <query>
(format "Parses the next " (~~ (template.text [<query>])) " input.")))
(`` (documentation: <check>
@@ -35,7 +35,7 @@
"Ensures the given Code is the next input."
[(this code)])
-(template [<query> <check> <desc>]
+(with_template [<query> <check> <desc>]
[(documentation: <query>
(format "Parse a local " <desc> " (a " <desc> " that has no module prefix)."))
(documentation: <check>
@@ -44,7 +44,7 @@
[/.local /.this_local "local symbol"]
)
-(template [<name>]
+(with_template [<name>]
[(`` (documentation: <name>
(format "Parses the contents of a " (~~ (template.text [<name>])) ".")))]
diff --git a/stdlib/source/documentation/lux/control/parser/json.lux b/stdlib/source/documentation/lux/control/parser/json.lux
index ba2c434ef..0c554c35e 100644
--- a/stdlib/source/documentation/lux/control/parser/json.lux
+++ b/stdlib/source/documentation/lux/control/parser/json.lux
@@ -21,7 +21,7 @@
(documentation: /.any
"Just returns the JSON input without applying any logic.")
-(template [<name>]
+(with_template [<name>]
[(`` (documentation: <name>
(format "Reads a JSON value as " (~~ (template.text [<name>])) ".")))]
@@ -31,7 +31,7 @@
[/.string]
)
-(template [<test> <check> <read>]
+(with_template [<test> <check> <read>]
[(`` (documentation: <test>
(format "Asks whether a JSON value is a " (~~ (template.text [<read>])) ".")))
(`` (documentation: <check>
diff --git a/stdlib/source/documentation/lux/control/parser/synthesis.lux b/stdlib/source/documentation/lux/control/parser/synthesis.lux
index 137d08ba1..40a73b496 100644
--- a/stdlib/source/documentation/lux/control/parser/synthesis.lux
+++ b/stdlib/source/documentation/lux/control/parser/synthesis.lux
@@ -27,7 +27,7 @@
(documentation: /.end?
"Checks whether there are no more inputs.")
-(template [<query> <assertion>]
+(with_template [<query> <assertion>]
[(`` (documentation: <query>
(format "Queries for a " (~~ (template.text [<query>])) " synthesis node.")))
(`` (documentation: <assertion>
diff --git a/stdlib/source/documentation/lux/control/parser/text.lux b/stdlib/source/documentation/lux/control/parser/text.lux
index db886a7b4..f399d4886 100644
--- a/stdlib/source/documentation/lux/control/parser/text.lux
+++ b/stdlib/source/documentation/lux/control/parser/text.lux
@@ -33,7 +33,7 @@
(documentation: /.any!
"Yields the next character (as a slice) without applying any logic.")
-(template [<name> <caveat>]
+(with_template [<name> <caveat>]
[(`` (documentation: <name>
(format "Produce a character" (~~ (template.text [<caveat>])) " if the parser fails.")))]
@@ -58,7 +58,7 @@
"Only yields characters within a range."
[(range bottom top)])
-(template [<name> <desc>]
+(with_template [<name> <desc>]
[(documentation: <name>
(format "Only yields " <desc> " characters."))]
@@ -77,7 +77,7 @@
(documentation: /.hexadecimal
"Yields hexadecimal digits.")
-(template [<name> <description_modifier>]
+(with_template [<name> <description_modifier>]
[(documentation: <name>
(format "Yields characters that are" <description_modifier> " part of a piece of text."))]
@@ -85,7 +85,7 @@
[/.none_of " not"]
)
-(template [<name> <description_modifier>]
+(with_template [<name> <description_modifier>]
[(documentation: <name>
(format "Yields characters (as a slice) that are" <description_modifier> " part of a piece of text."))]
@@ -108,7 +108,7 @@
"Yields the outputs of both parsers composed together (as a slice)."
[(and! left right)])
-(template [<text> <slice>]
+(with_template [<text> <slice>]
[(`` (documentation: <text>
(format "Yields " (~~ (template.text [<name>])) " characters as a single continuous text.")))
(`` (documentation: <slice>
@@ -118,7 +118,7 @@
[/.many /.many!]
)
-(template [<text> <slice> <doc_modifier>]
+(with_template [<text> <slice> <doc_modifier>]
[(`` (documentation: <text>
(format "Yields " <doc_modifier> " N characters.")))
(`` (documentation: <slice>
diff --git a/stdlib/source/documentation/lux/control/parser/tree.lux b/stdlib/source/documentation/lux/control/parser/tree.lux
index d200cdfe7..af653e30c 100644
--- a/stdlib/source/documentation/lux/control/parser/tree.lux
+++ b/stdlib/source/documentation/lux/control/parser/tree.lux
@@ -24,7 +24,7 @@
(documentation: /.value
"Yields the value inside the current tree node.")
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/control/parser/type.lux b/stdlib/source/documentation/lux/control/parser/type.lux
index fa326176f..0aa20cac6 100644
--- a/stdlib/source/documentation/lux/control/parser/type.lux
+++ b/stdlib/source/documentation/lux/control/parser/type.lux
@@ -41,7 +41,7 @@
""
[(with_extension type poly)])
-(template [<name>]
+(with_template [<name>]
[(`` (documentation: <name>
(format "Parses the contents of a " (~~ (template.text [<name>])) " type.")))]
@@ -61,7 +61,7 @@
"Parses a type application."
[(applied poly)])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
index 0558eaed0..2120ef800 100644
--- a/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/documentation/lux/data/collection/dictionary/ordered.lux
@@ -29,7 +29,7 @@
""
[(key? dict key)])
-(template [<name>]
+(with_template [<name>]
[(`` (documentation: <name>
(format "Yields value under the " (~~ (template.text [<name>])) "imum key.")))]
diff --git a/stdlib/source/documentation/lux/data/collection/list.lux b/stdlib/source/documentation/lux/data/collection/list.lux
index 28b8011f1..2da969a32 100644
--- a/stdlib/source/documentation/lux/data/collection/list.lux
+++ b/stdlib/source/documentation/lux/data/collection/list.lux
@@ -90,7 +90,7 @@
""
[(member? eq xs x)])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/data/color.lux b/stdlib/source/documentation/lux/data/color.lux
index a3d452f5f..c82870c35 100644
--- a/stdlib/source/documentation/lux/data/color.lux
+++ b/stdlib/source/documentation/lux/data/color.lux
@@ -67,7 +67,7 @@
(documentation: /.Pigment
"A color with some degree of transparency.")
-(template [<name>]
+(with_template [<name>]
[(`` (documentation: <name>
(format "A "
(text.replaced "_" "-" (~~ (template.text [<name>])))
diff --git a/stdlib/source/documentation/lux/data/color/named.lux b/stdlib/source/documentation/lux/data/color/named.lux
index 398a4d7ef..d09e90390 100644
--- a/stdlib/source/documentation/lux/data/color/named.lux
+++ b/stdlib/source/documentation/lux/data/color/named.lux
@@ -18,7 +18,7 @@
["[0]" /
["/[1]" //]]])
-(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 866fd5682..a2ea2866e 100644
--- a/stdlib/source/documentation/lux/data/format/json.lux
+++ b/stdlib/source/documentation/lux/data/format/json.lux
@@ -37,7 +37,7 @@
"A JSON object field setter."
[(has key value json)])
-(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 792b904d0..ab9a71016 100644
--- a/stdlib/source/documentation/lux/data/text/encoding.lux
+++ b/stdlib/source/documentation/lux/data/text/encoding.lux
@@ -15,7 +15,7 @@
(documentation: /.Encoding
"Encoding formats for text.")
-(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 3214f6038..de00765eb 100644
--- a/stdlib/source/documentation/lux/data/text/unicode/block.lux
+++ b/stdlib/source/documentation/lux/data/text/unicode/block.lux
@@ -24,7 +24,7 @@
""
[(within? block char)])
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
(let [[_ name] (symbol <name>)]
(format (hex#encoded (/.start <name>))
diff --git a/stdlib/source/documentation/lux/ffi.jvm.lux b/stdlib/source/documentation/lux/ffi.jvm.lux
index 22bd01753..8c4c37046 100644
--- a/stdlib/source/documentation/lux/ffi.jvm.lux
+++ b/stdlib/source/documentation/lux/ffi.jvm.lux
@@ -10,7 +10,7 @@
[\\library
["[0]" /]])
-(template [<name>]
+(with_template [<name>]
[(`` (documentation: <name>
(format "The type of a (boxed) " (~~ (template.text [<name>])) " object.")))]
@@ -24,7 +24,7 @@
[/.Character]
)
-(template [<name>]
+(with_template [<name>]
[(`` (documentation: <name>
(format "The type of an (unboxed) " (~~ (template.text [<name>])) " value.")))]
@@ -38,7 +38,7 @@
[/.char]
)
-(template [<name> <from> <to>]
+(with_template [<name> <from> <to>]
[(`` (documentation: <name>
"Type converter."))]
diff --git a/stdlib/source/documentation/lux/ffi.old.lux b/stdlib/source/documentation/lux/ffi.old.lux
index 863749adf..3f22f8fd2 100644
--- a/stdlib/source/documentation/lux/ffi.old.lux
+++ b/stdlib/source/documentation/lux/ffi.old.lux
@@ -10,7 +10,7 @@
[\\library
["[0]" /]])
-(template [<name> <from> <to>]
+(with_template [<name> <from> <to>]
[(documentation: <name>
"Type converter.")]
diff --git a/stdlib/source/documentation/lux/math/number.lux b/stdlib/source/documentation/lux/math/number.lux
index 90dce2151..2625f99d3 100644
--- a/stdlib/source/documentation/lux/math/number.lux
+++ b/stdlib/source/documentation/lux/math/number.lux
@@ -21,7 +21,7 @@
["[1][0]" ratio]
["[1][0]" complex]])
-(template [<name> <encoding> <no_commas> <with_commas>]
+(with_template [<name> <encoding> <no_commas> <with_commas>]
[(documentation: <name>
(format "Given syntax for a " <encoding> " number, generates a Nat, an Int, a Rev or a Frac.")
[<no_commas>]
diff --git a/stdlib/source/documentation/lux/math/number/frac.lux b/stdlib/source/documentation/lux/math/number/frac.lux
index 57fd3dbd1..7e7cfa502 100644
--- a/stdlib/source/documentation/lux/math/number/frac.lux
+++ b/stdlib/source/documentation/lux/math/number/frac.lux
@@ -30,7 +30,7 @@
"Frac(tion) greater-than or equal."
[(>= reference sample)])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
@@ -45,7 +45,7 @@
""
[(/% param subject)])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
@@ -53,7 +53,7 @@
[/.max "Frac(tion) minimum."]
)
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/math/number/i64.lux b/stdlib/source/documentation/lux/math/number/i64.lux
index f69796e97..d9bf765ca 100644
--- a/stdlib/source/documentation/lux/math/number/i64.lux
+++ b/stdlib/source/documentation/lux/math/number/i64.lux
@@ -10,7 +10,7 @@
[\\library
["[0]" /]])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
@@ -43,7 +43,7 @@
"Count the number of 1s in a bit-map."
[(ones it)])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/math/number/int.lux b/stdlib/source/documentation/lux/math/number/int.lux
index 6a2f7ef24..646220cc3 100644
--- a/stdlib/source/documentation/lux/math/number/int.lux
+++ b/stdlib/source/documentation/lux/math/number/int.lux
@@ -30,7 +30,7 @@
"Int(eger) greater-than or equal."
[(>= reference sample)])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
@@ -38,7 +38,7 @@
[/.max "Int(eger) maximum."]
)
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/math/number/nat.lux b/stdlib/source/documentation/lux/math/number/nat.lux
index f830b17fd..6f79389c7 100644
--- a/stdlib/source/documentation/lux/math/number/nat.lux
+++ b/stdlib/source/documentation/lux/math/number/nat.lux
@@ -10,7 +10,7 @@
[\\library
["[0]" /]])
-(template [<name> <documentation>]
+(with_template [<name> <documentation>]
[(documentation: <name>
<documentation>)]
@@ -27,7 +27,7 @@
[/.% "Nat(ural) remainder."]
)
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/math/number/rev.lux b/stdlib/source/documentation/lux/math/number/rev.lux
index 30bf3821b..39dc43660 100644
--- a/stdlib/source/documentation/lux/math/number/rev.lux
+++ b/stdlib/source/documentation/lux/math/number/rev.lux
@@ -30,7 +30,7 @@
"Rev(olution) greater-than or equal."
[(>= reference sample)])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
@@ -38,7 +38,7 @@
[/.max "Rev(olution) maximum."]
)
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/static.lux b/stdlib/source/documentation/lux/static.lux
index 6b820161b..ab822cb92 100644
--- a/stdlib/source/documentation/lux/static.lux
+++ b/stdlib/source/documentation/lux/static.lux
@@ -10,7 +10,7 @@
[\\library
["[0]" /]])
-(template [<name> <type>]
+(with_template [<name> <type>]
[(documentation: <name>
(%.code (' (<name>
(is <type>
@@ -31,7 +31,7 @@
(is ???
(value generating expression)))])
-(template [<name> <type>]
+(with_template [<name> <type>]
[(documentation: <name>
(%.code (' (is <type>
(<name>)))))]
diff --git a/stdlib/source/documentation/lux/time.lux b/stdlib/source/documentation/lux/time.lux
index 6337f6e1b..9e460146c 100644
--- a/stdlib/source/documentation/lux/time.lux
+++ b/stdlib/source/documentation/lux/time.lux
@@ -20,7 +20,7 @@
["[1][0]" month]
["[1][0]" year]])
-(template [<name> <doc>]
+(with_template [<name> <doc>]
[(documentation: <name>
<doc>)]
diff --git a/stdlib/source/documentation/lux/type.lux b/stdlib/source/documentation/lux/type.lux
index d1aef3ff2..138986636 100644
--- a/stdlib/source/documentation/lux/type.lux
+++ b/stdlib/source/documentation/lux/type.lux
@@ -24,7 +24,7 @@
["[1][0]" unit]
["[1][0]" variance]])
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
"The number of parameters, and the body, of a quantified type.")]
@@ -40,7 +40,7 @@
"The quantified type, and its parameters, for a type-application."
[(flat_application type)])
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
"The members of a composite type.")]
@@ -69,7 +69,7 @@
"A type without any names covering it."
[(anonymous type)])
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
"A composite type, constituted by the given member types.")]
@@ -85,7 +85,7 @@
"An un-evaluated type application, with the given quantified type, and parameters."
[(application params quant)])
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
"A quantified type, with the given number of parameters, and body.")]
diff --git a/stdlib/source/documentation/lux/type/primitive.lux b/stdlib/source/documentation/lux/type/primitive.lux
index ea7ca95ea..6d9e20762 100644
--- a/stdlib/source/documentation/lux/type/primitive.lux
+++ b/stdlib/source/documentation/lux/type/primitive.lux
@@ -23,7 +23,7 @@
"A specific abstract/nominal type still being defined somewhere in the scope."
[(specific name)])
-(template [<name> <from> <$> <to>]
+(with_template [<name> <from> <$> <to>]
[(documentation: <name>
"Type-casting macro for abstract/nominal types."
[(|> value
diff --git a/stdlib/source/documentation/lux/type/resource.lux b/stdlib/source/documentation/lux/type/resource.lux
index bc3e8f0f0..a216b3082 100644
--- a/stdlib/source/documentation/lux/type/resource.lux
+++ b/stdlib/source/documentation/lux/type/resource.lux
@@ -51,7 +51,7 @@
(format "A resource locked by a key."
\n "The 'key' represents the right to access/consume a resource."))
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
"Makes a value into a resource and adds the key/access-right to it to the ambient keyring for future use.")]
@@ -75,7 +75,7 @@
right (read ! res|right)]
(in (format left right)))])
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
"Group/un-group keys in the keyring into/out-of tuples."
[(do (monad !)
diff --git a/stdlib/source/documentation/lux/type/unit.lux b/stdlib/source/documentation/lux/type/unit.lux
index 4a8dbd8b1..3a80b367c 100644
--- a/stdlib/source/documentation/lux/type/unit.lux
+++ b/stdlib/source/documentation/lux/type/unit.lux
@@ -42,7 +42,7 @@
""
[(re_scaled from to quantity)])
-(template [<type> <scale>]
+(with_template [<type> <scale>]
[(`` (documentation: <scale>
(let [numerator (the [/.ratio ratio.#numerator] <scale>)
denominator (the [/.ratio ratio.#denominator] <scale>)]
@@ -57,7 +57,7 @@
[/.Nano /.nano]
)
-(template [<unit>]
+(with_template [<unit>]
[(`` (documentation: <unit>
(format "The '" (~~ (template.text [<unit>])) "' unit of meaurement.")))]
diff --git a/stdlib/source/documentation/lux/world/net/http/client.lux b/stdlib/source/documentation/lux/world/net/http/client.lux
index 2f44944ca..0a779634d 100644
--- a/stdlib/source/documentation/lux/world/net/http/client.lux
+++ b/stdlib/source/documentation/lux/world/net/http/client.lux
@@ -17,7 +17,7 @@
(documentation: (/.Client !)
"A HTTP client capable of issuing requests to a HTTP server.")
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
(format "A " (text.upper_cased (template.text [<name>])) " request."))]
diff --git a/stdlib/source/documentation/lux/world/net/http/status.lux b/stdlib/source/documentation/lux/world/net/http/status.lux
index 2ccf8d681..9d34e7487 100644
--- a/stdlib/source/documentation/lux/world/net/http/status.lux
+++ b/stdlib/source/documentation/lux/world/net/http/status.lux
@@ -13,7 +13,7 @@
[\\library
["[0]" /]])
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
(|> (template.text [<name>])
(text.replaced "_" " ")
diff --git a/stdlib/source/documentation/lux/world/output/video/resolution.lux b/stdlib/source/documentation/lux/world/output/video/resolution.lux
index 65aa9d860..f6881ac34 100644
--- a/stdlib/source/documentation/lux/world/output/video/resolution.lux
+++ b/stdlib/source/documentation/lux/world/output/video/resolution.lux
@@ -16,7 +16,7 @@
(documentation: /.Resolution
"A screen resolution.")
-(template [<name>]
+(with_template [<name>]
[(documentation: <name>
(let [name (|> (template.text [<name>])
(text.replaced "_" " ")