Merge pull request #15 from Trivernis/develop

Develop
main
Julius Riegel 2 years ago committed by GitHub
commit 5d56a1d11e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,7 +2,7 @@
name = "asciimath-rs"
description = "AsciiMath parser"
repository = "https://github.com/trivernis/asciimath-rs"
version = "0.6.1"
version = "0.6.2"
authors = ["trivernis <trivernis@protonmail.com>"]
edition = "2018"
readme = "README.md"
@ -16,4 +16,4 @@ categories = ["mathematics", "parser-implementations"]
charred = "0.3.3"
maplit = "1.0.2"
lazy_static = "1.4.0"
htmlescape = "0.3.1"
htmlescape = "0.3.1"

@ -18,16 +18,16 @@ pub enum Literal {
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct PlainText {
pub(crate) text: String,
pub(crate) formatting: Option<FontCommand>,
pub text: String,
pub formatting: Option<FontCommand>,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Symbol {
pub(crate) symbol: String,
pub symbol: String,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Number {
pub(crate) number: String,
pub number: String,
}

@ -33,43 +33,43 @@ pub struct Prod {
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Frac {
pub(crate) top: Box<Element>,
pub(crate) bottom: Box<Element>,
pub top: Box<Element>,
pub bottom: Box<Element>,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Pow {
pub(crate) base: Box<Element>,
pub(crate) exp: Box<Element>,
pub base: Box<Element>,
pub exp: Box<Element>,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Sub {
pub(crate) base: Box<Element>,
pub(crate) lower: Box<Element>,
pub base: Box<Element>,
pub lower: Box<Element>,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Sqrt {
pub(crate) inner: Box<Element>,
pub inner: Box<Element>,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Root {
pub(crate) base: Box<Element>,
pub(crate) inner: Box<Element>,
pub base: Box<Element>,
pub inner: Box<Element>,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct Integral {
pub(crate) top: Option<Box<Element>>,
pub(crate) bottom: Option<Box<Element>>,
pub top: Option<Box<Element>>,
pub bottom: Option<Box<Element>>,
}
#[derive(Debug, Clone, PartialOrd, PartialEq)]
pub struct OIntegral {
pub(crate) top: Option<Box<Element>>,
pub(crate) bottom: Option<Box<Element>>,
pub top: Option<Box<Element>>,
pub bottom: Option<Box<Element>>,
}
impl Expression {

Loading…
Cancel
Save