summaryrefslogtreecommitdiffstats
path: root/mdoc_term.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-06-12 12:10:55 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-06-12 12:10:55 +0000
commitb2b5082e5673e0127d8316e54a5d2ad084a62864 (patch)
tree065fff7700eb20616226134fedbfec463842ed39 /mdoc_term.c
parent9182860daa80b4a3002521ca4fdbd780d009b616 (diff)
downloadmandoc-b2b5082e5673e0127d8316e54a5d2ad084a62864.tar.gz
Moved `Bl -compact' into cached data. This allowed the removal of
scanning the argv list in print_bvspace(), and thus the parent pointer.
Diffstat (limited to 'mdoc_term.c')
-rw-r--r--mdoc_term.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/mdoc_term.c b/mdoc_term.c
index 31c2e51e..1ac28db5 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -61,7 +61,6 @@ static int arg_getattrs(const int *, int *, size_t,
const struct mdoc_node *);
static int arg_getattr(int, const struct mdoc_node *);
static void print_bvspace(struct termp *,
- const struct mdoc_node *,
const struct mdoc_node *);
static void print_mdoc_node(DECL_ARGS);
static void print_mdoc_nodelist(DECL_ARGS);
@@ -564,15 +563,15 @@ arg_getattrs(const int *keys, int *vals,
* too.
*/
static void
-print_bvspace(struct termp *p,
- const struct mdoc_node *bl,
- const struct mdoc_node *n)
+print_bvspace(struct termp *p, const struct mdoc_node *n)
{
const struct mdoc_node *nn;
- /* FIXME: MDOC_Bd == bl->tok && bl->data.Bd.comp */
term_newln(p);
- if (arg_hasattr(MDOC_Compact, bl))
+
+ if (MDOC_Bl == n->tok && n->data.Bl.comp)
+ return;
+ if (MDOC_Bd == n->tok && n->data.Bd.comp)
return;
/* Do not vspace directly after Ss/Sh. */
@@ -591,13 +590,13 @@ print_bvspace(struct termp *p,
/* A `-column' does not assert vspace within the list. */
- if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type)
+ if (MDOC_Bl == n->tok && LIST_column == n->data.Bl.type)
if (n->prev && MDOC_It == n->prev->tok)
return;
/* A `-diag' without body does not vspace. */
- if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type)
+ if (MDOC_Bl == n->tok && LIST_diag == n->data.Bl.type)
if (n->prev && MDOC_It == n->prev->tok) {
assert(n->prev->body);
if (NULL == n->prev->body->child)
@@ -646,7 +645,7 @@ termp_it_pre(DECL_ARGS)
enum mdoc_list type;
if (MDOC_BLOCK == n->type) {
- print_bvspace(p, n->parent->parent, n);
+ print_bvspace(p, n);
return(1);
}
@@ -1607,7 +1606,7 @@ termp_bd_pre(DECL_ARGS)
const struct mdoc_node *nn;
if (MDOC_BLOCK == n->type) {
- print_bvspace(p, n, n);
+ print_bvspace(p, n);
return(1);
} else if (MDOC_HEAD == n->type)
return(0);