diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-25 23:25:53 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-25 23:25:53 +0000 |
| commit | c9e80a007b446796d182d2e716659df296725f5a (patch) | |
| tree | 6a2b05142154f0326df913e6b3b8ca548e1d9eba /mdoc_validate.c | |
| parent | 97ea338f64152142a27642d6ee10c3a0ae63be1e (diff) | |
| download | mandoc-c9e80a007b446796d182d2e716659df296725f5a.tar.gz mandoc-c9e80a007b446796d182d2e716659df296725f5a.tar.zst mandoc-c9e80a007b446796d182d2e716659df296725f5a.zip | |
Implement schwarze@'s much more elegant version of my %T/%J fix.
Diffstat (limited to 'mdoc_validate.c')
| -rw-r--r-- | mdoc_validate.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/mdoc_validate.c b/mdoc_validate.c index b359df7e..aa167454 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.148 2010/12/25 13:50:37 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.149 2010/12/25 23:25:53 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -1649,19 +1649,8 @@ post_rs(POST_ARGS) { struct mdoc_node *nn, *next, *prev; int i, j; - int *tj; -#define RS_JOURNAL (1 << 0) -#define RS_TITLE (1 << 1) - /* Mark whether we're carrying both a %T and %J. */ - - tj = &mdoc->last->norm->Rs.titlejournal; - - if (MDOC_BLOCK == mdoc->last->type) { - if ( ! (RS_JOURNAL & *tj && RS_TITLE & *tj)) - *tj = 0; - return(1); - } else if (MDOC_BODY != mdoc->last->type) + if (MDOC_BODY != mdoc->last->type) return(1); /* @@ -1677,10 +1666,8 @@ post_rs(POST_ARGS) break; if (i < RSORD_MAX) { - if (MDOC__T == rsord[i]) - *tj |= RS_TITLE; - else if (MDOC__J == rsord[i]) - *tj |= RS_JOURNAL; + if (MDOC__J == rsord[i]) + mdoc->last->norm->Rs.child_J = nn; next = nn->next; continue; } |