===================================================================
RCS file: /cvs/mandoc/Attic/strings.c,v
retrieving revision 1.18
retrieving revision 1.25
diff -u -p -r1.18 -r1.25
--- mandoc/Attic/strings.c	2009/02/24 14:52:55	1.18
+++ mandoc/Attic/strings.c	2009/03/05 13:12:12	1.25
@@ -1,4 +1,4 @@
-/* $Id: strings.c,v 1.18 2009/02/24 14:52:55 kristaps Exp $ */
+/* $Id: strings.c,v 1.25 2009/03/05 13:12:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -61,10 +61,27 @@ mdoc_isescape(const char *p)
 		/* FALLTHROUGH */
 	case ('e'):
 		return(2);
+	case ('*'):
+		if (0 == *++p || ! isgraph((u_char)*p))
+			return(0);
+		switch (*p) {
+		case ('('):
+			if (0 == *++p || ! isgraph((u_char)*p))
+				return(0);
+			return(4);
+		case ('['):
+			for (c = 3, p++; *p && ']' != *p; p++, c++)
+				if ( ! isgraph((u_char)*p))
+					break;
+			return(*p == ']' ? c : 0);
+		default:
+			break;
+		}
+		return(3);
 	case ('('):
-		if (0 == *++p || ! isgraph(*p))
+		if (0 == *++p || ! isgraph((u_char)*p))
 			return(0);
-		if (0 == *++p || ! isgraph(*p))
+		if (0 == *++p || ! isgraph((u_char)*p))
 			return(0);
 		return(4);
 	case ('['):
@@ -74,7 +91,7 @@ mdoc_isescape(const char *p)
 	}
 
 	for (c = 3, p++; *p && ']' != *p; p++, c++)
-		if ( ! isgraph(*p))
+		if ( ! isgraph((u_char)*p))
 			break;
 
 	return(*p == ']' ? c : 0);
@@ -178,9 +195,9 @@ mdoc_atotime(const char *p)
 
 	(void)memset(&tm, 0, sizeof(struct tm));
 
-	if (xstrcmp(p, "$Mdocdate: February 24 2009 $"))
+	if (xstrcmp(p, "$Mdocdate: March 5 2009 $"))
 		return(time(NULL));
-	if ((pp = strptime(p, "$Mdocdate: February 24 2009 $", &tm)) && 0 == *pp)
+	if ((pp = strptime(p, "$Mdocdate: March 5 2009 $", &tm)) && 0 == *pp)
 		return(mktime(&tm));
 	/* XXX - this matches "June 1999", which is wrong. */
 	if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
@@ -346,6 +363,8 @@ mdoc_atoatt(const char *p)
 		return(ATT_v7);
 	else if (0 == strcmp(p, "32v"))
 		return(ATT_32v);
+	else if (0 == strcmp(p, "V"))
+		return(ATT_V);
 	else if (0 == strcmp(p, "V.1"))
 		return(ATT_V1);
 	else if (0 == strcmp(p, "V.2"))
@@ -404,7 +423,7 @@ mdoc_arch2a(enum mdoc_arch arch)
 	case (ARCH_armish):
 		return("ARMISH");
 	case (ARCH_aviion):
-		return("AViion");
+		return("AViiON");
 	case (ARCH_hp300):
 		return("HP300");
 	case (ARCH_hppa):
@@ -460,23 +479,23 @@ mdoc_vol2a(enum mdoc_vol vol)
 
 	switch (vol) {
 	case (VOL_AMD):
-		return("OpenBSD Ancestral Manual Documents");
+		return("Ancestral Manual Documents");
 	case (VOL_IND):
-		return("OpenBSD Manual Master Index");
+		return("Manual Master Index");
 	case (VOL_KM):
-		return("OpenBSD Kernel Manual");
+		return("Kernel Manual");
 	case (VOL_LOCAL):
-		return("OpenBSD Local Manual");
+		return("Local Manual");
 	case (VOL_PRM):
-		return("OpenBSD Programmer's Manual");
+		return("Programmer's Manual");
 	case (VOL_PS1):
-		return("OpenBSD Programmer's Supplementary Documents");
+		return("Programmer's Supplementary Documents");
 	case (VOL_SMM):
-		return("OpenBSD System Manager's Manual");
+		return("System Manager's Manual");
 	case (VOL_URM):
-		return("OpenBSD Reference Manual");
+		return("Reference Manual");
 	case (VOL_USD):
-		return("OpenBSD User's Supplementary Documents");
+		return("User's Supplementary Documents");
 	case (VOL_DEFAULT):
 		return(NULL);
 	default:
@@ -707,6 +726,9 @@ mdoc_att2a(enum mdoc_att c)
 	case(ATT_32v):
 		p = "Version 32V AT&T UNIX";
 		break;
+	case(ATT_V):
+		p = "AT&T System V UNIX";
+		break;
 	case(ATT_V1):
 		p = "AT&T System V.1 UNIX";
 		break;
@@ -725,4 +747,98 @@ mdoc_att2a(enum mdoc_att c)
 	}
 
 	return(p);
+}
+
+
+size_t
+mdoc_macro2len(int macro)
+{
+
+	switch (macro) {
+	case(MDOC_Ad):
+		return(12);
+	case(MDOC_Ao):
+		return(12);
+	case(MDOC_An):
+		return(12);
+	case(MDOC_Aq):
+		return(12);
+	case(MDOC_Ar):
+		return(12);
+	case(MDOC_Bo):
+		return(12);
+	case(MDOC_Bq):
+		return(12);
+	case(MDOC_Cd):
+		return(12);
+	case(MDOC_Cm):
+		return(10);
+	case(MDOC_Do):
+		return(10);
+	case(MDOC_Dq):
+		return(12);
+	case(MDOC_Dv):
+		return(12);
+	case(MDOC_Eo):
+		return(12);
+	case(MDOC_Em):
+		return(10);
+	case(MDOC_Er):
+		return(12);
+	case(MDOC_Ev):
+		return(15);
+	case(MDOC_Fa):
+		return(12);
+	case(MDOC_Fl):
+		return(10);
+	case(MDOC_Fo):
+		return(16);
+	case(MDOC_Fn):
+		return(16);
+	case(MDOC_Ic):
+		return(10);
+	case(MDOC_Li):
+		return(16);
+	case(MDOC_Ms):
+		return(6);
+	case(MDOC_Nm):
+		return(10);
+	case(MDOC_No):
+		return(12);
+	case(MDOC_Oo):
+		return(10);
+	case(MDOC_Op):
+		return(14);
+	case(MDOC_Pa):
+		return(32);
+	case(MDOC_Pf):
+		return(12);
+	case(MDOC_Po):
+		return(12);
+	case(MDOC_Pq):
+		return(12);
+	case(MDOC_Ql):
+		return(16);
+	case(MDOC_Qo):
+		return(12);
+	case(MDOC_So):
+		return(12);
+	case(MDOC_Sq):
+		return(12);
+	case(MDOC_Sy):
+		return(6);
+	case(MDOC_Sx):
+		return(16);
+	case(MDOC_Tn):
+		return(10);
+	case(MDOC_Va):
+		return(12);
+	case(MDOC_Vt):
+		return(12);
+	case(MDOC_Xr):
+		return(10);
+	default:
+		break;
+	};
+	return(0);
 }