aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2018-05-29 02:10:10 +0000
committerIngo Schwarze <schwarze@openbsd.org>2018-05-29 02:10:10 +0000
commit1b77b3206799accd714dfcfe5e1d600716383372 (patch)
tree8e7d701f8d1c4976a5b43312fe9692d073606848
parent63a479e7ee9cd5025e61de1f3edf07944f7ef66f (diff)
downloadmandoc-1b77b3206799accd714dfcfe5e1d600716383372.tar.gz
mandoc-1b77b3206799accd714dfcfe5e1d600716383372.tar.zst
mandoc-1b77b3206799accd714dfcfe5e1d600716383372.zip
Delete support for the print_otag(sw) * and - modifiers,
which are no longer used because we write fewer style= attributes.
-rw-r--r--html.c13
-rw-r--r--mandoc_html.316
2 files changed, 5 insertions, 24 deletions
diff --git a/html.c b/html.c
index 709c43fa..0d6b67ce 100644
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/* $Id: html.c,v 1.230 2018/05/28 14:13:36 schwarze Exp $ */
+/* $Id: html.c,v 1.231 2018/05/29 02:10:10 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -694,12 +694,6 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
su = &mysu;
a2width(arg2, su);
}
- if (*fmt == '*') {
- if (su != NULL && su->unit == SCALE_EN &&
- su->scale > 5.9 && su->scale < 6.1)
- su = NULL;
- fmt++;
- }
if (*fmt == '+') {
if (su != NULL) {
/* Make even bold text fit. */
@@ -709,11 +703,6 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
}
fmt++;
}
- if (*fmt == '-') {
- if (su != NULL)
- su->scale *= -1.0;
- fmt++;
- }
break;
default:
abort();
diff --git a/mandoc_html.3 b/mandoc_html.3
index 5e7bf607..59b1f4f1 100644
--- a/mandoc_html.3
+++ b/mandoc_html.3
@@ -1,4 +1,4 @@
-.\" $Id: mandoc_html.3,v 1.11 2018/04/13 16:28:07 schwarze Exp $
+.\" $Id: mandoc_html.3,v 1.12 2018/05/29 02:10:10 schwarze Exp $
.\"
.\" Copyright (c) 2014, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: April 13 2018 $
+.Dd $Mdocdate: May 29 2018 $
.Dt MANDOC_HTML 3
.Os
.Sh NAME
@@ -245,18 +245,10 @@ nothing is printed for this pair.
.Pp
The
.Cm w
-argument type letter can optionally be followed by one, two, or three
-modifier letters.
-The modifier
-.Cm *
-suppresses printing of the pair if the argument matches 6n.
-The modifier
+argument type letter can optionally be followed by the modifier
.Cm +
-increases the width by 20% to make even bold text fit
+which increases the width by 20% to make even bold text fit
and adds three units for padding between columns.
-The modifier
-.Cm \-
-makes the width negative by multiplying it with \-1.
.El
.Pp
Style name letters decide what to do with the preceding argument: