Ordered item 1 of sublevel 2 with a paragraph (paragraph can start with point after plus or minus characters, e.g. ++. or --.)
This is another item. But with 3 paragraphs, blockquote and sublists:
This is the second paragraph in the item. You can add paragraphs to an item, using point notation, where first characters in the string are sequence of points with space between them and another string. For example, this paragraph (in sublevel 2) starts with two points:
.. This is the second paragraph...this is a blockquote in a list
You can use blockquote with headers, paragraphs, tables and lists in it:
Tables can have or have not header and footer. This table is defined without any header and footer in it:red fox 0 blue dolphin 1000 green leaf 10000 This is yet another paragraph in the item.
- This is an item of unordered list (sublevel 3)
- This is the second item of the unordered list (sublevel 3)
- This is a single item of ordered list in sublevel 6
and this is a paragraph in sublevel 4
This is a new item with paragraph in sublevel 3.
- Start ordered list in sublevel 4 with code block:
====================line 1 +print markmin2pdf(m)This is a test block with new features:
This is a blockquote with a list with tables in it:
This is a paragraph before list. You can continue paragraph on the next lines.
This is an ordered list with tables:- Item 1
- Item 2
aa bb cc 11 22 33 - Item 4
T1 T2 t3 aaa bbb ccc ddd fff ggg 123 0 5.0
This this a new paragraph with a table. Table has header and footer:
Title 1 Title 2 Title 3 data 1 data 2 2.00 data 4 data5(long) 23.00 data 8 33.50 Total: 3 items 58.50 Multilevel lists
Now lists can be multilevel:
- Ordered item 1 on level 1. You can continue item text on next strings
Ordered item 1 of sublevel 2 with a paragraph (paragraph can start with point after plus or minus characters, e.g. ++. or --.)
This is another item. But with 3 paragraphs, blockquote and sublists:
This is the second paragraph in the item. You can add paragraphs to an item, using point notation, where first characters in the string are sequence of points with space between them and another string. For example, this paragraph (in sublevel 2) starts with two points:
.. This is the second paragraph...this is a blockquote in a list
You can use blockquote with headers, paragraphs, tables and lists in it:
Tables can have or have not header and footer. This table is defined without any header and footer in it:red fox 0 blue dolphin 1000 green leaf 10000 This is yet another paragraph in the item.
- This is an item of unordered list (sublevel 3)
- This is the second item of the unordered list (sublevel 3)
- This is a single item of ordered list in sublevel 6
and this is a paragraph in sublevel 4
This is a new item with paragraph in sublevel 3.
- Start ordered list in sublevel 4 with code block:
line 1 line 2 line 3 Yet another item with code block:
is a table and is rendered asline 1 line 2 @@ -47,7 +47,7 @@ code block X | 0 | 0 ================= **D**|**F**|**G** ------------------:abc[id]
Four or more dashes delimit the table and | separates the columns. TheA B C 0 0 X 0 X 0 X 0 0 D F G :abc,:id[abc_1]or:abc[abc_1]at the end sets the class and/or id for the table and it is optional.Blockquote
A table with a single cell is rendered as a blockquote:
Hello world
Blockquote can contain headers, paragraphs, lists and tables:
is a table and is rendered as----- +-----------------:abc[id]
Four or more dashes delimit the table and | separates the columns. TheA B C 0 0 X 0 X 0 X 0 0 D F G :abc,:id[abc_1]or:abc[abc_1]at the end sets the class and/or id for the table and it is optional.Blockquote
A table with a single cell is rendered as a blockquote:
Hello world
Blockquote can contain headers, paragraphs, lists and tables:
' % (cls, id, escape(code[1:-1])) - return '----- This is a paragraph in a blockquote + item 1 diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py index 1d761ae9..2b305608 100755 --- a/gluon/contrib/markmin/markmin2html.py +++ b/gluon/contrib/markmin/markmin2html.py @@ -507,14 +507,14 @@ regex_URL=re.compile(r'@\{(?P\w+)/(?P .+?)\}') regex_env=re.compile(r'@\{(?P\w+?)\}') regex_expand_meta = re.compile('('+META+'|'+DISABLED_META+')') regex_dd=re.compile(r'\$\$(?P .*?)\$\$') -regex_code = re.compile('('+META+'|'+DISABLED_META+r')|(``(?P .+?)``(?::(?P \w+)(?:\[(?P \S+?)\])?)?)',re.S) +regex_code = re.compile('('+META+'|'+DISABLED_META+r')|(``(?P
.+?)``(?::(?P [a-zA-Z][_a-zA-Z\-\d]*)(?:\[(?P [^\]]*)\])?)?)',re.S) regex_strong=re.compile(r'\*\*(?P
[^\s*]+( +[^\s*]+)*)\*\*') regex_del=re.compile(r'~~(?P [^\s*]+( +[^\s*]+)*)~~') regex_em=re.compile(r"''(?P [^\s']+(?: +[^\s']+)*)''") regex_num=re.compile(r"^\s*[+-]?((\d+(\.\d*)?)|\.\d+)([eE][+-]?[0-9]+)?\s*$") regex_list=re.compile('^(?:(#{1,6}|\.+|\++|\-+)(\.)?\s+)?(.*)$') regex_bq_headline=re.compile('^(?:(\.+|\++|\-+)(\.)?\s+)?(-{3}-*)$') -regex_tq=re.compile('^(-{3}-*)(?::(?P \S+?)(?:\[(?P \S+)\])?)?$') +regex_tq=re.compile('^(-{3}-*)(?::(?P
[a-zA-Z][_a-zA-Z\-\d]*)(?:\[(?P [a-zA-Z][_a-zA-Z\-\d]*)\])?)?$') regex_qr = re.compile(r'(?/=])qr:(?P
\w+://[\w\d\-+?&%/:.]+)',re.M) regex_embed = re.compile(r'(?/=])embed:(?P \w+://[\w\d\-+_=?%&/:.]+)', re.M) regex_iframe = re.compile(r'(?/=])iframe:(?P \w+://[\w\d\-+=?%&/:.]+)', re.M) @@ -536,7 +536,7 @@ def markmin_escape(text): """ insert \\ before markmin control characters: '`:*~[]{}@$ """ return regex_markmin_escape.sub(lambda m: '\\'+m.group(0).replace('\\','\\\\'), text) -def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='google',auto=True): +def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='google',auto=True,class_prefix='',id_prefix='markmin_'): """ Arguments: - text is the text to be processed @@ -564,13 +564,13 @@ def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='goo >>> render('``\\nhello\\nworld\\n``:python') '
' >>> render('``hello world``:python[test_id]') - 'hello\\nworldhello world' + 'hello world' >>> render('``hello world``:id[test_id]') - 'hello world' + 'hello world' >>> render('``\\nhello\\nworld\\n``:python[test_id]') - '
' + 'hello\\nworld
' >>> render('``\\nhello\\nworld\\n``:id[test_id]') - 'hello\\nworld
' + 'hello\\nworld
' >>> render("''hello world''") 'hello\\nworldhello world
' >>> render('** hello** **world**') @@ -699,7 +699,7 @@ def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='goo >>> render("the [[link \\[**without** ``title``:red\\] http://www.example.com]]") 'the link [without <b>title</b>]
' - >>> render("aaa-META-``code``:text-LINK-[[link http://www.example.com]]-LINK-[[image http://www.picture.com img]]-end") + >>> render("aaa-META-``code``:text[]-LINK-[[link http://www.example.com]]-LINK-[[image http://www.picture.com img]]-end") 'aaa-META-
' >>> render("[[test [test2] text3]]") @@ -930,8 +930,8 @@ def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='goo ) for f in s.split('|')])+'') lineno+=1 - t_cls = ' class="%s"'%t_cls if t_cls and t_cls != 'id' else '' - t_id = ' id="%s"'%t_id if t_id else '' + t_cls = ' class="%s%s"'%(class_prefix, t_cls) if t_cls and t_cls != 'id' else '' + t_id = ' id="%s%s"'%(id_prefix, t_id) if t_id else '' s = '' if thead: s += ''+''.join([l for l in thead])+'' @@ -974,8 +974,8 @@ def render(text,extra={},allowed={},sep='p',URL=None,environment=None,latex='goo lineno+=1 - t_cls = ' class="%s"'%t_cls if t_cls and t_cls != 'id' else '' - t_id = ' id="%s"'%t_id if t_id else '' + t_cls = ' class="%s%s"'%(class_prefix,t_cls) if t_cls and t_cls != 'id' else '' + t_id = ' id="%s%s"'%(id_prefix,t_id) if t_id else '' s = 'code-LINK-link-LINK--end
- Start ordered list in sublevel 4 with code block:
- Start ordered list in sublevel 4 with code block: