-
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19 from neocotic/wip-2.1.0
2.1.0 WIP
- Loading branch information
Showing
29 changed files
with
1,804 additions
and
1,038 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,7 @@ | ||
node_modules/ | ||
npm-debug.log | ||
|
||
test/output/ | ||
|
||
.DS_Store? | ||
ehthumbs.db | ||
Icon? | ||
Thumbs.db | ||
Thumbs.db |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
language: node_js | ||
node_js: | ||
- 0.8 | ||
- 0.6 | ||
before_script: | ||
- npm install -g grunt-cli |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Authors ordered by first contribution | ||
|
||
* Trevor Jim <trever@research.att.com> | ||
* Alasdair Mercer <mercer.alasdair@gmail.com> | ||
* Alasdair Mercer <mercer.alasdair@gmail.com> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,19 +1,43 @@ | ||
# Change Log | ||
2013.05.03, Version 2.1.0 | ||
|
||
## 2013.02.04, Version 2.0.2 | ||
* [#18](https://github.com/neocotic/html.md/issues/18): Add support for [bower][] installations | ||
* [#20](https://github.com/neocotic/html.md/issues/20): Replace `Cakefile` with new [grunt][] build process | ||
* [#20](https://github.com/neocotic/html.md/issues/20): Replace [tap][] test framework with [nodeunit][] | ||
* [#21](https://github.com/neocotic/html.md/issues/21): Removed [CoffeeScript][] as a runtime dependency | ||
* [#21](https://github.com/neocotic/html.md/issues/21): Update [jsdom][] to v0.6.0 to fix known bugs | ||
* [#21](https://github.com/neocotic/html.md/issues/21): Improve compatibility with the Windows platform | ||
* [#21](https://github.com/neocotic/html.md/issues/21): Improve code and documentation quality and standards | ||
* [#21](https://github.com/neocotic/html.md/issues/21): Fix `absolute` option to also apply to `img` elements | ||
* [#21](https://github.com/neocotic/html.md/issues/21): Improve compatibility with older browsers | ||
* [#22](https://github.com/neocotic/html.md/issues/22): Improve handling of ordered and unodered lists | ||
* [#22](https://github.com/neocotic/html.md/issues/22): Support nested lists | ||
* [#23](https://github.com/neocotic/html.md/issues/23): Add option to support inline link style | ||
* Replace [optparse][] with [commander][] | ||
* Lots of bug fixes and optimizations | ||
|
||
2013.02.04, Version 2.0.2 | ||
|
||
* [#13](https://github.com/neocotic/html.md/issues/13): Add new man page | ||
* [#14](https://github.com/neocotic/html.md/issues/14): Fix bug with `eval` option | ||
|
||
## 2012.12.12, Version 2.0.1 | ||
2012.12.12, Version 2.0.1 | ||
|
||
* [#8](https://github.com/neocotic/html.md/issues/8): Fix incorrect version | ||
|
||
## 2012.12.11, Version 2.0.0 | ||
2012.12.11, Version 2.0.0 | ||
|
||
* [#1](https://github.com/neocotic/html.md/issues/1): Check inline style attribute to see if elements are hidden | ||
* [#2](https://github.com/neocotic/html.md/issues/2): Add command line interface | ||
* [#3](https://github.com/neocotic/html.md/issues/3): Create unit test suite | ||
* [#4](https://github.com/neocotic/html.md/issues/4): Rewrite code in CoffeeScript | ||
* [#5](https://github.com/neocotic/html.md/issues/5): Add compatibility support for node.js | ||
* [#6](https://github.com/neocotic/html.md/issues/6): Add build process | ||
* [#6](https://github.com/neocotic/html.md/issues/6): Add build process | ||
|
||
[bower]: http://twitter.github.io/bower/ | ||
[coffeescript]: http://coffeescript.org | ||
[commander]: http://visionmedia.github.io/commander.js/ | ||
[grunt]: http://gruntjs.com | ||
[jsdom]: https://github.com/tmpvar/jsdom | ||
[nodeunit]: https://github.com/caolan/nodeunit | ||
[optparse]: https://github.com/jfd/optparse-js | ||
[tap]: https://github.com/isaacs/node-tap |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
module.exports = (grunt) -> | ||
|
||
# Configure | ||
# --------- | ||
|
||
grunt.initConfig | ||
|
||
pkg: grunt.file.readJSON 'package.json' | ||
|
||
clean: | ||
docs: ['docs/*'] | ||
lib: ['lib/*'] | ||
dist: ['dist/*'] | ||
|
||
coffee: | ||
all: | ||
expand: yes | ||
cwd: 'src' | ||
src: '**/*.coffee' | ||
dest: 'lib' | ||
ext: '.js' | ||
|
||
docco: | ||
all: | ||
options: output: 'docs' | ||
src: ['src/**/*.coffee'] | ||
|
||
nodeunit: | ||
all: ['test/**/*_test.coffee'] | ||
|
||
uglify: | ||
all: | ||
files: 'dist/md.min.js': ['lib/md.js'] | ||
options: | ||
banner: """ | ||
/*! <%= pkg.name %> v<%= pkg.version %> | (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %> | <%= pkg.licenses[0].type %> License | ||
Make.text v1.5 | (c) 2007 Trevor Jim | ||
*/ | ||
""" | ||
|
||
# Tasks | ||
# ----- | ||
|
||
for dependency of grunt.config.data.pkg.devDependencies when ~dependency.indexOf 'grunt-' | ||
grunt.loadNpmTasks dependency | ||
|
||
grunt.registerTask 'build', ['clean', 'coffee', 'docco', 'uglify'] | ||
grunt.registerTask 'default', ['build', 'test'] | ||
grunt.registerTask 'test', ['nodeunit'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,21 @@ | ||
# Build Requirements | ||
In order to build [html.md][], you need to have the following install [git][] 1.7+ and the latest version of [node.js][] 0.6+ (which includes [npm][]). | ||
In order to build [html.md][], you need to have the following install [git][] 1.7+ and [node.js][] | ||
0.6+ (which includes [npm][]). | ||
|
||
# Building | ||
Follow these steps to build [html.md][]; | ||
|
||
1. Clone a copy of the main [html.md git repository](https://github.com/neocotic/html.md) by running `git clone git://github.com/neocotic/html.md.git` | ||
1. Clone a copy of the main [html.md git repository](https://github.com/neocotic/html.md) by | ||
running `git clone git://github.com/neocotic/html.md.git` | ||
2. `cd` to the repository directory | ||
3. Ensure you have all of the dependencies by entering `npm install` | ||
4. For the compiled JavaScript `cd` to the repository directory and enter `cake build` | ||
4. For the compiled JavaScript `cd` run `grunt build` | ||
* Outputs `md.js` to the `lib` directory | ||
* Outputs `md.min.js` (optimised version) to the `dist` directory | ||
5. To run the full test suite enter `cake test` | ||
6. To update the documentation enter `cake docs` | ||
* Outputs `md.min.js` (compressed version) to the `dist` directory | ||
* Outputs documentation to the `docs` directory | ||
* Not currently working on Windows as it uses linux shell commands | ||
5. To run the full test suite enter `grunt test` | ||
|
||
[git]: http://git-scm.com | ||
[node.js]: http://nodejs.org | ||
[npm]: http://npmjs.org | ||
[html.md]: http://neocotic.com/html.md | ||
[html.md]: http://neocotic.com/html.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.