version 1.288, 2017/05/17 17:54:45 |
version 1.293, 2017/07/15 17:29:31 |
|
|
#include <unistd.h> |
#include <unistd.h> |
|
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
|
#include "mandoc.h" |
#include "roff.h" |
#include "roff.h" |
#include "mdoc.h" |
#include "mdoc.h" |
#include "out.h" |
#include "out.h" |
Line 714 mdoc_it_pre(MDOC_ARGS) |
|
Line 715 mdoc_it_pre(MDOC_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
return 0; |
return 0; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (bl->norm->Bl.comp) |
print_otag(h, TAG_LI, "c", cattr); |
print_otag(h, TAG_LI, "csvt", cattr, 0); |
|
else |
|
print_otag(h, TAG_LI, "c", cattr); |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 729 mdoc_it_pre(MDOC_ARGS) |
|
Line 727 mdoc_it_pre(MDOC_ARGS) |
|
case LIST_ohang: |
case LIST_ohang: |
switch (n->type) { |
switch (n->type) { |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
if (bl->norm->Bl.comp) |
print_otag(h, TAG_DT, "c", cattr); |
print_otag(h, TAG_DT, "csvt", cattr, 0); |
|
else |
|
print_otag(h, TAG_DT, "c", cattr); |
|
if (type == LIST_diag) |
if (type == LIST_diag) |
print_otag(h, TAG_B, "c", cattr); |
print_otag(h, TAG_B, "c", cattr); |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
print_otag(h, TAG_DD, "cswl", cattr, |
print_otag(h, TAG_DD, "csw+l", cattr, |
bl->norm->Bl.width); |
bl->norm->Bl.width); |
break; |
break; |
default: |
default: |
Line 779 mdoc_it_pre(MDOC_ARGS) |
|
Line 774 mdoc_it_pre(MDOC_ARGS) |
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
break; |
break; |
case ROFFT_BODY: |
case ROFFT_BODY: |
if (bl->norm->Bl.comp) |
print_otag(h, TAG_TD, "c", cattr); |
print_otag(h, TAG_TD, "csvt", cattr, 0); |
|
else |
|
print_otag(h, TAG_TD, "c", cattr); |
|
break; |
break; |
default: |
default: |
print_otag(h, TAG_TR, "c", cattr); |
print_otag(h, TAG_TR, "c", cattr); |
Line 797 mdoc_it_pre(MDOC_ARGS) |
|
Line 789 mdoc_it_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_bl_pre(MDOC_ARGS) |
mdoc_bl_pre(MDOC_ARGS) |
{ |
{ |
|
char cattr[21]; |
struct tag *t; |
struct tag *t; |
struct mdoc_bl *bl; |
struct mdoc_bl *bl; |
const char *cattr; |
|
size_t i; |
size_t i; |
enum htmltag elemtype; |
enum htmltag elemtype; |
|
|
Line 834 mdoc_bl_pre(MDOC_ARGS) |
|
Line 826 mdoc_bl_pre(MDOC_ARGS) |
|
switch (bl->type) { |
switch (bl->type) { |
case LIST_bullet: |
case LIST_bullet: |
elemtype = TAG_UL; |
elemtype = TAG_UL; |
cattr = "Bl-bullet"; |
(void)strlcpy(cattr, "Bl-bullet", sizeof(cattr)); |
break; |
break; |
case LIST_dash: |
case LIST_dash: |
case LIST_hyphen: |
case LIST_hyphen: |
elemtype = TAG_UL; |
elemtype = TAG_UL; |
cattr = "Bl-dash"; |
(void)strlcpy(cattr, "Bl-dash", sizeof(cattr)); |
break; |
break; |
case LIST_item: |
case LIST_item: |
elemtype = TAG_UL; |
elemtype = TAG_UL; |
cattr = "Bl-item"; |
(void)strlcpy(cattr, "Bl-item", sizeof(cattr)); |
break; |
break; |
case LIST_enum: |
case LIST_enum: |
elemtype = TAG_OL; |
elemtype = TAG_OL; |
cattr = "Bl-enum"; |
(void)strlcpy(cattr, "Bl-enum", sizeof(cattr)); |
break; |
break; |
case LIST_diag: |
case LIST_diag: |
elemtype = TAG_DL; |
elemtype = TAG_DL; |
cattr = "Bl-diag"; |
(void)strlcpy(cattr, "Bl-diag", sizeof(cattr)); |
break; |
break; |
case LIST_hang: |
case LIST_hang: |
elemtype = TAG_DL; |
elemtype = TAG_DL; |
cattr = "Bl-hang"; |
(void)strlcpy(cattr, "Bl-hang", sizeof(cattr)); |
break; |
break; |
case LIST_inset: |
case LIST_inset: |
elemtype = TAG_DL; |
elemtype = TAG_DL; |
cattr = "Bl-inset"; |
(void)strlcpy(cattr, "Bl-inset", sizeof(cattr)); |
break; |
break; |
case LIST_ohang: |
case LIST_ohang: |
elemtype = TAG_DL; |
elemtype = TAG_DL; |
cattr = "Bl-ohang"; |
(void)strlcpy(cattr, "Bl-ohang", sizeof(cattr)); |
break; |
break; |
case LIST_tag: |
case LIST_tag: |
cattr = "Bl-tag"; |
|
if (bl->offs) |
if (bl->offs) |
print_otag(h, TAG_DIV, "cswl", cattr, bl->offs); |
print_otag(h, TAG_DIV, "cswl", "Bl-tag", bl->offs); |
print_otag(h, TAG_DL, "csw+l", cattr, bl->width); |
print_otag(h, TAG_DL, "csw+l", bl->comp ? |
|
"Bl-tag Bl-compact" : "Bl-tag", bl->width); |
return 1; |
return 1; |
case LIST_column: |
case LIST_column: |
elemtype = TAG_TABLE; |
elemtype = TAG_TABLE; |
cattr = "Bl-column"; |
(void)strlcpy(cattr, "Bl-column", sizeof(cattr)); |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
} |
} |
|
if (bl->comp) |
|
(void)strlcat(cattr, " Bl-compact", sizeof(cattr)); |
print_otag(h, elemtype, "cswl", cattr, bl->offs); |
print_otag(h, elemtype, "cswl", cattr, bl->offs); |
return 1; |
return 1; |
} |
} |
Line 1309 mdoc_pp_pre(MDOC_ARGS) |
|
Line 1303 mdoc_pp_pre(MDOC_ARGS) |
|
static int |
static int |
mdoc_lk_pre(MDOC_ARGS) |
mdoc_lk_pre(MDOC_ARGS) |
{ |
{ |
|
const struct roff_node *link, *descr, *punct; |
struct tag *t; |
struct tag *t; |
|
|
if ((n = n->child) == NULL) |
if ((link = n->child) == NULL) |
return 0; |
return 0; |
|
|
|
/* Find beginning of trailing punctuation. */ |
|
punct = n->last; |
|
while (punct != link && punct->flags & NODE_DELIMC) |
|
punct = punct->prev; |
|
punct = punct->next; |
|
|
/* Link target and link text. */ |
/* Link target and link text. */ |
t = print_otag(h, TAG_A, "cTh", "Lk", n->string); |
descr = link->next; |
if (n->next == NULL || n->next->flags & NODE_DELIMC) |
if (descr == punct) |
print_text(h, n->string); |
descr = link; /* no text */ |
for (n = n->next; n != NULL && !(n->flags & NODE_DELIMC); n = n->next) |
t = print_otag(h, TAG_A, "cTh", "Lk", link->string); |
print_text(h, n->string); |
do { |
|
if (descr->flags & (NODE_DELIMC | NODE_DELIMO)) |
|
h->flags |= HTML_NOSPACE; |
|
print_text(h, descr->string); |
|
descr = descr->next; |
|
} while (descr != punct); |
print_tagq(h, t); |
print_tagq(h, t); |
|
|
/* Trailing punctuation. */ |
/* Trailing punctuation. */ |
while (n != NULL) { |
while (punct != NULL) { |
h->flags |= HTML_NOSPACE; |
h->flags |= HTML_NOSPACE; |
print_text(h, n->string); |
print_text(h, punct->string); |
n = n->next; |
punct = punct->next; |
} |
} |
return 0; |
return 0; |
} |
} |