===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.50
retrieving revision 1.53
diff -u -p -r1.50 -r1.53
--- mandoc/term.c	2009/03/09 13:17:49	1.50
+++ mandoc/term.c	2009/03/11 00:39:58	1.53
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.50 2009/03/09 13:17:49 kristaps Exp $ */
+/* $Id: term.c,v 1.53 2009/03/11 00:39:58 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -53,7 +53,9 @@
 #define	TTYPE_SYMB	  16
 #define	TTYPE_SYMBOL	  17
 #define	TTYPE_DIAG	  18
-#define	TTYPE_NMAX	  19
+#define	TTYPE_LINK_ANCHOR 19
+#define	TTYPE_LINK_TEXT	  20
+#define	TTYPE_NMAX	  21
 
 /* 
  * These define "styles" for element types, like command arguments or
@@ -82,7 +84,9 @@ const	int ttypes[TTYPE_NMAX] = {
 	TERMP_BOLD,	 	/* TTYPE_INCLUDE */
 	TERMP_BOLD,	 	/* TTYPE_SYMB */
 	TERMP_BOLD,	 	/* TTYPE_SYMBOL */
-	TERMP_BOLD	 	/* TTYPE_DIAG */
+	TERMP_BOLD,	 	/* TTYPE_DIAG */
+	TERMP_UNDERLINE, 	/* TTYPE_LINK_ANCHOR */
+	TERMP_BOLD	 	/* TTYPE_LINK_TEXT */
 };
 
 static	int		  arg_hasattr(int, const struct mdoc_node *);
@@ -114,6 +118,7 @@ DECL_PREPOST(termp__t);
 DECL_PREPOST(termp_aq);
 DECL_PREPOST(termp_bd);
 DECL_PREPOST(termp_bq);
+DECL_PREPOST(termp_brq);
 DECL_PREPOST(termp_d1);
 DECL_PREPOST(termp_dq);
 DECL_PREPOST(termp_fd);
@@ -146,7 +151,9 @@ DECL_PRE(termp_fa);
 DECL_PRE(termp_fl);
 DECL_PRE(termp_fx);
 DECL_PRE(termp_ic);
+DECL_PRE(termp_lk);
 DECL_PRE(termp_ms);
+DECL_PRE(termp_mt);
 DECL_PRE(termp_nd);
 DECL_PRE(termp_nm);
 DECL_PRE(termp_ns);
@@ -279,6 +286,11 @@ const	struct termact __termacts[MDOC_MAX] = {
 	{ termp_lb_pre, termp_lb_post }, /* Lb */
 	{ termp_ap_pre, NULL }, /* Lb */
 	{ termp_pp_pre, NULL }, /* Pp */ 
+	{ termp_lk_pre, NULL }, /* Lk */ 
+	{ termp_mt_pre, NULL }, /* Mt */ 
+	{ termp_brq_pre, termp_brq_post }, /* Brq */ 
+	{ termp_brq_pre, termp_brq_post }, /* Bro */ 
+	{ NULL, NULL }, /* Brc */ 
 };
 
 const struct termact *termacts = __termacts;
@@ -725,12 +737,8 @@ termp_st_pre(DECL_ARGS)
 {
 	const char	*cp;
 
-	if (node->child) {
-		if (MDOC_TEXT != node->child->type)
-			errx(1, "expected text line arguments");
-		if ((cp = mdoc_a2st(node->child->string)))
-			word(p, cp);
-	}
+	if (node->child && (cp = mdoc_a2st(node->child->string)))
+		word(p, cp);
 	return(0);
 }
 
@@ -839,23 +847,15 @@ termp_xr_pre(DECL_ARGS)
 
 	if (NULL == (n = node->child))
 		errx(1, "expected text line argument");
-	if (MDOC_TEXT != n->type)
-		errx(1, "expected text line argument");
-
 	word(p, n->string);
-
 	if (NULL == (n = n->next)) 
 		return(0);
-	if (MDOC_TEXT != n->type)
-		errx(1, "expected text line argument");
-
 	p->flags |= TERMP_NOSPACE;
 	word(p, "(");
 	p->flags |= TERMP_NOSPACE;
 	word(p, n->string);
 	p->flags |= TERMP_NOSPACE;
 	word(p, ")");
-
 	return(0);
 }
 
@@ -982,14 +982,10 @@ termp_lb_pre(DECL_ARGS)
 
 	if (NULL == node->child)
 		errx(1, "expected text line argument");
