summaryrefslogtreecommitdiffstats
path: root/term.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-04-29 22:18:12 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-04-29 22:18:12 +0000
commitca0ffe9dcbdc75b372adf897f81053ccd2df605e (patch)
tree9f55cfc1c41bcf64290b9c493f1d4f2403f3780b /term.c
parentc8b861b7ce8fa5f991be88f5f1b2476c455fe717 (diff)
downloadmandoc-ca0ffe9dcbdc75b372adf897f81053ccd2df605e.tar.gz
Move "chars" interface out of out.h and into mandoc.h. This doesn't
change any code but for renaming functions and types to be consistent with other mandoc.h stuff. The reason for moving into libmandoc is that the rendering of special characters is part of mandoc itself---not an external part. From mandoc(1)'s perspective, this changes nothing, but for other utilities, it's important to have these part of libmandoc. Note this isn't documented [yet] in mandoc.3 because there are some parts I'd like to change around beforehand.
Diffstat (limited to 'term.c')
-rw-r--r--term.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/term.c b/term.c
index 742b9877..b78f9ad1 100644
--- a/term.c
+++ b/term.c
@@ -47,7 +47,7 @@ term_free(struct termp *p)
if (p->buf)
free(p->buf);
if (p->symtab)
- chars_free(p->symtab);
+ mchars_free(p->symtab);
free(p);
}
@@ -350,7 +350,7 @@ numbered(struct termp *p, const char *word, size_t len)
{
const char *rhs;
- rhs = chars_num2char(word, len);
+ rhs = mchars_num2char(word, len);
if (rhs)
encode(p, rhs, 1);
}
@@ -362,7 +362,7 @@ spec(struct termp *p, const char *word, size_t len)
const char *rhs;
size_t sz;
- rhs = chars_spec2str(p->symtab, word, len, &sz);
+ rhs = mchars_spec2str(p->symtab, word, len, &sz);
if (rhs)
encode(p, rhs, sz);
else if (1 == len)
@@ -376,7 +376,7 @@ res(struct termp *p, const char *word, size_t len)
const char *rhs;
size_t sz;
- rhs = chars_res2str(p->symtab, word, len, &sz);
+ rhs = mchars_res2str(p->symtab, word, len, &sz);
if (rhs)
encode(p, rhs, sz);
}
@@ -623,11 +623,11 @@ term_strlen(const struct termp *p, const char *cp)
switch (esc) {
case (ESCAPE_PREDEF):
- rhs = chars_res2str
+ rhs = mchars_res2str
(p->symtab, seq, ssz, &rsz);
break;
case (ESCAPE_SPECIAL):
- rhs = chars_spec2str
+ rhs = mchars_spec2str
(p->symtab, seq, ssz, &rsz);
if (ssz != 1 || rhs)