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

Fix page counter

Browse Source
This commit is contained in:
Laurenz 2023-03-18 16:28:39 +01:00
parent 8b3dff37c8
commit f2b0c5e08d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/src/meta/counter.rs
View File

@ -277,8 +277,8 @@ impl Counter {
if is_page { if is_page {
let page = introspector.page(id); let page = introspector.page(id);
let delta = page.get() - prev_page.get(); let delta = page.get() - prev_page.get();
if let Some(delta) = NonZeroUsize::new(delta) { if delta > 0 {
state.step(delta); state.step(NonZeroUsize::ONE, delta);
} }
prev_page = page; prev_page = page;
} }
@ -354,7 +354,7 @@ impl CounterState {
pub fn update(&mut self, vt: &mut Vt, update: CounterUpdate) -> SourceResult<()> { pub fn update(&mut self, vt: &mut Vt, update: CounterUpdate) -> SourceResult<()> {
match update { match update {
CounterUpdate::Set(state) => *self = state, CounterUpdate::Set(state) => *self = state,
CounterUpdate::Step(level) => self.step(level), CounterUpdate::Step(level) => self.step(level, 1),
CounterUpdate::Func(func) => { CounterUpdate::Func(func) => {
*self = func *self = func
.call_vt(vt, self.0.iter().copied().map(Into::into))? .call_vt(vt, self.0.iter().copied().map(Into::into))?
@ -365,12 +365,12 @@ impl CounterState {
Ok(()) Ok(())
} }
/// Advance the top level number by the specified amount. /// Advance the number of the given level by the specified amount.
pub fn step(&mut self, level: NonZeroUsize) { pub fn step(&mut self, level: NonZeroUsize, by: usize) {
let level = level.get(); let level = level.get();
if self.0.len() >= level { if self.0.len() >= level {
self.0[level - 1] = self.0[level - 1].saturating_add(1); self.0[level - 1] = self.0[level - 1].saturating_add(by);
self.0.truncate(level); self.0.truncate(level);
} }

BIN
tests/ref/meta/counter-page.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 14 KiB

1
tests/typ/meta/counter-page.typ
View File

@ -1,6 +1,7 @@
// Test the page counter. // Test the page counter.
#set page(height: 50pt, margin: (bottom: 20pt, rest: 10pt)) #set page(height: 50pt, margin: (bottom: 20pt, rest: 10pt))
#lorem(12)
#set page(numbering: "(i)") #set page(numbering: "(i)")
#lorem(6) #lorem(6)
#pagebreak() #pagebreak()