Do not read past the end of the buffer if an "f" layout font modifier

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 6a392f6479371cce9b946ca7610825c4e1e183f0..1c37b203b05c58fc9e90739474b887260e0c5a6b 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.302 2014/12/24 23:32:42 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.308 2015/02/05 01:46:56 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -67,6 +67,7 @@ static        void      termp__t_post(DECL_ARGS);
 static void      termp_bd_post(DECL_ARGS);
 static void      termp_bk_post(DECL_ARGS);
 static void      termp_bl_post(DECL_ARGS);
+static void      termp_eo_post(DECL_ARGS);
 static void      termp_fd_post(DECL_ARGS);
 static void      termp_fo_post(DECL_ARGS);
 static void      termp_in_post(DECL_ARGS);
@@ -91,6 +92,7 @@ static        int       termp_bt_pre(DECL_ARGS);
 static int       termp_bx_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);
+static int       termp_eo_pre(DECL_ARGS);
 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);
@@ -190,7 +192,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
        { termp_under_pre, NULL }, /* Em */
-       { termp_quote_pre, termp_quote_post }, /* Eo */
+       { termp_eo_pre, termp_eo_post }, /* Eo */
        { termp_xx_pre, NULL }, /* Fx */
        { termp_bold_pre, NULL }, /* Ms */
        { termp_li_pre, NULL }, /* No */
@@ -291,9 +293,10 @@ static void
 print_mdoc_nodelist(DECL_ARGS)
 {
 
-       print_mdoc_node(p, pair, meta, n);
-       if (n->next)
-               print_mdoc_nodelist(p, pair, meta, n->next);
+       while (n != NULL) {
+               print_mdoc_node(p, pair, meta, n);
+               n = n->next;
+       }
 }
 
 static void
@@ -306,7 +309,7 @@ print_mdoc_node(DECL_ARGS)
        chld = 1;
        offset = p->offset;
        rmargin = p->rmargin;
-       n->prev_font = term_fontq(p);
+       n->prev_font = p->fonti;
 
        memset(&npair, 0, sizeof(struct termpair));
        npair.ppair = pair;
@@ -316,12 +319,9 @@ print_mdoc_node(DECL_ARGS)
         * invoked in a prior line, revert it to PREKEEP.
         */
 
-       if (TERMP_KEEP & p->flags) {
-               if (n->prev ? (n->prev->lastline != n->line) :
-                   (n->parent && n->parent->line != n->line)) {
-                       p->flags &= ~TERMP_KEEP;
-                       p->flags |= TERMP_PREKEEP;
-               }
+       if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) {
+               p->flags &= ~TERMP_KEEP;
+               p->flags |= TERMP_PREKEEP;
        }
 
        /*
@@ -1091,9 +1091,6 @@ termp_an_pre(DECL_ARGS)
                return(0);
        }
 
-       if (n->child == NULL)
-               return(0);
-
        if (p->flags & TERMP_SPLIT)
                term_newln(p);
 
@@ -1855,8 +1852,8 @@ termp_quote_pre(DECL_ARGS)
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
-               term_word(p, n->parent->prev != NULL &&
-                   n->parent->prev->tok == MDOC_An ?  "<" : "\\(la");
+               term_word(p, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ? "<" : "\\(la");
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
@@ -1883,8 +1880,6 @@ termp_quote_pre(DECL_ARGS)
                        return(1);
                term_word(p, n->norm->Es->child->string);
                break;
-       case MDOC_Eo:
-               break;
        case MDOC_Po:
                /* FALLTHROUGH */
        case MDOC_Pq:
@@ -1920,16 +1915,14 @@ termp_quote_post(DECL_ARGS)
        if (n->type != MDOC_BODY && n->type != MDOC_ELEM)
                return;
 
-       if ( ! (n->tok == MDOC_En ||
-           (n->tok == MDOC_Eo && n->end == ENDBODY_SPACE)))
-               p->flags |= TERMP_NOSPACE;
+       p->flags |= TERMP_NOSPACE;
 
        switch (n->tok) {
        case MDOC_Ao:
                /* FALLTHROUGH */
        case MDOC_Aq:
-               term_word(p, n->parent->prev != NULL &&
-                   n->parent->prev->tok == MDOC_An ?  ">" : "\\(ra");
+               term_word(p, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ? ">" : "\\(ra");
                break;
        case MDOC_Bro:
                /* FALLTHROUGH */
@@ -1951,14 +1944,12 @@ termp_quote_post(DECL_ARGS)
                term_word(p, "\\(rq");
                break;
        case MDOC_En:
-               if (NULL != n->norm->Es &&
-                   NULL != n->norm->Es->child &&
-                   NULL != n->norm->Es->child->next) {
-                       p->flags |= TERMP_NOSPACE;
+               if (n->norm->Es == NULL ||
+                   n->norm->Es->child == NULL ||
+                   n->norm->Es->child->next == NULL)
+                       p->flags &= ~TERMP_NOSPACE;
+               else
                        term_word(p, n->norm->Es->child->next->string);
-               }
-               break;
-       case MDOC_Eo:
                break;
        case MDOC_Po:
                /* FALLTHROUGH */
@@ -1985,6 +1976,51 @@ termp_quote_post(DECL_ARGS)
        }
 }
 
+static int
+termp_eo_pre(DECL_ARGS)
+{
+
+       if (n->type != MDOC_BODY)
+               return(1);
+
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               term_word(p, "\\&");
+       else if (n->end != ENDBODY_NOT ? n->child != NULL :
+            n->parent->head->child != NULL &&
+            (n->parent->body->child != NULL ||
+             n->parent->tail->child != NULL))
+               p->flags |= TERMP_NOSPACE;
+
+       return(1);
+}
+
+static void
+termp_eo_post(DECL_ARGS)
+{
+       int      body, tail;
+
+       if (n->type != MDOC_BODY)
+               return;
+
+       if (n->end != ENDBODY_NOT) {
+               p->flags &= ~TERMP_NOSPACE;
+               return;
+       }
+
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+       if (body && tail)
+               p->flags |= TERMP_NOSPACE;
+       else if ( ! (body || tail))
+               term_word(p, "\\&");
+       else if ( ! tail)
+               p->flags &= ~TERMP_NOSPACE;
+}
+
 static int
 termp_fo_pre(DECL_ARGS)
 {