libmdoc.h no longer needs mdoc.h

[mandoc.git] / tbl_layout.c

diff --git a/tbl_layout.c b/tbl_layout.c
index dc745b33f2f0f26500374f98b3a1d4134167535a..0f7d5a79326717b7ec8ca09b1cb37d311cc4ebdf 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_layout.c,v 1.37 2015/01/30 04:11:50 schwarze Exp $ */
+/*     $Id: tbl_layout.c,v 1.46 2018/12/13 02:06:07 schwarze Exp $ */

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

- * Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012, 2014, 2015, 2017 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -20,14 +20,16 @@
 #include <sys/types.h>
 
 #include <ctype.h>
 #include <sys/types.h>
 
 #include <ctype.h>

+#include <stdint.h>

 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 

-#include "mandoc.h"

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

+#include "mandoc.h"
+#include "tbl.h"

 #include "libmandoc.h"
 #include "libmandoc.h"

-#include "libroff.h"
+#include "tbl_int.h"

 
 struct tbl_phrase {
        char             name;
 
 struct tbl_phrase {
        char             name;


@@ -62,6 +64,7 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp,
                int ln, const char *p, int *pos)
 {
        char            *endptr;
                int ln, const char *p, int *pos)
 {
        char            *endptr;

+       size_t           sz;

 
 mod:
        while (p[*pos] == ' ' || p[*pos] == '\t')
 
 mod:
        while (p[*pos] == ' ' || p[*pos] == '\t')


@@ -97,12 +100,8 @@ mod:
 
        switch (tolower((unsigned char)p[(*pos)++])) {
        case 'b':
 
        switch (tolower((unsigned char)p[(*pos)++])) {
        case 'b':

-               /* FALLTHROUGH */
-       case 'i':
-               /* FALLTHROUGH */
-       case 'r':
-               (*pos)--;
-               break;
+               cp->flags |= TBL_CELL_BOLD;
+               goto mod;

        case 'd':
                cp->flags |= TBL_CELL_BALIGN;
                goto mod;
        case 'd':
                cp->flags |= TBL_CELL_BALIGN;
                goto mod;


@@ -111,12 +110,14 @@ mod:
                goto mod;
        case 'f':
                break;
                goto mod;
        case 'f':
                break;

+       case 'i':
+               cp->flags |= TBL_CELL_ITALIC;
+               goto mod;

        case 'm':
                mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse,
                    ln, *pos, "m");
                goto mod;
        case 'p':
        case 'm':
                mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse,
                    ln, *pos, "m");
                goto mod;
        case 'p':

-               /* FALLTHROUGH */

        case 'v':
                if (p[*pos] == '-' || p[*pos] == '+')
                        (*pos)++;
        case 'v':
                if (p[*pos] == '-' || p[*pos] == '+')
                        (*pos)++;


@@ -129,7 +130,22 @@ mod:
        case 'u':
                cp->flags |= TBL_CELL_UP;
                goto mod;
        case 'u':
                cp->flags |= TBL_CELL_UP;
                goto mod;

-       case 'w':  /* XXX for now, ignore minimal column width */
+       case 'w':
+               sz = 0;
+               if (p[*pos] == '(') {
+                       (*pos)++;
+                       while (p[*pos + sz] != '\0' && p[*pos + sz] != ')')
+                               sz++;
+               } else
+                       while (isdigit((unsigned char)p[*pos + sz]))
+                               sz++;
+               if (sz) {
+                       free(cp->wstr);
+                       cp->wstr = mandoc_strndup(p + *pos, sz);
+                       *pos += sz;
+                       if (p[*pos] == ')')
+                               (*pos)++;
+               }

                goto mod;
        case 'x':
                cp->flags |= TBL_CELL_WMAX;
                goto mod;
        case 'x':
                cp->flags |= TBL_CELL_WMAX;


@@ -150,20 +166,34 @@ mod:
                goto mod;
        }
 
                goto mod;
        }
 

-       switch (tolower((unsigned char)p[(*pos)++])) {
+       /* Ignore parenthised font names for now. */
+
+       if (p[*pos] == '(')
+               goto mod;
+
+       /* Support only one-character font-names for now. */
+
+       if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) {
+               mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
+                   ln, *pos, "TS %s", p + *pos - 1);
+               if (p[*pos] != '\0')
+                       (*pos)++;
+               if (p[*pos] != '\0')
+                       (*pos)++;
+               goto mod;
+       }
+
+       switch (p[(*pos)++]) {

        case '3':
        case '3':

-               /* FALLTHROUGH */
-       case 'b':
+       case 'B':

                cp->flags |= TBL_CELL_BOLD;
                goto mod;
        case '2':
                cp->flags |= TBL_CELL_BOLD;
                goto mod;
        case '2':

-               /* FALLTHROUGH */
-       case 'i':
+       case 'I':

                cp->flags |= TBL_CELL_ITALIC;
                goto mod;
        case '1':
                cp->flags |= TBL_CELL_ITALIC;
                goto mod;
        case '1':

-               /* FALLTHROUGH */
-       case 'r':
+       case 'R':

                goto mod;
        default:
                mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
                goto mod;
        default:
                mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,


@@ -270,6 +300,8 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos)
                                    tbl->parse, ln, pos, NULL);
                                cell_alloc(tbl, tbl->first_row,
                                    TBL_CELL_LEFT);
                                    tbl->parse, ln, pos, NULL);
                                cell_alloc(tbl, tbl->first_row,
                                    TBL_CELL_LEFT);

+                               if (tbl->opts.lvert < tbl->first_row->vert)
+                                       tbl->opts.lvert = tbl->first_row->vert;

                                return;
                        }
 
                                return;
                        }
 


@@ -292,6 +324,7 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos)
                                    rp->next->first == NULL) {
                                        free(rp->next);
                                        rp->next = NULL;
                                    rp->next->first == NULL) {
                                        free(rp->next);
                                        rp->next = NULL;

+                                       tbl->last_row = rp;

                                }
                        }
                        return;
                                }
                        }
                        return;


@@ -326,6 +359,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
        struct tbl_cell *p, *pp;
 
        p = mandoc_calloc(1, sizeof(*p));
        struct tbl_cell *p, *pp;
 
        p = mandoc_calloc(1, sizeof(*p));

+       p->spacing = SIZE_MAX;

        p->pos = pos;
 
        if ((pp = rp->last) != NULL) {
        p->pos = pos;
 
        if ((pp = rp->last) != NULL) {


@@ -338,5 +372,5 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
        if (tbl->opts.cols <= p->col)
                tbl->opts.cols = p->col + 1;
 
        if (tbl->opts.cols <= p->col)
                tbl->opts.cols = p->col + 1;
 

-       return(p);
+       return p;

 }
 }