Fill mode changes don't break next-line scope in all cases,

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index eee1e3a7186aa66a6f4eeee34fe53bc999616faa..4ea0fa246ee8c029645a6fdbbf8b1b48cba3503f 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.85 2015/02/06 03:38:45 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.93 2015/04/18 17:53:21 schwarze Exp $ */

 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *


@@ -22,15 +22,15 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

-#include "out.h"
-#include "man.h"
+#include "mandoc.h"
+#include "roff.h"

 #include "mdoc.h"
 #include "mdoc.h"

+#include "man.h"
+#include "out.h"

 #include "main.h"
 
 #include "main.h"
 

-#define        DECL_ARGS const struct mdoc_meta *meta, \
-                 const struct mdoc_node *n
+#define        DECL_ARGS const struct roff_meta *meta, struct roff_node *n

 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */
 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */


@@ -108,7 +108,7 @@ static      int       pre_sm(DECL_ARGS);
 static int       pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);
 static int       pre_sy(DECL_ARGS);
 static int       pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);
 static int       pre_sy(DECL_ARGS);

-static void      pre_syn(const struct mdoc_node *);
+static void      pre_syn(const struct roff_node *);

 static int       pre_vt(DECL_ARGS);
 static int       pre_ux(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);
 static int       pre_vt(DECL_ARGS);
 static int       pre_ux(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);


@@ -117,7 +117,7 @@ static      void      print_line(const char *, int);
 static void      print_block(const char *, int);
 static void      print_offs(const char *, int);
 static void      print_width(const struct mdoc_bl *,
 static void      print_block(const char *, int);
 static void      print_offs(const char *, int);
 static void      print_width(const struct mdoc_bl *,

-                       const struct mdoc_node *);
+                       const struct roff_node *);

 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 


@@ -186,8 +186,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */

-       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Do */
-       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Dq */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Dq */

        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */


@@ -468,7 +468,7 @@ print_offs(const char *v, int keywords)
  * Set up the indentation for a list item; used from pre_it().
  */
 static void
  * Set up the indentation for a list item; used from pre_it().
  */
 static void

-print_width(const struct mdoc_bl *bl, const struct mdoc_node *child)
+print_width(const struct mdoc_bl *bl, const struct roff_node *child)

 {
        char              buf[24];
        struct roffsu     su;
 {
        char              buf[24];
        struct roffsu     su;


@@ -493,7 +493,7 @@ print_width(const struct mdoc_bl *bl, const struct mdoc_node *child)
        /* XXX Rough estimation, might have multiple parts. */
        if (bl->type == LIST_enum)
                chsz = (bl->count > 8) + 1;
        /* XXX Rough estimation, might have multiple parts. */
        if (bl->type == LIST_enum)
                chsz = (bl->count > 8) + 1;

-       else if (child != NULL && child->type == MDOC_TEXT)
+       else if (child != NULL && child->type == ROFFT_TEXT)

                chsz = strlen(child->string);
        else
                chsz = 0;
                chsz = strlen(child->string);
        else
                chsz = 0;


@@ -532,7 +532,7 @@ print_count(int *count)
 }
 
 void
 }
 
 void

-man_man(void *arg, const struct man *man)
+man_man(void *arg, const struct roff_man *man)

 {
 
        /*
 {
 
        /*


@@ -545,18 +545,14 @@ man_man(void *arg, const struct man *man)
 }
 
 void
 }
 
 void

-man_mdoc(void *arg, const struct mdoc *mdoc)
+man_mdoc(void *arg, const struct roff_man *mdoc)

 {
 {

-       const struct mdoc_meta *meta;
-       const struct mdoc_node *n;
-
-       meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc);
+       struct roff_node *n;

 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",

-           meta->title,
-           (meta->msec == NULL ? "" : meta->msec),
-           meta->date, meta->os, meta->vol);
+           mdoc->meta.title,
+           (mdoc->meta.msec == NULL ? "" : mdoc->meta.msec),
+           mdoc->meta.date, mdoc->meta.os, mdoc->meta.vol);

 
        /* Disable hyphenation and if nroff, disable justification. */
        printf(".nh\n.if n .ad l");
 
        /* Disable hyphenation and if nroff, disable justification. */
        printf(".nh\n.if n .ad l");


@@ -567,15 +563,16 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }

