aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/cgi.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-01-25 02:14:43 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-01-25 02:14:43 +0000
commit1ec67c1af1b363b2138d23adb47cf9a20831b5d1 (patch)
tree9634a2c1e0aa1949c5c75ce5eb08378ee14ef3b8 /cgi.c
parent5d0a6a3dde9b1be9a0d4b91df936289aec6b292b (diff)
downloadmandoc-1ec67c1af1b363b2138d23adb47cf9a20831b5d1.tar.gz
mandoc-1ec67c1af1b363b2138d23adb47cf9a20831b5d1.tar.zst
mandoc-1ec67c1af1b363b2138d23adb47cf9a20831b5d1.zip
Improve HTML formatting of .Bl -tag.
In particular, when using the style sheet, put the body on the same line as the head for short heads, or on the next line for long heads, in a way that preserves both correct indentation and correct vertical spacing with and without -compact, and with one or more heads per body (hi, Zaphod) - eight use cases so far - and with and without -tag, and with and without -offset, 32 use cases grand total. Using many ideas from zhuk@, from <David dot Dahlberg at fkie dot fraunhofer dot de>, and from Benny Lofgren <bl dash lists at lofgren dot biz>, and a few of my own. This is an excellent demonstration that CSS is an extremely hostile language, much more trapful and much harder to use than, say, C. When matthew@ reported this in July 2014 (!), it was already a known issue, and i no longer remember for how long. My first serious attempt at fixing it (in November 2015) failed miserably. I'd love to see simplifications of both the generated HTML code and of the style sheet, but without breaking any of the 32 use cases, please.
Diffstat (limited to 'cgi.c')
-rw-r--r--cgi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgi.c b/cgi.c
index 06beca3f..af669187 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/* $Id: cgi.c,v 1.144 2017/01/21 01:20:31 schwarze Exp $ */
+/* $Id: cgi.c,v 1.145 2017/01/25 02:14:43 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@usta.de>
@@ -799,6 +799,7 @@ resp_format(const struct req *req, const char *file)
memset(&conf, 0, sizeof(conf));
conf.fragment = 1;
+ conf.style = mandoc_strdup(CSS_DIR "/mandoc.css");
usepath = strcmp(req->q.manpath, req->p[0]);
mandoc_asprintf(&conf.man, "/%s%s%%N.%%S",
usepath ? req->q.manpath : "", usepath ? "/" : "");
@@ -826,6 +827,7 @@ resp_format(const struct req *req, const char *file)
mparse_free(mp);
mchars_free();
free(conf.man);
+ free(conf.style);
}
static void