version 1.48, 2018/12/12 21:54:35 |
version 1.58, 2021/09/10 12:07:21 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011,2015,2017-2019,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 <assert.h> |
#include <assert.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.h" |
#include "tbl.h" |
#include "tbl.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "tbl_int.h" |
|
|
static void getdata(struct tbl_node *, struct tbl_span *, |
static void getdata(struct tbl_node *, struct tbl_span *, |
int, const char *, int *); |
int, const char *, int *); |
Line 44 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 46 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
struct tbl_dat *dat, *pdat; |
struct tbl_dat *dat, *pdat; |
struct tbl_cell *cp; |
struct tbl_cell *cp; |
struct tbl_span *pdp; |
struct tbl_span *pdp; |
int sv; |
const char *ccp; |
|
int startpos, endpos; |
|
|
/* |
/* |
* Determine the length of the string in the cell |
* Determine the length of the string in the cell |
* and advance the parse point to the end of the cell. |
* and advance the parse point to the end of the cell. |
*/ |
*/ |
|
|
sv = *pos; |
startpos = *pos; |
while (p[*pos] != '\0' && p[*pos] != tbl->opts.tab) |
ccp = p + startpos; |
(*pos)++; |
while (*ccp != '\0' && *ccp != tbl->opts.tab) |
|
if (*ccp++ == '\\') |
|
mandoc_escape(&ccp, NULL, NULL); |
|
*pos = ccp - p; |
|
|
/* Advance to the next layout cell, skipping spanners. */ |
/* Advance to the next layout cell, skipping spanners. */ |
|
|
Line 72 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 78 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
if (dp->layout->last->col + 1 < dp->opts->cols) { |
if (dp->layout->last->col + 1 < dp->opts->cols) { |
cp = mandoc_calloc(1, sizeof(*cp)); |
cp = mandoc_calloc(1, sizeof(*cp)); |
cp->pos = TBL_CELL_LEFT; |
cp->pos = TBL_CELL_LEFT; |
|
cp->font = ESCAPE_FONTROMAN; |
|
cp->spacing = SIZE_MAX; |
dp->layout->last->next = cp; |
dp->layout->last->next = cp; |
cp->col = dp->layout->last->col + 1; |
cp->col = dp->layout->last->col + 1; |
dp->layout->last = cp; |
dp->layout->last = cp; |
} else { |
} else { |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, |
ln, sv, p + sv); |
ln, startpos, "%s", p + startpos); |
while (p[*pos] != '\0') |
while (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
return; |
return; |
Line 102 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 110 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
*/ |
*/ |
|
|
if (cp->pos == TBL_CELL_DOWN || |
if (cp->pos == TBL_CELL_DOWN || |
(*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) { |
(*pos - startpos == 2 && |
|
p[startpos] == '\\' && p[startpos + 1] == '^')) { |
pdp = dp; |
pdp = dp; |
while ((pdp = pdp->prev) != NULL) { |
while ((pdp = pdp->prev) != NULL) { |
pdat = pdp->first; |
pdat = pdp->first; |
Line 144 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 153 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
* until a standalone `T}', are included in our cell. |
* until a standalone `T}', are included in our cell. |
*/ |
*/ |
|
|
if (*pos - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') { |
if (*pos - startpos == 2 && |
|
p[startpos] == 'T' && p[startpos + 1] == '{') { |
tbl->part = TBL_PART_CDATA; |
tbl->part = TBL_PART_CDATA; |
return; |
return; |
} |
} |
|
|
dat->string = mandoc_strndup(p + sv, *pos - sv); |
endpos = *pos; |
|
if (dp->opts->opts & TBL_OPT_NOSPACE) { |
|
while (p[startpos] == ' ') |
|
startpos++; |
|
while (endpos > startpos && p[endpos - 1] == ' ') |
|
endpos--; |
|
} |
|
dat->string = mandoc_strndup(p + startpos, endpos - startpos); |
|
|
if (p[*pos] != '\0') |
if (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
Line 170 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 187 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
dat->layout->pos == TBL_CELL_DOWN) && |
dat->layout->pos == TBL_CELL_DOWN) && |
dat->pos == TBL_DATA_DATA && *dat->string != '\0') |
dat->pos == TBL_DATA_DATA && *dat->string != '\0') |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
tbl->parse, ln, sv, dat->string); |
ln, startpos, "%s", dat->string); |
} |
} |
|
|
void |
void |
Line 183 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
Line 200 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
|
|
if (p[pos] == 'T' && p[pos + 1] == '}') { |
if (p[pos] == 'T' && p[pos + 1] == '}') { |
pos += 2; |
pos += 2; |
|
if (tbl->opts.opts & TBL_OPT_NOSPACE) |
|
while (p[pos] == ' ') |
|
pos++; |
if (p[pos] == tbl->opts.tab) { |
if (p[pos] == tbl->opts.tab) { |
tbl->part = TBL_PART_DATA; |
tbl->part = TBL_PART_DATA; |
pos++; |
pos++; |
Line 209 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
Line 229 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
dat->string = mandoc_strdup(p + pos); |
dat->string = mandoc_strdup(p + pos); |
|
|
if (dat->layout->pos == TBL_CELL_DOWN) |
if (dat->layout->pos == TBL_CELL_DOWN) |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
ln, pos, dat->string); |
ln, pos, "%s", dat->string); |
} |
} |
|
|
static struct tbl_span * |
static struct tbl_span * |
Line 241 tbl_data(struct tbl_node *tbl, int ln, const char *p, |
|
Line 261 tbl_data(struct tbl_node *tbl, int ln, const char *p, |
|
struct tbl_cell *cp; |
struct tbl_cell *cp; |
struct tbl_span *sp; |
struct tbl_span *sp; |
|
|
rp = (sp = tbl->last_span) == NULL ? tbl->first_row : |
for (sp = tbl->last_span; sp != NULL; sp = sp->prev) |
sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ? |
if (sp->pos == TBL_SPAN_DATA) |
sp->layout->next : sp->layout; |
break; |
|
rp = sp == NULL ? tbl->first_row : |
|
sp->layout->next == NULL ? sp->layout : sp->layout->next; |
assert(rp != NULL); |
assert(rp != NULL); |
|
|
if ( ! strcmp(p, "_")) { |
if (p[1] == '\0') { |
sp = newspan(tbl, ln, rp); |
switch (p[0]) { |
sp->pos = TBL_SPAN_HORIZ; |
case '.': |
return; |
/* |
} else if ( ! strcmp(p, "=")) { |
* Empty request lines must be handled here |
sp = newspan(tbl, ln, rp); |
* and cannot be discarded in roff_parseln() |
sp->pos = TBL_SPAN_DHORIZ; |
* because in the layout section, they |
return; |
* are significant and end the layout. |
|
*/ |
|
return; |
|
case '_': |
|
sp = newspan(tbl, ln, rp); |
|
sp->pos = TBL_SPAN_HORIZ; |
|
return; |
|
case '=': |
|
sp = newspan(tbl, ln, rp); |
|
sp->pos = TBL_SPAN_DHORIZ; |
|
return; |
|
default: |
|
break; |
|
} |
} |
} |
|
|
/* |
/* |