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

A small comment regarding page layout

Browse Source
This commit is contained in:
Laurenz 2023-04-25 16:09:10 +02:00
parent 62361b4127
commit 946756bc53
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/src/layout/page.rs
View File

@ -271,9 +271,19 @@ pub struct PageElem {
} }
impl PageElem { impl PageElem {
/// Layout the page run into a sequence of frames, one per page. /// A document can consist of multiple `PageElem`s, one per run of pages
/// with equal properties (not one per actual output page!). The `number` is
/// the physical page number of the first page of this run. It is mutated
/// while we post-process the pages in this function. This function returns
/// a fragment consisting of multiple frames, one per output page of this
/// page run.
#[tracing::instrument(skip_all)] #[tracing::instrument(skip_all)]
pub fn layout(&self, vt: &mut Vt, styles: StyleChain) -> SourceResult<Fragment> { pub fn layout(
&self,
vt: &mut Vt,
styles: StyleChain,
mut number: NonZeroUsize,
) -> SourceResult<Fragment> {
tracing::info!("Page layout"); tracing::info!("Page layout");
// When one of the lengths is infinite the page fits its content along // When one of the lengths is infinite the page fits its content along
@ -333,8 +343,8 @@ impl PageElem {
); );
// Realize overlays. // Realize overlays.
for (i, frame) in fragment.iter_mut().enumerate() { for frame in fragment.iter_mut() {
tracing::info!("Layouting page #{i}"); tracing::info!("Layouting page #{number}");
frame.prepend(Point::zero(), numbering_meta.clone()); frame.prepend(Point::zero(), numbering_meta.clone());
let size = frame.size(); let size = frame.size();
let pad = padding.resolve(styles).relative_to(size); let pad = padding.resolve(styles).relative_to(size);
@ -382,6 +392,8 @@ impl PageElem {
if let Some(fill) = &fill { if let Some(fill) = &fill {
frame.fill(fill.clone()); frame.fill(fill.clone());
} }
number = number.saturating_add(1);
} }
Ok(fragment) Ok(fragment)

3
library/src/meta/document.rs
View File

@ -58,7 +58,8 @@ impl LayoutRoot for DocumentElem {
} }
if let Some(page) = child.to::<PageElem>() { if let Some(page) = child.to::<PageElem>() {
let fragment = page.layout(vt, styles)?; let number = NonZeroUsize::ONE.saturating_add(pages.len());
let fragment = page.layout(vt, styles, number)?;
pages.extend(fragment); pages.extend(fragment);
} else { } else {
bail!(child.span(), "unexpected document child"); bail!(child.span(), "unexpected document child");