Unify the three stylesheets into a single CSS file.

Many thanks to bentley@ for doing this work.
author: Ingo Schwarze <schwarze@openbsd.org> 2015-11-05 17:47:51 +0000
committer: Ingo Schwarze <schwarze@openbsd.org> 2015-11-05 17:47:51 +0000
commit: 19b3dcea79a7058bdd6e153461a7e967e68db921 (patch)
tree: 41679df46028d2828fcdcd3aebe4270ffa2c7303
parent: 26abada375966bf0a7ff0e9ec74ea47212c2ae4c (diff)
download: mandoc-19b3dcea79a7058bdd6e153461a7e967e68db921.tar.gz
mandoc-19b3dcea79a7058bdd6e153461a7e967e68db921.tar.zst
mandoc-19b3dcea79a7058bdd6e153461a7e967e68db921.zip
7 files changed, 34 insertions, 156 deletions
diff --git a/Makefile b/Makefile
index 7b6e9186..ec9eec60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.471 2015/11/05 17:16:34 schwarze Exp $
+# $Id: Makefile,v 1.472 2015/11/05 17:47:51 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -125,7 +125,6 @@ DISTFILES	 = INSTALL \
 		   configure.local.example \
 		   demandoc.1 \
 		   eqn.7 \
-		   example.style.css \
 		   gmdiff \
 		   html.h \
 		   lib.in \
@@ -135,7 +134,6 @@ DISTFILES	 = INSTALL \
 		   libroff.h \
 		   main.h \
 		   makewhatis.8 \
-		   man-cgi.css \
 		   man.1 \
 		   man.7 \
 		   man.cgi.8 \
@@ -144,6 +142,7 @@ DISTFILES	 = INSTALL \
 		   manconf.h \
 		   mandoc.1 \
 		   mandoc.3 \
+		   mandoc.css \
 		   mandoc.db.5 \
 		   mandoc.h \
 		   mandoc_aux.h \
@@ -165,7 +164,6 @@ DISTFILES	 = INSTALL \
 		   roff.h \
 		   soelim.1 \
 		   st.in \
-		   style.css \
 		   tag.h \
 		   tbl.3 \
 		   tbl.7 \
