Tedu support for the -xsh4.2 argument to the mdoc(7) .St macro

[mandoc.git] / out.c

diff --git a/out.c b/out.c
index 797a252abfeb6748d50d2ef23b97e33f4fbada55..bb29f78c9701bc0a280df13431dded99c091a88d 100644 (file)
--- a/out.c
+++ b/out.c
@@ -1,4 +1,4 @@
-/*     $Id: out.c,v 1.83 2021/09/28 17:06:59 schwarze Exp $ */
+/*     $Id: out.c,v 1.85 2021/10/17 21:05:54 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015, 2017, 2018, 2019, 2021


@@ -149,7 +149,6 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                 * to data cells in the data section.
                 */
 
                 * to data cells in the data section.
                 */
 

-               gp = &first_group;

                for (dp = sp->first; dp != NULL; dp = dp->next) {
                        icol = dp->layout->col;
                        while (maxcol < icol + dp->hspans)
                for (dp = sp->first; dp != NULL; dp = dp->next) {
                        icol = dp->layout->col;
                        while (maxcol < icol + dp->hspans)


@@ -190,16 +189,16 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                                continue;
 
                        /*
                                continue;
 
                        /*

-                        * Build an ordered, singly linked list
+                        * Build a singly linked list

                         * of all groups of columns joined by spans,
                         * recording the minimum width for each group.
                         */
 
                         * of all groups of columns joined by spans,
                         * recording the minimum width for each group.
                         */
 

-                       while (*gp != NULL && ((*gp)->startcol < icol ||
-                           (*gp)->endcol < icol + dp->hspans))
+                       gp = &first_group;
+                       while (*gp != NULL && ((*gp)->startcol != icol ||
+                           (*gp)->endcol != icol + dp->hspans))

                                gp = &(*gp)->next;
                                gp = &(*gp)->next;

-                       if (*gp == NULL || (*gp)->startcol > icol ||
-                            (*gp)->endcol > icol + dp->hspans) {
+                       if (*gp == NULL) {

                                g = mandoc_malloc(sizeof(*g));
                                g->next = *gp;
                                g->wanted = width;
                                g = mandoc_malloc(sizeof(*g));
                                g->next = *gp;
                                g->wanted = width;


@@ -248,13 +247,13 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                                done = 1;
                                break;
                        } else
                                done = 1;
                                break;
                        } else

-                               (*gp)->wanted -= width;
+                               g->wanted -= width;

                }
                if (done) {
                        *gp = g->next;
                        free(g);
                } else
                }
                if (done) {
                        *gp = g->next;
                        free(g);
                } else

-                       gp = &(*gp)->next;
+                       gp = &g->next;

        }
 
        colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth));
        }
 
        colwidth = mandoc_reallocarray(NULL, maxcol + 1, sizeof(*colwidth));


@@ -327,7 +326,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp_first,
                                *gp = g->next;
                                free(g);
                        } else
                                *gp = g->next;
                                free(g);
                        } else

-                               gp = &(*gp)->next;
+                               gp = &g->next;

                }
        }
        free(colwidth);
                }
        }
        free(colwidth);