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

[mandoc.git] / eqn_term.c

diff --git a/eqn_term.c b/eqn_term.c
index 08f4a993eca4f7aaff63b2986fd136d593d688b1..669c3c56cff74a754917199aef62d21f5c778e16 100644 (file)
--- a/eqn_term.c
+++ b/eqn_term.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn_term.c,v 1.13 2017/07/08 14:51:04 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>


@@ -51,6 +52,7 @@ 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;
 
        /* Delimiters around this box? */
        int delim;
 
        /* Delimiters around this box? */


@@ -67,7 +69,16 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
             ((bp->parent->type == EQN_LIST && bp->expectargs == 1) ||
              (bp->parent->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)
+               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;


@@ -80,8 +91,17 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
        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. */
 
 
        /* Special box types. */
 


@@ -98,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) {