wbrawner/hoedown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix table cells being rendered as table headers

Browse source
This commit is contained in:
Vicent Marti 2011-09-13 19:44:40 +02:00
parent 3cb0b6873a
commit 137c1e6f20
1 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/markdown.c
View file

@ -1862,7 +1862,14 @@ parse_htmlblock(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
}
static void
parse_table_row(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size, size_t columns, int *col_data)
parse_table_row(
struct buf *ob,
struct sd_markdown *rndr,
uint8_t *data,
size_t size,
size_t columns,
int *col_data,
int header_flag)
{
size_t i = 0, col;
struct buf *row_work = 0;
@ -1895,7 +1902,7 @@ parse_table_row(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
cell_end--;
parse_inline(cell_work, rndr, data + cell_start, 1 + cell_end - cell_start);
rndr->cb.table_cell(row_work, cell_work, col_data[col], rndr->opaque);
rndr->cb.table_cell(row_work, cell_work, col_data[col] | header_flag, rndr->opaque);
rndr_popbuf(rndr, BUFFER_SPAN);
i++;
@ -1903,7 +1910,7 @@ parse_table_row(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
for (; col < columns; ++col) {
struct buf empty_cell = { 0, 0, 0, 0 };
rndr->cb.table_cell(row_work, &empty_cell, col_data[col], rndr->opaque);
rndr->cb.table_cell(row_work, &empty_cell, col_data[col] | header_flag, rndr->opaque);
}
rndr->cb.table_row(ob, row_work, rndr->opaque);
@ -1912,7 +1919,13 @@ parse_table_row(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
}
static size_t
parse_table_header(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size, size_t *columns, int **column_data)
parse_table_header(
struct buf *ob,
struct sd_markdown *rndr,
uint8_t *data,
size_t size,
size_t *columns,
int **column_data)
{
int pipes;
size_t i = 0, col, header_end, under_end;
@ -1948,8 +1961,6 @@ parse_table_header(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size
for (col = 0; col < *columns && i < under_end; ++col) {
size_t dashes = 0;
(*column_data)[col] |= MKD_TABLE_HEADER;
while (i < under_end && data[i] == ' ')
i++;
@ -1982,12 +1993,23 @@ parse_table_header(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size
if (col < *columns)
return 0;
parse_table_row(ob, rndr, data, header_end, *columns, *column_data);
parse_table_row(
ob, rndr, data,
header_end,
*columns,
*column_data,
MKD_TABLE_HEADER
);
return under_end + 1;
}
static size_t
parse_table(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size)
parse_table(
struct buf *ob,
struct sd_markdown *rndr,
uint8_t *data,
size_t size)
{
size_t i;
@ -2018,7 +2040,15 @@ parse_table(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
break;
}
parse_table_row(body_work, rndr, data + row_start, i - row_start, columns, col_data);
parse_table_row(
body_work,
rndr,
data + row_start,
i - row_start,
columns,
col_data, 0
);
i++;
}