@@ -362,7 +360,6 @@ base-install: base-build
 	$(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7
 	$(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7
 	$(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
-	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 db-install: base-build
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -389,8 +386,7 @@ cgi-install: cgi-build
 	mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1
 	mkdir -p $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8
 	$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
-	$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
-	$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
+	$(INSTALL_DATA) mandoc.css $(DESTDIR)$(HTDOCDIR)
 	$(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
 	$(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
 
@@ -420,7 +416,7 @@ soelim: $(SOELIM_OBJS) compat_reallocarray.o
 
 www-install: www
 	mkdir -p $(HTDOCDIR)/snapshots
-	$(INSTALL_DATA) $(WWW_MANS) style.css $(HTDOCDIR)
+	$(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR)
 	$(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots
 	$(INSTALL_DATA) mdocml.tar.gz \
 		$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
@@ -454,4 +450,4 @@ mdocml.tar.gz: $(DISTFILES)
 
 .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
 	./mandoc -Thtml -Wall,stop \
-		-Ostyle=style.css,man=%N.%S.html,includes=%I.html $< > $@
+		-Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@
diff --git a/cgi.c b/cgi.c
index 279399ff..bd9634e5 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.112 2015/10/22 22:06:43 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.113 2015/11/05 17:47:51 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@usta.de>
@@ -377,15 +377,13 @@ resp_begin_html(int code, const char *msg)
 	       "<HTML>\n"
 	       "<HEAD>\n"
 	       "<META CHARSET=\"UTF-8\" />\n"
-	       "<LINK REL=\"stylesheet\" HREF=\"%s/man-cgi.css\""
-	       " TYPE=\"text/css\" media=\"all\">\n"
-	       "<LINK REL=\"stylesheet\" HREF=\"%s/man.css\""
+	       "<LINK REL=\"stylesheet\" HREF=\"%s/mandoc.css\""
 	       " TYPE=\"text/css\" media=\"all\">\n"
 	       "<TITLE>%s</TITLE>\n"
 	       "</HEAD>\n"
 	       "<BODY>\n"
 	       "<!-- Begin page content. //-->\n",
-	       CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE);
+	       CSS_DIR, CUSTOMIZE_TITLE);
 }
 
 static void
diff --git a/example.style.css b/example.style.css
deleted file mode 100644
index 90eb4a27..00000000
--- a/example.style.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/* $Id: example.style.css,v 1.55 2015/02/10 08:05:30 schwarze Exp $ */
-/*
- * This is an example style-sheet provided for mandoc(1) and the -Thtml
- * or -Txhtml output mode.
- * It mimics the appearance of the legacy man.cgi output.
- * See mdoc(7) and man(7) for macro explanations.
- */
-
-div.mandoc			{ min-width: 102ex;
-				  width: 102ex;
-				  font-family: monospace; } /* This is the outer node of all mandoc -T[x]html documents. */
-div.mandoc h1			{ margin-bottom: 0ex; font-size: inherit; margin-left: -4ex; } /* Section header (Sh, SH). */
-div.mandoc h2			{ margin-bottom: 0ex; font-size: inherit; margin-left: -2ex; } /* Sub-section header (Ss, SS). */
-div.mandoc table		{ width: 100%; margin-top: 0ex; margin-bottom: 0ex; } /* All tables. */
-div.mandoc td			{ vertical-align: top; } /* All table cells. */
-div.mandoc p			{ } /* Paragraph: Pp, Lp. */
-div.mandoc blockquote		{ margin-left: 5ex; margin-top: 0ex; margin-bottom: 0ex; } /* D1, Dl. */
-div.mandoc div.section		{ margin-bottom: 2ex; margin-left: 5ex; } /* Sections (Sh, SH). */
-div.mandoc div.subsection	{ } /* Sub-sections (Ss, SS). */
-div.mandoc table.synopsis	{ } /* SYNOPSIS section table. */
-div.mandoc table.foot		{ } /* Document footer. */
-div.mandoc td.foot-date		{ width: 50%; } /* Document footer: date. */
-div.mandoc td.foot-os		{ width: 50%;
-				  text-align: right; } /* Document footer: OS/source. */
-div.mandoc table.head		{ } /* Document header. */
-div.mandoc td.head-ltitle	{ width: 10%; } /* Document header: left-title. */
-div.mandoc td.head-vol		{ width: 80%;
-				  text-align: center; } /* Document header: volume. */
-div.mandoc td.head-rtitle	{ width: 10%;
-				  text-align: right; } /* Document header: right-title. */
-div.mandoc .display		{ } /* All Bd, D1, Dl. */
-div.mandoc .list		{ } /* All Bl. */
-div.mandoc i			{ } /* Italic: BI, IB, I, (implicit). */
-div.mandoc b			{ } /* Bold: SB, BI, IB, BR, RB, B, (implicit). */
-div.mandoc small		{ } /* Small: SB, SM. */
-div.mandoc .emph		{ font-style: italic; font-weight: normal; } /* Emphasis: Em, Bl -emphasis. */
-div.mandoc .symb		{ font-style: normal; font-weight: bold; } /* Symbolic: Sy, Ms, Bf -symbolic. */
-div.mandoc .lit			{ font-style: normal; font-weight: normal; font-family: monospace; } /* Literal: Dl, Li, Ql, Bf -literal, Bl -literal, Bl -unfilled. */
-div.mandoc i.addr		{ font-weight: normal; } /* Address (Ad). */
-div.mandoc i.arg		{ font-weight: normal; } /* Command argument (Ar). */
-div.mandoc span.author		{ } /* Author name (An). */
-div.mandoc b.cmd		{ font-style: normal; } /* Command (Cm). */
-div.mandoc b.config		{ font-style: normal; } /* Config statement (Cd). */
-div.mandoc span.define		{ } /* Defines (Dv). */
-div.mandoc span.desc		{ } /* Nd.  After em-dash. */
-div.mandoc b.diag		{ font-style: normal; } /* Diagnostic (Bl -diag). */
-div.mandoc span.env		{ } /* Environment variables (Ev). */
-div.mandoc span.errno		{ } /* Error string (Er). */
-div.mandoc i.farg		{ font-weight: normal; } /* Function argument (Fa, Fn). */
-div.mandoc i.file		{ font-weight: normal; } /* File (Pa). */
-div.mandoc b.flag		{ font-style: normal; } /* Flag (Fl, Cm). */
-div.mandoc b.fname		{ font-style: normal; } /* Function name (Fa, Fn, Rv). */
-div.mandoc i.ftype		{ font-weight: normal; } /* Function types (Ft, Fn). */
-div.mandoc b.includes		{ font-style: normal; } /* Header includes (In). */
-div.mandoc span.lib		{ } /* Library (Lb). */
-div.mandoc i.link-sec		{ font-weight: normal; } /* Section links (Sx). */
-div.mandoc b.macro		{ font-style: normal; } /* Macro-ish thing (Fd). */
-div.mandoc b.name		{ font-style: normal; } /* Name of utility (Nm). */
-div.mandoc span.opt		{ } /* Options (Op, Oo/Oc). */
-div.mandoc span.ref		{ } /* Citations (Rs). */
-div.mandoc span.ref-auth	{ } /* Reference author (%A). */
-div.mandoc i.ref-book		{ font-weight: normal; } /* Reference book (%B). */
-div.mandoc span.ref-city	{ } /* Reference city (%C). */
-div.mandoc span.ref-date	{ } /* Reference date (%D). */
-div.mandoc i.ref-issue		{ font-weight: normal; } /* Reference issuer/publisher (%I). */
-div.mandoc i.ref-jrnl		{ font-weight: normal; } /* Reference journal (%J). */
-div.mandoc span.ref-num		{ } /* Reference number (%N). */
-div.mandoc span.ref-opt		{ } /* Reference optionals (%O). */
-div.mandoc span.ref-page	{ } /* Reference page (%P). */
-div.mandoc span.ref-corp	{ } /* Reference corporate/foreign author (%Q). */
-div.mandoc span.ref-rep		{ } /* Reference report (%R). */
-div.mandoc span.ref-title	{ text-decoration: underline; } /* Reference title (%T). */
-div.mandoc span.ref-vol		{ } /* Reference volume (%V). */
-div.mandoc span.type		{ font-style: italic; font-weight: normal; } /* Variable types (Vt). */
-div.mandoc span.unix		{ } /* Unices (Ux, Ox, Nx, Fx, Bx, Bsx, Dx). */
-div.mandoc b.utility		{ font-style: normal; } /* Name of utility (Ex). */
-div.mandoc b.var		{ font-style: normal; } /* Variables (Rv). */
-div.mandoc a.link-ext		{ } /* Off-site link (Lk). */
-div.mandoc a.link-includes	{ } /* Include-file link (In). */
-div.mandoc a.link-mail		{ } /* Mailto links (Mt). */
-div.mandoc a.link-man		{ } /* Manual links (Xr). */
-div.mandoc a.link-ref		{ } /* Reference section links (%Q). */
-div.mandoc a.link-sec		{ } /* Section links (Sx). */
-div.mandoc dl.list-diag		{ } /* Formatting for lists.  See mdoc(7). */
-div.mandoc dt.list-diag		{ }
-div.mandoc dd.list-diag		{ }
-div.mandoc dl.list-hang		{ }
-div.mandoc dt.list-hang		{ }
-div.mandoc dd.list-hang		{ }
-div.mandoc dl.list-inset	{ }
-div.mandoc dt.list-inset	{ }
-div.mandoc dd.list-inset	{ }
-div.mandoc dl.list-ohang	{ }
-div.mandoc dt.list-ohang	{ }
-div.mandoc dd.list-ohang	{ margin-left: 0ex; }
-div.mandoc dl.list-tag		{ }
-div.mandoc dt.list-tag		{ }
-div.mandoc dd.list-tag		{ }
-div.mandoc table.list-col	{ }
-div.mandoc tr.list-col		{ }
-div.mandoc td.list-col		{ }
-div.mandoc ul.list-bul		{ list-style-type: disc; padding-left: 1em; }
-div.mandoc li.list-bul		{ }
-div.mandoc ul.list-dash		{ list-style-type: none; padding-left: 0em; }
-div.mandoc li.list-dash:before	{ content: "\2014  "; }
-div.mandoc ul.list-hyph		{ list-style-type: none; padding-left: 0em; }
-div.mandoc li.list-hyph:before	{ content: "\2013  "; }
-div.mandoc ul.list-item		{ list-style-type: none; padding-left: 0em; }
-div.mandoc li.list-item		{ }
-div.mandoc ol.list-enum		{ padding-left: 2em; }
-div.mandoc li.list-enum		{ }
-div.mandoc span.eqn		{ } /* Equation modes.  See eqn(7). */
-div.mandoc table.tbl		{ } /* Table modes.  See tbl(7). */
-div.mandoc div.spacer		{ margin: 1em 0; }
diff --git a/man-cgi.css b/man-cgi.css
deleted file mode 100644
index 256e8c66..00000000
--- a/man-cgi.css
+++ /dev/null
@@ -1,13 +0,0 @@
-body				{ font-family: Helvetica, Arial, sans-serif; }
-body > div			{ padding-left: 2em;
-				  padding-top: 1em; }
-body > div#mancgi		{ padding-left: 0em;
-				  padding-top: 0em; }
-body > div.results		{ font-size: smaller; }
-#mancgi fieldset		{ text-align: center;
-				  border: thin solid silver;
-				  border-radius: 1em;
-			  	  font-size: small; }
-#mancgi input[name=expr] 	{ width: 25%; }
-.results td.title		{ vertical-align: top;
-				  padding-right: 1em; }
diff --git a/man.cgi.8 b/man.cgi.8
index 4d3588b0..80391d72 100644
--- a/man.cgi.8
+++ b/man.cgi.8
@@ -1,4 +1,4 @@
-.\"     $Id: man.cgi.8,v 1.11 2014/09/14 19:44:28 schwarze Exp $
+.\"     $Id: man.cgi.8,v 1.12 2015/11/05 17:47:51 schwarze Exp $
 .\"
 .\" Copyright (c) 2014 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: September 14 2014 $
+.Dd $Mdocdate: November 5 2015 $
 .Dt MAN.CGI 8
 .Os
 .Sh NAME
@@ -161,6 +161,9 @@ database inside each manpath.
 Configure your web server to execute CGI programs located in
 .Pa /cgi-bin .
 When using
+.Ox
+.Xr httpd 8
+or
 .Xr nginx 8 ,
 the
 .Xr slowcgi 8
@@ -349,15 +352,10 @@ Can be overridden by
 The path to the server document root relative to the server root.
 This is part of the web server configuration and not specific to
 .Nm .
-.It Pa /htdocs/man-cgi.css
-A style sheet for general
-.Nm
-styling, referenced from each generated HTML page.
-.It Pa /htdocs/man.css
+.It Pa /htdocs/mandoc.css
 A style sheet for
 .Xr mandoc 1
-HTML styling, referenced from each generated HTML page after
-.Pa man-cgi.css .
+HTML styling, referenced from each generated HTML page.
 .It Pa /man
 Default
 .Nm
diff --git a/mandoc.1 b/mandoc.1
index 90e2b5d3..f4707aa2 100644
--- a/mandoc.1
+++ b/mandoc.1
@@ -1,4 +1,4 @@
-.\"	$Id: mandoc.1,v 1.163 2015/10/30 19:04:16 schwarze Exp $
+.\"	$Id: mandoc.1,v 1.164 2015/11/05 17:47:51 schwarze Exp $
 .\"
 .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 .\" Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,7 +15,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: October 30 2015 $
+.Dd $Mdocdate: November 5 2015 $
 .Dt MANDOC 1
 .Os
 .Sh NAME
@@ -349,7 +349,7 @@ Equations rendered from
 blocks use MathML.
 .Pp
 The
-.Pa example.style.css
+.Pa mandoc.css
 file documents style-sheet classes available for customising output.
 If a style-sheet is not specified with
 .Fl O Cm style ,
@@ -601,10 +601,10 @@ To page manuals to the terminal:
 .Dl $ mandoc mandoc.1 mdoc.3 mdoc.7 | less
 .Pp
 To produce HTML manuals with
-.Ar style.css
+.Pa mandoc.css
 as the style-sheet:
 .Pp
-.Dl $ mandoc \-T html -O style=style.css mdoc.7 \*(Gt mdoc.7.html
+.Dl $ mandoc \-T html -O style=mandoc.css mdoc.7 \*(Gt mdoc.7.html
 .Pp
 To check over a large set of manuals:
 .Pp
diff --git a/style.css b/mandoc.css
index 1328f4d3..38c5c58b 100644
--- a/style.css
+++ b/mandoc.css
@@ -1,4 +1,4 @@
-/* $Id: style.css,v 1.31 2015/02/10 08:05:30 schwarze Exp $ */
+/* $Id: mandoc.css,v 1.1 2015/11/05 17:47:51 schwarze Exp $ */
 
 /*
  * This is an example style-sheet provided for mandoc(1) and the -Thtml
@@ -11,6 +11,19 @@
 
 html		{ max-width: 880px; margin-left: 1em; }
 body		{ font-size: smaller; font-family: Helvetica,Arial,sans-serif; }
+body > div			{ padding-left: 2em;
+				  padding-top: 1em; }
+body > div.mandoc,
+body > div#mancgi		{ padding-left: 0em;
+				  padding-top: 0em; }
+body > div.results		{ font-size: smaller; }
+#mancgi fieldset		{ text-align: center;
+				  border: thin solid silver;
+				  border-radius: 1em;
+			  	  font-size: small; }
+#mancgi input[name=expr] 	{ width: 25%; }
+.results td.title		{ vertical-align: top;
+				  padding-right: 1em; }
 h1		{ margin-bottom: 1ex; font-size: 110%; margin-left: -4ex; } /* Section header (Sh, SH). */
 h2		{ margin-bottom: 1ex; font-size: 105%; margin-left: -2ex; } /* Sub-section header (Ss, SS). */
 table		{ width: 100%; margin-top: 0ex; margin-bottom: 0ex; } /* All tables. */
author	Ingo Schwarze <schwarze@openbsd.org>	2015-11-05 17:47:51 +0000
committer	Ingo Schwarze <schwarze@openbsd.org>	2015-11-05 17:47:51 +0000
commit	19b3dcea79a7058bdd6e153461a7e967e68db921 (patch)
tree	41679df46028d2828fcdcd3aebe4270ffa2c7303
parent	26abada375966bf0a7ff0e9ec74ea47212c2ae4c (diff)
download	mandoc-19b3dcea79a7058bdd6e153461a7e967e68db921.tar.gz mandoc-19b3dcea79a7058bdd6e153461a7e967e68db921.tar.zst mandoc-19b3dcea79a7058bdd6e153461a7e967e68db921.zip