-       print_node(meta, n);
+       for (n = mdoc->first->child; n != NULL; n = n->next)
+               print_node(&mdoc->meta, n);

        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {

-       const struct mdoc_node  *sub;

        const struct manact     *act;
        const struct manact     *act;

+       struct roff_node        *sub;

        int                      cond, do_sub;
 
        /*
        int                      cond, do_sub;
 
        /*


@@ -588,8 +585,9 @@ print_node(DECL_ARGS)
        act = NULL;
        cond = 0;
        do_sub = 1;
        act = NULL;
        cond = 0;
        do_sub = 1;

+       n->flags &= ~MDOC_ENDED;

 
 

-       if (MDOC_TEXT == n->type) {
+       if (n->type == ROFFT_TEXT) {

                /*
                 * Make sure that we don't happen to start with a
                 * control character at the start of a line.
                /*
                 * Make sure that we don't happen to start with a
                 * control character at the start of a line.


@@ -635,7 +633,7 @@ print_node(DECL_ARGS)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)

-               n->pending->flags |= MDOC_ENDED;
+               n->body->flags |= MDOC_ENDED;

 
        if (ENDBODY_NOSPACE == n->end)
                outflags &= ~(MMAN_spc | MMAN_nl);
 
        if (ENDBODY_NOSPACE == n->end)
                outflags &= ~(MMAN_spc | MMAN_nl);


@@ -645,14 +643,14 @@ static int
 cond_head(DECL_ARGS)
 {
 
 cond_head(DECL_ARGS)
 {
 

-       return(MDOC_HEAD == n->type);
+       return(n->type == ROFFT_HEAD);

 }
 
 static int
 cond_body(DECL_ARGS)
 {
 
 }
 
 static int
 cond_body(DECL_ARGS)
 {
 

-       return(MDOC_BODY == n->type);
+       return(n->type == ROFFT_BODY);

 }
 
 static int
 }
 
 static int


@@ -775,7 +773,7 @@ static int
 pre_sect(DECL_ARGS)
 {
 
 pre_sect(DECL_ARGS)
 {
 

-       if (MDOC_HEAD == n->type) {
+       if (n->type == ROFFT_HEAD) {

                outflags |= MMAN_sp;
                print_block(manacts[n->tok].prefix, 0);
                print_word("");
                outflags |= MMAN_sp;
                print_block(manacts[n->tok].prefix, 0);
                print_word("");


@@ -792,7 +790,7 @@ static void
 post_sect(DECL_ARGS)
 {
 
 post_sect(DECL_ARGS)
 {
 

-       if (MDOC_HEAD != n->type)
+       if (n->type != ROFFT_HEAD)

                return;
        outflags &= ~MMAN_spc;
        print_word("");
                return;
        outflags &= ~MMAN_spc;
        print_word("");


@@ -804,7 +802,7 @@ post_sect(DECL_ARGS)
 
 /* See mdoc_term.c, synopsis_pre() for comments. */
 static void
 
 /* See mdoc_term.c, synopsis_pre() for comments. */
 static void

-pre_syn(const struct mdoc_node *n)
+pre_syn(const struct roff_node *n)

 {
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
 {
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))


@@ -929,9 +927,9 @@ pre_bf(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                return(1);
                return(1);

-       case MDOC_BODY:
+       case ROFFT_BODY:

                break;
        default:
                return(0);
                break;
        default:
                return(0);


@@ -954,7 +952,7 @@ static void
 post_bf(DECL_ARGS)
 {
 
 post_bf(DECL_ARGS)
 {
 

-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)

                font_pop();
 }
 
                font_pop();
 }
 


@@ -963,9 +961,9 @@ pre_bk(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                return(1);
                return(1);

-       case MDOC_BODY:
+       case ROFFT_BODY:

                outflags |= MMAN_Bk;
                return(1);
        default:
                outflags |= MMAN_Bk;
                return(1);
        default:


@@ -977,7 +975,7 @@ static void
 post_bk(DECL_ARGS)
 {
 
 post_bk(DECL_ARGS)
 {
 

-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)

                outflags &= ~MMAN_Bk;
 }
 
                outflags &= ~MMAN_Bk;
 }
 


@@ -1140,9 +1138,8 @@ pre_eo(DECL_ARGS)
            n->child->end != ENDBODY_NOT)
                print_word("\\&");
        else if (n->end != ENDBODY_NOT ? n->child != NULL :
            n->child->end != ENDBODY_NOT)
                print_word("\\&");
        else if (n->end != ENDBODY_NOT ? n->child != NULL :

-           n->parent->head->child != NULL &&
-           (n->parent->body->child != NULL ||
-            n->parent->tail->child != NULL))
+           n->parent->head->child != NULL && (n->child != NULL ||
+           (n->parent->tail != NULL && n->parent->tail->child != NULL)))

                outflags &= ~(MMAN_spc | MMAN_nl);
        return(1);
 }
                outflags &= ~(MMAN_spc | MMAN_nl);
        return(1);
 }


@@ -1233,7 +1230,7 @@ post_fl(DECL_ARGS)
        font_pop();
        if ( ! (n->nchild ||
            n->next == NULL ||
        font_pop();
        if ( ! (n->nchild ||
            n->next == NULL ||

-           n->next->type == MDOC_TEXT ||
+           n->next->type == ROFFT_TEXT ||

            n->next->flags & MDOC_LINE))
                outflags &= ~MMAN_spc;
 }
            n->next->flags & MDOC_LINE))
                outflags &= ~MMAN_spc;
 }


