version 1.20, 2011/01/03 13:59:21 |
version 1.24, 2011/03/22 09:48:13 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
|
* Copyright (c) 2011 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 <time.h> |
#include <time.h> |
|
|
#include "mandoc.h" |
#include "mandoc.h" |
#include "roff.h" |
|
#include "libmandoc.h" |
#include "libmandoc.h" |
#include "libroff.h" |
#include "libroff.h" |
|
|
Line 52 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
Line 52 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); |
return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); |
case (TBL_PART_LAYOUT): |
case (TBL_PART_LAYOUT): |
return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); |
return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); |
case (TBL_PART_DATA): |
case (TBL_PART_CDATA): |
|
return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); |
|
default: |
break; |
break; |
} |
} |
|
|
Line 64 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
Line 66 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
} |
} |
|
|
struct tbl_node * |
struct tbl_node * |
tbl_alloc(int pos, int line, void *data, const mandocmsg msg) |
tbl_alloc(int pos, int line, struct mparse *parse) |
{ |
{ |
struct tbl_node *p; |
struct tbl_node *p; |
|
|
p = mandoc_calloc(1, sizeof(struct tbl_node)); |
p = mandoc_calloc(1, sizeof(struct tbl_node)); |
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->data = data; |
p->parse = parse; |
p->msg = msg; |
|
p->part = TBL_PART_OPTS; |
p->part = TBL_PART_OPTS; |
p->opts.tab = '\t'; |
p->opts.tab = '\t'; |
p->opts.linesize = 12; |
p->opts.linesize = 12; |
Line 122 tbl_free(struct tbl_node *p) |
|
Line 123 tbl_free(struct tbl_node *p) |
|
void |
void |
tbl_restart(int line, int pos, struct tbl_node *tbl) |
tbl_restart(int line, int pos, struct tbl_node *tbl) |
{ |
{ |
|
if (TBL_PART_CDATA == tbl->part) |
|
mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, |
|
tbl->line, tbl->pos, NULL); |
|
|
tbl->part = TBL_PART_LAYOUT; |
tbl->part = TBL_PART_LAYOUT; |
tbl->line = line; |
tbl->line = line; |
tbl->pos = pos; |
tbl->pos = pos; |
|
|
if (NULL == tbl->first_span || NULL == tbl->first_span->first) |
if (NULL == tbl->first_span || NULL == tbl->first_span->first) |
TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos); |
mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, |
|
tbl->line, tbl->pos, NULL); |
} |
} |
|
|
const struct tbl_span * |
const struct tbl_span * |
tbl_span(const struct tbl_node *tbl) |
tbl_span(struct tbl_node *tbl) |
{ |
{ |
|
struct tbl_span *span; |
|
|
assert(tbl); |
assert(tbl); |
return(tbl->last_span); |
span = tbl->current_span ? tbl->current_span->next |
|
: tbl->first_span; |
|
if (span) |
|
tbl->current_span = span; |
|
return(span); |
} |
} |
|
|
void |
void |
Line 144 tbl_end(struct tbl_node *tbl) |
|
Line 154 tbl_end(struct tbl_node *tbl) |
|
{ |
{ |
|
|
if (NULL == tbl->first_span || NULL == tbl->first_span->first) |
if (NULL == tbl->first_span || NULL == tbl->first_span->first) |
TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos); |
mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, |
|
tbl->line, tbl->pos, NULL); |
|
|
if (tbl->last_span) |
if (tbl->last_span) |
tbl->last_span->flags |= TBL_SPAN_LAST; |
tbl->last_span->flags |= TBL_SPAN_LAST; |
|
|
|
if (TBL_PART_CDATA == tbl->part) |
|
mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, |
|
tbl->line, tbl->pos, NULL); |
} |
} |
|
|