===================================================================
RCS file: /cvs/mandoc/Attic/man_action.c,v
retrieving revision 1.30
retrieving revision 1.35
diff -u -p -r1.30 -r1.35
--- mandoc/Attic/man_action.c	2010/03/27 10:04:56	1.30
+++ mandoc/Attic/man_action.c	2010/05/17 10:50:32	1.35
@@ -1,6 +1,6 @@
-/*	$Id: man_action.c,v 1.30 2010/03/27 10:04:56 kristaps Exp $ */
+/*	$Id: man_action.c,v 1.35 2010/05/17 10:50:32 joerg Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * 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
@@ -30,9 +30,10 @@ struct	actions {
 };
 
 static	int	  post_TH(struct man *);
-static	int	  post_de(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 }, /* br */
@@ -65,17 +66,12 @@ const	struct actions man_actions[MAN_MAX] = {
 	{ NULL }, /* RE */
 	{ NULL }, /* RS */
 	{ NULL }, /* DT */
-	{ NULL }, /* UC */
+	{ post_UC }, /* UC */
 	{ NULL }, /* PD */
 	{ NULL }, /* Sp */
 	{ post_nf }, /* Vb */
 	{ post_fi }, /* Ve */
-	{ post_de }, /* de */
-	{ post_de }, /* dei */
-	{ post_de }, /* am */
-	{ post_de }, /* ami */
-	{ post_de }, /* ig */
-	{ NULL }, /* . */
+	{ post_AT }, /* AT */
 };
 
 
@@ -115,20 +111,6 @@ post_fi(struct man *m)
 
 
 static int
-post_de(struct man *m)
-{
-
-	/*
-	 * XXX: for the time being, we indiscriminately remove roff
-	 * instructions from the parse stream.
-	 */
-	if (MAN_BLOCK == m->last->type)
-		man_node_delete(m, m->last);
-	return(1);
-}
-
-
-static int
 post_nf(struct man *m)
 {
 
@@ -144,8 +126,6 @@ static int
 post_TH(struct man *m)
 {
 	struct man_node	*n;
-	char		*ep;
-	long		 lval;
 
 	if (m->meta.title)
 		free(m->meta.title);
@@ -153,9 +133,11 @@ post_TH(struct man *m)
 		free(m->meta.vol);
 	if (m->meta.source)
 		free(m->meta.source);
+	if (m->meta.msec)
+		free(m->meta.msec);
 
-	m->meta.title = m->meta.vol = m->meta.source = NULL;
-	m->meta.msec = 0;
+	m->meta.title = m->meta.vol = 
+		m->meta.msec = m->meta.source = NULL;
 	m->meta.date = 0;
 
 	/* ->TITLE<- MSEC DATE SOURCE VOL */
@@ -168,20 +150,14 @@ post_TH(struct man *m)
 
 	n = n->next;
 	assert(n);
+	m->meta.msec = mandoc_strdup(n->string);
 
-	lval = strtol(n->string, &ep, 10);
-	if (n->string[0] != '\0' && *ep == '\0')
-		m->meta.msec = (int)lval;
-	else if ( ! man_nwarn(m, n, WMSEC))
-		return(0);
-
 	/* TITLE MSEC ->DATE<- SOURCE VOL */
 
 	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);
@@ -205,5 +181,84 @@ post_TH(struct man *m)
 	 * meta-data.
 	 */
 	man_node_delete(m, m->last);
+	return(1);
+}
+
+
+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
+			p = unix_versions[0];
+	}
+
+	m->meta.source = mandoc_strdup(p);
+
+	return(1);
+}
+
+
+static int
+post_UC(struct man *m)
+{
+	static const char * const bsd_versions[] = {
+	    "3rd Berkeley Distribution",
+	    "4th Berkeley Distribution",
+	    "4.2 Berkeley Distribution",
+	    "4.3 Berkeley Distribution",
+	    "4.4 Berkeley Distribution",
+	};
+
+	const char	*p, *s;
+	struct man_node	*n;
+
+	n = m->last->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];
+	}
+
+	m->meta.source = mandoc_strdup(p);
+
 	return(1);
 }