version 1.192, 2013/08/05 14:36:01 |
version 1.195, 2013/10/06 13:32:46 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011, 2012, 2013 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 |
Line 888 pre_sh(PRE_ARGS) |
|
Line 888 pre_sh(PRE_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
roff_regunset(mdoc->roff, REG_nS); |
|
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
} |
} |
|
|
Line 1592 post_bl_head(POST_ARGS) |
|
Line 1590 post_bl_head(POST_ARGS) |
|
static int |
static int |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *nparent, *nprev; /* of the Bl block */ |
|
struct mdoc_node *nblock, *nbody; /* of the Bl */ |
|
struct mdoc_node *nchild, *nnext; /* of the Bl body */ |
|
|
if (MDOC_HEAD == mdoc->last->type) |
nbody = mdoc->last; |
return(post_bl_head(mdoc)); |
switch (nbody->type) { |
if (MDOC_BLOCK == mdoc->last->type) |
case (MDOC_BLOCK): |
return(post_bl_block(mdoc)); |
return(post_bl_block(mdoc)); |
if (MDOC_BODY != mdoc->last->type) |
case (MDOC_HEAD): |
|
return(post_bl_head(mdoc)); |
|
case (MDOC_BODY): |
|
break; |
|
default: |
return(1); |
return(1); |
|
} |
|
|
for (n = mdoc->last->child; n; n = n->next) { |
nchild = nbody->child; |
switch (n->tok) { |
while (NULL != nchild) { |
case (MDOC_Lp): |
if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) { |
/* FALLTHROUGH */ |
nchild = nchild->next; |
case (MDOC_Pp): |
|
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
|
/* FALLTHROUGH */ |
|
case (MDOC_It): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sm): |
|
continue; |
continue; |
default: |
|
break; |
|
} |
} |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
mdoc_nmsg(mdoc, nchild, MANDOCERR_CHILD); |
return(0); |
|
|
/* |
|
* Move the node out of the Bl block. |
|
* First, collect all required node pointers. |
|
*/ |
|
|
|
nblock = nbody->parent; |
|
nprev = nblock->prev; |
|
nparent = nblock->parent; |
|
nnext = nchild->next; |
|
|
|
/* |
|
* Unlink this child. |
|
*/ |
|
|
|
assert(NULL == nchild->prev); |
|
if (0 == --nbody->nchild) { |
|
nbody->child = NULL; |
|
nbody->last = NULL; |
|
assert(NULL == nnext); |
|
} else { |
|
nbody->child = nnext; |
|
nnext->prev = NULL; |
|
} |
|
|
|
/* |
|
* Relink this child. |
|
*/ |
|
|
|
nchild->parent = nparent; |
|
nchild->prev = nprev; |
|
nchild->next = nblock; |
|
|
|
nblock->prev = nchild; |
|
nparent->nchild++; |
|
if (NULL == nprev) |
|
nparent->child = nchild; |
|
else |
|
nprev->next = nchild; |
|
|
|
nchild = nnext; |
} |
} |
|
|
return(1); |
return(1); |
Line 1905 post_sh_head(POST_ARGS) |
|
Line 1942 post_sh_head(POST_ARGS) |
|
|
|
/* The SYNOPSIS gets special attention in other areas. */ |
/* The SYNOPSIS gets special attention in other areas. */ |
|
|
if (SEC_SYNOPSIS == sec) |
if (SEC_SYNOPSIS == sec) { |
|
roff_setreg(mdoc->roff, "nS", 1); |
mdoc->flags |= MDOC_SYNOPSIS; |
mdoc->flags |= MDOC_SYNOPSIS; |
else |
} else { |
|
roff_setreg(mdoc->roff, "nS", 0); |
mdoc->flags &= ~MDOC_SYNOPSIS; |
mdoc->flags &= ~MDOC_SYNOPSIS; |
|
} |
|
|
/* Mark our last section. */ |
/* Mark our last section. */ |
|
|
Line 1964 post_sh_head(POST_ARGS) |
|
Line 2004 post_sh_head(POST_ARGS) |
|
break; |
break; |
if (*mdoc->meta.msec == '9') |
if (*mdoc->meta.msec == '9') |
break; |
break; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC); |
mandoc_msg(MANDOCERR_SECMSEC, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, buf); |
break; |
break; |
default: |
default: |
break; |
break; |