-/* $Id: mdoc_action.c,v 1.11 2009/06/12 12:52:51 kristaps Exp $ */
+/* $Id: mdoc_action.c,v 1.65 2010/06/03 13:44:36 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef OSNAME
#include <sys/utsname.h>
+#endif
#include <assert.h>
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
+#include "mandoc.h"
#include "libmdoc.h"
+#include "libmandoc.h"
-enum mwarn {
- WBADSEC,
- WNOWIDTH,
- WBADDATE
-};
+#define POST_ARGS struct mdoc *m, struct mdoc_node *n
+#define PRE_ARGS struct mdoc *m, struct mdoc_node *n
-enum merr {
- ETOOLONG,
- EMALLOC,
- ENUMFMT
-};
-
-#define PRE_ARGS struct mdoc *m, const struct mdoc_node *n
-#define POST_ARGS struct mdoc *m
+#define NUMSIZ 32
+#define DATESIZ 32
struct actions {
int (*pre)(PRE_ARGS);
int (*post)(POST_ARGS);
};
-static int pwarn(struct mdoc *, int, int, enum mwarn);
-static int perr(struct mdoc *, int, int, enum merr);
-static int concat(struct mdoc *, const struct mdoc_node *,
- char *, size_t);
+static int concat(struct mdoc *, char *,
+ const struct mdoc_node *, size_t);
+static inline int order_rs(enum mdoct);
static int post_ar(POST_ARGS);
+static int post_at(POST_ARGS);
static int post_bl(POST_ARGS);
-static int post_bl_width(POST_ARGS);
+static int post_bl_head(POST_ARGS);
static int post_bl_tagwidth(POST_ARGS);
+static int post_bl_width(POST_ARGS);
static int post_dd(POST_ARGS);
static int post_display(POST_ARGS);
static int post_dt(POST_ARGS);
-static int post_lk(POST_ARGS);
+static int post_lb(POST_ARGS);
+static int post_li(POST_ARGS);
static int post_nm(POST_ARGS);
static int post_os(POST_ARGS);
+static int post_pa(POST_ARGS);
static int post_prol(POST_ARGS);
+static int post_rs(POST_ARGS);
static int post_sh(POST_ARGS);
+static int post_st(POST_ARGS);
static int post_std(POST_ARGS);
static int pre_bd(PRE_ARGS);
+static int pre_bl(PRE_ARGS);
static int pre_dl(PRE_ARGS);
+static int pre_offset(PRE_ARGS);
-#define vwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t))
-#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t))
-#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
-
-const struct actions mdoc_actions[MDOC_MAX] = {
- { NULL, NULL }, /* \" */
+static const struct actions mdoc_actions[MDOC_MAX] = {
+ { NULL, NULL }, /* Ap */
{ NULL, post_dd }, /* Dd */
{ NULL, post_dt }, /* Dt */
{ NULL, post_os }, /* Os */
{ pre_dl, post_display }, /* Dl */
{ pre_bd, post_display }, /* Bd */
{ NULL, NULL }, /* Ed */
- { NULL, post_bl }, /* Bl */
+ { pre_bl, post_bl }, /* Bl */
{ NULL, NULL }, /* El */
{ NULL, NULL }, /* It */
{ NULL, NULL }, /* Ad */
{ NULL, NULL }, /* Ft */
{ NULL, NULL }, /* Ic */
{ NULL, NULL }, /* In */
- { NULL, NULL }, /* Li */
+ { NULL, post_li }, /* Li */
{ NULL, NULL }, /* Nd */
{ NULL, post_nm }, /* Nm */
{ NULL, NULL }, /* Op */
{ NULL, NULL }, /* Ot */
- { NULL, NULL }, /* Pa */
+ { NULL, post_pa }, /* Pa */
{ NULL, post_std }, /* Rv */
- { NULL, NULL }, /* St */
+ { NULL, post_st }, /* St */
{ NULL, NULL }, /* Va */
{ NULL, NULL }, /* Vt */
{ NULL, NULL }, /* Xr */
{ NULL, NULL }, /* Ac */
{ NULL, NULL }, /* Ao */
{ NULL, NULL }, /* Aq */
- { NULL, NULL }, /* At */
+ { NULL, post_at }, /* At */
{ NULL, NULL }, /* Bc */
{ NULL, NULL }, /* Bf */
{ NULL, NULL }, /* Bo */
{ NULL, NULL }, /* Qo */
{ NULL, NULL }, /* Qq */
{ NULL, NULL }, /* Re */
- { NULL, NULL }, /* Rs */
+ { NULL, post_rs }, /* Rs */
{ NULL, NULL }, /* Sc */
{ NULL, NULL }, /* So */
{ NULL, NULL }, /* Sq */
{ NULL, NULL }, /* Hf */
{ NULL, NULL }, /* Fr */
{ NULL, NULL }, /* Ud */
- { NULL, NULL }, /* Lb */
- { NULL, NULL }, /* Ap */
+ { NULL, post_lb }, /* Lb */
{ NULL, NULL }, /* Lp */
- { NULL, post_lk }, /* Lk */
+ { NULL, NULL }, /* Lk */
{ NULL, NULL }, /* Mt */
{ NULL, NULL }, /* Brq */
{ NULL, NULL }, /* Bro */
{ NULL, NULL }, /* En */
{ NULL, NULL }, /* Dx */
{ NULL, NULL }, /* %Q */
+ { NULL, NULL }, /* br */
+ { NULL, NULL }, /* sp */
+ { NULL, NULL }, /* %U */
+ { NULL, NULL }, /* Ta */
};
-
-#ifdef __linux__
-extern size_t strlcat(char *, const char *, size_t);
-#endif
+#define RSORD_MAX 14
+
+static const enum mdoct rsord[RSORD_MAX] = {
+ MDOC__A,
+ MDOC__T,
+ MDOC__B,
+ MDOC__I,
+ MDOC__J,
+ MDOC__R,
+ MDOC__N,
+ MDOC__V,
+ MDOC__P,
+ MDOC__Q,
+ MDOC__D,
+ MDOC__O,
+ MDOC__C,
+ MDOC__U
+};
int
-mdoc_action_pre(struct mdoc *m, const struct mdoc_node *n)
+mdoc_action_pre(struct mdoc *m, struct mdoc_node *n)
{
switch (n->type) {
if (NULL == mdoc_actions[m->last->tok].post)
return(1);
- return((*mdoc_actions[m->last->tok].post)(m));
+ return((*mdoc_actions[m->last->tok].post)(m, m->last));
}
+/*
+ * Concatenate sibling nodes together. All siblings must be of type
+ * MDOC_TEXT or an assertion is raised. Concatenation is separated by a
+ * single whitespace.
+ */
static int
-concat(struct mdoc *m, const struct mdoc_node *n,
- char *buf, size_t sz)
+concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
{
+ assert(sz);
+ p[0] = '\0';
for ( ; n; n = n->next) {
assert(MDOC_TEXT == n->type);
- if (strlcat(buf, n->string, sz) >= sz)
- return(nerr(m, n, ETOOLONG));
+ /*
+ * XXX: yes, these can technically be resized, but it's
+ * highly unlikely that we're going to get here, so let
+ * it slip for now.
+ */
+ if (strlcat(p, n->string, sz) >= sz) {
+ mdoc_nmsg(m, n, MANDOCERR_MEM);
+ return(0);
+ }
if (NULL == n->next)
continue;
- if (strlcat(buf, " ", sz) >= sz)
- return(nerr(m, n, ETOOLONG));
+ if (strlcat(p, " ", sz) >= sz) {
+ mdoc_nmsg(m, n, MANDOCERR_MEM);
+ return(0);
+ }
}
return(1);
}
+/*
+ * Macros accepting `-std' as an argument have the name of the current
+ * document (`Nm') filled in as the argument if it's not provided.
+ */
static int
-perr(struct mdoc *m, int line, int pos, enum merr type)
+post_std(POST_ARGS)
{
- char *p;
+ struct mdoc_node *nn;
- p = NULL;
- switch (type) {
- case (ENUMFMT):
- p = "bad number format";
- break;
- case (ETOOLONG):
- p = "argument text too long";
- break;
- case (EMALLOC):
- p = "memory exhausted";
- break;
- }
- assert(p);
- return(mdoc_perr(m, line, pos, p));
+ if (n->child)
+ return(1);
+ if (NULL == m->meta.name)
+ return(1);
+
+ nn = n;
+ m->next = MDOC_NEXT_CHILD;
+
+ if ( ! mdoc_word_alloc(m, n->line, n->pos, m->meta.name))
+ return(0);
+ m->last = nn;
+ return(1);
}
+/*
+ * The `Nm' macro's first use sets the name of the document. See also
+ * post_std(), etc.
+ */
static int
-pwarn(struct mdoc *m, int line, int pos, enum mwarn type)
+post_nm(POST_ARGS)
{
- char *p;
- int c;
-
- p = NULL;
- c = WARN_SYNTAX;
- switch (type) {
- case (WBADSEC):
- p = "inappropriate document section in manual section";
- c = WARN_COMPAT;
- break;
- case (WNOWIDTH):
- p = "cannot determine default width";
- break;
- case (WBADDATE):
- p = "malformed date syntax";
- break;
- }
- assert(p);
- return(mdoc_pwarn(m, line, pos, c, p));
+ char buf[BUFSIZ];
+
+ if (m->meta.name)
+ return(1);
+ if ( ! concat(m, buf, n->child, BUFSIZ))
+ return(0);
+ m->meta.name = mandoc_strdup(buf);
+ return(1);
}
+/*
+ * Look up the value of `Lb' for matching predefined strings. If it has
+ * one, then substitute the current value for the formatted value. Note
+ * that the lookup may fail (we can provide arbitrary strings).
+ */
+/* ARGSUSED */
static int
-post_std(POST_ARGS)
+post_lb(POST_ARGS)
{
+ const char *p;
+ char *buf;
+ size_t sz;
- /*
- * If '-std' is invoked without an argument, fill it in with our
- * name (if it's been set).
- */
+ assert(MDOC_TEXT == n->child->type);
+ p = mdoc_a2lib(n->child->string);
- if (NULL == m->last->args)
- return(1);
- if (m->last->args->argv[0].sz)
+ if (p) {
+ free(n->child->string);
+ n->child->string = mandoc_strdup(p);
return(1);
+ }
- assert(m->meta.name);
+ sz = strlen(n->child->string) +
+ 2 + strlen("\\(lqlibrary\\(rq");
+ buf = mandoc_malloc(sz);
+ snprintf(buf, sz, "library \\(lq%s\\(rq", n->child->string);
+ free(n->child->string);
+ n->child->string = buf;
+ return(1);
+}
- m->last->args->argv[0].value = calloc(1, sizeof(char *));
- if (NULL == m->last->args->argv[0].value)
- return(verr(m, EMALLOC));
- m->last->args->argv[0].sz = 1;
- m->last->args->argv[0].value[0] = strdup(m->meta.name);
- if (NULL == m->last->args->argv[0].value[0])
- return(verr(m, EMALLOC));
+/*
+ * Substitute the value of `St' for the corresponding formatted string.
+ * We're guaranteed that this exists (it's been verified during the
+ * validation phase).
+ */
+/* ARGSUSED */
+static int
+post_st(POST_ARGS)
+{
+ const char *p;
+ assert(MDOC_TEXT == n->child->type);
+ p = mdoc_a2st(n->child->string);
+ if (p != NULL) {
+ free(n->child->string);
+ n->child->string = mandoc_strdup(p);
+ }
return(1);
}
+/*
+ * Look up the standard string in a table. We know that it exists from
+ * the validation phase, so assert on failure. If a standard key wasn't
+ * supplied, supply the default ``AT&T UNIX''.
+ */
static int
-post_nm(POST_ARGS)
+post_at(POST_ARGS)
{
- char buf[64];
-
- if (m->meta.name)
+ struct mdoc_node *nn;
+ const char *p, *q;
+ char *buf;
+ size_t sz;
+
+ if (n->child) {
+ assert(MDOC_TEXT == n->child->type);
+ p = mdoc_a2att(n->child->string);
+ if (p) {
+ free(n->child->string);
+ n->child->string = mandoc_strdup(p);
+ } else {
+ p = "AT&T UNIX ";
+ q = n->child->string;
+ sz = strlen(p) + strlen(q) + 1;
+ buf = mandoc_malloc(sz);
+ strlcpy(buf, p, sz);
+ strlcat(buf, q, sz);
+ free(n->child->string);
+ n->child->string = buf;
+ }
return(1);
+ }
- buf[0] = 0;
- if ( ! concat(m, m->last->child, buf, sizeof(buf)))
+ nn = n;
+ m->next = MDOC_NEXT_CHILD;
+ if ( ! mdoc_word_alloc(m, nn->line, nn->pos, "AT&T UNIX"))
return(0);
-
- if (NULL == (m->meta.name = strdup(buf)))
- return(verr(m, EMALLOC));
-
+ m->last = nn;
return(1);
}
+/*
+ * Mark the current section. The ``named'' section (lastnamed) is set
+ * whenever the current section isn't a custom section--we use this to
+ * keep track of section ordering. Also check that the section is
+ * allowed within the document's manual section.
+ */
static int
post_sh(POST_ARGS)
{
enum mdoc_sec sec;
- char buf[64];
-
- /*
- * We keep track of the current section /and/ the "named"
- * section, which is one of the conventional ones, in order to
- * check ordering.
- */
+ char buf[BUFSIZ];
- if (MDOC_HEAD != m->last->type)
+ if (MDOC_HEAD != n->type)
return(1);
- buf[0] = 0;
- if ( ! concat(m, m->last->child, buf, sizeof(buf)))
+ if ( ! concat(m, buf, n->child, BUFSIZ))
return(0);
- if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
+ sec = mdoc_str2sec(buf);
+ /*
+ * The first section should always make us move into a non-new
+ * state.
+ */
+ if (SEC_NONE == m->lastnamed || SEC_CUSTOM != sec)
m->lastnamed = sec;
+ /* Some sections only live in certain manual sections. */
+
switch ((m->lastsec = sec)) {
case (SEC_RETURN_VALUES):
/* FALLTHROUGH */
case (SEC_ERRORS):
- switch (m->meta.msec) {
- case (2):
- /* FALLTHROUGH */
- case (3):
- /* FALLTHROUGH */
- case (9):
+ assert(m->meta.msec);
+ if (*m->meta.msec == '2')
break;
- default:
- return(vwarn(m, WBADSEC));
- }
- break;
+ if (*m->meta.msec == '3')
+ break;
+ if (*m->meta.msec == '9')
+ break;
+ return(mdoc_nmsg(m, n, MANDOCERR_SECMSEC));
default:
break;
}
}
+/*
+ * Parse out the contents of `Dt'. See in-line documentation for how we
+ * handle the various fields of this macro.
+ */
static int
post_dt(POST_ARGS)
{
- struct mdoc_node *n;
+ struct mdoc_node *nn;
const char *cp;
- char *ep;
- long lval;
if (m->meta.title)
free(m->meta.title);
free(m->meta.arch);
m->meta.title = m->meta.vol = m->meta.arch = NULL;
- m->meta.msec = 0;
-
/* Handles: `.Dt'
* --> title = unknown, volume = local, msec = 0, arch = NULL
*/
- if (NULL == (n = m->last->child)) {
- if (NULL == (m->meta.title = strdup("unknown")))
- return(verr(m, EMALLOC));
- if (NULL == (m->meta.vol = strdup("local")))
- return(verr(m, EMALLOC));
- return(post_prol(m));
+ if (NULL == (nn = n->child)) {
+ /* XXX: make these macro values. */
+ /* FIXME: warn about missing values. */
+ m->meta.title = mandoc_strdup("UNKNOWN");
+ m->meta.vol = mandoc_strdup("LOCAL");
+ m->meta.msec = mandoc_strdup("1");
+ return(post_prol(m, n));
}
/* Handles: `.Dt TITLE'
* --> title = TITLE, volume = local, msec = 0, arch = NULL
*/
- if (NULL == (m->meta.title = strdup(n->string)))
- return(verr(m, EMALLOC));
+ m->meta.title = mandoc_strdup
+ ('\0' == nn->string[0] ? "UNKNOWN" : nn->string);
- if (NULL == (n = n->next)) {
- if (NULL == (m->meta.vol = strdup("local")))
- return(verr(m, EMALLOC));
- return(post_prol(m));
+ if (NULL == (nn = nn->next)) {
+ /* FIXME: warn about missing msec. */
+ /* XXX: make this a macro value. */
+ m->meta.vol = mandoc_strdup("LOCAL");
+ m->meta.msec = mandoc_strdup("1");
+ return(post_prol(m, n));
}
/* Handles: `.Dt TITLE SEC'
* arch = NULL
*/
- cp = mdoc_a2msec(n->string);
+ cp = mdoc_a2msec(nn->string);
if (cp) {
- if (NULL == (m->meta.vol = strdup(cp)))
- return(verr(m, EMALLOC));
- errno = 0;
- lval = strtol(n->string, &ep, 10);
- if (n->string[0] != '\0' && *ep == '\0')
- m->meta.msec = (int)lval;
- } else if (NULL == (m->meta.vol = strdup(n->string)))
- return(verr(m, EMALLOC));
-
- if (NULL == (n = n->next))
- return(post_prol(m));
+ m->meta.vol = mandoc_strdup(cp);
+ m->meta.msec = mandoc_strdup(nn->string);
+ } else if (mdoc_nmsg(m, n, MANDOCERR_BADMSEC)) {
+ m->meta.vol = mandoc_strdup(nn->string);
+ m->meta.msec = mandoc_strdup(nn->string);
+ } else
+ return(0);
+
+ if (NULL == (nn = nn->next))
+ return(post_prol(m, n));
/* Handles: `.Dt TITLE SEC VOL'
* --> title = TITLE, volume = VOL is vol ?
* VOL
*/
- cp = mdoc_a2vol(n->string);
+ cp = mdoc_a2vol(nn->string);
if (cp) {
free(m->meta.vol);
- if (NULL == (m->meta.vol = strdup(cp)))
- return(verr(m, EMALLOC));
- n = n->next;
+ m->meta.vol = mandoc_strdup(cp);
} else {
- cp = mdoc_a2arch(n->string);
+ /* FIXME: warn about bad arch. */
+ cp = mdoc_a2arch(nn->string);
if (NULL == cp) {
free(m->meta.vol);
- if (NULL == (m->meta.vol = strdup(n->string)))
- return(verr(m, EMALLOC));
- } else if (NULL == (m->meta.arch = strdup(cp)))
- return(verr(m, EMALLOC));
+ m->meta.vol = mandoc_strdup(nn->string);
+ } else
+ m->meta.arch = mandoc_strdup(cp);
}
/* Ignore any subsequent parameters... */
+ /* FIXME: warn about subsequent parameters. */
- return(post_prol(m));
+ return(post_prol(m, n));
}
+/*
+ * Set the operating system by way of the `Os' macro. Note that if an
+ * argument isn't provided and -DOSNAME="\"foo\"" is provided during
+ * compilation, this value will be used instead of filling in "sysname
+ * release" from uname().
+ */
static int
post_os(POST_ARGS)
{
- char buf[64];
+ char buf[BUFSIZ];
+#ifndef OSNAME
struct utsname utsname;
+#endif
if (m->meta.os)
free(m->meta.os);
- buf[0] = 0;
- if ( ! concat(m, m->last->child, buf, sizeof(buf)))
+ if ( ! concat(m, buf, n->child, BUFSIZ))
return(0);
- if (0 == buf[0]) {
+ /* XXX: yes, these can all be dynamically-adjusted buffers, but
+ * it's really not worth the extra hackery.
+ */
+
+ if ('\0' == buf[0]) {
+#ifdef OSNAME
+ if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
+ mdoc_nmsg(m, n, MANDOCERR_MEM);
+ return(0);
+ }
+#else /*!OSNAME */
if (-1 == uname(&utsname))
- return(mdoc_err(m, "utsname"));
- if (strlcat(buf, utsname.sysname, 64) >= 64)
- return(verr(m, ETOOLONG));
- if (strlcat(buf, " ", 64) >= 64)
- return(verr(m, ETOOLONG));
- if (strlcat(buf, utsname.release, 64) >= 64)
- return(verr(m, ETOOLONG));
- }
+ return(mdoc_nmsg(m, n, MANDOCERR_UTSNAME));
- if (NULL == (m->meta.os = strdup(buf)))
- return(verr(m, EMALLOC));
- m->lastnamed = m->lastsec = SEC_BODY;
+ if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) {
+ mdoc_nmsg(m, n, MANDOCERR_MEM);
+ return(0);
+ }
+ if (strlcat(buf, " ", 64) >= BUFSIZ) {
+ mdoc_nmsg(m, n, MANDOCERR_MEM);
+ return(0);
+ }
+ if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
+ mdoc_nmsg(m, n, MANDOCERR_MEM);
+ return(0);
+ }
+#endif /*!OSNAME*/
+ }
- return(post_prol(m));
+ m->meta.os = mandoc_strdup(buf);
+ return(post_prol(m, n));
}
/*
* Calculate the -width for a `Bl -tag' list if it hasn't been provided.
- * Uses the first head macro.
+ * Uses the first head macro. NOTE AGAIN: this is ONLY if the -width
+ * argument has NOT been provided. See post_bl_width() for converting
+ * the -width string.
*/
static int
-post_bl_tagwidth(struct mdoc *m)
+post_bl_tagwidth(POST_ARGS)
{
- struct mdoc_node *n;
- int sz;
- char buf[32];
+ struct mdoc_node *nn;
+ size_t sz;
+ int i;
+ char buf[NUMSIZ];
- /*
- * Use the text width, if a text node, or the default macro
- * width if a macro.
- */
+ /* Defaults to ten ens. */
- n = m->last->body->child;
- if (n) {
- assert(MDOC_BLOCK == n->type);
- assert(MDOC_It == n->tok);
- n = n->head->child;
- }
+ sz = 10; /* XXX: make this a macro value. */
- sz = 10; /* Default size. */
+ for (nn = n->body->child; nn; nn = nn->next) {
+ if (MDOC_It == nn->tok)
+ break;
+ }
- if (n) {
- if (MDOC_TEXT != n->type) {
- if (0 == (sz = (int)mdoc_macro2len(n->tok)))
- if ( ! vwarn(m, WNOWIDTH))
+ if (nn) {
+ assert(MDOC_BLOCK == nn->type);
+ nn = nn->head->child;
+ if (MDOC_TEXT != nn->type) {
+ sz = mdoc_macro2len(nn->tok);
+ if (sz == 0) {
+ if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG))
return(0);
+ sz = 10;
+ }
} else
- sz = (int)strlen(n->string) + 1;
+ sz = strlen(nn->string) + 1;
}
- if (-1 == snprintf(buf, sizeof(buf), "%dn", sz))
- return(verr(m, ENUMFMT));
+ snprintf(buf, NUMSIZ, "%zun", sz);
/*
* We have to dynamically add this to the macro's argument list.
* We're guaranteed that a MDOC_Width doesn't already exist.
*/
- n = m->last;
- assert(n->args);
- sz = (int)(n->args->argc)++;
-
- n->args->argv = realloc(n->args->argv,
- n->args->argc * sizeof(struct mdoc_argv));
+ nn = n;
+ assert(nn->args);
+ i = (int)(nn->args->argc)++;
- if (NULL == n->args->argv)
- return(verr(m, EMALLOC));
-
- n->args->argv[sz].arg = MDOC_Width;
- n->args->argv[sz].line = m->last->line;
- n->args->argv[sz].pos = m->last->pos;
- n->args->argv[sz].sz = 1;
- n->args->argv[sz].value = calloc(1, sizeof(char *));
-
- if (NULL == n->args->argv[sz].value)
- return(verr(m, EMALLOC));
- if (NULL == (n->args->argv[sz].value[0] = strdup(buf)))
- return(verr(m, EMALLOC));
+ nn->args->argv = mandoc_realloc(nn->args->argv,
+ nn->args->argc * sizeof(struct mdoc_argv));
+ nn->args->argv[i].arg = MDOC_Width;
+ nn->args->argv[i].line = n->line;
+ nn->args->argv[i].pos = n->pos;
+ nn->args->argv[i].sz = 1;
+ nn->args->argv[i].value = mandoc_malloc(sizeof(char *));
+ nn->args->argv[i].value[0] = mandoc_strdup(buf);
return(1);
}
+/*
+ * Calculate the real width of a list from the -width string, which may
+ * contain a macro (with a known default width), a literal string, or a
+ * scaling width.
+ */
static int
-post_bl_width(struct mdoc *m)
+post_bl_width(POST_ARGS)
{
size_t width;
- int i, tok;
- char buf[32];
+ int i;
+ enum mdoct tok;
+ char buf[NUMSIZ];
char *p;
- if (NULL == m->last->args)
+ if (NULL == n->args)
return(1);
- for (i = 0; i < (int)m->last->args->argc; i++)
- if (MDOC_Width == m->last->args->argv[i].arg)
+ for (i = 0; i < (int)n->args->argc; i++)
+ if (MDOC_Width == n->args->argv[i].arg)
break;
- if (i == (int)m->last->args->argc)
+ if (i == (int)n->args->argc)
return(1);
- p = m->last->args->argv[i].value[0];
+ p = n->args->argv[i].value[0];
/*
* If the value to -width is a macro, then we re-write it to be
*/
if (0 == strcmp(p, "Ds"))
- width = 8;
- else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
+ width = 6;
+ else if (MDOC_MAX == (tok = mdoc_hash_find(p)))
return(1);
else if (0 == (width = mdoc_macro2len(tok)))
- return(vwarn(m, WNOWIDTH));
+ return(mdoc_nmsg(m, n, MANDOCERR_BADWIDTH));
/* The value already exists: free and reallocate it. */
- if (-1 == snprintf(buf, sizeof(buf), "%zun", width))
- return(verr(m, ENUMFMT));
+ snprintf(buf, NUMSIZ, "%zun", width);
+ free(n->args->argv[i].value[0]);
+ n->args->argv[i].value[0] = mandoc_strdup(buf);
+ return(1);
+}
+
- free(m->last->args->argv[i].value[0]);
- m->last->args->argv[i].value[0] = strdup(buf);
- if (NULL == m->last->args->argv[i].value[0])
- return(verr(m, EMALLOC));
+/*
+ * Do processing for -column lists, which can have two distinct styles
+ * of invocation. Merge this two styles into a consistent form.
+ */
+/* ARGSUSED */
+static int
+post_bl_head(POST_ARGS)
+{
+ int i, c;
+ struct mdoc_node *np, *nn, *nnp;
+
+ if (NULL == n->child)
+ return(1);
+ np = n->parent;
+ assert(np->args);
+
+ for (c = 0; c < (int)np->args->argc; c++)
+ if (MDOC_Column == np->args->argv[c].arg)
+ break;
+
+ if (c == (int)np->args->argc)
+ return(1);
+ assert(0 == np->args->argv[c].sz);
+
+ /*
+ * Accomodate for new-style groff column syntax. Shuffle the
+ * child nodes, all of which must be TEXT, as arguments for the
+ * column field. Then, delete the head children.
+ */
+
+ np->args->argv[c].sz = (size_t)n->nchild;
+ np->args->argv[c].value = mandoc_malloc
+ ((size_t)n->nchild * sizeof(char *));
+
+ for (i = 0, nn = n->child; nn; i++) {
+ np->args->argv[c].value[i] = nn->string;
+ nn->string = NULL;
+ nnp = nn;
+ nn = nn->next;
+ mdoc_node_delete(NULL, nnp);
+ }
+
+ n->nchild = 0;
+ n->child = NULL;
return(1);
}
{
int i, r, len;
- if (MDOC_BLOCK != m->last->type)
+ if (MDOC_HEAD == n->type)
+ return(post_bl_head(m, n));
+ if (MDOC_BLOCK != n->type)
return(1);
/*
* rewritten into real lengths).
*/
- len = (int)(m->last->args ? m->last->args->argc : 0);
+ len = (int)(n->args ? n->args->argc : 0);
for (r = i = 0; i < len; i++) {
- if (MDOC_Tag == m->last->args->argv[i].arg)
+ if (MDOC_Tag == n->args->argv[i].arg)
r |= 1 << 0;
- if (MDOC_Width == m->last->args->argv[i].arg)
+ if (MDOC_Width == n->args->argv[i].arg)
r |= 1 << 1;
}
if (r & (1 << 0) && ! (r & (1 << 1))) {
- if ( ! post_bl_tagwidth(m))
+ if ( ! post_bl_tagwidth(m, n))
return(0);
} else if (r & (1 << 1))
- if ( ! post_bl_width(m))
+ if ( ! post_bl_width(m, n))
return(0);
return(1);
}
+/*
+ * The `Pa' macro defaults to a tilde if no value is provided as an
+ * argument.
+ */
static int
-post_lk(POST_ARGS)
+post_pa(POST_ARGS)
{
- struct mdoc_node *n;
+ struct mdoc_node *np;
- if (m->last->child)
+ if (n->child)
return(1);
- n = m->last;
+ np = n;
m->next = MDOC_NEXT_CHILD;
- /* FIXME: this isn't documented anywhere! */
- if ( ! mdoc_word_alloc(m, m->last->line,
- m->last->pos, "~"))
+ /* XXX: make into macro value. */
+ if ( ! mdoc_word_alloc(m, n->line, n->pos, "~"))
return(0);
+ m->last = np;
+ return(1);
+}
+
- m->last = n;
- m->next = MDOC_NEXT_SIBLING;
+/*
+ * Empty `Li' macros get an empty string to make front-ends add an extra
+ * space.
+ */
+static int
+post_li(POST_ARGS)
+{
+ struct mdoc_node *np;
+
+ if (n->child)
+ return(1);
+
+ np = n;
+ m->next = MDOC_NEXT_CHILD;
+ if ( ! mdoc_word_alloc(m, n->line, n->pos, ""))
+ return(0);
+ m->last = np;
return(1);
}
+/*
+ * The `Ar' macro defaults to two strings "file ..." if no value is
+ * provided as an argument.
+ */
static int
post_ar(POST_ARGS)
{
- struct mdoc_node *n;
+ struct mdoc_node *np;
- if (m->last->child)
+ if (n->child)
return(1);
- n = m->last;
+ np = n;
m->next = MDOC_NEXT_CHILD;
- if ( ! mdoc_word_alloc(m, m->last->line,
- m->last->pos, "file"))
+ /* XXX: make into macro values. */
+ if ( ! mdoc_word_alloc(m, n->line, n->pos, "file"))
return(0);
- m->next = MDOC_NEXT_SIBLING;
- if ( ! mdoc_word_alloc(m, m->last->line,
- m->last->pos, "..."))
+ if ( ! mdoc_word_alloc(m, n->line, n->pos, "..."))
return(0);
-
- m->last = n;
- m->next = MDOC_NEXT_SIBLING;
+ m->last = np;
return(1);
}
+/*
+ * Parse the date field in `Dd'.
+ */
static int
post_dd(POST_ARGS)
{
- char buf[64];
+ char buf[DATESIZ];
- buf[0] = 0;
- if ( ! concat(m, m->last->child, buf, sizeof(buf)))
+ if ( ! concat(m, buf, n->child, DATESIZ))
return(0);
- if (0 == (m->meta.date = mdoc_atotime(buf))) {
- if ( ! vwarn(m, WBADDATE))
+ m->meta.date = mandoc_a2time
+ (MTIME_MDOCDATE | MTIME_CANONICAL, buf);
+
+ if (0 == m->meta.date) {
+ if ( ! mdoc_nmsg(m, n, MANDOCERR_BADDATE))
return(0);
m->meta.date = time(NULL);
}
- return(post_prol(m));
+ return(post_prol(m, n));
}
+/*
+ * Remove prologue macros from the document after they're processed.
+ * The final document uses mdoc_meta for these values and discards the
+ * originals.
+ */
static int
post_prol(POST_ARGS)
{
- struct mdoc_node *n;
- /*
- * The end document shouldn't have the prologue macros as part
- * of the syntax tree (they encompass only meta-data).
- */
+ mdoc_node_delete(m, n);
+ if (m->meta.title && m->meta.date && m->meta.os)
+ m->flags |= MDOC_PBODY;
+ return(1);
+}
- if (m->last->parent->child == m->last)
- m->last->parent->child = m->last->prev;
- if (m->last->prev)
- m->last->prev->next = NULL;
- n = m->last;
- assert(NULL == m->last->next);
+/*
+ * Trigger a literal context.
+ */
+static int
+pre_dl(PRE_ARGS)
+{
- if (m->last->prev) {
- m->last = m->last->prev;
- m->next = MDOC_NEXT_SIBLING;
- } else {
- m->last = m->last->parent;
- m->next = MDOC_NEXT_CHILD;
+ if (MDOC_BODY == n->type)
+ m->flags |= MDOC_LITERAL;
+ return(1);
+}
+
+
+/* ARGSUSED */
+static int
+pre_offset(PRE_ARGS)
+{
+ int i;
+
+ /*
+ * Make sure that an empty offset produces an 8n length space as
+ * stipulated by mdoc.samples.
+ */
+
+ for (i = 0; n->args && i < (int)n->args->argc; i++) {
+ if (MDOC_Offset != n->args->argv[i].arg)
+ continue;
+ if (n->args->argv[i].sz)
+ break;
+ assert(1 == n->args->refcnt);
+ /* If no value set, length of <string>. */
+ n->args->argv[i].sz++;
+ n->args->argv[i].value = mandoc_malloc(sizeof(char *));
+ n->args->argv[i].value[0] = mandoc_strdup("8n");
+ break;
}
- mdoc_node_freelist(n);
return(1);
}
static int
-pre_dl(PRE_ARGS)
+pre_bl(PRE_ARGS)
{
- if (MDOC_BODY != n->type)
- return(1);
- m->flags |= MDOC_LITERAL;
+ if (MDOC_BLOCK == n->type)
+ return(pre_offset(m, n));
return(1);
}
{
int i;
+ if (MDOC_BLOCK == n->type)
+ return(pre_offset(m, n));
if (MDOC_BODY != n->type)
return(1);
- /* Enter literal context if `Bd -literal' or * -unfilled'. */
+ /* Enter literal context if `Bd -literal' or `-unfilled'. */
for (n = n->parent, i = 0; i < (int)n->args->argc; i++)
if (MDOC_Literal == n->args->argv[i].arg)
- break;
+ m->flags |= MDOC_LITERAL;
else if (MDOC_Unfilled == n->args->argv[i].arg)
- break;
-
- if (i < (int)n->args->argc)
- m->flags |= MDOC_LITERAL;
+ m->flags |= MDOC_LITERAL;
return(1);
}
post_display(POST_ARGS)
{
- if (MDOC_BODY == m->last->type)
+ if (MDOC_BODY == n->type)
m->flags &= ~MDOC_LITERAL;
return(1);
}
+static inline int
+order_rs(enum mdoct t)
+{
+ int i;
+
+ for (i = 0; i < (int)RSORD_MAX; i++)
+ if (rsord[i] == t)
+ return(i);
+
+ abort();
+ /* NOTREACHED */
+}
+
+
+/* ARGSUSED */
+static int
+post_rs(POST_ARGS)
+{
+ struct mdoc_node *nn, *next, *prev;
+ int o;
+
+ if (MDOC_BLOCK != n->type)
+ return(1);
+
+ assert(n->body->child);
+ for (next = NULL, nn = n->body->child->next; nn; nn = next) {
+ o = order_rs(nn->tok);
+
+ /* Remove `nn' from the chain. */
+ next = nn->next;
+ if (next)
+ next->prev = nn->prev;
+
+ prev = nn->prev;
+ if (prev)
+ prev->next = nn->next;
+
+ nn->prev = nn->next = NULL;
+
+ /*
+ * Scan back until we reach a node that's ordered before
+ * us, then set ourselves as being the next.
+ */
+ for ( ; prev; prev = prev->prev)
+ if (order_rs(prev->tok) <= o)
+ break;
+
+ nn->prev = prev;
+ if (prev) {
+ if (prev->next)
+ prev->next->prev = nn;
+ nn->next = prev->next;
+ prev->next = nn;
+ continue;
+ }
+
+ n->body->child->prev = nn;
+ nn->next = n->body->child;
+ n->body->child = nn;
+ }
+ return(1);
+}
git.ckatri.com / mandoc.git / blobdiff