diff --git a/README.md b/README.md index 8e7c1db..1ee2eb2 100644 --- a/README.md +++ b/README.md @@ -229,14 +229,6 @@ var defaultOptions = showdown.getDefaultOptions(); * **rawHeaderId**: (boolean) [default false] Remove only spaces, ' and " from generated header ids (including prefixes), replacing them with dashes (-). WARNING: This might result in malformed ids **(since v1.7.3)** - * **parseImgDimensions**: (boolean) [default false] Enable support for setting image dimensions from within markdown syntax. - Examples: - ``` - ![foo](foo.jpg =100x80) simple, assumes units are in px - ![bar](bar.jpg =100x*) sets the height to "auto" - ![baz](baz.jpg =80%x5em) Image with width of 80% and height of 5em - ``` - * **headerLevelStart**: (integer) [default 1] Set the header starting level. For instance, setting this to 3 means that ```md @@ -248,6 +240,14 @@ var defaultOptions = showdown.getDefaultOptions();
some text with__underscores__in middle
``` - * **literalMidWordAsterisks**: (boolean) [default false] Turning this on will stop showdown from interpreting asterisks - in the middle of words as `` and `` and instead treat them as literal asterisks. - - Example: - - ```md - some text with**underscores**in middle - ``` - will be parsed as - ```html -some text with**underscores**in middle
- ``` + * ~~**literalMidWordAsterisks**: (boolean) [default false] Turning this on will stop showdown from interpreting asterisks + in the middle of words as `` and `` and instead treat them as literal asterisks.~~ * **strikethrough**: (boolean) [default false] Enable support for strikethrough syntax. `~~strikethrough~~` as ``*
+
+## NEW Features
+
+### Event system
+- [X] Listener system revamp
+- [ ] Standardize events for all event types
+- [ ] Unit testing
+- [ ] Functional testing
+
+This should address:
+- **#567**: Allow not making header ids lowercase
+- **#540**: Add complete class to the tasklist list element
+
+### MD to HTML conversion
+- [X] Basic support
+- [X] Basic functional testcase
+- [ ] Advanced support for all showdown MD features
+- [ ] Advanced functional testcase
+- [ ] Unit testing
+
+## Documentation (for v2.0)
+- [ ] Options
+- [ ] Extensions (and the new event system)
+- [ ] Cookbook (with stuff for backwards compatibility, specially regarding removed options)
diff --git a/test/functional/makehtml/cases/features/simplifiedAutoLink/complete-test-case.html b/test/functional/makehtml/cases/features/simplifiedAutoLink/complete-test-case.html
new file mode 100644
index 0000000..4d068ff
--- /dev/null
+++ b/test/functional/makehtml/cases/features/simplifiedAutoLink/complete-test-case.html
@@ -0,0 +1,79 @@
+
+
+
+http://foo.com/blah_blah_(wikipedia)
+http://foo.com/blah_blah_(wikipedia)_(again)
+http://www.example.com/wpstyle/?p=364
+https://www.example.com/foo/?bar=baz&inga=42&quux
+
+http://userid:password@example.com:8080
+http://userid:password@example.com:8080/
+
+
+http://userid@example.com:8080
+http://userid@example.com:8080/
+http://userid:password@example.com
+http://userid:password@example.com/
+
+
+
+
+
+http://foo.com/blah_(wikipedia)#cite-1
+http://foo.com/blah_(wikipedia)_blah#cite-1
+http://foo.com/unicode_(✪)_in_parens
+http://foo.com/(something)?after=parens
+
+http://code.google.com/events/#&product=browser
+
+
+http://foo.bar/?q=Test%20URL-encoded%20stuff
+
+
+
+
+
+
+
+
+
+
+
+http://foo.bar/foo(bar)baz quux
+http://foo.bar?q=Spaces should be encoded
+
+
+
+
+
+
+
+
+
+
+http://
+http://.
+http://..
+http://../
+http://?
+http://??
+http://??/
+http://#
+http://##
+http://##/
+//
+//a
+///a
+///
+http:///a
+foo.com
+rdar://1234
+h://test
+http:// shouldfail.com
+:// should fail
+http://-error-.invalid/
+http://-a.b.co
+http://a.b-.co
+http://3628126748
+http://.www.foo.bar/
+http://.www.foo.bar./
diff --git a/test/functional/makehtml/cases/features/simplifiedAutoLink/complete-test-case.md b/test/functional/makehtml/cases/features/simplifiedAutoLink/complete-test-case.md
new file mode 100644
index 0000000..5a8232b
--- /dev/null
+++ b/test/functional/makehtml/cases/features/simplifiedAutoLink/complete-test-case.md
@@ -0,0 +1,158 @@
+
+
+http://foo.com/blah_blah
+
+http://foo.com/blah_blah/
+
+http://foo.com/blah_blah_(wikipedia)
+
+http://foo.com/blah_blah_(wikipedia)_(again)
+
+http://www.example.com/wpstyle/?p=364
+
+https://www.example.com/foo/?bar=baz&inga=42&quux
+
+http://✪df.ws/123
+
+http://userid:password@example.com:8080
+
+http://userid:password@example.com:8080/
+
+http://userid@example.com
+
+http://userid@example.com/
+
+http://userid@example.com:8080
+
+http://userid@example.com:8080/
+
+http://userid:password@example.com
+
+http://userid:password@example.com/
+
+http://142.42.1.1/
+
+http://142.42.1.1:8080/
+
+http://➡.ws/䨹
+
+http://⌘.ws
+
+http://⌘.ws/
+
+http://foo.com/blah_(wikipedia)#cite-1
+
+http://foo.com/blah_(wikipedia)_blah#cite-1
+
+http://foo.com/unicode_(✪)_in_parens
+
+http://foo.com/(something)?after=parens
+
+http://☺.damowmow.com/
+
+http://code.google.com/events/#&product=browser
+
+http://j.mp
+
+ftp://foo.bar/baz
+
+http://foo.bar/?q=Test%20URL-encoded%20stuff
+
+http://مثال.إختبار
+
+http://例子.测试
+
+http://उदाहरण.परीक्षा
+
+http://1337.net
+
+http://a.b-c.de
+
+http://223.255.255.254
+
+https://foo_bar.example.com/
+
+
+
+
+http://www.foo.bar./
+
+http://a.b--c.de/
+
+
+
+http://foo.bar/foo(bar)baz quux
+
+http://foo.bar?q=Spaces should be encoded
+
+
+http://10.1.1.1
+
+http://10.1.1.254
+
+http://0.0.0.0
+
+http://10.1.1.0
+
+http://10.1.1.255
+
+http://224.1.1.1
+
+http://1.1.1.1.1
+
+http://123.123.123
+
+
+
+
+http://
+
+http://.
+
+http://..
+
+http://../
+
+http://?
+
+http://??
+
+http://??/
+
+http://#
+
+http://##
+
+http://##/
+
+//
+
+//a
+
+///a
+
+///
+
+http:///a
+
+foo.com
+
+rdar://1234
+
+h://test
+
+http:// shouldfail.com
+
+:// should fail
+
+http://-error-.invalid/
+
+http://-a.b.co
+
+http://a.b-.co
+
+http://3628126748
+
+http://.www.foo.bar/
+
+http://.www.foo.bar./