=================================================================== RCS file: /cvs/mandoc/html.h,v retrieving revision 1.61 retrieving revision 1.66 diff -u -p -r1.61 -r1.66 --- mandoc/html.h 2014/09/27 10:56:18 1.61 +++ mandoc/html.h 2014/10/10 15:26:29 1.66 @@ -1,6 +1,6 @@ -/* $Id: html.h,v 1.61 2014/09/27 10:56:18 kristaps Exp $ */ +/* $Id: html.h,v 1.66 2014/10/10 15:26:29 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -50,6 +50,22 @@ enum htmltag { TAG_CODE, TAG_SMALL, TAG_STYLE, + TAG_MATH, + TAG_MROW, + TAG_MI, + TAG_MO, + TAG_MSUP, + TAG_MSUB, + TAG_MSUBSUP, + TAG_MFRAC, + TAG_MSQRT, + TAG_MFENCED, + TAG_MTABLE, + TAG_MTR, + TAG_MTD, + TAG_MUNDEROVER, + TAG_MUNDER, + TAG_MOVER, TAG_MAX }; @@ -64,6 +80,9 @@ enum htmlattr { ATTR_ID, ATTR_COLSPAN, ATTR_CHARSET, + ATTR_OPEN, + ATTR_CLOSE, + ATTR_MATHVARIANT, ATTR_MAX }; @@ -100,11 +119,6 @@ struct htmlpair { #define PAIR_HREF_INIT(p, v) PAIR_INIT(p, ATTR_HREF, v) #define PAIR_STYLE_INIT(p, h) PAIR_INIT(p, ATTR_STYLE, (h)->buf) -enum htmltype { - HTML_HTML_4_01_STRICT, - HTML_XHTML_1_0_STRICT -}; - struct html { int flags; #define HTML_NOSPACE (1 << 0) /* suppress next space */ @@ -128,7 +142,6 @@ struct html { struct tag *metaf; /* current open font scope */ enum htmlfont metal; /* last used font */ enum htmlfont metac; /* current font mode */ - enum htmltype type; /* output media type */ int oflags; /* output options */ #define HTML_FRAGMENT (1 << 0) /* don't emit HTML/HEAD/BODY */ };