version 1.233, 2014/11/28 06:27:05 |
version 1.239, 2015/04/02 21:36:50 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2015 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 <string.h> |
#include <string.h> |
#include <time.h> |
#include <time.h> |
|
|
#include "mdoc.h" |
|
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
#include "libmdoc.h" |
#include "mandoc.h" |
|
#include "roff.h" |
|
#include "mdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
#include "libmdoc.h" |
|
|
const char *const __mdoc_macronames[MDOC_MAX + 1] = { |
const char *const __mdoc_macronames[MDOC_MAX + 1] = { |
"Ap", "Dd", "Dt", "Os", |
"Ap", "Dd", "Dt", "Os", |
Line 88 static void mdoc_node_unlink(struct mdoc *, |
|
Line 89 static void mdoc_node_unlink(struct mdoc *, |
|
static void mdoc_free1(struct mdoc *); |
static void mdoc_free1(struct mdoc *); |
static void mdoc_alloc1(struct mdoc *); |
static void mdoc_alloc1(struct mdoc *); |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
static struct mdoc_node *node_alloc(struct mdoc *, int, int, |
enum mdoct, enum mdoc_type); |
enum mdoct, enum roff_type); |
static void node_append(struct mdoc *, struct mdoc_node *); |
static void node_append(struct mdoc *, struct mdoc_node *); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
Line 138 mdoc_alloc1(struct mdoc *mdoc) |
|
Line 139 mdoc_alloc1(struct mdoc *mdoc) |
|
mdoc->lastnamed = mdoc->lastsec = SEC_NONE; |
mdoc->lastnamed = mdoc->lastsec = SEC_NONE; |
mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node)); |
mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node)); |
mdoc->first = mdoc->last; |
mdoc->first = mdoc->last; |
mdoc->last->type = MDOC_ROOT; |
mdoc->last->type = ROFFT_ROOT; |
mdoc->last->tok = MDOC_MAX; |
mdoc->last->tok = MDOC_MAX; |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
} |
} |
Line 190 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
Line 191 mdoc_alloc(struct roff *roff, struct mparse *parse, |
|
return(p); |
return(p); |
} |
} |
|
|
int |
void |
mdoc_endparse(struct mdoc *mdoc) |
mdoc_endparse(struct mdoc *mdoc) |
{ |
{ |
|
|
mdoc_macroend(mdoc); |
mdoc_macroend(mdoc); |
return(1); |
|
} |
} |
|
|
void |
void |
Line 203 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
Line 203 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN); |
n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, ROFFT_EQN); |
n->eqn = ep; |
n->eqn = ep; |
if (ep->ln > mdoc->last->line) |
if (ep->ln > mdoc->last->line) |
n->flags |= MDOC_LINE; |
n->flags |= MDOC_LINE; |
Line 216 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
Line 216 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL); |
n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, ROFFT_TBL); |
n->span = sp; |
n->span = sp; |
node_append(mdoc, n); |
node_append(mdoc, n); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) |
mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs) |
{ |
{ |
|
|
if (mdoc->last->type != MDOC_EQN || ln > mdoc->last->line) |
if (mdoc->last->type != ROFFT_EQN || ln > mdoc->last->line) |
mdoc->flags |= MDOC_NEWLINE; |
mdoc->flags |= MDOC_NEWLINE; |
|
|
/* |
/* |
Line 282 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 282 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
|
|
assert(mdoc->last); |
assert(mdoc->last); |
assert(mdoc->first); |
assert(mdoc->first); |
assert(MDOC_ROOT != p->type); |
assert(p->type != ROFFT_ROOT); |
|
|
switch (mdoc->next) { |
switch (mdoc->next) { |
case MDOC_NEXT_SIBLING: |
case MDOC_NEXT_SIBLING: |
Line 307 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 307 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
*/ |
*/ |
|
|
switch (p->type) { |
switch (p->type) { |
case MDOC_BODY: |
case ROFFT_BODY: |
if (ENDBODY_NOT != p->end) |
if (ENDBODY_NOT != p->end) |
break; |
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_TAIL: |
case ROFFT_TAIL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_HEAD: |
case ROFFT_HEAD: |
p->norm = p->parent->norm; |
p->norm = p->parent->norm; |
break; |
break; |
default: |
default: |
Line 323 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 323 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
mdoc_valid_pre(mdoc, p); |
mdoc_valid_pre(mdoc, p); |
|
|
switch (p->type) { |
switch (p->type) { |
case MDOC_HEAD: |
case ROFFT_HEAD: |
assert(MDOC_BLOCK == p->parent->type); |
assert(p->parent->type == ROFFT_BLOCK); |
p->parent->head = p; |
p->parent->head = p; |
break; |
break; |
case MDOC_TAIL: |
case ROFFT_TAIL: |
assert(MDOC_BLOCK == p->parent->type); |
assert(p->parent->type == ROFFT_BLOCK); |
p->parent->tail = p; |
p->parent->tail = p; |
break; |
break; |
case MDOC_BODY: |
case ROFFT_BODY: |
if (p->end) |
if (p->end) |
break; |
break; |
assert(MDOC_BLOCK == p->parent->type); |
assert(p->parent->type == ROFFT_BLOCK); |
p->parent->body = p; |
p->parent->body = p; |
break; |
break; |
default: |
default: |
Line 344 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 344 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
mdoc->last = p; |
mdoc->last = p; |
|
|
switch (p->type) { |
switch (p->type) { |
case MDOC_TBL: |
case ROFFT_TBL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_TEXT: |
case ROFFT_TEXT: |
mdoc_valid_post(mdoc); |
mdoc_valid_post(mdoc); |
break; |
break; |
default: |
default: |
Line 356 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 356 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
|
|
static struct mdoc_node * |
static struct mdoc_node * |
node_alloc(struct mdoc *mdoc, int line, int pos, |
node_alloc(struct mdoc *mdoc, int line, int pos, |
enum mdoct tok, enum mdoc_type type) |
enum mdoct tok, enum roff_type type) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
Line 364 node_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 364 node_alloc(struct mdoc *mdoc, int line, int pos, |
|
p->sec = mdoc->lastsec; |
p->sec = mdoc->lastsec; |
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->lastline = line; |
|
p->tok = tok; |
p->tok = tok; |
p->type = type; |
p->type = type; |
|
|
Line 386 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 385 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); |
p = node_alloc(mdoc, line, pos, tok, ROFFT_TAIL); |
node_append(mdoc, p); |
node_append(mdoc, p); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
} |
} |
Line 398 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 397 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
|
|
assert(mdoc->first); |
assert(mdoc->first); |
assert(mdoc->last); |
assert(mdoc->last); |
p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); |
p = node_alloc(mdoc, line, pos, tok, ROFFT_HEAD); |
node_append(mdoc, p); |
node_append(mdoc, p); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(p); |
return(p); |
Line 409 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 408 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); |
p = node_alloc(mdoc, line, pos, tok, ROFFT_BODY); |
node_append(mdoc, p); |
node_append(mdoc, p); |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
return(p); |
return(p); |
} |
} |
|
|
void |
struct mdoc_node * |
mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, |
mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, |
struct mdoc_node *body, enum mdoc_endbody end) |
struct mdoc_node *body, enum mdoc_endbody end) |
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); |
body->flags |= MDOC_ENDED; |
p->pending = body; |
body->parent->flags |= MDOC_ENDED; |
|
p = node_alloc(mdoc, line, pos, tok, ROFFT_BODY); |
|
p->body = body; |
p->norm = body->norm; |
p->norm = body->norm; |
p->end = end; |
p->end = end; |
node_append(mdoc, p); |
node_append(mdoc, p); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
return(p); |
} |
} |
|
|
struct mdoc_node * |
struct mdoc_node * |
Line 435 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 437 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_BLOCK); |
p = node_alloc(mdoc, line, pos, tok, ROFFT_BLOCK); |
p->args = args; |
p->args = args; |
if (p->args) |
if (p->args) |
(args->refcnt)++; |
(args->refcnt)++; |
Line 466 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 468 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
{ |
{ |
struct mdoc_node *p; |
struct mdoc_node *p; |
|
|
p = node_alloc(mdoc, line, pos, tok, MDOC_ELEM); |
p = node_alloc(mdoc, line, pos, tok, ROFFT_ELEM); |
p->args = args; |
p->args = args; |
if (p->args) |
if (p->args) |
(args->refcnt)++; |
(args->refcnt)++; |
Line 487 mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 489 mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT); |
n = node_alloc(mdoc, line, pos, MDOC_MAX, ROFFT_TEXT); |
n->string = roff_strdup(mdoc->roff, p); |
n->string = roff_strdup(mdoc->roff, p); |
node_append(mdoc, n); |
node_append(mdoc, n); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
|
|
mdoc_node_free(struct mdoc_node *p) |
mdoc_node_free(struct mdoc_node *p) |
{ |
{ |
|
|
if (MDOC_BLOCK == p->type || MDOC_ELEM == p->type) |
if (p->type == ROFFT_BLOCK || p->type == ROFFT_ELEM) |
free(p->norm); |
free(p->norm); |
if (p->string) |
if (p->string) |
free(p->string); |
free(p->string); |
Line 595 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 597 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
|
|
/* |
/* |
* Divert directly to list processing if we're encountering a |
* Divert directly to list processing if we're encountering a |
* columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry |
* columnar ROFFT_BLOCK with or without a prior ROFFT_BLOCK entry |
* (a MDOC_BODY means it's already open, in which case we should |
* (a ROFFT_BODY means it's already open, in which case we should |
* process within its context in the normal way). |
* process within its context in the normal way). |
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (n->tok == MDOC_Bl && n->type == ROFFT_BODY && |
LIST_column == n->norm->Bl.type) { |
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); |
mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); |
return(1); |
return(1); |
} |
} |
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (n->tok == MDOC_It && n->type == ROFFT_BLOCK && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
Line 777 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 779 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
* context around the parsed macro. |
* context around the parsed macro. |
*/ |
*/ |
|
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (n->tok == MDOC_Bl && n->type == ROFFT_BODY && |
LIST_column == n->norm->Bl.type) { |
n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) { |
mdoc->flags |= MDOC_FREECOL; |
mdoc->flags |= MDOC_FREECOL; |
mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); |
mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); |
return(1); |
return(1); |
Line 790 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 792 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
* then open an `It' block context around the parsed macro. |
* then open an `It' block context around the parsed macro. |
*/ |
*/ |
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (n->tok == MDOC_It && n->type == ROFFT_BLOCK && |
NULL != n->parent && |
NULL != n->parent && |
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->norm->Bl.type) { |
LIST_column == n->parent->norm->Bl.type) { |
Line 864 mdoc_deroff(char **dest, const struct mdoc_node *n) |
|
Line 866 mdoc_deroff(char **dest, const struct mdoc_node *n) |
|
char *cp; |
char *cp; |
size_t sz; |
size_t sz; |
|
|
if (MDOC_TEXT != n->type) { |
if (n->type != ROFFT_TEXT) { |
for (n = n->child; n; n = n->next) |
for (n = n->child; n; n = n->next) |
mdoc_deroff(dest, n); |
mdoc_deroff(dest, n); |
return; |
return; |