caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-13 20:46:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix space/newline trimming 🐞

Browse Source 
Co-Authored-By: Martin <mhaug@live.de>
This commit is contained in:
Laurenz 2021-03-29 14:27:17 +02:00
parent 652986fd58
commit c393eccd36
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/layout/par.rs
View File

@ -5,6 +5,7 @@ use xi_unicode::LineBreakIterator;
use super::*;
use crate::exec::FontProps;
use crate::parse::is_newline;
/// A node that arranges its children into a paragraph.
#[derive(Debug, Clone, PartialEq)]
@ -123,8 +124,15 @@ impl ParLayouter {
let mut iter = LineBreakIterator::new(&node.text).peekable();
while let Some(&(pos, mandatory)) = iter.peek() {
let part = &node.text[start .. pos].trim_end();
let frame = shape(part, &mut ctx.env.fonts, &node.props);
let line = &node.text[start .. pos];
// Remove trailing newline and spacing at the end of lines.
let mut line = line.trim_end_matches(is_newline);
if pos != node.text.len() {
line = line.trim_end();
}
let frame = shape(line, &mut ctx.env.fonts, &node.props);
if self.usable().fits(frame.size) {
// Still fits into the line.