version 1.36, 2015/01/30 02:09:04 |
version 1.50, 2021/08/10 12:55:04 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012, 2014, 2015, 2017, 2020, 2021 |
|
* Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
#include <ctype.h> |
#include <ctype.h> |
|
#include <stdint.h> |
|
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
|
#include "mandoc.h" |
|
#include "tbl.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "tbl_int.h" |
|
|
struct tbl_phrase { |
struct tbl_phrase { |
char name; |
char name; |
Line 62 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
Line 66 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
int ln, const char *p, int *pos) |
int ln, const char *p, int *pos) |
{ |
{ |
char *endptr; |
char *endptr; |
|
unsigned long spacing; |
|
size_t sz; |
|
int isz; |
|
enum mandoc_esc fontesc; |
|
|
mod: |
mod: |
while (p[*pos] == ' ' || p[*pos] == '\t') |
while (p[*pos] == ' ' || p[*pos] == '\t') |
|
|
(*pos)++; |
(*pos)++; |
goto mod; |
goto mod; |
} |
} |
mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, ln, *pos, NULL); |
ln, *pos, NULL); |
|
return; |
return; |
} |
} |
|
|
/* Parse numerical spacing from modifier string. */ |
/* Parse numerical spacing from modifier string. */ |
|
|
if (isdigit((unsigned char)p[*pos])) { |
if (isdigit((unsigned char)p[*pos])) { |
cp->spacing = strtoull(p + *pos, &endptr, 10); |
if ((spacing = strtoul(p + *pos, &endptr, 10)) > 9) |
|
mandoc_msg(MANDOCERR_TBLLAYOUT_SPC, ln, *pos, |
|
"%lu", spacing); |
|
else |
|
cp->spacing = spacing; |
*pos = endptr - p; |
*pos = endptr - p; |
goto mod; |
goto mod; |
} |
} |
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case 'b': |
case 'b': |
/* FALLTHROUGH */ |
cp->font = ESCAPE_FONTBOLD; |
case 'i': |
goto mod; |
/* FALLTHROUGH */ |
|
case 'r': |
|
(*pos)--; |
|
break; |
|
case 'd': |
case 'd': |
cp->flags |= TBL_CELL_BALIGN; |
cp->flags |= TBL_CELL_BALIGN; |
goto mod; |
goto mod; |
|
|
goto mod; |
goto mod; |
case 'f': |
case 'f': |
break; |
break; |
|
case 'i': |
|
cp->font = ESCAPE_FONTITALIC; |
|
goto mod; |
case 'm': |
case 'm': |
mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, ln, *pos, "m"); |
ln, *pos, "m"); |
|
goto mod; |
goto mod; |
case 'p': |
case 'p': |
/* FALLTHROUGH */ |
|
case 'v': |
case 'v': |
if (p[*pos] == '-' || p[*pos] == '+') |
if (p[*pos] == '-' || p[*pos] == '+') |
(*pos)++; |
(*pos)++; |
|
|
case 'u': |
case 'u': |
cp->flags |= TBL_CELL_UP; |
cp->flags |= TBL_CELL_UP; |
goto mod; |
goto mod; |
case 'w': /* XXX for now, ignore minimal column width */ |
case 'w': |
|
sz = 0; |
|
if (p[*pos] == '(') { |
|
(*pos)++; |
|
while (p[*pos + sz] != '\0' && p[*pos + sz] != ')') |
|
sz++; |
|
} else |
|
while (isdigit((unsigned char)p[*pos + sz])) |
|
sz++; |
|
if (sz) { |
|
free(cp->wstr); |
|
cp->wstr = mandoc_strndup(p + *pos, sz); |
|
*pos += sz; |
|
if (p[*pos] == ')') |
|
(*pos)++; |
|
} |
goto mod; |
goto mod; |
case 'x': |
case 'x': |
cp->flags |= TBL_CELL_WMAX; |
cp->flags |= TBL_CELL_WMAX; |
|
|
cp->vert++; |
cp->vert++; |
else |
else |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
tbl->parse, ln, *pos - 1, NULL); |
ln, *pos - 1, NULL); |
goto mod; |
goto mod; |
default: |
default: |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR, |
ln, *pos - 1, "%c", p[*pos - 1]); |
ln, *pos - 1, "%c", p[*pos - 1]); |
goto mod; |
goto mod; |
} |
} |
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
while (p[*pos] == ' ' || p[*pos] == '\t') |
case '3': |
(*pos)++; |
/* FALLTHROUGH */ |
|
case 'b': |
/* Ignore parenthised font names for now. */ |
cp->flags |= TBL_CELL_BOLD; |
|
|
if (p[*pos] == '(') |
goto mod; |
goto mod; |
case '2': |
|
/* FALLTHROUGH */ |
isz = 0; |
case 'i': |
if (p[*pos] != '\0') |
cp->flags |= TBL_CELL_ITALIC; |
isz++; |
goto mod; |
if (strchr(" \t.", p[*pos + isz]) == NULL) |
case '1': |
isz++; |
/* FALLTHROUGH */ |
|
case 'r': |
fontesc = mandoc_font(p + *pos, isz); |
goto mod; |
|
|
switch (fontesc) { |
|
case ESCAPE_FONTPREV: |
|
case ESCAPE_ERROR: |
|
mandoc_msg(MANDOCERR_FT_BAD, |
|
ln, *pos, "TS %s", p + *pos - 1); |
|
break; |
default: |
default: |
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
cp->font = fontesc; |
ln, *pos - 1, "TS f%c", p[*pos - 1]); |
break; |
goto mod; |
|
} |
} |
|
*pos += isz; |
|
goto mod; |
} |
} |
|
|
static void |
static void |
Line 187 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 218 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
rp->vert++; |
rp->vert++; |
else |
else |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
tbl->parse, ln, *pos, NULL); |
ln, *pos, NULL); |
} |
} |
(*pos)++; |
(*pos)++; |
} |
} |
|
|
break; |
break; |
|
|
if (i == KEYS_MAX) { |
if (i == KEYS_MAX) { |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR, |
ln, *pos, "%c", p[*pos]); |
ln, *pos, "%c", p[*pos]); |
(*pos)++; |
(*pos)++; |
goto again; |
goto again; |
|
|
|
|
if (c == TBL_CELL_SPAN) { |
if (c == TBL_CELL_SPAN) { |
if (rp->last == NULL) |
if (rp->last == NULL) |
mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, |
mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
|
else if (rp->last->pos == TBL_CELL_HORIZ || |
else if (rp->last->pos == TBL_CELL_HORIZ || |
rp->last->pos == TBL_CELL_DHORIZ) |
rp->last->pos == TBL_CELL_DHORIZ) |
c = rp->last->pos; |
c = rp->last->pos; |
} else if (c == TBL_CELL_DOWN && rp == tbl->first_row) |
} else if (c == TBL_CELL_DOWN && rp == tbl->first_row) |
mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, |
mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
|
|
|
(*pos)++; |
(*pos)++; |
|
|
Line 267 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 296 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
} |
} |
if (tbl->first_row->first == NULL) { |
if (tbl->first_row->first == NULL) { |
mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, |
mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, |
tbl->parse, ln, pos, NULL); |
ln, pos, NULL); |
cell_alloc(tbl, tbl->first_row, |
cell_alloc(tbl, tbl->first_row, |
TBL_CELL_LEFT); |
TBL_CELL_LEFT); |
|
if (tbl->opts.lvert < tbl->first_row->vert) |
|
tbl->opts.lvert = tbl->first_row->vert; |
return; |
return; |
} |
} |
|
|
Line 282 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 313 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
if (tbl->opts.lvert < rp->vert) |
if (tbl->opts.lvert < rp->vert) |
tbl->opts.lvert = rp->vert; |
tbl->opts.lvert = rp->vert; |
if (rp->last != NULL && |
if (rp->last != NULL && |
rp->last->head == tbl->last_head && |
rp->last->col + 1 == tbl->opts.cols && |
tbl->opts.rvert < rp->last->vert) |
tbl->opts.rvert < rp->last->vert) |
tbl->opts.rvert = rp->last->vert; |
tbl->opts.rvert = rp->last->vert; |
|
|
Line 292 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 323 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
rp->next->first == NULL) { |
rp->next->first == NULL) { |
free(rp->next); |
free(rp->next); |
rp->next = NULL; |
rp->next = NULL; |
|
tbl->last_row = rp; |
} |
} |
} |
} |
return; |
return; |
Line 324 static struct tbl_cell * |
|
Line 356 static struct tbl_cell * |
|
cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) |
cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos) |
{ |
{ |
struct tbl_cell *p, *pp; |
struct tbl_cell *p, *pp; |
struct tbl_head *h, *hp; |
|
|
|
p = mandoc_calloc(1, sizeof(*p)); |
p = mandoc_calloc(1, sizeof(*p)); |
|
p->spacing = SIZE_MAX; |
|
p->font = ESCAPE_FONTROMAN; |
|
p->pos = pos; |
|
|
if ((pp = rp->last) != NULL) { |
if ((pp = rp->last) != NULL) { |
pp->next = p; |
pp->next = p; |
h = pp->head->next; |
p->col = pp->col + 1; |
} else { |
} else |
rp->first = p; |
rp->first = p; |
h = tbl->first_head; |
|
} |
|
rp->last = p; |
rp->last = p; |
|
|
p->pos = pos; |
if (tbl->opts.cols <= p->col) |
|
tbl->opts.cols = p->col + 1; |
|
|
/* Re-use header. */ |
return p; |
|
|
if (h != NULL) { |
|
p->head = h; |
|
return(p); |
|
} |
|
|
|
hp = mandoc_calloc(1, sizeof(*hp)); |
|
hp->ident = tbl->opts.cols++; |
|
|
|
if (tbl->last_head != NULL) { |
|
hp->prev = tbl->last_head; |
|
tbl->last_head->next = hp; |
|
} else |
|
tbl->first_head = hp; |
|
tbl->last_head = hp; |
|
|
|
p->head = hp; |
|
return(p); |
|
} |
} |