summaryrefslogtreecommitdiffstats
path: root/man_term.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-10-26 04:09:45 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-10-26 04:09:45 +0000
commit19a32a4c143965883bb87247ee3c503bd159f61f (patch)
treec6c65190ec32a4b4c439bfee45ffedaf53c0f319 /man_term.c
parent135785a8d163dcf9961552ae584586e0c1c9e973 (diff)
downloadmandoc-19a32a4c143965883bb87247ee3c503bd159f61f.tar.gz
Full `%U' support.
`Lk' display fixed. Renamed arg2xxxx as a2xxxx for consistency. Renamed print_foot to print_man_foot for consistency. Removed default printing of `~' when `Lk' not provided (not sure where I got that from).
Diffstat (limited to 'man_term.c')
-rw-r--r--man_term.c58
1 files changed, 29 insertions, 29 deletions
diff --git a/man_term.c b/man_term.c
index 4dc1d858..40d3d087 100644
--- a/man_term.c
+++ b/man_term.c
@@ -69,14 +69,14 @@ extern size_t strlcpy(char *, const char *, size_t);
extern size_t strlcat(char *, const char *, size_t);
#endif
-static int arg2width(const struct man_node *);
-static int arg2height(const struct man_node *);
+static int a2width(const struct man_node *);
+static int a2height(const struct man_node *);
-static void print_head(struct termp *,
+static void print_man_head(struct termp *,
const struct man_meta *);
-static void print_body(DECL_ARGS);
-static void print_node(DECL_ARGS);
-static void print_foot(struct termp *,
+static void print_man_body(DECL_ARGS);
+static void print_man_node(DECL_ARGS);
+static void print_man_foot(struct termp *,
const struct man_meta *);
static void print_bvspace(struct termp *,
const struct man_node *);
@@ -171,7 +171,7 @@ terminal_man(void *arg, const struct man *man)
n = man_node(man);
m = man_meta(man);
- print_head(p, m);
+ print_man_head(p, m);
p->flags |= TERMP_NOSPACE;
mt.fl = 0;
@@ -179,13 +179,13 @@ terminal_man(void *arg, const struct man *man)
mt.offset = INDENT;
if (n->child)
- print_body(p, &mt, n->child, m);
- print_foot(p, m);
+ print_man_body(p, &mt, n->child, m);
+ print_man_foot(p, m);
}
static int
-arg2height(const struct man_node *n)
+a2height(const struct man_node *n)
{
struct roffsu su;
@@ -199,7 +199,7 @@ arg2height(const struct man_node *n)
static int
-arg2width(const struct man_node *n)
+a2width(const struct man_node *n)
{
struct roffsu su;
@@ -310,7 +310,7 @@ pre_IR(DECL_ARGS)
p->under++;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
if ( ! (i % 2))
p->under--;
}
@@ -334,7 +334,7 @@ pre_RB(DECL_ARGS)
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
if (i % 2 && MAN_RB == n->tok)
p->bold--;
@@ -357,7 +357,7 @@ pre_RI(DECL_ARGS)
p->under++;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
if ( ! (i % 2))
p->under--;
}
@@ -384,7 +384,7 @@ pre_BI(DECL_ARGS)
if (i)
p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
if (i % 2 && MAN_BI == n->tok)
p->under--;
@@ -424,7 +424,7 @@ pre_sp(DECL_ARGS)
{
int i, len;
- len = n->child ? arg2height(n->child) : 1;
+ len = n->child ? a2height(n->child) : 1;
if (0 == len)
term_newln(p);
@@ -471,7 +471,7 @@ pre_HP(DECL_ARGS)
/* Calculate offset. */
if (NULL != (nn = n->parent->head->child))
- if ((ival = arg2width(nn)) >= 0)
+ if ((ival = a2width(nn)) >= 0)
len = (size_t)ival;
if (0 == len)
@@ -561,7 +561,7 @@ pre_IP(DECL_ARGS)
if (NULL != (nn = nn->next)) {
for ( ; nn->next; nn = nn->next)
/* Do nothing. */ ;
- if ((ival = arg2width(nn)) >= 0)
+ if ((ival = a2width(nn)) >= 0)
len = (size_t)ival;
}
@@ -581,7 +581,7 @@ pre_IP(DECL_ARGS)
/* Don't print the length value. */
for (nn = n->child; nn->next; nn = nn->next)
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
return(0);
case (MAN_BODY):
p->offset = mt->offset + len;
@@ -648,7 +648,7 @@ pre_TP(DECL_ARGS)
if (NULL != (nn = n->parent->head->child))
if (NULL != nn->next)
- if ((ival = arg2width(nn)) >= 0)
+ if ((ival = a2width(nn)) >= 0)
len = (size_t)ival;
switch (n->type) {
@@ -663,7 +663,7 @@ pre_TP(DECL_ARGS)
/* Don't print same-line elements. */
for (nn = n->child; nn; nn = nn->next)
if (nn->line > n->line)
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
if (ival >= 0)
mt->lmargin = (size_t)ival;
@@ -826,7 +826,7 @@ pre_RS(DECL_ARGS)
return(1);
}
- if ((ival = arg2width(nn)) < 0)
+ if ((ival = a2width(nn)) < 0)
return(1);
mt->offset = INDENT + (size_t)ival;
@@ -854,7 +854,7 @@ post_RS(DECL_ARGS)
static void
-print_node(DECL_ARGS)
+print_man_node(DECL_ARGS)
{
int c, sz;
@@ -890,7 +890,7 @@ print_node(DECL_ARGS)
}
if (c && n->child)
- print_body(p, mt, n->child, m);
+ print_man_body(p, mt, n->child, m);
if (MAN_TEXT != n->type)
if (termacts[n->tok].post)
@@ -899,18 +899,18 @@ print_node(DECL_ARGS)
static void
-print_body(DECL_ARGS)
+print_man_body(DECL_ARGS)
{
- print_node(p, mt, n, m);
+ print_man_node(p, mt, n, m);
if ( ! n->next)
return;
- print_body(p, mt, n->next, m);
+ print_man_body(p, mt, n->next, m);
}
static void
-print_foot(struct termp *p, const struct man_meta *meta)
+print_man_foot(struct termp *p, const struct man_meta *meta)
{
char buf[DATESIZ];
@@ -939,7 +939,7 @@ print_foot(struct termp *p, const struct man_meta *meta)
static void
-print_head(struct termp *p, const struct man_meta *meta)
+print_man_head(struct termp *p, const struct man_meta *meta)
{
char *buf, *title;