262 Commits

Author SHA1 Message Date
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
Christopher Jeffrey
f7be7f9640 fix potential problems with highlighter callback and escapes. 2012-04-11 01:57:17 -05:00
Christopher Jeffrey
041dd98ed4 change highlight option. add code class prefix. 2012-04-06 16:08:17 -05:00
Brad Harris
7f57e5b797 adding 'highlighter' as an option
while your readme shows you can fully support a highlighter by wrapping
marked and inspecting the tokens manually, it would be more performant
to not have to traverse the tokens another time to add highlighting.
2012-04-06 01:41:50 -06:00
Brad Harris
9880f22c4f returning 'marked' in setOptions to allow for fluent interface
allows for...

var marked = require('marked').setOptions({...});
2012-04-06 01:41:28 -06:00
Christopher Jeffrey
45fd7a24f8 avoid backreference in link regex 2012-03-10 16:47:38 -06:00
Christopher Jeffrey
1171a7b5b8 more conformant link rule. 2012-03-10 16:43:31 -06:00
Christopher Jeffrey
3430b72827 refactor, improve regexes. 2012-03-05 22:54:04 -06:00
Christopher Jeffrey
ef7917dcbb fix link titles. closes #36. refactor. 2012-03-05 21:27:04 -06:00
Christopher Jeffrey
7f9fd628af refactor. remove. 2012-02-29 22:36:45 -06:00
Christopher Jeffrey
f377ff524b only match http/https in gfm autolinks 2012-02-29 22:29:36 -06:00
Christopher Jeffrey
791cf53772 rename setDefaults to setOptions, refactor. update benchmarks. 2012-02-20 08:50:43 -06:00
Christopher Jeffrey
ad984d4f74 always reset options. typo. 2012-02-19 22:30:25 -06:00
Christopher Jeffrey
3e42b67057 always sanitize html blocks, even if pedantic. benchmarks. 2012-02-19 21:51:52 -06:00
Christopher Jeffrey
b2189ab99c optimize options more 2012-02-19 21:29:23 -06:00
Christopher Jeffrey
79975978b0 add options: pedantic, gfm, sanitize. 2012-02-19 19:15:11 -06:00
Christopher Jeffrey
92aaea8fe5 nested underscore ems, fix tests 2012-02-16 12:18:07 -06:00
Christopher Jeffrey
852165f387 do not process inline markdown in PRE elements 2012-02-13 00:23:56 -06:00
gigonaut
83ff21de3c ie8 doesn't understand &apos; does stupid things. This should fix it. 2012-02-02 17:25:17 -06:00
Christopher Jeffrey
c2d1e31fe4 refactor, use consistent variable names 2012-01-30 06:52:56 -06:00
Christopher Jeffrey
ac4ca9df4e use prettier whitespace during compilation 2012-01-29 16:37:11 -06:00
Christopher Jeffrey
74fa9c9c55 better loose list item determination 2012-01-28 22:35:14 -06:00
Christopher Jeffrey
790f29446d optimize parsing/compiling with concatenations 2012-01-28 22:10:04 -06:00
Christopher Jeffrey
9df1c5bd09 more conformant loose list check 2012-01-28 16:44:54 -06:00
Christopher Jeffrey
5809d6ad8d smarter whitespace handling for list items 2012-01-28 13:04:28 -06:00
Christopher Jeffrey
9bbb0b71e1 conformance: allow spaced blockquotes 2012-01-28 06:01:21 -06:00
Christopher Jeffrey
6f2757add6 change html regex 2012-01-25 05:04:27 -06:00