Bump version to 0.17.1

This reverts commit ec60d84265.

.github/.codecov.yml

@@ -0,0 +1 @@
+comment: false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug Report
+about: Report a bug.
+title: ""
+labels: bug
+assignees: ''
+
+---
+
+<!--
+Hey there, thanks for creating an issue!
+
+In order to reproduce your issue, we might need to know a little bit more about the environment
+which you're running `bat` on.
+
+If you're on Linux or MacOS:
+  Please run the script at https://github.com/sharkdp/bat/blob/master/diagnostics/info.sh and
+  paste the output at the bottom of the bug report.
+
+If you're on Windows:
+  Please tell us about your Windows Version (e.g. "Windows 10 1908") at the
+  bottom of the bug report.
+-->
+
+**What version of `bat` are you using?**
+[paste the output of `bat --version` here]
+
+**Describe the bug you encountered:**
+...
+
+**What did you expect to happen instead?**
+...
+
+**How did you install `bat`?**
+<!-- apt-get, homebrew, GitHub release, etc. -->
+
+---
+
+[paste the output of `info.sh` here]

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,2 @@
+blank_issues_enabled: true
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature Request
+about: Suggest an idea for this project.
+title: ''
+labels: feature-request
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,10 @@
+---
+name: Question
+about: Ask a question about 'bat'.
+title: ''
+labels: question
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/syntax_request.md

@@ -0,0 +1,29 @@
+---
+name: Syntax Request
+about: Request adding a new syntax to bat.
+title: ""
+labels: syntax-request
+assignees: ''
+
+---
+
+<!--
+BEFORE YOU MAKE A REQUEST:
+
+Are you looking to add a new syntax to use on one of your devices?
+Bat supports locally-installed language definitions. See the link below:
+
+https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions
+
+If you think adding this syntax would help others as well, please make sure that it meets our
+guidelines for adding new syntaxes:
+
+ - 10,000 downloads on packagecontrol.io
+-->
+
+
+**Syntax:**
+[Name or description of the syntax/language here]
+
+**Guideline Criteria:**
+[packagecontro.io link here]

.github/workflows/CICD.yml