@@ -1280,17 +1277,17 @@ pre_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                pre_syn(n);
                break;
                pre_syn(n);
                break;

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                if (n->child == NULL)
                        return(0);
                if (MDOC_SYNPRETTY & n->flags)
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;
                if (n->child == NULL)
                        return(0);
                if (MDOC_SYNPRETTY & n->flags)
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                outflags &= ~(MMAN_spc | MMAN_nl);
                print_word("(");
                outflags &= ~MMAN_spc;
                outflags &= ~(MMAN_spc | MMAN_nl);
                print_word("(");
                outflags &= ~MMAN_spc;


@@ -1306,11 +1303,11 @@ post_fo(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                if (n->child != NULL)
                        font_pop();
                break;
                if (n->child != NULL)
                        font_pop();
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                post_fn(meta, n);
                break;
        default:
                post_fn(meta, n);
                break;
        default:


@@ -1363,10 +1360,10 @@ post_in(DECL_ARGS)
 static int
 pre_it(DECL_ARGS)
 {
 static int
 pre_it(DECL_ARGS)
 {

-       const struct mdoc_node *bln;
+       const struct roff_node *bln;

 
        switch (n->type) {
 
        switch (n->type) {

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                outflags |= MMAN_PP | MMAN_nl;
                bln = n->parent->parent;
                if (0 == bln->norm->Bl.comp ||
                outflags |= MMAN_PP | MMAN_nl;
                bln = n->parent->parent;
                if (0 == bln->norm->Bl.comp ||


@@ -1460,12 +1457,12 @@ mid_it(void)
 static void
 post_it(DECL_ARGS)
 {
 static void
 post_it(DECL_ARGS)
 {

-       const struct mdoc_node *bln;
+       const struct roff_node *bln;

 
        bln = n->parent->parent;
 
        switch (n->type) {
 
        bln = n->parent->parent;
 
        switch (n->type) {

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                switch (bln->norm->Bl.type) {
                case LIST_diag:
                        outflags &= ~MMAN_spc;
                switch (bln->norm->Bl.type) {
                case LIST_diag:
                        outflags &= ~MMAN_spc;


@@ -1478,7 +1475,7 @@ post_it(DECL_ARGS)
                        break;
                }
                break;
                        break;
                }
                break;

-       case MDOC_BODY:
+       case ROFFT_BODY:

                switch (bln->norm->Bl.type) {
                case LIST_bullet:
                        /* FALLTHROUGH */
                switch (bln->norm->Bl.type) {
                case LIST_bullet:
                        /* FALLTHROUGH */


@@ -1530,7 +1527,7 @@ post_lb(DECL_ARGS)
 static int
 pre_lk(DECL_ARGS)
 {
 static int
 pre_lk(DECL_ARGS)
 {

-       const struct mdoc_node *link, *descr;
+       const struct roff_node *link, *descr;

 
        if (NULL == (link = n->child))
                return(0);
 
        if (NULL == (link = n->child))
                return(0);


@@ -1572,16 +1569,16 @@ pre_nm(DECL_ARGS)
 {
        char    *name;
 
 {
        char    *name;
 

-       if (MDOC_BLOCK == n->type) {
+       if (n->type == ROFFT_BLOCK) {

                outflags |= MMAN_Bk;
                pre_syn(n);
        }
                outflags |= MMAN_Bk;
                pre_syn(n);
        }

-       if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
+       if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD)

                return(1);
        name = n->child ? n->child->string : meta->name;
        if (NULL == name)
                return(0);
                return(1);
        name = n->child ? n->child->string : meta->name;
        if (NULL == name)
                return(0);

-       if (MDOC_HEAD == n->type) {
+       if (n->type == ROFFT_HEAD) {

                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);
                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);


@@ -1599,12 +1596,12 @@ post_nm(DECL_ARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MDOC_BLOCK:
+       case ROFFT_BLOCK:

                outflags &= ~MMAN_Bk;
                break;
                outflags &= ~MMAN_Bk;
                break;

-       case MDOC_HEAD:
+       case ROFFT_HEAD:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case MDOC_ELEM:
+       case ROFFT_ELEM:

                if (n->child != NULL || meta->name != NULL)
                        font_pop();
                break;
                if (n->child != NULL || meta->name != NULL)
                        font_pop();
                break;


@@ -1768,10 +1765,10 @@ pre_vt(DECL_ARGS)
 
        if (MDOC_SYNPRETTY & n->flags) {
                switch (n->type) {
 
        if (MDOC_SYNPRETTY & n->flags) {
                switch (n->type) {

-               case MDOC_BLOCK:
+               case ROFFT_BLOCK:

                        pre_syn(n);
                        return(1);
                        pre_syn(n);
                        return(1);

-               case MDOC_BODY:
+               case ROFFT_BODY:

                        break;
                default:
                        return(0);
                        break;
                default:
                        return(0);


@@ -1785,7 +1782,7 @@ static void
 post_vt(DECL_ARGS)
 {
 
 post_vt(DECL_ARGS)
 {
 

-       if (MDOC_SYNPRETTY & n->flags && MDOC_BODY != n->type)
+       if (n->flags & MDOC_SYNPRETTY && n->type != ROFFT_BODY)

                return;
        font_pop();
 }
                return;
        font_pop();
 }