simple implementation of the roff(7) .als (macro alias) request,

[mandoc.git] / tbl_layout.c

diff --git a/tbl_layout.c b/tbl_layout.c
index a2b5ef678d3b08182ab1f7425413e242e5da64db..5357d80871690293c0aac70776e2160453c59b70 100644 (file)
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_layout.c,v 1.35 2015/01/30 00:29:30 schwarze Exp $ */
+/*     $Id: tbl_layout.c,v 1.43 2017/06/13 16:12:01 schwarze Exp $ */
 /*
  * 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
@@ -62,6 +62,7 @@ mods(struct tbl_node *tbl, struct tbl_cell *cp,
                int ln, const char *p, int *pos)
 {
        char            *endptr;
+       size_t           sz;
 
 mod:
        while (p[*pos] == ' ' || p[*pos] == '\t')
@@ -97,12 +98,8 @@ mod:
 
        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;
@@ -111,12 +108,14 @@ mod:
                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':
-               /* FALLTHROUGH */
        case 'v':
                if (p[*pos] == '-' || p[*pos] == '+')
                        (*pos)++;
@@ -129,7 +128,22 @@ 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;
@@ -150,20 +164,34 @@ 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':
-               /* FALLTHROUGH */
-       case 'b':
+       case 'B':
                cp->flags |= TBL_CELL_BOLD;
                goto mod;
        case '2':
-               /* FALLTHROUGH */
-       case 'i':
+       case 'I':
                cp->flags |= TBL_CELL_ITALIC;
                goto mod;
        case '1':
-               /* FALLTHROUGH */
-       case 'r':
+       case 'R':
                goto mod;
        default:
                mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
@@ -270,6 +298,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);
+                               if (tbl->opts.lvert < tbl->first_row->vert)
+                                       tbl->opts.lvert = tbl->first_row->vert;
                                return;
                        }
 
@@ -282,7 +312,7 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos)
                                if (tbl->opts.lvert < rp->vert)
                                        tbl->opts.lvert = rp->vert;
                                if (rp->last != NULL &&
-                                   rp->last->head == tbl->last_head &&
+                                   rp->last->col + 1 == tbl->opts.cols &&
                                    tbl->opts.rvert < rp->last->vert)
                                        tbl->opts.rvert = rp->last->vert;
 
@@ -292,6 +322,7 @@ tbl_layout(struct tbl_node *tbl, int ln, const char *p, int pos)
                                    rp->next->first == NULL) {
                                        free(rp->next);
                                        rp->next = NULL;
+                                       tbl->last_row = rp;
                                }
                        }
                        return;
@@ -324,38 +355,19 @@ static struct tbl_cell *
 cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
 {
        struct tbl_cell *p, *pp;
-       struct tbl_head *h, *hp;
 
-       p = mandoc_calloc(1, sizeof(struct tbl_cell));
+       p = mandoc_calloc(1, sizeof(*p));
+       p->pos = pos;
 
-       if (NULL != (pp = rp->last)) {
+       if ((pp = rp->last) != NULL) {
                pp->next = p;
-               h = pp->head->next;
-       } else {
+               p->col = pp->col + 1;
+       } else
                rp->first = p;
-               h = tbl->first_head;
-       }
        rp->last = p;
 
-       p->pos = pos;
-
-       /* Re-use header. */
-
-       if (h) {
-               p->head = h;
-               return(p);
-       }
-
-       hp = mandoc_calloc(1, sizeof(struct tbl_head));
-       hp->ident = tbl->opts.cols++;
-
-       if (tbl->last_head) {
-               hp->prev = tbl->last_head;
-               tbl->last_head->next = hp;
-       } else
-               tbl->first_head = hp;
-       tbl->last_head = hp;
+       if (tbl->opts.cols <= p->col)
+               tbl->opts.cols = p->col + 1;
 
-       p->head = hp;
-       return(p);
+       return p;
 }