c393eccd36
Fix space/newline trimming 🐞
...
Co-Authored-By: Martin <mhaug@live.de>
2021-03-30 14:31:46 +02:00
652986fd58
Fix double leading 🐞
2021-03-30 14:31:39 +02:00
88da325c7d
Fixed par layouter directions 🗜
2021-03-29 15:02:15 +02:00
309b8f20a8
Line break iterating run shaper 🌵
...
Co-Authored-By: Martin <mhaug@live.de>
2021-03-29 15:02:15 +02:00
8c27dc1010
Write spaces and linebreaks into text runs ✒
2021-03-29 15:02:15 +02:00
9c040a9d2b
Move around test cases 🚚
2021-03-29 14:51:54 +02:00
57ca9628c1
Better space coalescing logic 🌧
...
This creates a smaller state machine helper type for softness coalescing, which does not own the resulting nodes. While this creates a bit more duplication in stack and par builder, it makes it a lot easier to integrate additional logic into the paragraph builder.
Furthermore:
- Line breaks are now "hard", that is, not coalesced with each other.
- Text nodes with equal style are now merged allowing for example `f{}i` to form a ligature.
2021-03-27 21:52:39 +01:00
76fc4cca62
Refactor alignments & directions 📐
...
- Adds lang function
- Refactors execution context
- Adds StackChild and ParChild enums
2021-03-25 21:32:33 +01:00
e8057a5385
Make pdf module top-level 🧱
2021-03-24 21:48:25 +01:00
73615f7e3c
Text shaping 🚀
...
- Shapes text with rustybuzz
- Font fallback with family list
- Tofus are shown in the first font
Co-Authored-By: Martin <mhaug@live.de>
2021-03-24 17:12:34 +01:00
98336bfafb
Better font family definitions ✒
2021-03-22 14:08:50 +01:00
39f55481ed
More consistent documentation 📝
2021-03-22 10:48:29 +01:00
83fa2c075e
Fix bug with line spacing after headings ✅
2021-03-22 01:14:37 +01:00
5e08028fb3
Syntax functions 🚀
...
This adds overridable functions that markup desugars into. Specifically:
- \ desugars into linebreak
- Two newlines desugar into parbreak
- * desugars into strong
- _ desugars into emph
- = .. desugars into heading
- `..` desugars into raw
2021-03-21 17:50:56 +01:00
898728f260
Square, circle and ellipse 🔵
2021-03-20 20:19:30 +01:00
6cb9fe9064
Text colors 🦩 ( #18 )
2021-03-19 22:36:13 +01:00
898dc38ec1
Better debug representations 💻
2021-03-19 21:23:03 +01:00
264a7dedd4
Scheduled maintenance 🔨
...
- New naming scheme
- TextNode instead of NodeText
- CallExpr instead of ExprCall
- ...
- Less glob imports
- Removes Value::Args variant
- Removes prelude
- Renames Layouted to Fragment
- Moves font into env
- Moves shaping into layout
- Moves frame into separate module
2021-03-19 17:57:31 +01:00
ca3df70e2a
Add basic paragraph function 📑
...
Allows to change:
- (paragraph) spacing
- leading
- word-spacing
2021-03-19 13:32:12 +01:00
54a9ccb1a5
Configurable font edges ⚙
...
Adds top-edge and bottom-edge parameters to the font function. These define how
the box around a word is computed. The possible values are:
- ascender
- cap-height (default top edge)
- x-height
- baseline (default bottom edge)
- descender
The defaults are chosen so that it's easy to create good-looking designs with
vertical alignment. Since they are much tighter than what most other software
uses by default, the default leading had to be increased to 50% of the font size
and paragraph spacing to 100% of the font size.
The values cap-height and x-height fall back to ascender in case they are zero
because this value may occur in fonts that don't have glyphs with cap- or
x-height (like Twitter Color Emoji). Since cap-height is the default top edge,
doing no fallback would break things badly.
Removes softness in favor of a simple boolean for pages and a more finegread u8
for spacing. This is needed to make paragraph spacing consume line spacing
created by hard line breaks.
2021-03-19 13:20:58 +01:00
bd12d135ca
Merge text and shape PDF loops 🎡
2021-03-19 11:05:23 +01:00
6bd1a494e0
Formatting and documentation ✨
2021-03-17 23:29:58 +01:00
49bb7f9a2b
Switch from name to ratio for font stretch parameter 📐
2021-03-17 23:14:19 +01:00
8cdfc7faaf
Rename box to rect and color to fill ✏
2021-03-17 22:08:44 +01:00
271b0f953b
Fixes in TextMate grammar ✅
2021-03-17 14:47:11 +01:00
ceb00a2e77
Factor out alignment deduplication into separate function ♻
2021-03-13 16:57:15 +01:00
1584b09708
Fix pagebreak-in-box bug ✔
2021-03-12 18:48:11 +01:00
c3acb491e3
Refactor execution context 🏗
...
- The execution context is a lot more structured: Instead of a magic stack of arbitrary objects there are static objects for pages, stacks and paragraphs
- Page softness/keeping mechanic is now a lot simpler than before
2021-03-12 14:16:59 +01:00
584a43277d
Rename ChildAlign to LayoutAligns ✏
2021-03-12 14:12:30 +01:00
c1b1dbcc09
Better expansion behaviour 🐪
...
This makes expansion behaviour inheritable by placing it into the area and passing it down during layouting instead of computing some approximation of what we want during execution.
2021-03-11 10:48:29 +01:00
4e5f85aa4a
Pad function 🔲
2021-03-10 17:42:47 +01:00
b0446cbdd1
Move around library types 🚚
2021-03-10 17:22:44 +01:00
bbb9ed07ff
Better line spacing calculations ↕
...
- Only add line spacing between lines. Previously, line spacing was added below
every line, making `#box[word]` higher than just `word`.
- Compute box height of text as `ascender - descender` so that the full word is
contained in the box.
2021-03-10 10:20:01 +01:00
b2b8d37ce0
Rename run to line and add some explanatory comments ✏
...
The name run was a relict of the time where a line consisted of a set of runs with same alignment. While these runs still exist conceptually, they are all stored flatly together in what was now renamed from `run` to `line`.
2021-03-09 17:25:25 +01:00
5157c1e276
Documentation fixes ✔
2021-03-03 23:32:29 +01:00
193734f453
Callee expressions 🍅
2021-03-03 22:33:00 +01:00
1cfc3c72b5
Show name of user-defined functions in representation 🦋
2021-03-03 18:15:33 +01:00
c94a18833f
Closures and function definitions 🚀
...
Supports:
- Closure syntax: `(x, y) => z`
- Shorthand for a single argument: `x => y`
- Function syntax: `let f(x) = y`
- Capturing of variables from the environment
- Error messages for too few / many passed arguments
Does not support:
- Named arguments
- Variadic arguments with `..`
2021-03-03 17:53:40 +01:00
4d90a066f1
Simplify collection parsing ♻
...
In preparation for closure expressions.
2021-03-02 23:20:28 +01:00
d5d187a8c2
Replace default fonts 🆕
2021-03-02 17:31:41 +01:00
45abcf6b2b
Remove dependencies on itoa and ryu ⬇️
2021-03-02 15:45:01 +01:00
742a28a57a
Cleaner control flow in for loop evaluation 🧼
2021-02-24 21:32:09 +01:00
f084165eab
While loops 🔁
2021-02-24 21:29:32 +01:00
dae3dad540
Index + value iteration for arrays 🦚
2021-02-24 18:54:06 +01:00
de37a056ed
Split pushed text at newlines ✂
2021-02-21 11:43:25 +01:00
4d42c79b16
Fix spacing after raw blocks ⬇️
2021-02-21 11:43:08 +01:00
927341d93a
Update coma example ⬆️
2021-02-18 15:19:29 +01:00
ed81049ddc
Show repr in monospace 📏
2021-02-18 15:06:13 +01:00
84cdc85ca7
Refresh parser 🌊
2021-02-18 15:06:00 +01:00
e143fd36ef
Refresh tokenizer 🌊
2021-02-18 15:05:49 +01:00
db1659a987
Rename any template to func template ✏
2021-02-12 23:14:29 +01:00
094462cbdd
Make templates and strings summable 🥪
2021-02-12 23:11:47 +01:00
58f799c41c
Early quit loop when body returns error 🛑
2021-02-12 23:06:04 +01:00
790dc9e667
Cleaning 🧹
2021-02-12 22:55:26 +01:00
a2fcc1bf28
Small fixes ♻
2021-02-11 22:24:42 +01:00
146eda102a
Move span directly into diagnostics 🚚
2021-02-11 19:26:47 +01:00
1711b67877
Move all pretty printing into one module and pretty print values 🦋
2021-02-11 17:33:13 +01:00
f9197dcfef
Add arguments value 🏓
2021-02-09 22:56:44 +01:00
06ca740d01
Split evaluation and execution 🔪
2021-02-09 19:46:57 +01:00
e35bbfffcb
Remove captured expression 🗑️
2021-02-07 13:39:05 +01:00
c80e13579f
Dry-clean visitor with a macro 🏜
2021-02-07 13:14:28 +01:00
a6cae89b47
Generalize child of NodeBackground 🍼
2021-02-06 12:54:44 +01:00
80e076814d
Merge `rect` and `box` 🦚
2021-02-06 12:30:44 +01:00
8469bad748
Add rectangle function 🎛
2021-02-04 21:30:18 +01:00
8de1f8b770
Fix counting bug ✅
2021-02-04 00:38:30 +01:00
d86a5e8a1f
Tidy up raw blocks 🧹
...
- Better trimming (only trim at the end if necessary)
- Fixed block-level layouting
- Improved pretty printing
- Flip inline variable to block
- Flip inline variable to display for math formulas
2021-02-03 21:34:49 +01:00
6fcef9973b
Refresh tests 🔄
2021-01-31 22:43:11 +01:00
bcb2c46a10
Scoped for loop bindings 🏔️
...
Previously for loop bindings were leaked until after the loop.
2021-01-30 16:26:44 +01:00
5943f552e5
Capture variable by slot instead of value 🎣
2021-01-30 16:19:57 +01:00
67047047e8
Interpret two backticks as single-backtick block ✅
2021-01-30 15:24:11 +01:00
fe7ea53800
New display-math syntax 🧮
...
Changed to `$[x]$` instead of `$$x$$` because then `$$` simply is an empty formula that does not poison the whole document.
2021-01-30 12:36:41 +01:00
89eb8bae49
New syntax 💎
...
- Everything everywhere!
- Blocks with curly braces: {}
- Templates with brackets: []
- Function templates with hashtag: `#[f]`
- Headings with equals sign: `= Introduction`
2021-01-30 12:09:26 +01:00
ac24075469
Moves captures visitor into separate file 🚚
2021-01-30 10:24:51 +01:00
2036663ed2
Capture variables in templates 🔍
2021-01-27 15:05:18 +01:00
2641c2d20e
Always evaluate for loop to template 🔁
2021-01-27 13:55:04 +01:00
ce8138c685
Scope variables in blocks 🏔️
2021-01-27 11:50:51 +01:00
710f88ccb2
For loop patterns 🦚
2021-01-26 23:30:03 +01:00
010ddc4795
More straightforward pretty printing tests 🧹
2021-01-26 21:57:56 +01:00
f006636dd2
Update comments 🔄
2021-01-26 21:23:42 +01:00
ed929dd10c
For loops 🔁
...
(does not support key-value patterns yet)
2021-01-26 21:16:36 +01:00
e847082435
Multi-expression blocks 🛍️
2021-01-26 21:13:52 +01:00
aaa48403cd
Require hashtag for all keywords 💂♀️
2021-01-26 21:11:44 +01:00
16ac3f3ebc
Small improvements ♻
2021-01-26 13:49:04 +01:00
ac788f2082
Many more expressions 🥗
...
Boolean, equality, comparison and assignment expression parsing and evaluation.
2021-01-22 17:16:42 +01:00
0de4f3ed7b
Reorder and fix docs ✔
2021-01-20 21:50:51 +01:00
84ba547c7c
If expressions 🔀
2021-01-20 21:33:13 +01:00
dd246e5bc9
Spans for group and block contents 📐
2021-01-17 16:18:36 +01:00
29be90bf95
Assertions with [eq] + better tests 🩺
2021-01-17 13:53:22 +01:00
51efb0f4d6
Port remaining parser tests 🚚
2021-01-16 15:08:03 +01:00
d763f0f5a6
Split state and scopes, less ref-counting 🔀
2021-01-15 16:53:02 +01:00
0f0416054f
Move value tests + smarter number formatting 🔢
2021-01-15 15:43:59 +01:00
469d78d610
Move let-binding tests to integration 🚚
2021-01-14 17:41:13 +01:00
73b25bdad0
Move bracket function tests to integration 🚚
2021-01-14 17:30:22 +01:00
cfcb36b159
Move test files into category subfolders 🚚
2021-01-14 16:47:29 +01:00
272a4c2289
Unbounded pages 🌌
2021-01-13 23:19:44 +01:00
1b53e27f27
Some minor improvements ♻
2021-01-13 21:33:22 +01:00
2aa4c5bfc6
Move array and dictionary tests to integration 🚚
2021-01-13 17:03:10 +01:00
6efa6c7891
Move basic markup tests to integration 🚚
2021-01-13 16:50:43 +01:00
1cd687b681
Move escaping tests to integration and extend them 🚚
2021-01-13 16:37:18 +01:00
274e008e2c
Move heading tests to integration 🚚
2021-01-13 16:09:08 +01:00
1d01b93f67
Move comment tests to integration 🚚
2021-01-13 15:44:41 +01:00
539735e668
Basic let bindings 🎞
2021-01-13 11:54:50 +01:00
d2ba1b705e
Group and block expressions, unary plus 🧩
2021-01-12 18:55:12 +01:00
105cda0e69
Braced content -> Bracketed templates ✏
2021-01-10 21:38:58 +01:00
3c7d249ae4
Rename token modes ✏
2021-01-10 20:48:32 +01:00
515905d78d
Add angle value 📐
2021-01-10 18:22:06 +01:00
9eac62c31a
Add lots of new tokens 🍪
2021-01-10 17:52:37 +01:00
3b2a28ca8e
Add angle data type 📐
2021-01-09 21:35:36 +01:00
8275b186ba
Remove star-slash token ❌
2021-01-07 16:13:18 +01:00
59d811aeba
Inline literal enum into expression enum 🔀
2021-01-06 21:06:48 +01:00
7b4d4d6002
Pretty printing 🦋
...
- Syntax tree and value pretty printing
- Better value evaluation (top-level strings and content are evaluated plainly, everything else is pretty printed)
2021-01-06 01:32:59 +01:00
2e77b1c836
Better value representations, type function 🌐
2021-01-04 21:29:15 +01:00
77c06ebc24
None literal 🕳
2021-01-04 17:23:52 +01:00
32af3095f8
Fix performance regression ⚡
2021-01-03 00:41:12 +01:00
aae67bd572
Move and rename many things 🚛
2021-01-03 00:12:09 +01:00
1c40dc42e7
Dynamic values, Types, Arrays, and Dictionaries 🚀
...
- Identifiers are now evaluated as variables instead of being plain values
- Constants like `left` or `bold` are stored as dynamic values containing the respective rust types
- We now distinguish between arrays and dictionaries to make things more intuitive (at the cost of a bit more complex parsing)
- Spans were removed from collections (arrays, dictionaries), function arguments still have spans for the top-level values to enable good diagnostics
2021-01-02 19:37:10 +01:00
8cad78481c
A few small improvements ♻
2021-01-01 17:54:31 +01:00
2b6ccd8248
Better parser testing ✅
2021-01-01 16:43:58 +01:00
4069f0744d
Parsing improvements 🧽
...
- Simplified scanner code
- Peek eagerly
- Skip whitespace and comments automatically in header mode
- Parse simple block expressions
- Move literal definitions into expression module
- Raw resolving tests
2020-12-31 17:48:56 +01:00
ba3d43f7b2
Refresh function call and dictionary syntax
...
- No colon between function name and arguments, just whitespace
- "Named" arguments (previously "keyword" arguments) use colon instead of equals sign
2020-12-27 20:45:20 +01:00
750d220bb0
Add color enum 🎨
2020-12-27 19:23:26 +01:00
c44ebf876f
Add error cases for [font] 🧯
2020-12-21 00:47:47 +01:00
e59de77f96
Allow only a few predefined font classes in [font] 🚧
2020-12-21 00:40:09 +01:00
2b660968aa
Restructure value conversions 🧱
2020-12-21 00:36:22 +01:00
6f111f9410
Test [font] 🧣
2020-12-17 15:43:30 +01:00
b02ba84264
Test [rgb] 🎨
2020-12-17 12:17:34 +01:00
81e80ecfba
Test [page] function 📕
...
- Make page break behaviour more consistent
- Allow skipping reference image testing for single tests with `// compare-ref: false` (useful for tests which only check error messages)
2020-12-17 00:20:27 +01:00
2336aeb4c3
Tweak parser error messages 🔮
2020-12-16 16:24:06 +01:00
6bbedeaa2c
Better tokenization testing 🌋
...
- Better tokenization test coverage.
- Suffix testing: Each test case is tested with many different suffixes to ensure correct token ends.
- Improves expression parsing (fixes #3 ).
2020-12-16 15:42:02 +01:00
0cfce1de7e
Switch to miniz_oxide 🔼
2020-12-11 12:37:20 +01:00
1cbd5f3051
Refine test infrastructure ✅
...
- Tests diagnostics
- More and better separated image tests
2020-12-10 22:45:45 +01:00
fdc1b378a3
Compress images in PDFs ⚙
2020-11-30 22:07:08 +01:00
21857064db
Export alpha channel into PDF 🧊
2020-11-28 00:04:40 +01:00
982e7671a6
Embed each image only once into the PDF 🥔
2020-11-27 23:17:25 +01:00
98f77e4d80
Fix headings that are separated by only one newline 🚧
...
Previously the following lead to only one line with both heading and body:
```
# Heading
Body
```
2020-11-27 23:13:59 +01:00
475ca7a62e
Basic environment and resource loader 🏞
2020-11-27 22:35:42 +01:00
bc997b7c33
Export images in PDF 🖼
2020-11-27 20:01:54 +01:00
e30d896c7b
Switch to tiny-skia 🎨
2020-11-25 18:46:47 +01:00
11e44516fa
Merge some modules 🥞
2020-11-25 16:56:29 +01:00
761931405c
Use newly stabilized intra doc links ↩
2020-11-24 16:12:41 +01:00
f105663037
Basic image support 🖼
...
- [image] function
- Image rendering in tests
- Supports JPEG and PNG
- No PDF export so far
2020-11-20 16:36:22 +01:00
2e6e6244cc
Switch to pdf-writer ⬆️
2020-11-19 23:46:51 +01:00
3a7bfd6bed
Remove unused function `Spanned::value` 🗑
2020-11-16 11:08:36 +01:00
7ec7c49144
Don't panic 🌶
2020-11-05 13:07:13 +01:00
e26b431bee
Produce output file in current directory instead of source directory 📂
2020-11-05 12:30:46 +01:00
ee38c6aa9a
Allow configuration of directions in page and box ↗
2020-10-19 13:05:54 +02:00
91e5120693
BoxAlign and Flow aliases ✏
2020-10-13 13:51:58 +02:00
8680fcd490
Rename geometric eval and apply to resolve ✏
2020-10-13 13:24:33 +02:00
1736bfc194
Rename typstc -> typst ✏
2020-10-13 11:47:29 +02:00
f29207d999
Strongly typed groups 👔
2020-10-12 22:06:28 +02:00
dd4a4545a6
Move main back into src/ 📨
2020-10-12 21:26:58 +02:00
1a70cb6a33
Naming and grammar ✔
2020-10-12 18:01:22 +02:00
5243878d81
Less vecs in layouting ⚡
2020-10-12 17:29:01 +02:00
38157b0e0c
Synchronous layout 🪀
2020-10-12 17:10:01 +02:00
e94627721d
Adapt to fontdock 🔼
2020-10-12 16:59:21 +02:00
a2a68106c0
Evaluation benchmark 🔋
2020-10-11 23:18:00 +02:00
1b3eb42003
Refactor paragraph layout 📰
2020-10-11 22:41:21 +02:00
607f4395f9
Refactor stack layout again 🧣
2020-10-11 22:38:34 +02:00
d3bc4ec073
Refactor layouting base 🪁
2020-10-11 22:38:30 +02:00
f04ad0ffa5
Rename LayoutItem to Layouted ✏
2020-10-11 13:08:27 +02:00
c216a4fc26
Flatten ast module back into syntax module 🌪
2020-10-10 22:41:56 +02:00
51bf3268dd
Refactor text state 🆎
2020-10-10 22:35:24 +02:00
92c01da360
Switch back to custom geometry types, unified with layout primitives 🏞
2020-10-10 22:19:36 +02:00
42500d5ed8
Refactor stack ♻
2020-10-10 12:40:11 +02:00
13230db68c
Fix some clippy warnings ✔
2020-10-07 19:28:34 +02:00
d2e220245d
Move deco, pass and feedback into diagnostics module ↩
2020-10-07 18:24:47 +02:00
537545e7f8
Evaluation and node-based layouting 🚀
2020-10-07 17:07:44 +02:00
ca1256c924
Remove obsolete extra variable in stack layouter ❌
2020-10-06 20:40:37 +02:00
7dd78af459
Rename ast/tree -> ast/node ✏
2020-10-06 20:27:17 +02:00
4252f959f7
Typesafe conversions in stack & line layouters 🍮
2020-10-06 18:27:00 +02:00
985fe28166
Fix bug in line layouter ✔
2020-10-06 14:44:58 +02:00
ef410f6877
Move multi-dir support in stack layouter 🍁
2020-10-06 14:20:28 +02:00
c6a6870978
Rename secondary/primary to main/cross ✏
2020-10-06 13:13:18 +02:00
5a7a32a9ba
Streamline generic layouting primitives 🛫
2020-10-05 16:44:35 +02:00
93eaafb236
Tidy up align function 🧺
2020-10-05 16:06:25 +02:00
fa3e2920c0
Remove @ syntax in diagnostics macros 🗑
2020-10-05 15:45:45 +02:00
2df8b964d0
Simplify shaping 🌱
2020-10-05 15:35:55 +02:00
d1c07260c0
Move align out of BoxLayout 🍫
2020-10-05 13:39:33 +02:00
335fa2d118
Small improvements 🍪
2020-10-04 23:31:35 +02:00
605ab104c5
Better argument parsing 🥙
2020-10-04 22:36:20 +02:00
ef8aa763fa
Shorten some names ↔
2020-10-04 20:22:11 +02:00
a41d7ab47d
Expression evaluation with Eval trait 🧮
2020-10-04 20:07:01 +02:00
c1dd872b34
Remove unncessary wrappers and typedefs 🛑
2020-10-04 19:57:39 +02:00
105f70867d
Add none value 🧫
2020-10-04 19:26:27 +02:00
f4460f8abd
Style nits 🎈
2020-10-04 19:21:35 +02:00
0f7c70fd93
Separate state and constraints 🧶
2020-10-04 19:06:20 +02:00
6672f8f7df
Remove Typesetter in favor of typeset function 🎯
2020-10-04 18:18:55 +02:00
262a8fa36a
Refactor and move shaping out of the layout module ⛳
2020-10-04 18:01:56 +02:00
54e0da59e3
Small documentation fixes 🧾
2020-10-03 18:15:09 +02:00
91d14d2a22
Evaluate expressions 🧮
2020-10-03 17:56:56 +02:00
95bae5725c
Int, Float, Relative and Linear values 🍉
2020-10-03 15:07:57 +02:00
0fc25d732d
Port to kurbo 🎋
2020-10-03 13:23:59 +02:00
8dbc5b60cc
Update font docs 📖
2020-10-03 11:32:24 +02:00
75e6dbfbe6
Rename bold/italic to strong/emph ✏
2020-10-03 11:18:25 +02:00
730715c064
Rename text layouting to shaping ✏
2020-10-03 11:09:32 +02:00
dc8d5d2f1e
Small improvements 🧺
2020-10-02 20:22:08 +02:00
904bc392ab
Remove spans from token iterator 🧽
2020-10-02 19:17:47 +02:00
343982c56f
Optimize parser by remembering peeked token ⚡
2020-10-02 16:52:01 +02:00
3533268b1f
Refactor parser 🏞
2020-10-02 15:43:29 +02:00
f8770d2b2a
Generalize layouting primitives 🛤
2020-10-01 15:35:09 +02:00
Laurenz
Martin