version 1.272, 2014/07/29 13:58:18 |
version 1.277, 2014/08/17 08:37:11 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
Line 476 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 474 print_mdoc_head(struct termp *p, const void *arg) |
|
meta->vol, meta->arch); |
meta->vol, meta->arch); |
vollen = term_strlen(p, volume); |
vollen = term_strlen(p, volume); |
|
|
mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec); |
if (NULL == meta->msec) |
|
title = mandoc_strdup(meta->title); |
|
else |
|
mandoc_asprintf(&title, "%s(%s)", |
|
meta->title, meta->msec); |
titlen = term_strlen(p, title); |
titlen = term_strlen(p, title); |
|
|
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
Line 804 termp_it_pre(DECL_ARGS) |
|
Line 806 termp_it_pre(DECL_ARGS) |
|
* the "overstep" effect in term_flushln() and treat |
* the "overstep" effect in term_flushln() and treat |
* this as a `-ohang' list instead. |
* this as a `-ohang' list instead. |
*/ |
*/ |
if (n->next->child && |
if (NULL != n->next && |
(MDOC_Bl == n->next->child->tok || |
NULL != n->next->child && |
MDOC_Bd == n->next->child->tok)) |
(MDOC_Bl == n->next->child->tok || |
|
MDOC_Bd == n->next->child->tok)) |
break; |
break; |
|
|
p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; |
p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG; |
Line 860 termp_it_pre(DECL_ARGS) |
|
Line 863 termp_it_pre(DECL_ARGS) |
|
* don't want to recalculate rmargin and offsets when |
* don't want to recalculate rmargin and offsets when |
* using `Bd' or `Bl' within `-hang' overstep lists. |
* using `Bd' or `Bl' within `-hang' overstep lists. |
*/ |
*/ |
if (MDOC_HEAD == n->type && n->next->child && |
if (MDOC_HEAD == n->type && |
(MDOC_Bl == n->next->child->tok || |
NULL != n->next && |
MDOC_Bd == n->next->child->tok)) |
NULL != n->next->child && |
|
(MDOC_Bl == n->next->child->tok || |
|
MDOC_Bd == n->next->child->tok)) |
break; |
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_bullet: |
case LIST_bullet: |
Line 1025 termp_nm_pre(DECL_ARGS) |
|
Line 1030 termp_nm_pre(DECL_ARGS) |
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
synopsis_pre(p, n->parent); |
synopsis_pre(p, n->parent); |
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
if (MDOC_HEAD == n->type && |
|
NULL != n->next && NULL != n->next->child) { |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND; |
p->trailspace = 1; |
p->trailspace = 1; |
p->rmargin = p->offset + term_len(p, 1); |
p->rmargin = p->offset + term_len(p, 1); |
Line 1053 termp_nm_post(DECL_ARGS) |
|
Line 1059 termp_nm_post(DECL_ARGS) |
|
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
} else if (MDOC_HEAD == n->type && n->next->child) { |
} else if (MDOC_HEAD == n->type && |
|
NULL != n->next && NULL != n->next->child) { |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); |
p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG); |
p->trailspace = 0; |
p->trailspace = 0; |
Line 1167 termp_rv_pre(DECL_ARGS) |
|
Line 1174 termp_rv_pre(DECL_ARGS) |
|
int nchild; |
int nchild; |
|
|
term_newln(p); |
term_newln(p); |
term_word(p, "The"); |
|
|
|
nchild = n->nchild; |
nchild = n->nchild; |
for (n = n->child; n; n = n->next) { |
if (nchild > 0) { |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, "The"); |
term_word(p, n->string); |
|
term_fontpop(p); |
|
|
|
p->flags |= TERMP_NOSPACE; |
for (n = n->child; n; n = n->next) { |
term_word(p, "()"); |
term_fontpush(p, TERMFONT_BOLD); |
|
term_word(p, n->string); |
|
term_fontpop(p); |
|
|
if (nchild > 2 && n->next) { |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ","); |
term_word(p, "()"); |
|
|
|
if (n->next == NULL) |
|
continue; |
|
|
|
if (nchild > 2) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ","); |
|
} |
|
if (n->next->next == NULL) |
|
term_word(p, "and"); |
} |
} |
|
|
if (n->next && NULL == n->next->next) |
if (nchild > 1) |
term_word(p, "and"); |
term_word(p, "functions return"); |
} |
else |
|
term_word(p, "function returns"); |
|
|
if (nchild > 1) |
term_word(p, "the value\\~0 if successful;"); |
term_word(p, "functions return"); |
} else |
else |
term_word(p, "Upon successful completion," |
term_word(p, "function returns"); |
" the value\\~0 is returned;"); |
|
|
term_word(p, "the value 0 if successful; otherwise the " |
term_word(p, "otherwise the value\\~\\-1 is returned" |
"value -1 is returned and the global variable"); |
" and the global variable"); |
|
|
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
term_word(p, "errno"); |
term_word(p, "errno"); |
Line 1229 termp_ex_pre(DECL_ARGS) |
|
Line 1245 termp_ex_pre(DECL_ARGS) |
|
} |
} |
|
|
if (nchild > 1) |
if (nchild > 1) |
term_word(p, "utilities exit"); |
term_word(p, "utilities exit\\~0"); |
else |
else |
term_word(p, "utility exits"); |
term_word(p, "utility exits\\~0"); |
|
|
term_word(p, "0 on success, and >0 if an error occurs."); |
term_word(p, "on success, and\\~>0 if an error occurs."); |
|
|
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
return(0); |
return(0); |
Line 1761 termp_ss_pre(DECL_ARGS) |
|
Line 1777 termp_ss_pre(DECL_ARGS) |
|
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
p->offset = term_len(p, (p->defindent+1)/2); |
p->offset = term_len(p, (p->defindent+1)/2); |
break; |
break; |
|
case MDOC_BODY: |
|
p->offset = term_len(p, p->defindent); |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
termp_ss_post(DECL_ARGS) |
termp_ss_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_HEAD == n->type) |
if (n->type == MDOC_HEAD || n->type == MDOC_BODY) |
term_newln(p); |
term_newln(p); |
} |
} |
|
|