diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-11-29 15:45:15 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-11-29 15:45:15 +0000 |
commit | 3bf902d15d0372b6a9e98f91fe4d29f271932d79 (patch) | |
tree | 1e8f21d2a6ae80420a5e89af2cf16c49e89bddc2 /mdoc_action.c | |
parent | 5c8d5a8cd342f90796637f556e972777198be148 (diff) | |
download | mandoc-3bf902d15d0372b6a9e98f91fe4d29f271932d79.tar.gz |
Remove left-over rsord[] in mdoc_actions.c.
Remove MANDOCERR_BADLIB (not used).
Moved `St' handling from mdoc_action.c into mdoc_validate.c.
Moved relevant MDOC_LITERAL macros (`Dl', `Bd' subtypes) from
mdoc_action.c into mdoc_validate.c.
Diffstat (limited to 'mdoc_action.c')
-rw-r--r-- | mdoc_action.c | 91 |
1 files changed, 3 insertions, 88 deletions
diff --git a/mdoc_action.c b/mdoc_action.c index b2e69fc0..19b5b5f9 100644 --- a/mdoc_action.c +++ b/mdoc_action.c @@ -56,18 +56,13 @@ static int post_bl_head(POST_ARGS); static int post_bl_tagwidth(POST_ARGS); static int post_bl_width(POST_ARGS); static int post_dd(POST_ARGS); -static int post_display(POST_ARGS); static int post_dt(POST_ARGS); static int post_nm(POST_ARGS); static int post_os(POST_ARGS); static int post_pa(POST_ARGS); static int post_prol(POST_ARGS); -static int post_st(POST_ARGS); static int post_std(POST_ARGS); -static int pre_bd(PRE_ARGS); -static int pre_dl(PRE_ARGS); - static const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ap */ { NULL, post_dd }, /* Dd */ @@ -77,8 +72,8 @@ static const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ss */ { NULL, NULL }, /* Pp */ { NULL, NULL }, /* D1 */ - { pre_dl, post_display }, /* Dl */ - { pre_bd, post_display }, /* Bd */ + { NULL, NULL }, /* Dl */ + { NULL, NULL }, /* Bd */ { NULL, NULL }, /* Ed */ { NULL, post_bl }, /* Bl */ { NULL, NULL }, /* El */ @@ -106,7 +101,7 @@ static const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ot */ { NULL, post_pa }, /* Pa */ { NULL, post_std }, /* Rv */ - { NULL, post_st }, /* St */ + { NULL, NULL }, /* St */ { NULL, NULL }, /* Va */ { NULL, NULL }, /* Vt */ { NULL, NULL }, /* Xr */ @@ -193,25 +188,6 @@ static const struct actions mdoc_actions[MDOC_MAX] = { { NULL, NULL }, /* Ta */ }; -#define RSORD_MAX 14 - -static const enum mdoct rsord[RSORD_MAX] = { - MDOC__A, - MDOC__T, - MDOC__B, - MDOC__I, - MDOC__J, - MDOC__R, - MDOC__N, - MDOC__V, - MDOC__P, - MDOC__Q, - MDOC__D, - MDOC__O, - MDOC__C, - MDOC__U -}; - int mdoc_action_pre(struct mdoc *m, struct mdoc_node *n) @@ -331,27 +307,6 @@ post_nm(POST_ARGS) } /* - * Substitute the value of `St' for the corresponding formatted string. - * We're guaranteed that this exists (it's been verified during the - * validation phase). - */ -/* ARGSUSED */ -static int -post_st(POST_ARGS) -{ - const char *p; - - assert(MDOC_TEXT == n->child->type); - p = mdoc_a2st(n->child->string); - if (p != NULL) { - free(n->child->string); - n->child->string = mandoc_strdup(p); - } - return(1); -} - - -/* * Parse out the contents of `Dt'. See in-line documentation for how we * handle the various fields of this macro. */ @@ -763,43 +718,3 @@ post_prol(POST_ARGS) m->flags |= MDOC_PBODY; return(1); } - - -/* - * Trigger a literal context. - */ -static int -pre_dl(PRE_ARGS) -{ - - if (MDOC_BODY == n->type) - m->flags |= MDOC_LITERAL; - return(1); -} - - -static int -pre_bd(PRE_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - - assert(n->data.Bd); - if (DISP_literal == n->data.Bd->type) - m->flags |= MDOC_LITERAL; - if (DISP_unfilled == n->data.Bd->type) - m->flags |= MDOC_LITERAL; - - return(1); -} - - -static int -post_display(POST_ARGS) -{ - - if (MDOC_BODY == n->type) - m->flags &= ~MDOC_LITERAL; - return(1); -} |