-/* $Id: mdocterm.c,v 1.27 2009/03/03 21:07:01 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.40 2009/03/12 06:32:17 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/utsname.h>
+#include <sys/types.h>
#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifndef __OpenBSD__
-#include <time.h>
-#endif
#include "mmain.h"
#include "term.h"
static void stringa(struct termp *,
const char *, size_t);
static void symbola(struct termp *, enum tsym);
+static void sanity(const struct mdoc_node *);
static void stylea(struct termp *, enum tstyle);
#ifdef __linux__
};
static struct termenc termenc2[] = {
+ { "rC", TERMSYM_RBRACE },
+ { "lC", TERMSYM_LBRACE },
{ "rB", TERMSYM_RBRACK },
{ "lB", TERMSYM_LBRACK },
+ { "ra", TERMSYM_RANGLE },
+ { "la", TERMSYM_LANGLE },
{ "Lq", TERMSYM_LDQUOTE },
{ "lq", TERMSYM_LDQUOTE },
{ "Rq", TERMSYM_RDQUOTE },
{ "Le", TERMSYM_LE },
{ "<=", TERMSYM_LE },
{ "Ge", TERMSYM_GE },
- { "=>", TERMSYM_GE },
+ { ">=", TERMSYM_GE },
{ "==", TERMSYM_EQ },
{ "Ne", TERMSYM_NEQ },
{ "!=", TERMSYM_NEQ },
{ " ", 1 }, /* TERMSYM_SPACE */
{ ".", 1 }, /* TERMSYM_PERIOD */
{ "", 0 }, /* TERMSYM_BREAK */
+ { "<", 1 }, /* TERMSYM_LANGLE */
+ { ">", 1 }, /* TERMSYM_RANGLE */
+ { "{", 1 }, /* TERMSYM_LBRACE */
+ { "}", 1 }, /* TERMSYM_RBRACE */
};
static const char ansi_clear[] = { 27, '[', '0', 'm' };
int
main(int argc, char *argv[])
{
- struct mmain *p;
+ struct mmain *p;
+ int c;
const struct mdoc *mdoc;
- struct termp termp;
+ struct termp termp;
p = mmain_alloc();
- if ( ! mmain_getopt(p, argc, argv, NULL, NULL, NULL, NULL))
- mmain_exit(p, 1);
+ c = mmain_getopt(p, argc, argv, NULL, NULL, NULL, NULL);
+ if (1 != c)
+ mmain_exit(p, -1 == c ? 1 : 0);
if (NULL == (mdoc = mmain_mdoc(p)))
mmain_exit(p, 1);
- termp.maxrmargin = 78; /* XXX */
- termp.rmargin = termp.maxrmargin;
+ termp.maxrmargin = termp.rmargin = 78; /* XXX */
termp.maxcols = 1024;
termp.offset = termp.col = 0;
termp.flags = TERMP_NOSPACE;
* offset value. This is useful when doing columnar lists where the
* prior column has right-padded.
*
- * - TERMP_LITERAL: don't break apart words. Note that a long literal
- * word will violate the right margin.
- *
* - TERMP_NOBREAK: this is the most important and is used when making
* columns. In short: don't print a newline and instead pad to the
* right margin. Used in conjunction with TERMP_NOLPAD.
/* LINTED */
for (j = i, vsz = 0; j < p->col; j++) {
- if (isspace((int)p->buf[j]))
+ if (isspace((u_char)p->buf[j]))
break;
else if (27 == p->buf[j]) {
assert(j + 4 <= p->col);
putchar('\n');
for (j = 0; j < p->rmargin; j++)
putchar(' ');
- vis = p->rmargin;
+ vis = p->rmargin - p->offset;
} else if (vis + vsz > bp)
warnx("word breaks right margin");
*/
for ( ; i < p->col; i++) {
- if (isspace((int)p->buf[i]))
+ if (isspace((u_char)p->buf[i]))
break;
putchar(p->buf[i]);
}
*/
if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) {
- putchar('\n');
- for (i = 0; i < p->rmargin; i++)
- putchar(' ');
+ if ( ! (TERMP_NONOBREAK & p->flags)) {
+ putchar('\n');
+ for (i = 0; i < p->rmargin; i++)
+ putchar(' ');
+ }
p->col = 0;
return;
}
*/
if (p->flags & TERMP_NOBREAK) {
- for ( ; vis < maxvis; vis++)
- putchar(' ');
+ if ( ! (TERMP_NONOBREAK & p->flags))
+ for ( ; vis < maxvis; vis++)
+ putchar(' ');
} else
putchar('\n');
return;
}
- len = strlen(word);
- assert(len > 0);
+ if (0 == (len = strlen(word)))
+ errx(1, "blank line not in literal context");
if (mdoc_isdelim(word)) {
if ( ! (p->flags & TERMP_IGNDELIM))
/* LINTED */
for (j = i = 0; i < len; i++) {
- if ( ! isspace((int)word[i])) {
+ if ( ! isspace((u_char)word[i])) {
j++;
continue;
}
/* Escaped spaces don't delimit... */
- if (i > 0 && isspace((int)word[i]) &&
+ if (i > 0 && isspace((u_char)word[i]) &&
'\\' == word[i - 1]) {
j++;
continue;
int dochild;
struct termpair pair;
+ /* Some quick sanity-checking. */
+
+ sanity(node);
+
/* Pre-processing. */
dochild = 1;
if ( ! (*termacts[node->tok].pre)(p, &pair, meta, node))
dochild = 0;
} else /* MDOC_TEXT == node->type */
- word(p, node->data.text.string);
+ word(p, node->string);
/* Children. */
static void
header(struct termp *p, const struct mdoc_meta *meta)
{
- char *buf, *title, *bufp, *vbuf;
- const char *pp;
- struct utsname uts;
+ char *buf, *title, *bufp;
p->rmargin = p->maxrmargin;
p->offset = 0;
err(1, "malloc");
if (NULL == (title = malloc(p->rmargin)))
err(1, "malloc");
- if (NULL == (vbuf = malloc(p->rmargin)))
- err(1, "malloc");
-
- if (NULL == (pp = mdoc_vol2a(meta->vol))) {
- switch (meta->msec) {
- case (MSEC_1):
- /* FALLTHROUGH */
- case (MSEC_6):
- /* FALLTHROUGH */
- case (MSEC_7):
- pp = mdoc_vol2a(VOL_URM);
- break;
- case (MSEC_8):
- pp = mdoc_vol2a(VOL_SMM);
- break;
- case (MSEC_2):
- /* FALLTHROUGH */
- case (MSEC_3):
- /* FALLTHROUGH */
- case (MSEC_4):
- /* FALLTHROUGH */
- case (MSEC_5):
- pp = mdoc_vol2a(VOL_PRM);
- break;
- case (MSEC_9):
- pp = mdoc_vol2a(VOL_KM);
- break;
- default:
- break;
- }
- }
- vbuf[0] = 0;
-
- if (pp) {
- if (-1 == uname(&uts))
- err(1, "uname");
- (void)strlcat(vbuf, uts.sysname, p->rmargin);
- (void)strlcat(vbuf, " ", p->rmargin);
- } else if (NULL == (pp = mdoc_msec2a(meta->msec)))
- pp = mdoc_msec2a(MSEC_local);
-
- (void)strlcat(vbuf, pp, p->rmargin);
/*
* The header is strange. It has three components, which are
* switches on the manual section.
*/
- if (mdoc_arch2a(meta->arch))
- (void)snprintf(buf, p->rmargin, "%s (%s)",
- vbuf, mdoc_arch2a(meta->arch));
- else
- (void)strlcpy(buf, vbuf, p->rmargin);
+ assert(meta->vol);
+ (void)strlcpy(buf, meta->vol, p->rmargin);
- pp = mdoc_msec2a(meta->msec);
+ if (meta->arch) {
+ (void)strlcat(buf, " (", p->rmargin);
+ (void)strlcat(buf, meta->arch, p->rmargin);
+ (void)strlcat(buf, ")", p->rmargin);
+ }
- (void)snprintf(title, p->rmargin, "%s(%s)",
- meta->title, pp ? pp : "");
+ (void)snprintf(title, p->rmargin, "%s(%d)",
+ meta->title, meta->msec);
for (bufp = title; *bufp; bufp++)
- *bufp = toupper(*bufp);
+ *bufp = toupper((u_char)*bufp);
p->offset = 0;
p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
p->flags &= ~TERMP_NOSPACE;
free(title);
- free(vbuf);
free(buf);
}
{
size_t j;
- (*i)++;
- assert(*i < len);
+ if (++(*i) >= len) {
+ warnx("ignoring bad escape sequence");
+ return;
+ }
if ('(' == word[*i]) {
(*i)++;
- assert(*i + 1 < len);
+ if (*i + 1 >= len) {
+ warnx("ignoring bad escape sequence");
+ return;
+ }
nescape(p, &word[*i], 2);
(*i)++;
return;
} else if ('*' == word[*i]) {
- /* XXX - deprecated! */
(*i)++;
- assert(*i < len);
+ if (*i >= len) {
+ warnx("ignoring bad escape sequence");
+ return;
+ }
switch (word[*i]) {
case ('('):
(*i)++;
- assert(*i + 1 < len);
+ if (*i + 1 >= len) {
+ warnx("ignoring bad escape sequence");
+ return;
+ }
nescape(p, &word[*i], 2);
(*i)++;
return;
for (j = 0; word[*i] && ']' != word[*i]; (*i)++, j++)
/* Loop... */ ;
- assert(word[*i]);
+ if (0 == word[*i]) {
+ warnx("ignoring bad escape sequence");
+ return;
+ }
nescape(p, &word[*i - j], j);
}
}
p->buf[(p->col)++] = c;
}
+
+
+static void
+sanity(const struct mdoc_node *n)
+{
+
+ switch (n->type) {
+ case (MDOC_TEXT):
+ if (n->child)
+ errx(1, "regular form violated (1)");
+ if (NULL == n->parent)
+ errx(1, "regular form violated (2)");
+ if (NULL == n->string)
+ errx(1, "regular form violated (3)");
+ switch (n->parent->type) {
+ case (MDOC_TEXT):
+ /* FALLTHROUGH */
+ case (MDOC_ROOT):
+ errx(1, "regular form violated (4)");
+ /* NOTREACHED */
+ default:
+ break;
+ }
+ break;
+ case (MDOC_ELEM):
+ if (NULL == n->parent)
+ errx(1, "regular form violated (5)");
+ switch (n->parent->type) {
+ case (MDOC_TAIL):
+ /* FALLTHROUGH */
+ case (MDOC_BODY):
+ /* FALLTHROUGH */
+ case (MDOC_HEAD):
+ break;
+ default:
+ errx(1, "regular form violated (6)");
+ /* NOTREACHED */
+ }
+ if (n->child) switch (n->child->type) {
+ case (MDOC_TEXT):
+ break;
+ default:
+ errx(1, "regular form violated (7(");
+ /* NOTREACHED */
+ }
+ break;
+ case (MDOC_HEAD):
+ /* FALLTHROUGH */
+ case (MDOC_BODY):
+ /* FALLTHROUGH */
+ case (MDOC_TAIL):
+ if (NULL == n->parent)
+ errx(1, "regular form violated (8)");
+ if (MDOC_BLOCK != n->parent->type)
+ errx(1, "regular form violated (9)");
+ if (n->child) switch (n->child->type) {
+ case (MDOC_BLOCK):
+ /* FALLTHROUGH */
+ case (MDOC_ELEM):
+ /* FALLTHROUGH */
+ case (MDOC_TEXT):
+ break;
+ default:
+ errx(1, "regular form violated (a)");
+ /* NOTREACHED */
+ }
+ break;
+ case (MDOC_BLOCK):
+ if (NULL == n->parent)
+ errx(1, "regular form violated (b)");
+ if (NULL == n->child)
+ errx(1, "regular form violated (c)");
+ switch (n->parent->type) {
+ case (MDOC_ROOT):
+ /* FALLTHROUGH */
+ case (MDOC_HEAD):
+ /* FALLTHROUGH */
+ case (MDOC_BODY):
+ /* FALLTHROUGH */
+ case (MDOC_TAIL):
+ break;
+ default:
+ errx(1, "regular form violated (d)");
+ /* NOTREACHED */
+ }
+ switch (n->child->type) {
+ case (MDOC_ROOT):
+ /* FALLTHROUGH */
+ case (MDOC_ELEM):
+ errx(1, "regular form violated (e)");
+ /* NOTREACHED */
+ default:
+ break;
+ }
+ break;
+ case (MDOC_ROOT):
+ if (n->parent)
+ errx(1, "regular form violated (f)");
+ if (NULL == n->child)
+ errx(1, "regular form violated (10)");
+ switch (n->child->type) {
+ case (MDOC_BLOCK):
+ break;
+ default:
+ errx(1, "regular form violated (11)");
+ /* NOTREACHED */
+ }
+ break;
+ }
+}
+
git.ckatri.com / mandoc.git / blobdiff