Mostly complete implementation of the 'c' (character available)

[mandoc.git] / eqn_term.c

diff --git a/eqn_term.c b/eqn_term.c
index 4358015274500b97b842b553e419446b28fad379..669c3c56cff74a754917199aef62d21f5c778e16 100644 (file)
--- a/eqn_term.c
+++ b/eqn_term.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn_term.c,v 1.9 2017/02/12 14:19:01 schwarze Exp $ */
+/*     $Id: eqn_term.c,v 1.17 2017/08/23 21:56:20 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -20,6 +20,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

+#include <ctype.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -40,10 +41,10 @@ static void eqn_box(struct termp *, const struct eqn_box *);
 
 
 void
 
 
 void

-term_eqn(struct termp *p, const struct eqn *ep)
+term_eqn(struct termp *p, const struct eqn_box *bp)

 {
 
 {
 

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

        p->flags &= ~TERMP_NOSPACE;
 }
 
        p->flags &= ~TERMP_NOSPACE;
 }
 


@@ -51,20 +52,58 @@ static void
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {
        const struct eqn_box *child;
 eqn_box(struct termp *p, const struct eqn_box *bp)
 {
        const struct eqn_box *child;

+       const char *cp;
+       int delim;

 
 

-       if (bp->type == EQN_LIST ||
+       /* Delimiters around this box? */
+
+       if ((bp->type == EQN_LIST && bp->expectargs > 1) ||

            (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
            (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)
+           (bp->parent != NULL && (bp->parent->pos == EQNPOS_SQRT ||
+           /* Diacritic followed by ^ or _. */
+           ((bp->top != NULL || bp->bottom != NULL) &&
+            bp->parent->type == EQN_SUBEXPR &&
+            bp->parent->pos != EQNPOS_OVER && bp->next != NULL) ||
+           /* Nested over, sub, sup, from, to. */
+           (bp->type == EQN_SUBEXPR && bp->pos != EQNPOS_SQRT &&
+            ((bp->parent->type == EQN_LIST && bp->expectargs == 1) ||
+             (bp->parent->type == EQN_SUBEXPR &&
+              bp->pos != EQNPOS_SQRT)))))) {
+               if ((bp->parent->type == EQN_SUBEXPR && bp->prev != NULL) ||
+                   (bp->type == EQN_LIST &&
+                    bp->first != NULL &&
+                    bp->first->type != EQN_PILE &&
+                    bp->first->type != EQN_MATRIX &&
+                    bp->prev != NULL &&
+                    (bp->prev->type == EQN_LIST ||
+                     (bp->prev->type == EQN_TEXT &&
+                      (*bp->prev->text == '\\' ||
+                       isalpha((unsigned char)*bp->prev->text))))))

                        p->flags |= TERMP_NOSPACE;
                term_word(p, bp->left != NULL ? bp->left : "(");
                p->flags |= TERMP_NOSPACE;
                        p->flags |= TERMP_NOSPACE;
                term_word(p, bp->left != NULL ? bp->left : "(");
                p->flags |= TERMP_NOSPACE;

-       }
+               delim = 1;
+       } else
+               delim = 0;
+
+       /* Handle Fonts and text. */
+

        if (bp->font != EQNFONT_NONE)
                term_fontpush(p, fontmap[(int)bp->font]);
 
        if (bp->font != EQNFONT_NONE)
                term_fontpush(p, fontmap[(int)bp->font]);
 

-       if (bp->text != NULL)
+       if (bp->text != NULL) {
+               if (strchr("!\"'),.:;?]}", *bp->text) != NULL)
+                       p->flags |= TERMP_NOSPACE;

                term_word(p, bp->text);
                term_word(p, bp->text);

+               if ((cp = strchr(bp->text, '\0')) > bp->text &&
+                   (strchr("\"'([{", cp[-1]) != NULL ||
+                    (bp->prev == NULL && (cp[-1] == '-' ||
+                     (cp >= bp->text + 5 &&
+                      strcmp(cp - 5, "\\[mi]") == 0)))))
+                       p->flags |= TERMP_NOSPACE;
+       }
+
+       /* Special box types. */

 
        if (bp->pos == EQNPOS_SQRT) {
                term_word(p, "sqrt");
 
        if (bp->pos == EQNPOS_SQRT) {
                term_word(p, "sqrt");


@@ -79,9 +118,9 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
                term_word(p, bp->pos == EQNPOS_OVER ? "/" :
                    (bp->pos == EQNPOS_SUP ||
                     bp->pos == EQNPOS_TO) ? "^" : "_");
                term_word(p, bp->pos == EQNPOS_OVER ? "/" :
                    (bp->pos == EQNPOS_SUP ||
                     bp->pos == EQNPOS_TO) ? "^" : "_");

-               p->flags |= TERMP_NOSPACE;

                child = child->next;
                if (child != NULL) {
                child = child->next;
                if (child != NULL) {

+                       p->flags |= TERMP_NOSPACE;

                        eqn_box(p, child);
                        if (bp->pos == EQNPOS_FROMTO ||
                            bp->pos == EQNPOS_SUBSUP) {
                        eqn_box(p, child);
                        if (bp->pos == EQNPOS_FROMTO ||
                            bp->pos == EQNPOS_SUBSUP) {


@@ -96,29 +135,25 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
        } else {
                child = bp->first;
                if (bp->type == EQN_MATRIX &&
        } else {
                child = bp->first;
                if (bp->type == EQN_MATRIX &&

-                   child != NULL && child->type == EQN_LIST)
+                   child != NULL &&
+                   child->type == EQN_LIST &&
+                   child->expectargs > 1)

                        child = child->first;
                while (child != NULL) {
                        eqn_box(p,
                            bp->type == EQN_PILE &&
                            child->type == EQN_LIST &&
                        child = child->first;
                while (child != NULL) {
                        eqn_box(p,
                            bp->type == EQN_PILE &&
                            child->type == EQN_LIST &&

+                           child->expectargs > 1 &&

                            child->args == 1 ?
                            child->first : child);
                        child = child->next;
                }
        }
 
                            child->args == 1 ?
                            child->first : child);
                        child = child->next;
                }
        }
 

+       /* Handle Fonts and diacritics. */
+

        if (bp->font != EQNFONT_NONE)
                term_fontpop(p);
        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->top != NULL) {
                p->flags |= TERMP_NOSPACE;
                term_word(p, bp->top);


@@ -127,4 +162,13 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
                p->flags |= TERMP_NOSPACE;
                term_word(p, "_");
        }
                p->flags |= TERMP_NOSPACE;
                term_word(p, "_");
        }

+
+       /* Right delimiter after this box? */
+
+       if (delim) {
+               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;
+       }

 }
 }