version 1.96, 2011/01/12 10:43:22 |
version 1.108, 2011/04/30 22:14:42 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
|
|
#include "out.h" |
#include "out.h" |
#include "man.h" |
#include "man.h" |
#include "term.h" |
#include "term.h" |
#include "chars.h" |
|
#include "main.h" |
#include "main.h" |
|
|
#define INDENT 7 |
#define INDENT 7 |
Line 126 static const struct termact termacts[MAN_MAX] = { |
|
Line 125 static const struct termact termacts[MAN_MAX] = { |
|
{ pre_I, NULL, 0 }, /* I */ |
{ pre_I, NULL, 0 }, /* I */ |
{ pre_alternate, NULL, 0 }, /* IR */ |
{ pre_alternate, NULL, 0 }, /* IR */ |
{ pre_alternate, NULL, 0 }, /* RI */ |
{ pre_alternate, NULL, 0 }, /* RI */ |
{ NULL, NULL, MAN_NOTEXT }, /* na */ |
{ pre_ign, NULL, MAN_NOTEXT }, /* na */ |
{ pre_sp, NULL, MAN_NOTEXT }, /* sp */ |
{ pre_sp, NULL, MAN_NOTEXT }, /* sp */ |
{ pre_literal, NULL, 0 }, /* nf */ |
{ pre_literal, NULL, 0 }, /* nf */ |
{ pre_literal, NULL, 0 }, /* fi */ |
{ pre_literal, NULL, 0 }, /* fi */ |
Line 159 terminal_man(void *arg, const struct man *man) |
|
Line 158 terminal_man(void *arg, const struct man *man) |
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
switch (p->enc) { |
case (TERMENC_ASCII): |
case (TERMENC_ASCII): |
p->symtab = chars_init(CHARS_ASCII); |
p->symtab = mchars_alloc(); |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
Line 212 print_bvspace(struct termp *p, const struct man_node * |
|
Line 211 print_bvspace(struct termp *p, const struct man_node * |
|
{ |
{ |
term_newln(p); |
term_newln(p); |
|
|
|
if (n->body && n->body->child && MAN_TBL == n->body->child->type) |
|
return; |
|
|
if (NULL == n->prev) |
if (NULL == n->prev) |
return; |
return; |
|
|
Line 255 pre_literal(DECL_ARGS) |
|
Line 257 pre_literal(DECL_ARGS) |
|
else |
else |
mt->fl &= ~MANT_LITERAL; |
mt->fl &= ~MANT_LITERAL; |
|
|
return(1); |
return(0); |
} |
} |
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
Line 855 print_man_node(DECL_ARGS) |
|
Line 857 print_man_node(DECL_ARGS) |
|
size_t rm, rmax; |
size_t rm, rmax; |
int c; |
int c; |
|
|
c = 1; |
|
|
|
switch (n->type) { |
switch (n->type) { |
case(MAN_TEXT): |
case(MAN_TEXT): |
|
/* |
|
* If we have a blank line, output a vertical space. |
|
* If we have a space as the first character, break |
|
* before printing the line's data. |
|
*/ |
if ('\0' == *n->string) { |
if ('\0' == *n->string) { |
term_vspace(p); |
term_vspace(p); |
break; |
return; |
} |
} else if (' ' == *n->string && MAN_LINE & n->flags) |
|
|
if (' ' == *n->string && MAN_LINE & n->flags) |
|
term_newln(p); |
term_newln(p); |
|
|
term_word(p, n->string); |
term_word(p, n->string); |
|
|
/* FIXME: this means that macro lines are munged! */ |
/* |
|
* If we're in a literal context, make sure that words |
if (MANT_LITERAL & mt->fl) { |
* togehter on the same line stay together. This is a |
|
* POST-printing call, so we check the NEXT word. Since |
|
* -man doesn't have nested macros, we don't need to be |
|
* more specific than this. |
|
*/ |
|
if (MANT_LITERAL & mt->fl && |
|
(NULL == n->next || |
|
n->next->line > n->line)) { |
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
Line 882 print_man_node(DECL_ARGS) |
|
Line 892 print_man_node(DECL_ARGS) |
|
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
} |
} |
|
|
break; |
if (MAN_EOS & n->flags) |
|
p->flags |= TERMP_SENTENCE; |
|
return; |
|
case (MAN_EQN): |
|
term_word(p, n->eqn->data); |
|
return; |
case (MAN_TBL): |
case (MAN_TBL): |
|
/* |
|
* Tables are preceded by a newline. Then process a |
|
* table line, which will cause line termination, |
|
*/ |
if (TBL_SPAN_FIRST & n->span->flags) |
if (TBL_SPAN_FIRST & n->span->flags) |
term_newln(p); |
term_newln(p); |
term_tbl(p, n->span); |
term_tbl(p, n->span); |
break; |
return; |
default: |
default: |
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
|
term_fontrepl(p, TERMFONT_NONE); |
|
if (termacts[n->tok].pre) |
|
c = (*termacts[n->tok].pre)(p, mt, n, m); |
|
break; |
break; |
} |
} |
|
|
|
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
|
term_fontrepl(p, TERMFONT_NONE); |
|
|
|
c = 1; |
|
if (termacts[n->tok].pre) |
|
c = (*termacts[n->tok].pre)(p, mt, n, m); |
|
|
if (c && n->child) |
if (c && n->child) |
print_man_nodelist(p, mt, n->child, m); |
print_man_nodelist(p, mt, n->child, m); |
|
|
switch (n->type) { |
if (termacts[n->tok].post) |
case (MAN_TEXT): |
(*termacts[n->tok].post)(p, mt, n, m); |
/* FALLTHROUGH */ |
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
case (MAN_TBL): |
term_fontrepl(p, TERMFONT_NONE); |
break; |
|
default: |
|
if (termacts[n->tok].post) |
|
(*termacts[n->tok].post)(p, mt, n, m); |
|
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
|
term_fontrepl(p, TERMFONT_NONE); |
|
break; |
|
} |
|
|
|
if (MAN_EOS & n->flags) |
if (MAN_EOS & n->flags) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
Line 931 print_man_nodelist(DECL_ARGS) |
|
Line 945 print_man_nodelist(DECL_ARGS) |
|
static void |
static void |
print_man_foot(struct termp *p, const void *arg) |
print_man_foot(struct termp *p, const void *arg) |
{ |
{ |
char buf[DATESIZ]; |
|
const struct man_meta *meta; |
const struct man_meta *meta; |
|
|
meta = (const struct man_meta *)arg; |
meta = (const struct man_meta *)arg; |
|
|
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
|
|
if (meta->rawdate) |
|
strlcpy(buf, meta->rawdate, DATESIZ); |
|
else |
|
time2a(meta->date, buf, DATESIZ); |
|
|
|
term_vspace(p); |
term_vspace(p); |
term_vspace(p); |
term_vspace(p); |
term_vspace(p); |
term_vspace(p); |
|
|
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->rmargin = p->maxrmargin - term_strlen(p, buf); |
p->rmargin = p->maxrmargin - term_strlen(p, meta->date); |
p->offset = 0; |
p->offset = 0; |
|
|
/* term_strlen() can return zero. */ |
/* term_strlen() can return zero. */ |
Line 966 print_man_foot(struct termp *p, const void *arg) |
|
Line 974 print_man_foot(struct termp *p, const void *arg) |
|
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
|
|
term_word(p, buf); |
term_word(p, meta->date); |
term_flushln(p); |
term_flushln(p); |
} |
} |
|
|