Merged nested inlinefuncs from the dev branch. Added |-style ansi-markers. Resolves #818.

This commit is contained in:
Griatch 2015-11-28 20:30:01 +01:00
parent 492e2e2411
commit 7de036c1d9
5 changed files with 90 additions and 36 deletions

View file

@ -62,7 +62,7 @@ ANSI_TAB = "\t"
ANSI_SPACE = " "
# Escapes
ANSI_ESCAPES = ("{{", "\\\\")
ANSI_ESCAPES = ("{{", "\\\\", "\|\|")
from collections import OrderedDict
_PARSE_CACHE = OrderedDict()
@ -408,14 +408,14 @@ class ANSIParser(object):
## |-style variations
(r'|[r', r'{[500'),
(r'|[g', r'{[050'),
(r'|[y', r'{[550'),
(r'|[b', r'{[005'),
(r'|[m', r'{[505'),
(r'|[c', r'{[055'),
(r'|[w', r'{[555'), # white background
(r'|[x', r'{[222')] # dark grey background
(r'|[r', r'|[500'),
(r'|[g', r'|[050'),
(r'|[y', r'|[550'),
(r'|[b', r'|[005'),
(r'|[m', r'|[505'),
(r'|[c', r'|[055'),
(r'|[w', r'|[555'), # white background
(r'|[x', r'|[222')] # dark grey background
# xterm256 {123, %c134. These are replaced directly by
# the sub_xterm256 method