===================================================================
RCS file: /cvs/mandoc/Attic/man_action.c,v
retrieving revision 1.1
retrieving revision 1.35
diff -u -p -r1.1 -r1.35
--- mandoc/Attic/man_action.c	2009/03/25 15:36:05	1.1
+++ mandoc/Attic/man_action.c	2010/05/17 10:50:32	1.35
@@ -1,41 +1,43 @@
-/* $Id: man_action.c,v 1.1 2009/03/25 15:36:05 kristaps Exp $ */
+/*	$Id: man_action.c,v 1.35 2010/05/17 10:50:32 joerg Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * 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>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "libman.h"
+#include "libmandoc.h"
 
-
 struct	actions {
 	int	(*post)(struct man *);
 };
 
+static	int	  post_TH(struct man *);
+static	int	  post_fi(struct man *);
+static	int	  post_nf(struct man *);
+static	int	  post_AT(struct man *);
+static	int	  post_UC(struct man *);
 
 const	struct actions man_actions[MAN_MAX] = {
-	{ NULL }, /* __ */
-	{ NULL }, /* TH */
+	{ NULL }, /* br */
+	{ post_TH }, /* TH */
 	{ NULL }, /* SH */
 	{ NULL }, /* SS */
 	{ NULL }, /* TP */
@@ -54,6 +56,22 @@ const	struct actions man_actions[MAN_MAX] = {
 	{ NULL }, /* B */
 	{ NULL }, /* I */
 	{ NULL }, /* IR */
+	{ NULL }, /* RI */
+	{ NULL }, /* na */
+	{ NULL }, /* i */
+	{ NULL }, /* sp */
+	{ post_nf }, /* nf */
+	{ post_fi }, /* fi */
+	{ NULL }, /* r */
+	{ NULL }, /* RE */
+	{ NULL }, /* RS */
+	{ NULL }, /* DT */
+	{ post_UC }, /* UC */
+	{ NULL }, /* PD */
+	{ NULL }, /* Sp */
+	{ post_nf }, /* Vb */
+	{ post_fi }, /* Ve */
+	{ post_AT }, /* AT */
 };
 
 
@@ -67,130 +85,180 @@ man_action_post(struct man *m)
 
 	switch (m->last->type) {
 	case (MAN_TEXT):
-		break;
+		/* FALLTHROUGH */
 	case (MAN_ROOT):
-		break;
+		return(1);
 	default:
-		if (NULL == man_actions[m->last->tok].post)
-			break;
-		return((*man_actions[m->last->tok].post)(m));
+		break;
 	}
+
+	if (NULL == man_actions[m->last->tok].post)
+		return(1);
+	return((*man_actions[m->last->tok].post)(m));
+}
+
+
+static int
+post_fi(struct man *m)
+{
+
+	if ( ! (MAN_LITERAL & m->flags))
+		if ( ! man_nwarn(m, m->last, WNLITERAL))
+			return(0);
+	m->flags &= ~MAN_LITERAL;
 	return(1);
 }
 
-#if 0
+
 static int