-	if (MDOC_TEXT != node->child->type)
-		errx(1, "expected text line argument");
-
 	if ((lb = mdoc_a2lib(node->child->string))) {
 		word(p, lb);
 		return(0);
 	}
-
 	word(p, "library");
 	return(1);
 }
@@ -1095,8 +1091,6 @@ termp_fn_pre(DECL_ARGS)
 
 	if (NULL == node->child)
 		errx(1, "expected text line arguments");
-	if (MDOC_TEXT != node->child->type)
-		errx(1, "expected text line arguments");
 
 	/* FIXME: can be "type funcname" "type varname"... */
 
@@ -1108,8 +1102,6 @@ termp_fn_pre(DECL_ARGS)
 
 	p->flags |= TERMP_NOSPACE;
 	for (n = node->child->next; n; n = n->next) {
-		if (MDOC_TEXT != n->type)
-			errx(1, "expected text line arguments");
 		p->flags |= ttypes[TTYPE_FUNC_ARG];
 		word(p, n->string);
 		p->flags &= ~ttypes[TTYPE_FUNC_ARG];
@@ -1159,13 +1151,9 @@ termp_fa_pre(DECL_ARGS)
 	}
 
 	for (n = node->child; n; n = n->next) {
-		if (MDOC_TEXT != n->type)
-			errx(1, "expected text line arguments");
-
 		p->flags |= ttypes[TTYPE_FUNC_ARG];
 		word(p, n->string);
 		p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-
 		if (n->next)
 			word(p, ",");
 	}
@@ -1528,12 +1516,8 @@ termp_at_pre(DECL_ARGS)
 
 	att = NULL;
 
-	if (node->child) {
-		if (MDOC_TEXT != node->child->type)
-			errx(1, "expected text line argument");
+	if (node->child)
 		att = mdoc_a2att(node->child->string);
-	}
-
 	if (NULL == att)
 		att = "AT&T UNIX";
 
@@ -1544,12 +1528,37 @@ termp_at_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
+termp_brq_pre(DECL_ARGS)
+{
+
+	if (MDOC_BODY != node->type)
+		return(1);
+	word(p, "\\(lC");
+	p->flags |= TERMP_NOSPACE;
+	return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp_brq_post(DECL_ARGS)
+{
+
+	if (MDOC_BODY != node->type)
+		return;
+	p->flags |= TERMP_NOSPACE;
+	word(p, "\\(rC");
+}
+
+
+/* ARGSUSED */
+static int
 termp_bq_pre(DECL_ARGS)
 {
 
 	if (MDOC_BODY != node->type)
 		return(1);
-	word(p, "[");
+	word(p, "\\(lB");
 	p->flags |= TERMP_NOSPACE;
 	return(1);
 }
@@ -1562,7 +1571,8 @@ termp_bq_post(DECL_ARGS)
 
 	if (MDOC_BODY != node->type)
 		return;
-	word(p, "]");
+	p->flags |= TERMP_NOSPACE;
+	word(p, "\\(rB");
 }
 
 
@@ -1624,7 +1634,9 @@ termp_fo_post(DECL_ARGS)
 
 	if (MDOC_BODY != node->type)
 		return;
+	p->flags |= TERMP_NOSPACE;
 	word(p, ")");
+	p->flags |= TERMP_NOSPACE;
 	word(p, ";");
 	newln(p);
 }
@@ -1747,3 +1759,39 @@ termp____post(DECL_ARGS)
 	p->flags |= TERMP_NOSPACE;
 	word(p, node->next ? "," : ".");
 }
+
+
+/* ARGSUSED */
+static int
+termp_lk_pre(DECL_ARGS)
+{
+	const struct mdoc_node *n;
+
+	if (NULL == (n = node->child))
+		errx(1, "expected line argument");
+
+	p->flags |= ttypes[TTYPE_LINK_ANCHOR];
+	word(p, n->string);
+	p->flags &= ~ttypes[TTYPE_LINK_ANCHOR];
+	p->flags |= TERMP_NOSPACE;
+	word(p, ":");
+
+	p->flags |= ttypes[TTYPE_LINK_TEXT];
+	for ( ; n; n = n->next) {
+		word(p, n->string);
+	}
+	p->flags &= ~ttypes[TTYPE_LINK_TEXT];
+
+	return(0);
+}
+
+
+/* ARGSUSED */
+static int
+termp_mt_pre(DECL_ARGS)
+{
+
+	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]);
+	return(1);
+}
+