===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.45
retrieving revision 1.51
diff -u -p -r1.45 -r1.51
--- mandoc/term.c	2009/03/08 13:57:07	1.45
+++ mandoc/term.c	2009/03/09 14:19:59	1.51
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.45 2009/03/08 13:57:07 kristaps Exp $ */
+/* $Id: term.c,v 1.51 2009/03/09 14:19:59 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -16,6 +16,8 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
@@ -51,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
@@ -80,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 *);
@@ -120,6 +126,7 @@ DECL_PREPOST(termp_fo);
 DECL_PREPOST(termp_ft);
 DECL_PREPOST(termp_in);
 DECL_PREPOST(termp_it);
+DECL_PREPOST(termp_lb);
 DECL_PREPOST(termp_op);
 DECL_PREPOST(termp_pf);
 DECL_PREPOST(termp_pq);
@@ -129,6 +136,7 @@ DECL_PREPOST(termp_ss);
 DECL_PREPOST(termp_sq);
 DECL_PREPOST(termp_vt);
 
+DECL_PRE(termp_ap);
 DECL_PRE(termp_ar);
 DECL_PRE(termp_at);
 DECL_PRE(termp_bf);
@@ -142,7 +150,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);
@@ -164,7 +174,6 @@ DECL_PRE(termp_xr);
 DECL_POST(termp___);
 DECL_POST(termp_bl);
 DECL_POST(termp_bx);
-DECL_POST(termp_lb);
 
 const	struct termact __termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* \" */
@@ -273,7 +282,11 @@ const	struct termact __termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Hf */
 	{ NULL, NULL }, /* Fr */
 	{ termp_ud_pre, NULL }, /* Ud */
-	{ NULL, termp_lb_post }, /* lb */
+	{ 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 */ 
 };
 
 const struct termact *termacts = __termacts;
@@ -316,7 +329,7 @@ arg_listtype(const struct mdoc_node *n)
 
 	assert(MDOC_BLOCK == n->type);
 
-	len = n->args ? n->args->argc : 0;
+	len = (int)(n->args ? n->args->argc : 0);
 
 	for (i = 0; i < len; i++) 
 		switch (n->args->argv[i].arg) {
@@ -970,6 +983,27 @@ termp_bt_pre(DECL_ARGS)
 
 
 /* ARGSUSED */
+static int
+termp_lb_pre(DECL_ARGS)
+{
+	const char	*lb;
+
+	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);
+}
+
+
+/* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)
 {
@@ -1679,6 +1713,18 @@ termp_sm_pre(DECL_ARGS)
 
 /* ARGSUSED */
 static int
+termp_ap_pre(DECL_ARGS)
+{
+
+	p->flags |= TERMP_NOSPACE;
+	word(p, "\\(aq");
+	p->flags |= TERMP_NOSPACE;
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
 termp__t_pre(DECL_ARGS)
 {
 
@@ -1709,3 +1755,43 @@ 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 text line argument");
+	if (MDOC_TEXT != n->type)
+		errx(1, "expected text 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) {
+		if (MDOC_TEXT != n->type)
+			errx(1, "expected text line argument");
+		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);
+}
+