255 Commits

Author SHA1 Message Date
Tyler Freeman
229c3a1163 fixed issue 79: URLs followed by HTML tag tries to include tag as part of the link
Conflicts:
	lib/marked.js
2013-01-09 13:43:23 -06:00
Christopher Jeffrey
e6827b7567 merge options. fixes #87. 2013-01-09 01:20:00 -06:00
Christopher Jeffrey
a1080df787 a more accurate del rule. 2013-01-06 14:55:25 -06:00
Christopher Jeffrey
ada939da3d comments 2013-01-05 06:03:46 -06:00
Christopher Jeffrey
3e827b9f4c comment. 2013-01-04 23:19:36 -06:00
Christopher Jeffrey
75071c8de1 explicitly send a false top state. 2013-01-04 23:17:32 -06:00
Christopher Jeffrey
5861dfe59c comments 2013-01-04 22:54:31 -06:00
Christopher Jeffrey
b0b6578535 rename rules. 2013-01-04 22:38:06 -06:00
Christopher Jeffrey
d6f2558f9d avoid code duplication with regexes. 2013-01-04 22:34:53 -06:00
Christopher Jeffrey
dc14096aee GFM tables do not break paragraphs. see #74. 2013-01-04 16:11:04 -06:00
Christopher Jeffrey
27e356ce17 clean up table regexes. 2013-01-04 15:54:09 -06:00
Christopher Jeffrey
caed1cbe6c refactor highlighting. 2013-01-04 15:52:02 -06:00
Christopher Jeffrey
16212b780e fix table parsing. closes #104. 2013-01-04 14:14:02 -06:00
Christopher Jeffrey
0a486ce9c1 minor. remove pointless assignment. 2013-01-03 21:20:50 -06:00
Christopher Jeffrey
9f45e252b8 clean up table parsing. 2013-01-03 09:28:41 -06:00
Christopher Jeffrey
094515c53d semicolon. 2013-01-03 08:48:02 -06:00
Christopher Jeffrey
8cbc4de819 misc. 2013-01-03 07:59:05 -06:00
Christopher Jeffrey
2cd27a6720 add gfm strikethrough. fixes #53. 2013-01-03 07:44:02 -06:00
Christopher Jeffrey
8873d6604f Merge remote-tracking branch 'ForbesLindesay/execption-when-no-links'
Conflicts:
	lib/marked.js
2013-01-03 06:48:10 -06:00
Christopher Jeffrey
f9f0668383 comments. style. 2013-01-03 06:32:39 -06:00
Brian Cavalier
aa5556992c Add AMD support when define and define.amd detected 2013-01-03 06:31:35 -06:00
Christopher Jeffrey
47304d29b4 optimize for disabled tables. 2013-01-03 06:23:01 -06:00
Christopher Jeffrey
42d8b2422f remove u00a0. fixes #52 and possibly #81. 2013-01-03 03:44:37 -06:00
Christopher Jeffrey
8a7ecafed2 move table rules to correct positions. 2013-01-03 03:22:48 -06:00
Christopher Jeffrey
5806c20d65 better option handling. 2013-01-03 03:02:05 -06:00
Christopher Jeffrey
7aa7934c90 add gfm line breaks. 2013-01-03 02:21:44 -06:00
Christopher Jeffrey
262f8797ff Merge branch 'gfm_tables_again' into just_proto_table
Conflicts:
	lib/marked.js
2013-01-03 01:49:08 -06:00
Christopher Jeffrey
969939c9f7 move tag string. 2013-01-03 01:42:48 -06:00
Christopher Jeffrey
66dcce2737 use InlineLexer constructor. 2013-01-03 01:40:10 -06:00
Christopher Jeffrey
079cbe8b6a small refactor. 2013-01-03 01:13:40 -06:00
Christopher Jeffrey
aef3a954da refactor options. 2013-01-03 00:45:07 -06:00
Christopher Jeffrey
87a72cda33 major refactor.
Conflicts:
	lib/marked.js
2013-01-03 00:29:41 -06:00
Christopher Jeffrey
e715bd18a0 simplify table regexes. possibly use backreferences for leading whitespace. 2013-01-02 22:10:53 -06:00
Christopher Jeffrey
29eacfdee3 refactor. 2013-01-02 22:04:56 -06:00
Christopher Jeffrey
d8af0af8e8 minor refactor. 2013-01-02 15:35:51 -06:00
Christopher Jeffrey
c07e160849 refactor again. 2013-01-02 15:31:39 -06:00
Christopher Jeffrey
4e9398d123 whitespace output. 2013-01-02 15:26:54 -06:00
Christopher Jeffrey
51bc60a331 minor 2013-01-02 15:25:10 -06:00
Christopher Jeffrey
91a44f6684 remove tabs in table output. 2013-01-02 15:23:50 -06:00
Christopher Jeffrey
c35964259b optimize gfm tables. see --patience diff. 2013-01-02 15:21:01 -06:00
Christopher Jeffrey
dd38370f04 fix gfm paragraph rule to account for tables. 2013-01-02 15:14:06 -06:00
Christopher Jeffrey
68c014c310 avoid using ES5 methods for tables. 2013-01-02 15:08:07 -06:00
Christopher Jeffrey
ec47218dd9 fix misnested TH tags. 2013-01-02 14:53:10 -06:00
Christopher Jeffrey
a412613f06 refactor table implementation. 2013-01-02 14:34:19 -06:00
Christopher Jeffrey
1f09da120f Merge remote-tracking branch 'kitsonk/gfm_tables'
Conflicts:
	lib/marked.js
2013-01-02 14:20:57 -06:00
Christopher Jeffrey
a80ed87b0c avoid infinite loops 2012-12-13 11:36:02 -06:00
isaacs
53e570e481 gfm: Support fences of more than 3 characters 2012-12-13 09:27:05 -08:00
Matt Brennan
fc1c80625c be nice to null characters 2012-11-23 10:54:18 +00:00
Forbes Lindesay
d35d6d307f Throw an exception when parsing with no links object 2012-11-12 23:09:11 +00:00
Christopher Jeffrey
60fefe674f remove old sanitize check 2012-09-11 14:54:10 -05:00