-post_dt(POST_ARGS)
+post_nf(struct man *m)
 {
-	struct mdoc_node *n;
-	const char	 *cp;
-	char		 *ep;
-	long		  lval;
 
+	if (MAN_LITERAL & m->flags)
+		if ( ! man_nwarn(m, m->last, WOLITERAL))
+			return(0);
+	m->flags |= MAN_LITERAL;
+	return(1);
+}
+
+
+static int
+post_TH(struct man *m)
+{
+	struct man_node	*n;
+
 	if (m->meta.title)
 		free(m->meta.title);
 	if (m->meta.vol)
 		free(m->meta.vol);
-	if (m->meta.arch)
-		free(m->meta.arch);
+	if (m->meta.source)
+		free(m->meta.source);
+	if (m->meta.msec)
+		free(m->meta.msec);
 
-	m->meta.title = m->meta.vol = m->meta.arch = NULL;
-	m->meta.msec = 0;
+	m->meta.title = m->meta.vol = 
+		m->meta.msec = m->meta.source = NULL;
+	m->meta.date = 0;
 
-	/* Handles: `.Dt' 
-	 *   --> title = unknown, volume = local, msec = 0, arch = NULL
-	 */
+	/* ->TITLE<- MSEC DATE SOURCE VOL */
 
-	if (NULL == (n = m->last->child)) {
-		m->meta.title = xstrdup("unknown");
-		m->meta.vol = xstrdup("local");
-		return(post_prol(m));
-	}
+	n = m->last->child;
+	assert(n);
+	m->meta.title = mandoc_strdup(n->string);
 
-	/* Handles: `.Dt TITLE' 
-	 *   --> title = TITLE, volume = local, msec = 0, arch = NULL
-	 */
+	/* TITLE ->MSEC<- DATE SOURCE VOL */
 
-	m->meta.title = xstrdup(n->string);
+	n = n->next;
+	assert(n);
+	m->meta.msec = mandoc_strdup(n->string);
 
-	if (NULL == (n = n->next)) {
-		m->meta.vol = xstrdup("local");
-		return(post_prol(m));
-	}
+	/* TITLE MSEC ->DATE<- SOURCE VOL */
 
-	/* Handles: `.Dt TITLE SEC'
-	 *   --> title = TITLE, volume = SEC is msec ? 
-	 *           format(msec) : SEC,
-	 *       msec = SEC is msec ? atoi(msec) : 0,
-	 *       arch = NULL
-	 */
+	n = n->next;
+	if (n) {
+		m->meta.date = mandoc_a2time
+			(MTIME_ISO_8601, n->string);
+		if (0 == m->meta.date) {
+			if ( ! man_nwarn(m, n, WDATE))
+				return(0);
+			m->meta.date = time(NULL);
+		}
+	} else
+		m->meta.date = time(NULL);
 
-	cp = mdoc_a2msec(n->string);
-	if (cp) {
-		m->meta.vol = xstrdup(cp);
-		errno = 0;
-		lval = strtol(n->string, &ep, 10);
-		if (n->string[0] != '\0' && *ep == '\0')
-			m->meta.msec = (int)lval;
-	} else 
-		m->meta.vol = xstrdup(n->string);
+	/* TITLE MSEC DATE ->SOURCE<- VOL */
 
-	if (NULL == (n = n->next))
-		return(post_prol(m));
+	if (n && (n = n->next))
+		m->meta.source = mandoc_strdup(n->string);
 
-	/* Handles: `.Dt TITLE SEC VOL'
-	 *   --> title = TITLE, volume = VOL is vol ?
-	 *       format(VOL) : 
-	 *           VOL is arch ? format(arch) : 
-	 *               VOL
+	/* TITLE MSEC DATE SOURCE ->VOL<- */
+
+	if (n && (n = n->next))
+		m->meta.vol = mandoc_strdup(n->string);
+
+	/*
+	 * Remove the `TH' node after we've processed it for our
+	 * meta-data.
 	 */
+	man_node_delete(m, m->last);
+	return(1);
+}
 
-	cp = mdoc_a2vol(n->string);
-	if (cp) {
-		free(m->meta.vol);
-		m->meta.vol = xstrdup(cp);
-		n = n->next;
-	} else {
-		cp = mdoc_a2arch(n->string);
-		if (NULL == cp) {
-			free(m->meta.vol);
-			m->meta.vol = xstrdup(n->string);
+
+static int
+post_AT(struct man *m)
+{
+	static const char * const unix_versions[] = {
+	    "7th Edition",
+	    "System III",
+	    "System V",
+	    "System V Release 2",
+	};
+
+	const char	*p, *s;
+	struct man_node	*n, *nn;
+
+	n = m->last->child;
+
+	if (NULL == n || MAN_TEXT != n->type)
+		p = unix_versions[0];
+	else {
+		s = n->string;
+		if (0 == strcmp(s, "3"))
+			p = unix_versions[0];
+		else if (0 == strcmp(s, "4"))
+			p = unix_versions[1];
+		else if (0 == strcmp(s, "5")) {
+			nn = n->next;
+			if (nn && MAN_TEXT == nn->type && nn->string[0])
+				p = unix_versions[3];
+			else
+				p = unix_versions[2];
 		} else
-			m->meta.arch = xstrdup(cp);
-	}	
+			p = unix_versions[0];
+	}
 
-	/* Ignore any subsequent parameters... */
+	m->meta.source = mandoc_strdup(p);
 
-	return(post_prol(m));
+	return(1);
 }
 
+
 static int
-post_prol(POST_ARGS)
+post_UC(struct man *m)
 {
-	struct mdoc_node *n;
+	static const char * const bsd_versions[] = {
+	    "3rd Berkeley Distribution",
+	    "4th Berkeley Distribution",
+	    "4.2 Berkeley Distribution",
+	    "4.3 Berkeley Distribution",
+	    "4.4 Berkeley Distribution",
+	};
 
-	/* 
-	 * The end document shouldn't have the prologue macros as part
-	 * of the syntax tree (they encompass only meta-data).  
-	 */
+	const char	*p, *s;
+	struct man_node	*n;
 
-	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->child;
 
-	n = m->last;
-	assert(NULL == m->last->next);
-
-	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 (NULL == n || MAN_TEXT != n->type)
+		p = bsd_versions[0];
+	else {
+		s = n->string;
+		if (0 == strcmp(s, "3"))
+			p = bsd_versions[0];
+		else if (0 == strcmp(s, "4"))
+			p = bsd_versions[1];
+		else if (0 == strcmp(s, "5"))
+			p = bsd_versions[2];
+		else if (0 == strcmp(s, "6"))
+			p = bsd_versions[3];
+		else if (0 == strcmp(s, "7"))
+			p = bsd_versions[4];
+		else
+			p = bsd_versions[0];
 	}
 
-	mdoc_node_freelist(n);
+	m->meta.source = mandoc_strdup(p);
+
 	return(1);
 }
-#endif