[Pkg-javascript-commits] [node-jade] 02/10: Merge tag 'upstream/1.11.0'

[Jelmer Vernooij]

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

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

commit 768f4009b323fd70a04e624dc307f3e712633804
Merge: e129d63 f95cc52
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Sun Jul 3 16:36:31 2016 +0000

    Merge tag 'upstream/1.11.0'
    
    Upstream version 1.11.0

 .gitignore                                      |  12 +
 .gitmodules                                     |  21 --
 .travis.yml                                     |  16 +
 History.md                                      |  81 +++++
 README.md                                       |  22 +-
 Readme_zh-cn.md                                 |   2 +-
 bin/jade.js                                     | 201 ++++++++----
 block-code.html                                 |   0
 component.json                                  |   2 +-
 docs/server.js                                  |   1 -
 docs/stop.js                                    |   4 +-
 docs/style/bg.jpg                               | Bin 0 -> 5349 bytes
 docs/style/bg at 2X.jpg                            | Bin 0 -> 27855 bytes
 docs/style/index.less                           |  17 +-
 docs/style/jade-logo-header.svg                 | 108 ++++++
 docs/style/jade-logo.svg                        |   1 +
 docs/style/logo.png                             | Bin 6431 -> 0 bytes
 docs/versions.json                              |  11 +-
 docs/views/api.jade                             | 120 ++++++-
 docs/views/command-line.jade                    |  25 +-
 docs/views/layout.jade                          |  15 +-
 docs/views/reference.jade                       |   3 +-
 docs/views/reference/attributes.jade            |  43 ++-
 docs/views/reference/code.jade                  |  71 ++--
 docs/views/reference/comments.jade              |   2 +-
 docs/views/reference/doctype.jade               |   2 +-
 docs/views/reference/filters.jade               |   2 +-
 docs/views/reference/inheritance.jade           |  12 +-
 docs/views/reference/interpolation.jade         | 124 +++++++
 examples/attributes.js                          |   2 +-
 examples/client-compilation.jade                | 145 ++++++++
 examples/client-compilation.js                  |  22 ++
 examples/code.jade                              |   5 +
 examples/code.js                                |   2 +-
 examples/csrf.jade                              |   5 -
 examples/csrf.js                                |  42 ---
 examples/dynamicscript.js                       |  20 +-
 examples/each.js                                |   2 +-
 examples/extend.js                              |   2 +-
 examples/includes.js                            |   2 +-
 examples/layout-debug.js                        |   4 +-
 examples/layout.js                              |   2 +-
 examples/mixins.jade                            |  10 +-
 examples/mixins.js                              |   2 +-
 examples/rss.js                                 |   2 +-
 examples/text.js                                |   2 +-
 examples/whitespace.js                          |   2 +-
 index.js                                        |   2 -
 lib/compiler.js                                 |  33 +-
 lib/filters.js                                  |  88 ++++-
 lib/index.js                                    | 419 +++++++++++++++++++++++-
 lib/jade.js                                     | 371 ---------------------
 lib/lexer.js                                    |  60 ++--
 lib/parser.js                                   |  30 +-
 lib/runtime.js                                  |  57 +++-
 package.json                                    |  94 +++---
 release.js                                      |  89 +----
 test/anti-cases/mixin-args-syntax-error.jade    |   2 +
 test/anti-cases/unclosed-interpolated-call.jade |   1 +
 test/anti-cases/unclosed-interpolated-tag.jade  |   4 +
 test/anti-cases/unclosed-interpolation.jade     |   1 +
 test/cases/auxiliary/1794-extends.jade          |   1 +
 test/cases/auxiliary/1794-include.jade          |   4 +
 test/cases/block-code.html                      |   7 +
 test/cases/block-code.jade                      |  12 +
 test/cases/blocks-in-if.jade                    |   2 +-
 test/cases/classes.html                         |   2 +-
 test/cases/classes.jade                         |   6 +-
 test/cases/comments-in-case.html                |   6 +
 test/cases/comments-in-case.jade                |  10 +
 test/cases/filters.coffeescript.html            |   3 +-
 test/cases/filters.coffeescript.jade            |   4 +-
 test/cases/filters.markdown.jade                |   2 +-
 test/cases/include-filter-stylus.jade           |   2 +-
 test/cases/include-filter.jade                  |   6 +-
 test/cases/includes.html                        |   6 +-
 test/cases/includes.jade                        |   2 +-
 test/cases/mixin-via-include.jade               |   2 +-
 test/cases/regression.1794.html                 |   1 +
 test/cases/regression.1794.jade                 |   4 +
 test/cases/styles.html                          |  13 +-
 test/cases/styles.jade                          |  15 +-
 test/cases/text.html                            |   2 +
 test/cases/text.jade                            |   4 +
 test/command-line.js                            | 331 ++++++++++++++++++-
 test/deprecated.js                              |   7 +
 test/error.reporting.js                         |   6 +-
 test/examples.js                                |  29 +-
 test/jade.test.js                               | 138 +++++++-
 test/run.js                                     |  15 +-
 test/unit.js                                    |  12 +-
 91 files changed, 2240 insertions(+), 856 deletions(-)

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