summaryrefslogtreecommitdiff
path: root/tests/library
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2021-01-30 12:09:26 +0100
committerLaurenz <laurmaedje@gmail.com>2021-01-30 12:09:26 +0100
commit89eb8bae49edb71d9a9279a2210bb1ccaf4dd707 (patch)
tree160b1a2ff41b5bba8a58f882df9d10c9eb036cf2 /tests/library
parentac24075469f171fe83a976b9a97b9b1ea078a7e3 (diff)
New syntax 💎
- Everything everywhere! - Blocks with curly braces: {} - Templates with brackets: [] - Function templates with hashtag: `#[f]` - Headings with equals sign: `= Introduction`
Diffstat (limited to 'tests/library')
-rw-r--r--tests/library/typ/font.typ46
-rw-r--r--tests/library/typ/hv.typ18
-rw-r--r--tests/library/typ/image.typ30
-rw-r--r--tests/library/typ/page.typ53
-rw-r--r--tests/library/typ/pagebreak.typ4
-rw-r--r--tests/library/typ/rgb.typ22
6 files changed, 86 insertions, 87 deletions
diff --git a/tests/library/typ/font.typ b/tests/library/typ/font.typ
index 4be98941..57761a8f 100644
--- a/tests/library/typ/font.typ
+++ b/tests/library/typ/font.typ
@@ -1,37 +1,37 @@
// Test configuring font properties.
-[font "PT Sans", 10pt]
+#[font "PT Sans", 10pt]
// Set same font size in three different ways.
-[font 20pt][A]
-[font 200%][A]
-[font 15pt + 50%][A]
+#[font 20pt][A]
+#[font 200%][A]
+#[font 15pt + 50%][A]
// Do nothing.
-[font][Normal]
+#[font][Normal]
// Set style (is available).
-[font style: italic][Italic]
+#[font style: italic][Italic]
// Set weight (is available).
-[font weight: bold][Bold]
+#[font weight: bold][Bold]
// Set stretch (not available, matching closest).
-[font stretch: ultra-condensed][Condensed]
+#[font stretch: ultra-condensed][Condensed]
-// Error: 1:7-1:12 unexpected argument
-[font false]
+// Error: 1:8-1:13 unexpected argument
+#[font false]
-// Error: 3:14-3:18 expected font style, found font weight
-// Error: 2:28-2:34 expected font weight, found string
-// Error: 1:43-1:44 expected font family or array of font families, found integer
-[font style: bold, weight: "thin", serif: 0]
+// Error: 3:15-3:19 expected font style, found font weight
+// Error: 2:29-2:35 expected font weight, found string
+// Error: 1:44-1:45 expected font family or array of font families, found integer
+#[font style: bold, weight: "thin", serif: 0]
-// Warning: 1:15-1:19 should be between 100 and 900
-[font weight: 2700]
+// Warning: 1:16-1:20 should be between 100 and 900
+#[font weight: 2700]
-// Error: 1:7-1:27 unexpected argument
-[font something: "invalid"]
+// Error: 1:8-1:28 unexpected argument
+#[font something: "invalid"]
---
// Test font fallback and class definitions.
@@ -40,17 +40,17 @@
Emoji: 🏀
// CMU Serif + Noto Emoji.
-[font "CMU Serif", "Noto Emoji"][
+#[font "CMU Serif", "Noto Emoji"][
Emoji: 🏀
]
// Class definitions.
-[font serif: ("CMU Serif", "Latin Modern Math", "Noto Emoji")]
-[font serif][
+#[font serif: ("CMU Serif", "Latin Modern Math", "Noto Emoji")]
+#[font serif][
Math: ∫ α + β ➗ 3
]
// Class definition reused.
-[font sans-serif: "Noto Emoji"]
-[font sans-serif: ("Archivo", sans-serif)]
+#[font sans-serif: "Noto Emoji"]
+#[font sans-serif: ("Archivo", sans-serif)]
New sans-serif. 🚀
diff --git a/tests/library/typ/hv.typ b/tests/library/typ/hv.typ
index 36a6d242..67c04a12 100644
--- a/tests/library/typ/hv.typ
+++ b/tests/library/typ/hv.typ
@@ -1,22 +1,22 @@
// Ends paragraphs.
-Tightly [v -5pt] packed
+Tightly #[v -5pt] packed
// Eating up soft spacing.
-Inv [h 0pt] isible
+Inv #[h 0pt] isible
// Multiple spacings in a row.
-Add [h 10pt] [h 10pt] up
+Add #[h 10pt] #[h 10pt] up
// Relative to font size.
-Relative [h 100%] spacing
+Relative #[h 100%] spacing
// Missing spacing.
-// Error: 1:11-1:11 missing argument: spacing
-Totally [h] ignored
+// Error: 1:12-1:12 missing argument: spacing
+Totally #[h] ignored
// Swapped axes.
-[page main-dir: rtl, cross-dir: ttb, height: 80pt][
- 1 [h 1cm] 2
+#[page main-dir: rtl, cross-dir: ttb, height: 80pt][
+ 1 #[h 1cm] 2
- 3 [v 1cm] 4 [v -1cm] 5
+ 3 #[v 1cm] 4 #[v -1cm] 5
]
diff --git a/tests/library/typ/image.typ b/tests/library/typ/image.typ
index 2e7b1eb5..a1e886dd 100644
--- a/tests/library/typ/image.typ
+++ b/tests/library/typ/image.typ
@@ -1,39 +1,39 @@
// Test loading different image formats.
// Load an RGBA PNG image.
-[image "res/rhino.png"]
-[pagebreak]
+#[image "res/rhino.png"]
+#[pagebreak]
// Load an RGB JPEG image.
-[image "res/tiger.jpg"]
+#[image "res/tiger.jpg"]
-// Error: 1:8-1:29 failed to load image
-[image "path/does/not/exist"]
+// Error: 1:9-1:30 failed to load image
+#[image "path/does/not/exist"]
-// Error: 1:8-1:29 failed to load image
-[image "typ/image-error.typ"]
+// Error: 1:9-1:30 failed to load image
+#[image "typ/image-error.typ"]
---
// Test configuring the size and fitting behaviour of images.
// Fit to width of page.
-[image "res/rhino.png"]
+#[image "res/rhino.png"]
// Fit to height of page.
-[page height: 40pt][
- [image "res/rhino.png"]
+#[page height: 40pt][
+ #[image "res/rhino.png"]
]
// Set width explicitly.
-[image "res/rhino.png", width: 50pt]
+#[image "res/rhino.png", width: 50pt]
// Set height explicitly.
-[image "res/rhino.png", height: 50pt]
+#[image "res/rhino.png", height: 50pt]
// Set width and height explicitly and force stretching.
-[image "res/rhino.png", width: 25pt, height: 50pt]
+#[image "res/rhino.png", width: 25pt, height: 50pt]
// Make sure the bounding-box of the image is correct.
-[align bottom, right][
- [image "res/tiger.jpg", width: 60pt]
+#[align bottom, right][
+ #[image "res/tiger.jpg", width: 60pt]
]
diff --git a/tests/library/typ/page.typ b/tests/library/typ/page.typ
index 9eeddc93..97100ae9 100644
--- a/tests/library/typ/page.typ
+++ b/tests/library/typ/page.typ
@@ -1,54 +1,53 @@
// Test configuring page sizes and margins.
// Set width and height.
-[page width: 120pt, height: 120pt]
-[page width: 40pt][High]
-[page height: 40pt][Wide]
+#[page width: 120pt, height: 120pt]
+#[page width: 40pt][High]
+#[page height: 40pt][Wide]
// Set all margins at once.
-[page margins: 30pt][
- [align top, left][TL]
- [align bottom, right][BR]
+#[page margins: 30pt][
+ #[align top, left][TL]
+ #[align bottom, right][BR]
]
// Set individual margins.
-[page height: 40pt]
-[page left: 0pt | align left][Left]
-[page right: 0pt | align right][Right]
-[page top: 0pt | align top][Top]
-[page bottom: 0pt | align bottom][Bottom]
+#[page height: 40pt]
+#[page left: 0pt | align left][Left]
+#[page right: 0pt | align right][Right]
+#[page top: 0pt | align top][Top]
+#[page bottom: 0pt | align bottom][Bottom]
// Ensure that specific margins override general margins.
-[page margins: 0pt, left: 20pt][Overriden]
+#[page margins: 0pt, left: 20pt][Overriden]
-// Error: 1:7-1:18 unknown variable
-[page nonexistant]
+// Error: 1:8-1:19 unknown variable
+#[page nonexistant]
-// Error: 1:17-1:20 aligned axis
-[page main-dir: ltr]
+// Error: 1:18-1:21 aligned axis
+#[page main-dir: ltr]
// Flipped predefined paper.
-[page "a11", flip: true][Flipped A11]
+#[page "a11", flip: true][Flipped A11]
// Flipped custom page size.
-[page width: 40pt, height: 120pt]
-[page flip: true]
+#[page width: 40pt, height: 120pt]
+#[page flip: true]
Wide
// Test changing the layouting directions of pages.
-
-[page height: 50pt, main-dir: btt, cross-dir: rtl]
+#[page height: 50pt, main-dir: btt, cross-dir: rtl]
Right to left!
---
// Test a combination of pages with bodies and normal content.
-[page height: 50pt]
+#[page height: 50pt]
-[page][First]
-[page][Second]
-[pagebreak]
+#[page][First]
+#[page][Second]
+#[pagebreak]
Fourth
-[page][]
+#[page][]
Sixth
-[page][Seventh and last]
+#[page][Seventh and last]
diff --git a/tests/library/typ/pagebreak.typ b/tests/library/typ/pagebreak.typ
index 2f539ce0..08dd9c7b 100644
--- a/tests/library/typ/pagebreak.typ
+++ b/tests/library/typ/pagebreak.typ
@@ -1,3 +1,3 @@
First of two
-[pagebreak]
-[page height: 40pt]
+#[pagebreak]
+#[page height: 40pt]
diff --git a/tests/library/typ/rgb.typ b/tests/library/typ/rgb.typ
index f778b2d1..e7b40518 100644
--- a/tests/library/typ/rgb.typ
+++ b/tests/library/typ/rgb.typ
@@ -1,17 +1,17 @@
// Check the output.
-[rgb 0.0, 0.3, 0.7]
+#[rgb 0.0, 0.3, 0.7]
// Alpha channel.
-[rgb 1.0, 0.0, 0.0, 0.5]
+#[rgb 1.0, 0.0, 0.0, 0.5]
-// Warning: 2:6-2:9 should be between 0.0 and 1.0
-// Warning: 1:11-1:15 should be between 0.0 and 1.0
-[rgb -30, 15.5, 0.5]
+// Warning: 2:7-2:10 should be between 0.0 and 1.0
+// Warning: 1:12-1:16 should be between 0.0 and 1.0
+#[rgb -30, 15.5, 0.5]
-// Error: 1:6-1:10 missing argument: blue component
-[rgb 0, 1]
+// Error: 1:7-1:11 missing argument: blue component
+#[rgb 0, 1]
-// Error: 3:5-3:5 missing argument: red component
-// Error: 2:5-2:5 missing argument: green component
-// Error: 1:5-1:5 missing argument: blue component
-[rgb]
+// Error: 3:6-3:6 missing argument: red component
+// Error: 2:6-2:6 missing argument: green component
+// Error: 1:6-1:6 missing argument: blue component
+#[rgb]