diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2008-12-28 21:25:09 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2008-12-28 21:25:09 +0000 |
| commit | f39e2b991210f1443885f9363e390ca32e234309 (patch) | |
| tree | 636ffaa24545219f2760d5539c968e14c25ef4ef /mdoc.c | |
| parent | f560c8171b3c347f410aed692168d4bd5ee00513 (diff) | |
| download | mandoc-f39e2b991210f1443885f9363e390ca32e234309.tar.gz mandoc-f39e2b991210f1443885f9363e390ca32e234309.tar.zst mandoc-f39e2b991210f1443885f9363e390ca32e234309.zip | |
*** empty log message ***
Diffstat (limited to 'mdoc.c')
| -rw-r--r-- | mdoc.c | 35 |
1 files changed, 14 insertions, 21 deletions
@@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.5 2008/12/28 00:34:20 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.6 2008/12/28 21:25:09 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se> * @@ -90,8 +90,8 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { macro_scoped_implicit, 0 }, /* Sh */ { macro_scoped_implicit, 0 }, /* Ss */ { macro_text, 0 }, /* Pp */ - { NULL, 0 }, /* D1 */ - { NULL, 0 }, /* Dl */ + { macro_scoped_line, 0 }, /* D1 */ + { macro_scoped_line, 0 }, /* Dl */ { macro_scoped_explicit, MDOC_EXPLICIT }, /* Bd */ { macro_scoped_explicit, 0 }, /* Ed */ { macro_scoped_explicit, MDOC_EXPLICIT }, /* Bl */ @@ -166,7 +166,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { NULL, 0 }, /* Qc */ { NULL, 0 }, /* Ql */ { NULL, 0 }, /* Qo */ - { NULL, 0 }, /* Qq */ + { macro_scoped_pline, MDOC_CALLABLE }, /* Qq */ { NULL, 0 }, /* Re */ { NULL, 0 }, /* Rs */ { NULL, 0 }, /* Sc */ @@ -336,6 +336,8 @@ mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf) return(0); } + /*mdoc_msg(mdoc, ppos, "calling `%s'", mdoc_macronames[tok]);*/ + return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf)); } @@ -407,35 +409,25 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct mdoc_node *p) switch (p->type) { case (MDOC_BODY): - switch (mdoc->last->type) { - case (MDOC_BLOCK): - p->parent = mdoc->last; - mdoc->last->child = p; - act = "child"; - break; - case (MDOC_HEAD): - p->parent = mdoc->last->parent; - mdoc->last->next = p; - p->prev = mdoc->last; - act = "sibling"; - break; - default: - abort(); - /* NOTREACHED */ - } + p->parent = mdoc->last->parent; + mdoc->last->next = p; + p->prev = mdoc->last; + act = "sibling"; break; + case (MDOC_HEAD): assert(mdoc->last->type == MDOC_BLOCK); p->parent = mdoc->last; mdoc->last->child = p; act = "child"; break; + default: switch (mdoc->last->type) { case (MDOC_BODY): /* FALLTHROUGH */ case (MDOC_HEAD): - p->parent = mdoc->last->parent; + p->parent = mdoc->last; mdoc->last->child = p; act = "child"; break; @@ -455,6 +447,7 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct mdoc_node *p) } +/* FIXME: deprecate paramsz, params. */ void mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, size_t paramsz, const char **params) |