catch up with the changed interface of mparse_alloc(), see mandoc.h rev 1.100

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 73178879467a1cd4ec5ee753ac4a2c611f740519..2e65d09f2890156d41d3378092daea279c2b45ea 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,6 +1,6 @@
-/*     $Id: man_term.c,v 1.123 2011/11/13 15:33:41 schwarze Exp $ */
+/*     $Id: man_term.c,v 1.128 2012/05/27 17:39:28 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>

  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -68,21 +68,22 @@ static      void              print_man_foot(struct termp *, const void *);
 static void              print_bvspace(struct termp *, 
                                const struct man_node *);
 
 static void              print_bvspace(struct termp *, 
                                const struct man_node *);
 

-static int               pre_alternate(DECL_ARGS);

 static int               pre_B(DECL_ARGS);
 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);
 static int               pre_B(DECL_ARGS);
 static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);

+static int               pre_OP(DECL_ARGS);

 static int               pre_PP(DECL_ARGS);
 static int               pre_RS(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
 static int               pre_PP(DECL_ARGS);
 static int               pre_RS(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);

+static int               pre_alternate(DECL_ARGS);
+static int               pre_ft(DECL_ARGS);

 static int               pre_ign(DECL_ARGS);
 static int               pre_in(DECL_ARGS);
 static int               pre_literal(DECL_ARGS);
 static int               pre_sp(DECL_ARGS);
 static int               pre_ign(DECL_ARGS);
 static int               pre_in(DECL_ARGS);
 static int               pre_literal(DECL_ARGS);
 static int               pre_sp(DECL_ARGS);

-static int               pre_ft(DECL_ARGS);

 
 static void              post_IP(DECL_ARGS);
 static void              post_HP(DECL_ARGS);
 
 static void              post_IP(DECL_ARGS);
 static void              post_HP(DECL_ARGS);


@@ -125,6 +126,7 @@ static      const struct termact termacts[MAN_MAX] = {
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */
        { pre_ft, NULL, MAN_NOTEXT }, /* ft */
        { pre_ign, NULL, 0 }, /* AT */
        { pre_in, NULL, MAN_NOTEXT }, /* in */
        { pre_ft, NULL, MAN_NOTEXT }, /* ft */

+       { pre_OP, NULL, 0 }, /* OP */

 };
 
 
 };
 
 


@@ -322,6 +324,29 @@ pre_B(DECL_ARGS)
        return(1);
 }
 
        return(1);
 }
 

+/* ARGSUSED */
+static int
+pre_OP(DECL_ARGS)
+{
+
+       term_word(p, "[");
+       p->flags |= TERMP_NOSPACE;
+
+       if (NULL != (n = n->child)) {
+               term_fontrepl(p, TERMFONT_BOLD);
+               term_word(p, n->string);
+       }
+       if (NULL != n && NULL != n->next) {
+               term_fontrepl(p, TERMFONT_UNDER);
+               term_word(p, n->next->string);
+       }
+
+       term_fontrepl(p, TERMFONT_NONE);
+       p->flags |= TERMP_NOSPACE;
+       term_word(p, "]");
+       return(0);
+}
+

 /* ARGSUSED */
 static int
 pre_ft(DECL_ARGS)
 /* ARGSUSED */
 static int
 pre_ft(DECL_ARGS)


@@ -963,15 +988,33 @@ print_man_foot(struct termp *p, const void *arg)
        const struct man_meta *meta;
 
        meta = (const struct man_meta *)arg;
        const struct man_meta *meta;
 
        meta = (const struct man_meta *)arg;

+       assert(meta->title);
+       assert(meta->msec);
+       assert(meta->date);

 
        term_fontrepl(p, TERMFONT_NONE);
 
        term_vspace(p);
 
        term_fontrepl(p, TERMFONT_NONE);
 
        term_vspace(p);

