Avoid cross reference to mandoc(1) because it may cause a message

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 1cc615cc214fa44318ca33958b05db51f63474fe..fc55e881b78481e762c785b0a5b3b6c69bf6afe4 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.216 2017/07/14 15:56:37 schwarze Exp $ */
+/*     $Id: html.c,v 1.219 2017/07/15 17:57:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -623,25 +623,29 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                case 'u':
                        su = va_arg(ap, struct roffsu *);
                        break;
-               case 'v':
-                       i = va_arg(ap, int);
-                       su = &mysu;
-                       SCALE_VS_INIT(su, i);
-                       break;
                case 'w':
-                       if ((arg2 = va_arg(ap, char *)) == NULL)
-                               break;
-                       su = &mysu;
-                       a2width(arg2, su);
+                       if ((arg2 = va_arg(ap, char *)) != NULL) {
+                               su = &mysu;
+                               a2width(arg2, su);
+                       }
+                       if (*fmt == '*') {
+                               if (su != NULL && su->unit == SCALE_EN &&
+                                   su->scale > 5.9 && su->scale < 6.1)
+                                       su = NULL;
+                               fmt++;
+                       }
                        if (*fmt == '+') {
-                               /* Increase to make even bold text fit. */
-                               su->scale *= 1.2;
-                               /* Add padding. */
-                               su->scale += 3.0;
+                               if (su != NULL) {
+                                       /* Make even bold text fit. */
+                                       su->scale *= 1.2;
+                                       /* Add padding. */
+                                       su->scale += 3.0;
+                               }
                                fmt++;
                        }
                        if (*fmt == '-') {
-                               su->scale *= -1.0;
+                               if (su != NULL)
+                                       su->scale *= -1.0;
                                fmt++;
                        }
                        break;
@@ -652,9 +656,6 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                /* Second letter: style name. */
 
                switch (*fmt++) {
-               case 'b':
-                       attr = "margin-bottom";
-                       break;
                case 'h':
                        attr = "height";
                        break;
@@ -664,9 +665,6 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                case 'l':
                        attr = "margin-left";
                        break;
-               case 't':
-                       attr = "margin-top";
-                       break;
                case 'w':
                        attr = "width";
                        break;