- /* $Id: mdocterm.c,v 1.5 2009/02/23 12:45:19 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.13 2009/02/25 17:02:47 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
#include <stdlib.h>
#include <string.h>
-#ifdef __linux__
+#ifndef __OpenBSD__
#include <time.h>
#endif
#include "mmain.h"
#include "term.h"
+#ifdef __NetBSD__
+#define xisspace(x) isspace((int)(x))
+#else
+#define xisspace(x) isspace((x))
+#endif
+
enum termstyle {
STYLE_CLEAR,
STYLE_BOLD,
};
static void body(struct termp *,
+ struct termpair *,
const struct mdoc_meta *,
const struct mdoc_node *);
static void header(struct termp *,
static void pword(struct termp *, const char *, size_t);
static void pescape(struct termp *,
const char *, size_t *, size_t);
+static void nescape(struct termp *,
+ const char *, size_t);
static void chara(struct termp *, char);
static void stringa(struct termp *, const char *);
static void style(struct termp *, enum termstyle);
err(1, "malloc");
header(&termp, mdoc_meta(mdoc));
- body(&termp, mdoc_meta(mdoc), mdoc_node(mdoc));
+ body(&termp, NULL, mdoc_meta(mdoc), mdoc_node(mdoc));
footer(&termp, mdoc_meta(mdoc));
free(termp.buf);
* Count up visible word characters. Control sequences
* (starting with the CSI) aren't counted.
*/
- assert( ! isspace(p->buf[i]));
+ assert( ! xisspace(p->buf[i]));
/* LINTED */
for (j = i, vsz = 0; j < p->col; j++) {
- if (isspace(p->buf[j]))
+ if (xisspace(p->buf[j]))
break;
else if (27 == p->buf[j]) {
assert(j + 4 <= p->col);
for (j = 0; j < p->offset; j++)
putchar(' ');
vis = 0;
- } else if (vis + vsz >= maxvis) {
+ } else if (vis + vsz >= maxvis)
/* FIXME */
errx(1, "word breaks right margin");
- }
/*
* Write out the word and a trailing space. Omit the
*/
for ( ; i < p->col; i++) {
- if (isspace(p->buf[i]))
+ if (xisspace(p->buf[i]))
break;
putchar(p->buf[i]);
}
*/
if (p->flags & TERMP_NOBREAK) {
- for ( ; vis <= maxvis; vis++)
+ for ( ; vis < maxvis; vis++)
putchar(' ');
} else
putchar('\n');
* vertical space.
*/
p->flags |= TERMP_NOSPACE;
- if (0 == p->col)
+ if (0 == p->col) {
+ p->flags &= ~TERMP_NOLPAD;
return;
+ }
flushln(p);
+ p->flags &= ~TERMP_NOLPAD;
}
}
+static void
+nescape(struct termp *p, const char *word, size_t len)
+{
+
+ switch (len) {
+ case (2):
+ if ('r' == word[0] && 'B' == word[1])
+ chara(p, ']');
+ else if ('l' == word[0] && 'B' == word[1])
+ chara(p, '[');
+ else if ('<' == word[0] && '-' == word[1])
+ stringa(p, "<-");
+ else if ('-' == word[0] && '>' == word[1])
+ stringa(p, "->");
+ else if ('l' == word[0] && 'q' == word[1])
+ chara(p, '\"');
+ else if ('r' == word[0] && 'q' == word[1])
+ chara(p, '\"');
+ else if ('b' == word[0] && 'u' == word[1])
+ chara(p, 'o');
+ break;
+ default:
+ break;
+ }
+}
+
+
static void
pescape(struct termp *p, const char *word, size_t *i, size_t len)
{
+ size_t j;
(*i)++;
assert(*i < len);
/* Two-character escapes. */
(*i)++;
assert(*i + 1 < len);
-
- if ('r' == word[*i] && 'B' == word[*i + 1])
- chara(p, ']');
- else if ('l' == word[*i] && 'B' == word[*i + 1])
- chara(p, '[');
- else if ('<' == word[*i] && '-' == word[*i + 1])
- stringa(p, "<-");
- else if ('-' == word[*i] && '>' == word[*i + 1])
- stringa(p, "->");
-
+ nescape(p, &word[*i], 2);
(*i)++;
return;
/* FALLTHROUGH */
case ('-'):
/* FALLTHROUGH */
+ case (' '):
+ /* FALLTHROUGH */
case ('.'):
chara(p, word[*i]);
default:
}
return;
}
- /* n-character escapes. */
+
+ (*i)++;
+ for (j = 0; word[*i] && ']' != word[*i]; (*i)++, j++)
+ /* Loop... */ ;
+
+ nescape(p, &word[*i - j], j);
}
! (p->flags & TERMP_LITERAL))
chara(p, ' ');
- p->flags &= ~TERMP_NOSPACE;
+ if ( ! (p->flags & TERMP_NONOSPACE))
+ p->flags &= ~TERMP_NOSPACE;
if (p->flags & TERMP_BOLD)
style(p, STYLE_BOLD);
/* LINTED */
for (j = i = 0; i < len; i++) {
- if ( ! isspace(word[i])) {
+ if ( ! xisspace(word[i])) {
j++;
continue;
}
static void
-body(struct termp *p, const struct mdoc_meta *meta,
+body(struct termp *p, struct termpair *ppair,
+ const struct mdoc_meta *meta,
const struct mdoc_node *node)
{
int dochild;
+ struct termpair pair;
/* Pre-processing. */
dochild = 1;
+ pair.ppair = ppair;
+ pair.type = 0;
+ pair.offset = pair.rmargin = 0;
+ pair.flag = 0;
+ pair.count = 0;
if (MDOC_TEXT != node->type) {
if (termacts[node->tok].pre)
- if ( ! (*termacts[node->tok].pre)(p, meta, node))
+ if ( ! (*termacts[node->tok].pre)(p, &pair, meta, node))
dochild = 0;
} else /* MDOC_TEXT == node->type */
word(p, node->data.text.string);
/* Children. */
+ if (TERMPAIR_FLAG & pair.type)
+ p->flags |= pair.flag;
+
if (dochild && node->child)
- body(p, meta, node->child);
+ body(p, &pair, meta, node->child);
+
+ if (TERMPAIR_FLAG & pair.type)
+ p->flags &= ~pair.flag;
/* Post-processing. */
if (MDOC_TEXT != node->type)
if (termacts[node->tok].post)
- (*termacts[node->tok].post)(p, meta, node);
+ (*termacts[node->tok].post)(p, &pair, meta, node);
/* Siblings. */
if (node->next)
- body(p, meta, node->next);
+ body(p, ppair, meta, node->next);
}
tm = localtime(&meta->date);
-#ifdef __linux__
- if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
+#ifdef __OpenBSD__
if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
+#else
+ if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
#endif
err(1, "strftime");
header(struct termp *p, const struct mdoc_meta *meta)
{
char *buf, *title;
- const char *pp, *msec;
- size_t ssz, tsz, ttsz, i;;
+ const char *pp;
if (NULL == (buf = malloc(p->rmargin)))
err(1, "malloc");
pp = mdoc_msec2a(MSEC_local);
break;
}
- assert(pp);
-
- tsz = strlcpy(buf, pp, p->rmargin);
- assert(tsz < p->rmargin);
-
- if ((pp = mdoc_arch2a(meta->arch))) {
- tsz = strlcat(buf, " (", p->rmargin);
- assert(tsz < p->rmargin);
- tsz = strlcat(buf, pp, p->rmargin);
- assert(tsz < p->rmargin);
- tsz = strlcat(buf, ")", p->rmargin);
- assert(tsz < p->rmargin);
- }
- ttsz = strlcpy(title, meta->title, p->rmargin);
+ if (mdoc_arch2a(meta->arch))
+ (void)snprintf(buf, p->rmargin, "%s(%s)",
+ pp, mdoc_arch2a(meta->arch));
+ else
+ (void)strlcpy(buf, pp, p->rmargin);
- if (NULL == (msec = mdoc_msec2a(meta->msec)))
- msec = "";
+ pp = mdoc_msec2a(meta->msec);
- ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2;
+ (void)snprintf(title, p->rmargin, "%s(%s)",
+ meta->title, pp ? pp : "");
- if (ssz > p->rmargin) {
- if ((ssz -= p->rmargin) % 2)
- ssz++;
- ssz /= 2;
-
- assert(ssz <= ttsz);
- title[ttsz - ssz] = 0;
- ssz = 1;
- } else
- ssz = ((p->rmargin - ssz) / 2) + 1;
+ p->offset = 0;
+ p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
+ p->flags |= TERMP_NOBREAK;
+ p->flags |= TERMP_NOSPACE;
- printf("%s(%s)", title, msec);
+ word(p, title);
+ flushln(p);
- for (i = 0; i < ssz; i++)
- printf(" ");
+ p->offset = p->rmargin;
+ p->rmargin += strlen(buf);
- printf("%s", buf);
+ word(p, buf);
+ flushln(p);
- for (i = 0; i < ssz; i++)
- printf(" ");
+ exit(1);
- printf("%s(%s)\n", title, msec);
- fflush(stdout);
+ p->offset = p->rmargin;
+ p->rmargin = p->maxrmargin;
+ p->flags &= ~TERMP_NOBREAK;
+
+ word(p, title);
+ flushln(p);
+
+ p->rmargin = p->maxrmargin;
+ p->offset = 0;
+ p->flags &= ~TERMP_NOSPACE;
free(title);
free(buf);
git.ckatri.com / mandoc.git / blobdiff