Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Numbered equations #1821

Closed
wants to merge 13 commits into from
Closed

Numbered equations #1821

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
39f5121
add a 'numbered' mode to math in typesetter.lua
leorosa Jun 24, 2023
d179665
assure that the 'counters' package is loaded
leorosa Jun 24, 2023
66e89c3
rely on increment-counter to initialize the equation counter
leorosa Jun 30, 2023
f62b3a2
Merge branch 'sile-typesetter:master' into numbered_equations
leorosa Jul 4, 2023
05155b3
add a 'numbered' option to number equations, and a 'counter' option t…
leorosa Jul 4, 2023
7d9bb34
add a function to print equations' numbers
leorosa Jul 4, 2023
3f47639
use 'numbered' and/or 'counter' options instead of a new mode in math…
leorosa Jul 4, 2023
4967292
add some documentation
leorosa Jul 4, 2023
faaaf0c
add the '\equation{...}' shortcut command to call '\math[mode=display…
leorosa Jul 4, 2023
a42c9c6
Merge branch 'sile-typesetter:master' into numbered_equations
leorosa Aug 23, 2023
0f97f48
Merge branch 'sile-typesetter:master' into numbered_equations
leorosa Sep 12, 2023
b5cf4a2
feat(math): numbered equations
leorosa Sep 12, 2023
c4db864
feat(math): numbered equations
leorosa Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/math/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ function package:_init ()
return value * SILE.settings:get("math.font.size") / 18
end
})
self:loadPackage("counters")
SILE.scratch.counters.equation = { value = 0, display = "arabic" }
Omikhleia marked this conversation as resolved.
Show resolved Hide resolved
end

function package.declareSettings (_)
Expand Down
14 changes: 14 additions & 0 deletions packages/math/typesetter.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ end
local function handleMath (_, mbox, mode)
if mode == 'display' then
mbox.mode = b.mathMode.display
elseif mode == 'numbered' then
leorosa marked this conversation as resolved.
Show resolved Hide resolved
mbox.mode = b.mathMode.display
elseif mode == 'text' then
mbox.mode = b.mathMode.textCramped
else
Expand All @@ -149,6 +151,18 @@ local function handleMath (_, mbox, mode)
end)
SILE.typesetter:endline()
SILE.typesetter:pushExplicitVglue(SILE.settings:get("math.displayskip"))
elseif mode == "numbered" then
SILE.typesetter:endline()
SILE.typesetter:pushExplicitVglue(SILE.settings:get("math.displayskip"))
SILE.typesetter:pushGlue(SILE.nodefactory.hfillglue())
SILE.typesetter:pushHorizontal(mbox)
SILE.typesetter:pushGlue(SILE.nodefactory.hfillglue())
SILE.call("increment-counter", { id="equation" })
SILE.typesetter:typeset("(")
SILE.call("show-counter", { id="equation" })
SILE.typesetter:typeset(")")
leorosa marked this conversation as resolved.
Show resolved Hide resolved
SILE.typesetter:endline()
SILE.typesetter:pushExplicitVglue(SILE.settings:get("math.displayskip"))
else
SILE.typesetter:pushHorizontal(mbox)
end
Expand Down