Fix elements being enclosed when not needed (part 3)

pull/9/head
trivernis 4 years ago
parent 41c7c14537
commit 2c3802e699

@ -2,7 +2,7 @@
name = "asciimath-rs" name = "asciimath-rs"
description = "AsciiMath parser" description = "AsciiMath parser"
repository = "https://github.com/trivernis/asciimath-rs" repository = "https://github.com/trivernis/asciimath-rs"
version = "0.5.4" version = "0.5.5"
authors = ["trivernis <trivernis@protonmail.com>"] authors = ["trivernis <trivernis@protonmail.com>"]
edition = "2018" edition = "2018"
readme = "README.md" readme = "README.md"

@ -144,27 +144,27 @@ impl TreeParser {
match token { match token {
Accent::OverSet => { Accent::OverSet => {
self.step(); self.step();
let top = self.parse_element()?.boxed(); let top = self.parse_element()?.to_non_enclosed().boxed();
self.step(); self.step();
let bottom = self.parse_element()?.boxed(); let bottom = self.parse_element()?.to_non_enclosed().boxed();
Some(ExpressionAccent::OverSet(OverSet { top, bottom })) Some(ExpressionAccent::OverSet(OverSet { top, bottom }))
} }
Accent::UnderSet => { Accent::UnderSet => {
self.step(); self.step();
let bottom = self.parse_element()?.boxed(); let bottom = self.parse_element()?.to_non_enclosed().boxed();
self.step(); self.step();
let top = self.parse_element()?.boxed(); let top = self.parse_element()?.to_non_enclosed().boxed();
Some(ExpressionAccent::UnderSet(UnderSet { top, bottom })) Some(ExpressionAccent::UnderSet(UnderSet { top, bottom }))
} }
Accent::Color(color) => { Accent::Color(color) => {
self.step(); self.step();
let inner = self.parse_element()?.boxed(); let inner = self.parse_element()?.to_non_enclosed().boxed();
Some(ExpressionAccent::Color(Color { color, inner })) Some(ExpressionAccent::Color(Color { color, inner }))
} }
_ => { _ => {
self.step(); self.step();
Some(ExpressionAccent::Generic(GenericAccent { Some(ExpressionAccent::Generic(GenericAccent {
inner: self.parse_element()?.boxed(), inner: self.parse_element()?.to_non_enclosed().boxed(),
accent: token, accent: token,
})) }))
} }

Loading…
Cancel
Save