StarMirror/showdown
1
0
Fork 0
mirror of https://github.com/showdownjs/showdown.git synced 2024-03-22 13:30:55 +08:00
Code Issues Projects Releases Wiki Activity
666 Commits 16 Branches 59 Tags 19 MiB
63d949f731
Commit Graph

234 Commits

Author SHA1 Message Date
Estevao Soares dos Santos
f97e072bc4 fix(double linebreaks): fix double linebreaks in html output 
Closes #291
 2016-09-29 00:50:58 +01:00
Estevao Soares dos Santos
799abea767 fix(parser): fix issue with comments inside nested code blocks 
Code blocks containing comments are now converted correctly when nested in list items.

Closes #288
 2016-08-30 06:07:57 +01:00
Estevao Soares dos Santos
0cc55b07ee fix(simplifiedAutoLink): fix simplified autolink to match GFM behavior 
Using the simplifiedAutoLink option does not return the expected GFM behaviour when parsing links without a http prefix.
Previously, `www.google.com` would be parsed into `<a href="www.google.com">www.google.com</a>`.
With this fix, showdown behaves like GFM, and the result is `<a href="http://www.google.com">www.google.com</a>`

Closes #284, closes #285
 2016-08-19 19:12:25 +01:00
Estevao Soares dos Santos
8591ec8196 Merge branch 'develop' into feature/source_indentation_auto_removal 2016-06-21 01:42:50 +01:00
Estevão Soares dos Santos
73206b07fb fix(image-parser): fix ref style imgs after inline style imgs not parsing correctly 
When reference style and inline style are mixed together, in the same line, it produces weird parsing bugs. This commit fixes this

Closes #261
 2016-06-08 17:16:49 +01:00
Estevão Soares dos Santos
261f127f7e feat(smart-indent-fix): fix for es6 identation problems 
Closes #259
 2016-06-07 01:23:52 +01:00
Stewart McKee
6e30a48890 added check for undefined on text due to failing to parse tables 2016-05-24 10:26:59 +01:00
Estevão Soares dos Santos
ddaacfc41a fix(tables): fix table heading separators requiring 3 dashes instead of 2 
Closes #256
 2016-05-17 21:27:40 +01:00
Estevão Soares dos Santos
6e5073d977 chore: remove html beautify from tests 2016-02-02 00:29:06 +00:00
Estevão Soares dos Santos
6412eadf29 fix weird travis issue try 1 2016-02-01 03:56:22 +00:00
Estevão Soares dos Santos
f58f014bc3 fix(tables): fix tables to match github's md spec 
Now Leading and trailing pipes (|) are optional in tables

Closes #230
 2016-01-25 05:24:54 +00:00
Estevão Soares dos Santos
71a5873902 fix(HTMLParser): fix code tags parsing 
Closes #231
 2016-01-25 03:01:54 +00:00
Estevão Soares dos Santos
7d0436d210 fix(HTMLParser): fix ghCodeBlocks being parsed inside code tags 
When using html pre/code tags to wrap github's fenced code block syntax,
showdown would parsed them instead of treating them like plain code.

Closes #229
 2016-01-25 01:04:06 +00:00
Estevão Soares dos Santos
c97f1dc6b1 feat(markdown="1"): enable parsing markdown inside HTML blocks 
Enable parsing markdown inside HTML blocks if those blocks have an attribute called markdown="1".
This feature is EXPERIMENTAL! As such, the behavior might change on future releases.

Closes #178
 2016-01-02 01:08:17 +00:00
Estevão Soares dos Santos
2746949d7d fix(hashHTMLBlock): fix issue with html breaking markdown parsing 
Closes #220
 2016-01-01 23:33:33 +00:00
Estevão Soares dos Santos
5669317fe4 fix(strikethrough): Fix strikethrough issue with escaped chars 
Closes #214
 2015-10-30 01:00:30 +00:00
Estevão Soares dos Santos
f4cb29e05a Merge branch 'develop' into feature/event_mediator 
Conflicts:
	dist/showdown.js
	dist/showdown.js.map
	dist/showdown.min.js
	dist/showdown.min.js.map
	src/converter.js
	src/subParsers/blockGamut.js
	src/subParsers/codeSpans.js
 2015-10-19 03:20:20 +01:00
