-/* $Id: mdoc_html.c,v 1.235 2015/09/26 00:32:35 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.247 2017/01/11 17:39:53 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
static void mdoc_bk_post(MDOC_ARGS);
static int mdoc_bk_pre(MDOC_ARGS);
static int mdoc_bl_pre(MDOC_ARGS);
-static int mdoc_bt_pre(MDOC_ARGS);
-static int mdoc_bx_pre(MDOC_ARGS);
static int mdoc_cd_pre(MDOC_ARGS);
static int mdoc_d1_pre(MDOC_ARGS);
static int mdoc_dv_pre(MDOC_ARGS);
static void mdoc_quote_post(MDOC_ARGS);
static int mdoc_quote_pre(MDOC_ARGS);
static int mdoc_rs_pre(MDOC_ARGS);
-static int mdoc_rv_pre(MDOC_ARGS);
static int mdoc_sh_pre(MDOC_ARGS);
static int mdoc_skip_pre(MDOC_ARGS);
static int mdoc_sm_pre(MDOC_ARGS);
static int mdoc_ss_pre(MDOC_ARGS);
static int mdoc_sx_pre(MDOC_ARGS);
static int mdoc_sy_pre(MDOC_ARGS);
-static int mdoc_ud_pre(MDOC_ARGS);
static int mdoc_va_pre(MDOC_ARGS);
static int mdoc_vt_pre(MDOC_ARGS);
static int mdoc_xr_pre(MDOC_ARGS);
{mdoc_quote_pre, mdoc_quote_post}, /* Op */
{mdoc_ft_pre, NULL}, /* Ot */
{mdoc_pa_pre, NULL}, /* Pa */
- {mdoc_rv_pre, NULL}, /* Rv */
+ {mdoc_ex_pre, NULL}, /* Rv */
{NULL, NULL}, /* St */
{mdoc_va_pre, NULL}, /* Va */
{mdoc_vt_pre, NULL}, /* Vt */
{mdoc_quote_pre, mdoc_quote_post}, /* Bo */
{mdoc_quote_pre, mdoc_quote_post}, /* Bq */
{mdoc_xx_pre, NULL}, /* Bsx */
- {mdoc_bx_pre, NULL}, /* Bx */
+ {mdoc_xx_pre, NULL}, /* Bx */
{mdoc_skip_pre, NULL}, /* Db */
{NULL, NULL}, /* Dc */
{mdoc_quote_pre, mdoc_quote_post}, /* Do */
{NULL, NULL}, /* Oc */
{mdoc_bk_pre, mdoc_bk_post}, /* Bk */
{NULL, NULL}, /* Ek */
- {mdoc_bt_pre, NULL}, /* Bt */
+ {NULL, NULL}, /* Bt */
{NULL, NULL}, /* Hf */
{mdoc_em_pre, NULL}, /* Fr */
- {mdoc_ud_pre, NULL}, /* Ud */
+ {NULL, NULL}, /* Ud */
{mdoc_lb_pre, NULL}, /* Lb */
{mdoc_pp_pre, NULL}, /* Lp */
{mdoc_lk_pre, NULL}, /* Lk */
synopsis_pre(struct html *h, const struct roff_node *n)
{
- if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+ if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))
return;
if (n->prev->tok == n->tok &&
switch (n->prev->tok) {
case MDOC_Fd:
- /* FALLTHROUGH */
case MDOC_Fn:
- /* FALLTHROUGH */
case MDOC_Fo:
- /* FALLTHROUGH */
case MDOC_In:
- /* FALLTHROUGH */
case MDOC_Vt:
print_paragraph(h);
break;
int child;
struct tag *t;
+ if (n->flags & NODE_NOPRT)
+ return;
+
child = 1;
t = h->tags.head;
- n->flags &= ~MDOC_ENDED;
+ n->flags &= ~NODE_ENDED;
switch (n->type) {
case ROFFT_TEXT:
* Make sure that if we're in a literal mode already
* (i.e., within a <PRE>) don't print the newline.
*/
- if (' ' == *n->string && MDOC_LINE & n->flags)
+ if (' ' == *n->string && NODE_LINE & n->flags)
if ( ! (HTML_LITERAL & h->flags))
print_otag(h, TAG_BR, 0, NULL);
- if (MDOC_DELIMC & n->flags)
+ if (NODE_DELIMC & n->flags)
h->flags |= HTML_NOSPACE;
print_text(h, n->string);
- if (MDOC_DELIMO & n->flags)
+ if (NODE_DELIMO & n->flags)
h->flags |= HTML_NOSPACE;
return;
case ROFFT_EQN:
- if (n->flags & MDOC_LINE)
+ if (n->flags & NODE_LINE)
putchar('\n');
print_eqn(h, n->eqn);
break;
break;
}
- if (h->flags & HTML_KEEP && n->flags & MDOC_LINE) {
+ if (h->flags & HTML_KEEP && n->flags & NODE_LINE) {
h->flags &= ~HTML_KEEP;
h->flags |= HTML_PREKEEP;
}
case ROFFT_EQN:
break;
default:
- if ( ! mdocs[n->tok].post || n->flags & MDOC_ENDED)
+ if ( ! mdocs[n->tok].post || n->flags & NODE_ENDED)
break;
(*mdocs[n->tok].post)(meta, n, h);
if (n->end != ENDBODY_NOT)
- n->body->flags |= MDOC_ENDED;
+ n->body->flags |= NODE_ENDED;
if (n->end == ENDBODY_NOSPACE)
h->flags |= HTML_NOSPACE;
break;
free(title);
free(volume);
- return(1);
+ return 1;
}
static int
case ROFFT_BLOCK:
PAIR_CLASS_INIT(&tag, "section");
print_otag(h, TAG_DIV, 1, &tag);
- return(1);
+ return 1;
case ROFFT_BODY:
if (n->sec == SEC_AUTHORS)
h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
- return(1);
+ return 1;
default:
break;
}
bufinit(h);
- bufcat(h, "x");
for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {
bufcat_id(h, n->string);
} else
print_otag(h, TAG_H1, 0, NULL);
- return(1);
+ return 1;
}
static int
if (n->type == ROFFT_BLOCK) {
PAIR_CLASS_INIT(&tag, "subsection");
print_otag(h, TAG_DIV, 1, &tag);
- return(1);
+ return 1;
} else if (n->type == ROFFT_BODY)
- return(1);
+ return 1;
bufinit(h);
- bufcat(h, "x");
for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {
bufcat_id(h, n->string);
} else
print_otag(h, TAG_H2, 0, NULL);
- return(1);
+ return 1;
}
static int
/* `Cm' has no leading hyphen. */
if (MDOC_Cm == n->tok)
- return(1);
+ return 1;
print_text(h, "\\-");
- if ( ! (n->nchild == 0 &&
+ if (!(n->child == NULL &&
(n->next == NULL ||
n->next->type == ROFFT_TEXT ||
- n->next->flags & MDOC_LINE)))
+ n->next->flags & NODE_LINE)))
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
static int
struct htmlpair tag;
if (n->type != ROFFT_BODY)
- return(1);
+ return 1;
/* XXX: this tag in theory can contain block elements. */
print_text(h, "\\(em");
PAIR_CLASS_INIT(&tag, "desc");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
print_otag(h, TAG_B, 1, &tag);
if (n->child == NULL && meta->name != NULL)
print_text(h, meta->name);
- return(1);
+ return 1;
case ROFFT_BODY:
print_otag(h, TAG_TD, 0, NULL);
- return(1);
+ return 1;
default:
break;
}
print_otag(h, TAG_COL, 0, NULL);
print_otag(h, TAG_TBODY, 0, NULL);
print_otag(h, TAG_TR, 0, NULL);
- return(1);
+ return 1;
}
static int
struct htmlpair tag[2];
if (NULL == n->child)
- return(0);
+ return 0;
PAIR_CLASS_INIT(&tag[0], "link-man");
print_text(h, n->string);
if (NULL == (n = n->next))
- return(0);
+ return 0;
h->flags |= HTML_NOSPACE;
print_text(h, "(");
print_text(h, n->string);
h->flags |= HTML_NOSPACE;
print_text(h, ")");
- return(0);
+ return 0;
}
static int
mdoc_ns_pre(MDOC_ARGS)
{
- if ( ! (MDOC_LINE & n->flags))
+ if ( ! (NODE_LINE & n->flags))
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "arg");
print_otag(h, TAG_I, 1, &tag);
- return(1);
+ return 1;
}
static int
mdoc_xx_pre(MDOC_ARGS)
{
- const char *pp;
struct htmlpair tag;
- int flags;
-
- switch (n->tok) {
- case MDOC_Bsx:
- pp = "BSD/OS";
- break;
- case MDOC_Dx:
- pp = "DragonFly";
- break;
- case MDOC_Fx:
- pp = "FreeBSD";
- break;
- case MDOC_Nx:
- pp = "NetBSD";
- break;
- case MDOC_Ox:
- pp = "OpenBSD";
- break;
- case MDOC_Ux:
- pp = "UNIX";
- break;
- default:
- return(1);
- }
PAIR_CLASS_INIT(&tag, "unix");
print_otag(h, TAG_SPAN, 1, &tag);
-
- print_text(h, pp);
- if (n->child) {
- flags = h->flags;
- h->flags |= HTML_KEEP;
- print_text(h, n->child->string);
- h->flags = flags;
- }
- return(0);
-}
-
-static int
-mdoc_bx_pre(MDOC_ARGS)
-{
- struct htmlpair tag;
-
- PAIR_CLASS_INIT(&tag, "unix");
- print_otag(h, TAG_SPAN, 1, &tag);
-
- if (NULL != (n = n->child)) {
- print_text(h, n->string);
- h->flags |= HTML_NOSPACE;
- print_text(h, "BSD");
- } else {
- print_text(h, "BSD");
- return(0);
- }
-
- if (NULL != (n = n->next)) {
- h->flags |= HTML_NOSPACE;
- print_text(h, "-");
- h->flags |= HTML_NOSPACE;
- print_text(h, n->string);
- }
-
- return(0);
+ return 1;
}
static int
if (n->type == ROFFT_HEAD) {
switch (type) {
case LIST_bullet:
- /* FALLTHROUGH */
case LIST_dash:
- /* FALLTHROUGH */
case LIST_item:
- /* FALLTHROUGH */
case LIST_hyphen:
- /* FALLTHROUGH */
case LIST_enum:
- return(0);
+ return 0;
case LIST_diag:
- /* FALLTHROUGH */
case LIST_hang:
- /* FALLTHROUGH */
case LIST_inset:
- /* FALLTHROUGH */
case LIST_ohang:
- /* FALLTHROUGH */
case LIST_tag:
SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
bufcat_su(h, "margin-top", &su);
} else if (n->type == ROFFT_BODY) {
switch (type) {
case LIST_bullet:
- /* FALLTHROUGH */
case LIST_hyphen:
- /* FALLTHROUGH */
case LIST_dash:
- /* FALLTHROUGH */
case LIST_enum:
- /* FALLTHROUGH */
case LIST_item:
SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
bufcat_su(h, "margin-top", &su);
print_otag(h, TAG_LI, 2, tag);
break;
case LIST_diag:
- /* FALLTHROUGH */
case LIST_hang:
- /* FALLTHROUGH */
case LIST_inset:
- /* FALLTHROUGH */
case LIST_ohang:
- /* FALLTHROUGH */
case LIST_tag:
if (NULL == bl->norm->Bl.width) {
print_otag(h, TAG_DD, 1, tag);
}
}
- return(1);
+ return 1;
}
static int
if (n->type == ROFFT_BODY) {
if (LIST_column == n->norm->Bl.type)
print_otag(h, TAG_TBODY, 0, NULL);
- return(1);
+ return 1;
}
if (n->type == ROFFT_HEAD) {
if (LIST_column != n->norm->Bl.type)
- return(0);
+ return 0;
/*
* For each column, print out the <COL> tag with our
print_otag(h, TAG_COL, 1, tag);
}
- return(0);
+ return 0;
}
SCALE_VS_INIT(&su, 0);
switch (n->norm->Bl.type) {
case LIST_bullet:
- /* FALLTHROUGH */
case LIST_dash:
- /* FALLTHROUGH */
case LIST_hyphen:
- /* FALLTHROUGH */
case LIST_item:
print_otag(h, TAG_UL, 2, tag);
break;
print_otag(h, TAG_OL, 2, tag);
break;
case LIST_diag:
- /* FALLTHROUGH */
case LIST_hang:
- /* FALLTHROUGH */
case LIST_inset:
- /* FALLTHROUGH */
case LIST_ohang:
- /* FALLTHROUGH */
case LIST_tag:
print_otag(h, TAG_DL, 2, tag);
break;
break;
default:
abort();
- /* NOTREACHED */
}
- return(1);
+ return 1;
}
static int
mdoc_ex_pre(MDOC_ARGS)
{
- struct tag *t;
- struct htmlpair tag;
- int nchild;
-
if (n->prev)
print_otag(h, TAG_BR, 0, NULL);
-
- PAIR_CLASS_INIT(&tag, "utility");
-
- print_text(h, "The");
-
- nchild = n->nchild;
- for (n = n->child; n; n = n->next) {
- assert(n->type == ROFFT_TEXT);
-
- t = print_otag(h, TAG_B, 1, &tag);
- print_text(h, n->string);
- print_tagq(h, t);
-
- if (nchild > 2 && n->next) {
- h->flags |= HTML_NOSPACE;
- print_text(h, ",");
- }
-
- if (n->next && NULL == n->next->next)
- print_text(h, "and");
- }
-
- if (nchild > 1)
- print_text(h, "utilities exit\\~0");
- else
- print_text(h, "utility exits\\~0");
-
- print_text(h, "on success, and\\~>0 if an error occurs.");
- return(0);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "emph");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
struct roffsu su;
if (n->type != ROFFT_BLOCK)
- return(1);
+ return 1;
SCALE_VS_INIT(&su, 0);
bufinit(h);
print_otag(h, TAG_CODE, 1, tag);
}
- return(1);
+ return 1;
}
static int
struct htmlpair tag[2];
bufinit(h);
- bufcat(h, "#x");
+ bufcat(h, "#");
for (n = n->child; n; ) {
bufcat_id(h, n->string);
print_otag(h, TAG_I, 1, tag);
print_otag(h, TAG_A, 2, tag);
- return(1);
+ return 1;
}
static int
struct roffsu su;
if (n->type == ROFFT_HEAD)
- return(0);
+ return 0;
if (n->type == ROFFT_BLOCK) {
comp = n->norm->Bd.comp;
}
if ( ! comp)
print_paragraph(h);
- return(1);
+ return 1;
}
/* Handle the -offset argument. */
bufcat_su(h, "margin-left", &su);
PAIR_STYLE_INIT(&tag[0], h);
- if (DISP_unfilled != n->norm->Bd.type &&
- DISP_literal != n->norm->Bd.type) {
- PAIR_CLASS_INIT(&tag[1], "display");
- print_otag(h, TAG_DIV, 2, tag);
- return(1);
- }
+ PAIR_CLASS_INIT(&tag[1], "display");
+ print_otag(h, TAG_DIV, 2, tag);
+
+ if (n->norm->Bd.type != DISP_unfilled &&
+ n->norm->Bd.type != DISP_literal)
+ return 1;
- PAIR_CLASS_INIT(&tag[1], "lit display");
- print_otag(h, TAG_PRE, 2, tag);
+ PAIR_CLASS_INIT(&tag[0], "lit");
+ print_otag(h, TAG_PRE, 1, tag);
/* This can be recursive: save & set our literal state. */
*/
switch (nn->tok) {
case MDOC_Sm:
- /* FALLTHROUGH */
case MDOC_br:
- /* FALLTHROUGH */
case MDOC_sp:
- /* FALLTHROUGH */
case MDOC_Bl:
- /* FALLTHROUGH */
case MDOC_D1:
- /* FALLTHROUGH */
case MDOC_Dl:
- /* FALLTHROUGH */
case MDOC_Lp:
- /* FALLTHROUGH */
case MDOC_Pp:
continue;
default:
break;
}
if (h->flags & HTML_NONEWLINE ||
- (nn->next && ! (nn->next->flags & MDOC_LINE)))
+ (nn->next && ! (nn->next->flags & NODE_LINE)))
continue;
else if (nn->next)
print_text(h, "\n");
if (0 == sv)
h->flags &= ~HTML_LITERAL;
- return(0);
+ return 0;
}
static int
PAIR_CLASS_INIT(&tag, "file");
print_otag(h, TAG_I, 1, &tag);
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "addr");
print_otag(h, TAG_I, 1, &tag);
- return(1);
+ return 1;
}
static int
if (n->norm->An.auth == AUTH_split) {
h->flags &= ~HTML_NOSPLIT;
h->flags |= HTML_SPLIT;
- return(0);
+ return 0;
}
if (n->norm->An.auth == AUTH_nosplit) {
h->flags &= ~HTML_SPLIT;
h->flags |= HTML_NOSPLIT;
- return(0);
+ return 0;
}
if (h->flags & HTML_SPLIT)
PAIR_CLASS_INIT(&tag, "author");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
synopsis_pre(h, n);
PAIR_CLASS_INIT(&tag, "config");
print_otag(h, TAG_B, 1, &tag);
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "define");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "env");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "errno");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "farg");
if (n->parent->tok != MDOC_Fo) {
print_otag(h, TAG_I, 1, &tag);
- return(1);
+ return 1;
}
for (nn = n->child; nn; nn = nn->next) {
print_text(h, ",");
}
- return(0);
+ return 0;
}
static int
synopsis_pre(h, n);
if (NULL == (n = n->child))
- return(0);
+ return 0;
assert(n->type == ROFFT_TEXT);
if (strcmp(n->string, "#include")) {
PAIR_CLASS_INIT(&tag[0], "macro");
print_otag(h, TAG_B, 1, tag);
- return(1);
+ return 1;
}
PAIR_CLASS_INIT(&tag[0], "includes");
print_text(h, n->string);
}
- return(0);
+ return 0;
}
static int
if (n->type == ROFFT_BLOCK) {
synopsis_pre(h, n);
- return(1);
+ return 1;
} else if (n->type == ROFFT_ELEM) {
synopsis_pre(h, n);
} else if (n->type == ROFFT_HEAD)
- return(0);
+ return 0;
PAIR_CLASS_INIT(&tag, "type");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
synopsis_pre(h, n);
PAIR_CLASS_INIT(&tag, "ftype");
print_otag(h, TAG_I, 1, &tag);
- return(1);
+ return 1;
}
static int
const char *sp, *ep;
int sz, i, pretty;
- pretty = MDOC_SYNPRETTY & n->flags;
+ pretty = NODE_SYNPRETTY & n->flags;
synopsis_pre(h, n);
/* Split apart into type and name. */
*/
#if 0
- if (MDOC_SYNPRETTY & n->flags) {
+ if (NODE_SYNPRETTY & n->flags) {
nbuf[0] = '\0';
html_idcat(nbuf, sp, BUFSIZ);
PAIR_ID_INIT(&tag[1], nbuf);
for (n = n->child->next; n; n = n->next) {
i = 1;
- if (MDOC_SYNPRETTY & n->flags)
+ if (NODE_SYNPRETTY & n->flags)
i = 2;
t = print_otag(h, TAG_I, i, tag);
print_text(h, n->string);
print_text(h, ";");
}
- return(0);
+ return 0;
}
static int
if ( ! (HTML_NONOSPACE & h->flags))
h->flags &= ~HTML_NOSPACE;
- return(0);
+ return 0;
}
static int
mdoc_skip_pre(MDOC_ARGS)
{
- return(0);
+ return 0;
}
static int
{
print_paragraph(h);
- return(0);
+ return 0;
}
static int
/* So the div isn't empty: */
print_text(h, "\\~");
- return(0);
+ return 0;
}
struct htmlpair tag[2];
if (NULL == (n = n->child))
- return(0);
+ return 0;
assert(n->type == ROFFT_TEXT);
for (n = n->next; n; n = n->next)
print_text(h, n->string);
- return(0);
+ return 0;
}
static int
print_tagq(h, t);
}
- return(0);
+ return 0;
}
static int
h->flags |= HTML_NOSPACE;
print_text(h, "(");
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
} else if (n->type == ROFFT_BLOCK) {
synopsis_pre(h, n);
- return(1);
+ return 1;
}
if (n->child == NULL)
- return(0);
+ return 0;
assert(n->child->string);
PAIR_CLASS_INIT(&tag, "fname");
t = print_otag(h, TAG_B, 1, &tag);
print_text(h, n->child->string);
print_tagq(h, t);
- return(0);
+ return 0;
}
static void
* of no children.
*/
- if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
+ if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags)
print_text(h, "#include");
print_text(h, "<");
print_text(h, n->string);
}
- return(0);
+ return 0;
}
static int
PAIR_CLASS_INIT(&tag, "cmd");
print_otag(h, TAG_B, 1, &tag);
- return(1);
-}
-
-static int
-mdoc_rv_pre(MDOC_ARGS)
-{
- struct htmlpair tag;
- struct tag *t;
- int nchild;
-
- if (n->prev)
- print_otag(h, TAG_BR, 0, NULL);
-
- PAIR_CLASS_INIT(&tag, "fname");
-
- nchild = n->nchild;
- if (nchild > 0) {
- print_text(h, "The");
-
- for (n = n->child; n; n = n->next) {
- t = print_otag(h, TAG_B, 1, &tag);
- print_text(h, n->string);
- print_tagq(h, t);
-
- h->flags |= HTML_NOSPACE;
- print_text(h, "()");
-
- if (n->next == NULL)
- continue;
-
- if (nchild > 2) {
- h->flags |= HTML_NOSPACE;
- print_text(h, ",");
- }
- if (n->next->next == NULL)
- print_text(h, "and");
- }
-
- if (nchild > 1)
- print_text(h, "functions return");
- else
- print_text(h, "function returns");
-
- print_text(h, "the value\\~0 if successful;");
- } else
- print_text(h, "Upon successful completion,"
- " the value\\~0 is returned;");
-
- print_text(h, "otherwise the value\\~\\-1 is returned"
- " and the global variable");
-
- PAIR_CLASS_INIT(&tag, "var");
- t = print_otag(h, TAG_B, 1, &tag);
- print_text(h, "errno");
- print_tagq(h, t);
- print_text(h, "is set to indicate the error.");
- return(0);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "var");
print_otag(h, TAG_B, 1, &tag);
- return(1);
+ return 1;
}
static int
h->flags |= HTML_NOSPACE;
print_text(h, "\\(aq");
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
static int
struct roffsu su;
if (n->type == ROFFT_HEAD)
- return(0);
+ return 0;
else if (n->type != ROFFT_BODY)
- return(1);
+ return 1;
if (FONT_Em == n->norm->Bf.font)
PAIR_CLASS_INIT(&tag[0], "emph");
bufcat_su(h, "margin-left", &su);
PAIR_STYLE_INIT(&tag[1], h);
print_otag(h, TAG_DIV, 2, tag);
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "symb");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
{
h->flags |= HTML_IGNDELIM;
- return(1);
+ return 1;
}
static void
mdoc_pf_post(MDOC_ARGS)
{
- if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+ if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
h->flags |= HTML_NOSPACE;
}
struct htmlpair tag;
if (n->type != ROFFT_BLOCK)
- return(1);
+ return 1;
if (n->prev && SEC_SEE_ALSO == n->sec)
print_paragraph(h);
PAIR_CLASS_INIT(&tag, "ref");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
struct htmlpair tag;
PAIR_CLASS_INIT(&tag, "none");
- print_otag(h, TAG_CODE, 1, &tag);
- return(1);
+ print_otag(h, TAG_SPAN, 1, &tag);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "lit");
print_otag(h, TAG_CODE, 1, &tag);
- return(1);
+ return 1;
}
static int
PAIR_CLASS_INIT(&tag, "symb");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
-}
-
-static int
-mdoc_bt_pre(MDOC_ARGS)
-{
-
- print_text(h, "is currently in beta test.");
- return(0);
-}
-
-static int
-mdoc_ud_pre(MDOC_ARGS)
-{
-
- print_text(h, "currently under development.");
- return(0);
+ return 1;
}
static int
{
struct htmlpair tag;
- if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev)
+ if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
print_otag(h, TAG_BR, 0, NULL);
PAIR_CLASS_INIT(&tag, "lib");
print_otag(h, TAG_SPAN, 1, &tag);
- return(1);
+ return 1;
}
static int
break;
default:
abort();
- /* NOTREACHED */
}
if (MDOC__U != n->tok) {
print_otag(h, t, 1, tag);
- return(1);
+ return 1;
}
PAIR_HREF_INIT(&tag[1], n->child->string);
print_otag(h, TAG_A, 2, tag);
- return(1);
+ return 1;
}
static void
case ROFFT_BLOCK:
break;
case ROFFT_HEAD:
- return(0);
+ return 0;
case ROFFT_BODY:
- if (n->parent->args || 0 == n->prev->nchild)
+ if (n->parent->args != NULL || n->prev->child == NULL)
h->flags |= HTML_PREKEEP;
break;
default:
abort();
- /* NOTREACHED */
}
- return(1);
+ return 1;
}
static void
struct htmlpair tag;
if (n->type != ROFFT_BODY)
- return(1);
+ return 1;
switch (n->tok) {
case MDOC_Ao:
- /* FALLTHROUGH */
case MDOC_Aq:
- print_text(h, n->nchild == 1 &&
+ print_text(h, n->child != NULL && n->child->next == NULL &&
n->child->tok == MDOC_Mt ? "<" : "\\(la");
break;
case MDOC_Bro:
- /* FALLTHROUGH */
case MDOC_Brq:
print_text(h, "\\(lC");
break;
case MDOC_Bo:
- /* FALLTHROUGH */
case MDOC_Bq:
print_text(h, "\\(lB");
break;
case MDOC_Oo:
- /* FALLTHROUGH */
case MDOC_Op:
print_text(h, "\\(lB");
h->flags |= HTML_NOSPACE;
case MDOC_En:
if (NULL == n->norm->Es ||
NULL == n->norm->Es->child)
- return(1);
+ return 1;
print_text(h, n->norm->Es->child->string);
break;
case MDOC_Do:
- /* FALLTHROUGH */
case MDOC_Dq:
- /* FALLTHROUGH */
case MDOC_Qo:
- /* FALLTHROUGH */
case MDOC_Qq:
print_text(h, "\\(lq");
break;
case MDOC_Po:
- /* FALLTHROUGH */
case MDOC_Pq:
print_text(h, "(");
break;
print_otag(h, TAG_CODE, 1, &tag);
break;
case MDOC_So:
- /* FALLTHROUGH */
case MDOC_Sq:
print_text(h, "\\(oq");
break;
default:
abort();
- /* NOTREACHED */
}
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
static void
switch (n->tok) {
case MDOC_Ao:
- /* FALLTHROUGH */
case MDOC_Aq:
- print_text(h, n->nchild == 1 &&
+ print_text(h, n->child != NULL && n->child->next == NULL &&
n->child->tok == MDOC_Mt ? ">" : "\\(ra");
break;
case MDOC_Bro:
- /* FALLTHROUGH */
case MDOC_Brq:
print_text(h, "\\(rC");
break;
case MDOC_Oo:
- /* FALLTHROUGH */
case MDOC_Op:
- /* FALLTHROUGH */
case MDOC_Bo:
- /* FALLTHROUGH */
case MDOC_Bq:
print_text(h, "\\(rB");
break;
print_text(h, n->norm->Es->child->next->string);
break;
case MDOC_Qo:
- /* FALLTHROUGH */
case MDOC_Qq:
- /* FALLTHROUGH */
case MDOC_Do:
- /* FALLTHROUGH */
case MDOC_Dq:
print_text(h, "\\(rq");
break;
case MDOC_Po:
- /* FALLTHROUGH */
case MDOC_Pq:
print_text(h, ")");
break;
case MDOC_Ql:
- /* FALLTHROUGH */
case MDOC_So:
- /* FALLTHROUGH */
case MDOC_Sq:
print_text(h, "\\(cq");
break;
default:
abort();
- /* NOTREACHED */
}
}
{
if (n->type != ROFFT_BODY)
- return(1);
+ return 1;
if (n->end == ENDBODY_NOT &&
n->parent->head->child == NULL &&
n->parent->head->child != NULL && (n->child != NULL ||
(n->parent->tail != NULL && n->parent->tail->child != NULL)))
h->flags |= HTML_NOSPACE;
- return(1);
+ return 1;
}
static void
git.ckatri.com / mandoc.git / blobdiff