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 cdad7fb5dfcb203a1172778e892217163fc92a60..c2ba9eaf758573ef3bb32ec8d04b5773b8ca5fc8 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.171 2010/07/04 22:04:04 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>
@@ -31,7 +31,6 @@
 #include "mandoc.h"
 #include "out.h"
 #include "term.h"
-#include "regs.h"
 #include "mdoc.h"
 #include "chars.h"
 #include "main.h"
@@ -93,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);
@@ -152,7 +152,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_bl_pre, termp_bl_post }, /* Bl */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
-       { NULL, NULL }, /* Ad */ 
+       { termp_under_pre, NULL }, /* Ad */ 
        { termp_an_pre, termp_an_post }, /* An */
        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
@@ -179,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 */
@@ -209,7 +209,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_under_pre, NULL }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
-       { termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */
+       { termp_bold_pre, NULL }, /* Ms */
        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
@@ -330,6 +330,23 @@ print_mdoc_node(DECL_ARGS)
        else if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
                chld = (*termacts[n->tok].pre)(p, &npair, m, n);
 
+       /*
+        * Keeps only work until the end of a line.  If a keep was
+        * invoked in a prior line, revert it to PREKEEP.
+        */
+
+       if (TERMP_KEEP & p->flags) {
+               if (n->prev && n->prev->line != n->line) {
+                       p->flags &= ~TERMP_KEEP;
+                       p->flags |= TERMP_PREKEEP;
+               } else if (NULL == n->prev) {
+                       if (n->parent && n->parent->line != n->line) {
+                               p->flags &= ~TERMP_KEEP;
+                               p->flags |= TERMP_PREKEEP;
+                       }
+               }
+       }
+
        if (chld && n->child)
                print_mdoc_nodelist(p, &npair, m, n->child);
 
@@ -1010,15 +1027,22 @@ termp_nm_pre(DECL_ARGS)
        if (NULL == n->child && NULL == m->name)
                return(0);
 
-       synopsis_pre(p, n);
+       if (MDOC_HEAD == n->type)
+               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);
@@ -1060,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)
@@ -1604,8 +1641,7 @@ termp_fa_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
-       size_t                   tabwidth;
-       size_t                   rm, rmax;
+       size_t                   tabwidth, rm, rmax;
        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {
@@ -1637,12 +1673,11 @@ termp_bd_pre(DECL_ARGS)
        p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
        for (nn = n->child; nn; nn = nn->next) {
-               p->flags |= TERMP_NOSPACE;
                print_mdoc_node(p, pair, m, nn);
-               if (NULL == nn->prev ||
-                   nn->prev->line < nn->line ||
-                   NULL == nn->next)
-                       term_flushln(p);
+               if (nn->next && nn->next->line == nn->line)
+                       continue;
+               term_flushln(p);
+               p->flags |= TERMP_NOSPACE;
        }
 
        p->tabwidth = tabwidth;
@@ -1889,6 +1924,11 @@ termp_sp_pre(DECL_ARGS)
                len = 0;
                break;
        default:
+               assert(n->parent);
+               if ((NULL == n->next || NULL == n->prev) &&
+                               (MDOC_Ss == n->parent->tok ||
+                                MDOC_Sh == n->parent->tok))
+                       return(0);
                len = 1;
                break;
        }
@@ -2050,9 +2090,11 @@ termp_sm_pre(DECL_ARGS)
 {
 
        assert(n->child && MDOC_TEXT == n->child->type);
-       if (0 == strcmp("on", n->child->string))
+       if (0 == strcmp("on", n->child->string)) {
+               if (p->col)
+                       p->flags &= ~TERMP_NOSPACE;
                p->flags &= ~TERMP_NONOSPACE;
-       else
+       } else
                p->flags |= TERMP_NONOSPACE;
 
        return(0);
@@ -2076,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;
@@ -2097,23 +2149,25 @@ termp_li_pre(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
-       const struct mdoc_node *nn;
+       const struct mdoc_node *nn, *sv;
 
        term_fontpush(p, TERMFONT_UNDER);
-       nn = n->child;
+
+       nn = sv = n->child;
 
        if (NULL == nn->next)
                return(1);
 
-       term_word(p, nn->string);
+       for (nn = nn->next; nn; nn = nn->next) 
+               term_word(p, nn->string);
+
        term_fontpop(p);
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, ":");
 
        term_fontpush(p, TERMFONT_BOLD);
-       for (nn = nn->next; nn; nn = nn->next) 
-               term_word(p, nn->string);
+       term_word(p, sv->string);
        term_fontpop(p);
 
        return(0);