version 1.38, 2015/02/10 11:03:13 |
version 1.49, 2020/09/01 18:25:28 |
|
|
/* $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 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 65 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; |
|
|
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; |
} |
} |
|
|
cp->flags |= TBL_CELL_ITALIC; |
cp->flags |= TBL_CELL_ITALIC; |
goto mod; |
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; |
} |
} |
|
|
/* Support only one-character font-names for now. */ |
/* Support only one-character font-names for now. */ |
|
|
if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) { |
if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) { |
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
mandoc_msg(MANDOCERR_FT_BAD, |
ln, *pos, "TS %s", p + *pos - 1); |
ln, *pos, "TS %s", p + *pos - 1); |
if (p[*pos] != '\0') |
if (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
|
|
|
|
switch (p[(*pos)++]) { |
switch (p[(*pos)++]) { |
case '3': |
case '3': |
/* FALLTHROUGH */ |
|
case 'B': |
case 'B': |
cp->flags |= TBL_CELL_BOLD; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
case '2': |
case '2': |
/* FALLTHROUGH */ |
|
case 'I': |
case 'I': |
cp->flags |= TBL_CELL_ITALIC; |
cp->flags |= TBL_CELL_ITALIC; |
goto mod; |
goto mod; |
case '1': |
case '1': |
/* FALLTHROUGH */ |
|
case 'R': |
case 'R': |
goto mod; |
goto mod; |
default: |
default: |
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
mandoc_msg(MANDOCERR_FT_BAD, |
ln, *pos - 1, "TS f%c", p[*pos - 1]); |
ln, *pos - 1, "TS f%c", p[*pos - 1]); |
goto mod; |
goto mod; |
} |
} |
Line 203 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 221 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 283 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 299 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 308 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 326 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 342 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 361 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
struct tbl_cell *p, *pp; |
struct tbl_cell *p, *pp; |
|
|
p = mandoc_calloc(1, sizeof(*p)); |
p = mandoc_calloc(1, sizeof(*p)); |
|
p->spacing = SIZE_MAX; |
p->pos = pos; |
p->pos = pos; |
|
|
if ((pp = rp->last) != NULL) { |
if ((pp = rp->last) != NULL) { |
Line 354 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 374 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
if (tbl->opts.cols <= p->col) |
if (tbl->opts.cols <= p->col) |
tbl->opts.cols = p->col + 1; |
tbl->opts.cols = p->col + 1; |
|
|
return(p); |
return p; |
} |
} |