version 1.13.2

[mandoc.git] / eqn_term.c

diff --git a/eqn_term.c b/eqn_term.c
index 59671e8478882da587a40058c7c2f93ddbeecd17..010a152e2567a46dd1b9ede7cb84a29977db57c1 100644 (file)
--- a/eqn_term.c
+++ b/eqn_term.c
@@ -1,6 +1,7 @@
-/*     $Id: eqn_term.c,v 1.3 2011/07/23 22:57:13 kristaps Exp $ */
+/*     $Id: eqn_term.c,v 1.7 2014/10/12 14:49:39 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>

+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <stdio.h>
 
 #include <assert.h>
 #include <stdio.h>


@@ -27,56 +28,97 @@
 #include "out.h"
 #include "term.h"
 
 #include "out.h"
 #include "term.h"
 

+static const enum termfont fontmap[EQNFONT__MAX] = {
+       TERMFONT_NONE, /* EQNFONT_NONE */
+       TERMFONT_NONE, /* EQNFONT_ROMAN */
+       TERMFONT_BOLD, /* EQNFONT_BOLD */
+       TERMFONT_BOLD, /* EQNFONT_FAT */
+       TERMFONT_UNDER /* EQNFONT_ITALIC */
+};
+

 static void    eqn_box(struct termp *, const struct eqn_box *);
 static void    eqn_box(struct termp *, const struct eqn_box *);

-static void    eqn_box_post(struct termp *, const struct eqn_box *);
-static void    eqn_box_pre(struct termp *, const struct eqn_box *);
-static void    eqn_text(struct termp *, const struct eqn_box *);
+

 
 void
 term_eqn(struct termp *p, const struct eqn *ep)
 {
 
 
 void
 term_eqn(struct termp *p, const struct eqn *ep)
 {
 

-       p->flags |= TERMP_NONOSPACE;

        eqn_box(p, ep->root);
        eqn_box(p, ep->root);

-       p->flags &= ~TERMP_NONOSPACE;
+       p->flags &= ~TERMP_NOSPACE;

 }
 
 static void
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {
 }
 
 static void
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {

+       const struct eqn_box *child;
+
+       if (bp->type == EQN_LIST ||
+           (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
+           (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) {
+               if (bp->parent->type == EQN_SUBEXPR && bp->prev != NULL)
+                       p->flags |= TERMP_NOSPACE;
+               term_word(p, bp->left != NULL ? bp->left : "(");
+               p->flags |= TERMP_NOSPACE;
+       }
+       if (bp->font != EQNFONT_NONE)
+               term_fontpush(p, fontmap[(int)bp->font]);
+
+       if (bp->text != NULL)
+               term_word(p, bp->text);

 
 

-       eqn_box_pre(p, bp);
-       eqn_text(p, bp);
-
-       if (bp->first)
+       if (bp->pos == EQNPOS_SQRT) {
+               term_word(p, "sqrt");
+               p->flags |= TERMP_NOSPACE;

                eqn_box(p, bp->first);
                eqn_box(p, bp->first);

-
-       eqn_box_post(p, bp);
-
-       if (bp->next)
-               eqn_box(p, bp->next);
-}
-
-static void
-eqn_box_pre(struct termp *p, const struct eqn_box *bp)
-{
-
-       if (bp->left)
-               term_word(p, bp->left);
-}
-
-static void
-eqn_box_post(struct termp *p, const struct eqn_box *bp)
-{
-
-       if (bp->right)
-               term_word(p, bp->right);
-}
-
-static void
-eqn_text(struct termp *p, const struct eqn_box *bp)
-{
-
-       if (bp->text)
-               term_word(p, bp->text);
+       } else if (bp->type == EQN_SUBEXPR) {
+               child = bp->first;
+               eqn_box(p, child);
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, bp->pos == EQNPOS_OVER ? "/" :
+                   (bp->pos == EQNPOS_SUP ||
+                    bp->pos == EQNPOS_TO) ? "^" : "_");
+               p->flags |= TERMP_NOSPACE;
+               child = child->next;
+               eqn_box(p, child);
+               if (bp->pos == EQNPOS_FROMTO ||
+                   bp->pos == EQNPOS_SUBSUP) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, "^");
+                       p->flags |= TERMP_NOSPACE;
+                       child = child->next;
+                       eqn_box(p, child);
+               }
+       } else {
+               child = bp->first;
+               if (bp->type == EQN_MATRIX && child->type == EQN_LIST)
+                       child = child->first;
+               while (child != NULL) {
+                       eqn_box(p,
+                           bp->type == EQN_PILE &&
+                           child->type == EQN_LIST &&
+                           child->args == 1 ?
+                           child->first : child);
+                       child = child->next;
+               }
+       }
+
+       if (bp->font != EQNFONT_NONE)
+               term_fontpop(p);
+       if (bp->type == EQN_LIST ||
+           (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
+           (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, bp->right != NULL ? bp->right : ")");
+               if (bp->parent->type == EQN_SUBEXPR && bp->next != NULL)
+                       p->flags |= TERMP_NOSPACE;
+       }
+
+       if (bp->top != NULL) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, bp->top);
+       }
+       if (bp->bottom != NULL) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, "_");
+       }

 }
 }