Estevão Soares dos Santos
e86aea8183 fix(literalMidWordUnderscores): fix different behavior with asterisks 
Closes #198
 2015-10-19 03:09:50 +01:00
Estevão Soares dos Santos
5b1f716151 chore: normalize test names 2015-10-19 02:50:32 +01:00
Estevão Soares dos Santos
a0da0a60b2 chore: small test fix for #196 2015-10-19 02:35:08 +01:00
Estevão Soares dos Santos
3097bd45c2 feat(hashHTMLSpans): Add support for hashing span elements 
This feature enables hashing span elements that should not be touched by
showdown. For instance, `<code>` tags in markdown source should not be
parsed by showdown, so the text inside them remains unchanged.
This is made possible by a new exciting internal feature,
matchRecursiveRegExp.

Closes #196, Closes #175, Partially reverts 5f043ca
 2015-10-19 01:55:35 +01:00
Estevão Soares dos Santos
7aeed3c8ae Merge pull request #197 from twitwi/test-for-issue-196 
chore: add test for issue #196
 2015-10-18 20:46:14 +01:00
Estevão Soares dos Santos
8ebb25e486 fix(simpleautolink): fix mail simpleAutoLink to ignore urls with @ symbol 
Urls with @ symbol will not be incorrectly converted to mail addressed

Closes #204
 2015-10-07 04:46:28 +01:00
Rémi Emonet
ab902eacdf fixing test as, in code blocks, markdown should automatically escape 
still the issue is there
 2015-09-01 01:24:11 +02:00
Rémi Emonet
2b17dc9944 adding test for issue #196 2015-09-01 00:18:32 +02:00
Estevão Soares dos Santos
50256233eb fix(tables): fix md tables being parsed inside indented code blocks. 
Closes #193
 2015-08-27 03:41:59 +01:00
Estevão Soares dos Santos
ed2cf595b0 fix(blockQuote): fix 'github style codeblocks' not being parsed inside 'blockquote' 
Closes #192
 2015-08-25 21:10:49 +01:00
Estevão Soares dos Santos
3df706248f fix(blockGamut): fix for headings inside blockquotes 
The spec states that you can be lazy and only put the `>` before the first line of a hard-wrapped paragraph.
It also states that blocquotes can contain any other md element inside.
This means headings and horizontal rules should be included in the blockquote but, right now, are treated as
independent entities

Closes #191
 2015-08-23 03:11:11 +01:00
Estevão Soares dos Santos
cb0509b4a2 fix test 2015-08-03 03:49:03 +01:00
Estevão Soares dos Santos
2734326e19 feat(eventDispatcher): add an event dispatcher to converter 2015-08-03 03:47:49 +01:00
Estevão Soares dos Santos
7720c88bfc fix(lists): fix github code blocks not being parsed inside lists 
Fix ghCodeBlocks not being correctly parsed inside lists. Also, as a side
effect, fixes issues with consecutive lists and extra paragraphs being
added into lists.

Closes #142, Closes #183, Closes #184
 2015-08-01 21:05:28 +01:00
Estevão Soares dos Santos
eeccee7038 Merge branch 'develop' 2015-07-22 18:29:00 +01:00
Estevão Soares dos Santos
789dc1806a feat(subParser/tables.js): add support for md span elements in table headers 
+ tests

Closes #179
 2015-07-22 18:21:20 +01:00
Estevão Soares dos Santos
bf8b3649ad test(ghost): ignore footnotes test 
Ignore footnotes tests since we don't have this feature in showdown
 2015-07-14 21:10:00 +01:00
Estevão Soares dos Santos
534c53616a test: add ghost issues tests 2015-07-14 20:53:28 +01:00
Estevão Soares dos Santos
5d0ec964e4 test: add test for autolink literalMidWordUnderscores options used together 2015-07-14 20:52:56 +01:00
Hannah Wolfe
220b85d722 Merge ErinDS broken stuff tests 2015-07-14 18:53:17 +01:00
Estevão Soares dos Santos
7ee2017c56 fix(subParsers/italicsAndBold.js): fix broken em/strong tags when used with literalMidWordUnderscores 
When literalMidWordUnderscoresis set to true, em and strong tags that start or end a paragraph don't get parsed as such.
This fixes this issue.

