=================================================================== RCS file: /cvs/mandoc/roff_html.c,v retrieving revision 1.11 retrieving revision 1.14 diff -u -p -r1.11 -r1.14 --- mandoc/roff_html.c 2017/06/24 14:38:33 1.11 +++ mandoc/roff_html.c 2018/12/13 11:55:47 1.14 @@ -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.14 2018/12/13 11:55:47 schwarze Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons - * Copyright (c) 2014, 2017 Ingo Schwarze + * Copyright (c) 2014, 2017, 2018 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 @@ -20,7 +20,6 @@ #include #include -#include "mandoc.h" #include "roff.h" #include "out.h" #include "html.h" @@ -58,11 +57,7 @@ roff_html_pre(struct html *h, const struct roff_node * static void roff_html_pre_br(ROFF_HTML_ARGS) { - struct tag *t; - - t = print_otag(h, TAG_DIV, ""); - print_text(h, "\\~"); /* So the div isn't empty. */ - print_tagq(h, t); + print_otag(h, TAG_BR, ""); } static void @@ -82,15 +77,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); }