Skip to content

Commit

Permalink
Merge pull request #40 from schettino72/color-schemes
Browse files Browse the repository at this point in the history 
added support to select a color-scheme. added schemes 'xterm' and 'xterm...
  • Loading branch information
@ralphbean
ralphbean committed Oct 12, 2013
2 parents 3587f03 + 367289a commit 1111aec
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 37 deletions.
13 changes: 10 additions & 3 deletions ansi2html/converter.py
View file
Expand Up @@ -188,6 +188,7 @@ def __init__(self,
escaped=True,
markup_lines=False,
output_encoding='utf-8',
scheme='ansi2html'
):

self.inline = inline
Expand All @@ -197,10 +198,11 @@ def __init__(self,
self.escaped = escaped
self.markup_lines = markup_lines
self.output_encoding = output_encoding
self.scheme = scheme
self._attrs = None

if inline:
self.styles = dict([(item.klass.strip('.'), item) for item in get_styles(self.dark_bg)])
self.styles = dict([(item.klass.strip('.'), item) for item in get_styles(self.dark_bg, self.scheme)])

self.ansi_codes_prog = re.compile('\033\\[' '([\\d;]*)' '([a-zA-z])')

Expand Down Expand Up @@ -365,15 +367,15 @@ def convert(self, ansi, full=True, ensure_trailing_newline=False):
return attrs["body"]
else:
return _template % {
'style' : "\n".join(map(str, get_styles(self.dark_bg))),
'style' : "\n".join(map(str, get_styles(self.dark_bg, self.scheme))),
'font_size' : self.font_size,
'content' : attrs["body"],
'output_encoding' : self.output_encoding,
}

def produce_headers(self):
return '<style type="text/css">\n%(style)s\n</style>\n' % {
'style' : "\n".join(map(str, get_styles(self.dark_bg)))
'style' : "\n".join(map(str, get_styles(self.dark_bg, self.scheme)))
}


Expand Down Expand Up @@ -428,6 +430,10 @@ def main():
'--output-encoding', dest='output_encoding', metavar='ENCODING',
default='utf-8',
help="Specify output encoding")
parser.add_option(
'-s', '--scheme', dest='scheme', metavar='SCHEME',
default='ansi2html',
help="Specify color palette scheme [ansi2html, xterm, xterm-bright]")

opts, args = parser.parse_args()

Expand All @@ -439,6 +445,7 @@ def main():
escaped=opts.escaped,
markup_lines=opts.markup_lines,
output_encoding=opts.output_encoding,
scheme=opts.scheme,
)

def _read(input_bytes):
Expand Down
55 changes: 21 additions & 34 deletions ansi2html/style.py
View file
Expand Up @@ -46,8 +46,17 @@ def level(grey):
def index2(grey):
return str(232 + grey)


def get_styles(dark_bg=True):
# http://en.wikipedia.org/wiki/ANSI_escape_code#Colors
SCHEME = { # black red green brown/yellow blue magenta cyan grey/white
'ansi2html': ("#000316", "#aa0000", "#00aa00", "#aa5500", "#0000aa",
"#E850A8", "#00aaaa", "#F5F1DE"),
'xterm': ("#000000", "#cd0000", "#00cd00", "#cdcd00", "#0000ee",
"#cd00cd", "#00cdcd", "#e5e5e5"),
'xterm-bright': ("#7f7f7f", "#ff0000", "#00ff00", "#ffff00", "#5c5cff",
"#ff00ff", "#00ffff", "#ffffff"),
}

def get_styles(dark_bg=True, scheme='ansi2html'):

css = [
Rule('.body_foreground', color=('#000000', '#AAAAAA')[dark_bg]),
Expand All @@ -64,40 +73,18 @@ def get_styles(dark_bg=True):
Rule('.ansi6', text_decoration='blink'),
Rule('.ansi8', visibility='hidden'),
Rule('.ansi9', text_decoration='line-through'),
Rule('.ansi30', color="#000316"),
Rule('.inv30', background_color="#000316"),
Rule('.ansi31', color="#aa0000"),
Rule('.inv31', background_color="#aa0000"),
Rule('.ansi32', color="#00aa00"),
Rule('.inv32', background_color="#00aa00"),
Rule('.ansi33', color="#aa5500"),
Rule('.inv33', background_color="#aa5500"),
Rule('.ansi34', color="#0000aa"),
Rule('.inv34', background_color="#0000aa"),
Rule('.ansi35', color="#E850A8"),
Rule('.inv35', background_color="#E850A8"),
Rule('.ansi36', color="#00aaaa"),
Rule('.inv36', background_color="#00aaaa"),
Rule('.ansi37', color="#F5F1DE"),
Rule('.inv37', background_color="#F5F1DE"),
Rule('.ansi40', background_color="#000316"),
Rule('.inv40', color="#000316"),
Rule('.ansi41', background_color="#aa0000"),
Rule('.inv41', color="#aa0000"),
Rule('.ansi42', background_color="#00aa00"),
Rule('.inv42', color="#00aa00"),
Rule('.ansi43', background_color="#aa5500"),
Rule('.inv43', color="#aa5500"),
Rule('.ansi44', background_color="#0000aa"),
Rule('.inv44', color="#0000aa"),
Rule('.ansi45', background_color="#E850A8"),
Rule('.inv45', color="#E850A8"),
Rule('.ansi46', background_color="#00aaaa"),
Rule('.inv46', color="#00aaaa"),
Rule('.ansi47', background_color="#F5F1DE"),
Rule('.inv47', color="#F5F1DE"),
]

# set palette
assert scheme in SCHEME
pal = SCHEME[scheme]
for _index in range(8):
css.append(Rule('.ansi3%s' % _index, color=pal[_index]))
css.append(Rule('.inv3%s' % _index, background_color=pal[_index]))
for _index in range(8):
css.append(Rule('.ansi4%s' % _index, background_color=pal[_index]))
css.append(Rule('.inv4%s' % _index, color=pal[_index]))

# css.append("/* Define the explicit color codes (obnoxious) */\n\n")

for green in range(0, 6):
Expand Down
12 changes: 12 additions & 0 deletions tests/test_ansi2html.py
View file
Expand Up @@ -308,5 +308,17 @@ def test_cross_line_state(self): # covers issue 36, too
expected = six.u('<span style="color: #aa0000">RED\nSTILL RED</span>\n')
self.assertEqual(expected, html)

def test_scheme(self): # covers issue 36, too
sample = '\x1b[33mYELLOW/BROWN'
# ansi2html scheme is brown #aa5500
html = Ansi2HTMLConverter(inline=True).convert(sample, full=False, ensure_trailing_newline=False)
expected = six.u('<span style="color: #aa5500">YELLOW/BROWN</span>')
self.assertEqual(expected, html)

# xterm scheme is yellow #cdcd00
html = Ansi2HTMLConverter(inline=True, scheme='xterm').convert(sample, full=False, ensure_trailing_newline=False)
expected = six.u('<span style="color: #cdcd00">YELLOW/BROWN</span>')
self.assertEqual(expected, html)

if __name__ == '__main__':
unittest.main()

0 comments on commit 1111aec

Please sign in to comment.