commit: 74d0e1f032834ca43afabf203e3cc87f1d635724
parent: c9bdf97b36685eeda879b4c0ae033c5fd7c99e16
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Mon, 1 Jun 2020 14:36:23 +0200
Remove patch on mandoc, done in overlay
Diffstat:
1 file changed, 0 insertions(+), 218 deletions(-)
diff --git a/patches/app-text/mandoc/tbl_term.c_1.70_1.73.patch b/patches/app-text/mandoc/tbl_term.c_1.70_1.73.patch
@@ -1,218 +0,0 @@
-===================================================================
-RCS file: /cvs/mandoc/tbl_term.c,v
-retrieving revision 1.68
-retrieving revision 1.73
-diff -u -p -r1.68 -r1.73
---- mandoc/tbl_term.c 2019/02/09 21:02:47 1.68
-+++ mandoc/tbl_term.c 2020/01/11 16:26:08 1.73
-@@ -1,7 +1,7 @@
--/* $Id: tbl_term.c,v 1.68 2019/02/09 21:02:47 schwarze Exp $ */
-+/* $Id: tbl_term.c,v 1.73 2020/01/11 16:26:08 schwarze Exp $ */
- /*
- * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
-- * Copyright (c) 2011-2019 Ingo Schwarze <schwarze@openbsd.org>
-+ * Copyright (c) 2011-2020 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
-@@ -46,7 +46,8 @@ static void tbl_fill_border(struct termp *, int, size_
- static void tbl_fill_char(struct termp *, char, size_t);
- static void tbl_fill_string(struct termp *, const char *, size_t);
- static void tbl_hrule(struct termp *, const struct tbl_span *,
-- const struct tbl_span *, int);
-+ const struct tbl_span *, const struct tbl_span *,
-+ int);
- static void tbl_literal(struct termp *, const struct tbl_dat *,
- const struct roffcol *);
- static void tbl_number(struct termp *, const struct tbl_opts *,
-@@ -163,7 +164,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
- const struct tbl_cell *cp, *cpn, *cpp, *cps;
- const struct tbl_dat *dp;
- static size_t offset;
-- size_t save_offset;
-+ size_t save_offset;
- size_t coloff, tsz;
- int hspans, ic, more;
- int dvert, fc, horiz, lhori, rhori, uvert;
-@@ -222,9 +223,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
-
- if (tp->enc == TERMENC_ASCII &&
- sp->opts->opts & TBL_OPT_DBOX)
-- tbl_hrule(tp, NULL, sp, TBL_OPT_DBOX);
-+ tbl_hrule(tp, NULL, sp, sp, TBL_OPT_DBOX);
- if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX))
-- tbl_hrule(tp, NULL, sp, TBL_OPT_BOX);
-+ tbl_hrule(tp, NULL, sp, sp, TBL_OPT_BOX);
- }
-
- /* Set up the columns. */
-@@ -266,11 +267,11 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
- hspans--;
- continue;
- }
-- if (dp == NULL)
-- continue;
-- hspans = dp->hspans;
-- if (ic || sp->layout->first->pos != TBL_CELL_SPAN)
-+ if (dp != NULL &&
-+ (ic || sp->layout->first->pos != TBL_CELL_SPAN)) {
-+ hspans = dp->hspans;
- dp = dp->next;
-+ }
- }
-
- /* Set up a column for a right vertical frame. */
-@@ -301,11 +302,11 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
- tp->tcol++;
- tp->col = 0;
- tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic);
-- if (dp == NULL)
-- continue;
-- hspans = dp->hspans;
-- if (cp->pos != TBL_CELL_SPAN)
-+ if (dp != NULL &&
-+ (ic || sp->layout->first->pos != TBL_CELL_SPAN)) {
-+ hspans = dp->hspans;
- dp = dp->next;
-+ }
- }
- break;
- }
-@@ -342,7 +343,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
-
- more = 0;
- if (horiz)
-- tbl_hrule(tp, sp->prev, sp, 0);
-+ tbl_hrule(tp, sp->prev, sp, sp->next, 0);
- else {
- cp = sp->layout->first;
- cpn = sp->next == NULL ? NULL :
-@@ -424,11 +425,10 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
- cp = cp->next;
- continue;
- }
-- if (dp != NULL) {
-+ if (dp != NULL && (ic ||
-+ sp->layout->first->pos != TBL_CELL_SPAN)) {
- hspans = dp->hspans;
-- if (ic || sp->layout->first->pos
-- != TBL_CELL_SPAN)
-- dp = dp->next;
-+ dp = dp->next;
- }
-
- /*
-@@ -557,12 +557,12 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
- tp->tcol->rmargin = tp->maxrmargin;
- if (sp->next == NULL) {
- if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
-- tbl_hrule(tp, sp, NULL, TBL_OPT_BOX);
-+ tbl_hrule(tp, sp, sp, NULL, TBL_OPT_BOX);
- tp->skipvsp = 1;
- }
- if (tp->enc == TERMENC_ASCII &&
- sp->opts->opts & TBL_OPT_DBOX) {
-- tbl_hrule(tp, sp, NULL, TBL_OPT_DBOX);
-+ tbl_hrule(tp, sp, sp, NULL, TBL_OPT_DBOX);
- tp->skipvsp = 2;
- }
- assert(tp->tbl.cols);
-@@ -571,7 +571,7 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
- } else if (horiz == 0 && sp->opts->opts & TBL_OPT_ALLBOX &&
- (sp->next == NULL || sp->next->pos == TBL_SPAN_DATA ||
- sp->next->next != NULL))
-- tbl_hrule(tp, sp, sp->next, TBL_OPT_ALLBOX);
-+ tbl_hrule(tp, sp, sp, sp->next, TBL_OPT_ALLBOX);
-
- tp->tcol->offset = save_offset;
- tp->flags &= ~TERMP_NONOSPACE;
-@@ -579,9 +579,10 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
-
- static void
- tbl_hrule(struct termp *tp, const struct tbl_span *spp,
-- const struct tbl_span *spn, int flags)
-+ const struct tbl_span *sp, const struct tbl_span *spn, int flags)
- {
- const struct tbl_cell *cpp; /* Layout cell above this line. */
-+ const struct tbl_cell *cp; /* Layout cell in this line. */
- const struct tbl_cell *cpn; /* Layout cell below this line. */
- const struct tbl_dat *dpn; /* Data cell below this line. */
- const struct roffcol *col; /* Contains width and spacing. */
-@@ -592,6 +593,7 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
- int uw, dw; /* Vertical line widths. */
-
- cpp = spp == NULL ? NULL : spp->layout->first;
-+ cp = sp == NULL ? NULL : sp->layout->first;
- cpn = spn == NULL ? NULL : spn->layout->first;
- dpn = NULL;
- if (spn != NULL) {
-@@ -600,11 +602,11 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
- else if (spn->next != NULL)
- dpn = spn->next->first;
- }
-- opts = spn == NULL ? spp->opts->opts : spn->opts->opts;
-+ opts = sp->opts->opts;
- bw = opts & TBL_OPT_DBOX ? (tp->enc == TERMENC_UTF8 ? 2 : 1) :
- opts & (TBL_OPT_BOX | TBL_OPT_ALLBOX) ? 1 : 0;
- hw = flags == TBL_OPT_DBOX || flags == TBL_OPT_BOX ? bw :
-- spn->pos == TBL_SPAN_DHORIZ ? 2 : 1;
-+ sp->pos == TBL_SPAN_DHORIZ ? 2 : 1;
-
- /* Print the left end of the line. */
-
-@@ -619,14 +621,19 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
- (spp == NULL || cpn == NULL ||
- cpn->pos != TBL_CELL_DOWN ? BRIGHT * hw : 0), 1);
-
-+ col = tp->tbl.cols;
- for (;;) {
-- col = tp->tbl.cols + (cpn == NULL ? cpp->col : cpn->col);
-+ if (cp == NULL)
-+ col++;
-+ else
-+ col = tp->tbl.cols + cp->col;
-
- /* Print the horizontal line inside this column. */
-
- lw = cpp == NULL || cpn == NULL ||
- (cpn->pos != TBL_CELL_DOWN &&
-- (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+ (dpn == NULL || dpn->string == NULL ||
-+ strcmp(dpn->string, "\\^") != 0))
- ? hw : 0;
- tbl_direct_border(tp, BHORIZ * lw,
- col->width + col->spacing / 2);
-@@ -645,7 +652,10 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
- uw = 1;
- }
- cpp = cpp->next;
-- }
-+ } else if (spp != NULL && opts & TBL_OPT_ALLBOX)
-+ uw = 1;
-+ if (cp != NULL)
-+ cp = cp->next;
- if (cpn != NULL) {
- if (flags != TBL_OPT_DBOX) {
- dw = cpn->vert;
-@@ -655,8 +665,9 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
- cpn = cpn->next;
- while (dpn != NULL && dpn->layout != cpn)
- dpn = dpn->next;
-- }
-- if (cpp == NULL && cpn == NULL)
-+ } else if (spn != NULL && opts & TBL_OPT_ALLBOX)
-+ dw = 1;
-+ if (col + 1 == tp->tbl.cols + sp->opts->cols)
- break;
-
- /* Vertical lines do not cross spanned cells. */
-@@ -670,7 +681,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp
-
- rw = cpp == NULL || cpn == NULL ||
- (cpn->pos != TBL_CELL_DOWN &&
-- (dpn == NULL || strcmp(dpn->string, "\\^") != 0))
-+ (dpn == NULL || dpn->string == NULL ||
-+ strcmp(dpn->string, "\\^") != 0))
- ? hw : 0;
-
- /* The line crossing at the end of this column. */
