* mandoc: If a tbl(7) column contains both text cells and numeric cells,
@ 2018-08-18 20:18 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2018-08-18 20:18 UTC (permalink / raw)
To: source
Log Message:
-----------
If a tbl(7) column contains both text cells and numeric cells,
horizontally align the numbers in the same way as groff does.
Modified Files:
--------------
mandoc:
out.c
out.h
Revision Data
-------------
Index: out.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/out.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -Lout.c -Lout.c -u -p -r1.71 -r1.72
--- out.c
+++ out.c
@@ -168,6 +168,7 @@ tblcalc(struct rofftbl *tbl, const struc
}
/*
+ * Align numbers with text.
* Count columns to equalize and columns to maximize.
* Find maximum width of the columns to equalize.
* Find total width of the columns *not* to maximize.
@@ -177,6 +178,10 @@ tblcalc(struct rofftbl *tbl, const struc
ewidth = xwidth = 0;
for (icol = 0; icol <= maxcol; icol++) {
col = tbl->cols + icol;
+ if (col->width > col->nwidth)
+ col->decimal += (col->width - col->nwidth) / 2;
+ else
+ col->width = col->nwidth;
if (col->spacing == SIZE_MAX || icol == maxcol)
col->spacing = 3;
if (col->flags & TBL_CELL_EQUAL) {
@@ -358,10 +363,10 @@ tblcalc_number(struct rofftbl *tbl, stru
sz += col->decimal - d;
d = col->decimal;
} else
- col->width += d - col->decimal;
+ col->nwidth += d - col->decimal;
- if (sz > col->width)
- col->width = sz;
+ if (sz > col->nwidth)
+ col->nwidth = sz;
if (d > col->decimal)
col->decimal = d;
}
Index: out.h
===================================================================
RCS file: /home/cvs/mandoc/mandoc/out.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -Lout.h -Lout.h -u -p -r1.32 -r1.33
--- out.h
+++ out.h
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2017, 2018 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
@@ -32,6 +32,7 @@ enum roffscale {
struct roffcol {
size_t width; /* width of cell */
+ size_t nwidth; /* max. width of number in cell */
size_t decimal; /* decimal position in cell */
size_t spacing; /* spacing after the column */
int flags; /* layout flags, see tbl_cell */
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2018-08-18 20:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-18 20:18 mandoc: If a tbl(7) column contains both text cells and numeric cells, schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).