office/typst
office/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2024-10-19 00:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support syntax highlighting for more languages (#771)

Browse source 
Co-authored-by: Laurenz <laurmaedje@gmail.com>
This commit is contained in:
Gabriel Wu 2023-05-30 16:46:56 +08:00 committed by GitHub
parent 47f81f0da5
commit 87ee97ae5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 68 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
NOTICE
View file

@ -62,6 +62,14 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
================================================================================
================================================================================
Syntaxes in `assets/data/syntect.bin` are generated from syntax definitions
which can be found here:
https://github.com/sharkdp/bat/tree/master/assets/syntaxes
The syntax definitions are used under their respective licenses.
================================================================================
================================================================================
The SIL Open Font License Version 1.1 applies to:

BIN
assets/data/syntect.bin Normal file
View file

Binary file not shown.

2
library/Cargo.toml
View file

@ -34,7 +34,7 @@ rustybuzz = "0.7"
serde_json = "1"
serde_yaml = "0.8"
smallvec = "1.10"
syntect = { version = "5", default-features = false, features = ["default-syntaxes", "regex-fancy"] }
syntect = { version = "5", default-features = false, features = ["parsing", "regex-fancy"] }
time = { version = "0.3.20", features = ["formatting"] }
toml = { version = "0.7.3", default-features = false, features = ["parse"] }
tracing = "0.1.37"

29
library/src/text/raw.rs
View file

@ -313,8 +313,33 @@ fn to_syn(RgbaColor { r, g, b, a }: RgbaColor) -> synt::Color {
}
/// The syntect syntax definitions.
static SYNTAXES: Lazy<syntect::parsing::SyntaxSet> =
Lazy::new(syntect::parsing::SyntaxSet::load_defaults_nonewlines);
///
/// Code for syntax set generation is below. The `syntaxes` directory is from
/// <https://github.com/sharkdp/bat/tree/master/assets/syntaxes>
///
/// ```ignore
/// fn main() {
/// let mut builder = syntect::parsing::SyntaxSet::load_defaults_nonewlines().into_builder();
/// builder.add_from_folder("syntaxes/02_Extra", false).unwrap();
/// syntect::dumps::dump_to_file(&builder.build(), "syntect.bin").unwrap();
/// }
/// ```
///
/// The following syntaxes are disabled due to compatibility issues:
/// ```text
/// syntaxes/02_Extra/Assembly (ARM).sublime-syntax
/// syntaxes/02_Extra/Elixir/Regular Expressions (Elixir).sublime-syntax
/// syntaxes/02_Extra/JavaScript (Babel).sublime-syntax
/// syntaxes/02_Extra/LiveScript.sublime-syntax
/// syntaxes/02_Extra/PowerShell.sublime-syntax
/// syntaxes/02_Extra/SCSS_Sass/Syntaxes/Sass.sublime-syntax
/// syntaxes/02_Extra/SLS/SLS.sublime-syntax
/// syntaxes/02_Extra/VimHelp.sublime-syntax
/// syntaxes/02_Extra/cmd-help/syntaxes/cmd-help.sublime-syntax
/// ```
static SYNTAXES: Lazy<syntect::parsing::SyntaxSet> = Lazy::new(|| {
syntect::dumps::from_binary(include_bytes!("../../../assets/data/syntect.bin"))
});
/// The default theme used for syntax highlighting.
pub static THEME: Lazy<synt::Theme> = Lazy::new(|| synt::Theme {

BIN
tests/ref/text/raw-code.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 43 KiB

66
tests/typ/text/raw-code.typ
View file

@ -3,6 +3,14 @@
---
#set page(width: 180pt)
#set text(6pt)
#show raw: it => rect(
width: 100%,
inset: (x: 4pt, y: 5pt),
radius: 4pt,
fill: rgb(239, 241, 243),
place(right, text(luma(110), it.lang)) + it,
)
```typ
= Chapter 1
#lorem(100)
@ -11,10 +19,6 @@
#show heading: emph
```
---
#set page(width: 180pt)
#set text(6pt)
```rust
/// A carefully designed state machine.
#[derive(Debug)]
@ -25,10 +29,6 @@ fn advance(state: State<'_>) -> State<'_> {
}
```
---
#set page(width: 180pt)
#set text(6pt)
```py
import this
@ -36,10 +36,6 @@ def hi():
print("Hi!")
```
---
#set page(width: 180pt)
#set text(6pt)
```cpp
#include <iostream>
@ -48,26 +44,28 @@ int main() {
}
```
---
#set page(width: 180pt)
#set text(6pt)
```julia
# Add two numbers
function add(x, y)
return x * y
end
```
#rect(inset: (x: 4pt, y: 5pt), radius: 4pt, fill: rgb(239, 241, 243))[
```html
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
<body>
<h1>Topic</h1>
<p>The Hypertext Markup Language.</p>
<script>
function foo(a, b) {
return a + b + "string";
}
</script>
</body>
</html>
```
]
// Try with some indent.
```html
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
</head>
<body>
<h1>Topic</h1>
<p>The Hypertext Markup Language.</p>
<script>
function foo(a, b) {
return a + b + "string";
}
</script>
</body>
</html>
```