fnmain/jotdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixup! wip fix span / typeset precedence

Browse source
This commit is contained in:
Noah Hellman 2023-01-12 17:27:35 +01:00
parent 9dd10a558f
commit 73d3e05f0a
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/inline.rs
View file

@ -22,7 +22,6 @@ pub enum Atom {
#[derive(Debug, Copy, Clone, PartialEq, Eq)] #[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum Container { pub enum Container {
Span, Span,
// typesetting
Subscript, Subscript,
Superscript, Superscript,
Insert, Insert,
@ -71,7 +70,7 @@ pub struct Parser<I> {
lexer: lex::Lexer<I>, lexer: lex::Lexer<I>,
/// Span of current event. /// Span of current event.
span: Span, span: Span,
/// Stack with kind and index of _potential_ openers for typesetting containers. /// Stack with kind and index of _potential_ openers for containers.
openers: Vec<(Delim, usize)>, openers: Vec<(Delim, usize)>,
/// Buffer queue for next events. Events are buffered until no modifications due to future /// Buffer queue for next events. Events are buffered until no modifications due to future
/// characters are needed. /// characters are needed.
@ -251,7 +250,9 @@ impl<I: Iterator<Item = char> + Clone> Parser<I> {
Delim::from_token(first.kind).map(|(delim, dir)| { Delim::from_token(first.kind).map(|(delim, dir)| {
self.openers self.openers
.iter() .iter()
.rposition(|(d, _)| d.matches(delim)) .rposition(|(d, _)| {
*d == delim || matches!((d, delim), (Delim::Span(..), Delim::Span(..)))
})
.and_then(|o| { .and_then(|o| {
let (d, e) = self.openers[o]; let (d, e) = self.openers[o];
if matches!(dir, Dir::Close | Dir::Both) { if matches!(dir, Dir::Close | Dir::Both) {
@ -295,10 +296,13 @@ impl<I: Iterator<Item = char> + Clone> Parser<I> {
let mut end = false; let mut end = false;
let len = (&mut ahead) let len = (&mut ahead)
.take_while(|c| { .take_while(|c| {
if *c == opener {
return false;
}
if *c == closer { if *c == closer {
end = true; end = true;
}; };
!end && *c != opener !end
}) })
.count(); .count();
end.then(|| { end.then(|| {
@ -351,7 +355,7 @@ enum SpanType {
General, General,
} }
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
enum Delim { enum Delim {
Span(SpanType), Span(SpanType),
Strong(Directionality), Strong(Directionality),
@ -372,21 +376,6 @@ enum Dir {
} }
impl Delim { impl Delim {
fn matches(self, other: Delim) -> bool {
match self {
Self::Span(..) => matches!(other, Self::Span(..)),
Self::Strong(..) => matches!(other, Self::Strong(..)),
Self::Emphasis(..) => matches!(other, Self::Emphasis(..)),
Self::Superscript(..) => matches!(other, Self::Superscript(..)),
Self::Subscript(..) => matches!(other, Self::Subscript(..)),
Self::SingleQuoted => matches!(other, Self::SingleQuoted),
Self::DoubleQuoted => matches!(other, Self::DoubleQuoted),
Self::Mark => matches!(other, Self::Mark),
Self::Delete => matches!(other, Self::Delete),
Self::Insert => matches!(other, Self::Insert),
}
}
fn from_token(kind: lex::Kind) -> Option<(Self, Dir)> { fn from_token(kind: lex::Kind) -> Option<(Self, Dir)> {
use Delim::*; use Delim::*;
use Dir::{Both, Close, Open}; use Dir::{Both, Close, Open};