From 7fdaf6a23aba6b6a837937d0ef22a84bc0726715 Mon Sep 17 00:00:00 2001 From: q Date: Sun, 19 Jun 2016 22:01:57 +0300 Subject: [PATCH] fix bold re. adding suport for slide alignment --- reporting/markslider.py | 13 ++++++++++--- reporting/md_color.py | 8 ++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/reporting/markslider.py b/reporting/markslider.py index d8be6e5..7a779ad 100755 --- a/reporting/markslider.py +++ b/reporting/markslider.py @@ -302,12 +302,19 @@ def page_print(reader,opts,offset): scrsize=opts.size # clear page bc.clear() + if False: # Placeholder for 80x25 center alignment + align_x_offset=scrsize[1]/2-40 + align_pad=" "*align_x_offset + align_y_offset=scrsize[0]/2-12 + bc.down_line(align_y_offset) + else: + align_pad="" # Print header if opts.dark_colors: coloring="${b}${U}" else: coloring="${U}${Y}" - print(colorify(coloring+page[0],opts)) + print(align_pad+colorify(coloring+page[0],opts)+bc.Z) # Print page rows parsed=md_color.parse(page) @@ -332,7 +339,7 @@ def page_print(reader,opts,offset): colored_row=colored[row_i]#=colorify(row,opts) if offset[1]==r+1+offset[0]: colored_row=add_highlight(row,opts) - sys.stdout.write(colored_row) + sys.stdout.write(align_pad+colored_row) if r>=scrsize[0]-2: break @@ -478,7 +485,7 @@ def colorify(s,opts): """ Add colors to string """ if not opts.color: return bc.nocolor_string(s) - c=bc.color_string(s)+bc.Z + c=bc.color_string(s)#+bc.Z return c def cut_line(s,i): diff --git a/reporting/md_color.py b/reporting/md_color.py index 8845a94..17e28c9 100755 --- a/reporting/md_color.py +++ b/reporting/md_color.py @@ -142,10 +142,10 @@ block_match={ blocks=['block_quote', 'multiline_code','hrule', 'heading','lheading','list_bullet', 'block_code', 'text', 'empty'] inline_match={ - 'bold1': {'re':re.compile(r'(^| )(_[^_]+_)'), - 'bc':'${W}\\1\\2','dc':'${W}\\1\\2'}, # _bold_ - 'bold2': {'re':re.compile(r'(^| )(\*{1,2}[^\*]+\*{1,2})'), - 'bc':'${W}\\1\\2','dc':'${W}\\1\\2'}, # **bold** + 'bold1': {'re':re.compile(r'(^| |})(_[^_]+_)'), + 'bc':'\\1${W}\\2','dc':'${W}\\1\\2'}, # _bold_ + 'bold2': {'re':re.compile(r'(^| |})(\*{1,2}[^\*]+\*{1,2})'), + 'bc':'\\1${W}\\2','dc':'${W}\\1\\2'}, # **bold** 'code': {'re':re.compile(r'([`]+[^`]+[`]+)'), 'bc':'${c}\\1','dc':'${m}\\1'}, # `code` 'code_special': {'re':re.compile(r'([`]+[^`]+[`]+)([!>])'),