-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #141 from junder873/add-typst-support
Add support for Typst tables
- Loading branch information
Showing
12 changed files
with
198 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| name = "RegressionTables" | ||
| uuid = "d519eb52-b820-54da-95a6-98e1306fdade" | ||
| authors = ["Johannes Boehm <[email protected]>"] | ||
| version = "0.7.2" | ||
| version = "0.7.3" | ||
|
|
||
| [deps] | ||
| Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| abstract type AbstractTypst <: AbstractRenderType end | ||
| struct TypstTable <: AbstractTypst end | ||
|
|
||
| function tablestart(::AbstractTypst, align) | ||
| cols = [c == 'l' ? "left" : c == 'r' ? "right" : "center" for c in align] | ||
| cols_align = join(cols, ", ") | ||
| cols = join(fill("auto", length(cols)), ", ") | ||
|
|
||
| """ | ||
| #table( | ||
| columns: ($cols), | ||
| align: ($cols_align), | ||
| column-gutter: 1fr, | ||
| stroke: none, | ||
| """ | ||
| end | ||
|
|
||
| wrapper(::AbstractTypst, x) = "\$\"\"^($x)\$" | ||
|
|
||
| tableend(::AbstractTypst) = ")" | ||
|
|
||
| function Base.repr(rndr::AbstractTypst, val::Pair; align="c", args...) | ||
| s = Base.repr(rndr, first(val); args...) | ||
| if length(s) == 0 && length(last(val)) == 1 | ||
| s | ||
| else | ||
| multicolumn(rndr, s, length(last(val)), align) | ||
| end | ||
| end | ||
| function multicolumn(rndr::AbstractTypst, s, cols::Int, align="c") | ||
| x = if align == "c" || align == 'c' | ||
| "center" | ||
| elseif align == "l" || align == 'l' | ||
| "left" | ||
| elseif align == "r" || align == 'r' | ||
| "right" | ||
| end | ||
| "table.cell(colspan: $cols, align: $x)[$s]" | ||
| end | ||
|
|
||
| underline(::AbstractTypst, colmin::Int, colmax::Int) = "table.hline(start: $(colmin-1), end: $(colmax), stroke: 0.5pt)" | ||
|
|
||
| toprule(x::AbstractTypst) = linestart(x) * "table.hline(), " | ||
| midrule(x::AbstractTypst) = linestart(x) * "table.hline(stroke: 0.7pt), " | ||
| bottomrule(x::AbstractTypst) = linestart(x) * "table.hline(), " | ||
| linestart(::AbstractTypst) = " " | ||
| lineend(::AbstractTypst) = "," | ||
| tablestart(tab::RegressionTable{<:AbstractTypst}) = tablestart(tab.render, tab.align) | ||
| colsep(::AbstractTypst) = ", " | ||
|
|
||
| label(::AbstractTypst, x::Type{Nobs}) = "_N_" | ||
| label(::AbstractTypst, x::Type{R2}) = "_R_\$\"\"^2\$" | ||
| label(::AbstractTypst, x::Type{FStat}) = "_F_" | ||
| label_p(::AbstractTypst, ) = "_p_" | ||
|
|
||
| extra_cell_space(::AbstractTypst) = 2 # to account for "[]" | ||
|
|
||
| interaction_combine(::AbstractTypst) = " \$times\$ " | ||
|
|
||
| function Base.print(io::IO, row::DataRow{T}) where {T<:AbstractTypst} | ||
| render = T() | ||
| print(io, linestart(render)) | ||
| for (i, x) in enumerate(row.data) | ||
| s = if isa(x, Pair) | ||
| repr(render, x; align = row.align[i]) | ||
| else | ||
| "[" * repr(render, x; align = row.align[i]) * "]" | ||
| end | ||
| print(io, make_padding(s, row.colwidths[i], row.align[i])) | ||
| if i < length(row.data) | ||
| print(io, colsep(render)) | ||
| end | ||
| end | ||
| print(io, lineend(render)) | ||
| if any(row.print_underlines) | ||
| println(io) | ||
| print(io, linestart(render)) | ||
| for (i, x) in enumerate(row.data) | ||
| s = isa(x, Pair) ? repr(render, first(x)) : repr(render, x) | ||
| if length(s) == 0 || !row.print_underlines[i] | ||
| continue | ||
| end | ||
| if isa(x, Pair) | ||
| print(io, underline(render, first(last(x)), last(last(x)))) | ||
| else | ||
| print(io, underline(render, i,i)) | ||
| end | ||
| print(io, colsep(render)) | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7062d92There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JuliaRegistrator register()
7062d92There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Registration pull request created: JuliaRegistries/General/103127
Tip: Release Notes
Did you know you can add release notes too? Just add markdown formatted text underneath the comment after the text
"Release notes:" and it will be added to the registry PR, and if TagBot is installed it will also be added to the
release that TagBot creates. i.e.
To add them here just re-invoke and the PR will be updated.
Tagging
After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.
This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via: