version 1.49, 2018/12/13 02:06:07 |
version 1.53, 2020/01/11 20:48:18 |
|
|
/* $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,2018,2019 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> |
Line 72 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 74 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->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, sv, "%s", p + sv); |
while (p[*pos] != '\0') |
while (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
return; |
return; |
Line 170 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 173 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, sv, "%s", dat->string); |
} |
} |
|
|
void |
void |
Line 209 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
Line 212 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 247 tbl_data(struct tbl_node *tbl, int ln, const char *p, |
|
Line 250 tbl_data(struct tbl_node *tbl, int ln, const char *p, |
|
|
|
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; |
|
} |
} |
} |
|
|
/* |
/* |