Vastly simplify man(7) block unwinding, similar to mdoc_macro.c 1.171.

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index 6c2904537dd13271d6c93a34a4c74803f8b30baa..f217b9a405bc62b16f3a64a670558f1731b0df18 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,15 +1,15 @@
-/*     $Id: term_ascii.c,v 1.39 2014/10/28 18:49:33 schwarze Exp $ */
+/*     $Id: term_ascii.c,v 1.44 2015/03/27 21:33:20 schwarze Exp $ */

 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF


@@ -35,10 +35,11 @@
 #include "mandoc_aux.h"
 #include "out.h"
 #include "term.h"
 #include "mandoc_aux.h"
 #include "out.h"
 #include "term.h"

+#include "manconf.h"

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

-static struct termp     *ascii_init(enum termenc,
-                               const struct mchars *, char *);
+static struct termp     *ascii_init(enum termenc, const struct mchars *,
+                               const struct manoutput *);

 static double            ascii_hspan(const struct termp *,
                                const struct roffsu *);
 static size_t            ascii_width(const struct termp *, int);
 static double            ascii_hspan(const struct termp *,
                                const struct roffsu *);
 static size_t            ascii_width(const struct termp *, int);


@@ -58,9 +59,9 @@ static        size_t            locale_width(const struct termp *, int);
 
 
 static struct termp *
 
 
 static struct termp *

-ascii_init(enum termenc enc, const struct mchars *mchars, char *outopts)
+ascii_init(enum termenc enc, const struct mchars *mchars,
+       const struct manoutput *outopts)

 {
 {

-       const char      *toks[5];

        char            *v;
        struct termp    *p;
 
        char            *v;
        struct termp    *p;
 


@@ -69,6 +70,9 @@ ascii_init(enum termenc enc, const struct mchars *mchars, char *outopts)
        p->symtab = mchars;
        p->tabwidth = 5;
        p->defrmargin = p->lastrmargin = 78;
        p->symtab = mchars;
        p->tabwidth = 5;
        p->defrmargin = p->lastrmargin = 78;

+       p->fontq = mandoc_reallocarray(NULL,
+            (p->fontsz = 8), sizeof(enum termfont));
+       p->fontq[0] = p->fontl = TERMFONT_NONE;

 
        p->begin = ascii_begin;
        p->end = ascii_end;
 
        p->begin = ascii_begin;
        p->end = ascii_end;


@@ -97,58 +101,36 @@ ascii_init(enum termenc enc, const struct mchars *mchars, char *outopts)
        }
 #endif
 
        }
 #endif
 

-       toks[0] = "indent";
-       toks[1] = "width";
-       toks[2] = "mdoc";
-       toks[3] = "synopsis";
-       toks[4] = NULL;
-
-       while (outopts && *outopts)
-               switch (getsubopt(&outopts, UNCONST(toks), &v)) {
-               case 0:
-                       p->defindent = (size_t)atoi(v);
-                       break;
-               case 1:
-                       p->defrmargin = (size_t)atoi(v);
-                       break;
-               case 2:
-                       /*
-                        * Temporary, undocumented mode
-                        * to imitate mdoc(7) output style.
-                        */
-                       p->mdocstyle = 1;
-                       p->defindent = 5;
-                       break;
-               case 3:
-                       p->synopsisonly = 1;
-                       break;
-               default:
-                       break;
-               }
-
-       /* Enforce a lower boundary. */
-       if (p->defrmargin < 58)
-               p->defrmargin = 58;
+       if (outopts->mdoc) {
+               p->mdocstyle = 1;
+               p->defindent = 5;
+       }
+       if (outopts->indent)
+               p->defindent = outopts->indent;
+       if (outopts->width)
+               p->defrmargin = outopts->width;
+       if (outopts->synopsisonly)
+               p->synopsisonly = 1;

 
        return(p);
 }
 
 void *
 
        return(p);
 }
 
 void *

-ascii_alloc(const struct mchars *mchars, char *outopts)
+ascii_alloc(const struct mchars *mchars, const struct manoutput *outopts)

 {
 
        return(ascii_init(TERMENC_ASCII, mchars, outopts));
 }
 
 void *
 {
 
        return(ascii_init(TERMENC_ASCII, mchars, outopts));
 }
 
 void *

-utf8_alloc(const struct mchars *mchars, char *outopts)
+utf8_alloc(const struct mchars *mchars, const struct manoutput *outopts)

 {
 
        return(ascii_init(TERMENC_UTF8, mchars, outopts));
 }
 
 void *
 {
 
        return(ascii_init(TERMENC_UTF8, mchars, outopts));
 }
 
 void *

-locale_alloc(const struct mchars *mchars, char *outopts)
+locale_alloc(const struct mchars *mchars, const struct manoutput *outopts)

 {
 
        return(ascii_init(TERMENC_LOCALE, mchars, outopts));
 {
 
        return(ascii_init(TERMENC_LOCALE, mchars, outopts));


@@ -159,16 +141,32 @@ ascii_setwidth(struct termp *p, int iop, size_t width)
 {
 
        p->rmargin = p->defrmargin;
 {
 
        p->rmargin = p->defrmargin;

-       if (0 < iop)
+       if (iop > 0)

                p->defrmargin += width;
                p->defrmargin += width;

-       else if (0 > iop)
+       else if (iop == 0)
+               p->defrmargin = width ? width : p->lastrmargin;
+       else if (p->defrmargin > width)

                p->defrmargin -= width;
        else
                p->defrmargin -= width;
        else

-               p->defrmargin = width ? width : p->lastrmargin;
+               p->defrmargin = 0;

        p->lastrmargin = p->rmargin;
        p->rmargin = p->maxrmargin = p->defrmargin;
 }
 
        p->lastrmargin = p->rmargin;
        p->rmargin = p->maxrmargin = p->defrmargin;
 }
 

+void
+ascii_sepline(void *arg)
+{
+       struct termp    *p;
+       size_t           i;
+
+       p = (struct termp *)arg;
+       putchar('\n');
+       for (i = 0; i < p->defrmargin; i++)
+               putchar('-');
+       putchar('\n');
+       putchar('\n');
+}
+

 static size_t
 ascii_width(const struct termp *p, int c)
 {
 static size_t
 ascii_width(const struct termp *p, int c)
 {