{symbol = '*', repr = '\\ast'},
{symbol = '~', repr = '\\HDLine[width=.20 * \\the\\textwidth]'},
{symbol = '|', repr = '\\char' .. utf.byte('|')},
- -- Use ▶ from our roman font, since Iwona doesn't have the glyph
+ -- Use ▶ and ∧ from our roman font, since Iwona doesn't have the glyph
{symbol = '▶', repr = '{\\rm{}▶}'},
+ --{symbol = '∧', repr = '{$∧$}'},
+ {symbol = '∧', repr = '{\\rm{}∧}'},
}
-- Keywords that should be bold
-- the word taken.
local function take_word(str)
-- A word must always start with a-z (in particular, λ is not a valid
- -- start of a word).
- res, newstr = utf.match(str, "^([a-zA-Z][%a%d%+%-%,_]+)(.*)")
+ -- start of a word). A word must always end with a letter or a digit
+ res, newstr = utf.match(str, "^([a-zA-Z][%a%d%+%-%,_]*[%a%d]+)(.*)")
+ if not res then
+ -- The above does not catch single letter words
+ res, newstr = utf.match(str, "^([a-zA-Z])(.*)")
+ end
return res, newstr or str
end
if in_block == 0 then
-- Initially allow subscripts using _ or just appending a number (later,
-- we will add extra patterns here.
- submatches = {"^(%a*)_([%a%d,]+)$", "^(%a+)(%d[%d,]+)$"}
+ submatches = {"^(%a*)_([%a%d,]+)$", "^(%a+)(%d[%d,]*)$"}
-- This stores all the bases we've encountered so far (to prevent
-- duplicates). For each of them there will be a pattern in submatches
-- above.