@@ -0,0 +1,443 @@
+name: CICD
+
+env:
+  PROJECT_NAME: bat
+  PROJECT_DESC: "A `cat` clone with wings"
+  PROJECT_MAINTAINER: "David Peter <mail@david-peter.de>"
+  PROJECT_HOMEPAGE: "https://github.com/sharkdp/bat"
+  MIN_SUPPORTED_RUST_VERSION: "1.40.0"
+
+on: [push, pull_request]
+
+jobs:
+  min_version:
+    name: Minimum supported rust version
+    runs-on: ubuntu-latest
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v2
+    - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ env.MIN_SUPPORTED_RUST_VERSION }}
+        default: true
+        profile: minimal # minimal component installation (ie, no documentation)
+    - name: Test
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+
+  test_with_new_syntaxes_and_themes:
+    name: Test with new syntaxes and themes
+    runs-on: ubuntu-latest
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: true # we need all syntax and theme submodules
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        default: true
+        profile: minimal
+    - name: Build and install bat
+      uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: --locked --path .
+    - name: Rebuild binary assets (syntaxes and themes)
+      run: bash assets/create.sh
+    - name: Build and install bat with updated assets
+      uses: actions-rs/cargo@v1
+      with:
+        command: install
+        args: --locked --path .
+    - name: Run unit tests with new syntaxes and themes
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --release
+    - name: Run ignored-by-default unit tests with new syntaxes and themes
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --release -- --ignored
+    - name: Syntax highlighting regression test
+      run: tests/syntax-tests/regression_test.sh
+    - name: List of languages
+      run: bat --list-languages
+    - name: List of themes
+      run: bat --list-themes
+
+  build:
+    name: Build
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        job:
+          # { os, target, cargo-options, features, use-cross, toolchain }
+          - { os: ubuntu-latest  , target: arm-unknown-linux-gnueabihf , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: aarch64-unknown-linux-gnu   , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: i686-unknown-linux-gnu      , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: i686-unknown-linux-musl     , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: x86_64-unknown-linux-gnu    , use-cross: use-cross }
+          - { os: ubuntu-18.04   , target: x86_64-unknown-linux-musl   , use-cross: use-cross }
+          - { os: ubuntu-16.04   , target: x86_64-unknown-linux-gnu    , use-cross: use-cross }
+          - { os: macos-latest   , target: x86_64-apple-darwin         }
+          # - { os: windows-latest , target: i686-pc-windows-gnu         }  ## disabled; linker errors (missing '_imp____acrt_iob_func')
+          - { os: windows-latest , target: i686-pc-windows-msvc        }
+          # - { os: windows-latest , target: x86_64-pc-windows-gnu       }  ## disabled; linker errors (missing '_imp____acrt_iob_func')
+          - { os: windows-latest , target: x86_64-pc-windows-msvc      }
+    steps:
+    - name: Git checkout
+      uses: actions/checkout@v2
+    - name: Install prerequisites
+      shell: bash
+      run: |
+        case ${{ matrix.job.target }} in
+          arm-unknown-linux-gnueabihf) sudo apt-get -y update ; sudo apt-get -y install gcc-arm-linux-gnueabihf ;;
+          aarch64-unknown-linux-gnu) sudo apt-get -y update ; sudo apt-get -y install gcc-aarch64-linux-gnu ;;
+        esac
+    - name: Initialize workflow variables
+      id: vars
+      shell: bash
+      run: |
+        # toolchain
+        TOOLCHAIN="stable" ## default to "stable" toolchain
+        # * specify alternate TOOLCHAIN for *-pc-windows-gnu targets; gnu targets on Windows are broken for the standard *-pc-windows-msvc toolchain (refs: <https://github.com/rust-lang/rust/issues/47048>, <https://github.com/rust-lang/rust/issues/53454>, <https://github.com/rust-lang/cargo/issues/6754>)
+        case ${{ matrix.job.target }} in *-pc-windows-gnu) TOOLCHAIN="stable-${{ matrix.job.target }}" ;; esac;
+        # * use requested TOOLCHAIN if specified
+        if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
+        echo set-output name=TOOLCHAIN::${TOOLCHAIN}
+        echo ::set-output name=TOOLCHAIN::${TOOLCHAIN}
+        # staging directory
+        STAGING='_staging'
+        echo set-output name=STAGING::${STAGING}
+        echo ::set-output name=STAGING::${STAGING}
+        # determine EXE suffix
+        EXE_suffix="" ; case ${{ matrix.job.target }} in *-pc-windows-*) EXE_suffix=".exe" ;; esac;
+        echo set-output name=EXE_suffix::${EXE_suffix}
+        echo ::set-output name=EXE_suffix::${EXE_suffix}
+        # parse commit reference info
+        REF_NAME=${GITHUB_REF#refs/*/}
+        unset REF_BRANCH ; case ${GITHUB_REF} in refs/heads/*) REF_BRANCH=${GITHUB_REF#refs/heads/} ;; esac;
+        unset REF_TAG ; case ${GITHUB_REF} in refs/tags/*) REF_TAG=${GITHUB_REF#refs/tags/} ;; esac;
+        REF_SHAS=${GITHUB_SHA:0:8}
+        echo set-output name=REF_NAME::${REF_NAME}
+        echo set-output name=REF_BRANCH::${REF_BRANCH}
+        echo set-output name=REF_TAG::${REF_TAG}
+        echo set-output name=REF_SHAS::${REF_SHAS}
+        echo ::set-output name=REF_NAME::${REF_NAME}
+        echo ::set-output name=REF_BRANCH::${REF_BRANCH}
+        echo ::set-output name=REF_TAG::${REF_TAG}
+        echo ::set-output name=REF_SHAS::${REF_SHAS}
+        # parse target
+        unset TARGET_ARCH ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) TARGET_ARCH=arm ;; i686-*) TARGET_ARCH=i686 ;; x86_64-*) TARGET_ARCH=x86_64 ;; esac;
+        echo set-output name=TARGET_ARCH::${TARGET_ARCH}
+        echo ::set-output name=TARGET_ARCH::${TARGET_ARCH}
+        unset TARGET_OS ; case ${{ matrix.job.target }} in *-linux-*) TARGET_OS=linux ;; *-apple-*) TARGET_OS=macos ;; *-windows-*) TARGET_OS=windows ;; esac;
+        echo set-output name=TARGET_OS::${TARGET_OS}
+        echo ::set-output name=TARGET_OS::${TARGET_OS}
+        # package name
+        PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
+        PKG_BASENAME=${PROJECT_NAME}-${REF_TAG:-$REF_SHAS}-${{ matrix.job.target }}
+        PKG_NAME=${PKG_BASENAME}${PKG_suffix}
+        echo set-output name=PKG_suffix::${PKG_suffix}
+        echo set-output name=PKG_BASENAME::${PKG_BASENAME}
+        echo set-output name=PKG_NAME::${PKG_NAME}
+        echo ::set-output name=PKG_suffix::${PKG_suffix}
+        echo ::set-output name=PKG_BASENAME::${PKG_BASENAME}
+        echo ::set-output name=PKG_NAME::${PKG_NAME}
+        # deployable tag? (ie, leading "vM" or "M"; M == version number)
+        unset DEPLOY ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DEPLOY='true' ; fi
+        echo set-output name=DEPLOY::${DEPLOY:-<empty>/false}
+        echo ::set-output name=DEPLOY::${DEPLOY}
+        # DPKG architecture?
+        unset DPKG_ARCH
+        case ${{ matrix.job.target }} in
+          aarch64-*-linux-*) DPKG_ARCH=arm64 ;;
+          arm-*-linux-*hf) DPKG_ARCH=armhf ;;
+          i686-*-linux-*) DPKG_ARCH=i686 ;;
+          x86_64-*-linux-*) DPKG_ARCH=amd64 ;;
+        esac;
+        echo set-output name=DPKG_ARCH::${DPKG_ARCH}
+        echo ::set-output name=DPKG_ARCH::${DPKG_ARCH}
+        # DPKG version?
+        unset DPKG_VERSION ; if [[ $REF_TAG =~ ^[vV]?[0-9].* ]]; then DPKG_VERSION=${REF_TAG/#[vV]/} ; fi
+        echo set-output name=DPKG_VERSION::${DPKG_VERSION}
+        echo ::set-output name=DPKG_VERSION::${DPKG_VERSION}
+        # DPKG base name/conflicts?
+        DPKG_BASENAME=${PROJECT_NAME}
+        DPKG_CONFLICTS=${PROJECT_NAME}-musl
+        case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${PROJECT_NAME}-musl ; DPKG_CONFLICTS=${PROJECT_NAME} ;; esac;
+        echo set-output name=DPKG_BASENAME::${DPKG_BASENAME}
+        echo set-output name=DPKG_CONFLICTS::${DPKG_CONFLICTS}
+        echo ::set-output name=DPKG_BASENAME::${DPKG_BASENAME}
+        echo ::set-output name=DPKG_CONFLICTS::${DPKG_CONFLICTS}
+        # DPKG name
+        unset DPKG_NAME;
+        if [[ -n $DPKG_ARCH && -n $DPKG_VERSION ]]; then DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb" ; fi
+        echo set-output name=DPKG_NAME::${DPKG_NAME}
+        echo ::set-output name=DPKG_NAME::${DPKG_NAME}
+        # target-specific options
+        # * CARGO_USE_CROSS (truthy)
+        CARGO_USE_CROSS='true' ; case '${{ matrix.job.use-cross }}' in ''|0|f|false|n|no) unset CARGO_USE_CROSS ;; esac;
+        echo set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS:-<empty>/false}
+        echo ::set-output name=CARGO_USE_CROSS::${CARGO_USE_CROSS}
+        # # * `arm` cannot be tested on ubuntu-* hosts (b/c testing is currently primarily done via comparison of target outputs with built-in outputs and the `arm` target is not executable on the host)
+        JOB_DO_TESTING="true"
+        case ${{ matrix.job.target }} in arm-*) unset JOB_DO_TESTING ;; esac;
+        echo set-output name=JOB_DO_TESTING::${JOB_DO_TESTING:-<empty>/false}
+        echo ::set-output name=JOB_DO_TESTING::${JOB_DO_TESTING}
+        # # * test only library unit tests and binary for arm-type targets
+        unset CARGO_TEST_OPTIONS
+        unset CARGO_TEST_OPTIONS ; case ${{ matrix.job.target }} in arm-* | aarch64-*) CARGO_TEST_OPTIONS="--lib --bin ${PROJECT_NAME}" ;; esac;
+        echo set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
+        echo ::set-output name=CARGO_TEST_OPTIONS::${CARGO_TEST_OPTIONS}
+        # * executable for `strip`?
+        STRIP="strip" ; case ${{ matrix.job.target }} in arm-unknown-linux-gnueabihf) STRIP="arm-linux-gnueabihf-strip" ;; aarch64-unknown-linux-gnu) STRIP="aarch64-linux-gnu-strip" ;; *-pc-windows-msvc) STRIP="" ;; esac;
+        echo set-output name=STRIP::${STRIP}
+        echo ::set-output name=STRIP::${STRIP}
+    - name: Create all needed build/work directories
+      shell: bash
+      run: |
+        mkdir -p '${{ steps.vars.outputs.STAGING }}'
+        mkdir -p '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}'
+        mkdir -p '${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/autocomplete'
+        mkdir -p '${{ steps.vars.outputs.STAGING }}/dpkg'
+    - name: Install Rust toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
+        target: ${{ matrix.job.target }}
+        override: true
+        profile: minimal # minimal component installation (ie, no documentation)
+    - name: Info
+      shell: bash
+      run: |
+        gcc --version || true
+        rustup -V
+        rustup toolchain list
+        rustup default
+        cargo -V
+        rustc -V
+    - name: Build
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: build
+        args: --release --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }}
+    - name: Test
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: test
+        args: --target=${{ matrix.job.target }} ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }}
+    - name: bat test run
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: run
+        args: --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} -- --paging=never --color=always --theme=ansi-dark Cargo.toml src/config.rs
+    - name: Check features regex-onig
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: check
+        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig
+    - name: Check features regex-onig,git
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: check
+        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git
+    - name: Check features regex-onig,paging
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: check
+        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,paging
+    - name: Check features regex-onig,git,paging
+      uses: actions-rs/cargo@v1
+      with:
+        use-cross: ${{ steps.vars.outputs.CARGO_USE_CROSS }}
+        command: check
+        args: --target=${{ matrix.job.target }} --verbose --lib --no-default-features --features regex-onig,git,paging
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@master
+      with:
+        name: ${{ env.PROJECT_NAME }}-${{ matrix.job.target }}
+        path: target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}
+    - name: Package
+      shell: bash
+      run: |
+        ARCHIVE_DIR='${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
+        # Binary
+        cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' "$ARCHIVE_DIR"
+
+        # `strip` binary (if needed)
+        if [ -n "${{ steps.vars.outputs.STRIP }}" ]; then "${{ steps.vars.outputs.STRIP }}" "$ARCHIVE_DIR/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}" ; fi
+
+        # Man page
+        cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/manual/bat.1 "$ARCHIVE_DIR"
+
+        # README and LICENSE files
+        cp "README.md" "LICENSE-MIT" "LICENSE-APACHE" "$ARCHIVE_DIR"
+
+        # Autocompletion files
+        cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.fish "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.fish"
+        cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.zsh "$ARCHIVE_DIR/autocomplete/${{ env.PROJECT_NAME }}.zsh"
+
+        # base compressed package
+        pushd '${{ steps.vars.outputs.STAGING }}/' >/dev/null
+        case ${{ matrix.job.target }} in
+          *-pc-windows-*) 7z -y a '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* | tail -2 ;;
+          *) tar czf '${{ steps.vars.outputs.PKG_NAME }}' '${{ steps.vars.outputs.PKG_BASENAME }}'/* ;;
+        esac;
+        popd >/dev/null
+
+        # Debian package
+        if [ -n "${{ steps.vars.outputs.DPKG_NAME }}" ]; then
+          DPKG_DIR="${{ steps.vars.outputs.STAGING }}/dpkg"
+
+          # Binary
+          install -Dm755 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}"
+          if [ -n "${{ steps.vars.outputs.STRIP }}" ]; then "${{ steps.vars.outputs.STRIP }}" "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}" ; fi
+
+          # Man page
+          install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/manual/bat.1 "${DPKG_DIR}/usr/share/man/man1/${{ env.PROJECT_NAME }}.1"
+          gzip --best "${DPKG_DIR}/usr/share/man/man1/${{ env.PROJECT_NAME }}.1"
+
+          # Autocompletion files
+          install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.fish "${DPKG_DIR}/usr/share/fish/vendor_completions.d/${{ env.PROJECT_NAME }}.fish"
+          install -Dm644 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/completions/bat.zsh "${DPKG_DIR}/usr/share/zsh/vendor-completions/_${{ env.PROJECT_NAME }}"
+
+          # README and LICENSE
+          install -Dm644 "README.md" "${DPKG_DIR}/usr/share/doc/${{ env.PROJECT_NAME }}/README.md"
+          install -Dm644 "LICENSE-MIT" "${DPKG_DIR}/usr/share/doc/${{ env.PROJECT_NAME }}/LICENSE-MIT"
+          install -Dm644 "LICENSE-APACHE" "${DPKG_DIR}/usr/share/doc/${{ env.PROJECT_NAME }}/LICENSE-APACHE"
+
+          cat > "${DPKG_DIR}/usr/share/doc/${{ env.PROJECT_NAME }}/copyright" <<EOF
+        Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+        Upstream-Name: ${{ env.PROJECT_NAME }}
+        Source: ${{ env.PROJECT_HOMEPAGE }}
+
+        Files: *
+        Copyright: ${{ env.PROJECT_MAINTAINER }}
+        License: Apache-2.0 or MIT
+
+        License: Apache-2.0
+         On Debian systems, the complete text of the Apache-2.0 can be found in the
+         file /usr/share/common-licenses/Apache-2.0.
+
+        License: MIT
+         Permission is hereby granted, free of charge, to any
+         person obtaining a copy of this software and associated
+         documentation files (the "Software"), to deal in the
+         Software without restriction, including without
+         limitation the rights to use, copy, modify, merge,
+         publish, distribute, sublicense, and/or sell copies of
+         the Software, and to permit persons to whom the Software
+         is furnished to do so, subject to the following
+         conditions:
+         .
+         The above copyright notice and this permission notice
+         shall be included in all copies or substantial portions
+         of the Software.
+         .
+         THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+         ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+         TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+         PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+         SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+         CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+         OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+         IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+         DEALINGS IN THE SOFTWARE.
+        EOF
+
+          # control file
+          mkdir -p "${DPKG_DIR}/DEBIAN"
+          cat > "${DPKG_DIR}/DEBIAN/control" <<EOF
+        Package: ${{ steps.vars.outputs.DPKG_BASENAME }}
+        Version: ${{ steps.vars.outputs.DPKG_VERSION }}
+        Section: utils
+        Priority: optional
+        Maintainer: ${{ env.PROJECT_MAINTAINER }}
+        Homepage: ${{ env.PROJECT_HOMEPAGE }}
+        Architecture: ${{ steps.vars.outputs.DPKG_ARCH }}
+        Provides: ${{ env.PROJECT_NAME }}
+        Conflicts: ${{ steps.vars.outputs.DPKG_CONFLICTS }}
+        Description: A cat(1) clone with wings.
+         A cat(1) clone with syntax highlighting and Git integration.
+        EOF
+
+          # build dpkg
+          fakeroot dpkg-deb --build "${DPKG_DIR}" "${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.DPKG_NAME }}"
+        fi
+    - name: Publish archives and packages
+      uses: softprops/action-gh-release@v1
+      if: steps.vars.outputs.DEPLOY
+      with:
+        files: |
+          ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_NAME }}
+          ${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.DPKG_NAME }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  coverage:
+    name: Code Coverage
+    runs-on: ${{ matrix.job.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        # job: [ { os: ubuntu-latest }, { os: macos-latest }, { os: windows-latest } ]
+        job:
+          - { os: ubuntu-latest , toolchain: nightly-2020-04-29 }
+          - { os: macos-latest , toolchain: nightly-2020-04-29 }
+          - { os: windows-latest , toolchain: nightly-2020-04-29-x86_64-pc-windows-gnu }
+    steps:
+    - uses: actions/checkout@v2
+    - name: Initialize workflow variables
+      id: vars
+      shell: bash
+      run: |
+        # toolchain
+        TOOLCHAIN="nightly" ## default to "nightly" toolchain
+        # * use requested TOOLCHAIN if specified
+        if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
+        # * use requested TOOLCHAIN if specified
+        if [ -n "${{ matrix.job.toolchain }}" ]; then TOOLCHAIN="${{ matrix.job.toolchain }}" ; fi
+        echo set-output name=TOOLCHAIN::${TOOLCHAIN}
+        echo ::set-output name=TOOLCHAIN::${TOOLCHAIN}
+        # target-specific options
+        # * CODECOV_FLAGS
+        CODECOV_FLAGS=$( echo "${{ matrix.job.os }}" | sed 's/[^[:alnum:]]/_/g' )
+        echo set-output name=CODECOV_FLAGS::${CODECOV_FLAGS}
+        echo ::set-output name=CODECOV_FLAGS::${CODECOV_FLAGS}
+    - name: rust toolchain ~ install
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: ${{ steps.vars.outputs.TOOLCHAIN }}
+        override: true
+        profile: minimal # minimal component installation (ie, no documentation)
+    - name: Test
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --no-fail-fast
+      env:
+        CARGO_INCREMENTAL: '0'
+        RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zno-landing-pads'
+    - name: Generate coverage data
+      id: coverage
+      uses: actions-rs/grcov@v0.1
+    - name: Upload coverage results (to Codecov.io)
+      uses: codecov/codecov-action@v1
+      with:
+        file: ${{ steps.coverage.outputs.report }}
+        flags: ${{ steps.vars.outputs.CODECOV_FLAGS }}
+        name: codecov-umbrella
+        fail_ci_if_error: false

.gitignore

@@ -1,3 +1,8 @@
-
 /target/
 **/*.rs.bk
+
+# Generated files
+/assets/completions/bat.fish
+/assets/completions/bat.zsh
+/assets/manual/bat.1
+/assets/metadata.yaml

.gitmodules

@@ -1,32 +1,32 @@
 [submodule "assets/syntaxes/Elixir"]
-	path = assets/syntaxes/Elixir
+	path = assets/syntaxes/02_Extra/Elixir
 	url = https://github.com/princemaple/elixir-sublime-syntax/
 [submodule "assets/syntaxes/Packages"]
-	path = assets/syntaxes/Packages
+	path = assets/syntaxes/01_Packages
 	url = https://github.com/sublimehq/Packages/
 [submodule "assets/syntaxes/TOML"]
-	path = assets/syntaxes/TOML
+	path = assets/syntaxes/02_Extra/TOML
 	url = https://github.com/jasonwilliams/sublime_toml_highlighting
 [submodule "assets/syntaxes/Julia"]
-	path = assets/syntaxes/Julia
+	path = assets/syntaxes/02_Extra/Julia
 	url = https://github.com/JuliaEditorSupport/Julia-sublime
 [submodule "assets/themes/sublime-monokai-extended"]
 	path = assets/themes/sublime-monokai-extended
 	url = https://github.com/jonschlinkert/sublime-monokai-extended
 [submodule "assets/syntaxes/Docker"]
-	path = assets/syntaxes/Docker
+	path = assets/syntaxes/02_Extra/Docker
 	url = https://github.com/asbjornenge/Docker.tmbundle
 [submodule "assets/syntaxes/VimL"]
-	path = assets/syntaxes/VimL
+	path = assets/syntaxes/02_Extra/VimL
 	url = https://github.com/SalGnt/Sublime-VimL
 [submodule "assets/syntaxes/INI"]
-	path = assets/syntaxes/INI
+	path = assets/syntaxes/02_Extra/INI
 	url = https://github.com/clintberry/sublime-text-2-ini
 [submodule "assets/syntaxes/CMake"]
-	path = assets/syntaxes/CMake
+	path = assets/syntaxes/02_Extra/CMake
 	url = https://github.com/zyxar/Sublime-CMakeLists
 [submodule "assets/syntaxes/LESS"]
-	path = assets/syntaxes/LESS
+	path = assets/syntaxes/02_Extra/LESS
 	url = https://github.com/danro/LESS-sublime
 [submodule "assets/themes/DarkNeon"]
 	path = assets/themes/DarkNeon
@@ -41,115 +41,168 @@
 	path = assets/themes/TwoDark
 	url = https://github.com/erremauro/TwoDark
 [submodule "assets/syntaxes/AWK"]
-	path = assets/syntaxes/AWK
+	path = assets/syntaxes/02_Extra/AWK
 	url = https://github.com/JohnNilsson/awk-sublime
 [submodule "assets/syntaxes/Nix"]
-	path = assets/syntaxes/Nix
+	path = assets/syntaxes/02_Extra/Nix
 	url = https://github.com/wmertens/sublime-nix
 [submodule "assets/themes/zenburn"]
 	path = assets/themes/zenburn
 	url = https://github.com/colinta/zenburn.git
 [submodule "assets/syntaxes/Kotlin"]
-	path = assets/syntaxes/Kotlin
+	path = assets/syntaxes/02_Extra/Kotlin
 	url = https://github.com/vkostyukov/kotlin-sublime-package
 [submodule "assets/syntaxes/Elm"]
-	path = assets/syntaxes/Elm
+	path = assets/syntaxes/02_Extra/Elm
 	url = https://github.com/elm-community/SublimeElmLanguageSupport
 [submodule "assets/syntaxes/TypeScript"]
-	path = assets/syntaxes/TypeScript
+	path = assets/syntaxes/02_Extra/TypeScript
 	url = https://github.com/Microsoft/TypeScript-Sublime-Plugin
 [submodule "assets/syntaxes/Puppet"]
-	path = assets/syntaxes/Puppet
+	path = assets/syntaxes/02_Extra/Puppet
 	url = https://github.com/russCloak/SublimePuppet
 [submodule "assets/syntaxes/CSV"]
-	path = assets/syntaxes/CSV
+	path = assets/syntaxes/02_Extra/CSV
 	url = https://github.com/wadetb/Sublime-Text-Advanced-CSV
 [submodule "assets/themes/onehalf"]
 	path = assets/themes/onehalf
 	url = https://github.com/sonph/onehalf
 [submodule "assets/syntaxes/JavaScript (Babel)"]
-	path = assets/syntaxes/JavaScript (Babel)
+	path = assets/syntaxes/02_Extra/JavaScript (Babel)
 	url = https://github.com/babel/babel-sublime
-[submodule "assets/syntaxes/Cabal"]
-	path = assets/syntaxes/Cabal
-	url = https://github.com/SublimeHaskell/SublimeHaskell
 [submodule "assets/syntaxes/Dart"]
-	path = assets/syntaxes/Dart
+	path = assets/syntaxes/02_Extra/Dart
 	url = https://github.com/guillermooo/dart-sublime-bundle
 [submodule "assets/syntaxes/FSharp"]
-	path = assets/syntaxes/FSharp
+	path = assets/syntaxes/02_Extra/FSharp
 	url = https://github.com/hoest/sublimetext-fsharp
 [submodule "assets/syntaxes/PureScript"]
-	path = assets/syntaxes/PureScript
+	path = assets/syntaxes/02_Extra/PureScript
 	url = https://github.com/tellnobody1/sublime-purescript-syntax
 [submodule "assets/syntaxes/Swift"]
-	path = assets/syntaxes/Swift
+	path = assets/syntaxes/02_Extra/Swift
 	url = https://github.com/quiqueg/Swift-Sublime-Package
 [submodule "assets/syntaxes/Crystal"]
-	path = assets/syntaxes/Crystal
+	path = assets/syntaxes/02_Extra/Crystal
 	url = https://github.com/crystal-lang-tools/sublime-crystal.git
 [submodule "assets/syntaxes/PowerShell"]
-	path = assets/syntaxes/PowerShell
+	path = assets/syntaxes/02_Extra/PowerShell
 	url = https://github.com/PowerShell/EditorSyntax
 [submodule "assets/syntaxes/Robot"]
-	path = assets/syntaxes/Robot
+	path = assets/syntaxes/02_Extra/Robot
 	url = https://github.com/andriyko/sublime-robot-framework-assistant.git
 [submodule "assets/themes/sublime-snazzy"]
 	path = assets/themes/sublime-snazzy
 	url = https://github.com/greggb/sublime-snazzy
-[submodule "assets/syntaxes/HTML (Twig)"]
-	path = assets/syntaxes/HTML (Twig)
-	url = https://github.com/Anomareh/PHP-Twig.tmbundle.git
-[submodule "assets/syntaxes/AsciiDoc"]
-	path = assets/syntaxes/AsciiDoc
-	url = https://github.com/SublimeText/AsciiDoc.git
 [submodule "assets/syntaxes/Assembly (ARM)"]
-	path = assets/syntaxes/Assembly (ARM)
+	path = assets/syntaxes/02_Extra/Assembly (ARM)
 	url = https://github.com/tvi/Sublime-ARM-Assembly
 [submodule "assets/syntaxes/syslog-syntax"]
-	path = assets/syntaxes/Syslog
+	path = assets/syntaxes/02_Extra/Syslog
 	url = https://github.com/caos21/syslog-syntax.git
 	branch = master
 [submodule "assets/syntaxes/protobuf-syntax-highlighting"]
-	path = assets/syntaxes/Protobuf
+	path = assets/syntaxes/02_Extra/Protobuf
 	url = https://github.com/VcamX/protobuf-syntax-highlighting.git
 	branch = master
 [submodule "assets/syntaxes/Terraform"]
-	path = assets/syntaxes/Terraform
+	path = assets/syntaxes/02_Extra/Terraform
 	url = https://github.com/alexlouden/Terraform.tmLanguage.git
 [submodule "assets/syntaxes/Jsonnet"]
-	path = assets/syntaxes/Jsonnet
+	path = assets/syntaxes/02_Extra/Jsonnet
 	url = https://github.com/gburiola/sublime-jsonnet-syntax.git
 [submodule "assets/syntaxes/varlink"]
-	path = assets/syntaxes/varlink
+	path = assets/syntaxes/02_Extra/varlink
 	url = https://github.com/varlink/syntax-highlight-varlink.git
 [submodule "assets/syntaxes/sublime-fish"]
-	path = assets/syntaxes/sublime-fish
+	path = assets/syntaxes/02_Extra/Fish
 	url = https://github.com/Phidica/sublime-fish.git
 [submodule "assets/syntaxes/Org mode"]
-	path = assets/syntaxes/Org mode
+	path = assets/syntaxes/02_Extra/Org mode
 	url = https://github.com/jezcope/Org.tmbundle.git
 [submodule "assets/syntaxes/requirementstxt"]
-	path = assets/syntaxes/requirementstxt
+	path = assets/syntaxes/02_Extra/requirementstxt
 	url = https://github.com/wuub/requirementstxt
 [submodule "assets/syntaxes/DotENV"]
-	path = assets/syntaxes/DotENV
+	path = assets/syntaxes/02_Extra/DotENV
 	url = https://github.com/zaynali53/DotENV
 [submodule "assets/syntaxes/hosts"]
-	path = assets/syntaxes/hosts
+	path = assets/syntaxes/02_Extra/hosts
 	url = https://github.com/brandonwamboldt/sublime-hosts
 [submodule "assets/syntaxes/ssh-config"]
-	path = assets/syntaxes/ssh-config
+	path = assets/syntaxes/02_Extra/ssh-config
 	url = https://github.com/robballou/sublimetext-sshconfig.git
 [submodule "assets/syntaxes/GraphQL"]
-	path = assets/syntaxes/GraphQL
+	path = assets/syntaxes/02_Extra/GraphQL
 	url = https://github.com/dncrews/GraphQL-SublimeText3.git
 [submodule "assets/syntaxes/Verilog"]
-	path = assets/syntaxes/Verilog
+	path = assets/syntaxes/02_Extra/Verilog
 	url = https://github.com/pro711/sublime-verilog
 [submodule "assets/syntaxes/SCSS_Sass"]
-	path = assets/syntaxes/SCSS_Sass
+	path = assets/syntaxes/02_Extra/SCSS_Sass
 	url = https://github.com/braver/SublimeSass
 [submodule "assets/syntaxes/Strace"]
-	path = assets/syntaxes/Strace
+	path = assets/syntaxes/02_Extra/Strace
 	url = https://github.com/djuretic/SublimeStrace
+[submodule "assets/syntaxes/Jinja2"]
+	path = assets/syntaxes/02_Extra/Jinja2
+	url = https://github.com/Martin819/sublime-jinja2
+[submodule "assets/syntaxes/SLS"]
+	path = assets/syntaxes/02_Extra/SLS
+	url = https://github.com/saltstack/sublime-text
+	branch = master
+[submodule "assets/themes/dracula-sublime"]
+	path = assets/themes/dracula-sublime
+	url = https://github.com/dracula/sublime.git
+[submodule "assets/syntaxes/HTML (Twig)"]
+	path = assets/syntaxes/02_Extra/HTML (Twig)
+	url = https://github.com/Anomareh/PHP-Twig.tmbundle.git
+[submodule "assets/themes/Nord-sublime"]
+	path = assets/themes/Nord-sublime
+	url = https://github.com/crabique/Nord-plist.git
+[submodule "assets/syntaxes/Vue"]
+	path = assets/syntaxes/02_Extra/Vue
+	url = https://github.com/vuejs/vue-syntax-highlight.git
+	branch = new
+[submodule "assets/syntaxes/CoffeeScript"]
+	path = assets/syntaxes/02_Extra/CoffeeScript
+	url = https://github.com/sustained/CoffeeScript-Sublime-Plugin
+[submodule "assets/syntaxes/02_Extra/Stylus"]
+	path = assets/syntaxes/02_Extra/Stylus
+	url = https://github.com/billymoon/Stylus
+[submodule "assets/themes/Solarized"]
+	path = assets/themes/Solarized
+	url = https://github.com/braver/Solarized
+[submodule "assets/syntaxes/02_Extra/Fortran"]
+	path = assets/syntaxes/02_Extra/Fortran
+	url = https://github.com/315234/SublimeFortran
+[submodule "assets/syntaxes/02_Extra/Email"]
+	path = assets/syntaxes/02_Extra/Email
+	url = https://github.com/mariozaizar/email.sublime-syntax.git
+[submodule "assets/syntaxes/02_Extra/QML"]
+	path = assets/syntaxes/02_Extra/QML
+	url = https://github.com/skozlovf/Sublime-QML
+[submodule "assets/syntaxes/02_Extra/AsciiDoc"]
+	path = assets/syntaxes/02_Extra/AsciiDoc
+	url = https://github.com/asciidoctor/sublimetext-asciidoc.git
+[submodule "assets/themes/gruvbox"]
+	path = assets/themes/gruvbox
+	url = https://github.com/peaceant/gruvbox.git
+[submodule "assets/syntaxes/02_Extra/GLSL"]
+	path = assets/syntaxes/02_Extra/GLSL
+	url = https://github.com/euler0/sublime-glsl
+[submodule "assets/syntaxes/02_Extra/Nginx"]
+	path = assets/syntaxes/02_Extra/Nginx
+	url = https://github.com/brandonwamboldt/sublime-nginx
+[submodule "assets/syntaxes/02_Extra/Apache"]
+	path = assets/syntaxes/02_Extra/Apache
+	url = https://github.com/colinta/ApacheConf.tmLanguage
+[submodule "assets/syntaxes/02_Extra/Ninja"]
+	path = assets/syntaxes/02_Extra/Ninja
+	url = https://github.com/pope/SublimeNinja.git
+[submodule "assets/syntaxes/02_Extra/Svelte"]
+	path = assets/syntaxes/02_Extra/Svelte
+	url = https://github.com/corneliusio/svelte-sublime
+[submodule "assets/themes/Coldark"]
+	path = assets/themes/Coldark
+	url = https://github.com/ArmandPhilippot/coldark-bat.git

.travis.yml

@@ -1,112 +0,0 @@
-language: rust
-
-matrix:
-  include:
-    # Stable channel.
-    - os: linux
-      rust: stable
-      env: TARGET=x86_64-unknown-linux-gnu
-    - os: linux
-      rust: stable
-      env:
-        - TARGET=x86_64-unknown-linux-musl
-        - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc
-    - os: linux
-      rust: stable
-      env: TARGET=i686-unknown-linux-gnu
-    - os: osx
-      rust: stable
-      env: TARGET=x86_64-apple-darwin
-    - os: linux
-      rust: stable
-      env:
-        - TARGET=arm-unknown-linux-gnueabihf
-        - CC_arm_unknown_linux_gnueabihf=/usr/bin/arm-linux-gnueabihf-gcc-4.8
-        - CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc-4.8
-    - os: linux
-      rust: stable
-      env:
-        - TARGET=aarch64-unknown-linux-gnu
-        - CC_aarch64-unknown-linux-gnu=/usr/bin/aarch64-linux-gnu-gcc-4.8
-        - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc-4.8
-
-    # Minimum Rust supported channel.
-    - os: linux
-      rust: 1.35.0
-      env: TARGET=x86_64-unknown-linux-gnu
-    - os: linux
-      rust: 1.35.0
-      env:
-        - TARGET=x86_64-unknown-linux-musl
-        - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc
-    - os: osx
-      rust: 1.35.0
-      env: TARGET=x86_64-apple-darwin
-
-    # Code formatting check
-    - os: linux
-      rust: nightly
-      # skip the global install step
-      install:
-        - cargo install --debug --force rustfmt-nightly
-      script: cargo fmt -- --check
-
-sudo: required
-
-before_install:
-  - ci/before_install.bash
-
-env:
-  global:
-    # Default target on travis-ci.
-    # Used as conditional check in the install stage
-    - HOST=x86_64-unknown-linux-gnu
-    # Used on the deployment script
-    - PROJECT_NAME=bat
-
-install:
-  # prevent target re-add error from rustup
-  - if [[ $TRAVIS_OS_NAME = linux && $HOST != $TARGET ]]; then rustup target add $TARGET; fi
-
-script:
-  - ci/script.bash
-
-before_deploy:
-  - bash ci/before_deploy.bash
-
-deploy:
-  provider: releases
-  # NOTE updating the `api_key.secure`
-  # - go to: https://github.com/settings/tokens/new
-  # - generate new token using `public_repo` scope
-  # - encrypt it using: `travis encrypt API_KEY_HERE`
-  # - paste the output below
-  api_key:
-    secure: "GZL8nYk+/MZGEqejpP0UMMGVmwUEdxiF9CflFIGccu+/tznDyHnHOpyJmbH3M5IKWIxa7xFgqOE8pHuD4oQXt4mzyJGB0KMKKEFLW7ckbTYKya5bw0heKznaqGnS0Yz+vpfqYR25eiPFYCz7mDsGsCzH5QZqt3cdn9MDQGu1D0IaxPjuBNH3T9kBblR0ifBd3Diy0JYhiVcMSI3V1rkel18F1yBHO2GQ95hkWxVgjANQnefq5+zdzbx4ki539ewYENShA8N0w6ULJVY9LmWRWJIp90ggOD3JCH6Nz/fBpYBqwfABO6Dr7Csw7IRm7pM4IVkFZS1taiDYFX9thxZh3UTmI4YYtSTPxH9NGV47kxPipbf4vAXFwW+1VcHKMpBzz+5IVsHnk1Pfx9/GZsXbqXM3PUWCStec36Xtqh5vQapDKEg9khkEs4b1X7/E73gvpRuQl9gbnyufSVWgDsXIWqM+0aDbqQz1FpLmVxz6eij0cB9vR+8kbNoe/CEPHPO9ZllvAHseukOeHPzSBd8rILORXaaGmQausXz2wWgSsffUSYz4705P8joI0zFCfmkHjL+kA1ZUx5SxLCc1ID7CFFZChhAxHoPL7xc21snswwr8QeheERdwvuzKNaerBGZEw8dmMMx98YkjftIj65DDySr2mRZuufBQeQpmMhFyIT4="
-  # for uploading multiple files
-  file_glob: true
-  # NOTE explanation on each env variable
-  # - PROJECT_NAME: name of the project, set on the `env.global` above
-  # - TRAVIS_TAG: tag name that the build is being deployed for, usually the version number
-  # - TARGET: target triple of the build
-  file:
-    - $PROJECT_NAME-$TRAVIS_TAG-$TARGET.*
-    - $PROJECT_NAME*.deb
-  # don't delete artifacts from previous stage
-  skip_cleanup: true
-  on:
-    # deploy only if we push a tag
-    tags: true
-    # deploy only on stable channel that has TARGET env variable sets
-    condition: $TRAVIS_RUST_VERSION = stable && $TARGET != ""
-
-notifications:
-  email:
-    on_success: never
-
-# Caching
-cache:
-  directories:
-    - /home/travis/.cargo
-before_cache:
-  - rm -rf /home/travis/.cargo/registry

CHANGELOG.md

@@ -0,0 +1,791 @@
+# unreleased
+
+
+## Features
+
+## Bugfixes
+
+## Other
+
+## Syntaxes
+
+## New themes
+
+## `bat` as a library
+
+## Packaging
+
+# v0.17.1
+
+## Bugfixes
+
+- Running `bat` without arguments fails ("output file is also an input"), see #1396
+
+# v0.17.0
+
+## Features
+
+- Added a new `--style` value, `rule`, which adds a simple horizontal ruled line between files, see #1276 (@tommilligan)
+- Pass `-S` ("chop long lines") to `less` if `--wrap=never` is set in `bat`, see #1255 (@gahag)
+
+## Bugfixes
+
+- Detect infinite loop when input and output are the same, see #1193 and #1197 (@niklasmohrin)
+- Throw an error when `bat` is being used as `pager`, see #1343 (@adrian-rivera)
+- Bash syntax highlighting not selected for `*.ebuild` and `*.eclass` files, see #1292 (@sharkdp)
+- Fix `zsh` completion when using `-p`, see #1320 (@xzfc)
+
+## Other
+
+- Add note to refer to see detailed help with `--help` (and vice versa with `-h`), see #1215 (@henil)
+- Add a `Contributors` section to `README`, see #1348 (@adrian-rivera)
+
+## Syntaxes
+
+- Manpage syntax highlighting has been improved, see #1315 (@keith-hall)
+- Add Svelte file syntax, see #1285 (@kjmph)
+
+## New themes
+
+- Coldark, see #1329 (@armandphilippot)
+
+
+# v0.16.0
+
+## Features
+
+- Added support for the `NO_COLOR` environment variable, see #1021 and #1031 (@eth-p)
+- Added `-P` short flag to disable paging, see #1075 and #1082 (@LordFlashmeow)
+- Added `--force-colorization`/`-f` flag to provide an alias for forced color and decoration output, see #1141 (@alexanderkarlis)
+
+## Bugfixes
+
+- Fixed non-printable characters display for redirected output, see #1061 (@gsomix)
+- Handle file extension conflicts in `--list-languages`, see #1076 and #1135 (@Kienyew)
+
+## Other
+
+- Switched to "·" (U+00B7) Middle Dot from "•" (U+2022) Bullet for non-printing spaces, see #1056 and #1100 (@LordFlashmeow)
+- Added zsh shell completion script, see #1136 (@Kienyew)
+- Improved `--help` text (@sharkdp)
+- Added custom languages/themes sections to manpage (@eth-p)
+
+## Syntaxes
+
+- Update AsciiDoc syntax, see #1034 (@rxt1077)
+- GLSL (@caioalonso)
+- Add Nginx and Apache config file syntax, see #1137 (@kjmph, @niklasmohrin)
+- Use `fstab` syntax for `crypttab` files, see #1073 (@sharkdp)
+- Support syntax highlighting for files in `$XDG_CONFIG_HOME/git/`, see #1191 (@ahmedelgabri)
+
+## New themes
+
+- Gruvbox, see #1069 (@kyleondy)
+- base16-256 for [base16-shell](https://github.com/chriskempson/base16-shell) users, see #1111 (@mk12)
+
+## `bat` as a library
+
+- Add APIs to provide `Input` descriptions with `InputDescription` (@eth-p)
+- Add function to directly provide `Input`s to `PrettyPrinter` (@eth-p)
+- **Breaking:** `Input::theme_preview_file` is no longer available. (@eth-p)
+
+## Packaging
+
+- Removed build dependency on `liquid` (@sharkdp).
+
+# v0.15.4
+
+## Bugfixes
+
+- Added missing Solarized themes, see #1027
+- Fixed highlighting bug in Haskell source files, see #1026
+
+# v0.15.3
+
+## Bugfixes
+
+- Cannot run `bat` with relative paths, see #1022
+- bat mishighlights Users that start with digits in SSH config, see #984
+
+## New syntaxes
+
+- SML, see #1005 (@kopecs)
+
+## Other
+
+- Some syntaxes and themes have been updated to the latest version
+
+# v0.15.2
+
+## Bugfixes
+
+- Fix syntax detection for files called 'rails', see #1008
+- Fix potential errors with syntax detection for symlinked files, see #1001
+- `--map-syntax` doesn't work with names provided through `--file-name` (@eth-p)
+
+## Other
+
+- Add padding above headers when not using a grid, see #968 and #981 (@pt2121)
+- bat now prints an error if an invalid syntax is specified via `-l` or `--map-syntax`, see #1004 (@eth-p)
+
+## `bat` as a library
+
+- `PrettyPrinter::vcs_modification_markers` has been marked deprecated when building without the `git` feature, see #997 and #1020 (@eth-p, @sharkdp)
+
+## Packaging
+
+- Compilation problems with `onig_sys` on various platforms have been resolved by upgrading to `syntect 4.2`, which includes a new `onig` version that allows to build `onig_sys` without the `bindgen` dependency. This removes the need for `libclang(-dev)` to be installed to compile `bat`. Package maintainers might want to remove `clang` as a build dependency. See #650 for more details.
+
+# v0.15.1
+
+## Bugfixes
+
+- Fix highlighting of Markdown files, see #963 and #977
+- Fix `base16` theme (was broken since in v0.14), see #972, #934 and #979 (@mk12).
+  Users suffering from #865 ("no color for bat in ssh from a Windows client") can use the `ansi-dark` and `ansi-light` themes from now on.
+
+## New syntaxes
+
+- Fortran, see #957
+- Email (@mariozaizar)
+- QML, see #962 (@pylipp)
+
+# v0.15.0
+
+## Features
+
+- Add a new `--diff`/`-d` option that can be used to only show lines surrounding
+  Git changes, i.e. added, removed or modified lines. The amount of additional
+  context can be controlled with `--diff-context=N`. See #23 and #940
+
+## Bugfixes
+
+- Error message printed in the middle of the output for another file, see #946
+- Performance improvements when using custom caches (via `bat cache --build`): the `bat` startup time should now be twice as fast (@lzutao).
+
+## Themes
+
+- Updated version of the Solarized dark/light themes, see #941
+
+## `bat` as a library
+
+- There are a few changes in the "low level" API (the `Config` struct has changed and
+  the error handler needs a new `&mut dyn Write` argument). The high-level API is not
+  affected.
+
+# v0.14.0
+
+## Features
+
+- Added a new `--file-name <name>…` option to overwrite the displayed filename(s)
+  in the header. This is useful when piping input into `bat`. See #654 and #892 (@neuronull).
+- Added a new `--generate-config-file` option to create an initial configuration file
+  at the right place. See #870 (@jmick414)
+
+## Bugfixes
+
+- Performance problems with C# source code have been fixed, see #677 (@keith-hall)
+- Performance problems with Makefiles have been fixed, see #750 (@keith-hall)
+- Fix bug when highlighting Ruby files with unindented heredocs, see #914 (@keith-hall)
+- A highlighting problem with Rust source code has been fixed, see #924 (@keith-hall)
+- Windows: short files that do not require paging are displayed and then lost, see #887
+- `--highlight-line` did not work correctly in combination with `--tabs=0` and `--wrap=never`,
+  see #937
+
+## Other
+
+- When saving/reading user-provided syntaxes or themes, `bat` will now maintain a
+  `metadata.yaml` file which includes information about the `bat` version which was
+  used to create the cached files. When loading cached files, we now print an error
+  if they have been created with an incompatible version. See #882
+- Updated `liquid` dependency to 0.20, see #880 (@ignatenkobrain)
+
+## `bat` as a library
+
+- A completely new "high level" API has been added that is much more convenient
+  to use. See the `examples` folder for the updated code. The older "low level"
+  API is still available (basically everything that is not in the root `bat`
+  module), but has been refactored quite a bit. It is recommended to only use
+  the new "high level" API, if possible. This will be much easier to keep stable.
+  Note that this should still be considered a "beta" release of `bat`-as-a-library.
+  For more details and some screenshots of the example programs, see #936.
+- Stripped out a lot of binary-only dependencies, see #895 and #899 (@dtolnay)
+
+  This introduces a `features = ["application"]` which is enabled by default and pulls in
+  everything required by `bat` the application. When depending on bat as a library, downstream
+  `Cargo.toml` should disable this feature to cut out inapplicable heavy dependencies:
+  ``` toml
+  [dependencies]
+  bat = { version = "0.14", default-features = false }
+  ```
+  Other optional functionality has also been put behind features: `paging` and `git` support.
+- Allow using the library with older syntect, see #896 and #898 (@dtolnay)
+
+## New syntaxes
+
+- Rego, see #872 (@patrick-east)
+- Stylo, see #917
+
+
+# v0.13.0
+
+## `bat` as a library
+
+Beginning with this release, `bat` can be used as a library (#423).
+
+This was a huge effort and I want to thank all people who made this possible: @DrSensor, @mitsuhiko, @mre, @eth-p!
+
+- Initial attempt in #469 (@mitsuhiko)
+- Second attempt, complete restructuring of the `bat` crate, see #679 (@DrSensor)
+- Updates to example, public API, error handling, further refactoring: #693 #873 #875 (@sharkdp)
+
+I want to stress that this is the very first release of the library. Things are very likely to change. A lot of things are still missing (including the documentation).
+
+That being said, you can start using it! See the example programs in [`examples/`](https://github.com/sharkdp/bat/tree/master/examples).
+
+You can see the API documentation here: https://docs.rs/bat/
+
+## Features
+
+- (**Breaking change**) Glob-based syntax mapping, see #877 and #592. With this change,
+  users need to update their bat config files (`bat --config-file`), if they have any `--map-syntax` settings
+  present.
+
+  The option now works like this:
+  ```bash
+  --map-syntax <glob-pattern>:<syntax-name>
+  ```
+
+  For more information, see the `--help` text, the man page or the README.
+
+  This new feature allows us to properly highlight files like:
+  * `/etc/profile`
+  * `~/.ssh/config`
+
+- `--highlight-line` now accepts line ranges, see #809 (@lkalir)
+- Proper wrapping support for output with wide Unicode characters, see #811 #787 and #815 (@Kogia-sima)
+- A lot of updates to existing syntaxes via #644 (@benwaffle, @keith-hall)
+- `BAT_CACHE_PATH` can be used to place cached `bat` assets in a non-standard path, see #829 (@neuronull)
+- Support combination of multiple styles at the same time, see #857 (@aslpavel)
+
+## Bugfixes
+
+- Do not pass '--no-init' on newer less versions, see #749 and #786 (@sharkdp)
+- 'bat cache' still takes precedence over existing files, see #666 (@sharkdp)
+- `.sc` files should be treated as scala files, see #443 (@benwaffle)
+- Allow underscores and dashes in page names, see #670 (@LunarLambda)
+- Keep empty lines empty, see #601 (@mbarbar)
+- Wrapping does not work when piping, see #758 (@fusillicode, @allevo, @gildo)
+- Allow for non-unicode filenames, see #225 (@sharkdp)
+- Empty file without header produces incomplete grid, see #798 (@eth-p)
+- Files named `build` don't respect shebang lines, see #685 (@sharkdp)
+
+## Other
+
+- Parametrizable names for man page and shell completion files, see #659 #673 #656 (@eth-p)
+- Enabled LTO, making `bat` about 10% faster, see #719 (@bolinfest, @sharkdp)
+- Suggestions non how to configure `bat` for MacOS dark mode, see README (@jerguslejko)
+- Extended ["Integration with other tools"](https://github.com/sharkdp/bat#integration-with-other-tools) section (@eth-p)
+- Updated [instrutions on how to use `bat` as a `man`-pager](https://github.com/sharkdp/bat#man), see #652, see #667 (@sharkdp)
+- Add section concerning file encodings, see #688 and #568 (@sharkdp)
+- Updated sort order of command-line options in `--help` text and manpage, see #653 and #700 (@hrlmartins)
+- Updates to the man page syntax, see #718 (@sharkdp)
+- Japanese documentation updates, see #863 (@k-ta-yamada, @sorairolake and @wt-l00)
+- Accept "default" as a theme, see #757 (@fvictorio)
+- Updated Windows installation instructions, see #852 (@sorenbug)
+- Updated man page, see #573 (@sharkdp)
+
+## New syntaxes
+
+- Jinja2, see #648 (@Martin819)
+- SaltStack SLS, see #658 (@Martin819)
+- `/etc/fstab`, see #696 (@flopp and @eth-p)
+- `/etc/group` and `/etc/passwd`, see #698 (@argentite)
+- `/proc/cpuinfo` and `/proc/meminfo`, see #593 (@sharkdp)
+- Nim, see #542 (@sharkdp)
+- Vue, see #826 (@chaaaaarlotte)
+- CoffeScript, see #833 (@sharkdp)
+
+## New themes
+
+- Dracula, see #687 (@clarfon)
+- Nord, see #760 (@crabique)
+- Solarized light and dark, see #768 (@hakamadare)
+
+## Packaging
+
+- `bat` is now in the official Ubuntu and Debian repositories, see #323 and #705 (@MarcoFalke)
+- `bat` can now be installed via MacPorts, see #675 (@bn3t)
+- Install fish completions into 'vendor_completions.d', see #651 (@sharkdp)
+
+## Thanks
+
+- To @eth-p for joining me as a maintainer! I'm very grateful for all the work you put into
+  managing and responding to issues, improving our deployment, adding PR/issue templates (#837) as
+  well as fixing bugs and implementing new features.
+
+# v0.12.1
+
+## Bugfixes
+
+- Fixes a bug for older Windows versions (*"The procedure entry point `CreateFile2` could not be located"*), see #643 (@rivy)
+
+# v0.12.0
+
+## Features
+
+- Binary file content can now be viewed with `bat -A`, see #623, #640 (@pjsier and @sharkdp)
+- `bat` can now be used as a man pager. Take a look at the README and #523 for more details.
+- Add new style component to separate multiple `--line-range`s, see #570 (@eth-p)
+- Added `-L` as an alias for `--list-languages`
+
+## Bugfixes
+
+- Output looks unbalanced when using '--style=grid,numbers' without 'header', see #571 (@eth-p)
+- issues with filenames starting with "cache", see #584
+- Can't build cache with new theme without creating cache dir, see #576 (@frm)
+- `--terminal-width -10` is parsed incorrectly, see #611
+
+## Other
+
+- Added fish completions to DEB package, see #554
+
+## New syntaxes
+
+- Emacs Org mode, see #36 (@bricewge)
+- `requirements.txt`
+- DotENV `.env`
+- SSH config syntax (`-l ssh_config`), see #582 (@issmirnov)
+- `/etc/hosts`, see #583 (@issmirnov)
+- GraphQL, see #625 (@dandavison)
+- Verilog, see #616
+- SCSS and Sass, see #637
+- `strace` syntax, see #599
+
+## Packaging
+
+- `bat` is now in the official Gentoo repositories, see #588 (@toku-sa-n)
+- `bat` is now in the official Alpine Linux repositories, see #586 (@5paceToast)
+- `bat` is in the official Fedora repositories, see #610 (@ignatenkobrain)
+
+# v0.11.0
+
+## Features
+
+- Three new special color themes are available: `ansi-light`, `ansi-dark` and `base16`. These
+  are useful for people that often switch from dark to light themes in their terminal emulator
+  or for people that want the colors to match their terminal theme colors. For more details,
+  see #543 and #490 (@mk12, implementation idea by @trishume)
+- Hand-written auto completion script for Fish shell, see #524 and #555 (@ev-dev and @eth-p)
+- The `-p`/`--plain` option can now be used twice (typically `-pp`). The first `-p` switches the
+  `--style` to "plain". The second `-p` disables the pager. See #560 and #552 (@eth-p)
+
+## Bugfixes
+
+- Do not replace arguments to `less` when using `--pager`, see #509
+- Binary files will now be indicated by a warning in interactive mode, see #530 #466 #550 (@maxfilov)
+- Empty files are (once again) printed with a single header line, see #504 and #566 (@reidwagner
+  and @sharkdp)
+- `--terminal-width=0` is now disallowed, see #559 (@eth-p)
+- Accidental printing of files named `cache`, see #557
+
+## Other
+
+- New integration tests, see #500 and #502 (@reidwagner and @sharkdp)
+- New ["Integration with other tools"](https://github.com/sharkdp/bat#integration-with-other-tools) section in the README.
+- Migrated to Rust 2018 (@expobrain)
+
+## New syntaxes
+
+- F# syntax has been updated, see #531 (@stroborobo)
+- Fish shell, see #548 (@sanga)
+
+## Packaging
+
+- `bat` is now available on Chocolatey, see #541 (@rasmuskriest)
+
+# v0.10.0
+
+## Features
+
+- Added new `--highlight-line <N>` option, see #453, #346 and #175 (@tskinn and @sharkdp)
+
+## Changes
+
+- **Change the default configuration directory on macOS** to `~/.config/bat`, see #442 (@lavifb). If you are on macOS, you need to copy your configuration directory from the previous place (`~/Library/Preferences/bat`) to the new place (`~/.config/bat`).
+- Completely disabled the generation of shell completion files, see #372
+- Properly set arguments to `less` if `PAGER` environment variable contains something like `less -F` (which is missing the `-R` option), see #430 (@majecty)
+- Report the name of missing files, see #444 (@ufuji1984)
+- Don't start pager if file doesn't exist, see #387
+- Rename `bat cache --init` to `bat cache --build`, see #498
+- Move the `--config-dir` and `--cache-dir` options from `bat cache` to `bat` and hide them from the help text.
+
+## Bugfixes
+
+- Blank line at the end of output when using `--style=plain`, see #379
+- EOF must be sent twice on stdin if no other input is sent, see #477 (@reidwagner)
+
+## New syntaxes
+
+- Twig (@ahmedelgabri)
+- `.desktop` files (@jleclanche)
+- AsciiDoc (@markusthoemmes)
+- Assembly (x86_64 and ARM)
+- Log files (@caos21)
+- Protobuf and ProtobufText (@caos21)
+- Terraform (@caos21)
+- Jsonnet (@hfm)
+- Varlink (@haraldh)
+
+## Other
+
+- Added Japanese version of README (@sh-tech and @object1037)
+- Code improvements (@barskern)
+
+# v0.9.0
+
+## Features
+
+- A new `-A`/`--show-all` option has been added to show and highlight non-printable characters (in analogy to GNU `cat`s option):
+
+  ![](https://camo.githubusercontent.com/c3e769482ef3184f6be6adaa34bdc8d19c378254/68747470733a2f2f692e696d6775722e636f6d2f324b54486859542e706e67)
+
+  see #395 and #381 for more details.
+
+- Added `--pager` option (to configure the pager from the configuration file), see #362 (@majecty)
+
+- Added `BAT_CONFIG_PATH` environment variable to set a non-default path for `bat`s configuration file, see #375 (@deg4uss3r)
+
+- Allow for multiple occurences of `--style` to allow for the configuration
+  of styles from the config file, see #367 (@sindreij)
+
+- Allow for multiple `--line-range` arguments, see #23
+
+- The `--terminal-width` option can now also accept offsets, see #376
+
+## Changes
+
+- Use of italics is now *disabled by default* (see #389 for details). They can be
+  re-enabled by adding `--italic-text=always` to your configuration file.
+
+- The default tab-width has been set to 4.
+
+- Added new "Sublime Snazzy" theme.
+
+- Shell completions are currently *not* shipped anymore, see #372 for details.
+
+## Bugfixes
+
+- Avoid endless recursion when `PAGER="bat"`, see #383 (@rodorgas)
+
+## Other
+
+- `bat` is now available on openSUSE, see #405 (@dmarcoux)
+
+- Added section about the new configuration file in the README (@deg4uss3r)
+
+- Chinese translation of README (@chinanf-boy)
+
+- Re-written tests for `--tabs` (@choznerol)
+
+- Speed up integration tests, see #394
+
+# v0.8.0
+
+## Features
+
+- Support for a configuration file with the following simple format:
+
+  ```bash
+  --tabs=4
+  --theme="Sublime Snazzy"
+
+  # A line-comment
+  --map-syntax .ignore:.gitignore
+  --map-syntax PKGBUILD:bash
+  --map-syntax Podfile:ruby
+
+  # Flags and options can also be on a single line:
+  --wrap=never --paging=never
+  ```
+
+  The configuration file path can be accessed via `bat --config-file`. On Linux,
+  it is stored in `~/.config/bat/config`.
+
+- Support for the `BAT_OPTS` environment variable with the same format as specified
+  above (in a single line). This takes precedence over the configuration file.
+
+  See also #310.
+
+- Support for custom syntax mappings via the `-m`/`--max-syntax` option.
+
+  This allows users to (re)map certain file extensions or file names to an existing syntax:
+
+  ``` bash
+  bat --map-syntax .config:json ...
+  ```
+
+  The option can be use multiple times. Note that you can easily make these mappings permanent by using bats new configuration file.
+
+  See #169
+
+- Support pager command-line arguments in `PAGER` and `BAT_PAGER`, see #352 (@Foxboron)
+
+- Add support for wildcards in Windows CMD, see #309 (@zxey)
+
+- First-line syntax detection for all input types, see #205
+
+- Encoding support for UTF-16LE and UTF-16BE, see #285
+
+- New syntaxes: Robot framework (@sanga)
+
+## Changes
+
+- Binary files are now detected and not displayed when the output goes to an interactive terminal, see #205
+
+## Bugfixes
+
+- JavaDoc comments break syntax highlighting in .java files, see #81
+
+- Bat Panics on Haskell Source Code, see #314
+
+## Other
+
+- Better `-h` and `--help` texts.
+
+- Updated documentation on how to configure `bat`s pager
+
+- Updated documentation for light backgrounds, see #328 (@russtaylor)
+
+- Generate shell completions during build, see #115 (@davideGiovannini)
+
+- A lot of new tests have been written
+
+- `bat` is now available via [Termux](https://termux.com/), see #341 (@fornwall)
+
+- `bat` is now available via [nix](https://nixos.org/nix), see #344 (@mgttlinger)
+
+- `bat` is now available via [Docker](https://hub.docker.com/r/danlynn/bat/), see #331 (@danlynn)
+
+# v0.7.1
+
+## Features
+
+- Use the `ansi_colours` package by @mina86 for better true-color approximation on 8 bit color terminals, see #319 and #202.
+
+## Bugfixes
+
+- Bat Panics on Haskell Source Code, see #314
+- Disable wrapping when `--style=plain`/`-p` is used, see #289
+
+## Other
+
+- Added Ansible install instructions (@aeimer)
+- Added section about Cygwin to the README (@eth-p)
+
+# v0.7.0
+
+## Features
+
+- Tabs are now (optionally) expanded to spaces. This can be controlled with the new
+  `--tabs` command-line option or the `BAT_TABS` environment variable. The
+  new feature also closes two bugs #166 and #184. For more information, see #302 (@eth-p).
+
+- Added support for the `BAT_STYLE` environment variable, see #208 (@ms2300)
+
+- Added `OneHalf` theme for terminals with a light-gray background, see #256
+
+- Added new syntaxes for CSV, JSX in JavaScript and TypeScript, Cabal, Dart,
+  F#, PureScript, Swift, Crystal, PowerShell (Many Thanks to @tobenna and @mimadrid)
+
+## Changes
+
+- Query `git diff` only when needed, see #303 (@ShikChen)
+
+- Disable wrapping when `--plain` is used, see #289 (@eth-p)
+
+## Bugfixes
+
+- Can read files named `cache`, see #275 (@BK1603)
+
+- A lot of bugfixes for Windows, see #252, #264
+
+- Detect `less` reliably and in a portable way, see #271 and #290 (@Aankhen)
+
+- last decoration line is not formatted properly with `--wrap never`, see #299 (@Rogach)
+
+- Do not show file header for directories, see #292
+
+## Other
+
+- Enabled a new `aarch64` build target, see #258 (@rachitchokshi)
+
+- Provide Debian packages for `armhf`, see #280 (@rachitchokshi)
+
+- Added README section about "`bat` on Windows" (@Aankhen)
+
+- Windows installation via scoop (@meltinglava)
+
+# v0.6.1
+
+## Bugfixes
+
+- Fixed panic when running `bat --list-languages | head`, see #232 (@mchlrhw)
+- Respect `--color` settings for `--list-themes` and `--list-languages`, see #233
+- Git modifications now work on Windows
+
+## Other
+
+- There will be auto-generated Windows releases, starting with this version (@anykao)
+
+# v0.6.0
+
+## Features
+
+- The `--list-themes` option now shows a preview for each highlighting theme (@ms2300)
+- Added `-p`/`--plain` as an alias for `--style=plain`, see #212 (@ms2300)
+- Major refactorings, enabling some progress on #150. In non-interactive mode, `bat` will now copy input bytes 1:1.
+- New languages: Elm, Kotlin, Puppet, TypeScript, see #215 #216 #217 #218
+- New syntax highlighting theme: zenburn (@colindean)
+
+## Changes
+
+- New themes in `$BAT_CONFIG_DIR/themes` are now loaded *in addition* to
+  the default themes (they may also override), see #172
+- The `Default.tmTheme` symlink is not necessary anymore.
+
+## Bugfixes
+
+* Using `bat cache --init` leads to duplicated syntaxes, see #206
+
+## Other
+
+* Extended and cleaned-up `--help` text.
+* Added initial version of a man page, see #52
+* New README sections: *Development* and *Troubleshooting*, see #220
+
+# v0.5.0
+
+## Features
+
+- Added `--line-range n:m` option to print a range of lines, see #159 (@tskinn)
+- The syntax highlighting theme can now be controlled by the `BAT_THEME` environment variable, see [README](https://github.com/sharkdp/bat#highlighting-theme) and #177 (@mandx)
+- The `PAGER` and `BAT_PAGER` environment variables can be used to control the pager that `bat` uses, see #158 and the [new README section](https://github.com/sharkdp/bat#using-a-different-pager)
+- Added syntax highlighting for Nix, see #180
+- Added syntax highlighting for AWK (Gert Hulselmans)
+
+## Changes
+
+- The customization of syntax sets and theme sets is now separated. Syntax definitions are now loaded *in addition* to the ones that are stored in the `bat` binary by default. Please refer to these new sections in the README: [Adding new syntaxes](https://github.com/sharkdp/bat#adding-new-syntaxes--language-definitions), [Adding new themes](https://github.com/sharkdp/bat#adding-new-themes), also see #172
+- The color for the filename is now the default foreground color. The colors for the grid and the line numbers is now determined from the syntax highlighting theme, which now also works for light backgrounds, see #178.
+
+## Bugfixes
+
+- Escape Sequences get partially stripped, see #182 (@eth-p)
+- Use separate Git repository for snapshot testing, see #165 and #161
+- Markdown breaking on JavaScript, see #183
+
+## Other
+
+- Binaries for armv7 are now provided, see #196
+- `bat` is now in the official [Arch package repositories](https://www.archlinux.org/packages/community/x86_64/bat/).
+- Optimizations in the RGB => 8-bit conversion (@mina86)
+
+# v0.4.1
+
+(this is just a small bugfix release, see 0.4.0 for all features and changes)
+
+## Bugfixes
+
+- Fix problem with `cargo test` when `bat` is not checked out in a Git repository, see #161
+
+# v0.4.0
+
+## Features
+
+* Support for line-wrapping, see #54 and #102 (@eth-p)
+* New and updated `--style` parameter, see #74 and README (@pitkley)
+* Added `--theme` and `--list-themes` options, see #89 (@rleungx)
+* Added syntax highlighting for: Julia (@iamed2), Dockerfiles, VimL, CMake, INI, Less
+* Added a few popular Sublime Text highlighting themes, see #133
+* Support for bold, italic and underline font styles, see #96
+* Support for 32bit systems is now available, see #84
+* Added `-u` and `-n` options, see #134
+* ANSI color support on Windows 10
+
+## Changes
+
+* The customization folder for own syntaxes has been renamed from `syntax` to `syntaxes`, see README.
+* Changed Markdown syntax to the default Sublime Text syntax, see #157
+* Sorted language listing (@rleungx)
+* Command line arguments like `--theme` or `--color` can now override themselves.
+* Improved `--help` text.
+
+## Bugfixes
+
+- Fixed crash for (really) small terminal sizes, see #117 (@eth-p)
+- Syntax detection for `.bashrc`, `CMakeLists.txt` etc., see #100
+- Properly handle lines with invalid UTF-8, see #7 (@BrainMaestro)
+- Better error handling, see #17 (@rleungx and @sharkdp)
+- Proper handling of UTF-8 characters in `less`, see #98 (@ghuls)
+- Build fix on nightly, see #148 (@tathanhdinh)
+
+## Other
+
+- [Comparison with alternative projects](https://github.com/sharkdp/bat/blob/master/doc/alternatives.md).
+- New "bat" logo in the README, see #119 (@jraulhernandezi)
+- Output test cases (@BrainMaestro)
+- Lots of great refactoring work (@BrainMaestro)
+
+# v0.3.0
+
+## Features
+
+* Automatic paging by integrating with `less`, see #29 (@BrainMaestro)
+* Added support for reading from standard input, see #2
+* Added support for writing to non-interactive terminals (pipes, files, ..); new
+  `--color=auto/always/never` option, see #26 (@BrainMaestro)
+* Added `--list-languages` option to print all available syntaxes, see #69 (@connorkuehl)
+* New option to specify the syntax via `-l`/`--language`, see #19 (@BrainMaestro)
+* New option to control the output style (`--style`), see #5 (@nakulcg)
+* Added syntax highlighting support for TOML files, see #37
+
+## Changes
+
+* The `init-cache` sub-command has been removed. The cache can now be controlled via
+  `bat cache`. See `bat cache -h` for all available commands.
+
+## Bug fixes
+
+* Get git repository from file path instead of current directory, see #22 (@nakulcg)
+* Process substitution can now be used with bat (`bat <(echo a) <(echo b)`), see #80
+
+## Thanks
+
+I'd like to say a big THANK YOU to all contributors and everyone that has given us
+some form of feedback.
+
+Special thanks go to @BrainMaestro for his huge support with new features, bug reports
+and code reviews!
+
+# v0.2.3
+
+- Added a new statically linked version of bat (`..-musl-..`)
+
+# v0.2.2
+
+- Remove openssl dependency completely, see #30.
+
+# v0.2.1
+
+- Added Elixir syntax, see #25.
+- Use libcurl-openssl instead of libcurl-gnutls, see #30.
+
+# v0.2.0
+
+- Support for custom syntaxes, add 'Markdown extended' theme
+- Bugfix: Git modifications not shown from child folder
+
+# v0.1.0
+
+Initial release

CONTRIBUTING.md

@@ -0,0 +1,48 @@
+# Contributing
+
+Thank you for considering to contribute to `bat`!
+
+
+
+## Add an entry to the changelog
+
+If your contribution changes the behavior of `bat` (as opposed to a typo-fix
+in the documentation), please update the [`CHANGELOG.md`](CHANGELOG.md) file
+and describe your changes. This makes the release proess much easier and
+therefore helps to get your changes into a new `bat` release faster.
+
+The top of the `CHANGELOG` contains a *"unreleased"* section with a few
+subsections (Features, Bugfixes, …). Please add your entry to the subsection
+that best describes your change
+
+Entries follow this format:
+```
+- Short description of what has been changed, see #123 (@user)
+```
+Here, `#123` is the number of the original issue and/or your pull request.
+Please replace `@user` by your GitHub username.
+
+
+## Development
+
+Please check out the [Development](https://github.com/sharkdp/bat#development)
+section in the README.
+
+
+## Adding a new feature
+
+Please consider opening a
+[feature request ticket](https://github.com/sharkdp/bat/issues/new?assignees=&labels=feature-request&template=feature_request.md)
+first in order to give us a chance to discuss the feature first.
+
+
+## Adding new syntaxes/languages or themes
+
+Before you make a pull request that adds a new syntax or theme, please read
+the [Customization](https://github.com/sharkdp/bat#customization) section
+in the README first.
+
+If you really think that a particular syntax or theme should be added for all
+users, please read the corresponding
+[documentation](https://github.com/sharkdp/bat/blob/master/doc/assets.md)
+first.

Cargo.toml

@@ -7,7 +7,7 @@ license = "MIT/Apache-2.0"
 name = "bat"
 readme = "README.md"
 repository = "https://github.com/sharkdp/bat"
-version = "0.12.0"
+version = "0.17.1"
 exclude = [
     "assets/syntaxes/*",
     "assets/themes/*",
@@ -15,42 +15,71 @@ exclude = [
 build = "build.rs"
 edition = '2018'
 
+[features]
+default = ["application"]
+# Feature required for bat the application. Should be disabled when depending on
+# bat as a library.
+application = [
+    "atty",
+    "clap",
+    "dirs",
+    "git",
+    "lazy_static",
+    "paging",
+    "wild",
+    "regex-onig",
+]
+git = ["git2"] # Support indicating git modifications
+paging = ["shell-words"] # Support applying a pager on the output
+regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
+regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine
+
 [dependencies]
-atty = "0.2.13"
-ansi_term = "0.12"
+atty = { version = "0.2.14", optional = true }
+ansi_term = "^0.12.1"
 ansi_colours = "^1.0"
-console = "0.8"
-dirs = "2.0"
-lazy_static = "1.4"
-wild = "2.0"
+console = "0.13.0"
+dirs = { version = "3.0", optional = true }
+lazy_static = { version = "1.4", optional = true }
+wild = { version = "2.0", optional = true }
 content_inspector = "0.2.4"
 encoding = "0.2"
-shell-words = "0.1.0"
+shell-words = { version = "1.0.0", optional = true }
+unicode-width = "0.1.8"
+globset = "0.4"
+serde = { version = "1.0", features = ["derive"] }
+serde_yaml = "0.8"
+semver = "0.11"
+path_abs = { version = "0.5", default-features = false }
 
 [dependencies.git2]
-version = "0.10"
+version = "0.13"
+optional = true
 default-features = false
-features = []
 
 [dependencies.syntect]
-version = "3.2.1"
+version = "4.4.0"
 default-features = false
 features = ["parsing", "yaml-load", "dump-load", "dump-create"]
 
 [dependencies.clap]
 version = "2.33"
+optional = true
 default-features = false
 features = ["suggestions", "color", "wrap_help"]
 
 [dependencies.error-chain]
 version = "0.12"
 default-features = false
-features = []
 
 [dev-dependencies]
 tempdir = "0.3"
-assert_cmd = "0.11.1"
-escargot = "0.5.0"
+assert_cmd = "1.0.1"
+predicates = "1.0.5"
 
 [build-dependencies]
-clap = "2.33"
+clap = { version = "2.33", optional = true }
+
+[profile.release]
+lto = true
+codegen-units = 1

LICENSE-MIT

@@ -1,4 +1,4 @@
-Copyright (c) 2018 bat-developers (https://github.com/sharkdp/bat).
+Copyright (c) 2018-2020 bat-developers (https://github.com/sharkdp/bat).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,6 @@
 <p align="center">
   <img src="doc/logo-header.svg" alt="bat - a cat clone with wings"><br>
-  <a href="https://travis-ci.org/sharkdp/bat"><img src="https://travis-ci.org/sharkdp/bat.svg?branch=master" alt="Build Status"></a>
-  <a href="https://ci.appveyor.com/project/sharkdp/bat"><img src="https://ci.appveyor.com/api/projects/status/cptsmtbiwbnr2vhf?svg=true"></a>
+  <a href="https://github.com/sharkdp/bat/actions?query=workflow%3ACICD"><img src="https://github.com/sharkdp/bat/workflows/CICD/badge.svg" alt="Build Status"></a>
   <img src="https://img.shields.io/crates/l/bat.svg" alt="license">
   <a href="https://crates.io/crates/bat"><img src="https://img.shields.io/crates/v/bat.svg?colorB=319e8c" alt="Version info"></a><br>
   A <i>cat(1)</i> clone with syntax highlighting and Git integration.
@@ -12,8 +11,8 @@
   <a href="#how-to-use">How To Use</a> •
   <a href="#installation">Installation</a> •
   <a href="#customization">Customization</a> •
-  <a href="#project-goals-and-alternatives">Project goals, alternatives</a> •
-  Translation [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>][<a href="doc/README-ja.md">日本文</a>]
+  <a href="#project-goals-and-alternatives">Project goals, alternatives</a><br>
+  [<a href="https://github.com/chinanf-boy/bat-zh">中文</a>] [<a href="doc/README-ja.md">日本語</a>] [<a href="doc/README-ko.md">한국어</a>] [<a href="doc/README-ru.md">Русский</a>]
 </p>
 
 ### Syntax highlighting
@@ -39,14 +38,14 @@ characters:
 
 ### Automatic paging
 
-`bat` can pipe its own output to `less` if the output is too large for one screen.
+By default, `bat` pipes its own output to a pager (e.g `less`) if the output is too large for one screen.
+If you would rather `bat` work like `cat` all the time (never page output), you can set `--paging=never` as an option, either on the command line or in your configuration file.
+If you intend to alias `cat` to `bat` in your shell configuration, you can use `alias cat='bat --paging=never'` to preserve the default behavior.
 
-### File concatenation
+#### File concatenation
 
-Oh.. you can also use it to concatenate files :wink:. Whenever
-`bat` detects a non-interactive terminal (i.e. when you pipe into another process
-or into a file), `bat` will act as a drop-in replacement for `cat` and
-fall back to printing the plain file contents.
+Even with a pager set, you can still use `bat` to concatenate files :wink:.
+Whenever `bat` detects a non-interactive terminal (i.e. when you pipe into another process or into a file), `bat` will act as a drop-in replacement for `cat` and fall back to printing the plain file contents, regardless of the `--pager` option's value.
 
 ## How to use
 
@@ -62,7 +61,9 @@ Display multiple files at once
 > bat src/*.rs
 ```
 
-Read from stdin, determine the syntax automatically
+Read from stdin, determine the syntax automatically (note, highlighting will
+only work if the syntax can be determined from the first line of the file,
+usually through a shebang such as `#!/bin/sh`)
 
 ```bash
 > curl -s https://sh.rustup.rs | bat
@@ -105,6 +106,14 @@ If you happen to use [`fd`](https://github.com/sharkdp/fd), you can use the `-X`
 fd … -X bat
 ```
 
+#### `ripgrep`
+
+With [`batgrep`](https://github.com/eth-p/bat-extras/blob/master/doc/batgrep.md), `bat` can be used as the printer for [`ripgrep`](https://github.com/BurntSushi/ripgrep) search results.
+
+```bash
+batgrep needle src/
+```
+
 #### `tail -f`
 
 `bat` can be combined with `tail -f` to continuously monitor a given file with syntax highlighting.
@@ -114,7 +123,7 @@ tail -f /var/log/pacman.log | bat --paging=never -l log
 Note that we have to switch off paging in order for this to work. We have also specified the syntax
 explicitly (`-l log`), as it can not be auto-detected in this case.
 
-#### `git show`
+#### `git`
 
 You can combine `bat` with `git show` to view an older version of a given file with proper syntax
 highlighting:
@@ -122,6 +131,19 @@ highlighting:
 git show v0.6.0:src/main.rs | bat -l rs
 ```
 
+#### `git diff`
+
+You can combine `bat` with `git diff` to view lines around code changes with proper syntax
+highlighting:
+```bash
+batdiff() {
+    git diff --name-only --diff-filter=d | xargs bat --diff
+}
+```
+If you prefer to use this as a separate tool, check out `batdiff` in [`bat-extras`](https://github.com/eth-p/bat-extras).
+
+If you are looking for more support for git and diff operations, check out [`delta`](https://github.com/dandavison/delta).
+
 #### `xclip`
 
 The line numbers and Git modification markers in the output of `bat` can make it hard to copy
@@ -134,24 +156,62 @@ bat main.cpp | xclip
 
 #### `man`
 
-`bat` can be used as a pager for `man`. It can be used like this:
-```
-export MANPAGER="sh -c 'col -b | bat -l man -p'"
+`bat` can be used as a colorizing pager for `man`, by setting the
+`MANPAGER` environment variable:
 
+```bash
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 man 2 select
 ```
 
-The [Manpage syntax](assets/syntaxes/Manpage.sublime-syntax) is developed in this repository and still needs some work.
+It might also be necessary to set `MANROFFOPT="-c"` if you experience
+formatting problems.
+
+If you prefer to have this bundled in a new command, you can also use [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md).
+
+Note that the [Manpage syntax](assets/syntaxes/02_Extra/Manpage.sublime-syntax) is developed in this repository and still needs some work.
+
+Also, note that this will [not work](https://github.com/sharkdp/bat/issues/1145) with Mandocs `man` implementation.
+
+#### `prettier` / `shfmt` / `rustfmt`
+
+The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.
+
 
 ## Installation
 
-### On Ubuntu
+[![Packaging status](https://repology.org/badge/vertical-allrepos/bat.svg)](https://repology.org/project/bat/versions)
+
+### On Ubuntu (using `apt`)
 *... and other Debian-based Linux distributions.*
 
-Download the latest `.deb` package from the [release page](https://github.com/sharkdp/bat/releases)
-and install it via:
+`bat` is making its way through the [Ubuntu](https://packages.ubuntu.com/eoan/bat) and
+[Debian](https://packages.debian.org/sid/bat) package release process, and is available
+for Ubuntu as of Eoan 19.10. On Debian `bat` is currently only available on the unstable
+"Sid" branch.
+
+If your Ubuntu/Debian installation is new enough you can simply run:
+
+```bash
+apt install bat
+```
+
+If you install `bat` this way, please note that the executable may be installed as `batcat` instead of `bat` (due to [a name
+clash with another package](https://github.com/sharkdp/bat/issues/982)). You can set up a `bat -> batcat` symlink or alias to prevent any issues that may come up because of this and to be consistent with other distributions:
 ``` bash
-sudo dpkg -i bat_0.12.0_amd64.deb  # adapt version number and architecture
+mkdir -p ~/.local/bin
+ln -s /usr/bin/batcat ~/.local/bin/bat
+```
+
+### On Ubuntu (using most recent `.deb` packages)
+*... and other Debian-based Linux distributions.*
+
+If the package has not yet been promoted to your Ubuntu/Debian installation, or you want
+the most recent release of `bat`, download the latest `.deb` package from the
+[release page](https://github.com/sharkdp/bat/releases) and install it via:
+
+```bash
+sudo dpkg -i bat_0.17.1_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
@@ -192,7 +252,7 @@ emerge sys-apps/bat
 ### On Void Linux
 
 You can install `bat` via xbps-install:
-```
+```bash
 xbps-install -S bat
 ```
 
@@ -223,68 +283,54 @@ nix-env -i bat
 
 You can install `bat` with zypper:
 
-```
+```bash
 zypper install bat
 ```
 
-### On macOS
+### On macOS (or Linux) via Homebrew
 
-You can install `bat` with [Homebrew](http://braumeister.org/formula/bat):
+You can install `bat` with [Homebrew on MacOS](https://formulae.brew.sh/formula/bat) or [Homebrew on Linux](https://formulae.brew.sh/formula-linux/bat):
 
 ```bash
 brew install bat
 ```
 
-### On Windows
+### On macOS via MacPorts
 
-You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases),
-or install it with [scoop](https://scoop.sh/) or [Chocolatey](https://chocolatey.org):
+Or install `bat` with [MacPorts](https://ports.macports.org/port/bat/summary):
 
 ```bash
-scoop install bat
+port install bat
 ```
 
+### On Windows
+
+There are a few options to install `bat` on Windows. Once you have installed `bat`,
+take a look at the ["Using `bat` on Windows"](#using-bat-on-windows) section.
+
+#### Prerequisites
+
+You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
+
+#### With Chocolatey
+
+You can install `bat` via [Chocolatey](https://chocolatey.org/packages/Bat):
 ```bash
 choco install bat
 ```
 
-[See below](#using-bat-on-windows) for notes.
+#### With Scoop
 
-### Via Docker
-
-There is a [Docker image](https://hub.docker.com/r/danlynn/bat/) that you can use to run `bat` in a container:
+You can install `bat` via [scoop](https://scoop.sh/):
 ```bash
-docker pull danlynn/bat
-alias bat='docker run -it --rm -e BAT_THEME -e BAT_STYLE -e BAT_TABS -v "$(pwd):/myapp" danlynn/bat'
+scoop install bat
 ```
 
-### Via Ansible
+#### From prebuilt binaries:
 
-You can install `bat` with [Ansible](https://www.ansible.com/):
+You can download prebuilt binaries from the [Release page](https://github.com/sharkdp/bat/releases),
 
-```bash
-# Install role on local machine
-ansible-galaxy install aeimer.install_bat
-```
-
-```yaml
----
-# Playbook to install bat
-- host: all
-  roles:
-    - aeimer.install_bat
-```
-
-- [Ansible Galaxy](https://galaxy.ansible.com/aeimer/install_bat)
-- [GitHub](https://github.com/aeimer/ansible-install-bat)
-
-This should work with the following distributions:
-- Debian/Ubuntu
-- ARM (eg. Raspberry PI)
-- Arch Linux
-- Void Linux
-- FreeBSD
-- MacOS
+You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
 
 ### From binaries
 
@@ -294,15 +340,15 @@ binaries are also available: look for archives with `musl` in the file name.
 
 ### From source
 
-If you want to build `bat` from source, you need Rust 1.35 or
+If you want to build `bat` from source, you need Rust 1.40 or
 higher. You can then use `cargo` to build everything:
 
 ```bash
-cargo install bat
+cargo install --locked bat
 ```
 
-You may have to install `cmake` and the `libz` development package
-(`libz-dev` or `libz-devel`) in order for the build to succeed.
+Note that additional files like the man page or shell completion
+files can not be installed in this way. They will be generated by `cargo` and should be available in the cargo target folder (under `build`).
 
 ## Customization
 
@@ -317,7 +363,7 @@ make the change permanent. Alternatively, use `bat`s
 
 If you want to preview the different themes on a custom file, you can use
 the following command (you need [`fzf`](https://github.com/junegunn/fzf) for this):
-``` bash
+```bash
 bat --list-themes | fzf --preview="bat --theme={} --color=always /path/to/file"
 ```
 
@@ -326,6 +372,26 @@ light background, some themes like `GitHub` or `OneHalfLight` will work better f
 You can also use a custom theme by following the
 ['Adding new themes' section below](https://github.com/sharkdp/bat#adding-new-themes).
 
+### 8-bit themes
+
+`bat` has four themes that always use [8-bit colors](https://en.wikipedia.org/wiki/ANSI_escape_code#Colors),
+even when truecolor support is available:
+
+- `ansi-dark` looks decent on any terminal with a dark background. It uses 3-bit colors: black, red,
+  green, yellow, blue, magenta, cyan, and white.
+- `ansi-light` is like `ansi-dark`, but for terminals with a light background.
+- `base16` is designed for [base16](https://github.com/chriskempson/base16) terminal themes. It uses
+  4-bit colors (3-bit colors plus bright variants) in accordance with the
+  [base16 styling guidelines](https://github.com/chriskempson/base16/blob/master/styling.md).
+- `base16-256` is designed for [base16-shell](https://github.com/chriskempson/base16-shell).
+  It replaces certain bright colors with 8-bit colors from 16 to 21. **Do not** use this simply
+  because you have a 256-color terminal but are not using base16-shell.
+
+Although these themes are more restricted, they have two advantages over truecolor themes:
+
+- They harmonize better with other terminal software using 3-bit or 4-bit colors.
+- When you change your terminal theme, `bat` output already on the screen will update to match.
+
 ### Output style
 
 You can use the `--style` option to control the appearance of `bat`s output.
@@ -336,35 +402,45 @@ variable to make these changes permanent or use `bat`s
 
 ### Adding new syntaxes / language definitions
 
+Should you find that a particular syntax is not available within `bat`, you can follow these
+instructions to easily add new syntaxes to your current `bat` installation.
+
 `bat` uses the excellent [`syntect`](https://github.com/trishume/syntect/)
 library for syntax highlighting. `syntect` can read any
 [Sublime Text `.sublime-syntax` file](https://www.sublimetext.com/docs/3/syntax.html)
-and theme. To add new syntax definitions, do the following.
+and theme.
 
-Create a folder with syntax definition files:
+A good resource for finding Sublime Syntax packages is [Package Control](https://packagecontrol.io/). Once you found a
+syntax:
 
-```bash
-mkdir -p "$(bat --config-dir)/syntaxes"
-cd "$(bat --config-dir)/syntaxes"
+1. Create a folder with syntax definition files:
 
-# Put new '.sublime-syntax' language definition files
-# in this folder (or its subdirectories), for example:
-git clone https://github.com/tellnobody1/sublime-purescript-syntax
-```
+   ```bash
+   mkdir -p "$(bat --config-dir)/syntaxes"
+   cd "$(bat --config-dir)/syntaxes"
 
-Now use the following command to parse these files into a binary cache:
+   # Put new '.sublime-syntax' language definition files
+   # in this folder (or its subdirectories), for example:
+   git clone https://github.com/tellnobody1/sublime-purescript-syntax
+   ```
 
-```bash
-bat cache --build
-```
+2. Now use the following command to parse these files into a binary cache:
 
-Finally, use `bat --list-languages` to check if the new languages are available.
+   ```bash
+   bat cache --build
+   ```
 
-If you ever want to go back to the default settings, call:
+3. Finally, use `bat --list-languages` to check if the new languages are available.
 
-```bash
-bat cache --clear
-```
+   If you ever want to go back to the default settings, call:
+
+   ```bash
+   bat cache --clear
+   ```
+
+4. If you think that a specific syntax should be included in `bat` by default, please
+   consider opening a "syntax request" ticket after reading the policies and
+   instructions [here](doc/assets.md): [Open Syntax Request](https://github.com/sharkdp/bat/issues/new?labels=syntax-request&template=syntax_request.md).
 
 ### Adding new themes
 
@@ -384,6 +460,33 @@ bat cache --build
 
 Finally, use `bat --list-themes` to check if the new themes are available.
 
+### Adding or changing file type associations
+
+You can add new (or change existing) file name patterns using the `--map-syntax`
+command line option. The option takes an argument of the form `pattern:syntax` where
+`pattern` is a glob pattern that is matched against the file name and
+the absolute file path. The `syntax` part is the full name of a supported language
+(use `bat --list-languages` for an overview)full .
+
+Note: You probably want to use this option as an entry in `bat`s configuration file instead
+of passing it on the command line (see below).
+
+Example: To use "INI" syntax highlighting for all files with a `.conf` file extension, use
+```bash
+--map-syntax='*.conf:INI'
+```
+
+Example: To open all files called `.ignore` (exact match) with the "Git Ignore" syntax, use:
+```bash
+--map-syntax='.ignore:Git Ignore'
+```
+
+Example: To open all `.conf` files in subfolders of `/etc/apache2` with the "Apache Conf"
+syntax, use (this mapping is already built in):
+```bash
+-map-syntax='/etc/apache2/**/*.conf:Apache Conf'
+```
+
 ### Using a different pager
 
 `bat` uses the pager that is specified in the `PAGER` environment variable. If this variable is not
@@ -401,18 +504,40 @@ export BAT_PAGER="less -RF"
 Instead of using environment variables, you can also use `bat`s [configuration file](https://github.com/sharkdp/bat#configuration-file) to configure the pager (`--pager` option).
 
 **Note**: By default, if the pager is set to `less` (and no command-line options are specified),
-`bat` will pass the following command line
-options to the pager: `-R`/`--RAW-CONTROL-CHARS`, `-F`/`--quit-if-one-screen` and `-X`/`--no-init`.
-The first (`-R`) is needed to interpret ANSI colors correctly. The second option (`-F`) instructs
+`bat` will pass the following command line options to the pager: `-R`/`--RAW-CONTROL-CHARS`,
+`-F`/`--quit-if-one-screen` and `-X`/`--no-init`. The last option (`-X`) is only used for `less`
+versions older than 530.
+
+The `-R` option is needed to interpret ANSI colors correctly. The second option (`-F`) instructs
 less to exit immediately if the output size is smaller than the vertical size of the terminal.
 This is convenient for small files because you do not have to press `q` to quit the pager. The
 third option (`-X`) is needed to fix a bug with the `--quit-if-one-screen` feature in old versions
-of `less`. Unfortunately, it also breaks mouse-wheel support in `less`. If you want to enable
-mouse-wheel scrolling, you can either pass just `-R` (as in the example above, this will disable
-the quit-if-one-screen feature), or you can use a recent version of `less` and pass `-RF` which
-will hopefully enable both quit-if-one-screen and mouse-wheel scrolling.
+of `less`. Unfortunately, it also breaks mouse-wheel support in `less`.
+
+If you want to enable mouse-wheel scrolling on older versions of `less`, you can pass just `-R` (as
+in the example above, this will disable the quit-if-one-screen feature). For less 530 or newer,
+it should work out of the box.
+
+### Indentation
+
+`bat` expands tabs to 4 spaces by itself, not relying on the pager. To change this, simply add the
+`--tabs` argument with the number of spaces you want to be displayed.
+
+**Note**: Defining tab stops for the pager (via the `--pager` argument by `bat`, or via the `LESS`
+environment variable for `less`) won't be taken into account because the pager will already get
+expanded spaces instead of tabs. This behaviour is added to avoid indentation issues caused by the
+sidebar. Calling `bat` with `--tabs=0` will override it and let tabs be consumed by the pager.
+
+### Dark mode
+
+If you make use of the dark mode feature in macOS, you might want to configure `bat` to use a different
+theme based on the OS theme. The following snippet uses the `default` theme when in the _dark mode_
+and the `GitHub` theme when in the _light mode_.
+
+```bash
+alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"
+```
 
-If scrolling still doesn't work for you, you can try to pass the `-S` option in addition.
 
 ## Configuration file
 
@@ -428,6 +553,11 @@ non-default location of the configuration file:
 export BAT_CONFIG_PATH="/path/to/bat.conf"
 ```
 
+A default configuration file can be created with the `--generate-config-file` option.
+```bash
+bat --generate-config-file
+```
+
 ### Format
 
 The configuration file is a simple list of command line arguments. Use `bat --help` to see a full list of possible options and values. In addition, you can add comments by prepending a line with the `#` character.
@@ -443,21 +573,18 @@ Example configuration file:
 # Use italic text on the terminal (not supported on all terminals)
 --italic-text=always
 
-# Add mouse scrolling support in less (does not work with older
-# versions of "less")
---pager="less -FR"
-
-# Use C++ syntax (instead of C) for .h header files
---map-syntax h:cpp
-
-# Use "gitignore" highlighting for ".ignore" files
---map-syntax .ignore:.gitignore
+# Use C++ syntax for .ino files
+--map-syntax "*.ino:C++"
 ```
 
 ## Using `bat` on Windows
 
 `bat` mostly works out-of-the-box on Windows, but a few features may need extra configuration.
 
+### Prerequisites
+
+You will need to install the [Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads) package.
+
 ### Paging
 
 Windows only includes a very limited pager in the form of `more`. You can download a Windows binary
@@ -482,7 +609,7 @@ or by setting `BAT_PAGER` to an empty string.
 
 This can be solved by creating a wrapper or adding the following function to your `.bash_profile` file:
 
-```shell
+```bash
 bat() {
     local index
     local args=("$@")
@@ -500,9 +627,10 @@ bat() {
 
 ### Terminals & colors
 
-`bat` handles terminals *with* and *without* truecolor support. However, the colors in the syntax
-highlighting themes are not optimized for 8-bit colors and it is therefore strongly recommended
-that you use a terminal with 24-bit truecolor support (`terminator`, `konsole`, `iTerm2`, ...).
+`bat` handles terminals *with* and *without* truecolor support. However, the colors in most syntax
+highlighting themes are not optimized for 8-bit colors. It is therefore strongly recommended
+that you use a terminal with 24-bit truecolor support (`terminator`, `konsole`, `iTerm2`, ...),
+or use one of the basic [8-bit themes](#8-bit-themes) designed for a restricted set of colors.
 See [this article](https://gist.github.com/XVilka/8346728) for more details and a full list of
 terminals with truecolor support.
 
@@ -515,6 +643,18 @@ are supported (and fall back to 8-bit colors).
 Please try a different theme (see `bat --list-themes` for a list). The `OneHalfDark` and
 `OneHalfLight` themes provide grid and line colors that are brighter.
 
+### File encodings
+
+`bat` natively supports UTF-8 as well as UTF-16. For every other file encoding, you may need to
+convert to UTF-8 first because the encodings can typically not be auto-detected. You can `iconv`
+to do so.
+Example: if you have a PHP file in Latin-1 (ISO-8859-1) encoding, you can call:
+``` bash
+iconv -f ISO-8859-1 -t UTF-8 my-file.php | bat
+```
+Note: you might have to use the `-l`/`--language` option if the syntax can not be auto-detected
+by `bat`.
+
 ## Development
 
 ```bash
@@ -523,19 +663,29 @@ git clone --recursive https://github.com/sharkdp/bat
 
 # Build (debug version)
 cd bat
-cargo build
+cargo build --bins
 
 # Run unit tests and integration tests
 cargo test
 
 # Install (release version)
-cargo install
+cargo install --path . --locked
 
 # Build a bat binary with modified syntaxes and themes
 bash assets/create.sh
-cargo install -f
+cargo install --path . --locked --force
 ```
 
+## Contributing
+
+Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide.
+
+## Maintainers
+
+- [sharkdp](https://github.com/sharkdp)
+- [eth-p](https://github.com/eth-p)
+- [keith-hall](https://github.com/keith-hall)
+
 ## Project goals and alternatives
 
 `bat` tries to achieve the following goals:
@@ -547,3 +697,10 @@ cargo install -f
 
 There are a lot of alternatives, if you are looking for similar programs. See
 [this document](doc/alternatives.md) for a comparison.
+
+## License
+Copyright (c) 2018-2020 [bat-developers](https://github.com/sharkdp/bat).
+
+`bat` is made available under the terms of either the MIT License or the Apache License 2.0, at your option.
+
+See the [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) files for license details.

appveyor.yml

@@ -1,49 +0,0 @@
-environment:
-  global:
-    TARGET: x86_64-pc-windows-msvc
-    RUST_VERSION: stable
-    CRATE_NAME: bat
-    CARGO_HOME: "c:\\cargo"
-    RUSTUP_HOME: "c:\\rustup"
-
-install:
-  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host %TARGET%
-  - set PATH=%PATH%;C:\cargo\bin
-  - rustc -Vv
-  - cargo -V
-
-build: false
-test_script:
-  - cargo test --target %TARGET% --verbose
-  - cargo run --target %TARGET% -- src/main.rs README.md --paging=never
-
-before_deploy:
-  # Generate artifacts for release
-  - cargo build --release --verbose
-  - ps: ci\before_deploy.ps1
-
-deploy:
-  description: 'Automatically deployed release'
-  artifact: /.*\.zip/
-  # Here's how:
-  # - Go to 'https://github.com/settings/tokens/new' and generate a Token with only the
-  # `public_repo` scope enabled
-  # - Then go to 'https://ci.appveyor.com/tools/encrypt' and enter the newly generated token.
-  # - Enter the "encrypted value" below
-  auth_token:
-    secure: oO4/J+hcFXgXcEqEc8gzlQNqLG0IxU78s4EyH+uczGdsyWajb3yipxPR6nXUvmoj
-  provider: GitHub
-  on:
-    RUST_VERSION: stable
-    appveyor_repo_tag: true
-
-cache:
-  - C:\Users\appveyor\.cargo\registry
-  - target
-
-notifications:
-  - provider: Email
-    on_build_success: false
-    on_build_failure: false
-    on_build_status_changed: false

assets/README.md

@@ -1,40 +0,0 @@
-## Syntax Highlighting in bat
-
-`bat` uses the [syntect](https://github.com/trishume/syntect) library to highlight source
-code. As a basis, syntect uses [Sublime Text](https://www.sublimetext.com/) syntax definitions
-in the `.sublime-syntax` format.
-
-In order to add new syntaxes to `bat`, follow these steps:
-
-1. Find a Sublime Text syntax for the given language, preferably in a separate Git repository
-   which can be included as a submodule (under `assets/syntaxes`).
-
-2. If the Sublime Text syntax is only available as a `.tmLanguage` file, open the file in
-   Sublime Text and convert it to a `.sublime-syntax` file via *Tools* -> *Developer* ->
-   *New Syntax from XXX.tmLanguage...*. Save the new file in the `assets/syntaxes` folder.
-
-3. Run the `create.sh` script. It calls `bat cache --build` to parse all available
-   `.sublime-syntax` files and serialize them to a `syntaxes.bin` file (in this folder).
-
-4. Re-compile `bat`. At compilation time, the `syntaxes.bin` file will be stored inside the
-   `bat` binary.
-
-5. If you send a pull request with your changes, please do *not* include the changed `syntaxes.bin`
-   file. A new binary cache file will be created once before every new release of `bat`.
-
-### Troubleshooting
-
-Make sure that the local cache does not interfere with the internally stored syntaxes and
-themes (`bat cache --clear`).
-
-### Manual modifications
-
-The following files have been manually modified after converting from a `.tmLanguage` file:
-
-* `Dart.sublime-syntax` => removed `#regex.dart` include.
-* `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types.
-* `Org mode.sublime-syntax` => removed `task` file type.
-
-### Non-submodule additions
-
-* `Assembly (x86_64)` has been manually added from https://github.com/13xforever/x86-assembly-textmate-bundle due to `git clone` recursion problems

assets/completions/bat.fish

@@ -1,76 +0,0 @@
-# Fish Shell Completions
-# Place or symlink to $XDG_CONFIG_HOME/fish/completions/bat.fish ($XDG_CONFIG_HOME is usually set to ~/.config)
-
-# Helper function:
-function __bat_autocomplete_languages --description "A helper function used by "(status filename)
-	bat --list-languages | awk -F':' '
-		{
-			lang=$1
-			split($2, exts, ",")
-
-			for (i in exts) {
-				ext=exts[i]
-				if (ext !~ /[A-Z].*/ && ext !~ /^\..*rc$/) {
-					print ext"\t"lang
-				}
-			}
-		}
-	' | sort
-end
-
-# Completions:
-
-complete -c bat -l color -xka "auto never always" -d "Specify when to use colored output (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l config-dir -d "Display location of 'bat' configuration directory" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l config-file -d "Display location of 'bat' configuration file" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l decorations -xka "auto never always" -d "Specify when to use the decorations specified with '--style' (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s h -l help -d "Print help message" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s H -l highlight-line -x -d "<N> Highlight the N-th line with a different background color" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l italic-text -xka "always never" -d "Specify when to use ANSI sequences for italic text (default: never)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s l -l language -d "Set the language for syntax highlighting" -n "not __fish_seen_subcommand_from cache" -xa "(__bat_autocomplete_languages)" 
-
-complete -c bat -s r -l line-range -x -d "<N:M> Only print the specified range of lines for each file" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l list-languages -d "Display list of supported languages for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l list-themes -d "Display a list of supported themes for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s m -l map-syntax -x -d "<from:to> Map a file extension or file name to an existing syntax" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s n -l number -d "Only show line numbers, no other decorations. Alias for '--style=numbers'" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l pager -x -d "<command> Specify which pager program to use (default: less)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l paging -xka "auto never always" -d "Specify when to use the pager (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s p -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l style -xka "auto full plain changes header grid numbers" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l terminal-width -x -d "<width> Explicitly set terminal width; Prefix with '+' or '-' to offset (default width is auto determined)" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l theme -xka "(bat --list-themes | cat)" -d "Set the theme for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s u -l unbuffered -d "POSIX-compliant unbuffered output. Option is ignored" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -s V -l version -d "Show version information" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l wrap -xka "auto never character" -d "<mode> Specify the text-wrapping mode (default: auto)" -n "not __fish_seen_subcommand_from cache"
-
-# Sub-command 'cache' completions
-complete -c bat -a "cache" -d "Modify the syntax/language definition cache" -n "not __fish_seen_subcommand_from cache"
-
-complete -c bat -l build -f -d "Parse syntaxes/language definitions into cache" -n "__fish_seen_subcommand_from cache"
-
-complete -c bat -l clear -f -d "Reset syntaxes/language definitions to default settings" -n "__fish_seen_subcommand_from cache"

assets/completions/bat.fish.in

@@ -0,0 +1,78 @@
+# Fish Shell Completions
+# Place or symlink to $XDG_CONFIG_HOME/fish/completions/{{PROJECT_EXECUTABLE}}.fish ($XDG_CONFIG_HOME is usually set to ~/.config)
+
+# Helper function:
+function __{{PROJECT_EXECUTABLE}}_autocomplete_languages --description "A helper function used by "(status filename)
+	{{PROJECT_EXECUTABLE}} --list-languages | awk -F':' '
+		{
+			lang=$1
+			split($2, exts, ",")
+
+			for (i in exts) {
+				ext=exts[i]
+				if (ext !~ /[A-Z].*/ && ext !~ /^\..*rc$/) {
+					print ext"\t"lang
+				}
+			}
+		}
+	' | sort
+end
+
+# Completions:
+
+complete -c {{PROJECT_EXECUTABLE}} -l color -xka "auto never always" -d "Specify when to use colored output (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l config-dir -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration directory" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l config-file -d "Display location of '{{PROJECT_EXECUTABLE}}' configuration file" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l decorations -xka "auto never always" -d "Specify when to use the decorations specified with '--style' (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s h -l help -d "Print help message" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s H -l highlight-line -x -d "<N> Highlight the N-th line with a different background color" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l italic-text -xka "always never" -d "Specify when to use ANSI sequences for italic text (default: never)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s l -l language -d "Set the language for syntax highlighting" -n "not __fish_seen_subcommand_from cache" -xa "(__{{PROJECT_EXECUTABLE}}_autocomplete_languages)" 
+
+complete -c {{PROJECT_EXECUTABLE}} -s r -l line-range -x -d "<N:M> Only print the specified range of lines for each file" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l list-languages -d "Display list of supported languages for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l list-themes -d "Display a list of supported themes for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s m -l map-syntax -x -d "<from:to> Map a file extension or file name to an existing syntax" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s n -l number -d "Only show line numbers, no other decorations. Alias for '--style=numbers'" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l pager -x -d "<command> Specify which pager program to use (default: less)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l paging -xka "auto never always" -d "Specify when to use the pager (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s p -l plain -d "Only show plain style, no decorations. Alias for '--style=plain'" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s P -d "Disable paging. Alias for '--paging=never'" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s A -l show-all -d "Show non-printable characters like space/tab/newline" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l style -xka "auto full plain changes header grid numbers" -d "Comma-separated list of style elements or presets to display with file contents" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l tabs -x -d "<T> Set the tab width to T spaces (width of 0 passes tabs through directly)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l terminal-width -x -d "<width> Explicitly set terminal width; Prefix with '+' or '-' to offset (default width is auto determined)" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l theme -xka "({{PROJECT_EXECUTABLE}} --list-themes | cat)" -d "Set the theme for syntax highlighting" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s u -l unbuffered -d "POSIX-compliant unbuffered output. Option is ignored" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -s V -l version -d "Show version information" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l wrap -xka "auto never character" -d "<mode> Specify the text-wrapping mode (default: auto)" -n "not __fish_seen_subcommand_from cache"
+
+# Sub-command 'cache' completions
+complete -c {{PROJECT_EXECUTABLE}} -a "cache" -d "Modify the syntax/language definition cache" -n "not __fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l build -f -d "Parse syntaxes/language definitions into cache" -n "__fish_seen_subcommand_from cache"
+
+complete -c {{PROJECT_EXECUTABLE}} -l clear -f -d "Reset syntaxes/language definitions to default settings" -n "__fish_seen_subcommand_from cache"

assets/completions/bat.zsh.in

@@ -0,0 +1,93 @@
+#compdef {{PROJECT_EXECUTABLE}}
+
+local context state state_descr line
+typeset -A opt_args
+
+(( $+functions[_{{PROJECT_EXECUTABLE}}_cache_subcommand] )) ||
+_{{PROJECT_EXECUTABLE}}_cache_subcommand() {
+    local -a args
+    args=(
+        '(-b --build -c --clear)'{-b,--build}'[Initialize or update the syntax/theme cache]'
+        '(-b --build -c --clear)'{-c,--clear}'[Remove the cached syntax definitions and themes]'
+        '(--source)'--source='[Use a different directory to load syntaxes and themes from]:directory:_files -/'
+        '(--target)'--target='[Use a different directory to store the cached syntax and theme set]:directory:_files -/'
+        '(--blank)'--blank'[Create completely new syntax and theme sets]'
+        '(: -)'{-h,--help}'[Prints help information]'
+        '*: :'
+    )
+
+    _arguments -S -s $args
+}
+
+(( $+functions[_{{PROJECT_EXECUTABLE}}_main] )) ||
+_{{PROJECT_EXECUTABLE}}_main() {
+    local -a args
+    args=(
+        '(-A --show-all)'{-A,--show-all}'[Show non-printable characters (space, tab, newline, ..)]'
+        '*'{-p,--plain}'[Show plain style (alias for `--style=plain`), repeat twice to disable disable automatic paging (alias for `--paging=never`)]'
+        '(-l --language)'{-l+,--language=}'[Set the language for syntax highlighting]:<language>:->language'
+        '(-H --highlight-line)'{-H,--highlight-line}'[Highlight lines N through M]:<N\:M>...'
+        '(--file-name)'--file-name'[Specify the name to display for a file]:<name>...:_files'
+        '(-d --diff)'--diff'[Only show lines that have been added/removed/modified]'
+        '(--diff-context)'--diff-context'[Include N lines of context around added/removed/modified lines when using `--diff`]:<N> (lines):()'
+        '(--tabs)'--tabs'[Set the tab width to T spaces]:<T> (tab width):()'
+        '(--wrap)'--wrap='[Specify the text-wrapping mode]:<when>:(auto never character)'
+        '(--terminal-width)'--terminal-width'[Explicitly set the width of the terminal instead of determining it automatically]:<width>'
+        '(-n --number)'{-n,--number}'[Show line numbers]'
+        '(--color)'--color='[When to use colors]:<when>:(auto never always)'
+        '(--italic-text)'--italic-text='[Use italics in output]:<when>:(always never)'
+        '(--decorations)'--decorations='[When to show the decorations]:<when>:(auto never always)'
+        '(--paging)'--paging='[Specify when to use the pager]:<when>:(auto never always)'
+        '(-m --map-syntax)'{-m+,--map-syntax=}'[Use the specified syntax for files matching the glob pattern]:<glob\:syntax>...'
+        '(--theme)'--theme='[Set the color theme for syntax highlighting]:<theme>:->theme'
+        '(: --list-themes --list-languages -L)'--list-themes'[Display all supported highlighting themes]'
+        '(--style)'--style='[Comma-separated list of style elements to display]:<components>:->style'
+        '(-r --line-range)'{-r+,--line-range=}'[Only print the lines from N to M]:<N\:M>...'
+        '(: --list-themes --list-languages -L)'{-L,--list-languages}'[Display all supported languages]'
+        '(: -)'{-h,--help}'[Print this help message]'
+        '(: -)'{-V,--version}'[Show version information]'
+        '*: :_files'
+    )
+
+    _arguments -S -s $args
+
+    case "$state" in
+        language)
+            local IFS=$'\n'
+            local -a languages
+            languages=( $({{PROJECT_EXECUTABLE}} --list-languages | awk -F':|,' '{ for (i = 1; i <= NF; ++i) printf("%s:%s\n", $i, $1) }') )
+
+            _describe 'language' languages
+        ;;
+
+        theme)
+            local IFS=$'\n'
+            local -a themes
+            themes=( $({{PROJECT_EXECUTABLE}} --list-themes | sort) )
+
+            _values 'theme' $themes
+        ;;
+
+        style)
+            _values -s , 'style' auto full plain changes header grid numbers snip
+        ;;
+    esac
+}
+
+# first positional argument
+if (( ${#words} == 2 )); then
+    local -a subcommands
+    subcommands=('cache:Modify the syntax-definition and theme cache')
+    _describe subcommand subcommands
+    _{{PROJECT_EXECUTABLE}}_main
+else
+    case $words[2] in
+        cache)
+            _{{PROJECT_EXECUTABLE}}_cache_subcommand
+        ;;
+
+        *)
+            _{{PROJECT_EXECUTABLE}}_main
+        ;;
+    esac
+fi

assets/create.sh

@@ -1,17 +1,63 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REPO_DIR="$ASSET_DIR/.."
+
+# Ensure submodules are initialized.
+function update_submodules() {
+	local submodule
+	local submodule_prompt=unspecified
+	local submodule_path
+
+	{
+		while { read -r submodule && read -r submodule_path; } <&3; do
+			if ! [[ -d "${REPO_DIR}/.git/modules/${submodule}" ]] && [[ -d "${REPO_DIR}/${submodule_path}" ]]; then
+				if [[ "$submodule_prompt" = "unspecified" ]]; then
+					echo "One or more submodules were found to be uninitialized."
+					printf "Initialize and update them? [Y/n] "
+					read -r submodule_prompt
+				fi
+
+				case "$submodule_prompt" in
+					y|yes|'') {
+						git -C "$REPO_DIR" submodule update --init "$submodule_path"
+					};;
+					n|no) {
+						return
+					};;
+					*) {
+						echo "Unknown answer. Not updating submodules."
+					};;
+				esac
+			fi
+		done
+	} 3< <(git config --file "${REPO_DIR}/.gitmodules" --null --get-regexp path | xargs -0 printf "%s\n" | sed 's/^submodule.//;s/.path$//')
+}
+
+if [ -t 0 ]; then
+	update_submodules
+fi
 
 # Always remove the local cache to avoid any confusion
 bat cache --clear
 
-# TODO: Remove this (and the reverse part below) when
-# https://github.com/trishume/syntect/issues/222 has been fixed
-JAVADOC_FILE="${ASSET_DIR}/syntaxes/Packages/Java/JavaDoc.sublime-syntax"
-JAVADOC_PATCH="${ASSET_DIR}/JavaDoc.sublime-syntax.patch"
-patch "$JAVADOC_FILE" "$JAVADOC_PATCH"
+# TODO:
+# - Remove the JavaDoc patch once https://github.com/trishume/syntect/issues/222 has been fixed
+# - Remove the C# patch once https://github.com/sublimehq/Packages/pull/2331 has been merged
+
+(
+    cd "$ASSET_DIR"
+    for patch in patches/*.patch; do
+        patch --strip=0 < "$patch"
+    done
+)
 
 bat cache --build --blank --source="$ASSET_DIR" --target="$ASSET_DIR"
 
-patch -R "$JAVADOC_FILE" "$JAVADOC_PATCH"
+(
+    cd "$ASSET_DIR"
+    for patch in patches/*.patch; do
+        patch --strip=0 --reverse < "$patch"
+    done
+)

assets/manual/bat.1.in

@@ -0,0 +1,214 @@
+.TH {{PROJECT_EXECUTABLE_UPPERCASE}} "1"
+.SH NAME
+{{PROJECT_EXECUTABLE}} \- a cat(1) clone with syntax highlighting and Git integration.
+.SH "USAGE"
+.IP "{{PROJECT_EXECUTABLE}} [OPTIONS] [FILE]..."
+.IP "{{PROJECT_EXECUTABLE}} cache [CACHE-OPTIONS] [--build|--clear]
+.SH DESCRIPTION
+{{PROJECT_EXECUTABLE}} prints the syntax-highlighted content of a collection of FILEs to the
+terminal. If no FILE is specified, or when FILE is '-', it reads from standard input.
+
+{{PROJECT_EXECUTABLE}} supports a large number of programming and markup languages.
+It also communicates with git(1) to show modifications with respect to the git index.
+{{PROJECT_EXECUTABLE}} automatically pipes its output through a pager (by default: less).
+
+Whenever the output of {{PROJECT_EXECUTABLE}} goes to a non-interactive terminal, i.e. when the
+output is piped into another process or into a file, {{PROJECT_EXECUTABLE}} will act as a drop-in
+replacement for cat(1) and fall back to printing the plain file contents.
+
+.SH "OPTIONS"
+General remarks: Command-line options like '-l'/'--language' that take values can be specified as
+either '--language value', '--language=value', '-l value' or '-lvalue'.
+.HP
+\fB\-A\fR, \fB\-\-show\-all\fR
+.IP
+Show non\-printable characters like space, tab or newline. Use '\-\-tabs' to
+control the width of the tab\-placeholders.
+.HP
+\fB\-p\fR, \fB\-\-plain\fR
+.IP
+Only show plain style, no decorations. This is an alias for
+\&'\-\-style=plain'. When '\-p' is used twice ('\-pp'), it also disables
+automatic paging (alias for '\-\-style=plain \fB\-\-pager\fR=\fI\,never\/\fR').
+.HP
+\fB\-l\fR, \fB\-\-language\fR <language>
+.IP
+Explicitly set the language for syntax highlighting. The language can be
+specified as a name (like 'C++' or 'LaTeX') or possible file extension
+(like 'cpp', 'hpp' or 'md'). Use '\-\-list\-languages' to show all supported
+language names and file extensions.
+.HP
+\fB\-H\fR, \fB\-\-highlight\-line\fR <N:M>...
+.IP
+Highlight the specified line ranges with a different background color For example:
+.RS
+.IP "\-\-highlight\-line 40"
+highlights line 40
+.IP "\-\-highlight\-line 30:40"
+highlights lines 30 to 40
+.IP "\-\-highlight\-line :40"
+highlights lines 1 to 40
+.IP "\-\-highlight\-line 40:"
+highlights lines 40 to the end of the file
+.RE
+.HP
+\fB\-\-tabs\fR <T>
+.IP
+Set the tab width to T spaces. Use a width of 0 to pass tabs through directly
+.HP
+\fB\-\-wrap\fR <mode>
+.IP
+Specify the text\-wrapping mode (*auto*, never, character). The '\-\-terminal\-width' option
+can be used in addition to control the output width.
+.HP
+\fB\-\-terminal\-width\fR <width>
+.IP
+Explicitly set the width of the terminal instead of determining it automatically. If
+prefixed with '+' or '\-', the value will be treated as an offset to the actual terminal
+width. See also: '\-\-wrap'.
+.HP
+\fB\-n\fR, \fB\-\-number\fR
+.IP
+Only show line numbers, no other decorations. This is an alias for '\-\-style=numbers'
+.HP
+\fB\-\-color\fR <when>
+.IP
+Specify when to use colored output. The automatic mode only enables colors if an
+interactive terminal is detected. Possible values: *auto*, never, always.
+.HP
+\fB\-\-italic\-text\fR <when>
+.IP
+Specify when to use ANSI sequences for italic text in the output. Possible values:
+always, *never*.
+.HP
+\fB\-\-decorations\fR <when>
+.IP
+Specify when to use the decorations that have been specified via '\-\-style'. The
+automatic mode only enables decorations if an interactive terminal is detected. Possible
+values: *auto*, never, always.
+.HP
+\fB\-f\fR, \fB\-\-force\-colorization\fR
+.IP
+Alias for '--decorations=always --color=always'. This is useful \
+if the output of {{PROJECT_EXECUTABLE}} is piped to another program, but you want \
+to keep the colorization/decorations.
+.HP
+\fB\-\-paging\fR <when>
+.IP
+Specify when to use the pager. To disable the pager, use \&'\-\-paging=never' or its alias,
+\fB-P\fR. To disable the pager permanently, set BAT_PAGER to an empty string. To control
+which pager is used, see the '\-\-pager' option. Possible values: *auto*, never, always.
+.HP
+\fB\-\-pager\fR <command>
+.IP
+Determine which pager is used. This option will override the PAGER and BAT_PAGER
+environment variables. The default pager is 'less'. To control when the pager is used, see
+the '\-\-paging' option. Example: '\-\-pager "less \fB\-RF\fR"'.
+.HP
+\fB\-m\fR, \fB\-\-map\-syntax\fR <glob-pattern:syntax-name>...
+.IP
+Map a glob pattern to an existing syntax name. The glob pattern is matched on the full
+path and the filename. For example, to highlight *.build files with the Python syntax,
+use -m '*.build:Python'. To highlight files named '.myignore' with the Git Ignore
+syntax, use -m '.myignore:Git Ignore'.
+.HP
+\fB\-\-theme\fR <theme>
+.IP
+Set the theme for syntax highlighting. Use '\-\-list\-themes' to see all available themes.
+To set a default theme, add the '\-\-theme="..."' option to the configuration file or
+export the BAT_THEME environment variable (e.g.: export BAT_THEME="...").
+.HP
+\fB\-\-list\-themes\fR
+.IP
+Display a list of supported themes for syntax highlighting.
+.HP
+\fB\-\-style\fR <style\-components>
+.IP
+Configure which elements (line numbers, file headers, grid borders, Git modifications,
+\&..) to display in addition to the file contents. The argument is a comma\-separated list
+of components to display (e.g. 'numbers,changes,grid') or a pre\-defined style ('full').
+To set a default style, add the '\-\-style=".."' option to the configuration file or
+export the BAT_STYLE environment variable (e.g.: export BAT_STYLE=".."). Possible
+values: *auto*, full, plain, changes, header, grid, rule, numbers, snip.
+.HP
+\fB\-r\fR, \fB\-\-line\-range\fR <N:M>...
+.IP
+Only print the specified range of lines for each file. For example:
+.RS
+.IP "\-\-line\-range 30:40"
+prints lines 30 to 40
+.IP "\-\-line\-range :40"
+prints lines 1 to 40
+.IP "\-\-line\-range 40:"
+prints lines 40 to the end of the file
+.RE
+.HP
+\fB\-L\fR, \fB\-\-list\-languages\fR
+.IP
+Display a list of supported languages for syntax highlighting.
+.HP
+\fB\-u\fR, \fB\-\-unbuffered\fR
+.IP
+This option exists for POSIX\-compliance reasons ('u' is for 'unbuffered'). The output is
+always unbuffered \- this option is simply ignored.
+.HP
+\fB\-h\fR, \fB\-\-help\fR
+.IP
+Print this help message.
+.HP
+\fB\-V\fR, \fB\-\-version\fR
+.IP
+Show version information.
+.SH "POSITIONAL ARGUMENTS"
+.HP
+\fB<FILE>...\fR
+.IP
+Files to print and concatenate. Use a dash ('\-') or no argument at all to read from
+standard input.
+.SH "SUBCOMMANDS"
+.HP
+\fBcache\fR - Modify the syntax\-definition and theme cache.
+.SH "FILES"
+{{PROJECT_EXECUTABLE}} can also be customized with a configuration file. The location of the file
+is dependent on your operating system. To get the default path for your system, call:
+
+\fB{{PROJECT_EXECUTABLE}} --config-file\fR
+
+Alternatively, you can use the BAT_CONFIG_PATH environment variable to point {{PROJECT_EXECUTABLE}} to a non-default
+location of the configuration file.
+.SH "ADDING CUSTOM LANGUAGES"
+{{PROJECT_EXECUTABLE}} supports Sublime Text \fB.sublime-syntax\fR language files, and can be
+customized to add additional languages to your local installation. To do this, add the \fB.sublime-syntax\fR language
+files to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes\fR` and run `\fB{{PROJECT_EXECUTABLE}} cache --build\fR`.
+
+\fBExample:\fR
+
+.RS 0.5i
+mkdir -p "$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes"
+.br
+cd "$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes"
+
+# Put new '.sublime-syntax' language definition files
+.br
+# in this folder (or its subdirectories), for example:
+.br
+git clone https://github.com/tellnobody1/sublime-purescript-syntax
+
+# And then build the cache.
+.br
+{{PROJECT_EXECUTABLE}} cache --build
+.RE
+
+Once the cache is built, the new language will be visible in `\fB{{PROJECT_EXECUTABLE}} --list-languages\fR`.
+.br
+If you ever want to remove the custom languages, you can clear the cache with `\fB{{PROJECT_EXECUTABLE}} cache --clear\fR`. 
+
+.SH "ADDING CUSTOM THEMES"
+Similarly to custom languages, {{PROJECT_EXECUTABLE}} supports Sublime Text \fB.tmTheme\fR themes.
+These can be installed to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/themes\fR`, and are added to the cache with
+`\fB{{PROJECT_EXECUTABLE}} cache --build`.
+.SH "MORE INFORMATION"
+
+For more information and up-to-date documentation, visit the {{PROJECT_EXECUTABLE}} repo:
+.br
+\fBhttps://github.com/sharkdp/bat\fR

assets/patches/C#.sublime-syntax.patch

@@ -0,0 +1,13 @@
+diff --git syntaxes/01_Packages/C#/C#.sublime-syntax syntaxes/01_Packages/C#/C#.sublime-syntax
+index ed494f8b..01b710e8 100644
+--- syntaxes/01_Packages/C#/C#.sublime-syntax
++++ syntaxes/01_Packages/C#/C#.sublime-syntax
+@@ -1312,7 +1312,7 @@ contexts:
+             2: punctuation.separator.cs
+             3: punctuation.section.brackets.end.cs
+             4: keyword.operator.pointer.cs
+-    - match: \((?=(?:[^,)(]*|\([^\)]*\))*,)
++    - match: \((?=(?:[^,)(]|\([^\)]*\))*,)
+       scope: punctuation.section.group.begin.cs
+       push:
+         - meta_scope: meta.group.tuple.cs

assets/patches/JavaDoc.sublime-syntax.patch

@@ -1,7 +1,7 @@
-diff --git syntaxes/Packages/Java/JavaDoc.sublime-syntax syntaxes/Packages/Java/JavaDoc.sublime-syntax
+diff --git syntaxes/01_Packages/Java/JavaDoc.sublime-syntax syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
 index 422a6a9..40a741e 100644
---- syntaxes/Packages/Java/JavaDoc.sublime-syntax
-+++ syntaxes/Packages/Java/JavaDoc.sublime-syntax
+--- syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
++++ syntaxes/01_Packages/Java/JavaDoc.sublime-syntax
 @@ -13,7 +13,7 @@ variables:
  contexts:
    prototype:

assets/patches/Makefile.sublime-syntax.patch

@@ -0,0 +1,81 @@
+diff --git syntaxes/01_Packages/Makefile/Makefile.sublime-syntax syntaxes/01_Packages/Makefile/Makefile.sublime-syntax
+index 3cc3a97e..0c7a3f24 100644
+--- syntaxes/01_Packages/Makefile/Makefile.sublime-syntax
++++ syntaxes/01_Packages/Makefile/Makefile.sublime-syntax
+@@ -44,64 +44,50 @@ variables:
+   # variable substitutions anywhere. We try to remedy this by hacking in a
+   # regex that matches up to four levels of nested parentheses, and ignores
+   # whatever's inside the parentheses.
+-  nps: '[^()]*'
+-  open: '(?:\('
+-  close: '\))?'       # ignore this invalid.illegal
++  nps_unnested: '[^()]*'
++  nps: '[^()]*(?=[()])'
++  open: '(?:{{nps}}\('
++  close: '\){{nps_unnested}})?'       # ignore this invalid.illegal
+   just_eat: |         # WARNING: INSANITY FOLLOWS!
+-    (?x)              # ignore whitespace in this regex
+-      {{nps}}         #       level 0
++    (?x)(?:              # ignore whitespace in this regex
+       {{open}}        # start level 1                      __
+-        {{nps}}       #       level 1          _______    /*_>-<
+         {{open}}      # start level 2      ___/ _____ \__/ /
+-          {{nps}}     #       level 2     <____/     \____/
+           {{open}}    # start level 3     is like snek... (by Valerie Haecky)
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
++          {{nps}}
+         {{close}}     #   end level 2
+-        {{nps}}       #       level 1
+         {{open}}      # start level 2
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
++          {{nps}}
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
++          {{nps}}
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
+           {{open}}    # start level 3
+-            {{nps}}   #       level 3
+             {{open}}  # start level 4
+               {{nps}} #       level 4
+             {{close}} #   end level 4
+-            {{nps}}   #       level 3
++          {{nps}}
+           {{close}}   #   end level 3
+-          {{nps}}     #       level 2
++        {{nps}}
+         {{close}}     #   end level 2
+-        {{nps}}       #       level 1
++      {{nps}}
+       {{close}}       #   end level 1
+-      {{nps}}         #       level 0
++      |{{nps_unnested}})
+   rule_lookahead: '{{just_eat}}{{ruleassign}}{{just_eat}}'
+ 
+   var_lookahead_base: '{{just_eat}}({{varassign}}|{{shellassign}}){{just_eat}}'

assets/patches/Markdown.sublime-syntax.patch

@@ -0,0 +1,168 @@
+diff --git syntaxes/01_Packages/Markdown/Markdown.sublime-syntax syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
+index 19dc685d..6afd87ae 100644
+--- syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
++++ syntaxes/01_Packages/Markdown/Markdown.sublime-syntax
+@@ -24,7 +24,6 @@ variables:
+             )
+             [ \t]*$                          # followed by any number of tabs or spaces, followed by the end of the line
+         )
+-    setext_escape: ^(?=\s{0,3}(?:---+|===+)\s*$)
+     block_quote: (?:[ ]{,3}>(?:.|$))         # between 0 and 3 spaces, followed by a greater than sign, followed by any character or the end of the line
+     atx_heading: (?:[#]{1,6}\s*)             # between 1 and 6 hashes, followed by any amount of whitespace
+     indented_code_block: (?:[ ]{4}|\t)       # 4 spaces or a tab
+@@ -277,69 +276,40 @@ contexts:
+         8: markup.underline.link.markdown
+       push: [link-ref-def, after-link-title, link-title]
+     - match: '^(?=\S)(?![=-]{3,}\s*$)'
+-      branch_point: heading2-branch
+-      branch:
+-        - not-heading2
+-        - heading2
+-
+-  not-paragraph:
+-    - match: |-
+-        (?x)                         # pop out of this context when one of the following conditions are met:
+-        ^(?:
+-            \s*$                     # the line is blank (or only contains whitespace)
+-        |   (?=
+-                {{block_quote}}      # a block quote begins the line
+-            |   [ ]{,3}[*+-][ ]      # an unordered list item begins the line
+-            |   [ ]{,3}1[.][ ]       # an ordered list item with number "1" begins the line
+-            |   \#                   # an ATX heading begins the line
+-            |   [ ]{,3}<(            # all types of HTML blocks except type 7 may interrupt a paragraph
+-                  {{html_tag_block_end_at_close_tag}}   # 1
+-                | !--                                   # 2
+-                | \?                                    # 3
+-                | ![A-Z]                                # 4
+-                | !\[CDATA\[                            # 5
+-                | {{html_tag_block_end_at_blank_line}}  # 6
++      push:
++        - meta_scope: meta.paragraph.markdown
++        - match: |-
++            (?x)                         # pop out of this context when one of the following conditions are met:
++            ^(?:
++                \s*$                     # the line is blank (or only contains whitespace)
++            |   (?=
++                    {{block_quote}}      # a block quote begins the line
++                |   [ ]{,3}[*+-][ ]      # an unordered list item begins the line
++                |   [ ]{,3}1[.][ ]       # an ordered list item with number "1" begins the line
++                |   \#                   # an ATX heading begins the line
++                |   [ ]{,3}<(            # all types of HTML blocks except type 7 may interrupt a paragraph
++                      {{html_tag_block_end_at_close_tag}}   # 1
++                    | !--                                   # 2
++                    | \?                                    # 3
++                    | ![A-Z]                                # 4
++                    | !\[CDATA\[                            # 5
++                    | {{html_tag_block_end_at_blank_line}}  # 6
++                    )
+                 )
+             )
+-        )
+-      pop: true
+-
+-  not-heading2:
+-    - include: not-paragraph
+-    - match: (?=\S)
+-      branch_point: heading1-branch
+-      branch:
+-        - paragraph
+-        - heading1
+-    - match: ''
+-      pop: true
+-
+-  paragraph:
+-      - meta_scope: meta.paragraph.markdown
+-      - match: ^\s{0,3}===+\s*$
+-        fail: heading1-branch
+-      - match: ^\s{0,3}---+\s*$
+-        fail: heading2-branch
+-      - include: not-paragraph
+-      - include: inline-bold-italic-linebreak
+-      - include: scope:text.html.basic
+-
+-  heading1:
+-    - meta_scope: markup.heading.1.markdown
+-    - include: inline-bold-italic-linebreak
+-    - match: '^[ \t]{0,3}(={3,})(?=[ \t]*$)'
+-      captures:
+-        1: markup.heading.1.setext.markdown punctuation.definition.heading.setext.markdown
+-      pop: true
+-
+-  heading2:
+-    - meta_scope: markup.heading.2.markdown
+-    - include: inline-bold-italic-linebreak
+-    - match: '^[ \t]{0,3}(-{3,})(?=[ \t]*$)'
+-      captures:
+-        1: markup.heading.2.setext.markdown punctuation.definition.heading.setext.markdown
+-      pop: true
+-
++          pop: true
++        - include: inline-bold-italic-linebreak
++        - include: scope:text.html.basic
++        - match: '^(={3,})(?=[ \t]*$)'
++          scope: markup.heading.1.setext.markdown
++          captures:
++            1: punctuation.definition.heading.setext.markdown
++          pop: true
++        - match: '^(-{3,})(?=[ \t]*$)'
++          scope: markup.heading.2.setext.markdown
++          captures:
++            1: punctuation.definition.heading.setext.markdown
++          pop: true
+   link-ref-def:
+     - meta_scope: meta.link.reference.def.markdown
+     - match: ''
+@@ -430,8 +400,6 @@ contexts:
+       push:
+         - meta_scope: markup.bold.markdown
+         - meta_content_scope: markup.italic.markdown
+-        - match: '{{setext_escape}}'
+-          pop: true
+         - match: |-
+             (?x)
+                 [ \t]*\*{4,}    # if there are more than 3 its not applicable to be bold or italic
+@@ -446,8 +414,6 @@ contexts:
+           scope: punctuation.definition.bold.end.markdown
+           set:
+             - meta_content_scope: markup.italic.markdown
+-            - match: '{{setext_escape}}'
+-              pop: true
+             - match: |-
+                 (?x)
+                     [ \t]*\*{3,}    # if there are more than 3 its not applicable to be bold or italic
+@@ -463,8 +429,6 @@ contexts:
+           scope: punctuation.definition.italic.end.markdown
+           set:
+             - meta_content_scope: markup.bold.markdown
+-            - match: '{{setext_escape}}'
+-              pop: true
+             - match: |-
+                 (?x)
+                     [ \t]*\*{3,}    # if there are more than 3 its not applicable to be bold or italic
+@@ -727,8 +691,6 @@ contexts:
+       scope: punctuation.definition.italic.begin.markdown
+       push:
+         - meta_scope: markup.italic.markdown
+-        - match: '{{setext_escape}}'
+-          pop: true
+         - match: |-
+               (?x)
+                   [ \t]*\*{4,}   # if there are more than 3 its not applicable to be bold or italic
+@@ -745,8 +707,6 @@ contexts:
+       scope: punctuation.definition.italic.begin.markdown
+       push:
+         - meta_scope: markup.italic.markdown
+-        - match: '{{setext_escape}}'
+-          pop: true
+         - match: |-
+               (?x)
+                   [ \t]*_{4,}   # if there are more than 3 its not applicable to be bold or italic
+@@ -773,8 +733,6 @@ contexts:
+         - include: bold-italic-trailing
+   bold-italic-trailing:
+     - include: scope:text.html.basic
+-    - match: '{{setext_escape}}'
+-      pop: true
+     - match: ^\s*$\n?
+       scope: invalid.illegal.non-terminated.bold-italic.markdown
+       pop: true

assets/patches/Rust.sublime-syntax.patch

@@ -0,0 +1,13 @@
+diff --git syntaxes/01_Packages/Rust/Rust.sublime-syntax syntaxes/01_Packages/Rust/Rust.sublime-syntax
+index 3c354486..24727a4e 100644
+--- syntaxes/01_Packages/Rust/Rust.sublime-syntax
++++ syntaxes/01_Packages/Rust/Rust.sublime-syntax
+@@ -907,6 +907,8 @@ contexts:
+     - include: type-any-identifier
+     - match: ':'
+       scope: punctuation.separator.rust
++    - match: (?=;)
++      pop: true
+ 
+   fn-body:
+     - meta_scope: meta.function.rust

assets/patches/ShellScript.sublime-syntax.patch

@@ -0,0 +1,15 @@
+diff --git syntaxes/01_Packages/ShellScript/Bash.sublime-syntax syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
+index e973e319..a703cef8 100644
+--- syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
++++ syntaxes/01_Packages/ShellScript/Bash.sublime-syntax
+@@ -30,8 +30,8 @@ file_extensions:
+   - .zshenv
+   - .zshrc
+   - PKGBUILD  # https://jlk.fjfi.cvut.cz/arch/manpages/man/PKGBUILD.5
+-  - .ebuild
+-  - .eclass
++  - ebuild
++  - eclass
+ 
+ first_line_match: |
+   (?x)

assets/syntaxes/02_Extra/Apache.sublime-syntax

@@ -0,0 +1,221 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Apache Conf
+file_extensions:
+  - envvars
+  - htaccess
+  - HTACCESS
+  - htgroups
+  - HTGROUPS
+  - htpasswd
+  - HTPASSWD
+  - .htaccess
+  - .HTACCESS
+  - .htgroups
+  - .HTGROUPS
+  - .htpasswd
+  - .HTPASSWD
+scope: source.apacheconf
+contexts:
+  main:
+    - match: ^(\s)*(#).*$\n?
+      scope: comment.line.hash.ini
+      captures:
+        1: punctuation.definition.comment.apacheconf
+    - match: (<)(Proxy|ProxyMatch|IfVersion|Directory|DirectoryMatch|Files|FilesMatch|IfDefine|IfModule|Limit|LimitExcept|Location|LocationMatch|VirtualHost|Macro|If|Else|ElseIf)(\s(.+?))?(>)
+      captures:
+        1: punctuation.definition.tag.apacheconf
+        2: entity.tag.apacheconf
+        4: string.value.apacheconf
+        5: punctuation.definition.tag.apacheconf
+    - match: (</)(Proxy|ProxyMatch|IfVersion|Directory|DirectoryMatch|Files|FilesMatch|IfDefine|IfModule|Limit|LimitExcept|Location|LocationMatch|VirtualHost|Macro|If|Else|ElseIf)(>)
+      captures:
+        1: punctuation.definition.tag.apacheconf
+        2: entity.tag.apacheconf
+        3: punctuation.definition.tag.apacheconf
+    - match: (?<=(Rewrite(Rule|Cond)))\s+(.+?)\s+(.+?)($|\s)
+      captures:
+        3: string.regexp.apacheconf
+        4: string.replacement.apacheconf
+    - match: (?<=RedirectMatch)(\s+(\d\d\d|permanent|temp|seeother|gone))?\s+(.+?)\s+((.+?)($|\s))?
+      captures:
+        2: entity.status.apacheconf
+        3: string.regexp.apacheconf
+        5: string.path.apacheconf
+    - match: (?<=Redirect)(\s+(\d\d\d|permanent|temp|seeother|gone))?\s+(.+?)\s+((.+?)($|\s))?
+      captures:
+        2: entity.status.apacheconf
+        3: string.path.apacheconf
+        5: string.path.apacheconf
+    - match: (?<=ScriptAliasMatch|AliasMatch)\s+(.+?)\s+((.+?)\s)?
+      captures:
+        1: string.regexp.apacheconf
+        3: string.path.apacheconf
+    - match: (?<=RedirectPermanent|RedirectTemp|ScriptAlias|Alias)\s+(.+?)\s+((.+?)($|\s))?
+      captures:
+        1: string.path.apacheconf
+        3: string.path.apacheconf
+    - match: \b(AcceptPathInfo|AccessFileName|AddDefaultCharset|AddOutputFilterByType|AllowEncodedSlashes|AllowOverride|AuthName|AuthType|CGIMapExtension|ContentDigest|DefaultType|Define|DocumentRoot|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|FileETag|ForceType|HostnameLookups|IdentityCheck|Include(Optional)?|KeepAlive|KeepAliveTimeout|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine|LimitXMLRequestBody|LogLevel|MaxKeepAliveRequests|Mutex|NameVirtualHost|Options|Require|RLimitCPU|RLimitMEM|RLimitNPROC|Satisfy|ScriptInterpreterSource|ServerAdmin|ServerAlias|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetHandler|SetInputFilter|SetOutputFilter|Time(O|o)ut|TraceEnable|UseCanonicalName|Use|ErrorLogFormat|GlobalLog|PHPIniDir|SSLHonorCipherOrder|SSLCompression|SSLUseStapling|SSLStapling\w+|SSLCARevocationCheck|SSLSRPVerifierFile|SSLSessionTickets|RequestReadTimeout|ProxyHTML\w+|MaxRanges)\b
+      captures:
+        1: keyword.core.apacheconf
+    - match: \b(AcceptMutex|AssignUserID|BS2000Account|ChildPerUserID|CoreDumpDirectory|EnableExceptionHook|Group|Listen|ListenBacklog|LockFile|MaxClients|MaxConnectionsPerChild|MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxRequestWorkers|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MinSpareServers|MinSpareThreads|NumServers|PidFile|ReceiveBufferSize|ScoreBoardFile|SendBufferSize|ServerLimit|StartServers|StartThreads|ThreadLimit|ThreadsPerChild|ThreadStackSize|User|Win32DisableAcceptEx)\b
+      captures:
+        1: keyword.mpm.apacheconf
+    - match: \b(Allow|Deny|Order)\b
+      captures:
+        1: keyword.access.apacheconf
+    - match: \b(Action|Script)\b
+      captures:
+        1: keyword.actions.apacheconf
+    - match: \b(Alias|AliasMatch|Redirect|RedirectMatch|RedirectPermanent|RedirectTemp|ScriptAlias|ScriptAliasMatch)\b
+      captures:
+        1: keyword.alias.apacheconf
+    - match: \b(AuthAuthoritative|AuthGroupFile|AuthUserFile|AuthBasicProvider|AuthBasicFake|AuthBasicAuthoritative|AuthBasicUseDigestAlgorithm)\b
+      captures:
+        1: keyword.auth.apacheconf
+    - match: \b(Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID|Anonymous_VerifyEmail)\b
+      captures:
+        1: keyword.auth_anon.apacheconf
+    - match: \b(AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile)\b
+      captures:
+        1: keyword.auth_dbm.apacheconf
+    - match: \b(AuthDigestAlgorithm|AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize|AuthDigestProvider)\b
+      captures:
+        1: keyword.auth_digest.apacheconf
+    - match: \b(AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases|AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl)\b
+      captures:
+        1: keyword.auth_ldap.apacheconf
+    - match: \b(AddAlt|AddAltByEncoding|AddAltByType|AddDescription|AddIcon|AddIconByEncoding|AddIconByType|DefaultIcon|HeaderName|IndexIgnore|IndexOptions|IndexOrderDefault|IndexStyleSheet|IndexHeadInsert|ReadmeName)\b
+      captures:
+        1: keyword.autoindex.apacheconf
+    - match: \b(BalancerMember|BalancerGrowth|BalancerPersist|BalancerInherit)\b
+      captures:
+        1: keyword.filter.apacheconf
+    - match: \b(CacheDefaultExpire|CacheDisable|CacheEnable|CacheForceCompletion|CacheIgnoreCacheControl|CacheIgnoreHeaders|CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire)\b
+      captures:
+        1: keyword.cache.apacheconf
+    - match: \b(MetaDir|MetaFiles|MetaSuffix)\b
+      captures:
+        1: keyword.cern_meta.apacheconf
+    - match: \b(ScriptLog|ScriptLogBuffer|ScriptLogLength)\b
+      captures:
+        1: keyword.cgi.apacheconf
+    - match: \b(ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock)\b
+      captures:
+        1: keyword.cgid.apacheconf
+    - match: \b(CharsetDefault|CharsetOptions|CharsetSourceEnc)\b
+      captures:
+        1: keyword.charset_lite.apacheconf
+    - match: \b(Dav|DavDepthInfinity|DavMinTimeout|DavLockDB)\b
+      captures:
+        1: keyword.dav.apacheconf
+    - match: \b(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize)\b
+      captures:
+        1: keyword.deflate.apacheconf
+    - match: \b(DirectoryIndex|DirectorySlash|FallbackResource)\b
+      captures:
+        1: keyword.dir.apacheconf
+    - match: \b(CacheDirLength|CacheDirLevels|CacheExpiryCheck|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheMaxFileSize|CacheMinFileSize|CacheRoot|CacheSize|CacheTimeMargin)\b
+      captures:
+        1: keyword.disk_cache.apacheconf
+    - match: \b(DumpIOInput|DumpIOOutput)\b
+      captures:
+        1: keyword.dumpio.apacheconf
+    - match: \b(PassEnv|SetEnv|UnsetEnv)\b
+      captures:
+        1: keyword.env.apacheconf
+    - match: \b(ExpiresActive|ExpiresByType|ExpiresDefault)\b
+      captures:
+        1: keyword.expires.apacheconf
+    - match: \b(ExtFilterDefine|ExtFilterOptions)\b
+      captures:
+        1: keyword.ext_filter.apacheconf
+    - match: \b(CacheFile|MMapFile)\b
+      captures:
+        1: keyword.file_cache.apacheconf
+    - match: \b(AddOutputFilterByType|FilterChain|FilterDeclare|FilterProtocol|FilterProvider|FilterTrace)\b
+      captures:
+        1: keyword.filter.apacheconf
+    - match: \b(Header|RequestHeader)\b
+      captures:
+        1: keyword.headers.apacheconf
+    - match: \b(ImapBase|ImapDefault|ImapMenu)\b
+      captures:
+        1: keyword.imap.apacheconf
+    - match: \b(SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|XBitHack)\b
+      captures:
+        1: keyword.include.apacheconf
+    - match: \b(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer)\b
+      captures:
+        1: keyword.isapi.apacheconf
+    - match: \b(LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize|LDAPTrustedCA|LDAPTrustedCAType)\b
+      captures:
+        1: keyword.ldap.apacheconf
+    - match: \b(BufferedLogs|CookieLog|CustomLog|LogFormat|TransferLog|ForensicLog)\b
+      captures:
+        1: keyword.log.apacheconf
+    - match: \b(MCacheMaxObjectCount|MCacheMaxObjectSize|MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize)\b
+      captures:
+        1: keyword.mem_cache.apacheconf
+    - match: \b(AddCharset|AddEncoding|AddHandler|AddInputFilter|AddLanguage|AddOutputFilter|AddType|DefaultLanguage|ModMimeUsePathInfo|MultiviewsMatch|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|TypesConfig)\b
+      captures:
+        1: keyword.mime.apacheconf
+    - match: \b(ProtocolEcho|Example|AddModuleInfo|MimeMagicFile|CheckSpelling|ExtendedStatus|SuexecUserGroup|UserDir)\b
+      captures:
+        1: keyword.misc.apacheconf
+    - match: \b(CacheNegotiatedDocs|ForceLanguagePriority|LanguagePriority)\b
+      captures:
+        1: keyword.negotiation.apacheconf
+    - match: \b(NWSSLTrustedCerts|NWSSLUpgradeable|SecureListen)\b
+      captures:
+        1: keyword.nw_ssl.apacheconf
+    - match: \b(AllowCONNECT|NoProxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyFtpDirCharset|ProxyIOBufferSize|ProxyMaxForwards|ProxyPass|ProxyPassMatch|ProxyPassReverse|ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia)\b
+      captures:
+        1: keyword.proxy.apacheconf
+    - match: \b(RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule)\b
+      captures:
+        1: keyword.rewrite.apacheconf
+    - match: \b(BrowserMatch|BrowserMatchNoCase|SetEnvIf|SetEnvIfNoCase)\b
+      captures:
+        1: keyword.setenvif.apacheconf
+    - match: \b(LoadFile|LoadModule)\b
+      captures:
+        1: keyword.so.apacheconf
+    - match: \b(SSLCACertificateFile|SSLCACertificatePath|SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions|SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite|SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire|SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|SSLInsecureRenegotiation|SSLOpenSSLConfCmd)\b
+      captures:
+        1: keyword.ssl.apacheconf
+    - match: \b(Substitute|SubstituteInheritBefore|SubstituteMaxLineLength)\b
+      captures:
+        1: keyword.substitute.apacheconf
+    - match: \b(CookieDomain|CookieExpires|CookieName|CookieStyle|CookieTracking)\b
+      captures:
+        1: keyword.usertrack.apacheconf
+    - match: \b(VirtualDocumentRoot|VirtualDocumentRootIP|VirtualScriptAlias|VirtualScriptAliasIP)\b
+      captures:
+        1: keyword.vhost_alias.apacheconf
+    - match: \b(php_value|php_flag|php_admin_value|php_admin_flag)\b(\s+(.+?)(\s+(".+?"|.+?))?)?\s
+      captures:
+        1: keyword.php.apacheconf
+        3: entity.property.apacheconf
+        5: string.value.apacheconf
+    - match: '(%\{)((HTTP_USER_AGENT|HTTP_REFERER|HTTP_COOKIE|HTTP_FORWARDED|HTTP_HOST|HTTP_PROXY_CONNECTION|HTTP_ACCEPT|REMOTE_ADDR|REMOTE_HOST|REMOTE_PORT|REMOTE_USER|REMOTE_IDENT|REQUEST_METHOD|SCRIPT_FILENAME|PATH_INFO|QUERY_STRING|AUTH_TYPE|DOCUMENT_ROOT|SERVER_ADMIN|SERVER_NAME|SERVER_ADDR|SERVER_PORT|SERVER_PROTOCOL|SERVER_SOFTWARE|TIME_YEAR|TIME_MON|TIME_DAY|TIME_HOUR|TIME_MIN|TIME_SEC|TIME_WDAY|TIME|API_VERSION|THE_REQUEST|REQUEST_URI|REQUEST_FILENAME|IS_SUBREQ|HTTPS)|(.*?))(\})'
+      captures:
+        1: punctuation.variable.apacheconf
+        3: variable.env.apacheconf
+        4: variable.misc.apacheconf
+        5: punctuation.variable.apacheconf
+    - match: \b((text|image|application|video|audio)/.+?)\s
+      captures:
+        1: entity.mime-type.apacheconf
+    - match: \b(?i)(export|from|unset|set|on|off)\b
+      captures:
+        1: entity.helper.apacheconf
+    - match: \b(\d+)\b
+      captures:
+        1: constant.numeric.integer.decimal.apacheconf
+    - match: '\s(\[)(.*?)(\])\s'
+      captures:
+        1: punctuation.definition.flag.apacheconf
+        2: string.flag.apacheconf
+        3: punctuation.definition.flag.apacheconf

assets/syntaxes/02_Extra/AsciiDoc.sublime-syntax

@@ -0,0 +1,997 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: AsciiDoc (Asciidoctor)
+file_extensions:
+  - adoc
+  - ad
+  - asciidoc
+scope: text.asciidoc
+contexts:
+  main:
+    - include: lists
+    - include: blocks
+    - include: section_titles
+    - include: lines
+    - include: inline
+    - include: characters
+  attribute_entry:
+    - match: |-
+        (?x)
+        ^(:)                          # opening delimiter
+        (!)?                          # bang symbol (unset attribute)
+        ([A-Za-z0-9_][A-Za-z0-9_-]*)  # attribute name
+        (!)?                          # bang symbol (unset attribute)
+        (:)                           # closing delimiter
+        (?:\s+|(?=$))
+      comment: |
+        An attribute entry.
+
+        Examples:
+          :my-attribute: value
+          :sectnums!:
+          :!sectnums:
+      captures:
+        1: punctuation.definition.attributeentry.attrname.begin.asciidoc
+        2: punctuation.definition.attributeentry.unset.asciidoc
+        3: support.variable.attribute.asciidoc
+        4: punctuation.definition.attributeentry.unset.asciidoc
+        5: punctuation.definition.attributeentry.attrname.end.asciidoc
+      push:
+        - meta_scope: meta.attributeentry.asciidoc
+        - meta_content_scope: meta.attributeentry.value.asciidoc
+        - match: $\n?
+          pop: true
+        - include: characters
+  attribute_list_line:
+    - match: '^(\[)[^\[\]]*(\])\s*$\n?'
+      comment: "Attribute list as paragraph: single brackets. No need for special treatment of escape; follows literal block, section template as being a more general regex."
+      scope: support.variable.attributelist.asciidoc
+      captures:
+        1: punctuation.definition.attributelistline.begin.asciidoc
+        2: punctuation.definition.attributelistline.end.asciidoc
+  attribute_reference:
+    - match: "({)([A-Za-z0-9_][A-Za-z0-9_-]*)(})"
+      comment: |
+        Examples:
+          {my-attribute}
+      scope: variable.other
+      captures:
+        1: constant.character.attributes.reference.begin.asciidoc
+        2: support.variable.attribute.asciidoc
+        3: constant.character.attributes.reference.end.asciidoc
+  biblio_anchor:
+    - match: '(?<!\[)(\[\[\[).*?(\]\]\])(?!\])'
+      comment: |
+        Bibliography anchor
+
+        Examples:
+          [[[Lorem ipsum]]]
+      scope: storage.type.reference.biblioanchor.asciidoc
+      captures:
+        1: punctuation.definition.biblioanchor.begin.asciidoc
+        2: punctuation.definition.biblioanchor.end.asciidoc
+  block_admonition_label:
+    - match: ^(NOTE|TIP|IMPORTANT|WARNING|CAUTION):(?=\s+)
+      comment: |
+        Label of an admonition block.
+
+        Examples:
+          NOTE: This is a admonition block.
+          WARNING:  Be aware of them!
+      scope: support.constant.admonitionword.asciidoc
+  block_comment:
+    - match: '^(/{4,})\s*$\n?'
+      comment: |
+        Examples:
+          ////
+          A multi-line comment.
+          Notice it's a delimited block.
+          ////
+      captures:
+        0: punctuation.definition.comment.begin.asciidoc
+      push:
+        - meta_scope: comment.block.asciidoc
+        - meta_content_scope: meta.block.comment.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: punctuation.definition.comment.end.asciidoc
+          pop: true
+        - include: macro
+  block_example:
+    - match: '^(={4,})\s*$\n?'
+      comment: |
+        Examples:
+          ====
+          Lorem ipsum.
+          ====
+
+        Note: Might need to add more includes, but these are the ones that arise in
+        practice for me.
+      captures:
+        0: constant.delimiter.example.begin.asciidoc
+      push:
+        - meta_scope: string.unquoted.block.example.asciidoc
+        - meta_content_scope: meta.block.example.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: constant.delimiter.example.end.asciidoc
+          pop: true
+        - include: lists
+        - include: block_listing
+        - include: lines
+        - include: inline
+        - include: characters
+  block_id:
+    - match: '^(\[\[)([^\[].*)(\]\])\s*$\n?'
+      comment: |
+        A block id (i.e. anchor).
+
+        Examples:
+          [[myid]]
+          Lorem ipsum dolor.
+      scope: meta.tag.blockid.asciidoc
+      captures:
+        1: punctuation.definition.blockid.begin.asciidoc
+        2: markup.underline.blockid.id.asciidoc
+        3: punctuation.definition.blockid.end.asciidoc
+  block_listing:
+    - match: '^(\-{4,})\s*$\n?'
+      comment: |
+        Examples:
+          ----
+          Lorem ipsum.
+          ----
+      captures:
+        0: constant.delimiter.listing.begin.asciidoc
+      push:
+        - meta_scope: meta.embedded.block.listing.asciidoc
+        - meta_content_scope: source.block.listing.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: constant.delimiter.listing.end.asciidoc
+          pop: true
+        - include: inline_callout
+  block_literal:
+    - match: '^(\.{4,})\s*$\n?'
+      comment: |
+        Examples:
+          ....
+          Lorem ipsum.
+          ....
+      captures:
+        0: constant.delimiter.block.literal.begin.asciidoc
+      push:
+        - meta_scope: string.literal.block.delimited.asciidoc
+        - meta_content_scope: meta.block.literal.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: constant.delimiter.block.literal.end.asciidoc
+          pop: true
+        - include: inline_callout
+  block_open:
+    - match: ^\-\-\s*$\n?
+      comment: |
+        Examples:
+          --
+          Lorem ipsum
+          --
+        Note: Might need to check on these includes.
+      captures:
+        0: constant.delimiter.block.open.begin.asciidoc
+      push:
+        - meta_scope: meta.block.open.asciidoc
+        - meta_content_scope: meta.block.open.content.asciidoc
+        - match: ^\-\-\s*$\n?
+          captures:
+            0: constant.delimiter.block.open.end.asciidoc
+          pop: true
+        - include: lists
+        - include: block_comment
+        - include: block_listing
+        - include: block_pass
+        - include: lines
+        - include: inline
+        - include: characters
+  block_page_break:
+    - match: '^<{3,}$\n?'
+      comment: |
+        A page break.
+
+        Examples:
+          <<<
+          <<<<<
+      scope: meta.separator.pagebreak.asciidoc
+  block_pass:
+    - match: '^(\+{4,})\s*$\n?'
+      captures:
+        0: constant.delimiter.block.passthrough.begin.asciidoc
+      push:
+        - meta_scope: meta.embedded.block.passthrough.asciidoc
+        - meta_content_scope: text.xml.block.passthrough.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: constant.delimiter.block.passthrough.end.asciidoc
+          pop: true
+        - include: scope:text.xml
+  block_quote:
+    - match: '^(_{4,})\s*$\n?'
+      comment: |
+        Examples:
+          ____
+          Lorem ipsum
+          ____
+
+        Note: Might need to add more includes, but these are the ones that arise for me in practice.
+      captures:
+        0: constant.delimiter.block.quote.begin.asciidoc
+      push:
+        - meta_scope: markup.quote.block.asciidoc
+        - meta_content_scope: meta.block.quote.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: constant.delimiter.block.quote.end.asciidoc
+          pop: true
+        - include: lines
+        - include: inline
+        - include: characters
+  block_sidebar:
+    - match: '^(\*{4,})\s*$\n?'
+      comment: |
+        Examples:
+          ****
+          Lorem ipsum
+          ****
+
+        Note: Might need to add more includes, but these are the ones that arise
+        for me in practice.
+      captures:
+        0: constant.delimiter.block.sidebar.begin.asciidoc
+      push:
+        - meta_scope: string.quoted.block.sidebar.asciidoc
+        - meta_content_scope: meta.block.sidebar.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: constant.delimiter.block.sidebar.end.asciidoc
+          pop: true
+        - include: lists
+        - include: block_comment
+        - include: block_listing
+        - include: lines
+        - include: inline
+        - include: characters
+  block_source_fenced:
+    - match: ^(```)(\w+)?\s*$\n?
+      comment: |
+        Fenced code block (ala Markdown)
+
+        Examples:
+          ```rb
+          puts 'Hello world!'
+          ```
+      captures:
+        0: constant.delimiter.listing.begin.asciidoc
+      push:
+        - meta_scope: meta.embedded.block.listing.asciidoc
+        - meta_content_scope: source.block.listing.content.asciidoc
+        - match: ^\1\s*$\n?
+          captures:
+            0: constant.delimiter.listing.end.asciidoc
+          pop: true
+        - include: inline_callout
+  block_thematic_break:
+    - match: '^''{3,}$\n?'
+      comment: |
+        A thematic break (aka horizontal rule).
+
+        Examples:
+          '''
+          ''''''
+      scope: meta.separator.ruler.asciidoc
+  block_title:
+    - match: ^(\.)\w.*$\n?
+      comment: |
+        Title of a block.
+
+        Examples:
+          .My title
+          Lorem ipsum dolor.
+      scope: markup.heading.block.asciidoc
+      captures:
+        1: punctuation.definition.blockheading.asciidoc
+  blocks:
+    - include: block_literal
+    - include: block_comment
+    - include: block_listing
+    - include: block_source_fenced
+    - include: block_sidebar
+    - include: block_pass
+    - include: block_quote
+    - include: block_example
+    - include: block_open
+  characters:
+    - include: attribute_reference
+    - include: entity_number
+    - include: entity_name
+    - include: escape
+    - include: replacement
+    - include: macro_pass
+    - include: macro
+    - include: xref
+    - include: biblio_anchor
+    - include: indexterm_triple
+    - include: indexterm_double
+  colist_item_marker:
+    - match: ^(\s*((<)\d+?(>)))\s+(?=\S)
+      comment: |
+        Marker of a callout list item.
+
+        Examples:
+          <1> a callout
+          <42> another callout
+      scope: markup.list.numbered.callout.asciidoc
+      captures:
+        1: string.unquoted.list.callout.asciidoc
+        2: constant.numeric.callout.asciidoc
+        3: punctuation.definition.calloutlistnumber.begin.asciidoc
+        4: punctuation.definition.calloutlistnumber.end.asciidoc
+  dlist_item_label:
+    - match: '^\s*(?=.*:{2,4}(?:\s|$))'
+      comment: |
+        Label of a definition (labeled) list item.
+
+        Examples:
+          Label level 1:: lorem ipsum
+          Label level 2::: dolor sit amet
+          Label level 3:::: consectetur
+          Label level 1::
+            lorem ipsum
+          Another label :: lorem ipsum
+          Last::label:: dolor sit amet
+
+        Note: This rule is not strictly correct, because Asciidoctor allows
+        double colon followed by a space inside a label, i.e. it matches the
+        *last* double colon, not the first. I don't know how to do that
+        *effectively.
+      push:
+        - meta_scope: markup.list.labeled.asciidoc
+        - meta_content_scope: meta.list.label.asciidoc
+        - match: '(:{2,4})(?:\s|$\n?)'
+          captures:
+            1: constant.labeledlist.separator.asciidoc
+          pop: true
+        - include: inline
+        - include: characters
+  emphasis:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?      # might be preceded by an attributes list
+        (?<=^|\W)(?<!\\|})  # must be preceded by nonword character, and not by escape or } (attribute)
+        (_)(?=\S)           # delimiter underscore that must be followed by a nonspace character
+      comment: |
+        Emphasized (italic) text (constrained variant).
+
+        Examples:
+          _Lorem ipsum_ dolor
+          [red]_Lorem ipsum_ dolor
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.italic.single.begin.asciidoc
+      push:
+        - meta_scope: markup.italic.single.asciidoc
+        - meta_content_scope: meta.italicinner.single.asciidoc
+        - match: |-
+            (?x)
+            (?<=\S)(_)        # delimiter underscore that must be preceded by a nonspace character
+            (?!\w)            # ...and followed by a nonword character
+          captures:
+            1: punctuation.definition.italic.single.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: monospaced_double
+        - include: mark_double
+        - include: strong
+        - include: monospaced
+        - include: mark
+        - include: superscript
+        - include: subscript
+        - include: characters
+  emphasis_double:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?  # might start with attribute list
+        (?<!\\)         # must not be preceded by escape
+        (__)
+      comment: |
+        Emphasized (italic) text (unconstrained variant).
+
+        Examples:
+          Lo__re__m __ipsum dolor__.
+          Lo[red]__re__m
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.italic.double.begin.asciidoc
+      push:
+        - meta_scope: markup.italic.double.asciidoc
+        - meta_content_scope: meta.italicinner.double.asciidoc
+        - match: __
+          captures:
+            0: punctuation.definition.italic.double.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: monospaced_double
+        - include: mark_double
+        - include: strong
+        - include: monospaced
+        - include: mark
+        - include: superscript
+        - include: subscript
+        - include: characters
+  entity_name:
+    - match: '(?<!\\)&([a-zA-Z][a-zA-Z0-9]*);'
+      comment: |
+        Character entity reference
+
+        Examples:
+          &nbsp;
+          &sup2;
+      scope: constant.character.entity.xml.asciidoc
+  entity_number:
+    - match: '(?<!\\)&#(x?[0-9a-fA-f]{2,4});'
+      comment: |
+        Numeric character reference
+
+        Examples:
+          &#x278a;
+          &#182;
+      scope: constant.character.entity.asciidoc
+  escape:
+    - match: '\\(?=[-`*_#+.!(){}\[\]\\>:])'
+      comment: |
+        List of special characters that may be escaped.
+
+        Note: I do not really know if this is a good list, adopted wholesale from
+        original bundle.
+      scope: constant.character.escape.asciidoc
+  indexterm_double:
+    - match: '(?<!\()(\({2})([^\(\s].*?)(\){2})(?!\))'
+      comment: |
+        Double parenthesis indexterm.
+
+        Examples:
+          ((Arthur))
+      scope: variable.other.indexterm.double.asciidoc
+      captures:
+        1: constant.character.indexterm.double.begin.asciidoc
+        3: constant.character.indexterm.double.end.asciidoc
+  indexterm_triple:
+    - match: '(?<!\()(\({3})([^\(].*?)(\){3})(?!\))'
+      comment: |
+        Triple parenthesis indexterm.
+
+        Examples:
+          (((Sword, Broadsword, Excalibur)))
+      scope: variable.other.indexterm.triple.asciidoc
+      captures:
+        1: constant.character.indexterm.triple.begin.asciidoc
+        3: constant.character.indexterm.triple.end.asciidoc
+  inline:
+    - include: passthrough
+    - include: strong_double
+    - include: emphasis_double
+    - include: monospaced_double
+    - include: mark_double
+    - include: strong
+    - include: emphasis
+    - include: monospaced
+    - include: mark
+    - include: superscript
+    - include: subscript
+  inline_break:
+    - match: (?<=\s)\+$\n?
+      comment: |
+        Line hard break with a plus sign (+).
+
+        Examples:
+          Rubies are red, +
+          Topazes are blue.
+      scope: constant.linebreak.asciidoc
+  inline_callout:
+    - match: (?<!\\)(<)\d+(>)
+      comment: |
+        Callout label
+
+        Examples:
+          <1>
+          <42>
+      scope: constant.other.callout.asciidoc
+      captures:
+        1: punctuation.definition.callout.begin.asciidoc
+        2: punctuation.definition.callout.end.asciidoc
+  inline_comment:
+    - match: '^(//)([^/\n].*|)$\n?'
+      comment: |
+        Inline comment.
+
+        Examples:
+          // This is just a comment!
+      scope: comment.line.double-slash.asciidoc
+      captures:
+        1: punctuation.definition.comment.line.asciidoc
+        2: meta.line.comment.content.asciidoc
+  lines:
+    - include: inline_comment
+    - include: list_continuation
+    - include: inline_break
+    - include: block_page_break
+    - include: block_thematic_break
+    - include: block_title
+    - include: block_id
+    - include: section_template
+    - include: attribute_list_line
+    - include: attribute_entry
+  list_continuation:
+    - match: ^\+\s*$\n?
+      scope: constant.listcontinuation.asciidoc
+  lists:
+    - include: block_admonition_label
+    - include: ulist_item_marker
+    - include: olist_item_marker
+    - include: dlist_item_label
+    - include: colist_item_marker
+  macro:
+    - match: |-
+        (?x)
+        (?:
+          ((?:https?|mailto|ftp|file)  # specify separately so we can mark them as links that TextMate opens
+          ?:{1}  # inline only
+          \S*)   # (others such as image are partial URLs and/or TextMate cannot handle them)
+        |
+          (([a-zA-Z0-9][a-zA-Z0-9_]*)
+          (:{1,2})
+          (\S*))
+        )
+        (?:(\[)([^\]]*)(\]))
+      comment: |
+        Note: There are other macro notations, but I match only those that end in
+        square brackets.
+      scope: meta.macro.asciidoc
+      captures:
+        1: markup.underline.link.macro.asciidoc
+        3: keyword.control.name.macro.asciidoc
+        4: constant.character.separator.macro.asciidoc
+        5: markup.underline.target.macro.asciidoc
+        6: constant.character.attributes.macro.begin.asciidoc
+        7: variable.parameter.attributes.macro.asciidoc
+        8: constant.character.attributes.macro.end.asciidoc
+  macro_pass:
+    - match: |-
+        (?x)
+        (pass)
+        (:{1,2})
+        (\S*)
+        (\[)(?=[^\]]*\])
+      comment: |
+        Passthrough macro
+
+        Examples:
+          pass:[Lorem ipsum]
+          pass::[Lorem ipsum]
+      captures:
+        1: keyword.control.name.macro.pass.asciidoc
+        2: constant.character.separator.macro.asciidoc
+        3: markup.underline.target.macro.asciidoc
+        4: constant.character.attributes.macro.begin.asciidoc
+      push:
+        - meta_scope: meta.macro.pass.asciidoc
+        - meta_content_scope: variable.parameter.attributes.macro.pass.asciidoc
+        - match: '\]'
+          captures:
+            0: constant.character.attributes.macro.end.asciidoc
+          pop: true
+        - include: scope:text.xml
+  mark:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?      # might start with attribute list (darned well better or why are we here)
+        (?<=^|\W)(?<!\\|})  # must be preceded by nonword character, and not by escape or } (attribute)
+        (\#)(?=\S)          # delimiter hash that must be followed by a nonspace character
+      comment: |
+        Marked text (constrained variant).
+
+        Examples:
+          #Lorem ipsum# dolor
+          [red]#Lorem ipsum# dolor
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.string.unquoted.single.begin.asciidoc
+      push:
+        - meta_scope: string.other.unquoted.single.asciidoc
+        - meta_content_scope: string.unquoted.unquotedinner.single.asciidoc
+        - match: |-
+            (?x)
+            (?<=\S)(\#)       # delimiter hash that must be preceded by a nonspace character
+            (?!\w)            # ...and followed by a nonword character
+          captures:
+            1: punctuation.definition.string.unquoted.single.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: emphasis_double
+        - include: monospaced_double
+        - include: strong
+        - include: emphasis
+        - include: monospaced
+        - include: superscript
+        - include: subscript
+        - include: characters
+  mark_double:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?  # might start with an attribute list (indeed, that is its purpose)
+        (?<!\\)         # must not be preceded by escape
+        (\#\#)
+      comment: |
+        Marked text (unconstrained variant).
+
+        Examples:
+          Lo##re##m ##ipsum dolor##.
+          Lo[red]##re##m
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.string.unquoted.double.begin.asciidoc
+      push:
+        - meta_scope: string.other.unquoted.double.asciidoc
+        - meta_content_scope: string.unquoted.unquotedinner.double.asciidoc
+        - match: '\#\#'
+          captures:
+            0: punctuation.definition.string.unquoted.double.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: emphasis_double
+        - include: monospaced_double
+        - include: strong
+        - include: emphasis
+        - include: monospaced
+        - include: superscript
+        - include: subscript
+        - include: characters
+  monospaced:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?      # might start with attributes list
+        (?<=^|\W)(?<!\\|})  # must be preceded by nonword character, and not by escape or } (attribute)
+        (`)(?=\S)           # delimiter backtick that must be followed by a nonspace character
+      comment: |
+        Monospaced text (constrained variant).
+
+        Examples:
+          `Lorem ipsum` dolor
+          [red]`Lorem ipsum` dolor
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.literal.single.begin.asciidoc
+      push:
+        - meta_scope: string.other.literal.single.asciidoc
+        - meta_content_scope: meta.literalinner.single.asciidoc
+        - match: |-
+            (?x)
+            (?<=\S)(`)        # delimiter backtick that must be preceded by a nonspace character
+            (?!\w)            # ...and followed by a nonword character
+          captures:
+            1: punctuation.definition.literal.single.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: emphasis_double
+        - include: mark_double
+        - include: strong
+        - include: emphasis
+        - include: mark
+        - include: superscript
+        - include: subscript
+        - include: characters
+  monospaced_double:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?  # might start with attribute list
+        (?<!\\)         # must not be preceded by escape
+        (``)
+      comment: |
+        Monospaced text (unconstrained variant).
+
+        Examples:
+          Lo``re``m ``ipsum dolor``.
+          Lo[red]``re``m
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.literal.double.begin.asciidoc
+      push:
+        - meta_scope: string.other.literal.double.asciidoc
+        - meta_content_scope: meta.literalinner.double.asciidoc
+        - match: "``"
+          captures:
+            0: punctuation.definition.literal.double.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: emphasis_double
+        - include: mark_double
+        - include: strong
+        - include: emphasis
+        - include: mark
+        - include: superscript
+        - include: subscript
+        - include: characters
+  olist_item_marker:
+    - match: '^(\s*(\.{1,5}))\s+(?=\S)'
+      comment: |
+        Marker of an ordered (numbered) list item.
+
+        Examples:
+          . level 1
+          .. level 2
+          ... level 3
+          .... level 4
+          ..... level 5
+
+        Note: The space distinguishes it from a block title.
+      scope: markup.list.numbered.dotted.asciidoc
+      captures:
+        1: string.unquoted.list.dotted.asciidoc
+        2: constant.numeric.list.dot.asciidoc
+  passthrough:
+    - match: (\+\+\+|\$\$)
+      comment: |
+        Inline triple-plus and double dolar passthrough.
+
+        Examples:
+          Lo+++re++++m +++ipsum dolor+++.
+          Lo$$re$$m $$ipsum dolor$$.
+
+        Note: Must be dead first among the inlines, so as to take priority.
+      captures:
+        1: constant.character.passthru.begin.asciidoc
+      push:
+        - meta_scope: meta.passthru.inline.asciidoc
+        - meta_content_scope: variable.parameter.passthruinner.asciidoc
+        - match: \1
+          captures:
+            0: constant.character.passthru.end.asciidoc
+          pop: true
+  replacement:
+    - match: |-
+        (?x)
+        (?<!\\)  # must not be escaped
+        (
+          \(C\)
+          | \(TM\)
+          | \(R\)
+          | ((?<!\-)\-\-(?!\-))    # exactly two, and even this may not rule out all that I want to
+          | ((?<!\.)\.\.\.(?!\.))  # exactly three
+          | \->
+          | <\-
+          | =>
+          | <=
+        )
+      scope: constant.character.replacement.asciidoc
+  section_template:
+    - match: |-
+        (?x)^
+        (\[)  # in square brackets
+        (template\s*=\s*)?(")?  # might start with template-equals and might have template name in quotes
+        (
+        sect\d|abstract|preface|colophon|dedication|glossary|bibliography|synopsis|appendix|index # fixed list of known templates
+        )
+        (".*(\])|(\]))  # either close the quote (and perhaps go on) and close the bracket, or close the bracket immediately
+        \s*$\n?
+      comment: fixed list of known template names
+      scope: variable.parameter.sectiontemplate.asciidoc
+      captures:
+        1: punctuation.definition.sectiontemplate.begin.asciidoc
+        4: meta.tag.sectiontemplate.asciidoc
+        6: punctuation.definition.sectiontemplate.end.asciidoc
+        7: punctuation.definition.sectiontemplate.end.asciidoc
+  section_titles:
+    - include: title_level_5
+    - include: title_level_4
+    - include: title_level_3
+    - include: title_level_2
+    - include: title_level_1
+    - include: title_level_0
+  strong:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?      # might start with an attributes list
+        (?<=^|\W)(?<!\\|})  # must be preceded by nonword character, and not by escape or } (attribute)
+        (\*)(?=\S)          # delimiter star that must be followed by a nonspace character
+      comment: |
+        Strong (bold) text (constrained variant).
+
+        Examples:
+          *Lorem ipsum* dolor
+          [red]*Lorem ipsum* dolor
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.bold.single.begin.asciidoc
+      push:
+        - meta_scope: markup.bold.single.asciidoc
+        - meta_content_scope: meta.boldinner.single.asciidoc
+        - match: |-
+            (?x)
+            (?<=\S)(\*)       # delimiter star that must be preceded by a nonspace character
+            (?!\w)            # ...and followed by a nonword character
+          captures:
+            1: punctuation.definition.bold.single.end.asciidoc
+          pop: true
+        - include: emphasis_double
+        - include: monospaced_double
+        - include: mark_double
+        - include: emphasis
+        - include: monospaced
+        - include: mark
+        - include: superscript
+        - include: subscript
+        - include: characters
+  strong_double:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?  # might start with an attribute list
+        (?<!\\)         # must not be preceded by escape
+        (\*\*)
+      comment: |
+        Strong (bold) text (unconstrained variant).
+
+        Examples:
+          Lo**re**m **ipsum dolor**.
+          Lo[red]**re**m
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.bold.double.begin.asciidoc
+      push:
+        - meta_scope: markup.bold.double.asciidoc
+        - meta_content_scope: meta.boldinner.double.asciidoc
+        - match: \*\*
+          captures:
+            0: punctuation.definition.bold.double.end.asciidoc
+          pop: true
+        - include: emphasis_double
+        - include: monospaced_double
+        - include: mark_double
+        - include: emphasis
+        - include: monospaced
+        - include: mark
+        - include: superscript
+        - include: subscript
+        - include: characters
+  subscript:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?  # might start with attribute list
+        (?<!\\)         # must not be preceded by escape
+        (~)
+      comment: |
+       Subscript text.
+
+        Examples:
+          E=mc^2^
+          E=mc[red]^2^
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.string.subscript.begin.asciidoc
+      push:
+        - meta_scope: string.other.subscript.asciidoc
+        - meta_content_scope: meta.subscriptinner.asciidoc
+        - match: '~' # this tilda a problem if unquoted
+          captures:
+            0: punctuation.definition.string.subscript.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: emphasis_double
+        - include: monospaced_double
+        - include: mark_double
+        - include: strong
+        - include: emphasis
+        - include: monospaced
+        - include: mark
+        - include: superscript
+        - include: characters
+  superscript:
+    - match: |-
+        (?x)
+        (\[[^\]]*?\])?  # might start with attribute list
+        (?<!\\)         # no preceding escape
+        (\^)
+      comment: |
+        Superscript text.
+
+        Examples:
+          H~2~O
+          H[red]~2~O
+      captures:
+        1: support.variable.attributelist.asciidoc
+        2: punctuation.definition.string.superscript.begin.asciidoc
+      push:
+        - meta_scope: string.other.superscript.asciidoc
+        - meta_content_scope: meta.superscriptinner.asciidoc
+        - match: ^
+          captures:
+            0: punctuation.definition.string.superscript.end.asciidoc
+          pop: true
+        - include: strong_double
+        - include: emphasis_double
+        - include: monospaced_double
+        - include: mark_double
+        - include: strong
+        - include: emphasis
+        - include: monospaced
+        - include: mark
+        - include: subscript
+        - include: characters
+  title_level_0:
+    - match: ^(=) (\w.*)$\n?
+      scope: markup.heading.level.0.asciidoc
+      captures:
+        1: punctuation.definition.heading.asciidoc
+        2: entity.name.section.asciidoc
+  title_level_1:
+    - match: ^(==) (\w.*)$\n?
+      scope: markup.heading.level.1.asciidoc
+      captures:
+        1: punctuation.definition.heading.asciidoc
+        2: entity.name.section.asciidoc
+  title_level_2:
+    - match: ^(===) (\w.*)$\n?
+      scope: markup.heading.level.2.asciidoc
+      captures:
+        1: punctuation.definition.heading.asciidoc
+        2: entity.name.section.asciidoc
+  title_level_3:
+    - match: ^(====) (\w.*)$\n?
+      scope: markup.heading.level.3.asciidoc
+      captures:
+        1: punctuation.definition.heading.asciidoc
+        2: entity.name.section.asciidoc
+  title_level_4:
+    - match: ^(=====) (\w.*)$\n?
+      scope: markup.heading.level.4.asciidoc
+      captures:
+        1: punctuation.definition.heading.asciidoc
+        2: entity.name.section.asciidoc
+  title_level_5:
+    - match: ^(======) (\w.*)$\n?
+      scope: markup.heading.level.5.asciidoc
+      captures:
+        1: punctuation.definition.heading.asciidoc
+        2: entity.name.section.asciidoc
+  ulist_item_marker:
+    - match: '^(\s*(\-|\*{1,5}))\s+(?=\S)'
+      comment: |
+        Marker of an unordered (bullet) list item.
+
+        Examples:
+          * level 1
+          ** level 2
+          *** level 3
+          **** level 4
+          ***** level 5
+          - level 1
+          -- level 2
+          --- level 3
+          ---- level 4
+          ----- level 5
+      scope: markup.list.bulleted.asciidoc
+      captures:
+        1: string.unquoted.list.bullet.asciidoc
+        2: constant.numeric.list.bullet.asciidoc
+  xref:
+    - match: '(?<!<)(<<)([^,]*?)((,\s*)(.*?))?(>>)(?!<)'
+      comment: |
+        Internal cross-reference
+
+        Examples:
+          <<lorem>>
+          <<lorem, see here>>
+      scope: meta.xref.asciidoc
+      captures:
+        1: constant.character.xref.begin.asciidoc
+        2: markup.underline.term.xref.asciidoc
+        5: variable.parameter.xref.asciidoc
+        6: constant.character.xref.end.asciidoc

assets/syntaxes/02_Extra/Cabal.sublime-syntax

@@ -33,7 +33,7 @@ contexts:
       captures:
         1: constant.other.cabal
         2: punctuation.entity.cabal
-    - match: '^(?i)(executable|library|test-suite|benchmark|flag|source-repository)\s+([^\s,]+)\s*$'
+    - match: '^(?i)(executable|library|test-suite|benchmark|flag|source-repository|custom-setup)\s+([^\s,]+)\s*$'
       scope: entity.cabal
       captures:
         1: keyword.entity.cabal

assets/syntaxes/02_Extra/CoffeeScript.sublime-syntax

@@ -0,0 +1,271 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: CoffeeScript
+comment: "CoffeeScript Syntax: version 1"
+file_extensions:
+  - coffee
+  - Cakefile
+  - coffee.erb
+  - cson
+first_line_match: ^#!.*\bcoffee
+scope: source.coffee
+contexts:
+  main:
+    - match: '(\([^()]*?\))\s*([=-]>)'
+      comment: "match stuff like: a -> …"
+      scope: meta.inline.function.coffee
+      captures:
+        1: variable.parameter.function.coffee
+        2: storage.type.function.coffee
+    - match: (new)\s+(\w+(?:\.\w*)*)
+      scope: meta.class.instance.constructor
+      captures:
+        1: keyword.operator.new.coffee
+        2: support.class.coffee
+    - match: "'''"
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.heredoc.coffee
+        - match: "'''"
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+    - match: '"""'
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.double.heredoc.coffee
+        - match: '"""'
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: \\.
+          scope: constant.character.escape.coffee
+        - include: interpolated_coffee
+    - match: "`"
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.script.coffee
+        - match: "`"
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
+          scope: constant.character.escape.coffee
+    - match: (?<!#)###(?!#)
+      captures:
+        0: punctuation.definition.comment.coffee
+      push:
+        - meta_scope: comment.block.coffee
+        - match: '###(?:[ \t]*\n)'
+          captures:
+            0: punctuation.definition.comment.coffee
+          pop: true
+        - match: '@\w*'
+          scope: storage.type.annotation.coffeescript
+    - match: '(#)(?!\{).*$\n?'
+      scope: comment.line.number-sign.coffee
+      captures:
+        1: punctuation.definition.comment.coffee
+    - match: "/{3}"
+      push:
+        - meta_scope: string.regexp.coffee
+        - match: "/{3}[imgy]{0,4}"
+          pop: true
+        - include: interpolated_coffee
+        - include: embedded_comment
+    - match: '/(?![\s=/*+{}?]).*?[^\\]/[igmy]{0,4}(?![a-zA-Z0-9])'
+      scope: string.regexp.coffee
+    - match: |-
+        (?x)
+          \b(?<![\.\$])(
+            break|by|catch|continue|else|finally|for|in|of|if|return|switch|
+            then|throw|try|unless|when|while|until|loop|do|(?<=for)\s+own
+          )(?!\s*:)\b
+      scope: keyword.control.coffee
+    - match: |-
+        (?x)
+          and=|or=|!|%|&|\^|\*|\/|(\-)?\-(?!>)|\+\+|\+|~|==|=(?!>)|!=|<=|>=|<<=|>>=|
+          >>>=|<>|<|>|!|&&|\.\.(\.)?|\?|\||\|\||\:|\*=|(?<!\()/=|%=|\+=|\-=|&=|
+          \^=|\b(?<![\.\$])(instanceof|new|delete|typeof|and|or|is|isnt|not|super)\b
+      scope: keyword.operator.coffee
+    - match: '([a-zA-Z\$_](\w|\$|\.)*\s*(?!\::)((:)|(=[^=]))(?!(\s*\(.*\))?\s*((=|-)>)))'
+      scope: variable.assignment.coffee
+      captures:
+        1: variable.assignment.coffee
+        4: punctuation.separator.key-value
+        5: keyword.operator.coffee
+    - match: '(?<=\s|^)([\[\{])(?=.*?[\]\}]\s+[:=])'
+      captures:
+        0: keyword.operator.coffee
+      push:
+        - meta_scope: meta.variable.assignment.destructured.coffee
+        - match: '([\]\}]\s*[:=])'
+          captures:
+            0: keyword.operator.coffee
+          pop: true
+        - include: variable_name
+        - include: instance_variable
+        - include: single_quoted_string
+        - include: double_quoted_string
+        - include: numeric
+    - match: |-
+        (?x)
+          (\s*)
+          (?=[a-zA-Z\$_])
+          (
+            [a-zA-Z\$_](\w|\$|:|\.)*\s*
+            (?=[:=](\s*\(.*\))?\s*([=-]>))
+          )
+      scope: meta.function.coffee
+      captures:
+        2: entity.name.function.coffee
+        3: entity.name.function.coffee
+        4: variable.parameter.function.coffee
+        5: storage.type.function.coffee
+    - match: ^\s*(describe|it|app\.(get|post|put|all|del|delete))
+      comment: Show well-known functions from Express and Mocha in Go To Symbol view
+      push:
+        - meta_scope: meta.function.symbols.coffee
+        - match: $
+          pop: true
+        - include: main
+    - match: "[=-]>"
+      scope: storage.type.function.coffee
+    - match: '\b(?<!\.)(true|on|yes)(?!\s*[:=])\b'
+      scope: constant.language.boolean.true.coffee
+    - match: '\b(?<!\.)(false|off|no)(?!\s*[:=])\b'
+      scope: constant.language.boolean.false.coffee
+    - match: '\b(?<!\.)null(?!\s*[:=])\b'
+      scope: constant.language.null.coffee
+    - match: '\b(?<!\.)(this|extends)(?!\s*[:=])\b'
+      scope: variable.language.coffee
+    - match: '(class\b)\s+(@?[a-zA-Z\$_][\w\.]*)?(?:\s+(extends)\s+(@?[a-zA-Z\$\._][\w\.]*))?'
+      scope: meta.class.coffee
+      captures:
+        1: storage.type.class.coffee
+        2: entity.name.type.class.coffee
+        3: keyword.control.inheritance.coffee
+        4: entity.other.inherited-class.coffee
+    - match: \b(debugger|\\)\b
+      scope: keyword.other.coffee
+    - match: |-
+        (?x)\b(
+          Array|ArrayBuffer|Blob|Boolean|Date|document|event|Function|
+          Int(8|16|32|64)Array|Math|Map|Number|
+          Object|Proxy|RegExp|Set|String|WeakMap|
+          window|Uint(8|16|32|64)Array|XMLHttpRequest
+        )\b
+      scope: support.class.coffee
+    - match: ((?<=console\.)(debug|warn|info|log|error|time|timeEnd|assert))\b
+      scope: support.function.console.coffee
+    - match: |-
+        (?x)\b(
+          decodeURI(Component)?|encodeURI(Component)?|eval|parse(Float|Int)|require
+        )\b
+      scope: support.function.coffee
+    - match: |-
+        (?x)((?<=\.)(
+          apply|call|concat|every|filter|forEach|from|hasOwnProperty|indexOf|
+          isPrototypeOf|join|lastIndexOf|map|of|pop|propertyIsEnumerable|push|
+          reduce(Right)?|reverse|shift|slice|some|sort|splice|to(Locale)?String|
+          unshift|valueOf
+        ))\b
+      scope: support.function.method.array.coffee
+    - match: |-
+        (?x)((?<=Array\.)(
+          isArray
+        ))\b
+      scope: support.function.static.array.coffee
+    - match: |-
+        (?x)((?<=Object\.)(
+          create|definePropert(ies|y)|freeze|getOwnProperty(Descriptors?|Names)|
+          getProperty(Descriptor|Names)|getPrototypeOf|is(Extensible|Frozen|Sealed)?|
+          isnt|keys|preventExtensions|seal
+        ))\b
+      scope: support.function.static.object.coffee
+    - match: |-
+        (?x)((?<=Math\.)(
+          abs|acos|acosh|asin|asinh|atan|atan2|atanh|ceil|cos|cosh|exp|expm1|floor|
+          hypot|log|log10|log1p|log2|max|min|pow|random|round|sign|sin|sinh|sqrt|
+          tan|tanh|trunc
+        ))\b
+      scope: support.function.static.math.coffee
+    - match: |-
+        (?x)((?<=Number\.)(
+          is(Finite|Integer|NaN)|toInteger
+        ))\b
+      scope: support.function.static.number.coffee
+    - match: \b(Infinity|NaN|undefined)\b
+      scope: constant.language.coffee
+    - match: \;
+      scope: punctuation.terminator.statement.coffee
+    - match: ',[ |\t]*'
+      scope: meta.delimiter.object.comma.coffee
+    - match: \.
+      scope: meta.delimiter.method.period.coffee
+    - match: '\{|\}'
+      scope: meta.brace.curly.coffee
+    - match: \(|\)
+      scope: meta.brace.round.coffee
+    - match: '\[|\]\s*'
+      scope: meta.brace.square.coffee
+    - include: instance_variable
+    - include: single_quoted_string
+    - include: double_quoted_string
+    - include: numeric
+  double_quoted_string:
+    - match: '"'
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.double.coffee
+        - match: '"'
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]|37[0-7]?|[4-7][0-7]?|.)'
+          scope: constant.character.escape.coffee
+        - include: interpolated_coffee
+  embedded_comment:
+    - match: (?<!\\)(#).*$\n?
+      scope: comment.line.number-sign.coffee
+      captures:
+        1: punctuation.definition.comment.coffee
+  instance_variable:
+    - match: '(@)([a-zA-Z_\$]\w*)?'
+      scope: variable.other.readwrite.instance.coffee
+  interpolated_coffee:
+    - match: '\#\{'
+      captures:
+        0: punctuation.section.embedded.coffee
+      push:
+        - meta_scope: source.coffee.embedded.source
+        - match: '\}'
+          captures:
+            0: punctuation.section.embedded.coffee
+          pop: true
+        - include: main
+  numeric:
+    - match: '(?<!\$)\b((0([box])[0-9a-fA-F]+)|([0-9]+(\.[0-9]+)?(e[+\-]?[0-9]+)?))\b'
+      scope: constant.numeric.coffee
+  single_quoted_string:
+    - match: "'"
+      captures:
+        0: punctuation.definition.string.begin.coffee
+      push:
+        - meta_scope: string.quoted.single.coffee
+        - match: "'"
+          captures:
+            0: punctuation.definition.string.end.coffee
+          pop: true
+        - match: '\\(x\h{2}|[0-2][0-7]{,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)'
+          scope: constant.character.escape.coffee
+  variable_name:
+    - match: '([a-zA-Z\$_]\w*(\.\w+)*)'
+      scope: variable.assignment.coffee
+      captures:
+        1: variable.assignment.coffee

assets/syntaxes/02_Extra/CpuInfo.sublime-syntax

@@ -0,0 +1,14 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: CpuInfo
+file_extensions:
+  - cpuinfo
+scope: source.cpuinfo
+
+contexts:
+  main:
+    - match: '^([^:]+)\w*:\w*(.*)$'
+      captures:
+        1: keyword.other.cpuinfo-key
+        2: string.other.cpuinfo-value

assets/syntaxes/02_Extra/Crystal.sublime-syntax

@@ -108,7 +108,7 @@ contexts:
     - match: (?<!\.)\belse(\s)+if\b
       comment: else if is a common mistake carried over from other languages. it works if you put in a second end, but it’s never what you want.
       scope: invalid.deprecated.crystal
-    - match: '(?<!\.)\b(BEGIN|alias|as|begin|case|select|abstract|class|END|ensure|for|fun|if|ifdef|in|lib|module|of|out|private|protected|rescue|struct|with|union|enum|macro|then|type|unless|until|while)\b(?![?!])'
+    - match: '(?<!\.)\b(BEGIN|alias|as|begin|case|select|abstract|class|END|ensure|for|fun|if|ifdef|in|lib|module|of|out|private|protected|rescue|struct|with|union|enum|macro|then|unless|until|while)\b(?![?!])|(?<!\.)\btype\b\s*(?=[A-Z])'
       comment: everything being a reserved word, not a value and needing a 'end' is a..
       scope: keyword.control.primary.crystal
     - match: '(?<!\.)\b(when|else|elsif)\b(?![?!])'
@@ -131,9 +131,9 @@ contexts:
       scope: keyword.control.pseudo-method.crystal
     - match: '\b(nil|true|false)\b(?![?!])'
       scope: constant.language.crystal
-    - match: '\b(__(DIR|FILE|LINE)__|self)\b(?![?!])'
+    - match: '\b(__(DIR|FILE|LINE|END_LINE)__|self)\b(?![?!])|self[?]'
       scope: variable.language.crystal
-    - match: '\b(initialize|new|loop|include|extend|raise|getter|setter|property|class_getter|class_setter|class_property|describe|it|with|delegate|def_hash|def_equals|def_equals_and_hash|forward_missing_to|record|assert_responds_to|spawn)\b[!?]?'
+    - match: '\b(initialize|new|loop|include|extend|raise|getter|setter|property|class_getter|class_setter|class_property|describe|context|it|with|delegate|def_hash|def_equals|def_equals_and_hash|forward_missing_to|record|assert_responds_to|spawn|annotation|verbatim)\b[!?]?'
       comment: everything being a method but having a special function is a..
       scope: keyword.control.special-method.crystal
     - match: \b(require)\b
@@ -180,7 +180,7 @@ contexts:
          (?<=^|\s)(def)\s+                                              # the def keyword
          ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\x{80}-\x{10FFFF}\w]*(?>\.|::))?                                   # a method name prefix
            (?>[a-zA-Z_\x{80}-\x{10FFFF}][\x{80}-\x{10FFFF}\w]*(?>[?!]|=(?!>))?                              # the method name
-           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) )  # …or an operator method
+           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) )  # …or an operator method
          \s*(\()                                                        # the openning parenthesis for arguments
       comment: the method pattern comes from the symbol pattern, see there for a explaination
       captures:
@@ -190,7 +190,7 @@ contexts:
       push:
         - meta_scope: meta.function.method.with-arguments.crystal
         - meta_content_scope: variable.parameter.function.crystal
-        - match: \)\s*$|\)\s*:|\)\s*;
+        - match: \)
           captures:
             0: punctuation.definition.parameters.crystal
           pop: true
@@ -201,7 +201,7 @@ contexts:
          (?<=^|\s)(def)\s+                                              # the def keyword
          ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>\.|::))?                                   # a method name prefix
            (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?!>))?                              # the method name
-           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) )  # …or an operator method
+           |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) )  # …or an operator method
          [ \t]                                                          # the space separating the arguments
          (?=[ \t]*[^\s#;])                                              # make sure arguments and not a comment follow
       comment: same as the previous rule, but without parentheses around the arguments
@@ -221,7 +221,7 @@ contexts:
          ( \s+                                                               # an optional group of whitespace followed by…
            ( (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>\.|::))?                                      # a method name prefix
              (?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?!>))?                                 # the method name
-             |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?) ) )?  # …or an operator method
+             |===?|>[>=]?|<=>|<[<=]?|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?) ) )?  # …or an operator method
       comment: the optional name is just to catch the def also without a method-name
       scope: meta.function.method.without-arguments.crystal
       captures:
@@ -588,7 +588,7 @@ contexts:
           pop: true
         - match: \\.
           comment: Cant be named because its not neccesarily an escape.
-    - match: '(?<!:)(:)(?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\]=?|@@?[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*)'
+    - match: '(?<!:)(:)(?>[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*(?>[?!]|=(?![>=]))?|===?|>[>=]?|<[<=]?|<=>|[%&`/\|]|\*\*?|=?~|[-+]@?|\[\](?:=|\?)?|@@?[a-zA-Z_\x{80}-\x{10FFFF}][\w\x{80}-\x{10FFFF}]*|!=?(?![?!]))'
       comment: symbols
       scope: constant.other.symbol.crystal
       captures:
@@ -705,6 +705,7 @@ contexts:
             0: punctuation.definition.string.end.crystal
           pop: true
         - include: heredoc
+        - include: scope:text.html.basic
         - include: scope:source.js
         - include: interpolated_crystal
         - include: escaped_char
@@ -713,14 +714,14 @@ contexts:
       captures:
         0: punctuation.definition.string.begin.crystal
       push:
-        - meta_scope: string.unquoted.embedded.js.jquery.crystal
-        - meta_content_scope: text.js.jquery.embedded.crystal
+        - meta_scope: string.unquoted.embedded.js.crystal
+        - meta_content_scope: text.js.embedded.crystal
         - match: \s*\2$
           captures:
             0: punctuation.definition.string.end.crystal
           pop: true
         - include: heredoc
-        - include: scope:source.js.jquery
+        - include: scope:source.js
         - include: interpolated_crystal
         - include: escaped_char
     - match: '(?><<-("?)((?:[_\w]+_|)(?:SH|SHELL))\b\1)'

assets/syntaxes/02_Extra/DotENV.sublime-syntax

@@ -11,6 +11,7 @@ file_extensions:
   - .env.example
   - .env.test
   - .env.test.local
+  - .env.testing
   - .env.dev
   - .env.development
   - .env.development.local
@@ -18,6 +19,8 @@ file_extensions:
   - .env.production
   - .env.production.local
   - .env.dusk.local
+  - .flaskenv
+  - .env.staging
 scope: source.env
 contexts:
   main:

assets/syntaxes/02_Extra/Fstab.sublime-syntax

@@ -0,0 +1,134 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: fstab
+file_extensions:
+  - fstab
+  - crypttab
+scope: source.fstab
+
+contexts:
+  main:
+    - include: comment
+    - match: '^'
+      push: fstab_device
+      comment: leading spaces
+
+  fstab_device:
+    - include: comment
+    - match: '\s*([^=\s]+=)([^\s]+)\s*'
+      comment: device by uuid or label
+      set: fstab_mountpoint
+      captures:
+        1: punctuation.accessor
+        2: keyword.other.device
+    - match: '\s*(//|\\\\)([^\s]+)\s*'
+      comment: device by samba share
+      set: fstab_mountpoint
+      captures:
+        1: punctuation.accessor
+        2: keyword.other.device
+    - match: '\s*([^\s]+)(:)([^\s]+)\s*'
+      comment: device by server
+      set: fstab_mountpoint
+      captures:
+        1: keyword.other.device
+        2: punctuation.accessor
+        3: keyword.other.device
+    - match: '\s*[^\s/\\]+\s*'
+      comment: device by dev name
+      set: fstab_mountpoint
+      scope: keyword.other.device
+    - match: '\s*(/dev/)([^\s]+)\s*'
+      comment: device by dev path
+      set: fstab_mountpoint
+      captures: 
+        1: punctuation.accessor
+        2: keyword.other.device
+    - match: '\s*([^\s/]*/)*([^\s]+)\s*'
+      comment: device by unknown path
+      set: fstab_mountpoint
+      captures:
+        1: punctuation.accessor
+        2: keyword.other.device
+    - include: clear
+
+  fstab_mountpoint:
+    - include: comment
+    - match: '\s*/[^\s]*\s*'
+      comment: mount point
+      set: fstab_filesystem
+      scope: string.unquoted.mountpoint
+    - match: '\s*[^\s]+\s*'
+      comment: mount point without leading slash (invalid)
+      set: fstab_filesystem
+      scope: invalid.illegal
+    - include: clear
+
+  fstab_filesystem:
+    - include: comment
+    - match: '\s*[^\s]+\s*'
+      comment: filesystem type
+      set: fstab_options
+      scope: variable.parameter.filesystem
+    - include: clear
+
+  fstab_options:
+    - include: comment
+    - match: '([^\s,=]+)(=)([^\s,]+)'
+      comment: key-value option
+      captures:
+       1: entity.name.option
+       2: entity.other.separator
+       3: variable.parameter
+    - match: '[^\s,]+'
+      comment: flag option
+      scope: entity.name.option
+    - match: ','
+      comment: option separator
+      scope: punctuation.separator
+    - match: '\s+'
+      comment: next field
+      set: fstab_dump
+    - include: clear
+
+  fstab_dump:
+    - include: comment
+    - match: '\s*[01]\s*'
+      comment: dump field
+      scope: constant.numeric
+      set: fstab_pass
+    - match: '\s*[^\s]+\s*'
+      comment: invalid dump field
+      scope: invalid.illegal
+      set: fstab_pass
+    - include: clear
+
+  fstab_pass:
+    - include: comment
+    - match: '\s*[01]\s*'
+      comment: pass field
+      scope: constant.numeric
+      set: expected_eol
+    - match: '\s*[^\s]+\s*'
+      comment: invalid pass field
+      scope: invalid.illegal
+      set: expected_eol
+    - include: clear
+
+  expected_eol:
+    - include: comment
+    - include: clear
+    - match: '.*'
+      scope: invalid.illegal
+
+  comment:
+    - match: '\s*#.*$'
+      comment: comment using the number sign
+      scope: comment.line
+
+  clear:
+    - match: '.*$'
+      comment: used for clearing the context
+      pop: true
+

assets/syntaxes/02_Extra/Group.sublime-syntax

@@ -0,0 +1,48 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: group
+file_extensions:
+  - group
+scope: source.group
+
+contexts:
+  main:
+    - comment: name
+      match: ^[^:]+
+      scope: keyword
+
+    - comment: password
+      match: ":"
+      push: password
+
+  password:
+    - comment: uid
+      match: ":"
+      set: gid
+
+    - comment: shadowpassword
+      match: "[^:]+"
+      scope: invalid
+
+  gid:
+    - comment: gid
+      match: ":"
+      set: users
+
+    - comment: number
+      match: "[0-9]+"
+      scope: constant.numeric
+
+  users:
+    - comment: newline
+      match: "\n"
+      pop: true
+
+    - comment: directory
+      match: "[^:\n]+"
+      scope: variable.parameter
+
+    - comment: separator
+      match: ","
+      scope: punctuation

assets/syntaxes/02_Extra/INI.sublime-syntax

@@ -25,12 +25,13 @@ contexts:
       scope: comment.line.semicolon.ini
       captures:
         1: punctuation.definition.comment.ini
-    - match: '^\s*(\[)(.*?)(\])'
+    - match: '^\s*(\[)(.*?)(\])\s*(;.*)?$\n?'
       scope: meta.tag.section.ini
       captures:
         1: punctuation.definition.section.ini
         2: entity.section.ini
         3: punctuation.definition.section.ini
+        4: comment.definition.section.ini
     - match: '^(\s*(["'']?)(.+?)(\2)\s*(=))?\s*((["'']?)(.*?)(\7))\s*(;.*)?$\n?'
       scope: meta.declaration.ini
       captures:

assets/syntaxes/02_Extra/JavaScript (Babel).sublime-syntax

@@ -4,9 +4,11 @@
 name: JavaScript (Babel)
 file_extensions:
   - js
+  - mjs
   - jsx
   - babel
   - es6
+  - cjs
 first_line_match: ^#!\s*/.*\b(node|js)$\n?
 scope: source.js
 contexts:

assets/syntaxes/02_Extra/Manpage.sublime-syntax

@@ -0,0 +1,163 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Manpage
+file_extensions:
+  - man
+scope: source.man
+
+variables:
+  section_heading: '^(?!#)\S.*$'
+  command_line_option: '(--?[A-Za-z0-9][_A-Za-z0-9-]*)'
+
+contexts:
+  prototype:
+    # ignore syntax test lines
+    - match: '^#'
+      push:
+        - meta_scope: comment.syntax-test.man
+        - match: $\n?
+          pop: true
+  main:
+    - match: ^
+      push: first_line
+
+  first_line:
+    - match: '([A-Z0-9_\-]+)(\()([^)]+)(\))\s*'
+      captures:
+        1: meta.preprocessor.man
+        2: keyword.operator.man
+        3: string.quoted.other.man
+        4: keyword.operator.man
+      push:
+        - match: (?:[\w'-]+|\s(?!\s))
+          scope: markup.heading.title.man
+        - match: \s\s
+          pop: true
+        - match: '(?=\S|$)'
+          pop: true
+
+    - match: '$'
+      set: body
+
+  body:
+    # English, ..., ..., ..., Russian, ...
+
+    - match: '^(?:SYNOPSIS|SYNTAX|SINTASSI|SKŁADNIA|СИНТАКСИС|書式)'
+      scope: markup.heading.synopsis.man
+      embed: synopsis
+      escape: '(?={{section_heading}})'
+
+    - match: '^(?:USAGE)'
+      scope: markup.heading.synopsis.man
+      embed: synopsis
+      escape: '(?={{section_heading}})'
+
+    - match: '{{section_heading}}'
+      scope: markup.heading.other.man
+      embed: options # some man pages put command line options under the description heading
+      escape: '(?={{section_heading}})'
+
+  function-call:
+    - match: '\b([A-Za-z0-9_\-]+)(\()([^)]*)(\))'
+      captures:
+        1: entity.name.function.man
+        2: keyword.operator.man
+        3: constant.numeric.man
+        4: keyword.operator.man
+
+  options:
+    # command-line options like --option=value, --some-flag, or -x
+    - match: '^[ ]{7}(?=-)'
+      push: expect-command-line-option
+    - match: '(?:[^a-zA-Z0-9_-]|^|\s){{command_line_option}}'
+      captures:
+        1: entity.name.command-line-option
+      push:
+        - match: '='
+          scope: keyword.operator.man
+          set:
+            - match: '[^],.() ]+'
+              scope: variable.parameter.man
+              pop: true
+            - match: $
+              pop: true
+        - match: ''
+          pop: true
+    - include: function-call
+    - include: c-code
+
+  expect-command-line-option:
+    - match: '[A-Za-z0-9-]+'
+      scope: entity.name.command-line-option.man
+    - match: '(\[)(=)'
+      captures:
+        1: punctuation.section.brackets.begin.man
+        2: keyword.operator.man
+      push: [command-line-option-or-pipe, expect-parameter]
+    - match: '\['
+      push:
+        - meta_scope: entity.name.command-line-option.man
+        - match: '\]'
+          pop: true
+    - match: '='
+      scope: keyword.operator.man
+      push: expect-parameter
+    - match: (?=.*\.)
+      pop: true
+    - match: '\s'
+      push: expect-parameter
+    - match: '(,)\s*'
+      captures:
+        1: punctuation.separator.man
+    - match: $|(?=\])
+      pop: true
+
+  expect-parameter:
+    - match: '[A-Za-z0-9-]+'
+      scope: variable.parameter.man
+    - match: (?=\s+\|)
+      pop: true
+    - match: \|
+      scope: keyword.operator.logical.man
+    - match: '\['
+      scope: punctuation.section.brackets.begin.man
+      push:
+        - match: '\]'
+          scope: punctuation.section.brackets.end.man
+          pop: true
+        - include: expect-parameter
+    - match: '$|(?=[],]|{{command_line_option}})'
+      pop: true
+
+  c-code:
+    - match: '^(?=\s+(?:#include\b|#define\b|/\*|struct\s+(\w+\s*)?\{))'
+      embed: scope:source.c
+      #embed_scope: source.c.embedded.man
+      #escape: ^(?!#|\1|\s*(?:$|/\*|#include\b|#define\b))
+      escape: ^(?=\s*(?:\(.*\.\)\s*$|[A-Z](?![A-Z])))
+
+  synopsis:
+    - include: c-code
+    - match: \[
+      scope: punctuation.section.brackets.begin.man
+      push: command-line-option-or-pipe
+    - include: options
+
+  command-line-option-or-pipe:
+    - match: (\|)\s*
+      captures:
+        1: keyword.operator.logical.man
+    #- match: (?={{command_line_option}})
+    - match: \w+-\w+
+    - match: (?=-)
+      push:
+        - match: (?=\s*\|)
+          pop: true
+        - include: expect-command-line-option
+    - match: \]
+      scope: punctuation.section.brackets.end.man
+      pop: true
+    - match: \[
+      scope: punctuation.section.brackets.begin.man
+      push: command-line-option-or-pipe

assets/syntaxes/02_Extra/MemInfo.sublime-syntax

@@ -0,0 +1,14 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: MemInfo
+file_extensions:
+  - meminfo
+scope: source.meminfo
+
+contexts:
+  main:
+    - match: '^([^:]+)\w*:\w*(.*)$'
+      captures:
+        1: keyword.other.meminfo-key
+        2: string.other.meminfo-value

assets/syntaxes/02_Extra/Nim.sublime-syntax

@@ -0,0 +1,257 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Nim
+file_extensions:
+  - nim
+  - nims
+scope: source.nim
+contexts:
+  main:
+    - match: '(\#\[\s*(TODO|todo)?)'
+      comment: A multiline comment.
+      captures:
+        1: punctuation.definition.multi-comment.nim
+        2: invalid.illegal.TODO.nim
+      push:
+        - meta_scope: comment.line.number-sign.multi-comment.nim
+        - match: '(.*]\#)'
+          captures:
+            1: punctuation.definition.multi-comment.nim
+            2: invalid.illegal.TODO.nim
+          pop: true
+    - match: (##\s*(TODO|todo)?).+$\n?
+      comment: A documentation comment.
+      scope: comment.line.number-sign.doc-comment.nim
+      captures:
+        1: punctuation.definition.doc-comment.nim
+        2: invalid.illegal.TODO.nim
+    - match: (##\s*)$\n?
+      comment: An empty documentation comment.
+      scope: comment.line.number-sign.doc-comment.empty.nim
+      captures:
+        1: punctuation.definition.doc-comment.empty.nim
+    - match: (#\s*(TODO|todo)?).*$\n?
+      comment: A regular comment
+      scope: comment.line.number-sign.comment.nim
+      captures:
+        1: punctuation.definition.comment.nim
+        2: invalid.illegal.TODO.nim
+    - match: '\{\.'
+      comment: Pragmas
+      push:
+        - meta_scope: pragma
+        - match: '\.?\}'
+          pop: true
+        - match: \"
+          push:
+            - meta_scope: string.something.nim
+            - match: \"
+              pop: true
+        - match: '([\w\x{80}-\x{10FFFF}]+)'
+          scope: entity.other.attribute-name.pragma.nim
+    - match: discard \"\"\"
+      comment: A discarded triple string literal comment
+      push:
+        - meta_scope: comment.line.discarded.nim
+        - match: \"\"\"
+          pop: true
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*((\.[_\d]+([eE][\+\-]?\d[_\d]*)?)|([eE][\+\-]?\d[_\d]*)))(''?([fF](32|64|128))|[fFdD])?'
+      comment: A float literal
+      scope: constant.numeric.float.decimal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(0[xX][0-9A-Fa-f][_0-9A-Fa-f]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A hexadecimal literal
+      scope: constant.numeric.integer.hexadecimal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(0[ocC][0-7][_0-7]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A base-8 integer literal
+      scope: constant.numeric.integer.octal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(0(b|B)[01][_01]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A base-2 integer literal
+      scope: constant.numeric.integer.binary.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(\d[_\d]*)(''?(([iIuUfF](8|16|32|64))|[uUfFdD]))?'
+      comment: A base-10 integer literal
+      scope: constant.numeric.integer.decimal.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(true|false|inf|nil)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Language Constants.
+      scope: constant.language.nim
+    - match: (?:^|\s+|=)(when|if)\b
+      comment: Primary branching keywords
+      captures:
+        1: keyword.control.primary.nim
+      push:
+        - match: (?=:)
+          captures:
+            1: control.variable.parameter.nim
+          pop: true
+        - include: scope:source.nim
+    - match: (?:^|\s+|=)(case)\b
+      comment: Primary branching keyword 'case'
+      captures:
+        1: keyword.control.primary.nim
+      push:
+        - match: (?=\bof\b)
+          captures:
+            1: control.variable.parameter.nim
+          pop: true
+        - include: scope:source.nim
+    - match: (?:^|\s+)(of|else|elif)\b
+      comment: Secondary branching keywords and their conditions
+      captures:
+        1: keyword.control.secondary.nim
+      push:
+        - match: (?=:)
+          captures:
+            1: control.variable.parameter.nim
+          pop: true
+        - include: scope:source.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(await|block|break|continue|do|end|except|finally|raise|return|try|while|yield)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Keywords that affect program control flow or scope.
+      scope: keyword.control.nim
+    - match: '((?<![\w\x{80}-\x{10FFFF}])(and|in|is|isnot|not|notin|or|xor)(?![\w\x{80}-\x{10FFFF}]))'
+      comment: Keyword boolean operators for expressions.
+      scope: keyword.operator.boolean.nim
+    - match: '((?<![\w\x{80}-\x{10FFFF}])(addr|as|atomic|bind|cast|const|converter|defer|discard|distinct|div|enum|export|include|let|mixin|object|of|ptr|ref|shl|shr|static|type|var)(?![\w\x{80}-\x{10FFFF}]))'
+      comment: Other keywords.
+      scope: keyword.other.nim
+    - match: (\b()\b|(=|\+|-|\*|/|<|>|@|\$|~|&|%|!|\?|\^|\.|:|\\)+)
+      comment: Generic operators for expressions.
+      scope: keyword.operator.nim
+    - match: (for)\s+
+      comment: in keyword in a 'for' loop
+      captures:
+        1: keyword.control.nim
+      push:
+        - meta_scope: meta.forloop.nim
+        - match: (?=:)
+          captures:
+            1: keyword.control.nim
+          pop: true
+        - match: '\ [\w\x{80}-\x{10FFFF},]+\s+(in)\s+'
+          captures:
+            1: keyword.control.nim
+        - include: scope:source.nim
+    - match: '((import)\s+[\.|\w|\/]+,?)'
+      comment: Import syntax
+      captures:
+        2: keyword.control.nim
+    - match: '(from)\s+[\/\w]+\s+(?=import)'
+      captures:
+        1: keyword.control.nim
+    - match: (var|let)\s*\(
+      comment: Destructure syntax
+      captures:
+        1: keyword.other.nim
+      push:
+        - match: \)
+          captures:
+            1: keyword.other.nim
+          pop: true
+    - match: '((?<![\w\x{80}-\x{10FFFF}])(generic|interface|lambda|out|shared|with|without)(?![\w\x{80}-\x{10FFFF}]))'
+      comment: Invalid and unused keywords.
+      scope: keyword.invalid.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(new|GC_ref|GC_unref|assert|echo|defined|declared|newException|countup|countdown|len|high|low)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Common functions
+      scope: keyword.other.common.function.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(((uint|int|float)(8|16|32|64)?)|clong|culong|cchar|cschar|cshort|cint|csize|clonglong|cfloat|cdouble|clongdouble|cuchar|cushort|cuint|culonglong|cstringArray|bool|string|auto|cstring|char|byte|tobject|typedesc|stmt|expr|any|untyped|typed)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Built-in, concrete types.
+      scope: storage.type.concrete.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(range|array|seq|tuple|natural|set|ref|ptr|pointer)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Built-in, generic types.
+      scope: storage.type.generic.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(proc|iterator|method|template|macro)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Function types
+      scope: storage.type.function.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(openarray|varargs|void)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Special types.
+      scope: storage.type.generic.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])([A-Z][A-Z0-9_]+)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Other constants.
+      scope: support.constant.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])([A-Z]\w+)(?![\w\x{80}-\x{10FFFF}])'
+      comment: Other types.
+      scope: support.type.nim
+    - match: '(?<![\w\x{80}-\x{10FFFF}])(\w+)(?![\w\x{80}-\x{10FFFF}])(?=\()'
+      comment: Function call.
+      scope: support.function.any-method.nim
+    - match: r?\"\"\"
+      comment: (Raw) Triple Quoted String
+      push:
+        - meta_scope: string.quoted.triple.nim
+        - match: '\"\"\"[^\"]'
+          pop: true
+    - match: r\"
+      comment: Raw Double Quoted String
+      push:
+        - meta_scope: string.quoted.double.raw.nim
+        - match: \"
+          pop: true
+        - match: \"\"
+    - match: \"
+      comment: Double Quoted String
+      push:
+        - meta_scope: string.quoted.double.nim
+        - match: \"
+          pop: true
+        - include: escaped_char
+    - match: \'
+      comment: Single quoted character literal
+      push:
+        - meta_scope: string.quoted.single.nim
+        - match: \'
+          pop: true
+        - match: \\n
+          scope: invalid.illegal.character.nim
+        - include: escaped_char
+        - match: '([^\''][^\'']+?)'
+          scope: invalid.illegal.character.nim
+    - match: '([\w\x{80}-\x{10FFFF}\`]+)\s*(?=\(|\[.+?\]\s*\()'
+      comment: Call syntax
+      captures:
+        1: support.function.any-method.nim
+      push:
+        - match: \)
+          captures:
+            1: support.function.any-method.nim
+          pop: true
+        - include: scope:source.nim
+    - match: '([\w\x{80}-\x{10FFFF}]+)(?=\s+[\w](?![\w\x{80}-\x{10FFFF}]+((?!\n)\s)+))'
+      comment: Command syntax
+      captures:
+        1: support.function.any-method.nim
+    - match: '([\w\x{80}-\x{10FFFF}]+)(?=\s+[\"\''\`])'
+      captures:
+        1: support.function.any-method.nim
+    - match: (tmpl(i)?)(?=( (nim|html|xml|js|css|glsl|md))?\"\"\")
+      comment: tmpl specifier
+      captures:
+        1: storage.type.function.nim
+        2: keyword.operator.nim
+  escaped_char:
+    - match: '\\[nN]'
+      scope: constant.character.escape.newline.nim
+    - match: '\\[cC]|\\[rR]'
+      scope: constant.character.escape.carriagereturn.nim
+    - match: '\\[lL]'
+      scope: constant.character.escape.linefeed.nim
+    - match: '\\[fF]'
+      scope: constant.character.escape.formfeed.nim
+    - match: '\\[tT]'
+      scope: constant.character.escape.tabulator.nim
+    - match: '\\[vV]'
+      scope: constant.character.escape.verticaltabulator.nim
+    - match: \\\"
+      scope: constant.character.escape.double-quote.nim
+    - match: \\'
+      scope: constant.character.escape.single-quote.nim
+    - match: '\\[0-9]+'
+      scope: constant.character.escape.chardecimalvalue.nim
+    - match: '\\[aA]'
+      scope: constant.character.escape.alert.nim
+    - match: '\\[bB]'
+      scope: constant.character.escape.backspace.nim
+    - match: '\\[eE]'
+      scope: constant.character.escape.escape.nim
+    - match: '\\[xX][0-9A-Fa-f]{2}'
+      scope: constant.character.escape.hex.nim
+    - match: \\\\
+      scope: constant.character.escape.backslash.nim

assets/syntaxes/02_Extra/Ninja.sublime-syntax

@@ -0,0 +1,52 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Ninja
+file_extensions:
+  - ninja
+scope: source.ninja
+contexts:
+  main:
+    - match: (#).*$\n?
+      comment: Comment line.
+      scope: comment.line.number-sign.ninja
+      captures:
+        1: punctuation.definition.comment.ninja
+    - match: ^(rule)\b
+      comment: Rule keyword and keywords for a rule.
+      captures:
+        1: keyword.other.ninja
+      push:
+        - match: ^(?=\S)
+          pop: true
+        - include: main
+        - match: \b(?:command|deps|depfile|description|generator|pool|restat|rspfile|rspfile_content)\b
+          scope: keyword.other.ninja
+    - match: ^(pool)\b
+      comment: Pool keyword and keywords for a pool.
+      captures:
+        1: keyword.other.ninja
+      push:
+        - match: ^(?=\S)
+          pop: true
+        - include: main
+        - match: \b(?:depth)\b
+          scope: keyword.other.ninja
+    - match: ^(?:build|rule|default|include|subninja)\b
+      comment: Other Keywords.
+      scope: keyword.other.ninja
+    - match: '(?:[=:]|\|{1,2})(?=\s)'
+      comment: Operators for variable assignment (=), rule definition (:), implicit (|) and order only (||) dependencies.
+      scope: keyword.operator.ninja
+    - match: \$$
+      comment: Line wrap.
+      scope: keyword.operator.ninja
+    - match: \$\$
+      comment: Dollar literal.
+      scope: keyword.operator.ninja
+    - match: '\$[[:alnum:]_-]+'
+      comment: Simple variables, e.g. $var.
+      scope: variable.other.ninja
+    - match: '\${[[:alnum:]_.-]+}'
+      comment: "Variables, e.g. ${some.var.name}."
+      scope: variable.other.ninja

assets/syntaxes/02_Extra/Nix.sublime-syntax

@@ -140,7 +140,7 @@ contexts:
       push:
         - match: '(?=([\])};]|\b(else|then)\b))'
           pop: true
-        - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])))'
+        - match: '(?=(\s*\}|\"|\binherit\b|\b[a-zA-Z\_][a-zA-Z0-9\_\''\-]*(\s*\.|\s*=[^=])|\$\{[a-zA-z0-9\_\''\-]+\}(\s*\.|\s*=[^=])))'
           push:
             - match: '(?=([\])};,]|\b(else|then)\b))'
               pop: true
@@ -563,7 +563,7 @@ contexts:
           pop: true
         - include: string-quoted
         - include: expression-cont
-    - match: '([a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'
+    - match: '(~?[a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+)'
       captures:
         0: string.unquoted.path.nix
       push:

assets/syntaxes/02_Extra/Passwd.sublime-syntax

@@ -0,0 +1,71 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: passwd
+file_extensions:
+  - passwd
+scope: source.passwd
+
+contexts:
+  main:
+    - comment: name
+      match: ^[^:]+
+      scope: keyword
+
+    - comment: password
+      match: ":"
+      push: password
+
+  password:
+    - comment: uid
+      match: ":"
+      set: uid
+
+    - comment: shadowpassword
+      match: "[^:]+"
+      scope: invalid
+
+  uid:
+    - comment: gid
+      match: ":"
+      set: gid
+
+    - comment: number
+      match: "[0-9]+"
+      scope: constant.numeric
+
+  gid:
+    - comment: comment
+      match: ":"
+      set: comment
+
+    - comment: number
+      match: "[0-9]+"
+      scope: constant.language
+
+  comment:
+    - comment: directory
+      match: ":"
+      set: directory
+
+    - comment: comment
+      match: "[^:]+"
+      scope: entity.name
+
+  directory:
+    - comment: shell
+      match: ":"
+      set: shell
+
+    - comment: directory
+      match: "[^:]+"
+      scope: string.unquoted
+
+  shell:
+    - comment: newline
+      match: "\n"
+      pop: true
+
+    - comment: directory
+      match: "[^:\n]+"
+      scope: variable.parameter

assets/syntaxes/02_Extra/PowerShell.sublime-syntax

@@ -147,7 +147,7 @@ contexts:
         2: keyword.other.powershell
         3: variable.parameter.powershell
   attribute:
-    - match: '(\[)\s*\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength)\b'
+    - match: '(\[)\s*\b(?i)(cmdletbinding|alias|outputtype|parameter|validatenotnull|validatenotnullorempty|validatecount|validateset|allownull|allowemptycollection|allowemptystring|validatescript|validaterange|validatepattern|validatelength|supportswildcards)\b'
       captures:
         1: punctuation.section.bracket.begin.powershell
         2: support.function.attribute.powershell
@@ -165,31 +165,11 @@ contexts:
               captures:
                 0: punctuation.section.group.end.powershell
               pop: true
-            - include: variable
-            - include: variableNoProperty
-            - include: hashtable
-            - include: scriptblock
-            - include: doubleQuotedStringEscapes
-            - include: doubleQuotedString
-            - include: type
-            - include: numericConstant
-            - include: doubleQuotedString
             - include: main
             - match: (?i)\b(mandatory|valuefrompipeline|valuefrompipelinebypropertyname|valuefromremainingarguments|position|parametersetname|defaultparametersetname|supportsshouldprocess|supportspaging|positionalbinding|helpuri|confirmimpact|helpmessage)\b(?:\s+)?(=)?
               captures:
                 1: variable.parameter.attribute.powershell
                 2: keyword.operator.assignment.powershell
-            - match: (?<!')'
-              captures:
-                0: punctuation.definition.string.begin.powershell
-              push:
-                - meta_scope: string.quoted.single.powershell
-                - match: "'(?!')"
-                  captures:
-                    0: punctuation.definition.string.end.powershell
-                  pop: true
-                - match: "''"
-                  scope: constant.character.escape.powershell
   commands:
     - match: '(?:(\p{L}|\d|_|-|\\|\:)*\\)?\b(?i:Add|Approve|Assert|Backup|Block|Build|Checkpoint|Clear|Close|Compare|Complete|Compress|Confirm|Connect|Convert|ConvertFrom|ConvertTo|Copy|Debug|Deny|Deploy|Disable|Disconnect|Dismount|Edit|Enable|Enter|Exit|Expand|Export|Find|Format|Get|Grant|Group|Hide|Import|Initialize|Install|Invoke|Join|Limit|Lock|Measure|Merge|Mount|Move|New|Open|Optimize|Out|Ping|Pop|Protect|Publish|Push|Read|Receive|Redo|Register|Remove|Rename|Repair|Request|Reset|Resize|Resolve|Restart|Restore|Resume|Revoke|Save|Search|Select|Send|Set|Show|Skip|Split|Start|Step|Stop|Submit|Suspend|Switch|Sync|Test|Trace|Unblock|Undo|Uninstall|Unlock|Unprotect|Unpublish|Unregister|Update|Use|Wait|Watch|Write)\-.+?(?:\.(?i:exe|cmd|bat|ps1))?\b'
       comment: "Verb-Noun pattern:"
@@ -242,14 +222,14 @@ contexts:
           pop: true
         - match: '(?i)\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,64}\b'
         - include: variableNoProperty
-        - include: variable
         - include: doubleQuotedStringEscapes
         - include: interpolation
         - match: '`\s*$'
           scope: keyword.other.powershell
   doubleQuotedStringEscapes:
-    - match: '`[0abnfrvt"''$`]'
+    - match: '`[`0abefnrtv"''$]'
       scope: constant.character.escape.powershell
+    - include: unicodeEscape
     - match: '""'
       scope: constant.character.escape.powershell
   function:
@@ -362,6 +342,11 @@ contexts:
         - match: '(?!\d+|\.)(?:\p{L}|\p{N}|\.)+'
           scope: storage.type.powershell
         - include: main
+  unicodeEscape:
+    - match: '`u\{(?:(?:10)?([0-9a-fA-F]){1,4}|0?\g<1>{1,5})}'
+      scope: constant.character.escape.powershell
+    - match: '`u(?:\{[0-9a-fA-F]{,6}.)?'
+      scope: invalid.character.escape.powershell
   variable:
     - match: (\$)(?i:(False|Null|True))\b
       comment: These are special constants.
@@ -374,13 +359,13 @@ contexts:
         0: support.constant.variable.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: '(\$)(?i:(\$|\^|\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'
+    - match: '(\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\b)((?:\.(?:\p{L}|\d|_)+)*\b)?'
       comment: Automatic variables are not constants, but they are read-only. In monokai (default) color schema support.variable doesn't have color, so we use constant.
       captures:
-        0: support.constant.automatic.powershell
+        0: support.variable.automatic.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: '(\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|ProgressPreference|PsCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|VerbosePreference|WarningPreference|WhatIfPreference))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'
+    - match: '(\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))((?:\.(?:\p{L}|\d|_)+)*\b)?\b'
       comment: Style preference variables as language variables so that they stand out.
       captures:
         0: variable.language.powershell
@@ -426,19 +411,19 @@ contexts:
         0: support.constant.variable.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: (\$)(?i:(\$|\^|\?|_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This))\b
+    - match: '(\$)((?:[$^?])|(?i:_|Args|ConsoleFileName|Event|EventArgs|EventSubscriber|ForEach|Input|LastExitCode|Matches|MyInvocation|NestedPromptLevel|Profile|PSBoundParameters|PsCmdlet|PsCulture|PSDebugContext|PSItem|PSCommandPath|PSScriptRoot|PsUICulture|Pwd|Sender|SourceArgs|SourceEventArgs|StackTrace|Switch|This)\b)'
       comment: Automatic variables are not constants, but they are read-only...
       captures:
         0: support.variable.automatic.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: (\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|ProgressPreference|PsCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|VerbosePreference|WarningPreference|WhatIfPreference))\b
+    - match: (\$)(?i:(ConfirmPreference|DebugPreference|ErrorActionPreference|ErrorView|FormatEnumerationLimit|InformationPreference|LogCommandHealthEvent|LogCommandLifecycleEvent|LogEngineHealthEvent|LogEngineLifecycleEvent|LogProviderHealthEvent|LogProviderLifecycleEvent|MaximumAliasCount|MaximumDriveCount|MaximumErrorCount|MaximumFunctionCount|MaximumHistoryCount|MaximumVariableCount|OFS|OutputEncoding|PSCulture|PSDebugContext|PSDefaultParameterValues|PSEmailServer|PSItem|PSModuleAutoLoadingPreference|PSModuleAutoloadingPreference|PSSenderInfo|PSSessionApplicationName|PSSessionConfigurationName|PSSessionOption|ProgressPreference|VerbosePreference|WarningPreference|WhatIfPreference))\b
       comment: Style preference variables as language variables so that they stand out.
       captures:
         0: variable.language.powershell
         1: punctuation.definition.variable.powershell
         3: variable.other.member.powershell
-    - match: '(?i:(\$|@)(global|local|private|script|using|workflow):((?:\p{L}|\d|_)+))'
+    - match: '(?i:(\$)(global|local|private|script|using|workflow):((?:\p{L}|\d|_)+))'
       captures:
         0: variable.other.readwrite.powershell
         1: punctuation.definition.variable.powershell

assets/syntaxes/02_Extra/QML.sublime-syntax

@@ -0,0 +1,103 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: QML
+file_extensions:
+  - qml
+  - qmlproject
+scope: source.qml
+contexts:
+  main:
+    - match: /\*(?!/)
+      comment: Block comment.
+      push:
+        - meta_scope: comment.block.documentation.qml
+        - match: \*/
+          pop: true
+    - match: //.*$
+      comment: Line comment.
+      scope: comment.line.double-slash.qml
+    - match: \b(import)\s+
+      comment: import statement.
+      captures:
+        1: keyword.other.import.qml
+      push:
+        - meta_scope: meta.import.qml
+        - match: $
+          pop: true
+        - match: '([\w\d\.]+)\s+(\d+\.\d+)(?:\s+(as)\s+([A-Z][\w\d]*))?'
+          comment: "import Namespace VersionMajor.VersionMinor [as SingletonTypeIdentifier]"
+          scope: meta.import.namespace.qml
+          captures:
+            1: entity.name.class.qml
+            2: constant.numeric.qml
+            3: keyword.other.import.qml
+            4: entity.name.class.qml
+        - match: '(\"[^\"]+\")(?:\s+(as)\s+([A-Z][\w\d]*))?'
+          comment: "import <string> [as Script]"
+          scope: meta.import.dirjs.qml
+          captures:
+            1: string.quoted.double.qml
+            2: keyword.other.import.qml
+            3: entity.name.class.qml
+    - match: '\b[A-Z]\w*\b'
+      comment: Capitalized word (class or enum).
+      scope: support.class.qml
+    - match: '(((^|\{)\s*)|\b)on[A-Z]\w*\b'
+      comment: onSomething - handler.
+      scope: support.class.qml
+    - match: '(?:^|\{)\s*(id)\s*\:\s*([^;\s]+)\b'
+      comment: "id: <something>"
+      scope: meta.id.qml
+      captures:
+        1: keyword.other.qml
+        2: storage.modifier.qml
+    - match: '^\s*(?:(default|readonly)\s+)?(property)\s+(?:(alias)|([\w\<\>]+))\s+(\w+)'
+      comment: property definition.
+      scope: meta.propertydef.qml
+      captures:
+        1: keyword.other.qml
+        2: keyword.other.qml
+        3: keyword.other.qml
+        4: storage.type.qml
+        5: entity.other.attribute-name.qml
+    - match: \b(signal)\s+(\w+)\s*
+      comment: "signal <signalName>[([<type> <parameter>[, ...]])]"
+      captures:
+        1: keyword.other.qml
+        2: support.function.qml
+      push:
+        - meta_scope: meta.signal.qml
+        - match: ;|(?=/)|$
+          pop: true
+        - match: (\w+)\s+(\w+)
+          scope: meta.signal.parameters.qml
+          captures:
+            1: storage.type.qml
+            2: variable.parameter.qml
+    - match: (?:\b|\s+)(?:(true|false|null|undefined)|(var|void)|(on|as|enum|connect|break|case|catch|continue|debugger|default|delete|do|else|finally|for|if|in|instanceof|new|return|switch|this|throw|try|typeof|while|with))\b
+      comment: js keywords.
+      scope: meta.keyword.qml
+      captures:
+        1: constant.language.qml
+        2: storage.type.qml
+        3: keyword.control.qml
+    - match: '\b(function)\s+([\w_]+)\s*(?=\()'
+      comment: function definition.
+      scope: meta.function.qml
+      captures:
+        1: storage.type.qml
+        2: entity.name.function.untitled
+    - match: '\b[\w_]+\s*(?=\()'
+      comment: function call.
+      scope: support.function.qml
+    - match: '(?:^|\{|;)\s*[a-z][\w\.]*\s*(?=\:)'
+      comment: "property  (property: <something>)."
+      scope: entity.other.attribute-name.qml
+    - match: (?<=\.)\b\w*
+      comment: property of the variable (name.property).
+      scope: entity.other.attribute-name.qml
+    - match: '\b([a-z_]\w*)\b'
+      comment: All non colored words are assumed to be variables.
+      scope: variable.parameter
+    - include: scope:source.js

assets/syntaxes/02_Extra/Rego.sublime-syntax

@@ -0,0 +1,97 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Rego
+file_extensions:
+  - rego
+scope: source.rego
+contexts:
+  main:
+    - include: comment
+    - include: keyword
+    - include: operator
+    - include: head
+    - include: term
+  comment:
+    - match: (#).*$\n?
+      scope: comment.line.number-sign.rego
+      captures:
+        1: punctuation.definition.comment.rego
+  call:
+    - match: '([a-zA-Z_][a-zA-Z0-9_]*)\('
+      scope: meta.function-call.rego
+      captures:
+        1: support.function.any-method.rego
+  constant:
+    - match: \b(?:true|false|null)\b
+      scope: constant.language.rego
+  head:
+    - match: "^([[:alpha:]_][[:alnum:]_]*)"
+      captures:
+        1: entity.name.function.declaration
+      push:
+        - meta_scope: meta.function.rego
+        - match: '(=|{|\n)'
+          pop: true
+        - include: term
+  keyword:
+    - match: (^|\s+)(?:(default|not|package|import|as|with|else|some))\s+
+      scope: keyword.other.rego
+  number:
+    - match: |-
+        (?x:         # turn on extended mode
+          -?         # an optional minus
+          (?:
+            0        # a zero
+            |        # ...or...
+            [1-9]    # a 1-9 character
+            \d*      # followed by zero or more digits
+          )
+          (?:
+            (?:
+              \.     # a period
+              \d+    # followed by one or more digits
+            )?
+            (?:
+              [eE]   # an e character
+              [+-]?  # followed by an option +/-
+              \d+    # followed by one or more digits
+            )?       # make exponent optional
+          )?         # make decimal portion optional
+        )
+      scope: constant.numeric.rego
+  operator:
+    - match: \=|\!\=|>|<|<\=|>\=|\+|-|\*|%|/|\||&|:\=
+      scope: keyword.operator.comparison.rego
+  string:
+    - match: '"'
+      captures:
+        0: punctuation.definition.string.begin.rego
+      push:
+        - meta_scope: string.quoted.double.rego
+        - match: '"'
+          captures:
+            0: punctuation.definition.string.end.rego
+          pop: true
+        - match: |-
+            (?x:                # turn on extended mode
+              \\                # a literal backslash
+              (?:               # ...followed by...
+                ["\\/bfnrt]     # one of these characters
+                |               # ...or...
+                u               # a u
+                [0-9a-fA-F]{4}  # and four hex digits
+              )
+            )
+          scope: constant.character.escape.rego
+        - match: \\.
+          scope: invalid.illegal.unrecognized-string-escape.rego
+  term:
+    - include: constant
+    - include: string
+    - include: number
+    - include: call
+    - include: variable
+  variable:
+    - match: '\b[[:alpha:]_][[:alnum:]_]*\b'
+      scope: meta.identifier.rego

assets/syntaxes/02_Extra/Resolv.sublime-syntax

@@ -0,0 +1,21 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: resolv
+file_extensions:
+  - resolv.conf
+scope: source.resolv
+
+contexts:
+  main:
+    - scope: comment.line.number-sign
+      match: \#.*
+      comment: comment
+
+    - comment: configuration
+      match: "(nameserver|domain|search|sortlist|options)"
+      scope: keyword.control
+
+    - comment: options
+      match: "(debug|ndots|timeout|attempts|rotate|no-check-names|inet6|ip6-bytestring|ip6-dotint|no-ip6-dotint|edns0|single-request|single-request-reopen|no-tld-query|use-vc|no-reload)"
+      scope: entity.name

assets/syntaxes/02_Extra/Robot.sublime-syntax

@@ -1,7 +1,7 @@
 %YAML 1.2
 ---
 # http://www.sublimetext.com/docs/3/syntax.html
-name: Robot Framework syntax highlighting.
+name: Robot Framework
 file_extensions:
   - robot
 scope: source.robot
@@ -52,3 +52,6 @@ contexts:
         - meta_scope: keyword.control.robot
         - match: '($|\||\s{2,})'
           pop: true
+    - match: (?i)^\s+(Given|When|and|but|Then)
+      comment: BDD keywords
+      scope: string.robot.bdd