[Pkg-javascript-commits] [node-jade] 02/04: Merge tag 'upstream/1.5.0+dfsg'

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch master
in repository node-jade.

commit 57ce3399f1035f152da92f6e424eb3ab7c4f8a62
Merge: 8920807 e8070eb
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Aug 5 02:19:44 2014 +0200

    Merge tag 'upstream/1.5.0+dfsg'
    
    Upstream version 1.5.0+dfsg

 .gitignore                                        |  12 ++
 .npmignore                                        |   1 +
 History.md                                        |  30 +++-
 README.md                                         |   9 +-
 Readme_zh-cn.md                                   |   2 +-
 bin/jade.js                                       |  33 ++++-
 component.json                                    |   2 +-
 docs/client/index.js                              | 108 ++++++++++++++
 docs/server.js                                    | 115 +++++++++++++++
 docs/stop.js                                      |  34 +++++
 docs/style/footer.less                            |  32 +++++
 docs/style/highlighting.less                      |  37 +++++
 docs/style/index.less                             |  47 ++++++
 docs/style/logo.png                               | Bin 0 -> 6431 bytes
 docs/style/parameter-lists.less                   |  58 ++++++++
 docs/versions.json                                |   7 +
 docs/views/api.jade                               | 165 ++++++++++++++++++++++
 docs/views/command-line.jade                      |  53 +++++++
 docs/views/history.jade                           |   5 +
 docs/views/home.jade                              |  51 +++++++
 docs/views/includes/ga.jade                       |  10 ++
 docs/views/includes/mixins.jade                   |  12 ++
 docs/views/layout.jade                            |  55 ++++++++
 docs/views/reference.jade                         |  35 +++++
 docs/views/reference/attributes.jade              | 143 +++++++++++++++++++
 docs/views/reference/case.jade                    |  61 ++++++++
 docs/views/reference/code.jade                    |  86 +++++++++++
 docs/views/reference/comments.jade                |  84 +++++++++++
 docs/views/reference/conditionals.jade            |  46 ++++++
 docs/views/reference/doctype.jade                 |  34 +++++
 docs/views/reference/extends.jade                 |  50 +++++++
 docs/views/reference/filters.jade                 |  33 +++++
 docs/views/reference/includes.jade                | 133 +++++++++++++++++
 docs/views/reference/iteration.jade               |  90 ++++++++++++
 docs/views/reference/mixins.jade                  | 117 +++++++++++++++
 docs/views/reference/plain-text.jade              |  60 ++++++++
 docs/views/reference/tags.jade                    |  49 +++++++
 lib/jade.js                                       |  59 ++++++--
 lib/lexer.js                                      |  96 ++++++++++---
 lib/parser.js                                     | 116 ++++++++-------
 lib/runtime.js                                    |   2 +-
 lib/utils.js                                      |  31 ++++
 package.json                                      |  36 ++++-
 release.js                                        |  88 ++++++++++++
 test/cases/auxiliary/blocks-in-blocks-layout.jade |   8 ++
 test/cases/blocks-in-blocks.html                  |   9 ++
 test/cases/blocks-in-blocks.jade                  |   4 +
 test/cases/blocks-in-if.html                      |   1 +
 test/cases/blocks-in-if.jade                      |  19 +++
 test/cases/comments.html                          |   4 +-
 test/cases/include-filter-coffee.coffee           |   2 +
 test/cases/include-filter.html                    |  14 ++
 test/cases/include-filter.jade                    |   4 +
 test/cases/script.whitespace.html                 |   4 +-
 test/command-line.js                              |  43 ++++++
 test/dependencies/dependency1.jade                |   1 +
 test/dependencies/dependency2.jade                |   1 +
 test/dependencies/dependency3.jade                |   1 +
 test/dependencies/extends1.jade                   |   1 +
 test/dependencies/extends2.jade                   |   1 +
 test/dependencies/include1.jade                   |   1 +
 test/dependencies/include2.jade                   |   1 +
 test/deprecated.js                                |  36 +++--
 test/error.reporting.js                           |  14 ++
 test/fixtures/invalid-block-in-extends.jade       |   7 +
 test/fixtures/layout.jade                         |   6 +
 test/jade.test.js                                 | 116 +++++++++++----
 67 files changed, 2482 insertions(+), 143 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-jade.git