Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 46 additions & 1 deletion harper-tex/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,56 @@ impl Default for TeX {

impl Parser for TeX {
fn parse(&self, source: &[char]) -> Vec<Token> {
let tokens = self.inner.parse(source);
let tokens = insert_inline_math_tokens(self.inner.parse(source), source);
collapse_tex_dashes(tokens)
}
}

fn insert_inline_math_tokens(tokens: Vec<Token>, source: &[char]) -> Vec<Token> {
let mut math_tokens = inline_math_spans(source)
.into_iter()
.map(|span| Token::new(span, TokenKind::Unlintable))
.peekable();

let mut out = Vec::with_capacity(tokens.len() + math_tokens.size_hint().0);
for token in tokens {
while math_tokens
.peek()
.is_some_and(|math_token| math_token.span.start < token.span.start)
{
out.push(math_tokens.next().unwrap());
}
out.push(token);
}
out.extend(math_tokens);
out
}

fn inline_math_spans(source: &[char]) -> Vec<Span<char>> {
let mut spans = Vec::new();
let mut cursor = 0;

while cursor < source.len() {
if source[cursor] != '$' || is_escaped(source, cursor) {
cursor += 1;
continue;
}

let Some(relative_end) = source[cursor + 1..].iter().position(|c| *c == '$') else {
break;
};
let end = cursor + 1 + relative_end + 1;
spans.push(Span::new(cursor, end));
cursor = end;
}

spans
}

fn is_escaped(source: &[char], cursor: usize) -> bool {
cursor > 0 && source[cursor - 1] == '\\'
}

fn collapse_tex_dashes(tokens: Vec<Token>) -> Vec<Token> {
let mut out = Vec::with_capacity(tokens.len());
let mut i = 0;
Expand Down
1 change: 1 addition & 0 deletions harper-tex/tests/run_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ create_test!(many_tags.tex, 6);
create_test!(many_more_tags.tex, 11);
create_test!(em_dash.tex, 0);
create_test!(issue_2835.tex, 3);
create_test!(issue_3613.tex, 0);
4 changes: 4 additions & 0 deletions harper-tex/tests/test_sources/issue_3613.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
\begin{document}
If $a+b=c$, then something else.
If something, then $x^2+y^2=z^2$.
\end{document}
Loading