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
e676ab53dd
Rename compute to eval ✏
2020-10-01 15:13:04 +02:00
7c12f0c07f
Flatten compute module
2020-10-01 15:10:35 +02:00
7fcad452b8
Reorganize ast types 🏕
2020-10-01 15:03:37 +02:00
aafd3c95ca
Rename table to dict ✏
2020-10-01 13:15:10 +02:00
885bfec5d7
Make syntax not depend on parse 📩
...
This would make it possible to split them into two separate crates.
2020-10-01 11:32:48 +02:00
16f0bd430e
Rename CharParser to Scanner ✏
2020-10-01 11:08:53 +02:00
c0998b4802
Simplify tokenizer a bit 🔄
2020-10-01 11:03:42 +02:00
4b9bc66028
Implement low-level char parser 🥜
2020-10-01 01:38:18 +02:00
01405902ba
Restructure parser files 🍔
2020-09-30 19:13:55 +02:00
0ddab1c00d
Flatten unescape_string a bit 🥞
2020-09-30 19:07:45 +02:00
4077a7c11e
Refactor raw blocks 💱
2020-09-30 18:59:33 +02:00
7cc279f7ae
Replace line/column with byte positions 🔢
2020-09-30 17:25:09 +02:00
3c3730425f
SpanWith trait ↔
2020-09-30 14:38:46 +02:00
7143e10afc
Streamline font handling a bit 📜
2020-09-30 13:18:42 +02:00
3e791e3337
Move decoration into mod.rs 🔙
2020-09-30 12:49:30 +02:00
bc1b4216a8
Reorganize syntax types into two modules 📦
2020-09-30 12:45:33 +02:00
dcf1d09d39
Fix for updated fontdock ✔
2020-09-27 14:26:50 +02:00
7f8f225cb3
Split up parser into multiple files 🧱
...
Splits up into:
- escaping: resolving of escape sequences
- parser: the parsing code
- tests: all integrated parsing tests
Also moves Ident from the root syntax module into the tree module.
2020-09-03 19:16:19 +02:00
7f575dc098
Rename `skip_white` to `skip_ws` ✒
2020-09-02 16:54:22 +02:00
b2f3730013
Deduplicate and flexibilize code token & node building 🧺
2020-09-01 14:57:25 +02:00
56acc9982c
Formatting 🌿
2020-09-01 13:13:54 +02:00
d986bc4b0a
Add section headings 👨🦲
...
Co-authored-by: Laurenz Mädje <laurmaedje@gmail.com>
2020-09-01 13:10:48 +02:00
1942a25793
Move Nbsp logic to tokenizer 🚛
2020-08-31 14:47:52 +02:00
08433ab79f
Capability to escape the tilde symbol 💨
2020-08-31 12:20:45 +02:00
d0e252d116
Add non-breaking space 🔒
2020-08-31 12:11:34 +02:00
181f756a9e
Format everything with rustfmt! 💚
2020-08-30 22:18:55 +02:00
0d44cf5321
Some alignment ⏭
2020-08-30 22:15:36 +02:00
18c515cde5
Make some code easier for rustfmt 🍦
2020-08-30 22:09:33 +02:00
fe51ad2e7c
Fix different-fonts-in-text bug ✔
2020-08-30 15:32:52 +02:00
9861a9583e
Slight simplifications 🍃
2020-08-30 15:16:55 +02:00
c043692c96
Also provide escapes for strings 🗒
2020-08-30 13:39:21 +02:00
7041e0938d
Added Unicode Escaping for body text 👙
2020-08-30 13:21:07 +02:00
d68367f32a
Newlines are complicated, y'all 😱
...
Co-authored-by: laurmaedje@outlook.de <laurmaedje@outlook.de>
2020-08-29 17:20:04 +02:00
1eb584e256
Fixing the build by removing P macro usage 🚑
...
Kids, merge with caution!
2020-08-29 14:10:56 +02:00
5e1fd35926
Merge branch 'master' into code-blocks
2020-08-29 13:58:30 +02:00
c2b6f2dc35
Added code blocks 🚟
2020-08-29 13:53:59 +02:00
236750c35f
Remove par nodes in favor of parbreaks 🔄
...
This basically reverts the earlier change from parbreaks to par nodes because:
- It is simpler and less nested
- It works way better with functions that layout their body inline like `font`, which where buggy before, previously
The original reasons for changing to par nodes were:
- the envisioned design of the layouter at that time (based on dynamic nodes etc.), which is not relevant anymore
- possibly existing benefits with regards to incremental compilation, which are unsure and outweighed by the immediate benefits of the parbreak-representation
2020-08-29 12:02:07 +02:00
6febc03273
Make align not behave box-like and smarter 📦
...
Doesn't layout contents into a box anymore, instead layouting inline in the parent context. Also makes axis inferring for center alignents smarter (just because I had fun doing it). It's unsure whether we want to keep it because it might be confusing.
2020-08-29 11:32:32 +02:00
8a45ec2875
Fix default values for rgb-clamping 🩹
2020-08-27 21:56:53 +02:00
2a92428ff6
Do as Dolores says ⚡
2020-08-27 21:47:26 +02:00
37835e4d8e
Better error reporting for nameless function 💡
2020-08-27 21:34:48 +02:00
c099b8b9b4
Fixing the regression 🩹
2020-08-27 20:56:44 +02:00
3abb9ec319
Code review-tastic changes 🦪
2020-08-27 20:42:09 +02:00
3de20f8d38
Add Multi-Invokation 👨👩👧👧
2020-08-27 17:50:57 +02:00
141d69cb60
Remove some obsolete stuff ❌
2020-08-19 21:12:34 +02:00
77dac270a8
Make compute functions possible 💻
...
Ships with the amazing new `rgb` function!
2020-08-19 20:49:01 +02:00
6d7e7d945b
Tidy up library functions 🧺
2020-08-17 23:45:03 +02:00
3cbca56a71
Parse braced expressions and bracketed calls in headers 🗳
...
- Refactors the tokenizer to be lazy: It does not emit pre-parsed function tokens, but instead allows it's mode to be changed. The modes are tracked on a stack to allow nested compute/typesetting (pop/push).
- Introduces delimited groups into the parser, which make it easy to parse delimited expressions without handling the delimiters in the parsing code for the group's content. A group is started with `start_group`. When reaching the group's end (matching delimiter) the eat and peek methods will simply return `None` instead of the delimiter, stopping the content parser and bubbling up the call stack until `end_group` is called to clear up the situation.
2020-08-17 16:25:09 +02:00
30f16bbf64
Add Value type and replace dyn-nodes with call-exprs 🏗
...
- In addition to syntax trees there are now `Value`s, which syntax trees can be evaluated into (e.g. the tree is `5+5` and the value is `10`)
- Parsing is completely pure, function calls are not parsed into nodes, but into simple call expressions, which are resolved later
- Functions aren't dynamic nodes anymore, but simply functions which receive their arguments as a table and the layouting context
- Functions may return any `Value`
- Layouting is powered by functions which return the new `Commands` value, which informs the layouting engine what to do
- When a function returns a non-`Commands` value, the layouter simply dumps the value into the document in monospace
2020-08-16 22:39:21 +02:00
9f6137d8a8
Remove tuples and objects in favor of tables 🛢
...
This refactores the parser tests to make them more concise and flexible with regards to spans.
2020-08-16 14:38:30 +02:00
84f30fb735
Remove SpanlessEq 🎃
...
The new solution is slightly hacky, but way more flexible. All types that implement PartialEq can now be compared spanlessly in tests by manipulating a thread-local boolean that is read in Span's PartialEq implementation.
2020-08-15 15:01:55 +02:00
eb9c4b1a49
Add table expressions with arg-parsing functions 🪔
2020-08-15 13:25:31 +02:00
4b723add38
Take references in TryFromExpr 🔭
2020-08-15 11:58:01 +02:00
1a0608930c
Rename Value trait into TryFromExpr ✒
2020-08-15 11:44:18 +02:00
c8f6b5bd5c
Desugar body into last argument 🍩
2020-08-14 20:43:03 +02:00
650c712eab
Add a syntax tree expression kind 🎍
...
This allows bodies to be passed as regular arguments.
2020-08-14 20:19:50 +02:00
1fb2d5103d
Always parse bodies as syntax trees 🌳
...
Previously they were passed as strings to the function parser, now they are parsed and then passed as trees to the function. This allows making bodies sugar for a last content argument. While it removes some flexibility allowing function to parse arbitrary syntaxes in their bodies, these can be modelled as (raw) string arguments.
2020-08-14 20:13:50 +02:00
691423a40a
Basic table type 📔
...
- Keys are strings or integers
- Access with borrowed or owned keys
- `push` method for array-like pattern
- No iteration support yet
2020-08-14 11:40:34 +02:00
88151c546f
Use equals sign instead of colon for objects 📍
2020-08-13 20:10:29 +02:00
da2ade6542
Remove redundant `Expr` prefix from tokens 🧽
2020-08-13 20:02:07 +02:00
2467cd6272
Refactor function parsing ♻
2020-08-04 13:48:07 +02:00
ed4fdcb0ad
Par nodes 🧳
2020-08-04 11:46:04 +02:00
dbfb3d2ced
Formatting, documentation and small improvements 🧽
2020-08-03 16:04:55 +02:00
5a8f2fb73d
Replace body! macro with functions 🧰
2020-08-02 22:21:58 +02:00
266d457292
Refactor model into tree 🛒
2020-08-02 22:05:49 +02:00
cbbc46215f
Layout elements and pure rust rendering 🥏
2020-08-02 21:17:42 +02:00
d5ff97f42e
Move binary into separate crate and tidy dependencies 🎭
2020-08-02 16:56:14 +02:00
533374db14
Refactor argument parsing 🔬
2020-08-02 16:31:34 +02:00
efb78831a7
Unify font and page functions 💕
...
- Removes font weight and width warnings for now, will be added again later
- Adds a bit hacky get_first function for tuples, will be refactored soon anyway
2020-08-02 11:06:45 +02:00
659248d52f
Raw lengths 🚲
...
Replace unitless length with raw f64 and introduce length type with unit.
2020-08-01 19:15:55 +02:00
04c05502be
Add some fonts 📜
2020-08-01 17:59:38 +02:00
06dbac6efd
Port font handling to fontdock and ttf-parser 🛳
...
- Use fontdock for indexing fonts and querying
- Typst binary now automatically indexes and uses system fonts in addition to a fixed font folder!
- Removes subsetting support for now (was half-finished anyways, plan is to use harfbuzz for subsetting in the future)
- Adds font width configuration support
2020-08-01 00:10:54 +02:00
8ca80fc7da
Include parens in expression's span ( fixes #4 ) ☘
2020-07-29 18:13:52 +02:00
bbcdeb128c
Move, rename and switch some things (boring) 🚚
...
- Problems -> Diagnostics
- Position -> Pos
- offset_spans -> Offset trait
- Size -> Length (and some more size types renamed)
- Paper into its own module
- scope::Parser -> parsing::CallParser
- Create `Decorations` alias
- Remove lots of double newlines
- Switch from f32 to f64
2020-07-29 18:09:51 +02:00
9672d43200
Improve argument naming and fix grammar in comment ♻
2020-07-29 17:38:14 +02:00
53ca5a7fc5
Refactor parser 🚇
2020-07-27 13:47:29 +02:00
9f400042cb
Streamline parser and tokenizer test code ✈
2020-07-26 19:14:23 +02:00
ea64ce9aeb
Better distinguish function names in tokenizer from parser ✂
2020-07-26 18:08:08 +02:00
e2ef4f64e7
Rename errors to problems and make error! macro more ergonomic 🧼
...
Also adds a `warning!` macro.
2020-07-26 17:28:43 +02:00
38a2424742
Remove duplicate spans for func args ❌
2020-07-18 18:02:38 +02:00
332f83ed2d
Some code and styling improvements 🎨
2020-07-18 17:52:12 +02:00
e9a9581252
Spanned object pairs and refactoring 🧵
2020-07-18 16:57:58 +02:00
bb1350cff5
Parsing mathematical expressions ➕
2020-07-18 14:07:53 +02:00
6f1319e91f
Derive copy for RgbaColor and change debug representation 🐞
2020-07-16 16:27:18 +02:00
e96f3830f1
Use FromStr trait and formatting ✨
2020-07-15 23:49:10 +02:00
1683ca87f7
Healed field for RgbaColors, CodeRev feedback 🤝
2020-07-15 20:57:26 +02:00
28c3a797ec
Add named tuples and hex color tokens
2020-07-14 19:09:58 +02:00
1658b00282
New syntax features 👔
...
- Forced line breaks with backslash followed by whitespace
- (Multline) raw text in backticks
- Set font class fallbacks with [font.family] (e.g. [font.family: monospace=("CMU Typewriter Text")])
- More sophisticated procedure to find end of function, which accounts for comments, strings, raw text and nested functions (this is a mix of a feature and a bug fix)
2020-02-13 21:58:49 +01:00
60099aed50
Parse tuples and objects 🍒
...
Generalizes the parsing of tuples, objects and function arguments into generic comma-separated collections.
2020-02-11 21:30:39 +01:00
5badb4e8ff
Write lots of parser tests 🌪
2020-02-09 14:14:32 +01:00
4e8359385f
Improve syntax testing framework ♻
...
... and finally expand a few escape sequences in strings.
2020-02-07 22:29:16 +01:00
02dc29d18a
Highlight bold / italic / monospace 🎨
2020-02-06 11:15:48 +01:00
751812f451
Serialize layouts with serde 🔠
2020-02-04 21:36:29 +01:00
e63ce52ae0
Merge `Parsed` and `Layouted` types into `Pass` with `Feedback` 🌝 🎢 🌚
2020-02-04 19:22:23 +01:00
5c11aa7223
Adapt for tonty and fix a few bugs 🚧
2020-02-04 11:22:00 +01:00
f655656fb8
Streamline Key + Value traits 🌊
2020-02-04 09:35:29 +01:00
ec60795575
Port tests 🚁
2020-02-03 15:05:34 +01:00
3150fd5643
Better Debug/Display and Derives 🧽
2020-02-03 12:22:02 +01:00
40ea35cbe7
Upgrade to new toddle interface 🐳
2020-02-03 10:37:50 +01:00
20fb4e7c37
Document everything 📜
2020-01-26 15:51:13 +01:00
0a087cd28b
Reorganize modules 🧱
2020-01-24 16:23:57 +01:00
03fddaf3ae
Non-fatal argument parsing 🌋
2020-01-24 12:44:04 +01:00
78da2bdd5d
Decoupled function parser 🔗 [WIP]
2020-01-21 17:09:31 +01:00
1c1c994c46
Merge branch 'master' into syntax-model
2020-01-20 22:42:00 +01:00
1eaa2d418b
Page margin classes! 🐿
2020-01-20 22:38:33 +01:00
95e6b078fe
Move to non-fatal errors 🪂 [WIP]
...
- Dynamic models instead of SyntaxTrees
- No more ParseResult/LayoutResult
- Errors and Decorations which are propagated to parent contexts
- Models are finally clonable
2020-01-19 21:53:24 +01:00
277f2d2176
ColorToken serialization + function fix 🚧
2020-01-18 15:58:36 +01:00
70878885f5
Do argument parsing ☑
2020-01-16 23:00:39 +01:00
08b91a265f
Powerful parser testing 🐱 👤
2020-01-16 17:51:04 +01:00
15ad30555b
Parser testing prototype 🥥
2020-01-14 20:17:50 +01:00
dde69276d4
Refactor expressions and create tuples and objects 🧮
2020-01-13 14:36:40 +01:00
6527d31dfb
Merge Characters struct into tokenizer 🔀
2020-01-13 13:02:33 +01:00
a8f711d49a
Checkpoint 🏁
2020-01-13 11:26:42 +01:00
bd702c2029
Span tests ↔
2020-01-11 11:47:07 +01:00
b1e956419d
Re-engineer tokenization 🚿
2020-01-11 10:11:14 +01:00
a75ddd2c93
Convert spans to line/column format 📑
2020-01-10 13:03:43 +01:00
5dbc7dc5aa
Introduce color tokens 🎨
2020-01-09 18:44:29 +01:00
bc22d1fbc1
Fix font weight bug 🚧
2020-01-08 14:28:14 +01:00
c9fd39f37e
Define base fallback list ♾
2020-01-06 13:06:17 +01:00
a93b1ab003
Formatting 🛀
2020-01-06 12:50:20 +01:00
2ee5810fec
Asyncify font loading 🪐
2020-01-06 12:41:42 +01:00
bd384a2a63
Re-enable *, _ and `.
2020-01-05 11:18:13 +01:00
7b84f3b553
Adopt new font loading engine ⚙
2020-01-04 22:43:26 +01:00
5dfaffc5bd
Add basic font family function ✏
2020-01-01 19:37:55 +01:00
7de9219321
Add word|line|par.spacing functions 💶
2020-01-01 17:15:21 +01:00
63b8ccba95
Fix looping bug 🚧
2019-12-30 23:39:10 +01:00
269f069a4d
Simple line layouter 🧾
2019-12-30 22:28:56 +01:00
b8620121a6
Fix nasty string boundary bug 🏗
2019-12-15 15:43:22 +01:00
a87937d0c4
Merge branch 'dev' of https://github.com/laurmaedje/typstc into dev
2019-12-15 15:10:31 +01:00
f3e461b27c
Paper styles and scalable+default margins 📜
2019-12-15 15:09:09 +01:00
3cef3fa2e0
Merged changes 🔀
2019-12-15 15:04:26 +01:00
3677e4a97d
Fix padding-top bug 🏗
2019-12-15 00:30:00 +01:00
895507146f
Reformat paper styles ♻
2019-12-15 00:18:41 +01:00
359d9e523a
Added shitload of page dimension definitions 📘
2019-12-14 14:09:01 +01:00
665b4d2aca
More consistent library code and functions 🎄
2019-12-13 23:59:01 +01:00
971ff3a2dc
Implement expression kind for Spanned<T> 👩💻
2019-12-13 14:58:14 +01:00
f549914ff8
Refine and rename layouting types 🛀
2019-12-12 23:33:26 +01:00
ff107cf3e7
Tidying up 🧹
2019-12-12 22:19:38 +01:00
3c0496bb61
Refactor size module ♻
2019-12-12 20:17:35 +01:00
e7277fec23
Add font size function 🌱
2019-12-12 11:41:04 +01:00
a791ef1628
Pretty good stack layouter ✈
2019-12-11 22:06:54 +01:00
d34707a6ae
Not too shabby stack layouter 🚆
2019-12-11 17:34:25 +01:00
92586d3e68
Progressing stack layouter 🚊
2019-12-10 11:37:12 +01:00
7e98022435
Bad stack layouter 🚑
2019-12-09 13:29:04 +01:00
64f938b449
Improve testers ♻
2019-12-08 11:36:18 +01:00
f364395e1d
Create parsing test harness ⚡
2019-12-07 14:42:25 +01:00
1099330988
Finish consistent map and add two further convenience maps 🗺
2019-12-06 13:26:44 +01:00
f5b104d0da
Rename crate `typst` -> `typstc` ✏
2019-12-05 20:29:55 +01:00
72a9631b03
Move arg parser into `FuncArgs` and create (incomplete) consistent map 🧭
2019-12-05 19:48:37 +01:00
f72b1505be
Unify error types ♾
2019-12-04 20:20:02 +01:00
9fb31defd0
Expand functionality of function! macro 🛰
2019-12-04 19:35:28 +01:00
ace57c3420
First half of stack update 🌓
2019-12-01 19:18:38 +01:00
5782b82770
Refactor layouting base ♻
2019-11-30 18:54:46 +01:00
b13ed627ff
Better error reporting 🚨
2019-11-30 14:10:35 +01:00
b4efae0883
Remove bad tests and tweak numbers for better debugging 🧪
2019-11-28 20:38:21 +01:00
833166c3bf
Fix bugs 🚧
2019-11-23 00:09:46 +01:00
6ff60bc368
Fix secondary non-origin alignment 🚧
2019-11-22 20:15:00 +01:00
4ab7ec6a9a
Specify both axis with align function ➕
2019-11-22 15:54:39 +01:00
ebff8eb038
Fix spacing bugs 🚧
2019-11-21 17:50:51 +01:00
131e81baaf
Fix flex primary expansion 🚧
2019-11-21 16:14:26 +01:00
863a1a7a00
Completed stack and flex refactoring 🔋
2019-11-21 16:03:15 +01:00
f24e9b44e0
Refined expansion model 🔛
2019-11-20 17:31:52 +01:00
1dafe2c2ea
First half of flex refactoring 🥝
2019-11-19 23:27:56 +01:00
6afc84cb9d
Small improvements to stack layouter 🍁
2019-11-19 22:46:06 +01:00
f8233a4cb1
Refactor stack layouter to layout eagerly 🛫
2019-11-18 19:36:50 +01:00
1a6fb48bc5
Page style modification functions 📜
...
- `page.size`
- `page.margins`
2019-11-18 15:10:11 +01:00
1eb25f86dd
Double-try spaces for functions 🌑 🌕
2019-11-18 12:57:14 +01:00
14259c7d09
Fix alignment bugs ✔
2019-11-17 20:57:50 +01:00
f6cb4d725e
Update standard library functions 🎁
2019-11-17 15:16:37 +01:00
4d0bdc4ca4
Axes updating for flex layouter 📐
2019-11-17 14:51:31 +01:00
1f009b5b95
Allow multiple subsequent spaces 📅
2019-11-17 12:09:18 +01:00
467d7203ee
Remove top-level stack layouter from tree layouter 🗑
2019-11-17 11:53:59 +01:00
bd66ebd683
Prepare axis setting for flex layouter ♟
2019-11-17 11:11:53 +01:00
796c2486ce
Axes updating for stack layouter 📐
2019-11-16 14:03:27 +01:00
ac4d501945
Move generalization/specialization methods 🚚
2019-11-16 11:10:53 +01:00
261ef9e33a
Generalize tree layouter 🌲
2019-11-16 10:37:30 +01:00
0917d89bb8
Generalize flex layouter 🎯
2019-11-15 19:55:47 +01:00
9473ae61e9
Generalize stack layouter 🎲
2019-11-15 13:05:25 +01:00
1ece263579
Create easy-to-use argument parser 💎
2019-11-07 19:07:11 +01:00
271af7ed03
Parse keyword arguments 📋
2019-11-06 23:18:48 +01:00
110e4b9cb9
Spans for all parts of functions ✅
2019-10-31 20:26:21 +01:00
65ec3764e5
Basic node spans ✅
2019-10-30 22:52:25 +01:00
b5d8b8f4a5
Token spans 🔜 🔙
2019-10-30 21:13:12 +01:00
ccc4639c7d
Improve documentation comments 📜
2019-10-30 20:13:28 +01:00
b4be25e43b
Prettify peeking and rearrange syntax/parsing modules 🧶
2019-10-24 19:10:03 +02:00
ecf0ff4d05
Introduce a set of macros for writing functions more concisely 🎁
2019-10-23 00:21:40 +02:00
cff325b520
Add spacing functions 🔛
2019-10-22 21:40:37 +02:00
991e879e1d
Extend stack layouts from vertical to horizontal flows ➡
2019-10-17 19:21:47 +02:00
1987e5861c
Create basic box and line-break functions 📦
2019-10-17 12:55:34 +02:00
f22f9513ae
Add pagebreak function ⏭
2019-10-17 10:12:34 +02:00
9a1d57a11a
Implement context-modifying align 🧩
2019-10-17 09:28:06 +02:00
e87a34a4d0
Rearrange layouting contexts ♻
2019-10-16 22:32:40 +02:00
58693486f9
Allow center alignment 📐
2019-10-16 21:58:22 +02:00
f2f05e07b0
Implement space extension (multipage) ➕
2019-10-16 21:31:14 +02:00
a3c667895e
Refactor the main layouter ♻
2019-10-15 18:15:36 +02:00
0727713424
Fix double-spaces bug 🚧
2019-10-15 09:07:03 +02:00
Laurenz
Martin Haug