wbrawner/hoedown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

document: Make MATH extension context-sensitive

Browse source
This commit is contained in:
Xavier Mendez 2014-09-02 00:41:12 +02:00
parent 0088492f5e
commit 960179e51f
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/document.c
View file

@ -331,6 +331,15 @@ _isspace(int c)
return c == ' ' || c == '\n'; return c == ' ' || c == '\n';
} }
/* is_empty_all: verify that all the data is spacing */
static inline int
is_empty_all(const uint8_t *data, size_t size)
{
size_t i = 0;
while (i < size && _isspace(data[i])) i++;
return i == size;
}
/**************************** /****************************
* INLINE PARSING FUNCTIONS * * INLINE PARSING FUNCTIONS *
****************************/ ****************************/
@ -706,16 +715,22 @@ parse_math(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offs
i++; i++;
} }
/* enforce spacing around the span */
if (offset && !_isspace(data[-1])) return 0;
if (i + delimsz < size && !_isspace(data[i + delimsz])) return 0;
/* prepare buffers */ /* prepare buffers */
hoedown_buffer text = { data + delimsz, i - delimsz, 0, 0, NULL, NULL, NULL }; hoedown_buffer text = { data + delimsz, i - delimsz, 0, 0, NULL, NULL, NULL };
/* enforce spacing around the span */
i += delimsz;
if (offset && !_isspace(data[-1])) return 0;
if (i < size && !_isspace(data[i])) return 0;
/* if this is a $$ and MATH_DOLLAR is not active,
* guess wether displaymode should be enabled from the context */
if (delimsz == 2 && !(doc->ext_flags & HOEDOWN_EXT_MATH_DOLLAR))
displaymode = is_empty_all(data - offset, offset) && is_empty_all(data + i, size - i);
/* call callback */ /* call callback */
if (doc->md.math(ob, &text, displaymode, doc->md.opaque)) if (doc->md.math(ob, &text, displaymode, doc->md.opaque))
return i + delimsz; return i;
return 0; return 0;
} }
@ -1336,9 +1351,9 @@ char_math(hoedown_buffer *ob, hoedown_document *doc, uint8_t *data, size_t offse
{ {
/* double dollar */ /* double dollar */
if (size > 1 && data[1] == '$') if (size > 1 && data[1] == '$')
return parse_math(ob, doc, data, offset, size, "$$", 2, doc->ext_flags & HOEDOWN_EXT_MATH_DOLLAR); return parse_math(ob, doc, data, offset, size, "$$", 2, 1);
/* single dollar allowed only at with flag */ /* single dollar allowed only with MATH_DOLLAR flag */
if (doc->ext_flags & HOEDOWN_EXT_MATH_DOLLAR) if (doc->ext_flags & HOEDOWN_EXT_MATH_DOLLAR)
return parse_math(ob, doc, data, offset, size, "$", 1, 0); return parse_math(ob, doc, data, offset, size, "$", 1, 0);