===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.45
retrieving revision 1.49
diff -u -p -r1.45 -r1.49
--- mandoc/term.c	2009/03/08 13:57:07	1.45
+++ mandoc/term.c	2009/03/08 20:57:35	1.49
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.45 2009/03/08 13:57:07 kristaps Exp $ */
+/* $Id: term.c,v 1.49 2009/03/08 20:57:35 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -120,6 +120,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 +130,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);
@@ -164,7 +166,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 +274,9 @@ 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 */ 
 };
 
 const struct termact *termacts = __termacts;
@@ -316,7 +319,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 +973,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)
 {
@@ -1674,6 +1698,18 @@ termp_sm_pre(DECL_ARGS)
 #endif
 
 	return(0);
+}
+
+
+/* ARGSUSED */
+static int
+termp_ap_pre(DECL_ARGS)
+{
+
+	p->flags |= TERMP_NOSPACE;
+	word(p, "\\(aq");
+	p->flags |= TERMP_NOSPACE;
+	return(1);
 }