version 1.100, 2010/06/27 16:36:22 |
version 1.113, 2010/07/21 09:08:26 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* 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 "libmandoc.h" |
#include "libmandoc.h" |
|
|
/* FIXME: .Bl -diag can't have non-text children in HEAD. */ |
/* FIXME: .Bl -diag can't have non-text children in HEAD. */ |
/* TODO: ignoring Pp (it's superfluous in some invocations). */ |
|
|
|
#define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n |
#define PRE_ARGS struct mdoc *mdoc, struct mdoc_node *n |
#define POST_ARGS struct mdoc *mdoc |
#define POST_ARGS struct mdoc *mdoc |
Line 107 static int pre_ss(PRE_ARGS); |
|
Line 106 static int pre_ss(PRE_ARGS); |
|
|
|
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_at[] = { post_at, NULL }; |
static v_post posts_at[] = { post_at, NULL }; |
static v_post posts_bd[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bd_bk[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
Line 154 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 153 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_notext }, /* Pp */ |
{ NULL, posts_notext }, /* Pp */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_wline }, /* Dl */ |
{ pres_d1, posts_wline }, /* Dl */ |
{ pres_bd, posts_bd }, /* Bd */ |
{ pres_bd, posts_bd_bk }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
Line 245 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 244 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Fc */ |
{ NULL, NULL }, /* Fc */ |
{ NULL, NULL }, /* Oo */ |
{ NULL, NULL }, /* Oo */ |
{ NULL, NULL }, /* Oc */ |
{ NULL, NULL }, /* Oc */ |
{ NULL, posts_wline }, /* Bk */ |
{ NULL, posts_bd_bk }, /* Bk */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, posts_eoln }, /* Bt */ |
{ NULL, posts_eoln }, /* Bt */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
Line 454 check_argv(struct mdoc *m, struct mdoc_node *n, struct |
|
Line 453 check_argv(struct mdoc *m, struct mdoc_node *n, struct |
|
|
|
|
|
static int |
static int |
check_text(struct mdoc *mdoc, int line, int pos, char *p) |
check_text(struct mdoc *m, int ln, int pos, char *p) |
{ |
{ |
int c; |
int c; |
|
size_t sz; |
|
|
for ( ; *p; p++, pos++) { |
for ( ; *p; p++, pos++) { |
|
sz = strcspn(p, "\t\\"); |
|
p += (int)sz; |
|
|
|
if ('\0' == *p) |
|
break; |
|
|
|
pos += (int)sz; |
|
|
if ('\t' == *p) { |
if ('\t' == *p) { |
if ( ! (MDOC_LITERAL & mdoc->flags)) |
if (MDOC_LITERAL & m->flags) |
if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR)) |
continue; |
return(0); |
if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB)) |
} else if ( ! isprint((u_char)*p) && ASCII_HYPH != *p) |
continue; |
if ( ! mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADCHAR)) |
return(0); |
return(0); |
} |
|
|
if ('\\' != *p) |
/* Check the special character. */ |
continue; |
|
|
|
c = mandoc_special(p); |
c = mandoc_special(p); |
if (c) { |
if (c) { |
Line 477 check_text(struct mdoc *mdoc, int line, int pos, char |
|
Line 484 check_text(struct mdoc *mdoc, int line, int pos, char |
|
continue; |
continue; |
} |
} |
|
|
c = mdoc_pmsg(mdoc, line, pos, MANDOCERR_BADESCAPE); |
c = mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE); |
if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags) && ! c) |
if ( ! (MDOC_IGN_ESCAPE & m->pflags) && ! c) |
return(c); |
return(c); |
} |
} |
|
|
Line 486 check_text(struct mdoc *mdoc, int line, int pos, char |
|
Line 493 check_text(struct mdoc *mdoc, int line, int pos, char |
|
} |
} |
|
|
|
|
|
|
|
|
static int |
static int |
check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) |
check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) |
{ |
{ |
Line 505 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
Line 510 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type |
|
} |
} |
|
|
|
|
|
|
static int |
static int |
pre_display(PRE_ARGS) |
pre_display(PRE_ARGS) |
{ |
{ |
Line 532 pre_display(PRE_ARGS) |
|
Line 536 pre_display(PRE_ARGS) |
|
static int |
static int |
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
int i, comp, dup; |
int i, comp, dup; |
const char *offs, *width; |
const char *offs, *width; |
enum mdoc_list lt; |
enum mdoc_list lt; |
|
struct mdoc_node *np; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
assert(n->parent); |
if (ENDBODY_NOT != n->end) { |
assert(MDOC_BLOCK == n->parent->type); |
assert(n->pending); |
assert(MDOC_Bl == n->parent->tok); |
np = n->pending->parent; |
assert(LIST__NONE != n->parent->data.Bl.type); |
} else |
memcpy(&n->data.Bl, &n->parent->data.Bl, |
np = n->parent; |
sizeof(struct mdoc_bl)); |
|
|
assert(np); |
|
assert(MDOC_BLOCK == np->type); |
|
assert(MDOC_Bl == np->tok); |
|
assert(np->data.Bl); |
|
n->data.Bl = np->data.Bl; |
return(1); |
return(1); |
} |
} |
|
|
Line 552 pre_bl(PRE_ARGS) |
|
Line 562 pre_bl(PRE_ARGS) |
|
* ones. If we find no list type, we default to LIST_item. |
* ones. If we find no list type, we default to LIST_item. |
*/ |
*/ |
|
|
assert(LIST__NONE == n->data.Bl.type); |
assert(NULL == n->data.Bl); |
|
n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
Line 596 pre_bl(PRE_ARGS) |
|
Line 607 pre_bl(PRE_ARGS) |
|
break; |
break; |
/* Set list arguments. */ |
/* Set list arguments. */ |
case (MDOC_Compact): |
case (MDOC_Compact): |
dup = n->data.Bl.comp; |
dup = n->data.Bl->comp; |
comp = 1; |
comp = 1; |
break; |
break; |
case (MDOC_Width): |
case (MDOC_Width): |
dup = (NULL != n->data.Bl.width); |
dup = (NULL != n->data.Bl->width); |
width = n->args->argv[i].value[0]; |
width = n->args->argv[i].value[0]; |
break; |
break; |
case (MDOC_Offset): |
case (MDOC_Offset): |
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bl.offs); |
dup = (NULL != n->data.Bl->offs); |
break; |
break; |
} |
} |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
return(0); |
return(0); |
break; |
break; |
|
default: |
|
continue; |
} |
} |
|
|
/* Check: duplicate auxiliary arguments. */ |
/* Check: duplicate auxiliary arguments. */ |
Line 621 pre_bl(PRE_ARGS) |
|
Line 634 pre_bl(PRE_ARGS) |
|
return(0); |
return(0); |
|
|
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bl.comp = comp; |
n->data.Bl->comp = comp; |
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bl.offs = offs; |
n->data.Bl->offs = offs; |
if (width && ! dup) |
if (width && ! dup) |
n->data.Bl.width = width; |
n->data.Bl->width = width; |
|
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != lt && n->data.Bl.type != LIST__NONE) |
if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP)) |
return(0); |
return(0); |
|
|
/* Assign list type. */ |
/* Assign list type. */ |
|
|
if (LIST__NONE != lt && n->data.Bl.type == LIST__NONE) |
if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) { |
n->data.Bl.type = lt; |
n->data.Bl->type = lt; |
|
/* Set column information, too. */ |
|
if (LIST_column == lt) { |
|
n->data.Bl->ncols = |
|
n->args->argv[i].sz; |
|
n->data.Bl->cols = (const char **) |
|
n->args->argv[i].value; |
|
} |
|
} |
|
|
/* The list type should come first. */ |
/* The list type should come first. */ |
|
|
if (n->data.Bl.type == LIST__NONE) |
if (n->data.Bl->type == LIST__NONE) |
if (n->data.Bl.width || |
if (n->data.Bl->width || |
n->data.Bl.offs || |
n->data.Bl->offs || |
n->data.Bl.comp) |
n->data.Bl->comp) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST)) |
return(0); |
return(0); |
|
|
Line 652 pre_bl(PRE_ARGS) |
|
Line 673 pre_bl(PRE_ARGS) |
|
|
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->data.Bl.type) { |
if (LIST__NONE == n->data.Bl->type) { |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE)) |
return(0); |
return(0); |
n->data.Bl.type = LIST_item; |
n->data.Bl->type = LIST_item; |
} |
} |
|
|
/* |
/* |
Line 664 pre_bl(PRE_ARGS) |
|
Line 685 pre_bl(PRE_ARGS) |
|
* and must also be warned. |
* and must also be warned. |
*/ |
*/ |
|
|
switch (n->data.Bl.type) { |
switch (n->data.Bl->type) { |
case (LIST_tag): |
case (LIST_tag): |
if (n->data.Bl.width) |
if (n->data.Bl->width) |
break; |
break; |
if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG)) |
break; |
break; |
Line 680 pre_bl(PRE_ARGS) |
|
Line 701 pre_bl(PRE_ARGS) |
|
case (LIST_inset): |
case (LIST_inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_item): |
case (LIST_item): |
if (NULL == n->data.Bl.width) |
if (NULL == n->data.Bl->width) |
break; |
break; |
if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG)) |
if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG)) |
break; |
break; |
Line 696 pre_bl(PRE_ARGS) |
|
Line 717 pre_bl(PRE_ARGS) |
|
static int |
static int |
pre_bd(PRE_ARGS) |
pre_bd(PRE_ARGS) |
{ |
{ |
int i, dup, comp; |
int i, dup, comp; |
enum mdoc_disp dt; |
enum mdoc_disp dt; |
const char *offs; |
const char *offs; |
|
struct mdoc_node *np; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
assert(n->parent); |
if (ENDBODY_NOT != n->end) { |
assert(MDOC_BLOCK == n->parent->type); |
assert(n->pending); |
assert(MDOC_Bd == n->parent->tok); |
np = n->pending->parent; |
assert(DISP__NONE != n->parent->data.Bd.type); |
} else |
memcpy(&n->data.Bd, &n->parent->data.Bd, |
np = n->parent; |
sizeof(struct mdoc_bd)); |
|
|
assert(np); |
|
assert(MDOC_BLOCK == np->type); |
|
assert(MDOC_Bd == np->tok); |
|
assert(np->data.Bd); |
|
n->data.Bd = np->data.Bd; |
return(1); |
return(1); |
} |
} |
|
|
assert(DISP__NONE == n->data.Bd.type); |
assert(NULL == n->data.Bd); |
|
n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd)); |
|
|
/* LINTED */ |
/* LINTED */ |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
Line 741 pre_bd(PRE_ARGS) |
|
Line 769 pre_bd(PRE_ARGS) |
|
/* NB: this can be empty! */ |
/* NB: this can be empty! */ |
if (n->args->argv[i].sz) { |
if (n->args->argv[i].sz) { |
offs = n->args->argv[i].value[0]; |
offs = n->args->argv[i].value[0]; |
dup = (NULL != n->data.Bd.offs); |
dup = (NULL != n->data.Bd->offs); |
break; |
break; |
} |
} |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV)) |
Line 749 pre_bd(PRE_ARGS) |
|
Line 777 pre_bd(PRE_ARGS) |
|
break; |
break; |
case (MDOC_Compact): |
case (MDOC_Compact): |
comp = 1; |
comp = 1; |
dup = n->data.Bd.comp; |
dup = n->data.Bd->comp; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 764 pre_bd(PRE_ARGS) |
|
Line 792 pre_bd(PRE_ARGS) |
|
/* Make our auxiliary assignments. */ |
/* Make our auxiliary assignments. */ |
|
|
if (offs && ! dup) |
if (offs && ! dup) |
n->data.Bd.offs = offs; |
n->data.Bd->offs = offs; |
if (comp && ! dup) |
if (comp && ! dup) |
n->data.Bd.comp = comp; |
n->data.Bd->comp = comp; |
|
|
/* Check whether a type has already been assigned. */ |
/* Check whether a type has already been assigned. */ |
|
|
if (DISP__NONE != dt && n->data.Bd.type != DISP__NONE) |
if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP)) |
return(0); |
return(0); |
|
|
/* Make our type assignment. */ |
/* Make our type assignment. */ |
|
|
if (DISP__NONE != dt && n->data.Bd.type == DISP__NONE) |
if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE) |
n->data.Bd.type = dt; |
n->data.Bd->type = dt; |
} |
} |
|
|
if (DISP__NONE == n->data.Bd.type) { |
if (DISP__NONE == n->data.Bd->type) { |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE)) |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE)) |
return(0); |
return(0); |
n->data.Bd.type = DISP_ragged; |
n->data.Bd->type = DISP_ragged; |
} |
} |
|
|
return(1); |
return(1); |
|
|
pre_an(PRE_ARGS) |
pre_an(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == n->args || 1 == n->args->argc) |
if (NULL == n->args) |
return(1); |
return(1); |
mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT, |
if (n->args->argc > 1) |
n->line, n->pos, |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGCOUNT)) |
"line arguments == 1 (have %d)", |
return(0); |
n->args->argc); |
|
return(0); |
if (MDOC_Split == n->args->argv[0].arg) |
|
n->data.An.auth = AUTH_split; |
|
else if (MDOC_Nosplit == n->args->argv[0].arg) |
|
n->data.An.auth = AUTH_nosplit; |
|
else |
|
abort(); |
|
|
|
return(1); |
} |
} |
|
|
|
|
Line 912 pre_dd(PRE_ARGS) |
|
Line 947 pre_dd(PRE_ARGS) |
|
static int |
static int |
post_bf(POST_ARGS) |
post_bf(POST_ARGS) |
{ |
{ |
char *p; |
struct mdoc_node *np; |
struct mdoc_node *head; |
enum mdocargt arg; |
|
|
if (MDOC_BLOCK != mdoc->last->type) |
/* |
return(1); |
* Unlike other data pointers, these are "housed" by the HEAD |
|
* element, which contains the goods. |
|
*/ |
|
|
head = mdoc->last->head; |
if (MDOC_HEAD != mdoc->last->type) { |
|
if (ENDBODY_NOT != mdoc->last->end) { |
|
assert(mdoc->last->pending); |
|
np = mdoc->last->pending->parent->head; |
|
} else if (MDOC_BLOCK != mdoc->last->type) { |
|
np = mdoc->last->parent->head; |
|
} else |
|
np = mdoc->last->head; |
|
|
if (mdoc->last->args && head->child) { |
assert(np); |
/* FIXME: this should provide a default. */ |
assert(MDOC_HEAD == np->type); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SYNTARGVCOUNT); |
assert(MDOC_Bf == np->tok); |
return(0); |
assert(np->data.Bf); |
} else if (mdoc->last->args) |
mdoc->last->data.Bf = np->data.Bf; |
return(1); |
return(1); |
|
} |
|
|
if (NULL == head->child || MDOC_TEXT != head->child->type) { |
np = mdoc->last; |
/* FIXME: this should provide a default. */ |
assert(MDOC_BLOCK == np->parent->type); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SYNTARGVCOUNT); |
assert(MDOC_Bf == np->parent->tok); |
|
np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf)); |
|
|
|
/* |
|
* Cannot have both argument and parameter. |
|
* If neither is specified, let it through with a warning. |
|
*/ |
|
|
|
if (np->parent->args && np->child) { |
|
mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT); |
return(0); |
return(0); |
|
} else if (NULL == np->parent->args && NULL == np->child) |
|
return(mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE)); |
|
|
|
/* Extract argument into data. */ |
|
|
|
if (np->parent->args) { |
|
arg = np->parent->args->argv[0].arg; |
|
if (MDOC_Emphasis == arg) |
|
np->data.Bf->font = FONT_Em; |
|
else if (MDOC_Literal == arg) |
|
np->data.Bf->font = FONT_Li; |
|
else if (MDOC_Symbolic == arg) |
|
np->data.Bf->font = FONT_Sy; |
|
else |
|
abort(); |
|
return(1); |
} |
} |
|
|
p = head->child->string; |
/* Extract parameter into data. */ |
|
|
if (0 == strcmp(p, "Em")) |
if (0 == strcmp(np->child->string, "Em")) |
return(1); |
np->data.Bf->font = FONT_Em; |
else if (0 == strcmp(p, "Li")) |
else if (0 == strcmp(np->child->string, "Li")) |
return(1); |
np->data.Bf->font = FONT_Li; |
else if (0 == strcmp(p, "Sy")) |
else if (0 == strcmp(np->child->string, "Sy")) |
return(1); |
np->data.Bf->font = FONT_Sy; |
|
else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE)) |
|
return(0); |
|
|
mdoc_nmsg(mdoc, head, MANDOCERR_FONTTYPE); |
return(1); |
return(0); |
|
} |
} |
|
|
|
|
Line 1021 post_at(POST_ARGS) |
|
Line 1092 post_at(POST_ARGS) |
|
static int |
static int |
post_an(POST_ARGS) |
post_an(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *np; |
|
|
if (mdoc->last->args) { |
np = mdoc->last; |
if (NULL == mdoc->last->child) |
if (AUTH__NONE != np->data.An.auth && np->child) |
return(1); |
return(mdoc_nmsg(mdoc, np, MANDOCERR_ARGCOUNT)); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGCOUNT)); |
if (AUTH__NONE != np->data.An.auth || np->child) |
} |
|
|
|
if (mdoc->last->child) |
|
return(1); |
return(1); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)); |
return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS)); |
} |
} |
|
|
|
|
Line 1046 post_it(POST_ARGS) |
|
Line 1115 post_it(POST_ARGS) |
|
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
n = mdoc->last->parent->parent; |
lt = n->data.Bl.type; |
assert(n->data.Bl); |
|
lt = n->data.Bl->type; |
|
|
if (LIST__NONE == lt) { |
if (LIST__NONE == lt) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
Line 1071 post_it(POST_ARGS) |
|
Line 1141 post_it(POST_ARGS) |
|
if (NULL == mdoc->last->head->child) |
if (NULL == mdoc->last->head->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
return(0); |
return(0); |
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
|
break; |
break; |
case (LIST_bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1082 post_it(POST_ARGS) |
|
Line 1149 post_it(POST_ARGS) |
|
case (LIST_enum): |
case (LIST_enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_hyphen): |
case (LIST_hyphen): |
|
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_item): |
case (LIST_item): |
if (mdoc->last->head->child) |
if (mdoc->last->head->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST)) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST)) |
return(0); |
return(0); |
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
|
break; |
break; |
case (LIST_column): |
case (LIST_column): |
cols = -1; |
cols = (int)n->data.Bl->ncols; |
for (i = 0; i < (int)n->args->argc; i++) |
|
if (MDOC_Column == n->args->argv[i].arg) { |
|
cols = (int)n->args->argv[i].sz; |
|
break; |
|
} |
|
|
|
assert(-1 != cols); |
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == mdoc->last->head->child); |
|
|
if (NULL == mdoc->last->body->child) |
if (NULL == mdoc->last->body->child) |
Line 1138 post_bl_head(POST_ARGS) |
|
Line 1199 post_bl_head(POST_ARGS) |
|
assert(mdoc->last->parent); |
assert(mdoc->last->parent); |
n = mdoc->last->parent; |
n = mdoc->last->parent; |
|
|
if (LIST_column == n->data.Bl.type) { |
if (LIST_column == n->data.Bl->type) { |
for (i = 0; i < (int)n->args->argc; i++) |
if (n->data.Bl->ncols && mdoc->last->nchild) { |
if (MDOC_Column == n->args->argv[i].arg) |
|
break; |
|
assert(i < (int)n->args->argc); |
|
|
|
if (n->args->argv[i].sz && mdoc->last->nchild) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS); |
mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS); |
return(0); |
return(0); |
} |
} |