version 1.300, 2014/12/23 09:31:46 |
version 1.305, 2015/01/31 00:12:41 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
|
#include <limits.h> |
#include <stdint.h> |
#include <stdint.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
|
|
void (*post)(DECL_ARGS); |
void (*post)(DECL_ARGS); |
}; |
}; |
|
|
static size_t a2width(const struct termp *, const char *); |
static int a2width(const struct termp *, const char *); |
|
|
static void print_bvspace(struct termp *, |
static void print_bvspace(struct termp *, |
const struct mdoc_node *, |
const struct mdoc_node *, |
|
|
print_mdoc_nodelist(DECL_ARGS) |
print_mdoc_nodelist(DECL_ARGS) |
{ |
{ |
|
|
print_mdoc_node(p, pair, meta, n); |
while (n != NULL) { |
if (n->next) |
print_mdoc_node(p, pair, meta, n); |
print_mdoc_nodelist(p, pair, meta, n->next); |
n = n->next; |
|
} |
} |
} |
|
|
static void |
static void |
Line 305 print_mdoc_node(DECL_ARGS) |
|
Line 307 print_mdoc_node(DECL_ARGS) |
|
chld = 1; |
chld = 1; |
offset = p->offset; |
offset = p->offset; |
rmargin = p->rmargin; |
rmargin = p->rmargin; |
n->prev_font = term_fontq(p); |
n->prev_font = p->fonti; |
|
|
memset(&npair, 0, sizeof(struct termpair)); |
memset(&npair, 0, sizeof(struct termpair)); |
npair.ppair = pair; |
npair.ppair = pair; |
Line 525 print_mdoc_head(struct termp *p, const void *arg) |
|
Line 527 print_mdoc_head(struct termp *p, const void *arg) |
|
free(volume); |
free(volume); |
} |
} |
|
|
static size_t |
static int |
a2width(const struct termp *p, const char *v) |
a2width(const struct termp *p, const char *v) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
Line 534 a2width(const struct termp *p, const char *v) |
|
Line 536 a2width(const struct termp *p, const char *v) |
|
SCALE_HS_INIT(&su, term_strlen(p, v)); |
SCALE_HS_INIT(&su, term_strlen(p, v)); |
su.scale /= term_strlen(p, "0"); |
su.scale /= term_strlen(p, "0"); |
} |
} |
|
|
return(term_hspan(p, &su)); |
return(term_hspan(p, &su)); |
} |
} |
|
|
Line 605 termp_ll_pre(DECL_ARGS) |
|
Line 606 termp_ll_pre(DECL_ARGS) |
|
static int |
static int |
termp_it_pre(DECL_ARGS) |
termp_it_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *bl, *nn; |
|
char buf[24]; |
char buf[24]; |
int i; |
const struct mdoc_node *bl, *nn; |
size_t width, offset, ncols, dcol; |
size_t ncols, dcol; |
|
int i, offset, width; |
enum mdoc_list type; |
enum mdoc_list type; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
Line 620 termp_it_pre(DECL_ARGS) |
|
Line 621 termp_it_pre(DECL_ARGS) |
|
type = bl->norm->Bl.type; |
type = bl->norm->Bl.type; |
|
|
/* |
/* |
|
* Defaults for specific list types. |
|
*/ |
|
|
|
switch (type) { |
|
case LIST_bullet: |
|
/* FALLTHROUGH */ |
|
case LIST_dash: |
|
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
|
/* FALLTHROUGH */ |
|
case LIST_enum: |
|
width = term_len(p, 2); |
|
break; |
|
case LIST_hang: |
|
width = term_len(p, 8); |
|
break; |
|
case LIST_column: |
|
/* FALLTHROUGH */ |
|
case LIST_tag: |
|
width = term_len(p, 10); |
|
break; |
|
default: |
|
width = 0; |
|
break; |
|
} |
|
offset = 0; |
|
|
|
/* |
* First calculate width and offset. This is pretty easy unless |
* First calculate width and offset. This is pretty easy unless |
* we're a -column list, in which case all prior columns must |
* we're a -column list, in which case all prior columns must |
* be accounted for. |
* be accounted for. |
*/ |
*/ |
|
|
width = offset = 0; |
if (bl->norm->Bl.offs != NULL) { |
|
|
if (bl->norm->Bl.offs) |
|
offset = a2width(p, bl->norm->Bl.offs); |
offset = a2width(p, bl->norm->Bl.offs); |
|
if (offset < 0 && (size_t)(-offset) > p->offset) |
|
offset = -p->offset; |
|
else if (offset > SHRT_MAX) |
|
offset = 0; |
|
} |
|
|
switch (type) { |
switch (type) { |
case LIST_column: |
case LIST_column: |
Line 683 termp_it_pre(DECL_ARGS) |
|
Line 715 termp_it_pre(DECL_ARGS) |
|
* number for buffering single arguments. See the above |
* number for buffering single arguments. See the above |
* handling for column for how this changes. |
* handling for column for how this changes. |
*/ |
*/ |
assert(bl->norm->Bl.width); |
|
width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); |
width = a2width(p, bl->norm->Bl.width) + term_len(p, 2); |
|
if (width < 0 && (size_t)(-width) > p->offset) |
|
width = -p->offset; |
|
else if (width > SHRT_MAX) |
|
width = 0; |
break; |
break; |
} |
} |
|
|
/* |
/* |
* List-type can override the width in the case of fixed-head |
|
* values (bullet, dash/hyphen, enum). Tags need a non-zero |
|
* offset. |
|
*/ |
|
|
|
switch (type) { |
|
case LIST_bullet: |
|
/* FALLTHROUGH */ |
|
case LIST_dash: |
|
/* FALLTHROUGH */ |
|
case LIST_hyphen: |
|
/* FALLTHROUGH */ |
|
case LIST_enum: |
|
if (width < term_len(p, 2)) |
|
width = term_len(p, 2); |
|
break; |
|
case LIST_hang: |
|
if (0 == width) |
|
width = term_len(p, 8); |
|
break; |
|
case LIST_column: |
|
/* FALLTHROUGH */ |
|
case LIST_tag: |
|
if (0 == width) |
|
width = term_len(p, 10); |
|
break; |
|
default: |
|
break; |
|
} |
|
|
|
/* |
|
* Whitespace control. Inset bodies need an initial space, |
* Whitespace control. Inset bodies need an initial space, |
* while diagonal bodies need two. |
* while diagonal bodies need two. |
*/ |
*/ |
Line 761 termp_it_pre(DECL_ARGS) |
|
Line 765 termp_it_pre(DECL_ARGS) |
|
case LIST_enum: |
case LIST_enum: |
/* |
/* |
* Weird special case. |
* Weird special case. |
* Very narrow enum lists actually hang. |
* Some very narrow lists actually hang. |
*/ |
*/ |
if (width == term_len(p, 2)) |
|
p->flags |= TERMP_HANG; |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_dash: |
case LIST_dash: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_hyphen: |
case LIST_hyphen: |
|
if (width <= (int)term_len(p, 2)) |
|
p->flags |= TERMP_HANG; |
if (MDOC_HEAD != n->type) |
if (MDOC_HEAD != n->type) |
break; |
break; |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
Line 859 termp_it_pre(DECL_ARGS) |
|
Line 863 termp_it_pre(DECL_ARGS) |
|
case LIST_hyphen: |
case LIST_hyphen: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_tag: |
case LIST_tag: |
assert(width); |
|
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
else |
else |
Line 1539 termp_bd_pre(DECL_ARGS) |
|
Line 1542 termp_bd_pre(DECL_ARGS) |
|
{ |
{ |
size_t tabwidth, lm, len, rm, rmax; |
size_t tabwidth, lm, len, rm, rmax; |
struct mdoc_node *nn; |
struct mdoc_node *nn; |
|
int offset; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
print_bvspace(p, n, n); |
print_bvspace(p, n, n); |
Line 1555 termp_bd_pre(DECL_ARGS) |
|
Line 1559 termp_bd_pre(DECL_ARGS) |
|
p->offset += term_len(p, p->defindent + 1); |
p->offset += term_len(p, p->defindent + 1); |
else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) |
else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) |
p->offset += term_len(p, (p->defindent + 1) * 2); |
p->offset += term_len(p, (p->defindent + 1) * 2); |
else |
else { |
p->offset += a2width(p, n->norm->Bd.offs); |
offset = a2width(p, n->norm->Bd.offs); |
|
if (offset < 0 && (size_t)(-offset) > p->offset) |
|
p->offset = 0; |
|
else if (offset < SHRT_MAX) |
|
p->offset += offset; |
|
} |
|
|
/* |
/* |
* If -ragged or -filled are specified, the block does nothing |
* If -ragged or -filled are specified, the block does nothing |
Line 1847 termp_quote_pre(DECL_ARGS) |
|
Line 1856 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, n->parent->prev != NULL && |
term_word(p, n->nchild == 1 && |
n->parent->prev->tok == MDOC_An ? "<" : "\\(la"); |
n->child->tok == MDOC_Mt ? "<" : "\\(la"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1920 termp_quote_post(DECL_ARGS) |
|
Line 1929 termp_quote_post(DECL_ARGS) |
|
case MDOC_Ao: |
case MDOC_Ao: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Aq: |
case MDOC_Aq: |
term_word(p, n->parent->prev != NULL && |
term_word(p, n->nchild == 1 && |
n->parent->prev->tok == MDOC_An ? ">" : "\\(ra"); |
n->child->tok == MDOC_Mt ? ">" : "\\(ra"); |
break; |
break; |
case MDOC_Bro: |
case MDOC_Bro: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |