summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/ref/structure/list.pngbin21396 -> 21285 bytes
-rw-r--r--tests/typ/code/block.typ8
-rw-r--r--tests/typ/code/call.typ2
-rw-r--r--tests/typ/code/closure.typ2
-rw-r--r--tests/typ/code/for.typ4
-rw-r--r--tests/typ/code/if.typ8
-rw-r--r--tests/typ/code/ops-invalid.typ2
-rw-r--r--tests/typ/code/ops.typ4
-rw-r--r--tests/typ/code/repr.typ2
-rw-r--r--tests/typ/code/return.typ2
-rw-r--r--tests/typ/code/while.typ4
-rw-r--r--tests/typ/structure/enum.typ4
-rw-r--r--tests/typ/structure/list.typ2
-rw-r--r--tests/typ/style/set-site.typ2
-rw-r--r--tests/typ/style/show.typ2
-rw-r--r--tests/typ/style/wrap.typ2
-rw-r--r--tests/typ/text/emph-strong.typ2
-rw-r--r--tests/typ/utility/basics.typ4
-rw-r--r--tests/typ/utility/collection.typ6
-rw-r--r--tests/typ/utility/math.typ2
20 files changed, 32 insertions, 32 deletions
diff --git a/tests/ref/structure/list.png b/tests/ref/structure/list.png
index 503bfc9a..e8a38616 100644
--- a/tests/ref/structure/list.png
+++ b/tests/ref/structure/list.png
Binary files differ
diff --git a/tests/typ/code/block.typ b/tests/typ/code/block.typ
index 9122ea48..194cde7a 100644
--- a/tests/typ/code/block.typ
+++ b/tests/typ/code/block.typ
@@ -11,7 +11,7 @@
for s in parts [{s}]
}
-// Evaluates to join of the templates and strings.
+// Evaluates to join of the content and strings.
{
[How]
if true {
@@ -52,13 +52,13 @@
// Some things can't be joined.
{
[A]
- // Error: 3-4 cannot join template with integer
+ // Error: 3-4 cannot join content with integer
1
[B]
}
---
-// Block directly in template also creates a scope.
+// Block directly in markup also creates a scope.
{ let x = 1 }
// Error: 7-8 unknown variable
@@ -103,7 +103,7 @@
}
---
-// Template also creates a scope.
+// Content blocks also create a scope.
[#let x = 1]
// Error: 2-3 unknown variable
diff --git a/tests/typ/code/call.typ b/tests/typ/code/call.typ
index 5736c63b..51ef1df5 100644
--- a/tests/typ/code/call.typ
+++ b/tests/typ/code/call.typ
@@ -63,7 +63,7 @@
---
#let f(x) = x
-// Error: 1-6 expected callable or collection, found template
+// Error: 1-6 expected callable or collection, found content
#f[1](2)
---
diff --git a/tests/typ/code/closure.typ b/tests/typ/code/closure.typ
index 14e74e7e..6ef3cb28 100644
--- a/tests/typ/code/closure.typ
+++ b/tests/typ/code/closure.typ
@@ -2,7 +2,7 @@
// Ref: false
---
-// Don't parse closure directly in template.
+// Don't parse closure directly in content.
// Ref: true
#let x = "\"hi\""
diff --git a/tests/typ/code/for.typ b/tests/typ/code/for.typ
index 661079fe..e161ba84 100644
--- a/tests/typ/code/for.typ
+++ b/tests/typ/code/for.typ
@@ -28,7 +28,7 @@
"]"
}
-// Template body.
+// Content block body.
// Should output `2345`.
#for v in (1, 2, 3, 4, 5, 6, 7) [#if v >= 2 and v <= 5 { repr(v) }]
@@ -76,7 +76,7 @@
// Return value.
#test(for v in "" [], none)
-#test(type(for v in "1" []), "template")
+#test(type(for v in "1" []), "content")
---
// Uniterable expression.
diff --git a/tests/typ/code/if.typ b/tests/typ/code/if.typ
index 3b3164fc..0ab5c495 100644
--- a/tests/typ/code/if.typ
+++ b/tests/typ/code/if.typ
@@ -16,7 +16,7 @@
One.
]
-// Template in condition.
+// Content block in condition.
#if [] != none [
Two.
]
@@ -39,10 +39,10 @@
"Four" + point
}
-// Template can be argument or body depending on whitespace.
+// Content block can be argument or body depending on whitespace.
{
- if "template" == type[b] [Fi] else [Nope]
- if "template" == type [Nope] else [ve.]
+ if "content" == type[b] [Fi] else [Nope]
+ if "content" == type [Nope] else [ve.]
}
#let i = 3
diff --git a/tests/typ/code/ops-invalid.typ b/tests/typ/code/ops-invalid.typ
index 340e4c9f..184e20cf 100644
--- a/tests/typ/code/ops-invalid.typ
+++ b/tests/typ/code/ops-invalid.typ
@@ -14,7 +14,7 @@
#test({2*}, 2)
---
-// Error: 2-12 cannot apply '+' to template
+// Error: 2-12 cannot apply '+' to content
{+([] + [])}
---
diff --git a/tests/typ/code/ops.typ b/tests/typ/code/ops.typ
index 53d00132..b81fc841 100644
--- a/tests/typ/code/ops.typ
+++ b/tests/typ/code/ops.typ
@@ -2,7 +2,7 @@
// Ref: false
---
-// Test template addition.
+// Test adding content.
// Ref: true
{[*Hello* ] + [world!]}
@@ -130,7 +130,7 @@
#test(test == test, true)
#test((() => {}) == (() => {}), false)
-// Templates compare by some kind of equality.
+// Content compares by hash equality.
#let t = [a]
#test(t == t, true)
#test([] == [], true)
diff --git a/tests/typ/code/repr.typ b/tests/typ/code/repr.typ
index 22890ff1..f766ee7e 100644
--- a/tests/typ/code/repr.typ
+++ b/tests/typ/code/repr.typ
@@ -39,7 +39,7 @@
{"a\n[]\"\u{1F680}string"}
---
-// Templates.
+// Content.
{[*{"H" + "i"} there*]}
---
diff --git a/tests/typ/code/return.typ b/tests/typ/code/return.typ
index 9ee3aed7..d3016444 100644
--- a/tests/typ/code/return.typ
+++ b/tests/typ/code/return.typ
@@ -30,7 +30,7 @@
#test(f(2), "ad")
---
-// Test return with joining and template.
+// Test return with joining and content.
// Ref: true
#let f(text, caption: none) = {
diff --git a/tests/typ/code/while.typ b/tests/typ/code/while.typ
index ccb67968..5dc5ae41 100644
--- a/tests/typ/code/while.typ
+++ b/tests/typ/code/while.typ
@@ -26,11 +26,11 @@
#test(while false {}, none)
#let i = 0
-#test(type(while i < 1 [{ i += 1 }]), "template")
+#test(type(while i < 1 [{ i += 1 }]), "content")
---
// Condition must be boolean.
-// Error: 8-14 expected boolean, found template
+// Error: 8-14 expected boolean, found content
#while [nope] [nope]
---
diff --git a/tests/typ/structure/enum.typ b/tests/typ/structure/enum.typ
index 8ba3cea6..24c28147 100644
--- a/tests/typ/structure/enum.typ
+++ b/tests/typ/structure/enum.typ
@@ -17,7 +17,7 @@
. Indented
---
-// Test automatic numbering in summed templates.
+// Test automatic numbering in summed content.
#for i in range(5) {
[. #roman(1 + i)]
}
@@ -55,6 +55,6 @@
#set enum(label: "(())")
---
-// Error: 18-28 expected template, found boolean
+// Error: 18-28 expected content, found boolean
#set enum(label: n => false)
. A
diff --git a/tests/typ/structure/list.typ b/tests/typ/structure/list.typ
index 38fc2c63..67be1628 100644
--- a/tests/typ/structure/list.typ
+++ b/tests/typ/structure/list.typ
@@ -28,7 +28,7 @@ paragraphs.
---
- Level 1
- Level [
-2 through template
+2 through content block
]
---
diff --git a/tests/typ/style/set-site.typ b/tests/typ/style/set-site.typ
index dc9c9e02..8ee8a5fd 100644
--- a/tests/typ/style/set-site.typ
+++ b/tests/typ/style/set-site.typ
@@ -1,5 +1,5 @@
// Test that set affects the instantiation site and not the
-// definition site of a template.
+// definition site of a content.
---
// Test that text is affected by instantiation-site bold.
diff --git a/tests/typ/style/show.typ b/tests/typ/style/show.typ
index 734ef931..e442e4d5 100644
--- a/tests/typ/style/show.typ
+++ b/tests/typ/style/show.typ
@@ -39,7 +39,7 @@ A [= Heading] C
= Heading
---
-// Error: 1-28 expected template, found string
+// Error: 1-28 expected content, found string
#show heading(_, _) as "hi"
= Heading
diff --git a/tests/typ/style/wrap.typ b/tests/typ/style/wrap.typ
index 9c94b9ae..b549f7d0 100644
--- a/tests/typ/style/wrap.typ
+++ b/tests/typ/style/wrap.typ
@@ -15,7 +15,7 @@ transports meaning from parchment to reader, the wave that sparks a flame
in booklovers and the great fulfiller of human need.
---
-// Test wrap in template.
+// Test wrap in content block.
A [_B #wrap c in [*#c*]; C_] D
---
diff --git a/tests/typ/text/emph-strong.typ b/tests/typ/text/emph-strong.typ
index 9bdb5059..cd2191cc 100644
--- a/tests/typ/text/emph-strong.typ
+++ b/tests/typ/text/emph-strong.typ
@@ -7,7 +7,7 @@ _Emphasized and *strong* words!_
// Inside of a word it's a normal underscore or star.
hello_world Nutzer*innen
-// Can contain paragraph in child template.
+// Can contain paragraph in nested content block.
_Still [
] emphasized._
diff --git a/tests/typ/utility/basics.typ b/tests/typ/utility/basics.typ
index 304fe769..7fccc781 100644
--- a/tests/typ/utility/basics.typ
+++ b/tests/typ/utility/basics.typ
@@ -36,7 +36,7 @@
#test("(" + join("a", "b", "c", sep: ", ") + ")", "(a, b, c)")
---
-// Test joining templates.
+// Test content joining.
// Ref: true
#join([One], [Two], [Three], sep: [, ]).
@@ -72,7 +72,7 @@
#float(float)
---
-// Error: 6-8 cannot convert template to string
+// Error: 6-8 cannot convert content to string
#str([])
---
diff --git a/tests/typ/utility/collection.typ b/tests/typ/utility/collection.typ
index 649be4f7..e8be07b5 100644
--- a/tests/typ/utility/collection.typ
+++ b/tests/typ/utility/collection.typ
@@ -24,7 +24,7 @@
#test(upper("Ελλάδα"), "ΕΛΛΆΔΑ")
---
-// Error: 8-9 expected string or template, found integer
+// Error: 8-9 expected string or content, found integer
#upper(1)
---
@@ -35,9 +35,9 @@
#test(sorted((2, 1, 3, 10, 5, 8, 6, -7, 2)), (-7, 1, 2, 2, 3, 5, 6, 8, 10))
---
-// Error: 9-21 cannot compare string with integer
+// Error: 9-21 cannot order string and integer
#sorted((1, 2, "ab"))
---
-// Error: 9-24 cannot compare template with template
+// Error: 9-24 cannot order content and content
#sorted(([Hi], [There]))
diff --git a/tests/typ/utility/math.typ b/tests/typ/utility/math.typ
index edbbd682..ec62dbd2 100644
--- a/tests/typ/utility/math.typ
+++ b/tests/typ/utility/math.typ
@@ -54,7 +54,7 @@
#min()
---
-// Error: 9-13 cannot compare integer with string
+// Error: 9-13 cannot compare integer and string
#min(1, "hi")
---