Deleted Added
sdiff udiff text old ( 302408 ) new ( 322249 )
full compact
eqn_term.c (302408) eqn_term.c (322249)
1/* $Id: eqn_term.c,v 1.8 2015/01/01 15:36:08 schwarze Exp $ */
1/* $Id: eqn_term.c,v 1.13 2017/07/08 14:51:04 schwarze Exp $ */
2/*
3 * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
2/*
3 * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
4 * Copyright (c) 2014, 2015 Ingo Schwarze
4 * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

--- 22 unchanged lines hidden (view full) ---

35 TERMFONT_BOLD, /* EQNFONT_FAT */
36 TERMFONT_UNDER /* EQNFONT_ITALIC */
37};
38
39static void eqn_box(struct termp *, const struct eqn_box *);
40
41
42void
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

--- 22 unchanged lines hidden (view full) ---

35 TERMFONT_BOLD, /* EQNFONT_FAT */
36 TERMFONT_UNDER /* EQNFONT_ITALIC */
37};
38
39static void eqn_box(struct termp *, const struct eqn_box *);
40
41
42void
43term_eqn(struct termp *p, const struct eqn *ep)
43term_eqn(struct termp *p, const struct eqn_box *bp)
44{
45
44{
45
46 eqn_box(p, ep->root);
46 eqn_box(p, bp);
47 p->flags &= ~TERMP_NOSPACE;
48}
49
50static void
51eqn_box(struct termp *p, const struct eqn_box *bp)
52{
53 const struct eqn_box *child;
47 p->flags &= ~TERMP_NOSPACE;
48}
49
50static void
51eqn_box(struct termp *p, const struct eqn_box *bp)
52{
53 const struct eqn_box *child;
54 int delim;
54
55
55 if (bp->type == EQN_LIST ||
56 /* Delimiters around this box? */
57
58 if ((bp->type == EQN_LIST && bp->expectargs > 1) ||
56 (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
59 (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
57 (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) {
60 (bp->parent != NULL && (bp->parent->pos == EQNPOS_SQRT ||
61 /* Diacritic followed by ^ or _. */
62 ((bp->top != NULL || bp->bottom != NULL) &&
63 bp->parent->type == EQN_SUBEXPR &&
64 bp->parent->pos != EQNPOS_OVER && bp->next != NULL) ||
65 /* Nested over, sub, sup, from, to. */
66 (bp->type == EQN_SUBEXPR && bp->pos != EQNPOS_SQRT &&
67 ((bp->parent->type == EQN_LIST && bp->expectargs == 1) ||
68 (bp->parent->type == EQN_SUBEXPR &&
69 bp->pos != EQNPOS_SQRT)))))) {
58 if (bp->parent->type == EQN_SUBEXPR && bp->prev != NULL)
59 p->flags |= TERMP_NOSPACE;
60 term_word(p, bp->left != NULL ? bp->left : "(");
61 p->flags |= TERMP_NOSPACE;
70 if (bp->parent->type == EQN_SUBEXPR && bp->prev != NULL)
71 p->flags |= TERMP_NOSPACE;
72 term_word(p, bp->left != NULL ? bp->left : "(");
73 p->flags |= TERMP_NOSPACE;
62 }
74 delim = 1;
75 } else
76 delim = 0;
77
78 /* Handle Fonts and text. */
79
63 if (bp->font != EQNFONT_NONE)
64 term_fontpush(p, fontmap[(int)bp->font]);
65
66 if (bp->text != NULL)
67 term_word(p, bp->text);
68
80 if (bp->font != EQNFONT_NONE)
81 term_fontpush(p, fontmap[(int)bp->font]);
82
83 if (bp->text != NULL)
84 term_word(p, bp->text);
85
86 /* Special box types. */
87
69 if (bp->pos == EQNPOS_SQRT) {
70 term_word(p, "sqrt");
88 if (bp->pos == EQNPOS_SQRT) {
89 term_word(p, "sqrt");
71 p->flags |= TERMP_NOSPACE;
72 eqn_box(p, bp->first);
90 if (bp->first != NULL) {
91 p->flags |= TERMP_NOSPACE;
92 eqn_box(p, bp->first);
93 }
73 } else if (bp->type == EQN_SUBEXPR) {
74 child = bp->first;
75 eqn_box(p, child);
76 p->flags |= TERMP_NOSPACE;
77 term_word(p, bp->pos == EQNPOS_OVER ? "/" :
78 (bp->pos == EQNPOS_SUP ||
79 bp->pos == EQNPOS_TO) ? "^" : "_");
80 p->flags |= TERMP_NOSPACE;

--- 7 unchanged lines hidden (view full) ---

88 p->flags |= TERMP_NOSPACE;
89 child = child->next;
90 if (child != NULL)
91 eqn_box(p, child);
92 }
93 }
94 } else {
95 child = bp->first;
94 } else if (bp->type == EQN_SUBEXPR) {
95 child = bp->first;
96 eqn_box(p, child);
97 p->flags |= TERMP_NOSPACE;
98 term_word(p, bp->pos == EQNPOS_OVER ? "/" :
99 (bp->pos == EQNPOS_SUP ||
100 bp->pos == EQNPOS_TO) ? "^" : "_");
101 p->flags |= TERMP_NOSPACE;

--- 7 unchanged lines hidden (view full) ---

109 p->flags |= TERMP_NOSPACE;
110 child = child->next;
111 if (child != NULL)
112 eqn_box(p, child);
113 }
114 }
115 } else {
116 child = bp->first;
96 if (bp->type == EQN_MATRIX && child->type == EQN_LIST)
117 if (bp->type == EQN_MATRIX &&
118 child != NULL &&
119 child->type == EQN_LIST &&
120 child->expectargs > 1)
97 child = child->first;
98 while (child != NULL) {
99 eqn_box(p,
100 bp->type == EQN_PILE &&
101 child->type == EQN_LIST &&
121 child = child->first;
122 while (child != NULL) {
123 eqn_box(p,
124 bp->type == EQN_PILE &&
125 child->type == EQN_LIST &&
126 child->expectargs > 1 &&
102 child->args == 1 ?
103 child->first : child);
104 child = child->next;
105 }
106 }
107
127 child->args == 1 ?
128 child->first : child);
129 child = child->next;
130 }
131 }
132
133 /* Handle Fonts and diacritics. */
134
108 if (bp->font != EQNFONT_NONE)
109 term_fontpop(p);
135 if (bp->font != EQNFONT_NONE)
136 term_fontpop(p);
110 if (bp->type == EQN_LIST ||
111 (bp->type == EQN_PILE && (bp->prev || bp->next)) ||
112 (bp->parent != NULL && bp->parent->pos == EQNPOS_SQRT)) {
113 p->flags |= TERMP_NOSPACE;
114 term_word(p, bp->right != NULL ? bp->right : ")");
115 if (bp->parent->type == EQN_SUBEXPR && bp->next != NULL)
116 p->flags |= TERMP_NOSPACE;
117 }
118
119 if (bp->top != NULL) {
120 p->flags |= TERMP_NOSPACE;
121 term_word(p, bp->top);
122 }
123 if (bp->bottom != NULL) {
124 p->flags |= TERMP_NOSPACE;
125 term_word(p, "_");
126 }
137 if (bp->top != NULL) {
138 p->flags |= TERMP_NOSPACE;
139 term_word(p, bp->top);
140 }
141 if (bp->bottom != NULL) {
142 p->flags |= TERMP_NOSPACE;
143 term_word(p, "_");
144 }
145
146 /* Right delimiter after this box? */
147
148 if (delim) {
149 p->flags |= TERMP_NOSPACE;
150 term_word(p, bp->right != NULL ? bp->right : ")");
151 if (bp->parent->type == EQN_SUBEXPR && bp->next != NULL)
152 p->flags |= TERMP_NOSPACE;
153 }
127}
154}