version 1.175, 2010/12/06 13:25:25 |
version 1.178, 2011/03/15 16:23:51 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011 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 |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 353 term_vspace(struct termp *p) |
|
Line 353 term_vspace(struct termp *p) |
|
|
|
|
|
static void |
static void |
|
numbered(struct termp *p, const char *word, size_t len) |
|
{ |
|
const char *rhs; |
|
|
|
rhs = chars_num2char(word, len); |
|
if (rhs) |
|
encode(p, rhs, 1); |
|
} |
|
|
|
|
|
static void |
spec(struct termp *p, enum roffdeco d, const char *word, size_t len) |
spec(struct termp *p, enum roffdeco d, const char *word, size_t len) |
{ |
{ |
const char *rhs; |
const char *rhs; |
Line 503 term_word(struct termp *p, const char *word) |
|
Line 514 term_word(struct termp *p, const char *word) |
|
if ((ssz = strcspn(word, "\\")) > 0) |
if ((ssz = strcspn(word, "\\")) > 0) |
encode(p, word, ssz); |
encode(p, word, ssz); |
|
|
word += ssz; |
word += (int)ssz; |
if ('\\' != *word) |
if ('\\' != *word) |
continue; |
continue; |
|
|
Line 511 term_word(struct termp *p, const char *word) |
|
Line 522 term_word(struct termp *p, const char *word) |
|
word += a2roffdeco(&deco, &seq, &ssz); |
word += a2roffdeco(&deco, &seq, &ssz); |
|
|
switch (deco) { |
switch (deco) { |
|
case (DECO_NUMBERED): |
|
numbered(p, seq, ssz); |
|
break; |
case (DECO_RESERVED): |
case (DECO_RESERVED): |
res(p, seq, ssz); |
res(p, seq, ssz); |
break; |
break; |
Line 677 term_strlen(const struct termp *p, const char *cp) |
|
Line 691 term_strlen(const struct termp *p, const char *cp) |
|
if (rhs) |
if (rhs) |
for (i = 0; i < rsz; i++) |
for (i = 0; i < rsz; i++) |
sz += (*p->width)(p, *rhs++); |
sz += (*p->width)(p, *rhs++); |
|
} else if (ASCII_NBRSP == *cp) { |
|
sz += (*p->width)(p, ' '); |
|
cp++; |
|
} else if (ASCII_HYPH == *cp) { |
|
sz += (*p->width)(p, '-'); |
|
cp++; |
} else |
} else |
sz += (*p->width)(p, *cp++); |
sz += (*p->width)(p, *cp++); |
|
|