Commit Graph

323 Commits

Author SHA1 Message Date
Martin Haug d986bc4b0a Add section headings 👨‍🦲
Co-authored-by: Laurenz Mädje <laurmaedje@gmail.com>
2020-09-01 13:10:48 +02:00
Laurenz 181f756a9e Format everything with rustfmt! 💚 2020-08-30 22:18:55 +02:00
Laurenz fe51ad2e7c Fix different-fonts-in-text bug ✔ 2020-08-30 15:32:52 +02:00
Martin Haug d68367f32a Newlines are complicated, y'all 😱
Co-authored-by: laurmaedje@outlook.de <laurmaedje@outlook.de>
2020-08-29 17:20:04 +02:00
Martin 5e1fd35926
Merge branch 'master' into code-blocks 2020-08-29 13:58:30 +02:00
Martin Haug c2b6f2dc35 Added code blocks 🚟 2020-08-29 13:53:59 +02:00
Laurenz 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
Laurenz 77dac270a8 Make compute functions possible 💻
Ships with the amazing new `rgb` function!
2020-08-19 20:49:01 +02:00
Laurenz 6d7e7d945b Tidy up library functions 🧺 2020-08-17 23:45:03 +02:00
Laurenz 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
Laurenz 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
Laurenz 2467cd6272 Refactor function parsing ♻ 2020-08-04 13:48:07 +02:00
Laurenz ed4fdcb0ad Par nodes 🧳 2020-08-04 11:46:04 +02:00
Laurenz dbfb3d2ced Formatting, documentation and small improvements 🧽 2020-08-03 16:04:55 +02:00
Laurenz 266d457292 Refactor model into tree 🛒 2020-08-02 22:05:49 +02:00
Laurenz cbbc46215f Layout elements and pure rust rendering 🥏 2020-08-02 21:17:42 +02:00
Laurenz d5ff97f42e Move binary into separate crate and tidy dependencies 🎭 2020-08-02 16:56:14 +02:00
Laurenz 533374db14 Refactor argument parsing 🔬 2020-08-02 16:31:34 +02:00
Laurenz 659248d52f Raw lengths 🚲
Replace unitless length with raw f64 and introduce length type with unit.
2020-08-01 19:15:55 +02:00
Laurenz 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
Laurenz 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
Laurenz 53ca5a7fc5 Refactor parser 🚇 2020-07-27 13:47:29 +02:00
Laurenz e2ef4f64e7 Rename errors to problems and make error! macro more ergonomic 🧼
Also adds a `warning!` macro.
2020-07-26 17:28:43 +02:00
Laurenz 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
Laurenz 5badb4e8ff Write lots of parser tests 🌪 2020-02-09 14:14:32 +01:00
Laurenz 02dc29d18a Highlight bold / italic / monospace 🎨 2020-02-06 11:15:48 +01:00
Laurenz 751812f451 Serialize layouts with serde 🔠 2020-02-04 21:36:29 +01:00
Laurenz e63ce52ae0 Merge `Parsed` and `Layouted` types into `Pass` with `Feedback` 🌝🎢🌚 2020-02-04 19:22:23 +01:00
Laurenz 3150fd5643 Better Debug/Display and Derives 🧽 2020-02-03 12:22:02 +01:00
Laurenz 40ea35cbe7 Upgrade to new toddle interface 🐳 2020-02-03 10:37:50 +01:00
Laurenz 20fb4e7c37 Document everything 📜 2020-01-26 15:51:13 +01:00
Laurenz 0a087cd28b Reorganize modules 🧱 2020-01-24 16:23:57 +01:00
Laurenz 03fddaf3ae Non-fatal argument parsing 🌋 2020-01-24 12:44:04 +01:00
Laurenz 78da2bdd5d Decoupled function parser 🔗 [WIP] 2020-01-21 17:09:31 +01:00
Laurenz 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
Laurenz a8f711d49a Checkpoint 🏁 2020-01-13 11:26:42 +01:00
Laurenz a93b1ab003 Formatting 🛀 2020-01-06 12:50:20 +01:00
Laurenz 2ee5810fec Asyncify font loading 🪐 2020-01-06 12:41:42 +01:00
Laurenz bd384a2a63 Re-enable *, _ and `. 2020-01-05 11:18:13 +01:00
Laurenz 7b84f3b553 Adopt new font loading engine ⚙ 2020-01-04 22:43:26 +01:00
Laurenz 63b8ccba95 Fix looping bug 🚧 2019-12-30 23:39:10 +01:00
Laurenz 269f069a4d Simple line layouter 🧾 2019-12-30 22:28:56 +01:00
Laurenz f3e461b27c Paper styles and scalable+default margins 📜 2019-12-15 15:09:09 +01:00
Laurenz 3677e4a97d Fix padding-top bug 🏗 2019-12-15 00:30:00 +01:00
Laurenz 665b4d2aca More consistent library code and functions 🎄 2019-12-13 23:59:01 +01:00
Laurenz f549914ff8 Refine and rename layouting types 🛀 2019-12-12 23:33:26 +01:00
Laurenz ff107cf3e7 Tidying up 🧹 2019-12-12 22:19:38 +01:00
Laurenz 3c0496bb61 Refactor size module ♻ 2019-12-12 20:17:35 +01:00
Laurenz a791ef1628 Pretty good stack layouter ✈ 2019-12-11 22:06:54 +01:00
Laurenz d34707a6ae Not too shabby stack layouter 🚆 2019-12-11 17:34:25 +01:00
Laurenz 92586d3e68 Progressing stack layouter 🚊 2019-12-10 11:37:12 +01:00
Laurenz 7e98022435 Bad stack layouter 🚑 2019-12-09 13:29:04 +01:00
Laurenz 64f938b449 Improve testers ♻ 2019-12-08 11:36:18 +01:00
Laurenz f5b104d0da Rename crate `typst` -> `typstc` ✏ 2019-12-05 20:29:55 +01:00
Laurenz 72a9631b03 Move arg parser into `FuncArgs` and create (incomplete) consistent map 🧭 2019-12-05 19:48:37 +01:00
Laurenz f72b1505be Unify error types ♾ 2019-12-04 20:20:02 +01:00
Laurenz 9fb31defd0 Expand functionality of function! macro 🛰 2019-12-04 19:35:28 +01:00
Laurenz ace57c3420 First half of stack update 🌓 2019-12-01 19:18:38 +01:00
Laurenz 5782b82770 Refactor layouting base ♻ 2019-11-30 18:54:46 +01:00
Laurenz b13ed627ff Better error reporting 🚨 2019-11-30 14:10:35 +01:00
Laurenz 833166c3bf Fix bugs 🚧 2019-11-23 00:09:46 +01:00
Laurenz 6ff60bc368 Fix secondary non-origin alignment 🚧 2019-11-22 20:15:00 +01:00
Laurenz 4ab7ec6a9a Specify both axis with align function 2019-11-22 15:54:39 +01:00
Laurenz ebff8eb038 Fix spacing bugs 🚧 2019-11-21 17:50:51 +01:00
Laurenz 131e81baaf Fix flex primary expansion 🚧 2019-11-21 16:14:26 +01:00
Laurenz 863a1a7a00 Completed stack and flex refactoring 🔋 2019-11-21 16:03:15 +01:00
Laurenz f24e9b44e0 Refined expansion model 🔛 2019-11-20 17:31:52 +01:00
Laurenz 1dafe2c2ea First half of flex refactoring 🥝 2019-11-19 23:27:56 +01:00
Laurenz 6afc84cb9d Small improvements to stack layouter 🍁 2019-11-19 22:46:06 +01:00
Laurenz f8233a4cb1 Refactor stack layouter to layout eagerly 🛫 2019-11-18 19:36:50 +01:00
Laurenz 1a6fb48bc5 Page style modification functions 📜
- `page.size`
- `page.margins`
2019-11-18 15:10:11 +01:00
Laurenz 1eb25f86dd Double-try spaces for functions 🌑🌕 2019-11-18 12:57:14 +01:00
Laurenz 14259c7d09 Fix alignment bugs ✔ 2019-11-17 20:57:50 +01:00
Laurenz f6cb4d725e Update standard library functions 🎁 2019-11-17 15:16:37 +01:00
Laurenz 4d0bdc4ca4 Axes updating for flex layouter 📐 2019-11-17 14:51:31 +01:00
Laurenz 1f009b5b95 Allow multiple subsequent spaces 📅 2019-11-17 12:09:18 +01:00
Laurenz 467d7203ee Remove top-level stack layouter from tree layouter 🗑 2019-11-17 11:53:59 +01:00
Laurenz bd66ebd683 Prepare axis setting for flex layouter ♟ 2019-11-17 11:11:53 +01:00
Laurenz 796c2486ce Axes updating for stack layouter 📐 2019-11-16 14:03:27 +01:00
Laurenz ac4d501945 Move generalization/specialization methods 🚚 2019-11-16 11:10:53 +01:00
Laurenz 261ef9e33a Generalize tree layouter 🌲 2019-11-16 10:37:30 +01:00
Laurenz 0917d89bb8 Generalize flex layouter 🎯 2019-11-15 19:55:47 +01:00
Laurenz 9473ae61e9 Generalize stack layouter 🎲 2019-11-15 13:05:25 +01:00
Laurenz 1ece263579 Create easy-to-use argument parser 💎 2019-11-07 19:07:11 +01:00
Laurenz 110e4b9cb9 Spans for all parts of functions 2019-10-31 20:26:21 +01:00
Laurenz 65ec3764e5 Basic node spans 2019-10-30 22:52:25 +01:00
Laurenz cff325b520 Add spacing functions 🔛 2019-10-22 21:40:37 +02:00
Laurenz 991e879e1d Extend stack layouts from vertical to horizontal flows ➡ 2019-10-17 19:21:47 +02:00
Laurenz 1987e5861c Create basic box and line-break functions 📦 2019-10-17 12:55:34 +02:00
Laurenz f22f9513ae Add pagebreak function ⏭ 2019-10-17 10:12:34 +02:00
Laurenz 9a1d57a11a Implement context-modifying align 🧩 2019-10-17 09:28:06 +02:00
Laurenz e87a34a4d0 Rearrange layouting contexts ♻ 2019-10-16 22:32:40 +02:00
Laurenz 58693486f9 Allow center alignment 📐 2019-10-16 21:58:22 +02:00
Laurenz f2f05e07b0 Implement space extension (multipage) 2019-10-16 21:31:14 +02:00
Laurenz a3c667895e Refactor the main layouter ♻ 2019-10-15 18:15:36 +02:00
Laurenz 0727713424 Fix double-spaces bug 🚧 2019-10-15 09:07:03 +02:00
Laurenz 5473e3903a Refactor the text layouting ♻ 2019-10-14 23:33:29 +02:00
Laurenz c768b8b61f Refactor stack and flex layouter ♻ 2019-10-14 21:04:12 +02:00
Laurenz 5e41672a91 Refactor and refine PDF exporter ♻ 2019-10-14 18:07:18 +02:00
Laurenz 7c0899b537 Run rustfmt 🚿 2019-10-13 13:10:21 +02:00
Laurenz 5c04185892 Reformat some things 🧺 2019-10-13 13:09:39 +02:00
Laurenz e2d17aa9d9 Move functions to command-based architecture ✈ 2019-10-13 12:36:45 +02:00
Laurenz 463e4ebd82 Refactor layout types 🚧 2019-10-13 12:08:07 +02:00
Laurenz 6f22e4f13c Render debug boxes 🧭 2019-10-11 20:28:22 +02:00
Laurenz c0e4fd55e6 Create test runner which renders layouts to images 🗺 2019-10-11 17:53:28 +02:00
Laurenz 8f788f9a4f Add standard `align` function and support right-alignment ➡️ 2019-10-10 23:38:03 +02:00
Laurenz f22a307000 Extract into separate repository 🧱 2019-10-09 19:46:42 +02:00
Laurenz Mädje b96a7e0cf3 Reuse font loader across compilations 🔋 2019-07-28 22:27:09 +02:00
Laurenz Mädje 6c8b5caa9f Improve subsetter testing ✔ 2019-07-27 21:15:10 +02:00
Laurenz 5de92f6d5e Add monospace syntax 📰 2019-06-22 17:01:32 +02:00
Laurenz 099ce71aba Unify font classes + By-value-contexts ⚖ 2019-06-22 15:32:19 +02:00
Laurenz c7ee2b393a Fix top-left text alignment 📐 2019-06-22 12:51:06 +02:00
Laurenz f6fe3b5cdd Implement function layouting ✒ 2019-06-22 12:25:01 +02:00
Laurenz e39a6efccf Deduplicate action lists ✂ 2019-06-21 22:12:36 +02:00
Laurenz 968e121697 Implement flex and box layouting 📏 2019-06-21 21:41:02 +02:00
Laurenz b53ad6b1ec Introduce flex layouting 🎈 2019-06-17 10:08:16 +02:00
Laurenz Mädje 236ebab23a Add more fonts 📜 2019-06-02 19:51:37 +02:00
Laurenz Mädje 3e9f42661e Move to top-left default positioning 📐 2019-06-02 19:15:45 +02:00
Laurenz Mädje 221934df4b Add margins with basic box layouter 📖 2019-06-02 18:01:22 +02:00
Laurenz Mädje c4eb4ee362 Fix some documentation 🚧 2019-06-02 12:39:59 +02:00
Laurenz 0274e93810 Devise text layouter 📑 2019-05-26 22:03:55 +02:00
Laurenz c38e17d91f Thoroughly improve documentation 📝 2019-05-26 21:59:33 +02:00
Laurenz b3734bbc04 Restructure engine into modular layouter 🍂 2019-05-24 12:24:10 +02:00