summaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_html.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-10-28 08:00:17 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-10-28 08:00:17 +0000
commit3211a3293d4f68feb48e68fc3014d6831c1b44e3 (patch)
treef6bb6ebeda945d354143c9f47fe7839393a6c792 /mdoc_html.c
parentcdff20f6d7e19ed09c4c123178ff9c16bdef9aa9 (diff)
downloadmandoc-3211a3293d4f68feb48e68fc3014d6831c1b44e3.tar.gz
mandoc-3211a3293d4f68feb48e68fc3014d6831c1b44e3.tar.zst
mandoc-3211a3293d4f68feb48e68fc3014d6831c1b44e3.zip
Fixed `sp', `br', `Pp', etc. so as not to have an empty div (-Thtml, -man, -mdoc).
Made html_idcat be completely correct (messy standard) (-Thtml). Fixed warnings about -ohang and -item lists (-Thtml, -mdoc). Fixed typo in index.sgml.
Diffstat (limited to 'mdoc_html.c')
-rw-r--r--mdoc_html.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/mdoc_html.c b/mdoc_html.c
index 65f78ea6..5a314fa1 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_html.c,v 1.41 2009/10/28 05:08:17 kristaps Exp $ */
+/* $Id: mdoc_html.c,v 1.42 2009/10/28 08:00:18 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -583,11 +583,11 @@ mdoc_sh_pre(MDOC_ARGS)
return(1);
}
- html_idcpy(buf, "id_", BUFSIZ);
+ buf[0] = '\0';
for (nn = n->child; nn; nn = nn->next) {
html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- html_idcat(buf, "_", BUFSIZ);
+ html_idcat(buf, " ", BUFSIZ);
}
/*
@@ -636,11 +636,11 @@ mdoc_ss_pre(MDOC_ARGS)
/* TODO: see note in mdoc_sh_pre() about duplicates. */
- html_idcpy(buf, "id_", BUFSIZ);
+ buf[0] = '\0';
for (nn = n->child; nn; nn = nn->next) {
html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- html_idcat(buf, "_", BUFSIZ);
+ html_idcat(buf, " ", BUFSIZ);
}
SCALE_HS_INIT(&su, INDENT - HALFINDENT);
@@ -954,8 +954,7 @@ mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width)
case (MDOC_Item):
/* FALLTHROUGH */
case (MDOC_Ohang):
- print_otag(h, TAG_DIV, 0, NULL);
- break;
+ return(0);
case (MDOC_Column):
bufcat_su(h, "min-width", width);
bufcat_style(h, "clear", "none");
@@ -1298,11 +1297,10 @@ mdoc_sx_pre(MDOC_ARGS)
/* FIXME: duplicates? */
strlcpy(buf, "#", BUFSIZ);
- html_idcat(buf, "id_", BUFSIZ);
for (nn = n->child; nn; nn = nn->next) {
html_idcat(buf, nn->string, BUFSIZ);
if (nn->next)
- html_idcat(buf, "_", BUFSIZ);
+ html_idcat(buf, " ", BUFSIZ);
}
PAIR_CLASS_INIT(&tag[0], "link-sec");
@@ -1719,7 +1717,10 @@ mdoc_sp_pre(MDOC_ARGS)
bufcat_su(h, "height", &su);
PAIR_STYLE_INIT(&tag, h);
print_otag(h, TAG_DIV, 1, &tag);
- return(1);
+ /* So the div isn't empty: */
+ print_text(h, "\\~");
+
+ return(0);
}