diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-13 12:38:47 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-08-13 12:38:47 +0000 |
| commit | c41f3cf10a99f055337e884f8bf6c5a612047efb (patch) | |
| tree | c873f980911fe63842b5598ede8a2ffa8e46825e /usr/src/cmd/mandoc/roff_html.c | |
| parent | 185a422e63f55e51465370d497ca1c1a13366df4 (diff) | |
| parent | 6640c13beae5a8b03718dc6b7a9cda5dd6ab9024 (diff) | |
| download | illumos-joyent-c41f3cf10a99f055337e884f8bf6c5a612047efb.tar.gz | |
[illumos-gate merge]
commit 6640c13beae5a8b03718dc6b7a9cda5dd6ab9024
9718 update mandoc to 1.14.4
commit 9fd537180d8c7ca186c4842f6262016f5e418d10
9668 loader: rename zfsloader to loader
commit a942f1f5f0eafb4e2a9cf5d6cff385b7830676e6
9715 libstand: gzipfs unused variable
commit 567af71db40b696d77b6f0112d8cb20c4dc3ad93
9714 libstand: dereferencing type-punned pointer will break strict-aliasing rules
commit 5620b343930008e3d99871d6563033c0cbe44afa
9713 libstand: cd9660 pointers differ in signedness
commit 27d539f2d4b4c40e9fc667f8b1319ed290c6e4b3
9712 libstand: netif.c variable set but not used
commit 380059927f2f5af9148793463b305037707f8613
9708 loader: libstand warning: pointer targets differ in signedness
commit cb41b9c565d4eec9e1f06e24d429696f59f2f07d
9674 Let's scrap AVS/sdbc
Conflicts:
usr/src/lib/Makefile
Diffstat (limited to 'usr/src/cmd/mandoc/roff_html.c')
| -rw-r--r-- | usr/src/cmd/mandoc/roff_html.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/usr/src/cmd/mandoc/roff_html.c b/usr/src/cmd/mandoc/roff_html.c index 53ae6d7ca2..6a06c0d878 100644 --- a/usr/src/cmd/mandoc/roff_html.c +++ b/usr/src/cmd/mandoc/roff_html.c @@ -1,7 +1,7 @@ -/* $Id: roff_html.c,v 1.11 2017/06/24 14:38:33 schwarze Exp $ */ +/* $Id: roff_html.c,v 1.12 2018/06/25 14:53:58 schwarze Exp $ */ /* * Copyright (c) 2010 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 @@ -82,15 +82,5 @@ roff_html_pre_ce(ROFF_HTML_ARGS) static void roff_html_pre_sp(ROFF_HTML_ARGS) { - struct roffsu su; - - SCALE_VS_INIT(&su, 1); - if ((n = n->child) != NULL) { - if (a2roffsu(n->string, &su, SCALE_VS) == NULL) - su.scale = 1.0; - else if (su.scale < 0.0) - su.scale = 0.0; - } - print_otag(h, TAG_DIV, "suh", &su); - print_text(h, "\\~"); /* So the div isn't empty. */ + print_paragraph(h); } |