Closes #174
 2015-07-14 16:51:26 +01:00
Estevão Soares dos Santos
b7f5e32e1a feat(subParsers/githubCodeBlock): add extra language class to conform to html5 spec 2015-07-14 00:41:59 +01:00
Estevão Soares dos Santos
cf2d1151e9 rollback(tests): cannot make cli tests run on travis 
Cli tests are passing on localhost, but fail on travis due to reasons unknown.
Disabling them for now until we figure it out.
 2015-07-13 05:46:06 +01:00
Estevão Soares dos Santos
d8111d1791 test(cli): run cli tests only on node >= 0.12 2015-07-13 05:39:05 +01:00
Estevão Soares dos Santos
1a764b0280 test(cli): fix tests for running in .travis 2015-07-13 05:21:23 +01:00
Estevão Soares dos Santos
d079154260 Merge branch 'feature/cli' into develop 
Conflicts:
	.gitignore
	src/subParsers/headers.js
 2015-07-13 05:16:09 +01:00
Estevão Soares dos Santos
f6a33e402c feat(CLI): add a simple cli tool 2015-07-13 05:09:03 +01:00
Estevão Soares dos Santos
be72b4879f fix(headerLevelStart): fix for NaN error when specifying a non number as headerLevelStart param 2015-07-13 01:35:36 +01:00
Estevão Soares dos Santos
7e55bceb0e feat(flavours): add markdown presets/flavors 
This feature enables users to select a preset/flavor.
A flavor is just a preset of options, a shortcut so users don't have to set each option one by one.

Closes #164
 2015-07-12 02:15:35 +01:00
Estevão Soares dos Santos
20ca099f56 chore: add class to tasklist items 2015-07-11 23:09:47 +01:00
Estevão Soares dos Santos
dc72403acc feat(tasklists): add support for GFM tasklists 
Github Flavored Markdown supports tasklist by `[x]` or `[ ]` after list item marker.
This commit adds this feature to showdown through an option called "tasklists".

Related to #164
 2015-07-11 23:02:02 +01:00
Estevão Soares dos Santos
c33f98884b feat(ghCodeBlocks): add option to disable GH codeblocks 
GFM support fenced codeblocks. Showdown, since very early, adopted this too.
It is now possible to disable GFM codeblocks with the option "ghCodeBlocks" set to false.
It is enabled by default
 2015-07-11 20:33:11 +01:00
