-/* $Id: mdoc_action.c,v 1.6 2009/04/06 08:53:12 kristaps Exp $ */
+/* $Id: mdoc_action.c,v 1.20 2009/06/25 08:42:06 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
* Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/utsname.h>
enum merr {
ETOOLONG,
EMALLOC,
+ EUTSNAME,
ENUMFMT
};
static int post_ar(POST_ARGS);
static int post_bl(POST_ARGS);
+static int post_bl_head(POST_ARGS);
static int post_bl_width(POST_ARGS);
static int post_bl_tagwidth(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_nm(POST_ARGS);
static int post_os(POST_ARGS);
static int post_prol(POST_ARGS);
#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
const struct actions mdoc_actions[MDOC_MAX] = {
- { NULL, NULL }, /* \" */
+ { NULL, NULL }, /* Ap */
{ NULL, post_dd }, /* Dd */
{ NULL, post_dt }, /* Dt */
{ NULL, post_os }, /* Os */
{ NULL, NULL }, /* Ad */
{ NULL, NULL }, /* An */
{ NULL, post_ar }, /* Ar */
- { NULL, NULL }, /* Cd */
+ { NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */
{ NULL, NULL }, /* Cm */
{ NULL, NULL }, /* Dv */
{ NULL, NULL }, /* Er */
{ NULL, NULL }, /* Fr */
{ NULL, NULL }, /* Ud */
{ NULL, NULL }, /* Lb */
- { NULL, NULL }, /* Ap */
{ NULL, NULL }, /* Lp */
- { NULL, NULL }, /* Lk */
+ { NULL, post_lk }, /* Lk */
{ NULL, NULL }, /* Mt */
{ NULL, NULL }, /* Brq */
{ NULL, NULL }, /* Bro */
case (ETOOLONG):
p = "argument text too long";
break;
+ case (EUTSNAME):
+ p = "utsname";
+ break;
case (EMALLOC):
p = "memory exhausted";
break;
if (m->meta.name)
return(1);
- printf("bar\n");
-
buf[0] = 0;
if ( ! concat(m, m->last->child, buf, sizeof(buf)))
return(0);
- printf("foo\n");
-
if (NULL == (m->meta.name = strdup(buf)))
return(verr(m, EMALLOC));
- printf("baz\n");
-
return(1);
}
if (0 == buf[0]) {
if (-1 == uname(&utsname))
- return(mdoc_err(m, "utsname"));
+ return(verr(m, EUTSNAME));
if (strlcat(buf, utsname.sysname, 64) >= 64)
return(verr(m, ETOOLONG));
if (strlcat(buf, " ", 64) >= 64)
if (NULL == (m->meta.os = strdup(buf)))
return(verr(m, EMALLOC));
- m->lastnamed = m->lastsec = SEC_BODY;
+ m->flags |= MDOC_PBODY;
return(post_prol(m));
}
* width if a macro.
*/
- if ((n = m->last->body->child)) {
+ n = m->last->body->child;
+ if (n) {
assert(MDOC_BLOCK == n->type);
assert(MDOC_It == n->tok);
n = n->head->child;
*/
if (0 == strcmp(p, "Ds"))
- width = 8;
+ width = 6;
else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
return(1);
else if (0 == (width = mdoc_macro2len(tok)))
}
+static int
+post_bl_head(POST_ARGS)
+{
+ int i, c;
+ struct mdoc_node *n, *nn, *nnp;
+
+ if (NULL == m->last->child)
+ return(1);
+
+ n = m->last->parent;
+ assert(n->args);
+
+ for (c = 0; c < (int)n->args->argc; c++)
+ if (MDOC_Column == n->args->argv[c].arg)
+ break;
+
+ /* Only process -column. */
+
+ if (c == (int)n->args->argc)
+ return(1);
+
+ assert(0 == n->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.
+ */
+
+ n->args->argv[c].sz = (size_t)m->last->nchild;
+ n->args->argv[c].value = malloc
+ ((size_t)m->last->nchild * sizeof(char *));
+
+ for (i = 0, nn = m->last->child; nn; i++) {
+ n->args->argv[c].value[i] = nn->string;
+ nn->string = NULL;
+ nnp = nn;
+ nn = nn->next;
+ mdoc_node_free(nnp);
+ }
+
+ m->last->nchild = 0;
+ m->last->child = NULL;
+
+ return(1);
+}
+
+
static int
post_bl(POST_ARGS)
{
int i, r, len;
+ if (MDOC_HEAD == m->last->type)
+ return(post_bl_head(m));
if (MDOC_BLOCK != m->last->type)
return(1);
}
+static int
+post_lk(POST_ARGS)
+{
+ struct mdoc_node *n;
+
+ if (m->last->child)
+ return(1);
+
+ n = m->last;
+ m->next = MDOC_NEXT_CHILD;
+ /* FIXME: this isn't documented anywhere! */
+ if ( ! mdoc_word_alloc(m, m->last->line,
+ m->last->pos, "~"))
+ return(0);
+
+ m->last = n;
+ m->next = MDOC_NEXT_SIBLING;
+ return(1);
+}
+
+
static int
post_ar(POST_ARGS)
{
pre_dl(PRE_ARGS)
{
- if (MDOC_BODY != n->type)
- return(1);
- m->flags |= MDOC_LITERAL;
+ if (MDOC_BODY == n->type)
+ m->flags |= MDOC_LITERAL;
return(1);
}
git.ckatri.com / mandoc.git / blobdiff