version 1.174, 2014/09/28 20:14:20 |
version 1.180, 2014/10/28 17:36:19 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 105 static const char *const htmlattrs[ATTR_MAX] = { |
|
Line 105 static const char *const htmlattrs[ATTR_MAX] = { |
|
"charset", /* ATTR_CHARSET */ |
"charset", /* ATTR_CHARSET */ |
"open", /* ATTR_OPEN */ |
"open", /* ATTR_OPEN */ |
"close", /* ATTR_CLOSE */ |
"close", /* ATTR_CLOSE */ |
|
"mathvariant", /* ATTR_MATHVARIANT */ |
}; |
}; |
|
|
static const char *const roffscales[SCALE_MAX] = { |
static const char *const roffscales[SCALE_MAX] = { |
Line 126 static int print_escape(char); |
|
Line 127 static int print_escape(char); |
|
static int print_encode(struct html *, const char *, int); |
static int print_encode(struct html *, const char *, int); |
static void print_metaf(struct html *, enum mandoc_esc); |
static void print_metaf(struct html *, enum mandoc_esc); |
static void print_attr(struct html *, const char *, const char *); |
static void print_attr(struct html *, const char *, const char *); |
static void *ml_alloc(char *); |
|
|
|
|
|
static void * |
void * |
ml_alloc(char *outopts) |
html_alloc(const struct mchars *mchars, char *outopts) |
{ |
{ |
struct html *h; |
struct html *h; |
const char *toks[5]; |
const char *toks[5]; |
Line 145 ml_alloc(char *outopts) |
|
Line 145 ml_alloc(char *outopts) |
|
h = mandoc_calloc(1, sizeof(struct html)); |
h = mandoc_calloc(1, sizeof(struct html)); |
|
|
h->tags.head = NULL; |
h->tags.head = NULL; |
h->symtab = mchars_alloc(); |
h->symtab = mchars; |
|
|
while (outopts && *outopts) |
while (outopts && *outopts) |
switch (getsubopt(&outopts, UNCONST(toks), &v)) { |
switch (getsubopt(&outopts, UNCONST(toks), &v)) { |
Line 168 ml_alloc(char *outopts) |
|
Line 168 ml_alloc(char *outopts) |
|
return(h); |
return(h); |
} |
} |
|
|
void * |
|
html_alloc(char *outopts) |
|
{ |
|
|
|
return(ml_alloc(outopts)); |
|
} |
|
|
|
void * |
|
xhtml_alloc(char *outopts) |
|
{ |
|
|
|
return(ml_alloc(outopts)); |
|
} |
|
|
|
void |
void |
html_free(void *p) |
html_free(void *p) |
{ |
{ |
Line 195 html_free(void *p) |
|
Line 181 html_free(void *p) |
|
free(tag); |
free(tag); |
} |
} |
|
|
if (h->symtab) |
|
mchars_free(h->symtab); |
|
|
|
free(h); |
free(h); |
} |
} |
|
|
Line 436 print_encode(struct html *h, const char *p, int norecu |
|
Line 419 print_encode(struct html *h, const char *p, int norecu |
|
case ESCAPE_UNICODE: |
case ESCAPE_UNICODE: |
/* Skip past "u" header. */ |
/* Skip past "u" header. */ |
c = mchars_num2uc(seq + 1, len - 1); |
c = mchars_num2uc(seq + 1, len - 1); |
if ('\0' != c) |
|
printf("&#x%x;", c); |
|
break; |
break; |
case ESCAPE_NUMBERED: |
case ESCAPE_NUMBERED: |
c = mchars_num2char(seq, len); |
c = mchars_num2char(seq, len); |
if ( ! ('\0' == c || print_escape(c))) |
|
putchar(c); |
|
break; |
break; |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
c = mchars_spec2cp(h->symtab, seq, len); |
c = mchars_spec2cp(h->symtab, seq, len); |
if (c > 0) |
|
printf("&#%d;", c); |
|
else if (-1 == c && 1 == len && |
|
!print_escape(*seq)) |
|
putchar((int)*seq); |
|
break; |
break; |
case ESCAPE_NOSPACE: |
case ESCAPE_NOSPACE: |
if ('\0' == *p) |
if ('\0' == *p) |
nospace = 1; |
nospace = 1; |
break; |
continue; |
default: |
default: |
break; |
continue; |
} |
} |
|
if (c <= 0) |
|
continue; |
|
if (c < 0x20 || (c > 0x7E && c < 0xA0)) |
|
c = 0xFFFD; |
|
if (c > 0x7E) |
|
printf("&#%d;", c); |
|
else if ( ! print_escape(c)) |
|
putchar(c); |
} |
} |
|
|
return(nospace); |
return(nospace); |