=================================================================== RCS file: /cvs/mandoc/html.h,v retrieving revision 1.65 retrieving revision 1.69 diff -u -p -r1.65 -r1.69 --- mandoc/html.h 2014/10/10 08:44:24 1.65 +++ mandoc/html.h 2014/12/01 08:05:52 1.69 @@ -1,6 +1,6 @@ -/* $Id: html.h,v 1.65 2014/10/10 08:44:24 kristaps Exp $ */ +/* $Id: html.h,v 1.69 2014/12/01 08:05:52 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 @@ -14,11 +14,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef HTML_H -#define HTML_H -__BEGIN_DECLS - enum htmltag { TAG_HTML, TAG_HEAD, @@ -133,7 +129,7 @@ struct html { struct tagq tags; /* stack of open tags */ struct rofftbl tbl; /* current table */ struct tag *tblt; /* current open table scope */ - struct mchars *symtab; /* character-escapes */ + const struct mchars *symtab; /* character table */ char *base_man; /* base for manpage href */ char *base_includes; /* base for include href */ char *style; /* style-sheet URI */ @@ -146,6 +142,11 @@ struct html { #define HTML_FRAGMENT (1 << 0) /* don't emit HTML/HEAD/BODY */ }; +__BEGIN_DECLS + +struct tbl_span; +struct eqn; + void print_gen_decls(struct html *); void print_gen_head(struct html *); struct tag *print_otag(struct html *, enum htmltag, @@ -176,5 +177,3 @@ void buffmt_includes(struct html *, const char *); int html_strlen(const char *); __END_DECLS - -#endif /*!HTML_H*/