caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix paragraph constraints

Browse Source 
Co-Authored-By: Martin <mhaug@live.de>
This commit is contained in:
Laurenz 2021-09-27 11:38:18 +02:00
parent 19e17cc6ac
commit 6c478face4
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/layout/par.rs
View File

@ -190,33 +190,28 @@ impl<'a> ParLayouter<'a> {
// line cannot be broken up further. // line cannot be broken up further.
if !stack.regions.current.fits(line.size) { if !stack.regions.current.fits(line.size) {
if let Some((last_line, last_end)) = last.take() { if let Some((last_line, last_end)) = last.take() {
// The region must not fit this line for the result to be valid. // Since the new line try did not fit, no region that would
// fit the line will yield the same line break. Therefore,
// the width of the region must not fit the width of the
// tried line.
if !stack.regions.current.w.fits(line.size.w) { if !stack.regions.current.w.fits(line.size.w) {
stack.constraints.max.x.set_min(line.size.w); stack.constraints.max.x.set_min(line.size.w);
} }
// Same as above, but for height.
if !stack.regions.current.h.fits(line.size.h) { if !stack.regions.current.h.fits(line.size.h) {
stack.constraints.max.y.set_min(stack.size.h + line.size.h); let too_large = stack.size.h + self.line_spacing + line.size.h;
stack.constraints.max.y.set_min(too_large);
} }
stack.push(last_line); stack.push(last_line);
stack.constraints.min.y = Some(stack.size.h); stack.constraints.min.y = Some(stack.size.h);
start = last_end; start = last_end;
line = LineLayout::new(ctx, &self, start .. end); line = LineLayout::new(ctx, &self, start .. end);
} }
} }
// If the line does not fit vertically, we start a new region.
while !stack.regions.current.h.fits(line.size.h)
&& !stack.regions.in_full_last()
{
// Again, the line must not fit. It would if the space taken up
// plus the line height would fit, therefore the constraint
// below.
stack.constraints.max.y.set_min(stack.size.h + line.size.h);
stack.finish_region(ctx);
}
// If the line does not fit vertically, we start a new region. // If the line does not fit vertically, we start a new region.
while !stack.regions.current.h.fits(line.size.h) { while !stack.regions.current.h.fits(line.size.h) {
if stack.regions.in_full_last() { if stack.regions.in_full_last() {
@ -224,7 +219,12 @@ impl<'a> ParLayouter<'a> {
break; break;
} }
stack.constraints.max.y.set_min(stack.size.h + line.size.h); // Again, the line must not fit. It would if the space taken up
// plus the line height would fit, therefore the constraint
// below.
let too_large = stack.size.h + self.line_spacing + line.size.h;
stack.constraints.max.y.set_min(too_large);
stack.finish_region(ctx); stack.finish_region(ctx);
} }
@ -236,7 +236,6 @@ impl<'a> ParLayouter<'a> {
last = None; last = None;
stack.push(line); stack.push(line);
stack.constraints.min.y = Some(stack.size.h);
// If there is a trailing line break at the end of the // If there is a trailing line break at the end of the
// paragraph, we want to force an empty line. // paragraph, we want to force an empty line.
@ -244,9 +243,10 @@ impl<'a> ParLayouter<'a> {
let line = LineLayout::new(ctx, &self, end .. end); let line = LineLayout::new(ctx, &self, end .. end);
if stack.regions.current.h.fits(line.size.h) { if stack.regions.current.h.fits(line.size.h) {
stack.push(line); stack.push(line);
stack.constraints.min.y = Some(stack.size.h);
} }
} }
stack.constraints.min.y = Some(stack.size.h);
} else { } else {
// Otherwise, the line fits both horizontally and vertically // Otherwise, the line fits both horizontally and vertically
// and we remember it. // and we remember it.