MANDOCERR_BADTAB needs checking, but .UR/.UE is done

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 08bf9fe4c802116265d4fe0eed079925a3d6e2a0..b27dc4ae2806e8ad84c86186c3a5f3cee7515035 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,8 @@
-/*     $Id: mdoc_term.c,v 1.252 2013/12/24 19:11:46 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.259 2014/02/16 12:33:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -100,7 +101,6 @@ static      int       termp_fl_pre(DECL_ARGS);
 static int       termp_fn_pre(DECL_ARGS);
 static int       termp_fo_pre(DECL_ARGS);
 static int       termp_ft_pre(DECL_ARGS);
-static int       termp_igndelim_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_li_pre(DECL_ARGS);
@@ -194,12 +194,12 @@ static    const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
-       { termp_igndelim_pre, NULL }, /* No */
+       { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
        { termp_xx_pre, NULL }, /* Nx */
        { termp_xx_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */
-       { termp_igndelim_pre, termp_pf_post }, /* Pf */
+       { NULL, termp_pf_post }, /* Pf */
        { termp_quote_pre, termp_quote_post }, /* Po */
        { termp_quote_pre, termp_quote_post }, /* Pq */
        { NULL, NULL }, /* Qc */
@@ -307,12 +307,9 @@ print_mdoc_node(DECL_ARGS)
        /*
         * Keeps only work until the end of a line.  If a keep was
         * invoked in a prior line, revert it to PREKEEP.
-        *
-        * Also let SYNPRETTY sections behave as if they were wrapped
-        * in a `Bk' block.
         */
 
-       if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {
+       if (TERMP_KEEP & p->flags) {
                if (n->prev ? (n->prev->lastline != n->line) :
                    (n->parent && n->parent->line != n->line)) {
                        p->flags &= ~TERMP_KEEP;
@@ -320,16 +317,6 @@ print_mdoc_node(DECL_ARGS)
                }
        }
 
-       /*
-        * Since SYNPRETTY sections aren't "turned off" with `Ek',
-        * we have to intuit whether we should disable formatting.
-        */
-
-       if ( ! (MDOC_SYNPRETTY & n->flags) &&
-           ((n->prev   && MDOC_SYNPRETTY & n->prev->flags) ||
-            (n->parent && MDOC_SYNPRETTY & n->parent->flags)))
-               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
-
        /*
         * After the keep flags have been set up, we may now
         * produce output.  Note that some pre-handlers do so.
@@ -886,8 +873,11 @@ termp_it_pre(DECL_ARGS)
                assert(width);
                if (MDOC_HEAD == n->type)
                        p->rmargin = p->offset + width;
-               else 
+               else {
                        p->offset += width;
+                       if (p->rmargin < p->offset)
+                               p->rmargin = p->offset;
+               }
                break;
        case (LIST_column):
                assert(width);
@@ -1010,8 +1000,10 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
-       if (MDOC_BLOCK == n->type)
+       if (MDOC_BLOCK == n->type) {
+               p->flags |= TERMP_PREKEEP;
                return(1);
+       }
 
        if (MDOC_BODY == n->type) {
                if (NULL == n->child)
@@ -1060,7 +1052,9 @@ static void
 termp_nm_post(DECL_ARGS)
 {
 
-       if (MDOC_HEAD == n->type && n->next->child) {
+       if (MDOC_BLOCK == n->type) {
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+       } else if (MDOC_HEAD == n->type && n->next->child) {
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
                p->trailspace = 0;
@@ -1538,7 +1532,7 @@ termp_ft_pre(DECL_ARGS)
 static int
 termp_fn_pre(DECL_ARGS)
 {
-       size_t           width, rmargin = 0;
+       size_t           rmargin = 0;
        int              pretty;
 
        pretty = MDOC_SYNPRETTY & n->flags;
@@ -1549,9 +1543,8 @@ termp_fn_pre(DECL_ARGS)
                return(0);
 
        if (pretty) {
-               width = term_len(p, 4);
                rmargin = p->rmargin;
-               p->rmargin = p->offset + width;
+               p->rmargin = p->offset + term_len(p, 4);
                p->flags |= TERMP_NOBREAK | TERMP_HANG;
        }
 
@@ -1574,6 +1567,8 @@ termp_fn_pre(DECL_ARGS)
        for (n = n->next; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
                term_fontpush(p, TERMFONT_UNDER);
+               if (pretty)
+                       p->flags |= TERMP_NBRWORD;
                term_word(p, n->string);
                term_fontpop(p);
 
@@ -1609,20 +1604,16 @@ termp_fa_pre(DECL_ARGS)
 
        for (nn = n->child; nn; nn = nn->next) {
                term_fontpush(p, TERMFONT_UNDER);
+               p->flags |= TERMP_NBRWORD;
                term_word(p, nn->string);
                term_fontpop(p);
 
-               if (nn->next) {
+               if (nn->next || (n->next && n->next->tok == MDOC_Fa)) {
                        p->flags |= TERMP_NOSPACE;
                        term_word(p, ",");
                }
        }
 
-       if (n->child && n->next && n->next->tok == MDOC_Fa) {
-               p->flags |= TERMP_NOSPACE;
-               term_word(p, ",");
-       }
-
        return(0);
 }
 
@@ -1796,16 +1787,6 @@ termp_xx_pre(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static int
-termp_igndelim_pre(DECL_ARGS)
-{
-
-       p->flags |= TERMP_IGNDELIM;
-       return(1);
-}
-
-
 /* ARGSUSED */
 static void
 termp_pf_post(DECL_ARGS)
@@ -2054,16 +2035,31 @@ termp_quote_post(DECL_ARGS)
 static int
 termp_fo_pre(DECL_ARGS)
 {
+       size_t           rmargin = 0;
+       int              pretty;
+
+       pretty = MDOC_SYNPRETTY & n->flags;
 
        if (MDOC_BLOCK == n->type) {
                synopsis_pre(p, n);
                return(1);
        } else if (MDOC_BODY == n->type) {
+               if (pretty) {
+                       rmargin = p->rmargin;
+                       p->rmargin = p->offset + term_len(p, 4);
+                       p->flags |= TERMP_NOBREAK | TERMP_HANG;
+               }
                p->flags |= TERMP_NOSPACE;
                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
+               if (pretty) {
+                       term_flushln(p);
+                       p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
+                       p->offset = p->rmargin;
+                       p->rmargin = rmargin;
+               }
                return(1);
-       } 
+       }
 
        if (NULL == n->child)
                return(0);
@@ -2091,6 +2087,7 @@ termp_fo_post(DECL_ARGS)
        if (MDOC_SYNPRETTY & n->flags) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, ";");
+               term_flushln(p);
        }
 }
 
@@ -2240,7 +2237,7 @@ static void
 termp_bk_post(DECL_ARGS)
 {
 
-       if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags))
+       if (MDOC_BODY == n->type)
                p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }