diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2014-10-28 17:36:19 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-10-28 17:36:19 +0000 |
commit | d0ac87d04f62f2c8e644686b707cb2602c2ddba6 (patch) | |
tree | 69a250d8b0b0b75bc58e1c8af72b3c3269561aed /html.c | |
parent | 5fa1bace54f386a9b3ce23690f136232e1e5bb2e (diff) | |
download | mandoc-d0ac87d04f62f2c8e644686b707cb2602c2ddba6.tar.gz mandoc-d0ac87d04f62f2c8e644686b707cb2602c2ddba6.tar.zst mandoc-d0ac87d04f62f2c8e644686b707cb2602c2ddba6.zip |
Make the character table available to libroff so it can check the
validity of character escape names and warn about unknown ones.
This requires mchars_spec2cp() to report unknown names again.
Fortunately, that doesn't require changing the calling code because
according to groff, invalid character escapes should not produce
output anyway, and now that we warn about them, that's fine.
Diffstat (limited to 'html.c')
-rw-r--r-- | html.c | 26 |
1 files changed, 4 insertions, 22 deletions
@@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.179 2014/10/27 16:29:06 schwarze Exp $ */ +/* $Id: html.c,v 1.180 2014/10/28 17:36:19 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -127,11 +127,10 @@ static int print_escape(char); static int print_encode(struct html *, const char *, int); static void print_metaf(struct html *, enum mandoc_esc); static void print_attr(struct html *, const char *, const char *); -static void *ml_alloc(char *); -static void * -ml_alloc(char *outopts) +void * +html_alloc(const struct mchars *mchars, char *outopts) { struct html *h; const char *toks[5]; @@ -146,7 +145,7 @@ ml_alloc(char *outopts) h = mandoc_calloc(1, sizeof(struct html)); h->tags.head = NULL; - h->symtab = mchars_alloc(); + h->symtab = mchars; while (outopts && *outopts) switch (getsubopt(&outopts, UNCONST(toks), &v)) { @@ -169,20 +168,6 @@ ml_alloc(char *outopts) return(h); } -void * -html_alloc(char *outopts) -{ - - return(ml_alloc(outopts)); -} - -void * -xhtml_alloc(char *outopts) -{ - - return(ml_alloc(outopts)); -} - void html_free(void *p) { @@ -196,9 +181,6 @@ html_free(void *p) free(tag); } - if (h->symtab) - mchars_free(h->symtab); - free(h); } |