Estevão Soares dos Santos
5ec75c459b fix(subparsers/tables.js): fix parser order so that tables include all spanGamut elements 2015-07-11 19:50:26 +01:00
Estevão Soares dos Santos
09a6578604 chore(grunt): make Grunt use a temporary build to avoid pollution of dist directory 2015-07-11 19:32:22 +01:00
Estevão Soares dos Santos
1c8c928d0a feat(subParsers/table): support for table alignment 
Credits to [torcellite (Karthik Balakrishnan)](https://github.com/torcellite)
 2015-07-11 18:21:43 +01:00
Estevão Soares dos Santos
3a924e3c7e feat(tables): add support for GFM tables 
Github Flavored Markdown supports a specific table syntax. Table support was already available as an extension.
With this commit, the feature was moved to core, adding this feature to showdown through an option called "tables".

Related to #164
 2015-07-11 16:44:24 +01:00
Estevão Soares dos Santos
43e9448d6e feat(strikethrough): add support for GFM strikethrough 
Github Flavored Markdown supports strikethrough (`<del>`) syntax using double tilde `~~` delimiters.
This commit adds this feature to showdown through an option called "strikethrough".

Related to #164
 2015-07-11 15:59:06 +01:00
Estevão Soares dos Santos
0c0cd7db99 feat(literalMidWordUnderscores): add support for GFM literal midword underscores 
Github Flavored Markdown does not parse underscores in the middle of a word as emphasis/bold.
This commit adds this feature to showdown through an option called "literalMidWordUnderscores".

Related to #164
 2015-07-11 15:45:58 +01:00
Estevão Soares dos Santos
cff0237299 feat(simplifiedAutoLink): add support for GFM autolinks 
Github Flavored Markdown detects urls and mails embeded in the text without any extra markup or delimiter.
This commit adds this feature to showdown through an option called "simplifiedAutoLink".
Related to #164
 2015-07-11 02:42:53 +01:00
Estevão Soares dos Santos
b84ac67dac feat(headerLevelStart): add support for setting the header starting level 
Closes #69
 2015-06-17 02:19:44 +01:00
Estevão Soares dos Santos
b49d93480b tests: test case for issue #96 2015-06-17 01:45:33 +01:00
Estevão Soares dos Santos
1d149c8806 chore: fix jshint 2015-06-17 01:26:50 +01:00
Estevão Soares dos Santos
af82c2b616 feat(image dimensions): add support for setting image dimensions within markdown syntax 
This feature allows users to define the image dimensions using markdown syntax:
```
![my image](img.jpg =100x80 "image title")
```
To enable this feature, use the option `parseImgDimensions`.

Closes #143
 2015-06-17 01:22:05 +01:00
Estevão Soares dos Santos
c17842f7b6 tests(showdown.getDefaultOptions()): add tests for showdow.getDefaultOptions() 2015-06-15 14:56:30 +01:00
Estevao Soares dos Santos
0bdd02b2cc fix(subParsers/lists.js): partial fix for odd behavior on multiple consecutive lists 
Consecutive lists we're previously being condensed into one unique list, with odd paragraph output.
This fix correctly splits lists, but does not change the weird paragraph output

closes #142
 2015-06-13 14:59:14 +01:00
Estevao Soares dos Santos
00db9d1c09 Merge branch 'develop' into hotfix/issue_142 2015-06-11 01:33:55 +01:00
Estevao Soares dos Santos
42240ba82c test: add karlcow's testsuite 
Also refactor tests to improve maintainability
 2015-06-11 01:29:42 +01:00
Estevao Soares dos Santos
307d135e0a tests(images): fix standard testsuite images test 2015-06-08 03:59:40 +01:00
Estevao Soares dos Santos
6cbc585fc0 tests(issue_142): add tests for issue #142 2015-06-08 02:40:33 +01:00
Estevao Soares dos Santos
dcbdc61e9d fix(output modifiers): fix for output modifiers running twice 
Output modifiers were being ran twice. This commit fixes that
 2015-06-07 19:17:02 +01:00
Estevao Soares dos Santos
4ebd0caa27 feature(extensionLoading): add support to legacy extensions in the new extension mechanism 
Old extensions that register themselves in `showdown.extensions` can be loaded and validated using the new extension loading mechanism.
However, a warn is issued, alerting users and developers that the extension should be updated to use the new mechanism

BREAKING CHANGE: Deprecates `showdown.extensions` property. To migrate, you should use the new method `showdown.extension(<ext name>, <extension>)` to register the extension.
 2015-06-07 19:02:45 +01:00
Stefano Brilli
da598d64e4 Add test to reproduce the bug 2015-06-07 13:15:18 +02:00
Estevão Soares dos Santos
33f64f60c9 feature(extensionLoading): refactor extension loading mechanism 2015-05-31 20:56:28 +01:00
Estevão Soares dos Santos
c6b60f12fa test(converter.makeHtml): refactor test to improve readability 2015-05-31 18:47:09 +01:00
Estevão Soares dos Santos
e3a4541ab3 Revert "fix(suparsbers/lists.js): fix odd behavior for multiple consecutive lists" 
This reverts commit 11f32e04a6.
 2015-05-30 00:10:21 +01:00
Estevão Soares dos Santos
11f32e04a6 fix(suparsbers/lists.js): fix odd behavior for multiple consecutive lists 2015-05-30 00:09:30 +01:00
Estevão Soares dos Santos
2a4a2bdf21 test(option.prefixHeaderId): add tests for prefixHeaderId option 2015-05-27 01:48:49 +01:00
Estevão Soares dos Santos
51167c810d style(tests): remove unecessary comment in testMakeHtml 2015-05-27 01:39:29 +01:00
Estevão Soares dos Santos
141e3f5f44 test(options.omitExtraWLInCodeBlocks): add test for options.omitExtraWLInCodeBlocks 2015-05-26 19:58:05 +01:00
Estevão Soares dos Santos
5efb5517a9 test(issues): add testcase for PR #83 2015-05-23 02:02:03 +01:00
Estevão Soares dos Santos
509a1d37b4 chore(tests) fix test that didn't merge correctly 2015-05-14 03:04:52 +01:00
Estevão Soares dos Santos
612c8ce661 Merge branch 'showdown2' 2015-05-14 03:01:03 +01:00
Estevão Soares dos Santos
c212dda65d Cleaning master for merging with branch showdown2 2015-05-14 02:50:17 +01:00
Estevão Soares dos Santos
7c7f49e8de Merge branch 'develop' 2015-05-13 22:38:32 +01:00
Estevão Soares dos Santos
b80bdce8cf chore(): add test for issue #150 2015-04-27 17:51:32 +01:00
Estevão Soares dos Santos
f8c4c983ea chore(run.js): add issue testing 2015-04-27 17:50:48 +01:00
Estevão Soares dos Santos
fb3e0ba3bc fix(subParsers/hashHTMLBlocks.js): fix rendering problems with html5 block elements. 
Some HTML5 block elements were not being properly ignored. This caused problems in rendering markdown as showdown would add additional <br /> to some block elements.
This commit should fix this issue.

Closes #90, closes #140, closes #147
 2015-04-23 21:51:32 +01:00
Estevão Soares dos Santos
fd9bb36583 Merge pull request #147 from ErisDS/block-elements 
Add missing block elements. Fixes #90
 2015-04-22 22:31:11 +01:00
Estevão Soares dos Santos
c06d500a90 Revert "Add missing block elements" 2015-04-22 22:26:05 +01:00
Estevão Soares dos Santos
a01d81bdbd Merge pull request #140 from ErisDS/block-elements 
Add missing block elements. fixes #90
 2015-04-22 22:25:55 +01:00
Estevão Soares dos Santos
fa5f06bfd8 fix(showdown.js): should fix issue #133 2015-04-22 15:21:15 +01:00
Hannah Wolfe
36daa99339 Add missing block elements 
fixes #90
 2015-03-16 16:27:16 +00:00
Estevão Soares dos Santos
0da9626408 chore(): code fix to pass jscs linter 2015-01-19 14:57:43 +00:00
Estevão Soares dos Santos
79829dbbf1 chore(): code style fix and tests fix due to code style changes 2015-01-19 12:04:22 +00:00
Estevão Soares dos Santos
8b000b134a chore(all): code style change 2015-01-19 11:37:21 +00:00
Estevão Soares dos Santos
c367a4b9a1 feat(uniqueHeaderId): add unique id prefix and suffix to headers 
If two headers have similar texts, the generated id could be equal. In order to prevent id clash:
  - A unique suffix is added if a header id already exists
  - Option to add a prefix to header id
  - Update of correspondent tests
  - (credits to nicovalencia)

Closes #81, closes #82
 2015-01-18 02:12:32 +00:00
Estevão Soares dos Santos
d4f619c666 Test(emphasis): prove that emphasis mechanism is working correctly 
This test scenario is related to issue #107
 2015-01-16 23:05:12 +00:00
Estevão Soares dos Santos
f938d2b8aa test(emphasis): add more test scenarios to emphasis 2015-01-16 23:03:38 +00:00
Estevão Soares dos Santos
3bbe4e2ef1 test(emphasis): change test to match original spec test 2015-01-16 22:17:25 +00:00
Estevão Soares dos Santos
bf094ba446 test(): browser and node tests now live in different directories 
This enables one to run the appropriate tests according to evironment
 2015-01-16 21:48:28 +00:00
Estevão Soares dos Santos
eae5f0e01f Major code refactoring 2015-01-15 21:21:33 +00:00
Alessandro Vermeulen
3dbc6ffcfb Added fix to prevent table rendering to be broken by alignment character ":". 2015-01-09 21:32:05 +01:00
vincent
476d18f47f Fix multi-table issue (buffer not flushed) 2014-11-11 20:17:35 +01:00
vincent
5eb7e618e9 add multiple markdown tables test 2014-11-11 16:48:01 +01:00
vincent
4909f81cf9 Furigana extension 2014-11-05 00:18:15 +01:00
Pascal Deschenes
b143ea30e8 fix test cases following table extension re-entrant support 2012-11-01 18:33:48 -04:00
Pascal Deschenes
dc28410a3b Merge branch 'master' into feature-table-extension 
Conflicts:
	README.md
	src/showdown.js
 2012-11-01 14:21:39 -04:00
Pascal Deschenes
ff9007606b fix typo 2012-11-01 14:09:12 -04:00
Pascal Deschenes
ddec23684f fix prettify naming (client side error) 2012-11-01 14:07:53 -04:00
Corey Innis
7c28d3752c [#36] iterate with Showdown.forEach 
* browser support: [].forEach is not always available.
* also using Showdown.forEach in the test suite, to set the pattern.
 2012-11-01 00:50:03 -07:00
Corey Innis
d6d7f807ea [#14] add initial github-flavored extension 
simply handles strike-through for now.
 2012-10-31 03:38:46 -07:00
Corey Innis
60c6eec3eb [#14] speling fix 2012-10-31 02:38:06 -07:00
Corey Innis
374669bb49 post-merge (unwiredben) update html5 structural tests 
to be sure the previous test incarnations continued to work.
 2012-10-31 00:32:30 -07:00
Corey Innis
9075cdc080 Merge remote-tracking branch 'unwiredben/master' 2012-10-31 00:30:23 -07:00
Corey Innis
fb4fed1db2 Merge remote-tracking branch 'tstone/upstream' 2012-10-31 00:19:12 -07:00
Pascal Deschenes
b9f38acb18 table extension new test cases: 
+ larger table
+ equals as header separators
 2012-10-30 17:05:09 -04:00
Pascal Deschenes
aa76deec74 add basic table support 2012-10-30 14:39:34 -04:00
unwiredben
9b297fa877 Remove unnecessary "match anything" test that caused excessive run time on some mixed content 
Update HTML5 structural tags test to also verify correctness this regexp and the previous one.

Signed-off-by: unwiredben <combee@techwood.org>
 2012-09-08 14:17:52 -05:00
Titus
90e51e95cc Added test for #25. Looks to be working. 2012-08-11 07:02:41 -06:00
Titus
0e4c052373 Merge branch 'master' into syntax-extensions 2012-08-09 20:19:17 -06:00
Titus
541b3eccb1 Fixed #26 -- Urls which contained matched parenthesis are now supported 2012-08-09 20:13:59 -06:00
Titus
e6526026ec Fixed #26 -- Urls which contained matched parenthesis are now supported 2012-08-09 20:06:58 -06:00
Titus
05453b5042 A string name (only) can now be given for bundled extensions 2012-06-20 21:17:58 -06:00
Titus
0218913efa Standardized naming for bundled extensions 2012-06-20 21:11:43 -06:00
Titus
e924b04aa2 Extensions within /src are now automatically loaded to the Showdown namespace when server-side 2012-06-20 20:59:50 -06:00
Titus
10f9c153a3 Added Google Prettify extension (output modification extension test) 2012-06-20 17:16:40 -06:00
Titus
9d0a929fac Modified test runner to support extension tests as well 2012-06-20 17:03:36 -06:00
Titus
5e477063df Updated test runner to correct require syntax 2012-06-15 12:46:38 -06:00
Titus
bab6b888ef Added support for new HTML5 structural tags to "pass through" without being wrapped in a <p> 2012-06-14 00:52:20 -06:00
Titus
c2e28da129 Added test case for #10 -- Seems to be working correctly 2012-06-14 00:44:58 -06:00
Titus
3e00e5a2d1 Fixed #11 -- <style> tags are now not wrapped in <p>'s + test case for this 2012-06-14 00:42:15 -06:00
Titus
a3a07eaac6 Updated nested blockquote test case to proper markdown syntax 2012-06-14 00:35:47 -06:00
Titus
f3f928084e Fixed #21 -- Github codeblocks can now contain back ticks 2012-06-14 00:09:58 -06:00
Titus
fa38885994 Added test case for github codeblock at start of string 2012-06-14 00:08:49 -06:00
Titus
b48c06fe72 Fixed mistake in github codeblock test 2012-06-13 23:43:46 -06:00
tstone
902c5891f6 Removed debug code that was accidentally committed 2012-06-13 23:24:53 -06:00
tstone
d16e675ae8 Added testing suite 2012-06-13 23:05:31 -06:00