Allow disabling vector and matrix delimiters

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

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

View File

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