Skip to content

Commit

Permalink
Add + list support, #12
Browse files Browse the repository at this point in the history
  • Loading branch information
hotoo committed Nov 6, 2014
1 parent 1cc84d8 commit 706eff0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions examples/data.mdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- date: 2014/09/20
- author: @hotoo <hotoo.cn@gmail.com>
- age: show
- mention: https://twitter.com/{@mention}
+ mention: https://twitter.com/{@mention}
- tags:
- job: #fff, #f00
- life: #fff, rgba(255,0,0,0.5)
Expand All @@ -15,9 +15,9 @@

* 2000 this is [link](https://github.com/hotoo/markline), and ![image](https://avatars0.githubusercontent.com/u/143572?v=2&s=460)
* 2000 this is **strong**, and __strong2__
* 2000 this is *em*, and _em2_
* 2000 this is ~delete~, and ~~delete2~~
* 2000 this is `code` and `another code`.
+ 2000 this is *em*, and _em2_
+ 2000 this is ~delete~, and ~~delete2~~
+ 2000 this is `code` and `another code`.

## @Memthon and #HashTags

Expand Down
8 changes: 4 additions & 4 deletions markline.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@ function parse(markdown){
};

var re_title = /^#\s+(.*)$/;
var re_meta = /^[\-\*]\s+([^:]+):\s*(.*)$/;
var re_meta = /^[\+\-\*]\s+([^:]+):\s*(.*)$/;
var re_submeta = /^[\s\t]+[\-\*]\s+([^:]+):\s*(.*)$/;
var re_hr = /^\-{2,}$/;
var re_group = /^##+\s+(.*)$/;
var re_line = /^[\*\-]\s+(([0-9\/\-]+)(?:~([0-9\/\-]*))?)\s+(.*)$/;
var re_event = /^\s+[\*\-]\s+(([0-9\/\-]+)(?:~([0-9\/\-]*))?)\s+(.*)$/;
var re_group = /^##{1,5}\s+(.*)$/;
var re_line = /^[\+\*\-]\s+(([0-9\/\-]+)(?:~([0-9\/\-]*))?)\s+(.*)$/;
var re_event = /^\s+[\+\*\-]\s+(([0-9\/\-]+)(?:~([0-9\/\-]*))?)\s+(.*)$/;

var current_group = "";
var current_line;
Expand Down

0 comments on commit 706eff0

Please sign in to comment.