In the validators, translate obsolete macro aliases (Lp, Ot, LP, P)

[mandoc.git] / html.h

diff --git a/html.h b/html.h
index 6d44a47383a791defa473bf58026d5fbf60c241d..477f50b4a0f0b405fdd9639703ad3997c2907f5b 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.92 2018/06/25 16:54:59 schwarze Exp $ */
+/*     $Id: html.h,v 1.95 2018/10/25 01:32:40 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>


@@ -72,6 +72,7 @@ enum  htmlfont {
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_BI,
        HTMLFONT_BOLD,
        HTMLFONT_ITALIC,
        HTMLFONT_BI,

+       HTMLFONT_CW,

        HTMLFONT_MAX
 };
 
        HTMLFONT_MAX
 };
 


@@ -93,6 +94,7 @@ struct        html {
 #define        HTML_SPLIT       (1 << 8) /* break line before .An */
 #define        HTML_NONEWLINE   (1 << 9) /* No line break in nofill mode. */
 #define        HTML_BUFFER      (1 << 10) /* Collect a word to see if it fits. */
 #define        HTML_SPLIT       (1 << 8) /* break line before .An */
 #define        HTML_NONEWLINE   (1 << 9) /* No line break in nofill mode. */
 #define        HTML_BUFFER      (1 << 10) /* Collect a word to see if it fits. */

+#define        HTML_TOCDONE     (1 << 11) /* The TOC was already written. */

        size_t            indent; /* current output indentation level */
        int               noindent; /* indent disabled by <pre> */
        size_t            col; /* current output byte position */
        size_t            indent; /* current output indentation level */
        int               noindent; /* indent disabled by <pre> */
        size_t            col; /* current output byte position */


@@ -101,7 +103,8 @@ struct      html {
        struct tag       *tag; /* last open tag */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */
        struct tag       *tag; /* last open tag */
        struct rofftbl    tbl; /* current table */
        struct tag       *tblt; /* current open table scope */

-       char             *base_man; /* base for manpage href */
+       char             *base_man1; /* bases for manpage href */
+       char             *base_man2;

        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        struct tag       *metaf; /* current open font scope */
        char             *base_includes; /* base for include href */
        char             *style; /* style-sheet URI */
        struct tag       *metaf; /* current open font scope */


@@ -109,6 +112,7 @@ struct      html {
        enum htmlfont     metac; /* current font mode */
        int               oflags; /* output options */
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */
        enum htmlfont     metac; /* current font mode */
        int               oflags; /* output options */
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */

+#define        HTML_TOC         (1 << 1) /* emit a table of contents */

 };
 
 
 };