Clarify what eqn actually is.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index bdbbd8b4a6fb2129d0c1db0f8ccf005239f5e339..0603b72160a1cc6690710ec4c31693ccafd6ea60 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.225 2011/04/04 16:21:51 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.233 2011/07/22 10:50:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -264,14 +264,7 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
        p->tabwidth = term_len(p, 5);
 
        if (NULL == p->symtab)
-               switch (p->enc) {
-               case (TERMENC_ASCII):
-                       p->symtab = chars_init(CHARS_ASCII);
-                       break;
-               default:
-                       abort();
-                       /* NOTREACHED */
-               }
+               p->symtab = mchars_alloc();
 
        n = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);
@@ -358,7 +351,7 @@ print_mdoc_node(DECL_ARGS)
                        p->flags |= TERMP_NOSPACE;
                break;
        case (MDOC_EQN):
-               term_word(p, n->eqn->data);
+               term_eqn(p, n->eqn);
                break;
        case (MDOC_TBL):
                term_tbl(p, n->span);
@@ -530,9 +523,10 @@ a2height(const struct termp *p, const char *v)
 {
        struct roffsu    su;
 
+
        assert(v);
        if ( ! a2roffsu(v, &su, SCALE_VS))
-               SCALE_VS_INIT(&su, term_len(p, 1));
+               SCALE_VS_INIT(&su, atoi(v));
 
        return(term_vspan(p, &su));
 }
@@ -1536,24 +1530,31 @@ termp_ft_pre(DECL_ARGS)
 static int
 termp_fn_pre(DECL_ARGS)
 {
-       const struct mdoc_node  *nn;
+       int              pretty;
+
+       pretty = MDOC_SYNPRETTY & n->flags;
 
        synopsis_pre(p, n);
 
+       if (NULL == (n = n->child))
+               return(0);
+
+       assert(MDOC_TEXT == n->type);
        term_fontpush(p, TERMFONT_BOLD);
-       term_word(p, n->child->string);
+       term_word(p, n->string);
        term_fontpop(p);
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
        p->flags |= TERMP_NOSPACE;
 
-       for (nn = n->child->next; nn; nn = nn->next) {
+       for (n = n->next; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);
                term_fontpush(p, TERMFONT_UNDER);
-               term_word(p, nn->string);
+               term_word(p, n->string);
                term_fontpop(p);
 
-               if (nn->next) {
+               if (n->next) {
                        p->flags |= TERMP_NOSPACE;
                        term_word(p, ",");
                }
@@ -1562,7 +1563,7 @@ termp_fn_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 
-       if (MDOC_SYNPRETTY & n->flags) {
+       if (pretty) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, ";");
        }