-       term_vspace(p);
-       term_vspace(p);
-       snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+
+       /*
+        * Temporary, undocumented option to imitate mdoc(7) output.
+        * In the bottom right corner, use the source instead of
+        * the title.
+        */
+
+       if ( ! p->mdocstyle) {
+               term_vspace(p);
+               term_vspace(p);
+               snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
+       } else if (meta->source) {
+               strlcpy(title, meta->source, BUFSIZ);
+       } else {
+               title[0] = '\0';
+       }

        datelen = term_strlen(p, meta->date);
 
        datelen = term_strlen(p, meta->date);
 

+       /* Bottom left corner: manual source. */
+

        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
        p->offset = 0;
        p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2;
        p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
        p->offset = 0;
        p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2;


@@ -980,6 +1023,8 @@ print_man_foot(struct termp *p, const void *arg)
                term_word(p, meta->source);
        term_flushln(p);
 
                term_word(p, meta->source);
        term_flushln(p);
 

+       /* At the bottom in the middle: manual date. */
+

        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin - term_strlen(p, title);
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin - term_strlen(p, title);


@@ -989,6 +1034,8 @@ print_man_foot(struct termp *p, const void *arg)
        term_word(p, meta->date);
        term_flushln(p);
 
        term_word(p, meta->date);
        term_flushln(p);
 

+       /* Bottom right corner: manual title and section. */
+

        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->flags &= ~TERMP_NOBREAK;
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;


@@ -1007,22 +1054,17 @@ print_man_head(struct termp *p, const void *arg)
        const struct man_meta *m;
 
        m = (const struct man_meta *)arg;
        const struct man_meta *m;
 
        m = (const struct man_meta *)arg;

-
-       /*
-        * Note that old groff would spit out some spaces before the
-        * header.  We discontinue this strange behaviour, but at one
-        * point we did so here.
-        */
-
-       p->offset = 0;
-       p->rmargin = p->maxrmargin;
-
-       buf[0] = title[0] = '\0';
+       assert(m->title);
+       assert(m->msec);

 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);
 
        if (m->vol)
                strlcpy(buf, m->vol, BUFSIZ);

+       else
+               buf[0] = '\0';

        buflen = term_strlen(p, buf);
 
        buflen = term_strlen(p, buf);
 

+       /* Top left corner: manual title and section. */
+

        snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
        titlen = term_strlen(p, title);
 
        snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
        titlen = term_strlen(p, title);
 


@@ -1036,6 +1078,8 @@ print_man_head(struct termp *p, const void *arg)
        term_word(p, title);
        term_flushln(p);
 
        term_word(p, title);
        term_flushln(p);
 

+       /* At the top in the middle: manual volume. */
+

        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?
        p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->rmargin = p->offset + buflen + titlen < p->maxrmargin ?


@@ -1044,6 +1088,8 @@ print_man_head(struct termp *p, const void *arg)
        term_word(p, buf);
        term_flushln(p);
 
        term_word(p, buf);
        term_flushln(p);
 

+       /* Top right corner: title and section, again. */
+

        p->flags &= ~TERMP_NOBREAK;
        if (p->rmargin + titlen <= p->maxrmargin) {
                p->flags |= TERMP_NOSPACE;
        p->flags &= ~TERMP_NOBREAK;
        if (p->rmargin + titlen <= p->maxrmargin) {
                p->flags |= TERMP_NOSPACE;


@@ -1058,11 +1104,14 @@ print_man_head(struct termp *p, const void *arg)
        p->rmargin = p->maxrmargin;
 
        /* 
        p->rmargin = p->maxrmargin;
 
        /* 

-        * Groff likes to have some leading spaces before content.  Well
-        * that's fine by me.
+        * Groff prints three blank lines before the content.
+        * Do the same, except in the temporary, undocumented
+        * mode imitating mdoc(7) output.

         */
 
        term_vspace(p);
         */
 
        term_vspace(p);

-       term_vspace(p);
-       term_vspace(p);
+       if ( ! p->mdocstyle) {
+               term_vspace(p);
+               term_vspace(p);
+       }

 }
 }