===================================================================
RCS file: /cvs/mandoc/mandoc.css,v
retrieving revision 1.22
retrieving revision 1.30
diff -u -p -r1.22 -r1.30
--- mandoc/mandoc.css	2017/07/16 18:45:00	1.22
+++ mandoc/mandoc.css	2018/05/26 17:38:01	1.30
@@ -1,11 +1,11 @@
-/* $Id: mandoc.css,v 1.22 2017/07/16 18:45:00 schwarze Exp $ */
+/* $Id: mandoc.css,v 1.30 2018/05/26 17:38:01 schwarze Exp $ */
 /*
  * Standard style sheet for mandoc(1) -Thtml and man.cgi(8).
  */
 
 /* Global defaults. */
 
-html {		max-width: 100ex; }
+html {		max-width: 65em; }
 body {		font-family: Helvetica,Arial,sans-serif; }
 table {		margin-top: 0em;
 		margin-bottom: 0em; }
@@ -14,7 +14,7 @@ ul, ol, dl {	margin-top: 0em;
 		margin-bottom: 0em; }
 li, dt {	margin-top: 1em; }
 
-a.selflink {	border-bottom: thin dotted;
+a.permalink {	border-bottom: thin dotted;
 		color: inherit;
 		font: inherit;
 		text-decoration: inherit; }
@@ -41,7 +41,7 @@ table.head {	width: 100%;
 td.head-vol {	text-align: center; }
 td.head-rtitle {
 		text-align: right; }
-span.Nd { }
+div.Nd {	display: inline; }
 
 table.foot {	width: 100%;
 		border-top: 1px dotted #808080;
@@ -52,14 +52,14 @@ td.foot-os {	text-align: right; }
 /* Sections and paragraphs. */
 
 div.manual-text {
-		margin-left: 5ex; }
+		margin-left: 3.8em; }
 h1.Sh {		margin-top: 2ex;
 		margin-bottom: 1ex;
-		margin-left: -4ex;
+		margin-left: -3.2em;
 		font-size: 110%; }
 h2.Ss {		margin-top: 2ex;
 		margin-bottom: 1ex;
-		margin-left: -2ex;
+		margin-left: -1.2em;
 		font-size: 105%; }
 div.Pp {	margin: 1ex 0ex; }
 a.Sx { }
@@ -68,59 +68,67 @@ a.Xr { }
 /* Displays and lists. */
 
 div.Bd { }
-div.D1 {	margin-left: 5ex; }
+div.D1 {	margin-left: 3.8em; }
 
 ul.Bl-bullet {	list-style-type: disc;
 		padding-left: 1em; }
-li.It-bullet { }
+ul.Bl-bullet > li { }
 ul.Bl-dash {	list-style-type: none;
 		padding-left: 0em; }
-li.It-dash:before {
+ul.Bl-dash > li:before {
 		content: "\2014  "; }
 ul.Bl-item {	list-style-type: none;
 		padding-left: 0em; }
-li.It-item { }
+ul.Bl-item > li { }
 ul.Bl-compact > li {
-		margin-top: 0ex; }
+		margin-top: 0em; }
 
 ol.Bl-enum {	padding-left: 2em; }
-li.It-enum { }
+ol.Bl-enum > li { }
 ol.Bl-compact > li {
-		margin-top: 0ex; }
+		margin-top: 0em; }
 
 dl.Bl-diag { }
-dt.It-diag { }
-dd.It-diag {	margin-left: 0ex; }
-b.It-diag {	font-style: normal; }
+dl.Bl-diag > dt {
+		font-style: normal;
+		font-weight: bold; }
+dl.Bl-diag > dd {
+		margin-left: 0em; }
 dl.Bl-hang { }
-dt.It-hang { }
-dd.It-hang {	margin-left: 10.2ex; }
+dl.Bl-hang > dt { }
+dl.Bl-hang > dd {
+		margin-left: 5.5em; }
 dl.Bl-inset { }
-dt.It-inset { }
-dd.It-inset {	margin-left: 0ex; }
+dl.Bl-inset > dt { }
+dl.Bl-inset > dd {
+		margin-left: 0em; }
 dl.Bl-ohang { }
-dt.It-ohang { }
-dd.It-ohang {	margin-left: 0ex; }
-dl.Bl-tag {	margin-left: 10.2ex; }
-dt.It-tag {	float: left;
-		margin-top: 0ex;
-		margin-left: -10.2ex;
-		padding-right: 2ex;
+dl.Bl-ohang > dt { }
+dl.Bl-ohang > dd {
+		margin-left: 0em; }
+dl.Bl-tag {	margin-left: 5.5em; }
+dl.Bl-tag > dt {
+		float: left;
+		margin-top: 0em;
+		margin-left: -5.5em;
+		padding-right: 1.2em;
 		vertical-align: top; }
-dd.It-tag {	clear: right;
+dl.Bl-tag > dd {
+		clear: right;
 		width: 100%;
-		margin-top: 0ex;
-		margin-left: 0ex;
+		margin-top: 0em;
+		margin-left: 0em;
 		vertical-align: top;
 		overflow: auto; }
 dl.Bl-compact > dt {
-		margin-top: 0ex; }
+		margin-top: 0em; }
 
 table.Bl-column { }
-tr.It-column { }
-td.It-column {	margin-top: 1em; }
+table.Bl-column > tbody > tr { }
+table.Bl-column > tbody > tr > td {
+		margin-top: 1em; }
 table.Bl-compact > tbody > tr > td {
-		margin-top: 0ex; }
+		margin-top: 0em; }
 
 cite.Rs {	font-style: normal;
 		font-weight: normal; }
@@ -145,27 +153,42 @@ table.tbl { }
 /* Semantic markup for command line utilities. */
 
 table.Nm { }
-b.Nm {		font-style: normal; }
-b.Fl {		font-style: normal; }
-b.Cm {		font-style: normal; }
+code.Nm {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+code.Fl {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+code.Cm {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
 var.Ar {	font-style: italic;
 		font-weight: normal; }
-span.Op { }
-b.Ic {		font-style: normal; }
+div.Op {	display: inline; }
+code.Ic {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
 code.Ev {	font-style: normal;
 		font-weight: normal;
 		font-family: monospace; }
-i.Pa {		font-weight: normal; }
+span.Pa {	font-style: italic;
+		font-weight: normal; }
 
 /* Semantic markup for function libraries. */
 
 span.Lb { }
-b.In {		font-style: normal; }
+code.In {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
 a.In { }
-b.Fd {		font-style: normal; }
+code.Fd {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
 var.Ft {	font-style: italic;
 		font-weight: normal; }
-b.Fn {		font-style: normal; }
+code.Fn {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
 var.Fa {	font-style: italic;
 		font-weight: normal; }
 var.Vt {	font-style: italic;
@@ -184,14 +207,19 @@ code.Er {	font-style: normal;
 span.An { }
 a.Lk { }
 a.Mt { }
-b.Cd {		font-style: normal; }
-i.Ad {		font-weight: normal; }
-b.Ms {		font-style: normal; }
+code.Cd {	font-style: normal;
+		font-weight: bold;
+		font-family: inherit; }
+span.Ad {	font-style: italic;
+		font-weight: normal; }
+span.Ms {	font-style: normal;
+		font-weight: bold; }
 span.St { }
 a.Ux { }
 
 /* Physical markup. */
 
+.Bf {		display: inline; }
 .No {		font-style: normal;
 		font-weight: normal; }
 .Em {		font-style: italic;