Move "chars" interface out of out.h and into mandoc.h. This doesn't

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 12722b97373d82dc5f4c1508d26039a0dfc0a1e3..b3c8380ddd76ce8a169a7effce8ba675ae170161 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.184 2011/04/09 15:29:40 kristaps Exp $ */
+/*     $Id: term.c,v 1.185 2011/04/29 22:18:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -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)