nojhan/colout
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bugfix: return text if no color, more debug infos

Browse source 
use global colormap_idx
This commit is contained in:
Johann Dreo 2014-04-24 09:54:30 +02:00
commit c830a02fec
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
colout/colout.py
View file

@ -351,7 +351,7 @@ def color_scale( name, text ):
# if out of scale, do not color # if out of scale, do not color
if f < scale[0] or f > scale[1]: if f < scale[0] or f > scale[1]:
return text return None
# normalize and scale over the nb of colors in cmap # normalize and scale over the nb of colors in cmap
colormap = colormaps[name] colormap = colormaps[name]
@ -448,7 +448,6 @@ def colorin(text, color="red", style="normal"):
assert( type(color) is str ) assert( type(color) is str )
global colormap_idx
global debug global debug
# Special characters. # Special characters.
@ -518,14 +517,20 @@ def colorin(text, color="red", style="normal"):
else: else:
raise UnknownColor(color) raise UnknownColor(color)
if not debug: if color_code is not None:
return start + style_code + endmarks[m] + color_code + "m" + text + stop if not debug:
return start + style_code + endmarks[m] + color_code + "m" + text + stop
else:
return start + style_code + endmarks[m] + color_code + "m" \
+ "<color name=" + str(color) + " code=" + color_code \
+ " style=" + str(style) + " stylecode=" + style_code \
+ " mode=" + str(m) + ">" \
+ text + "</color>" + stop
else: else:
return start + style_code + endmarks[m] + color_code + "m" \ if not debug:
+ "<color name=" + str(color) + " code=" + color_code \ return text
+ " style=" + str(style) + " stylecode=" + style_code \ else:
+ " mode=" + str(m) + ">" \ return "<none>" + text + "</none>"
+ text + "</color>" + stop
def colorout(text, match, prev_end, color="red", style="normal", group=0): def colorout(text, match, prev_end, color="red", style="normal", group=0):