version 1.41, 2015/10/12 00:08:16 |
version 1.45, 2018/12/12 21:54:35 |
|
|
/* $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 <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 "libroff.h" |
|
|
Line 62 mods(struct tbl_node *tbl, struct tbl_cell *cp, |
|
Line 64 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; |
|
size_t sz; |
|
|
mod: |
mod: |
while (p[*pos] == ' ' || p[*pos] == '\t') |
while (p[*pos] == ' ' || p[*pos] == '\t') |
|
|
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; |
Line 282 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 300 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
tbl->parse, ln, pos, NULL); |
tbl->parse, 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 339 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e |
|
Line 359 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) { |