mandoc/eqn.c - diff

Return to eqn.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/eqn.c between version 1.64 and 1.66

version 1.64, 2017/06/21 18:04:34

version 1.66, 2017/06/21 20:50:50

Line 1

/* $Id$ */

/* $OpenBSD$ */

Line 20

#include <sys/types.h>

#include <assert.h>

#include <ctype.h>

#include <limits.h>

#include <stdio.h>

#include <stdlib.h>

Line 523 eqn_tok_parse(struct eqn_node *ep, char **p)

Line 524 eqn_tok_parse(struct eqn_node *ep, char **p)

if (STRNEQ(start, sz, eqn_toks[i], strlen(eqn_toks[i])))

return i;

for (i = 0; i < EQNSYM__MAX; i++) {

if (STRNEQ(start, sz,

eqnsyms[i].str, strlen(eqnsyms[i].str))) {

mandoc_asprintf(p, "\\[%s]", eqnsyms[i].sym);

return EQN_TOK__MAX;

}

if (p != NULL)

*p = mandoc_strndup(start, sz);

Line 710 static enum rofferr

Line 719 static enum rofferr

eqn_parse(struct eqn_node *ep, struct eqn_box *parent)

{

char sym[64];

struct eqn_box *cur;

struct eqn_box *cur, *fontp, *nbox;

const char *start;

const char *cp, *cpn, *start;

char *p;

size_t i, sz;

size_t sz;

enum eqn_tok tok, subtok;

enum eqn_post pos;

int size;

Line 1084 this_tok:

Line 1093 this_tok:

while (parent->args == parent->expectargs)

parent = parent->parent;

if (tok == EQN_TOK_FUNC) {

for (cur = parent; cur != NULL; cur = cur->parent)

* Wrap well-known function names in a roman box,

if (cur->font != EQNFONT_NONE)

* unless they already are in roman context.

break;

if (cur == NULL || cur->font != EQNFONT_ROMAN) {

for (fontp = parent; fontp != NULL; fontp = fontp->parent)

parent = eqn_box_alloc(ep, parent);

if (fontp->font != EQNFONT_NONE)

parent->type = EQN_LISTONE;

break;

parent->font = EQNFONT_ROMAN;

if (tok == EQN_TOK_FUNC &&

parent->expectargs = 1;

(fontp == NULL || fontp->font != EQNFONT_ROMAN)) {

}

parent = fontp = eqn_box_alloc(ep, parent);

parent->type = EQN_LISTONE;

parent->font = EQNFONT_ROMAN;

parent->expectargs = 1;

}

cur = eqn_box_alloc(ep, parent);

cur->type = EQN_TEXT;

for (i = 0; i < EQNSYM__MAX; i++)

cur->text = p;

if (0 == strcmp(eqnsyms[i].str, p)) {

(void)snprintf(sym, sizeof(sym),

* If not inside any explicit font context,

"\\[%s]", eqnsyms[i].sym);

* give every letter its own box.

cur->text = mandoc_strdup(sym);

free(p);

if (fontp == NULL && *p != '\0') {

break;

cp = p;

for (;;) {

cpn = cp + 1;

if (*cp == '\\')

mandoc_escape(&cpn, NULL, NULL);

if (*cpn == '\0')

break;

if (isalpha((unsigned char)*cp) == 0 &&

isalpha((unsigned char)*cpn) == 0) {

cp = cpn;

continue;

}

nbox = eqn_box_alloc(ep, parent);

nbox->type = EQN_TEXT;

nbox->text = mandoc_strdup(cpn);

p = mandoc_strndup(cur->text,

cpn - cur->text);

free(cur->text);

cur->text = p;

cur = nbox;

cp = nbox->text;

}

if (i == EQNSYM__MAX)

cur->text = p;

* Post-process list status.

CVSweb