ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 07:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let WIDTH_PROC be specified as proc argument to write_*_table

Browse Source
This commit is contained in:
Feoramund
2024-06-24 13:38:59 -04:00
parent 67b4cb0038
commit e397bdf11d
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/text/table/table.odin
+5 -9
View File
@@ -371,11 +371,9 @@ write_html_table :: proc(w: io.Writer, tbl: ^Table) {
io.write_string(w, "</table>\n") io.write_string(w, "</table>\n")
} }
write_plain_table :: proc(w: io.Writer, tbl: ^Table) { write_plain_table :: proc(w: io.Writer, tbl: ^Table, width_proc: Width_Proc = unicode_width_proc) {
WIDTH_PROC :: unicode_width_proc
if tbl.dirty { if tbl.dirty {
build(tbl, WIDTH_PROC) build(tbl, width_proc)
} }
write_caption_separator :: proc(w: io.Writer, tbl: ^Table) { write_caption_separator :: proc(w: io.Writer, tbl: ^Table) {
@@ -400,7 +398,7 @@ write_plain_table :: proc(w: io.Writer, tbl: ^Table) {
write_caption_separator(w, tbl) write_caption_separator(w, tbl)
io.write_byte(w, '|') io.write_byte(w, '|')
write_text_align(w, tbl.caption, .Center, write_text_align(w, tbl.caption, .Center,
tbl.lpad, tbl.rpad, tbl.tblw + tbl.nr_cols - 1 - WIDTH_PROC(tbl.caption) - tbl.lpad - tbl.rpad) tbl.lpad, tbl.rpad, tbl.tblw + tbl.nr_cols - 1 - width_proc(tbl.caption) - tbl.lpad - tbl.rpad)
io.write_byte(w, '|') io.write_byte(w, '|')
io.write_byte(w, '\n') io.write_byte(w, '\n')
} }
@@ -423,12 +421,10 @@ write_plain_table :: proc(w: io.Writer, tbl: ^Table) {
} }
// Renders table according to GitHub Flavored Markdown (GFM) specification // Renders table according to GitHub Flavored Markdown (GFM) specification
write_markdown_table :: proc(w: io.Writer, tbl: ^Table) { write_markdown_table :: proc(w: io.Writer, tbl: ^Table, width_proc: Width_Proc = unicode_width_proc) {
// NOTE(oskar): Captions or colspans are not supported by GFM as far as I can tell. // NOTE(oskar): Captions or colspans are not supported by GFM as far as I can tell.
WIDTH_PROC :: unicode_width_proc
if tbl.dirty { if tbl.dirty {
build(tbl, WIDTH_PROC) build(tbl, width_proc)
} }
write_row :: proc(w: io.Writer, tbl: ^Table, row: int, alignment: Cell_Alignment = .Left) { write_row :: proc(w: io.Writer, tbl: ^Table, row: int, alignment: Cell_Alignment = .Left) {