Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Commit

Permalink
Allow skipping numbering for lines
Browse files Browse the repository at this point in the history
Closes #10
  • Loading branch information
EpicEricEE committed Jul 2, 2024
1 parent 820a82a commit e7e366a
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 2 deletions.
23 changes: 21 additions & 2 deletions equate/src/equate.typ
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,24 @@
})
.map(((i, _)) => i)

// Indices of lines that are marked not to be numbered.
let revoked = lines
.enumerate()
.filter(((i, line)) => {
if i not in labelled { return false }
return line.last().text == "<equate:revoke>"
})
.map(((i, _)) => i)

// The "revoke" label shall not count as a labelled line.
labelled = labelled.filter(i => i not in revoked)

// Indices of numbered lines in this equation.
let numbered = if number-mode == "line" {
range(lines.len())
range(lines.len()).filter(i => i not in revoked)
} else if labelled.len() == 0 and has-label {
// Only outer label, so number all lines.
range(lines.len())
range(lines.len()).filter(i => i not in revoked)
} else {
labelled
}
Expand All @@ -204,6 +216,13 @@
numbered,
lines.enumerate()
.map(((i, line)) => {
if i in revoked {
// Remove "revoke" label and space and return line.
line.remove(-1)
if line.at(-2, default: none) == [ ] { line.remove(-2) }
return line
}

if i not in labelled { return line }

// Remove trailing spacing (before label).
Expand Down
Binary file modified equate/tests/number-mode/ref/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions equate/tests/number-mode/test.typ
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ $ q + r #<label> \
$ u + v \
w + x $ <equate:revoke>

$ y + z \
1 + 2 #<equate:revoke> \
3 + 4 $ <label>

#show: equate.with(sub-numbering: true, number-mode: "label")

#set math.equation(numbering: "(1.1)")
Expand All @@ -50,3 +54,7 @@ $ q + r #<label> \

$ u + v \
w + x $ <equate:revoke>

$ y + z \
1 + 2 #<equate:revoke> \
3 + 4 $ <label>
Binary file modified equate/tests/numbering/ref/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions equate/tests/numbering/test.typ
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ $ i + j \
$ m + n \
o + p $ <equate:revoke>

$ q + r \
s + t #<equate:revoke> \
u + v $

#show: equate.with(sub-numbering: true)

#set math.equation(numbering: "(1.1)")
Expand All @@ -40,3 +44,7 @@ $ i + j \

$ m + n \
o + p $ <equate:revoke>

$ q + r \
s + t #<equate:revoke> \
u + v $

0 comments on commit e7e366a

Please sign in to comment.