238 Commits

Author SHA1 Message Date
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
Christopher Jeffrey
dfcbc911c3 treat sanitized block elements as paragraphs. fixes #76. 2012-09-11 12:38:34 -05:00
Kitson Kelly
832d05cf71 merge upstream/master 2012-09-10 19:25:58 +01:00
Christopher Jeffrey
232cebb756 refactor paragraph rule 2012-09-05 13:27:48 -05:00
Christopher Jeffrey
1fa5fb8bd8 fix paragraph rule. 2012-09-03 22:48:37 -05:00
Kitson Kelly
fd9066c145 add ability to escape | 2012-09-03 17:57:08 +01:00
Kitson Kelly
ac99b517de Migrate table support as part of GFM support 2012-09-03 17:28:06 +01:00
Kitson Kelly
39c6687c19 add support for Markdown Extra Tables 2012-09-03 17:09:12 +01:00
isaacs
c6a9e7284b Support ~~~ fences in GHM 2012-08-17 10:26:54 -07:00
Christopher Jeffrey
ba024294a8 improve tag() to ensure it excludes autolinks always. 2012-07-13 11:48:44 -05:00
Christopher Jeffrey
05dc64b9da Avoid creating two paragraphs on autolink. Fixes #63.
This has implications for XML namespaced elements, which were
originally always treated as block elements by the top-level paragraph
rule. As a side-effect of this commit, they are now always considered
inline.
2012-07-13 11:29:05 -05:00
Christopher Jeffrey
d44617a2dd refactor. make function syntax consistent. 2012-04-26 09:24:26 -05:00
Christopher Jeffrey
d3a7ec19e7 fix hr in list rule. rename "rule". 2012-04-26 09:19:15 -05:00
Christopher Jeffrey
028abf72fd refactor item/bullet/list regex 2012-04-22 17:19:08 -05:00
Christopher Jeffrey
8c46ecc105 never allow <hr> in list items, as per markdown.pl 2012-04-22 17:15:57 -05:00
Christopher Jeffrey
6646289edb fix list bullet hr confusion 2012-04-21 18:06:24 -05:00
Christopher Jeffrey
df762d3c4f fix bullet recognization in list rule. fixes #46. 2012-04-21 16:45:15 -05:00
Christopher Jeffrey
09717d791e improve wrapper 2012-04-12 02:27:41 -05:00