Fix formatting of empty .Bl -inset item heads.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 4fbed5debd72f81e6c2d9f6005de932fd8f8b122..74f86dfb5b679ea1301662e8d4ab880b2bcd6e2b 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.264 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.270 2014/07/03 23:24: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) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include "mandoc.h"
 #include <string.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

 #include "out.h"
 #include "term.h"
 #include "mdoc.h"
 #include "out.h"
 #include "term.h"
 #include "mdoc.h"


@@ -94,6 +95,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_bx_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);

+static int       termp_es_pre(DECL_ARGS);

 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);
 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);


@@ -157,7 +159,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_nd_pre, NULL }, /* Nd */
        { termp_nm_pre, termp_nm_post }, /* Nm */
        { termp_quote_pre, termp_quote_post }, /* Op */
        { termp_nd_pre, NULL }, /* Nd */
        { termp_nm_pre, termp_nm_post }, /* Nm */
        { termp_quote_pre, termp_quote_post }, /* Op */

-       { NULL, NULL }, /* Ot */
+       { termp_ft_pre, NULL }, /* Ot */

        { termp_under_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */
        { termp_under_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */


@@ -227,7 +229,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */

-       { NULL, NULL }, /* Fr */
+       { termp_under_pre, NULL }, /* Fr */

        { termp_ud_pre, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */
        { termp_sp_pre, NULL }, /* Lp */
        { termp_ud_pre, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */
        { termp_sp_pre, NULL }, /* Lp */


@@ -237,8 +239,8 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Bro */
        { NULL, NULL }, /* Brc */
        { NULL, termp____post }, /* %C */
        { termp_quote_pre, termp_quote_post }, /* Bro */
        { NULL, NULL }, /* Brc */
        { NULL, termp____post }, /* %C */

-       { NULL, NULL }, /* Es */ /* TODO */
-       { NULL, NULL }, /* En */ /* TODO */
+       { termp_es_pre, NULL }, /* Es */
+       { termp_quote_pre, termp_quote_post }, /* En */

        { termp_xx_pre, NULL }, /* Dx */
        { NULL, termp____post }, /* %Q */
        { termp_sp_pre, NULL }, /* br */
        { termp_xx_pre, NULL }, /* Dx */
        { NULL, termp____post }, /* %Q */
        { termp_sp_pre, NULL }, /* br */


@@ -441,9 +443,9 @@ print_mdoc_foot(struct termp *p, const void *arg)
 static void
 print_mdoc_head(struct termp *p, const void *arg)
 {
 static void
 print_mdoc_head(struct termp *p, const void *arg)
 {

-       char            buf[BUFSIZ], title[BUFSIZ];
-       size_t          buflen, titlen;
-       const struct mdoc_meta *meta;
+       const struct mdoc_meta  *meta;
+       char                    *volume, *title;
+       size_t                   vollen, titlen;

 
        meta = (const struct mdoc_meta *)arg;
 
 
        meta = (const struct mdoc_meta *)arg;
 


@@ -464,35 +466,32 @@ print_mdoc_head(struct termp *p, const void *arg)
        p->rmargin = p->maxrmargin;
 
        assert(meta->vol);
        p->rmargin = p->maxrmargin;
 
        assert(meta->vol);

-       strlcpy(buf, meta->vol, BUFSIZ);
-       buflen = term_strlen(p, buf);
-
-       if (meta->arch) {
-               strlcat(buf, " (", BUFSIZ);
-               strlcat(buf, meta->arch, BUFSIZ);
-               strlcat(buf, ")", BUFSIZ);
-       }
+       if (NULL == meta->arch)
+               volume = mandoc_strdup(meta->vol);
+       else
+               mandoc_asprintf(&volume, "%s (%s)",
+                   meta->vol, meta->arch);
+       vollen = term_strlen(p, volume);

 
 

-       snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+       mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec);

        titlen = term_strlen(p, title);
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;
        p->offset = 0;
        titlen = term_strlen(p, title);
 
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
        p->trailspace = 1;
        p->offset = 0;

-       p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
-           (p->maxrmargin -
-            term_strlen(p, buf) + term_len(p, 1)) / 2 :
-           p->maxrmargin - buflen;
+       p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+           (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
+           p->maxrmargin - vollen;

 
        term_word(p, title);
        term_flushln(p);
 
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
 
        term_word(p, title);
        term_flushln(p);
 
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;

-       p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
+       p->rmargin = p->offset + vollen + titlen < p->maxrmargin ?

            p->maxrmargin - titlen : p->maxrmargin;
 
            p->maxrmargin - titlen : p->maxrmargin;
 

-       term_word(p, buf);
+       term_word(p, volume);

        term_flushln(p);
 
        p->flags &= ~TERMP_NOBREAK;
        term_flushln(p);
 
        p->flags &= ~TERMP_NOBREAK;


@@ -508,6 +507,8 @@ print_mdoc_head(struct termp *p, const void *arg)
        p->flags &= ~TERMP_NOSPACE;
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOSPACE;
        p->offset = 0;
        p->rmargin = p->maxrmargin;

+       free(title);
+       free(volume);

 }
 
 static size_t
 }
 
 static size_t


@@ -620,7 +621,7 @@ static int
 termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *nn;
 termp_it_pre(DECL_ARGS)
 {
        const struct mdoc_node *bl, *nn;

-       char                    buf[7];
+       char                    buf[24];

        int                     i;
        size_t                  width, offset, ncols, dcol;
        enum mdoc_list          type;
        int                     i;
        size_t                  width, offset, ncols, dcol;
        enum mdoc_list          type;


@@ -746,7 +747,7 @@ termp_it_pre(DECL_ARGS)
                        term_word(p, "\\ \\ ");
                break;
        case LIST_inset:
                        term_word(p, "\\ \\ ");
                break;
        case LIST_inset:

-               if (MDOC_BODY == n->type)
+               if (MDOC_BODY == n->type && n->parent->head->nchild)

                        term_word(p, "\\ ");
                break;
        default:
                        term_word(p, "\\ ");
                break;
        default:


@@ -916,7 +917,7 @@ termp_it_pre(DECL_ARGS)
                        break;
                case LIST_enum:
                        (pair->ppair->ppair->count)++;
                        break;
                case LIST_enum:
                        (pair->ppair->ppair->count)++;

-                       snprintf(buf, sizeof(buf), "%d.",
+                       (void)snprintf(buf, sizeof(buf), "%d.",

                            pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;
                            pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;


@@ -1828,6 +1829,13 @@ termp_sp_pre(DECL_ARGS)
        return(0);
 }
 
        return(0);
 }
 

+static int
+termp_es_pre(DECL_ARGS)
+{
+
+       return(0);
+}
+

 static int
 termp_quote_pre(DECL_ARGS)
 {
 static int
 termp_quote_pre(DECL_ARGS)
 {


@@ -1860,6 +1868,12 @@ termp_quote_pre(DECL_ARGS)
        case MDOC_Dq:
                term_word(p, "\\(lq");
                break;
        case MDOC_Dq:
                term_word(p, "\\(lq");
                break;

+       case MDOC_En:
+               if (NULL == n->norm->Es ||
+                   NULL == n->norm->Es->child)
+                       return(1);
+               term_word(p, n->norm->Es->child->string);
+               break;

        case MDOC_Eo:
                break;
        case MDOC_Po:
        case MDOC_Eo:
                break;
        case MDOC_Po:


@@ -1897,7 +1911,8 @@ termp_quote_post(DECL_ARGS)
        if (MDOC_BODY != n->type && MDOC_ELEM != n->type)
                return;
 
        if (MDOC_BODY != n->type && MDOC_ELEM != n->type)
                return;
 

-       p->flags |= TERMP_NOSPACE;
+       if (MDOC_En != n->tok)
+               p->flags |= TERMP_NOSPACE;

 
        switch (n->tok) {
        case MDOC_Ao:
 
        switch (n->tok) {
        case MDOC_Ao:


@@ -1924,6 +1939,14 @@ termp_quote_post(DECL_ARGS)
        case MDOC_Dq:
                term_word(p, "\\(rq");
                break;
        case MDOC_Dq:
                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;
+                       term_word(p, n->norm->Es->child->next->string);
+               }
+               break;

        case MDOC_Eo:
                break;
        case MDOC_Po:
        case MDOC_Eo:
                break;
        case MDOC_Po:


@@ -2033,14 +2056,16 @@ static int
 termp_sm_pre(DECL_ARGS)
 {
 
 termp_sm_pre(DECL_ARGS)
 {
 

-       assert(n->child && MDOC_TEXT == n->child->type);
-       if (0 == strcmp("on", n->child->string)) {
-               if (p->col)
-                       p->flags &= ~TERMP_NOSPACE;
+       if (NULL == n->child)
+               p->flags ^= TERMP_NONOSPACE;
+       else if (0 == strcmp("on", n->child->string))

                p->flags &= ~TERMP_NONOSPACE;
                p->flags &= ~TERMP_NONOSPACE;

-       } else
+       else

                p->flags |= TERMP_NONOSPACE;
 
                p->flags |= TERMP_NONOSPACE;
 

+       if (p->col && ! (TERMP_NONOSPACE & p->flags))
+               p->flags &= ~TERMP_NOSPACE;
+

        return(0);
 }
 
        return(0);
 }