From d2672555187c915062a2f51eb6c0b569ce2aae0e Mon Sep 17 00:00:00 2001 From: schwarze Date: Wed, 12 Jan 2022 04:53:57 +0000 Subject: [PATCH] More accurately represent cells containing horizontal lines in -T tree output. In particular, do not represent "_" as "-", and distinguish "_" from "\_" and "=" from "\=". Output tweak following a related question from Ted Bullock . --- usr.bin/mandoc/tree.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/usr.bin/mandoc/tree.c b/usr.bin/mandoc/tree.c index be6dab878a6..98b80b56aac 100644 --- a/usr.bin/mandoc/tree.c +++ b/usr.bin/mandoc/tree.c @@ -1,7 +1,7 @@ -/* $OpenBSD: tree.c,v 1.58 2021/09/07 10:58:44 schwarze Exp $ */ +/* $OpenBSD: tree.c,v 1.59 2022/01/12 04:53:57 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons - * Copyright (c) 2013-2015, 2017-2021 Ingo Schwarze + * Copyright (c) 2013-2015, 2017-2022 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -507,12 +507,16 @@ print_span(const struct tbl_span *sp, int indent) putchar('x'); } switch (dp->pos) { - case TBL_DATA_HORIZ: case TBL_DATA_NHORIZ: - putchar('-'); + putchar('\\'); + /* FALLTHROUGH */ + case TBL_DATA_HORIZ: + putchar('_'); break; - case TBL_DATA_DHORIZ: case TBL_DATA_NDHORIZ: + putchar('\\'); + /* FALLTHROUGH */ + case TBL_DATA_DHORIZ: putchar('='); break; default: -- 2.20.1