version 1.8, 2009/04/12 19:45:26 |
version 1.12, 2009/06/12 09:18:00 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* |
* |
* 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 89 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 89 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_exp_close, MDOC_EXPLICIT }, /* El */ |
{ blk_exp_close, MDOC_EXPLICIT }, /* El */ |
{ blk_full, MDOC_PARSED }, /* It */ |
{ blk_full, MDOC_PARSED }, /* It */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_PARSED }, /* An */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line_eoln, MDOC_CALLABLE }, /* Cd */ |
{ in_line_eoln, MDOC_CALLABLE }, /* Cd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
Line 101 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 101 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_eoln, 0 }, /* Fd */ |
{ in_line_eoln, 0 }, /* Fd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ |
{ in_line, MDOC_PARSED }, /* Ft */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ |
{ in_line_eoln, 0 }, /* In */ |
{ in_line_eoln, 0 }, /* In */ /* FIXME: historic usage! */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ |
{ in_line_eoln, 0 }, /* Nd */ |
{ in_line_eoln, 0 }, /* Nd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ |
Line 145 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 145 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line, MDOC_PARSED }, /* Ms */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
Line 183 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 183 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_eoln, 0 }, /* Lb */ |
{ in_line_eoln, 0 }, /* Lb */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */ |
{ in_line, 0 }, /* Lp */ |
{ in_line, 0 }, /* Lp */ |
{ in_line, MDOC_PARSED }, /* Lk */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ |
{ in_line, MDOC_PARSED }, /* Mt */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */ |
Line 813 in_line(MACRO_PROT_ARGS) |
|
Line 813 in_line(MACRO_PROT_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Fl): |
case (MDOC_Fl): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (MDOC_Lk): |
|
/* FALLTHROUGH */ |
case (MDOC_Ar): |
case (MDOC_Ar): |
nc = 1; |
nc = 1; |
break; |
break; |
Line 868 in_line(MACRO_PROT_ARGS) |
|
Line 870 in_line(MACRO_PROT_ARGS) |
|
if ( ! mdoc_elem_alloc(mdoc, line, ppos, |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, |
tok, arg)) |
tok, arg)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
if ( ! rew_last(mdoc, mdoc->last)) |
|
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
Line 923 in_line(MACRO_PROT_ARGS) |
|
Line 926 in_line(MACRO_PROT_ARGS) |
|
c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
if (0 == c) |
if (0 == c) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
if ( ! rew_last(mdoc, mdoc->last)) |
|
return(0); |
} else if ( ! nc && 0 == cnt) { |
} else if ( ! nc && 0 == cnt) { |
mdoc_argv_free(arg); |
mdoc_argv_free(arg); |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |