Removed TODO that was fixed by parsing escapes in offset strings.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index ba16bbc260adf471d75c12c46f297beaa26f7a08..c2ba9eaf758573ef3bb32ec8d04b5773b8ca5fc8 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.183 2010/08/21 14:04:13 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.185 2010/09/23 20:40:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -92,6 +92,7 @@ static        void      termp_sh_post(DECL_ARGS);
 static void      termp_sq_post(DECL_ARGS);
 static void      termp_ss_post(DECL_ARGS);
 
+static int       termp__a_pre(DECL_ARGS);
 static int       termp_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
@@ -178,7 +179,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */
        { termp_xr_pre, NULL }, /* Xr */
-       { NULL, termp____post }, /* %A */
+       { termp__a_pre, termp____post }, /* %A */
        { termp_under_pre, termp____post }, /* %B */
        { NULL, termp____post }, /* %D */
        { termp_under_pre, termp____post }, /* %I */
@@ -1030,12 +1031,18 @@ termp_nm_pre(DECL_ARGS)
                synopsis_pre(p, n->parent);
 
        if (MDOC_HEAD == n->type && n->next->child) {
-               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_HANG;
-               p->rmargin = p->offset + term_len(p, 1) +
-                   (NULL == n->child ? term_strlen(p, m->name) :
-                    MDOC_TEXT == n->child->type ?
-                       term_strlen(p, n->child->string) :
-                    term_len(p, 5));
+               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
+               p->rmargin = p->offset + term_len(p, 1);
+               if (NULL == n->child) {
+                       p->rmargin += term_strlen(p, m->name);
+               } else if (MDOC_TEXT == n->child->type) {
+                       p->rmargin += term_strlen(p, n->child->string);
+                       if (n->child->next)
+                               p->flags |= TERMP_HANG;
+               } else {
+                       p->rmargin += term_len(p, 5);
+                       p->flags |= TERMP_HANG;
+               }
        }
 
        term_fontpush(p, TERMFONT_BOLD);
@@ -1077,6 +1084,19 @@ termp_fl_pre(DECL_ARGS)
 }
 
 
+/* ARGSUSED */
+static int
+termp__a_pre(DECL_ARGS)
+{
+
+       if (n->prev && MDOC__A == n->prev->tok)
+               if (NULL == n->next || MDOC__A != n->next->tok)
+                       term_word(p, "and");
+
+       return(1);
+}
+
+
 /* ARGSUSED */
 static int
 termp_an_pre(DECL_ARGS)
@@ -2098,6 +2118,16 @@ static void
 termp____post(DECL_ARGS)
 {
 
+       /*
+        * Handle lists of authors.  In general, print each followed by
+        * a comma.  Don't print the comma if there are only two
+        * authors.
+        */
+       if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)
+               if (NULL == n->next->next || MDOC__A != n->next->next->tok)
+                       if (NULL == n->prev || MDOC__A != n->prev->tok)
+                               return;
+
        /* TODO: %U. */
 
        p->flags |= TERMP_NOSPACE;