caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow disabling vector and matrix delimiters

Browse Source
This commit is contained in:
Laurenz 2023-03-27 14:52:25 +02:00
parent 51d972ec24
commit 13ece5ec26
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/src/math/matrix.rs
View File

@ -24,8 +24,8 @@ pub struct VecElem {
/// #set math.vec(delim: "[") /// #set math.vec(delim: "[")
/// $ vec(1, 2) $ /// $ vec(1, 2) $
/// ``` /// ```
#[default(Delimiter::Paren)] #[default(Some(Delimiter::Paren))]
pub delim: Delimiter, pub delim: Option<Delimiter>,
/// The elements of the vector. /// The elements of the vector.
#[variadic] #[variadic]
@ -39,8 +39,8 @@ impl LayoutMath for VecElem {
layout_delimiters( layout_delimiters(
ctx, ctx,
frame, frame,
Some(delim.open()), delim.map(Delimiter::open),
Some(delim.close()), delim.map(Delimiter::close),
self.span(), self.span(),
) )
} }
@ -76,8 +76,8 @@ pub struct MatElem {
/// #set math.mat(delim: "[") /// #set math.mat(delim: "[")
/// $ mat(1, 2; 3, 4) $ /// $ mat(1, 2; 3, 4) $
/// ``` /// ```
#[default(Delimiter::Paren)] #[default(Some(Delimiter::Paren))]
pub delim: Delimiter, pub delim: Option<Delimiter>,
/// An array of arrays with the rows of the matrix. /// An array of arrays with the rows of the matrix.
/// ///
@ -121,8 +121,8 @@ impl LayoutMath for MatElem {
layout_delimiters( layout_delimiters(
ctx, ctx,
frame, frame,
Some(delim.open()), delim.map(Delimiter::open),
Some(delim.close()), delim.map(Delimiter::close),
self.span(), self.span(),
) )
} }

BIN
tests/ref/math/matrix.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 10 KiB

1
tests/typ/math/matrix.typ
View File

@ -32,6 +32,7 @@ $ mat(
// Test alternative delimiter with set rule. // Test alternative delimiter with set rule.
#set math.mat(delim: "[") #set math.mat(delim: "[")
$ mat(1, 2; 3, 4) $ $ mat(1, 2; 3, 4) $
$ a + mat(delim: #none, 1, 2; 3, 4) + b $
--- ---
// Test alternative math delimiter directly in call. // Test alternative math delimiter directly in call.

2
tests/typ/math/vec.typ
View File

@ -10,5 +10,5 @@ $ v = vec(1, 2+3, 4) $
$ vec(1, 2) $ $ vec(1, 2) $
--- ---
// Error: 22-25 expected "(", "[", "{", "|", or "||" // Error: 22-25 expected "(", "[", "{", "|", "||", or none
#set math.vec(delim: "%") #set math.vec(delim: "%")