Bump version to 0.17.1

This reverts commit ec60d84265.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -28,11 +28,11 @@ If you're on Windows:
 **Describe the bug you encountered:**
 ...
 
-**Describe what you expected to happen?**
+**What did you expect to happen instead?**
 ...
 
 **How did you install `bat`?**
-apt-get, homebrew, GitHub release, etc.
+<!-- apt-get, homebrew, GitHub release, etc. -->
 
 ---
 

.github/workflows/CICD.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Git checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
     - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
       uses: actions-rs/toolchain@v1
       with:
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Git checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
       with:
         submodules: true # we need all syntax and theme submodules
     - name: Install Rust toolchain
@@ -58,6 +58,11 @@ jobs:
       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
@@ -87,7 +92,7 @@ jobs:
           - { os: windows-latest , target: x86_64-pc-windows-msvc      }
     steps:
     - name: Git checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
     - name: Install prerequisites
       shell: bash
       run: |
@@ -269,7 +274,6 @@ jobs:
       shell: bash
       run: |
         ARCHIVE_DIR='${{ steps.vars.outputs.STAGING }}/${{ steps.vars.outputs.PKG_BASENAME }}/'
-        COPYRIGHT_YEARS="2018 - "$(date "+%Y")
         # Binary
         cp 'target/${{ matrix.job.target }}/release/${{ env.PROJECT_NAME }}${{ steps.vars.outputs.EXE_suffix }}' "$ARCHIVE_DIR"
 
@@ -279,8 +283,8 @@ jobs:
         # Man page
         cp 'target/${{ matrix.job.target }}/release/build/${{ env.PROJECT_NAME }}'-*/out/assets/manual/bat.1 "$ARCHIVE_DIR"
 
-        # README, LICENSE and CHANGELOG files
+        # README and LICENSE files
-        cp "README.md" "LICENSE-MIT" "LICENSE-APACHE" "CHANGELOG.md" "$ARCHIVE_DIR"
+        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"
@@ -302,41 +306,26 @@ jobs:
           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
 
-          # Work out shared library dependencies
-          # dpkg-shlibdeps requires debian/control file. Dummy it and clean up
-          mkdir "./debian"
-          touch "./debian/control"
-          case ${{ matrix.job.target }} in
-            aarch64-*-linux-*) DEPENDS="$(dpkg-shlibdeps -l/usr/aarch64-linux-gnu/lib -O "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}" 2> /dev/null | sed 's/^shlibs:Depends=//')" ;;
-            arm-*-linux-*hf) DEPENDS="$(dpkg-shlibdeps -l/usr/arm-linux-gnueabihf/lib -O "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}" 2> /dev/null | sed 's/^shlibs:Depends=//')" ;;
-            i686-*-linux-*) DEPENDS="$(dpkg-shlibdeps -O "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}" 2> /dev/null | sed 's/^shlibs:Depends=//')" ;;
-            x86_64-*-linux-*) DEPENDS="$(dpkg-shlibdeps -O "${DPKG_DIR}/usr/bin/${{ env.PROJECT_NAME }}" 2> /dev/null | sed 's/^shlibs:Depends=//')" ;;
-          esac;
-          rm -rf "./debian"
-
           # 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 -n --best "${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/${{ steps.vars.outputs.DPKG_BASENAME }}/README.md"
+          install -Dm644 "README.md" "${DPKG_DIR}/usr/share/doc/${{ env.PROJECT_NAME }}/README.md"
-          install -Dm644 "LICENSE-MIT" "${DPKG_DIR}/usr/share/doc/${{ steps.vars.outputs.DPKG_BASENAME }}/LICENSE-MIT"
+          install -Dm644 "LICENSE-MIT" "${DPKG_DIR}/usr/share/doc/${{ env.PROJECT_NAME }}/LICENSE-MIT"
-          install -Dm644 "LICENSE-APACHE" "${DPKG_DIR}/usr/share/doc/${{ steps.vars.outputs.DPKG_BASENAME }}/LICENSE-APACHE"
+          install -Dm644 "LICENSE-APACHE" "${DPKG_DIR}/usr/share/doc/${{ env.PROJECT_NAME }}/LICENSE-APACHE"
-          install -Dm644 "CHANGELOG.md" "${DPKG_DIR}/usr/share/doc/${{ steps.vars.outputs.DPKG_BASENAME }}/changelog"
-          gzip -n --best "${DPKG_DIR}/usr/share/doc/${{ steps.vars.outputs.DPKG_BASENAME }}/changelog"
 
-          cat > "${DPKG_DIR}/usr/share/doc/${{ steps.vars.outputs.DPKG_BASENAME }}/copyright" <<EOF
+          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 }}
-        Copyright: $COPYRIGHT_YEARS ${{ env.PROJECT_MAINTAINER }}
         License: Apache-2.0 or MIT
 
         License: Apache-2.0
@@ -368,7 +357,6 @@ jobs:
          IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
          DEALINGS IN THE SOFTWARE.
         EOF
-          chmod 644 "${DPKG_DIR}/usr/share/doc/${{ steps.vars.outputs.DPKG_BASENAME }}/copyright"
 
           # control file
           mkdir -p "${DPKG_DIR}/DEBIAN"
@@ -380,10 +368,9 @@ jobs:
         Maintainer: ${{ env.PROJECT_MAINTAINER }}
         Homepage: ${{ env.PROJECT_HOMEPAGE }}
         Architecture: ${{ steps.vars.outputs.DPKG_ARCH }}
-        Depends: $DEPENDS
         Provides: ${{ env.PROJECT_NAME }}
         Conflicts: ${{ steps.vars.outputs.DPKG_CONFLICTS }}
-        Description: cat(1) clone with wings.
+        Description: A cat(1) clone with wings.
          A cat(1) clone with syntax highlighting and Git integration.
         EOF
 
@@ -412,7 +399,7 @@ jobs:
           - { 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@v1
+    - uses: actions/checkout@v2
     - name: Initialize workflow variables
       id: vars
       shell: bash

.gitmodules

@@ -197,3 +197,12 @@
 [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

CHANGELOG.md

@@ -1,5 +1,6 @@
 # unreleased
 
+
 ## Features
 
 ## Bugfixes
@@ -14,6 +15,41 @@
 
 ## 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

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.16.0"
+version = "0.17.1"
 exclude = [
     "assets/syntaxes/*",
     "assets/themes/*",
@@ -38,7 +38,7 @@ regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine
 atty = { version = "0.2.14", optional = true }
 ansi_term = "^0.12.1"
 ansi_colours = "^1.0"
-console = "0.12.0"
+console = "0.13.0"
 dirs = { version = "3.0", optional = true }
 lazy_static = { version = "1.4", optional = true }
 wild = { version = "2.0", optional = true }

README.md

@@ -38,14 +38,14 @@ characters:
 
 ### Automatic paging
 
-`bat` can pipe its own output to a pager (e.g `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
+Even with a pager set, you can still use `bat` to concatenate files :wink:.
-`bat` detects a non-interactive terminal (i.e. when you pipe into another process
+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.
-or into a file), `bat` will act as a drop-in replacement for `cat` and
-fall back to printing the plain file contents.
 
 ## How to use
 
@@ -131,7 +131,18 @@ highlighting:
 git show v0.6.0:src/main.rs | bat -l rs
 ```
 
-Note that syntax highlighting within diffs is currently not supported. If you are looking for this, check out [`delta`](https://github.com/dandavison/delta).
+#### `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`
 
@@ -200,7 +211,7 @@ 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.16.0_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.17.1_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux
@@ -276,14 +287,16 @@ You can install `bat` with zypper:
 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 macOS via MacPorts
+
 Or install `bat` with [MacPorts](https://ports.macports.org/port/bat/summary):
 
 ```bash
@@ -334,7 +347,7 @@ higher. You can then use `cargo` to build everything:
 cargo install --locked bat
 ```
 
-Note that addition files like the man page or shell completion
+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
@@ -389,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
+1. Create a folder with syntax definition files:
-mkdir -p "$(bat --config-dir)/syntaxes"
-cd "$(bat --config-dir)/syntaxes"
 
-# Put new '.sublime-syntax' language definition files
+   ```bash
-# in this folder (or its subdirectories), for example:
+   mkdir -p "$(bat --config-dir)/syntaxes"
-git clone https://github.com/tellnobody1/sublime-purescript-syntax
+   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
+2. Now use the following command to parse these files into a binary cache:
-bat cache --build
-```
 
-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
+   If you ever want to go back to the default settings, call:
-bat cache --clear
+
-```
+   ```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
 
@@ -437,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
@@ -488,6 +538,7 @@ and the `GitHub` theme when in the _light mode_.
 alias cat="bat --theme=\$(defaults read -globalDomain AppleInterfaceStyle &> /dev/null && echo default || echo GitHub)"
 ```
 
+
 ## Configuration file
 
 `bat` can also be customized with a configuration file. The location of the file is dependent
@@ -524,9 +575,6 @@ Example configuration file:
 
 # Use C++ syntax for .ino files
 --map-syntax "*.ino:C++"
-
-# Use ".gitignore"-style highlighting for ".ignore" files
---map-syntax ".ignore:Git Ignore"
 ```
 
 ## Using `bat` on Windows
@@ -621,17 +669,22 @@ cargo build --bins
 cargo test
 
 # Install (release version)
-cargo install --locked
+cargo install --path . --locked
 
 # Build a bat binary with modified syntaxes and themes
 bash assets/create.sh
-cargo install --locked --force
+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
 

assets/completions/bat.zsh.in

@@ -3,8 +3,8 @@
 local context state state_descr line
 typeset -A opt_args
 
-(( $+functions[_cache_subcommand] )) ||
+(( $+functions[_{{PROJECT_EXECUTABLE}}_cache_subcommand] )) ||
-_cache_subcommand() {
+_{{PROJECT_EXECUTABLE}}_cache_subcommand() {
     local -a args
     args=(
         '(-b --build -c --clear)'{-b,--build}'[Initialize or update the syntax/theme cache]'
@@ -19,12 +19,12 @@ _cache_subcommand() {
     _arguments -S -s $args
 }
 
-(( $+functions[_main] )) ||
+(( $+functions[_{{PROJECT_EXECUTABLE}}_main] )) ||
-_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`)]:When `-p` is used twice (`-pp`), it also disables automatic paging (alias for `--style=plain --paging=never`)'
+        '*'{-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'
@@ -79,15 +79,15 @@ if (( ${#words} == 2 )); then
     local -a subcommands
     subcommands=('cache:Modify the syntax-definition and theme cache')
     _describe subcommand subcommands
-    _main
+    _{{PROJECT_EXECUTABLE}}_main
 else
     case $words[2] in
         cache)
-            _cache_subcommand
+            _{{PROJECT_EXECUTABLE}}_cache_subcommand
         ;;
 
         *)
-            _main
+            _{{PROJECT_EXECUTABLE}}_main
         ;;
     esac
 fi

assets/create.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 
 ASSET_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

assets/manual/bat.1.in

@@ -90,7 +90,7 @@ values: *auto*, never, always.
 \fB\-f\fR, \fB\-\-force\-colorization\fR
 .IP
 Alias for '--decorations=always --color=always'. This is useful \
-if the output of bat is piped to another program, but you want \
+if the output of {{PROJECT_EXECUTABLE}} is piped to another program, but you want \
 to keep the colorization/decorations.
 .HP
 \fB\-\-paging\fR <when>
@@ -129,7 +129,7 @@ Configure which elements (line numbers, file headers, grid borders, Git modifica
 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, numbers, snip.
+values: *auto*, full, plain, changes, header, grid, rule, numbers, snip.
 .HP
 \fB\-r\fR, \fB\-\-line\-range\fR <N:M>...
 .IP
@@ -174,12 +174,12 @@ is dependent on your operating system. To get the default path for your system,
 
 \fB{{PROJECT_EXECUTABLE}} --config-file\fR
 
-Alternatively, you can use the BAT_CONFIG_PATH environment variable to point bat to a non-default
+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-snytax\fR language
+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 `\fBbat cache --build\fR`.
+files to `\fB$({{PROJECT_EXECUTABLE}} --config-dir)/syntaxes\fR` and run `\fB{{PROJECT_EXECUTABLE}} cache --build\fR`.
 
 \fBExample:\fR
 
@@ -199,9 +199,9 @@ git clone https://github.com/tellnobody1/sublime-purescript-syntax
 {{PROJECT_EXECUTABLE}} cache --build
 .RE
 
-Once the cache is built, the new language will be visible in `\fBbat --list-languages\fR`.
+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 `\fBbat cache --clear\fR`. 
+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.

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/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/Manpage.sublime-syntax

@@ -7,47 +7,157 @@ file_extensions:
 scope: source.man
 
 variables:
-  section_heading: '^\S.*$'
+  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_\-]+)(\()([^)]+)(\))'
+    - match: '([A-Z0-9_\-]+)(\()([^)]+)(\))\s*'
       captures:
-        1: meta.preprocessor
+        1: meta.preprocessor.man
-        2: keyword.operator
+        2: keyword.operator.man
-        3: string.quoted.other
+        3: string.quoted.other.man
-        4: keyword.operator
+        4: keyword.operator.man
-
+      push:
-    - match: '$'
+        - match: (?:[\w'-]+|\s(?!\s))
-      push: body
+          scope: markup.heading.title.man
-
+        - match: \s\s
-  body:
+          pop: true
-    - match: '^(SYNOPSIS|SYNTAX|SINTASSI|SKŁADNIA|СИНТАКСИС|書式)'
+        - match: '(?=\S|$)'
-      push: Packages/C/C.sublime-syntax
-      scope: markup.heading
-      with_prototype:
-        - match: '(?={{section_heading}})'
           pop: true
 
-    - match: '^\S.*$'
+    - match: '$'
-      scope: markup.heading
+      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
+        1: entity.name.function.man
-        2: keyword.operator
+        2: keyword.operator.man
-        3: constant.numeric
+        3: constant.numeric.man
-        4: keyword.operator
+        4: keyword.operator.man
 
+  options:
     # command-line options like --option=value, --some-flag, or -x
-    - match: '(?:[^a-zA-Z0-9_-]|^|\s)(--?[A-Za-z0-9][A-Za-z0-9-]*)(?:(=)?("?)([A-Za-z0-9]+)("?))?'
+    - match: '^[ ]{7}(?=-)'
+      push: expect-command-line-option
+    - match: '(?:[^a-zA-Z0-9_-]|^|\s){{command_line_option}}'
       captures:
-        1: entity.name
+        1: entity.name.command-line-option
-        2: keyword.operator
+      push:
-        3: punctuation.definition.string.begin
+        - match: '='
-        4: variable.parameter
+          scope: keyword.operator.man
-        3: punctuation.definition.string.end
+          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/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/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

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

@@ -3084,6 +3084,13 @@ contexts:
           captures:
             0: meta.brace.square.ts
           pop: true
+        - match: \.\.\.
+          scope: keyword.operator.rest.ts
+        - match: '(?<![_$[:alnum:]])(?:(?<=\.\.\.)|(?<!\.))([_$[:alpha:]][_$[:alnum:]]*)\s*(\?)?\s*(:)'
+          captures:
+            1: entity.name.label.ts
+            2: keyword.operator.optional.ts
+            3: punctuation.separator.label.ts
         - include: type
         - include: punctuation-comma
   typeof-operator:

assets/syntaxes/02_Extra/syntax_test_man.man

@@ -0,0 +1,151 @@
+# SYNTAX TEST "Manpage.sublime-syntax"
+SOMETHING(8)                System Manager's Manual               SOMETHING(8)
+# ^^^^^ meta.preprocessor
+#                           ^^^^^^^^^^^^^^^^^^^^^^^ markup.heading.title
+#                                                                   ^^^^^^^ meta.preprocessor
+
+NAME
+#^^^ markup.heading.other
+       example - do something useful
+
+SYNOPSIS
+       example  [options]  [--home  DIR]  [--shell  SHELL]  [--no-create-home]
+#                          ^ punctuation.section.brackets.begin
+#                           ^^^^^^ entity.name.command-line-option
+#                                   ^^^ variable.parameter
+#                                      ^ punctuation.section.brackets.end
+#                                         ^ punctuation.section.brackets.begin
+#                                          ^^^^^^^ entity.name.command-line-option
+#                                                   ^^^^^ variable.parameter
+#                                                        ^ punctuation.section.brackets.end
+#                                                           ^ punctuation.section.brackets.begin
+#                                                            ^^^^^^^^^^^^^^^^ entity.name.command-line-option
+#                                                                            ^ punctuation.section.brackets.end
+                  [-u | --set-upstream] [-o <string> | --push-option=<string>]
+#                 ^ punctuation.section.brackets.begin
+#                  ^^ entity.name.command-line-option
+#                     ^ keyword.operator.logical
+#                       ^^^^^^^^^^^^^^ entity.name.command-line-option
+#                                     ^ punctuation.section.brackets.end
+#                                                      ^^^^^^^^^^^^^ entity.name.command-line-option
+                  [--force-with-lease[=<refname>[:<expect>]]]
+#                 ^ punctuation.section.brackets.begin
+#                  ^^^^^^^^^^^^^^^^^^ entity.name.command-line-option
+#                                    ^ punctuation.section.brackets.begin
+#                                     ^ keyword.operator
+#                                       ^^^^^^^ variable.parameter
+#                                               ^ punctuation.section.brackets.begin
+#                                                  ^^^^^^ variable.parameter
+#                                                         ^^^ punctuation.section.brackets.end
+
+       example --system [options]
+#              ^^^^^^^^ entity.name
+
+   COMMON OPTIONS
+       [--quiet] [--debug] [--help|-h]  [--version]  [--conf FILE]
+
+        /* According to POSIX.1-2001, POSIX.1-2008 */
+#       ^^ source.c comment.block punctuation.definition.comment
+       #include <sys/select.h>
+#      ^^^^^^^^ source.c meta.preprocessor.include keyword.control.import.include
+           struct timeval {
+#          ^^^^^^ source.c storage.type
+            
+               time_t         tv_sec;     /* seconds */
+               suseconds_t    tv_usec;    /* microseconds */
+           };
+
+
+
+DESCRIPTION
+       example does something useful in  relation  to the command line options
+       and configuration information in /etc/example.conf.
+
+OPTIONS
+       --conf FILE
+#      ^^^^^^ entity.name.command-line-option
+#^^^^^^ - variable - entity - markup
+#             ^^^^ variable.parameter
+              Use FILE instead of /etc/example.conf.
+#             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - variable - entity
+
+       --disabled-login
+              Do  not  run passwd to set the password.  The user won't be able
+              to use her account until the password is set.
+
+       --disabled-password
+              Like --disabled-login, but logins are still possible (for  exam-
+#                  ^^^^^^^^^^^^^^^^ entity.name
+#^^^^^^^^^^^^^^^^^^ - entity - variable - markup
+#                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - entity - variable - markup
+              ple using SSH RSA keys) but not using password authentication.
+
+       --help Display brief instructions.
+#      ^^^^^^ entity.name.command-line-option
+#             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - variable.parameter
+
+       --home DIR
+#      ^^^^^^ entity.name.command-line-option
+#             ^^^ variable.parameter
+#                ^ - variable - entity - markup
+              Use DIR as the user's home directory, rather  than  the  default
+              specified  by the configuration file.  If the directory does not
+              exist, it is created and skeleton files are copied.
+
+       --[no-]signed, --signed=(true|false|if-asked)
+#      ^^^^^^^^^^^^^ entity.name.command-line-option
+#                   ^ punctuation.separator
+#                     ^^^^^^^^ entity.name.command-line-option
+#                             ^ keyword.operator
+#                              ^ - variable
+#                               ^^^^ variable.parameter
+#                                   ^ keyword.operator.logical
+#                                    ^^^^^ variable.parameter
+#                                         ^ keyword.operator.logical
+#                                          ^^^^^^^^ variable.parameter
+#                                                  ^ - variable
+       --no-recurse-submodules, --recurse-submodules=check|on-demand|only|no
+#      ^^^^^^^^^^^^^^^^^^^^^^^ entity.name.command-line-option
+#                             ^ punctuation.separator
+#                               ^^^^^^^^^^^^^^^^^^^^ entity.name.command-line-option
+#                                                   ^ keyword.operator
+#                                                    ^^^^^ variable.parameter
+#                                                         ^ keyword.operator.logical
+#                                                          ^^^^^^^^^ variable.parameter
+#                                                                   ^ keyword.operator.logical
+#                                                                    ^^^^ variable.parameter
+#                                                                        ^ keyword.operator.logical
+#                                                                         ^^ variable.parameter
+           May be used to make sure all submodule commits used by the
+
+       -c, -C NUM, --context[=NUM]
+#      ^^ entity.name.command-line-option
+#        ^ punctuation.separator
+#          ^^ entity.name.command-line-option
+#             ^^^ variable.parameter
+#                ^ punctuation.separator
+#                  ^^^^^^^^^ entity.name.command-line-option
+#                           ^^^^^^^ - entity.name
+#                            ^ keyword.operator
+#                             ^^^ variable.parameter
+#                                ^^ - variable
+              output NUM (default 3) lines of copied context
+
+EXAMPLE
+       #include <stdio.h>
+#      ^^^^^^^^ source.c meta.preprocessor.include keyword.control.import.include
+
+    (This is not C code.)
+#   ^^^^^^^^^^^^^^^^^^^^^^ - source.c
+
+           struct timeval {
+               time_t      tv_sec;         /* seconds */
+               suseconds_t tv_usec;        /* microseconds */
+           };
+#           ^ source.c punctuation.terminator
+
+       The corresponding argument for pselect() has the following type:
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.c
+           #define POLLIN_SET  (EPOLLRDNORM | EPOLLRDBAND | EPOLLIN |
+                                EPOLLHUP | EPOLLERR)
+#                                                  ^ source.c meta.preprocessor.macro meta.group punctuation.section.group.end

doc/README-ja.md

@@ -39,13 +39,13 @@
 
 ### 自動ページング
 
-出力が1つの画面に対して大きすぎる場合、`bat` は自身の出力を `less` にパイプで繋げることが可能です。
+出力が1つの画面に対して大きすぎる場合、`bat` は自身の出力をページャー(例えば `less`) にパイプで繋げます。
 
 ### ファイルの連結
 
 あなたはさらにファイルを連結させるために使うことも可能です:wink:。
-`bat` は非対話型のターミナルを検出すると、
+`bat` は非対話型のターミナルを検出すると(すなわち他のプロセスにパイプしたりファイル出力していると)、
-いつでも `cat` の完全互換として振る舞い、
+`bat` は `cat` の完全互換として振る舞い、
 プレーンなファイルを表示します。
 
 ## 使い方
@@ -62,7 +62,9 @@
 > bat src/*.rs
 ```
 
-標準入力から自動的に構文を決定させたい場合
+標準入力から自動的に構文を決定させたい場合(ハイライトされるのは、
+たいていは `#!/bin/sh` のようなシバンを利用して、
+ファイルの一行目から構文を決定できる場合のみです)
 
 ```bash
 > curl -s https://sh.rustup.rs | bat
@@ -152,7 +154,7 @@ man 2 select
 ```
 
 フォーマットの問題が発生した場合は
-`MANROFFOPT = "-c"` を設定する必要もあります。
+`MANROFFOPT="-c"` を設定する必要もあります。
 
 これを新しいコマンドにバンドルしたい場合は [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md) も使用できます。
 
@@ -189,7 +191,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
 batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、
 次の方法でインストールします:
 ```bash
-sudo dpkg -i bat_0.16.0_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.17.1_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux

doc/README-ko.md

@@ -170,7 +170,7 @@ apt install bat
 만약 최근 릴리즈된 bat을 사용을 원하거나 buntu/Debian 예전 버전을 사용하는 경우, [릴리즈 페이지](https://github.com/sharkdp/bat/releases)에서 다음과 같이 `.deb` 패키지를 받아 설치 할 수도 있습니다:
 
 ```bash
-sudo dpkg -i bat_0.16.0_amd64.deb  # adapt version number and architecture
+sudo dpkg -i bat_0.17.1_amd64.deb  # adapt version number and architecture
 ```
 
 ### On Alpine Linux

doc/README-ru.md

@@ -185,7 +185,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
 [release page](https://github.com/sharkdp/bat/releases) и установить так:
 
 ```bash
-sudo dpkg -i bat_0.16.0_amd64.deb  # измените архитектуру и версию
+sudo dpkg -i bat_0.17.1_amd64.deb  # измените архитектуру и версию
 ```
 
 ### Alpine Linux

doc/assets.md

@@ -1,10 +1,12 @@
-## Syntax Highlighting in bat
+## Adding new builtin languages for syntax highlighting
 
-`bat` uses the [syntect](https://github.com/trishume/syntect) library to highlight source
+Should you find that a particular syntax is not available within `bat` and think it should be included in `bat` by default, you can follow the instructions outlined below.
+
+`bat` uses the excellent [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:
+**Important:** Before proceeding, verify that the syntax you wish to add meets the [criteria for inclusion](#Criteria-for-inclusion-of-new-syntaxes).
 
 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`).
@@ -13,13 +15,15 @@ In order to add new syntaxes to `bat`, follow these steps:
    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
+3. Run the `assets/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`
+5. Use `bat --list-languages` to check if the new languages are available.
+
+6. 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
@@ -27,15 +31,20 @@ In order to add new syntaxes to `bat`, follow these steps:
 Make sure that the local cache does not interfere with the internally stored syntaxes and
 themes (`bat cache --clear`).
 
+## Criteria for inclusion of new syntaxes
+
+* More than 10,000 downloads on packagecontrol.io/
+
 ### Manual modifications
 
 The following files have been manually modified after converting from a `.tmLanguage` file:
 
 * `Apache.sublime_syntax`=> removed `.conf` and `.CONF` file types.
 * `Dart.sublime-syntax` => removed `#regex.dart` include.
-* `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types.
+* `INI.sublime-syntax` => added `.hgrc`, `hgrc`, and `desktop` file types and support for comments after section headers
 * `Org mode.sublime-syntax` => removed `task` file type.
 * `SML.sublime_syntax` => removed `ml` file type.
+* `Robot.sublime_syntax` => changed name to "Robot Framework"
 
 ### Non-submodule additions
 

doc/logo-header.svg

@@ -45,7 +45,7 @@
    showguides="true"
    inkscape:guide-bbox="true" />
     <rect
-   style="opacity:1;fill:#f2f2f2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.14294769px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+   style="opacity:0.5;fill:#e5e5e5;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.14294769px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
    id="rect1929"
    width="1000"
    height="286.64285"

src/bin/bat/app.rs

@@ -169,9 +169,8 @@ impl App {
                 || match self.matches.value_of("color") {
                     Some("always") => true,
                     Some("never") => false,
-                    Some("auto") | _ => {
+                    Some("auto") => env::var_os("NO_COLOR").is_none() && self.interactive_output,
-                        env::var_os("NO_COLOR").is_none() && self.interactive_output
+                    _ => unreachable!("other values for --color are not allowed"),
-                    }
                 },
             paging_mode,
             term_width: maybe_term_width.unwrap_or(Term::stdout().size().1 as usize),
@@ -226,17 +225,14 @@ impl App {
             style_components,
             syntax_mapping,
             pager: self.matches.value_of("pager"),
-            use_italic_text: match self.matches.value_of("italic-text") {
+            use_italic_text: self.matches.value_of("italic-text") == Some("always"),
-                Some("always") => true,
-                _ => false,
-            },
             highlighted_lines: self
                 .matches
                 .values_of("highlight-line")
                 .map(|ws| ws.map(LineRange::from).collect())
                 .transpose()?
                 .map(LineRanges::from)
-                .map(|lr| HighlightedLineRanges(lr))
+                .map(HighlightedLineRanges)
                 .unwrap_or_default(),
         })
     }
@@ -288,8 +284,8 @@ impl App {
 
     fn style_components(&self) -> Result<StyleComponents> {
         let matches = &self.matches;
-        Ok(StyleComponents(
+        let mut styled_components =
-            if matches.value_of("decorations") == Some("never") {
+            StyleComponents(if matches.value_of("decorations") == Some("never") {
                 HashSet::new()
             } else if matches.is_present("number") {
                 [StyleComponent::LineNumbers].iter().cloned().collect()
@@ -323,7 +319,17 @@ impl App {
                         acc.extend(components.iter().cloned());
                         acc
                     })
-            },
+            });
-        ))
+
+        // If `grid` is set, remove `rule` as it is a subset of `grid`, and print a warning.
+        if styled_components.grid() && styled_components.0.remove(&StyleComponent::Rule) {
+            use ansi_term::Colour::Yellow;
+            eprintln!(
+                "{}: Style 'rule' is a subset of style 'grid', 'rule' will not be visible.",
+                Yellow.paint("[bat warning]"),
+            );
+        }
+
+        Ok(styled_components)
     }
 }

src/bin/bat/clap_app.rs

@@ -24,6 +24,10 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
             "A cat(1) clone with wings.\n\n\
              Use '--help' instead of '-h' to see a more detailed version of the help text.",
         )
+        .after_help(
+            "Note: `bat -h` prints a short and concise overview while `bat --help` gives all \
+                 details.",
+        )
         .long_about("A cat(1) clone with syntax highlighting and Git integration.")
         .arg(
             Arg::with_name("FILE")
@@ -363,7 +367,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
                 .validator(|val| {
                     let mut invalid_vals = val.split(',').filter(|style| {
                         !&[
-                            "auto", "full", "plain", "header", "grid", "numbers", "snip",
+                            "auto", "full", "plain", "header", "grid", "rule", "numbers", "snip",
                             #[cfg(feature = "git")]
                                 "changes",
                         ]
@@ -378,7 +382,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
                 })
                 .help(
                     "Comma-separated list of style elements to display \
-                     (*auto*, full, plain, changes, header, grid, numbers, snip).",
+                     (*auto*, full, plain, changes, header, grid, rule, numbers, snip).",
                 )
                 .long_help(
                     "Configure which elements (line numbers, file headers, grid \
@@ -396,6 +400,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
                      * header: show filenames before the content.\n  \
                      * grid: vertical/horizontal lines to separate side bar\n          \
                        and the header from the content.\n  \
+                     * rule: horizontal lines to delimit files.\n  \
                      * numbers: show line numbers in the side bar.\n  \
                      * snip: draw separation lines between distinct line ranges.",
                 ),

src/bin/bat/config.rs

@@ -44,8 +44,7 @@ pub fn generate_config_file() -> bat::error::Result<()> {
         }
     }
 
-    let default_config =
+    let default_config = r#"# This is `bat`s configuration file. Each line either contains a comment or
-        r#"# This is `bat`s configuration file. Each line either contains a comment or
 # a command-line option that you want to pass to `bat` by default. You can
 # run `bat --help` to get a list of all possible configuration options.
 
@@ -86,7 +85,7 @@ pub fn get_args_from_config_file() -> Result<Vec<OsString>, shell_words::ParseEr
         .ok()
         .map(|content| get_args_from_str(&content))
         .transpose()?
-        .unwrap_or_else(|| vec![]))
+        .unwrap_or_else(Vec::new))
 }
 
 pub fn get_args_from_env_var() -> Option<Result<Vec<OsString>, shell_words::ParseError>> {

src/bin/bat/main.rs

@@ -205,6 +205,14 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
             writeln!(stdout, "{}", theme)?;
         }
     }
+    writeln!(
+        stdout,
+        "Further themes can be installed to '{}', \
+        and are added to the cache with `bat cache --build`. \
+        For more information, see:\n\n  \
+        https://github.com/sharkdp/bat#adding-new-themes",
+        config_file().join("themes").to_string_lossy()
+    )?;
 
     Ok(())
 }

src/controller.rs

@@ -54,7 +54,10 @@ impl<'b> Controller<'b> {
                     paging_mode = PagingMode::Never;
                 }
             }
-            output_type = OutputType::from_mode(paging_mode, self.config.pager)?;
+
+            let wrapping_mode = self.config.wrapping_mode;
+
+            output_type = OutputType::from_mode(paging_mode, wrapping_mode, self.config.pager)?;
         }
 
         #[cfg(not(feature = "paging"))]
@@ -144,7 +147,7 @@ impl<'b> Controller<'b> {
         Ok(no_errors)
     }
 
-    fn print_file<'a>(
+    fn print_file(
         &self,
         printer: &mut dyn Printer,
         writer: &mut dyn Write,

src/error.rs

@@ -20,6 +20,10 @@ error_chain! {
             description("unknown syntax"),
             display("unknown syntax: '{}'", name)
         }
+        InvalidPagerValueBat {
+            description("invalid value `bat` for pager property"),
+            display("Use of bat as a pager is disallowed in order to avoid infinite recursion problems")
+        }
     }
 }
 

src/input.rs

@@ -143,9 +143,8 @@ impl<'a> Input<'a> {
     }
 
     pub fn with_name(mut self, provided_name: Option<&OsStr>) -> Self {
-        match provided_name {
+        if let Some(name) = provided_name {
-            Some(name) => self.description.name = name.to_string_lossy().to_string(),
+            self.description.name = name.to_string_lossy().to_string()
-            None => {}
         }
 
         self.metadata.user_provided_name = provided_name.map(|n| n.to_owned());

src/output.rs

@@ -7,6 +7,15 @@ use crate::error::*;
 use crate::less::retrieve_less_version;
 #[cfg(feature = "paging")]
 use crate::paging::PagingMode;
+#[cfg(feature = "paging")]
+use crate::wrapping::WrappingMode;
+
+#[cfg(feature = "paging")]
+#[derive(Debug, PartialEq)]
+enum SingleScreenAction {
+    Quit,
+    Nothing,
+}
 
 #[derive(Debug)]
 pub enum OutputType {
@@ -17,18 +26,28 @@ pub enum OutputType {
 
 impl OutputType {
     #[cfg(feature = "paging")]
-    pub fn from_mode(mode: PagingMode, pager: Option<&str>) -> Result<Self> {
+    pub fn from_mode(
+        paging_mode: PagingMode,
+        wrapping_mode: WrappingMode,
+        pager: Option<&str>,
+    ) -> Result<Self> {
         use self::PagingMode::*;
-        Ok(match mode {
+        Ok(match paging_mode {
-            Always => OutputType::try_pager(false, pager)?,
+            Always => OutputType::try_pager(SingleScreenAction::Nothing, wrapping_mode, pager)?,
-            QuitIfOneScreen => OutputType::try_pager(true, pager)?,
+            QuitIfOneScreen => {
+                OutputType::try_pager(SingleScreenAction::Quit, wrapping_mode, pager)?
+            }
             _ => OutputType::stdout(),
         })
     }
 
     /// Try to launch the pager. Fall back to stdout in case of errors.
     #[cfg(feature = "paging")]
-    fn try_pager(quit_if_one_screen: bool, pager_from_config: Option<&str>) -> Result<Self> {
+    fn try_pager(
+        single_screen_action: SingleScreenAction,
+        wrapping_mode: WrappingMode,
+        pager_from_config: Option<&str>,
+    ) -> Result<Self> {
         use std::env;
         use std::ffi::OsString;
         use std::path::PathBuf;
@@ -66,10 +85,10 @@ impl OutputType {
 
         match pagerflags.split_first() {
             Some((pager_name, args)) => {
-                let mut pager_path = PathBuf::from(pager_name);
+                let pager_path = PathBuf::from(pager_name);
 
                 if pager_path.file_stem() == Some(&OsString::from("bat")) {
-                    pager_path = PathBuf::from("less");
+                    return Err(ErrorKind::InvalidPagerValueBat.into());
                 }
 
                 let is_less = pager_path.file_stem() == Some(&OsString::from("less"));
@@ -78,10 +97,14 @@ impl OutputType {
                     let mut p = Command::new(&pager_path);
                     if args.is_empty() || replace_arguments_to_less {
                         p.arg("--RAW-CONTROL-CHARS");
-                        if quit_if_one_screen {
+                        if single_screen_action == SingleScreenAction::Quit {
                             p.arg("--quit-if-one-screen");
                         }
 
+                        if wrapping_mode == WrappingMode::NoWrapping {
+                            p.arg("--chop-long-lines");
+                        }
+
                         // Passing '--no-init' fixes a bug with '--quit-if-one-screen' in older
                         // versions of 'less'. Unfortunately, it also breaks mouse-wheel support.
                         //

src/pretty_printer.rs

@@ -23,6 +23,7 @@ struct ActiveStyleComponents {
     header: bool,
     vcs_modification_markers: bool,
     grid: bool,
+    rule: bool,
     line_numbers: bool,
     snip: bool,
 }
@@ -179,6 +180,12 @@ impl<'a> PrettyPrinter<'a> {
         self
     }
 
+    /// Whether to paint a horizontal rule to delimit files
+    pub fn rule(&mut self, yes: bool) -> &mut Self {
+        self.active_style_components.rule = yes;
+        self
+    }
+
     /// Whether to show modification markers for VCS changes. This has no effect if
     /// the `git` feature is not activated.
     #[cfg_attr(
@@ -285,6 +292,9 @@ impl<'a> PrettyPrinter<'a> {
         if self.active_style_components.grid {
             style_components.push(StyleComponent::Grid);
         }
+        if self.active_style_components.rule {
+            style_components.push(StyleComponent::Rule);
+        }
         if self.active_style_components.header {
             style_components.push(StyleComponent::Header);
         }
@@ -328,7 +338,7 @@ impl<'a> Input<'a> {
 
     /// A new input from bytes.
     pub fn from_bytes(bytes: &'a [u8]) -> Self {
-        Input::from_reader(bytes).into()
+        Input::from_reader(bytes)
     }
 
     /// A new input from STDIN.

src/printer.rs

@@ -200,13 +200,18 @@ impl<'a> InteractivePrinter<'a> {
         })
     }
 
+    fn print_horizontal_line_term(&mut self, handle: &mut dyn Write, style: Style) -> Result<()> {
+        writeln!(
+            handle,
+            "{}",
+            style.paint("─".repeat(self.config.term_width))
+        )?;
+        Ok(())
+    }
+
     fn print_horizontal_line(&mut self, handle: &mut dyn Write, grid_char: char) -> Result<()> {
         if self.panel_width == 0 {
-            writeln!(
+            self.print_horizontal_line_term(handle, self.colors.grid)?;
-                handle,
-                "{}",
-                self.colors.grid.paint("─".repeat(self.config.term_width))
-            )?;
         } else {
             let hline = "─".repeat(self.config.term_width - (self.panel_width + 1));
             let hline = format!("{}{}{}", "─".repeat(self.panel_width), grid_char, hline);
@@ -251,6 +256,10 @@ impl<'a> Printer for InteractivePrinter<'a> {
         input: &OpenedInput,
         add_header_padding: bool,
     ) -> Result<()> {
+        if add_header_padding && self.config.style_components.rule() {
+            self.print_horizontal_line_term(handle, self.colors.rule)?;
+        }
+
         if !self.config.style_components.header() {
             if Some(ContentType::BINARY) == self.content_type && !self.config.show_nonprintable {
                 writeln!(
@@ -279,7 +288,8 @@ impl<'a> Printer for InteractivePrinter<'a> {
                     .paint(if self.panel_width > 0 { "│ " } else { "" }),
             )?;
         } else {
-            if add_header_padding {
+            // Only pad space between files, if we haven't already drawn a horizontal rule
+            if add_header_padding && !self.config.style_components.rule() {
                 writeln!(handle)?;
             }
             write!(handle, "{}", " ".repeat(self.panel_width))?;
@@ -301,7 +311,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
             description
                 .kind()
                 .map(|kind| format!("{}: ", kind))
-                .unwrap_or("".into()),
+                .unwrap_or_else(|| "".into()),
             self.colors.filename.paint(description.title()),
             mode
         )?;
@@ -603,6 +613,7 @@ const DEFAULT_GUTTER_COLOR: u8 = 238;
 #[derive(Debug, Default)]
 pub struct Colors {
     pub grid: Style,
+    pub rule: Style,
     pub filename: Style,
     pub git_added: Style,
     pub git_removed: Style,
@@ -624,6 +635,7 @@ impl Colors {
 
         Colors {
             grid: gutter_color.normal(),
+            rule: gutter_color.normal(),
             filename: Style::new().bold(),
             git_added: Green.normal(),
             git_removed: Red.normal(),

src/style.rs

@@ -9,6 +9,7 @@ pub enum StyleComponent {
     #[cfg(feature = "git")]
     Changes,
     Grid,
+    Rule,
     Header,
     LineNumbers,
     Snip,
@@ -29,6 +30,7 @@ impl StyleComponent {
             #[cfg(feature = "git")]
             StyleComponent::Changes => &[StyleComponent::Changes],
             StyleComponent::Grid => &[StyleComponent::Grid],
+            StyleComponent::Rule => &[StyleComponent::Rule],
             StyleComponent::Header => &[StyleComponent::Header],
             StyleComponent::LineNumbers => &[StyleComponent::LineNumbers],
             StyleComponent::Snip => &[StyleComponent::Snip],
@@ -54,6 +56,7 @@ impl FromStr for StyleComponent {
             #[cfg(feature = "git")]
             "changes" => Ok(StyleComponent::Changes),
             "grid" => Ok(StyleComponent::Grid),
+            "rule" => Ok(StyleComponent::Rule),
             "header" => Ok(StyleComponent::Header),
             "numbers" => Ok(StyleComponent::LineNumbers),
             "snip" => Ok(StyleComponent::Snip),
@@ -81,6 +84,10 @@ impl StyleComponents {
         self.0.contains(&StyleComponent::Grid)
     }
 
+    pub fn rule(&self) -> bool {
+        self.0.contains(&StyleComponent::Rule)
+    }
+
     pub fn header(&self) -> bool {
         self.0.contains(&StyleComponent::Header)
     }

tests/.gitattributes

@@ -1,10 +1,8 @@
 # force LF EOLs for test fixtures
 examples/** text=auto eol=lf
 snapshots/** text=auto eol=lf
-
+syntax-tests/source/** text=auto eol=lf
-# BAT/CMD files always need CRLF EOLs
+syntax-tests/highlighted/** text=auto eol=lf
-*.[Bb][Aa][Tt] text eol=crlf
-*.[Cc][Mm][Dd] text eol=crlf
 
 examples/* linguist-vendored
 snapshots/* linguist-vendored

tests/assets.rs

@@ -1,7 +1,9 @@
 use bat::assets::HighlightingAssets;
 
 /// This test ensures that we are not accidentally removing themes due to submodule updates.
+/// It is 'ignore'd by default because it requires themes.bin to be up-to-date.
 #[test]
+#[ignore]
 fn all_themes_are_present() {
     let assets = HighlightingAssets::from_binary();
 
@@ -12,6 +14,8 @@ fn all_themes_are_present() {
         themes,
         vec![
             "1337",
+            "Coldark-Cold",
+            "Coldark-Dark",
             "DarkNeon",
             "Dracula",
             "GitHub",

tests/benchmarks/comparison.sh

@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
 
 if ! which hyperfine > /dev/null 2>&1; then
     echo "'hyperfine' does not seem to be installed."

tests/benchmarks/run-benchmarks.sh

@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
 
 if ! which hyperfine > /dev/null 2>&1; then
     echo "'hyperfine' does not seem to be installed."

tests/integration_tests.rs

@@ -405,6 +405,16 @@ fn pager_disable() {
         .stdout(predicate::eq("hello world\n").normalize());
 }
 
+#[test]
+fn pager_value_bat() {
+    bat()
+        .arg("--pager=bat")
+        .arg("--paging=always")
+        .arg("test.txt")
+        .assert()
+        .failure();
+}
+
 #[test]
 fn alias_pager_disable() {
     bat()
@@ -570,6 +580,18 @@ fn empty_file_leads_to_empty_output_with_grid_enabled() {
         .stdout("");
 }
 
+#[test]
+fn empty_file_leads_to_empty_output_with_rule_enabled() {
+    bat()
+        .arg("empty.txt")
+        .arg("--style=rule")
+        .arg("--decorations=always")
+        .arg("--terminal-width=80")
+        .assert()
+        .success()
+        .stdout("");
+}
+
 #[test]
 fn filename_basic() {
     bat()
@@ -668,6 +690,48 @@ fn header_padding() {
         .stderr("");
 }
 
+#[test]
+fn header_padding_rule() {
+    bat()
+        .arg("--decorations=always")
+        .arg("--style=header,rule")
+        .arg("--terminal-width=80")
+        .arg("test.txt")
+        .arg("single-line.txt")
+        .assert()
+        .stdout(
+            "File: test.txt
+hello world
+────────────────────────────────────────────────────────────────────────────────
+File: single-line.txt
+Single Line
+",
+        )
+        .stderr("");
+}
+
+#[test]
+fn grid_overrides_rule() {
+    bat()
+        .arg("--decorations=always")
+        .arg("--style=grid,rule")
+        .arg("--terminal-width=80")
+        .arg("test.txt")
+        .arg("single-line.txt")
+        .assert()
+        .stdout(
+            "\
+────────────────────────────────────────────────────────────────────────────────
+hello world
+────────────────────────────────────────────────────────────────────────────────
+────────────────────────────────────────────────────────────────────────────────
+Single Line
+────────────────────────────────────────────────────────────────────────────────
+",
+        )
+        .stderr("\x1b[33m[bat warning]\x1b[0m: Style 'rule' is a subset of style 'grid', 'rule' will not be visible.\n");
+}
+
 #[cfg(target_os = "linux")]
 #[test]
 fn file_with_invalid_utf8_filename() {

tests/snapshot_tests.rs

@@ -19,17 +19,27 @@ snapshot_tests! {
     grid:                        "grid",
     header:                      "header",
     numbers:                     "numbers",
+    rule:                        "rule",
     changes_grid:                "changes,grid",
     changes_header:              "changes,header",
     changes_numbers:             "changes,numbers",
+    changes_rule:                "changes,rule",
     grid_header:                 "grid,header",
     grid_numbers:                "grid,numbers",
+    grid_rule:                   "grid,rule",
     header_numbers:              "header,numbers",
+    header_rule:                 "header,rule",
     changes_grid_header:         "changes,grid,header",
     changes_grid_numbers:        "changes,grid,numbers",
+    changes_grid_rule:           "changes,grid,rule",
     changes_header_numbers:      "changes,header,numbers",
+    changes_header_rule:         "changes,header,rule",
     grid_header_numbers:         "grid,header,numbers",
+    grid_header_rule:            "grid,header,rule",
+    header_numbers_rule:         "header,numbers,rule",
     changes_grid_header_numbers: "changes,grid,header,numbers",
+    changes_grid_header_rule:    "changes,grid,header,rule",
+    changes_grid_header_numbers_rule: "changes,grid,header,numbers,rule",
     full:                        "full",
     plain:                       "plain",
 }

tests/snapshots/generate_snapshots.py

@@ -7,7 +7,7 @@ import shutil
 
 
 def generate_snapshots():
-    single_styles = ["changes", "grid", "header", "numbers"]
+    single_styles = ["changes", "grid", "header", "numbers", "rule"]
     collective_styles = ["full", "plain"]
 
     for num in range(len(single_styles)):

tests/snapshots/output/changes_grid_header_numbers_rule.snapshot.txt

@@ -0,0 +1,26 @@
+───────┬────────────────────────────────────────────────────────────────────────
+       │ File: sample.rs
+───────┼────────────────────────────────────────────────────────────────────────
+   1   │ struct Rectangle {
+   2   │     width: u32,
+   3   │     height: u32,
+   4   │ }
+   5   │ 
+   6 _ │ fn main() {
+   7   │     let rect1 = Rectangle { width: 30, height: 50 };
+   8   │ 
+   9   │     println!(
+  10 ~ │         "The perimeter of the rectangle is {} pixels.",
+  11 ~ │         perimeter(&rect1)
+  12   │     );
+  13 + │     println!(r#"This line contains invalid utf8:  "�����"#;
+  14   │ }
+  15   │ 
+  16   │ fn area(rectangle: &Rectangle) -> u32 {
+  17   │     rectangle.width * rectangle.height
+  18   │ }
+  19 + │ 
+  20 + │ fn perimeter(rectangle: &Rectangle) -> u32 {
+  21 + │     (rectangle.width + rectangle.height) * 2
+  22 + │ }
+───────┴────────────────────────────────────────────────────────────────────────

tests/snapshots/output/changes_grid_header_rule.snapshot.txt

@@ -0,0 +1,26 @@
+──┬─────────────────────────────────────────────────────────────────────────────
+  │ File: sample.rs
+──┼─────────────────────────────────────────────────────────────────────────────
+  │ struct Rectangle {
+  │     width: u32,
+  │     height: u32,
+  │ }
+  │ 
+_ │ fn main() {
+  │     let rect1 = Rectangle { width: 30, height: 50 };
+  │ 
+  │     println!(
+~ │         "The perimeter of the rectangle is {} pixels.",
+~ │         perimeter(&rect1)
+  │     );
++ │     println!(r#"This line contains invalid utf8:  "�����"#;
+  │ }
+  │ 
+  │ fn area(rectangle: &Rectangle) -> u32 {
+  │     rectangle.width * rectangle.height
+  │ }
++ │ 
++ │ fn perimeter(rectangle: &Rectangle) -> u32 {
++ │     (rectangle.width + rectangle.height) * 2
++ │ }
+──┴─────────────────────────────────────────────────────────────────────────────

tests/snapshots/output/changes_grid_numbers_rule.snapshot.txt

@@ -0,0 +1,24 @@
+───────┬────────────────────────────────────────────────────────────────────────
+   1   │ struct Rectangle {
+   2   │     width: u32,
+   3   │     height: u32,
+   4   │ }
+   5   │ 
+   6 _ │ fn main() {
+   7   │     let rect1 = Rectangle { width: 30, height: 50 };
+   8   │ 
+   9   │     println!(
+  10 ~ │         "The perimeter of the rectangle is {} pixels.",
+  11 ~ │         perimeter(&rect1)
+  12   │     );
+  13 + │     println!(r#"This line contains invalid utf8:  "�����"#;
+  14   │ }
+  15   │ 
+  16   │ fn area(rectangle: &Rectangle) -> u32 {
+  17   │     rectangle.width * rectangle.height
+  18   │ }
+  19 + │ 
+  20 + │ fn perimeter(rectangle: &Rectangle) -> u32 {
+  21 + │     (rectangle.width + rectangle.height) * 2
+  22 + │ }
+───────┴────────────────────────────────────────────────────────────────────────

tests/snapshots/output/changes_grid_rule.snapshot.txt

@@ -0,0 +1,24 @@
+──┬─────────────────────────────────────────────────────────────────────────────
+  │ struct Rectangle {
+  │     width: u32,
+  │     height: u32,
+  │ }
+  │ 
+_ │ fn main() {
+  │     let rect1 = Rectangle { width: 30, height: 50 };
+  │ 
+  │     println!(
+~ │         "The perimeter of the rectangle is {} pixels.",
+~ │         perimeter(&rect1)
+  │     );
++ │     println!(r#"This line contains invalid utf8:  "�����"#;
+  │ }
+  │ 
+  │ fn area(rectangle: &Rectangle) -> u32 {
+  │     rectangle.width * rectangle.height
+  │ }
++ │ 
++ │ fn perimeter(rectangle: &Rectangle) -> u32 {
++ │     (rectangle.width + rectangle.height) * 2
++ │ }
+──┴─────────────────────────────────────────────────────────────────────────────

tests/snapshots/output/changes_header_numbers_rule.snapshot.txt

@@ -0,0 +1,23 @@
+       File: sample.rs
+   1   struct Rectangle {
+   2       width: u32,
+   3       height: u32,
+   4   }
+   5   
+   6 _ fn main() {
+   7       let rect1 = Rectangle { width: 30, height: 50 };
+   8   
+   9       println!(
+  10 ~         "The perimeter of the rectangle is {} pixels.",
+  11 ~         perimeter(&rect1)
+  12       );
+  13 +     println!(r#"This line contains invalid utf8:  "�����"#;
+  14   }
+  15   
+  16   fn area(rectangle: &Rectangle) -> u32 {
+  17       rectangle.width * rectangle.height
+  18   }
+  19 + 
+  20 + fn perimeter(rectangle: &Rectangle) -> u32 {
+  21 +     (rectangle.width + rectangle.height) * 2
+  22 + }

tests/snapshots/output/changes_header_rule.snapshot.txt

@@ -0,0 +1,23 @@
+  File: sample.rs
+  struct Rectangle {
+      width: u32,
+      height: u32,
+  }
+  
+_ fn main() {
+      let rect1 = Rectangle { width: 30, height: 50 };
+  
+      println!(
+~         "The perimeter of the rectangle is {} pixels.",
+~         perimeter(&rect1)
+      );
++     println!(r#"This line contains invalid utf8:  "�����"#;
+  }
+  
+  fn area(rectangle: &Rectangle) -> u32 {
+      rectangle.width * rectangle.height
+  }
++ 
++ fn perimeter(rectangle: &Rectangle) -> u32 {
++     (rectangle.width + rectangle.height) * 2
++ }

tests/snapshots/output/changes_numbers_rule.snapshot.txt

@@ -0,0 +1,22 @@
+   1   struct Rectangle {
+   2       width: u32,
+   3       height: u32,
+   4   }
+   5   
+   6 _ fn main() {
+   7       let rect1 = Rectangle { width: 30, height: 50 };
+   8   
+   9       println!(
+  10 ~         "The perimeter of the rectangle is {} pixels.",
+  11 ~         perimeter(&rect1)
+  12       );
+  13 +     println!(r#"This line contains invalid utf8:  "�����"#;
+  14   }
+  15   
+  16   fn area(rectangle: &Rectangle) -> u32 {
+  17       rectangle.width * rectangle.height
+  18   }
+  19 + 
+  20 + fn perimeter(rectangle: &Rectangle) -> u32 {
+  21 +     (rectangle.width + rectangle.height) * 2
+  22 + }

tests/snapshots/output/changes_rule.snapshot.txt

@@ -0,0 +1,22 @@
+  struct Rectangle {
+      width: u32,
+      height: u32,
+  }
+  
+_ fn main() {
+      let rect1 = Rectangle { width: 30, height: 50 };
+  
+      println!(
+~         "The perimeter of the rectangle is {} pixels.",
+~         perimeter(&rect1)
+      );
++     println!(r#"This line contains invalid utf8:  "�����"#;
+  }
+  
+  fn area(rectangle: &Rectangle) -> u32 {
+      rectangle.width * rectangle.height
+  }
++ 
++ fn perimeter(rectangle: &Rectangle) -> u32 {
++     (rectangle.width + rectangle.height) * 2
++ }

tests/snapshots/output/grid_header_numbers_rule.snapshot.txt

@@ -0,0 +1,26 @@
+─────┬──────────────────────────────────────────────────────────────────────────
+     │ File: sample.rs
+─────┼──────────────────────────────────────────────────────────────────────────
+   1 │ struct Rectangle {
+   2 │     width: u32,
+   3 │     height: u32,
+   4 │ }
+   5 │ 
+   6 │ fn main() {
+   7 │     let rect1 = Rectangle { width: 30, height: 50 };
+   8 │ 
+   9 │     println!(
+  10 │         "The perimeter of the rectangle is {} pixels.",
+  11 │         perimeter(&rect1)
+  12 │     );
+  13 │     println!(r#"This line contains invalid utf8:  "�����"#;
+  14 │ }
+  15 │ 
+  16 │ fn area(rectangle: &Rectangle) -> u32 {
+  17 │     rectangle.width * rectangle.height
+  18 │ }
+  19 │ 
+  20 │ fn perimeter(rectangle: &Rectangle) -> u32 {
+  21 │     (rectangle.width + rectangle.height) * 2
+  22 │ }
+─────┴──────────────────────────────────────────────────────────────────────────

tests/snapshots/output/grid_header_rule.snapshot.txt

@@ -0,0 +1,26 @@
+────────────────────────────────────────────────────────────────────────────────
+File: sample.rs
+────────────────────────────────────────────────────────────────────────────────
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle { width: 30, height: 50 };
+
+    println!(
+        "The perimeter of the rectangle is {} pixels.",
+        perimeter(&rect1)
+    );
+    println!(r#"This line contains invalid utf8:  "�����"#;
+}
+
+fn area(rectangle: &Rectangle) -> u32 {
+    rectangle.width * rectangle.height
+}
+
+fn perimeter(rectangle: &Rectangle) -> u32 {
+    (rectangle.width + rectangle.height) * 2
+}
+────────────────────────────────────────────────────────────────────────────────

tests/snapshots/output/grid_numbers_rule.snapshot.txt

@@ -0,0 +1,24 @@
+─────┬──────────────────────────────────────────────────────────────────────────
+   1 │ struct Rectangle {
+   2 │     width: u32,
+   3 │     height: u32,
+   4 │ }
+   5 │ 
+   6 │ fn main() {
+   7 │     let rect1 = Rectangle { width: 30, height: 50 };
+   8 │ 
+   9 │     println!(
+  10 │         "The perimeter of the rectangle is {} pixels.",
+  11 │         perimeter(&rect1)
+  12 │     );
+  13 │     println!(r#"This line contains invalid utf8:  "�����"#;
+  14 │ }
+  15 │ 
+  16 │ fn area(rectangle: &Rectangle) -> u32 {
+  17 │     rectangle.width * rectangle.height
+  18 │ }
+  19 │ 
+  20 │ fn perimeter(rectangle: &Rectangle) -> u32 {
+  21 │     (rectangle.width + rectangle.height) * 2
+  22 │ }
+─────┴──────────────────────────────────────────────────────────────────────────

tests/snapshots/output/grid_rule.snapshot.txt

@@ -0,0 +1,24 @@
+────────────────────────────────────────────────────────────────────────────────
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle { width: 30, height: 50 };
+
+    println!(
+        "The perimeter of the rectangle is {} pixels.",
+        perimeter(&rect1)
+    );
+    println!(r#"This line contains invalid utf8:  "�����"#;
+}
+
+fn area(rectangle: &Rectangle) -> u32 {
+    rectangle.width * rectangle.height
+}
+
+fn perimeter(rectangle: &Rectangle) -> u32 {
+    (rectangle.width + rectangle.height) * 2
+}
+────────────────────────────────────────────────────────────────────────────────

tests/snapshots/output/header_numbers_rule.snapshot.txt

@@ -0,0 +1,23 @@
+     File: sample.rs
+   1 struct Rectangle {
+   2     width: u32,
+   3     height: u32,
+   4 }
+   5 
+   6 fn main() {
+   7     let rect1 = Rectangle { width: 30, height: 50 };
+   8 
+   9     println!(
+  10         "The perimeter of the rectangle is {} pixels.",
+  11         perimeter(&rect1)
+  12     );
+  13     println!(r#"This line contains invalid utf8:  "�����"#;
+  14 }
+  15 
+  16 fn area(rectangle: &Rectangle) -> u32 {
+  17     rectangle.width * rectangle.height
+  18 }
+  19 
+  20 fn perimeter(rectangle: &Rectangle) -> u32 {
+  21     (rectangle.width + rectangle.height) * 2
+  22 }

tests/snapshots/output/header_rule.snapshot.txt

@@ -0,0 +1,23 @@
+File: sample.rs
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle { width: 30, height: 50 };
+
+    println!(
+        "The perimeter of the rectangle is {} pixels.",
+        perimeter(&rect1)
+    );
+    println!(r#"This line contains invalid utf8:  "�����"#;
+}
+
+fn area(rectangle: &Rectangle) -> u32 {
+    rectangle.width * rectangle.height
+}
+
+fn perimeter(rectangle: &Rectangle) -> u32 {
+    (rectangle.width + rectangle.height) * 2
+}

tests/snapshots/output/numbers_rule.snapshot.txt

@@ -0,0 +1,22 @@
+   1 struct Rectangle {
+   2     width: u32,
+   3     height: u32,
+   4 }
+   5 
+   6 fn main() {
+   7     let rect1 = Rectangle { width: 30, height: 50 };
+   8 
+   9     println!(
+  10         "The perimeter of the rectangle is {} pixels.",
+  11         perimeter(&rect1)
+  12     );
+  13     println!(r#"This line contains invalid utf8:  "�����"#;
+  14 }
+  15 
+  16 fn area(rectangle: &Rectangle) -> u32 {
+  17     rectangle.width * rectangle.height
+  18 }
+  19 
+  20 fn perimeter(rectangle: &Rectangle) -> u32 {
+  21     (rectangle.width + rectangle.height) * 2
+  22 }

tests/snapshots/output/rule.snapshot.txt

@@ -0,0 +1,22 @@
+struct Rectangle {
+    width: u32,
+    height: u32,
+}
+
+fn main() {
+    let rect1 = Rectangle { width: 30, height: 50 };
+
+    println!(
+        "The perimeter of the rectangle is {} pixels.",
+        perimeter(&rect1)
+    );
+    println!(r#"This line contains invalid utf8:  "�����"#;
+}
+
+fn area(rectangle: &Rectangle) -> u32 {
+    rectangle.width * rectangle.height
+}
+
+fn perimeter(rectangle: &Rectangle) -> u32 {
+    (rectangle.width + rectangle.height) * 2
+}

tests/syntax-tests/create_highlighted_versions.py

@@ -16,11 +16,32 @@ BAT_OPTIONS = [
     "--italic-text=always",
 ]
 
+SKIP_FILENAMES = [
+    "LICENSE.md",
+    "README.md",
+    "bat_options",
+]
+
+
+def get_options(source):
+    options = BAT_OPTIONS.copy()
+
+    source_dirpath = path.dirname(source)
+    options_file = path.join(source_dirpath, "bat_options")
+    try:
+        with open(options_file, "r") as f:
+            options.extend(map(lambda x: x.rstrip(), f.readlines()))
+    except FileNotFoundError:
+        pass
+
+    return options
+
 
 def create_highlighted_versions(output_basepath):
     root = os.path.dirname(os.path.abspath(__file__))
+    sources = path.join(root, "source", "*")
 
-    for source in glob.glob(path.join(root, "source", "*", "*")):
+    for source in glob.glob(path.join(sources, "*")) + glob.glob(path.join(sources, ".*")):
         try:
             env = os.environ.copy()
             env.pop("PAGER", None)
@@ -31,16 +52,18 @@ def create_highlighted_versions(output_basepath):
             env.pop("BAT_TABS", None)
             env["COLORTERM"] = "truecolor"  # make sure to output 24bit colors
 
-            bat_output = subprocess.check_output(
-                ["bat"] + BAT_OPTIONS + [source], stderr=subprocess.PIPE, env=env,
-            )
-
             source_dirname = path.basename(path.dirname(source))
             source_filename = path.basename(source)
 
-            if source_filename == "LICENSE.md":
+            if source_filename in SKIP_FILENAMES:
                 continue
 
+            bat_output = subprocess.check_output(
+                ["bat"] + get_options(source) + [source],
+                stderr=subprocess.PIPE,
+                env=env,
+            )
+
             output_dir = path.join(output_basepath, source_dirname)
             output_path = path.join(output_dir, source_filename)
 
@@ -64,6 +87,12 @@ def create_highlighted_versions(output_basepath):
                 file=sys.stderr,
             )
             sys.exit(1)
+        except FileNotFoundError:
+            print(
+                "Error: Could not execute 'bat'. Please make sure that the executable "
+                "is available on the PATH."
+            )
+            sys.exit(1)
 
 
 if __name__ == "__main__":

tests/syntax-tests/highlighted/ARM Assembly/test.S

@@ -0,0 +1,55 @@
+.data
+
+.balign 4
+red: .word 0
+green: .word 0
+blue: .word 0
+
+.text
+.global grayscale
+.func grayscale
+
+grayscale:
+assign:
+  /* some comment */
+  ldr ip, addr_red
+  str r3, [ip]
+  ldr ip, addr_green
+  ldmfd r13!, {r3}
+  str r3, [ip]
+  ldr ip, addr_blue
+  ldmfd r13!, {r3}
+  str r3, [ip]
+  stmfd r13!, {r4-r8}
+  ldr ip, addr_red
+  ldr r3, [ip]
+  ldr ip, addr_green
+  ldr r4, [ip]
+  ldr ip, addr_blue
+  ldr r5, [ip] /* another comment */
+grayscale_loop:
+  ldrb r6, [r1]
+  mul r6, r3, r6
+  add r1, r1, #1
+  ldrb r7, [r1]
+  mul r7, r4, r7
+  add r1, r1, #1
+  ldrb r8, [r1]
+  mul r8, r5, r8
+  add r1, r1, #1
+  add r6, r6, r7
+  add r6, r6, r8
+  asr r6, r6, #8
+  str r6, [r2]
+  add r2, r2, #1
+  sub r0, r0, #1
+  cmp r0, #0
+  bne grayscale_loop
+  ldmfd r13!, {r4-r8}
+  stmfd r13!, {r0-r1}
+  bx lr
+
+addr_red: .word red
+addr_green: .word green
+addr_blue: .word blue
+

tests/syntax-tests/highlighted/ASP/test.asp

@@ -0,0 +1,36 @@
+<html>
+<body>
+<!-- #include file ="headers\header.inc" -->
+
+<%
+For i = 0 To 5
+Response.Write("The number is " & i & "<br />")
+Next
+%>
+
+<%
+Response.Write("Hello World!")
+%>
+
+<%
+Dim x(2,2)
+x(0,0)="Volvo"
+x(0,1)="BMW"
+x(0,2)="Ford"
+x(1,0)="Apple"
+x(1,1)="Orange"
+x(1,2)="Banana"
+x(2,0)="Coke"
+x(2,1)="Pepsi"
+x(2,2)="Sprite"
+for i=0 to 2
+response.write("<p>")
+for j=0 to 2
+response.write(x(i,j) & "<br />")
+next
+response.write("</p>")
+next
+%>
+
+</body>
+</html>

tests/syntax-tests/highlighted/ActionScript/test.as

@@ -0,0 +1,75 @@
+import flash.events.*;
+import flash.events.MouseEvent;
+
+package TestSyntax {
+    public class TestSyntax  extends flash.display.Sprite {
+
+        public static const TEST_CONSTANT:Number = 33.333;
+
+        var testAttribute:int = 1;
+
+        public namespace TestNamespace;
+        TestNamespace function Method2():void { }
+
+        /**
+         * Multi-line comment
+         */
+        override public function set x(value:Number):void
+        {
+            super.x = Math.round(value);
+        }
+
+        /**
+         * Actual multi-line comment
+         * Takes up multiple lines
+         */
+        override public function set y(value:Number):void
+        {
+            super.y = 0;
+        }
+
+        public function testFunction() {
+            var test:String = 'hello';
+
+            // arrays
+            var testArray:Array = ["a", "b", "c", "d"];
+            for (var i:uint = 0; i < testArray.length; i++)
+                trace(testArray[i]);
+
+            // objects
+            var testObject:Object = {foo: 20, bar: 40};
+            for (var key:String in testObject) {
+                trace(testObject[key]);
+            }
+            for each (var objectValue:int in testObject) {
+                trace(objectValue);
+            }
+
+            // dynamic variables
+            var testDynamic:*;
+            testDynamic = 75;
+            testDynamic = "Seventy-five";
+
+            // regex
+            var testRegExp:RegExp = /foo-\d+/i;
+
+            // XML
+            var testXML:XML =
+<employee>
+  <firstName>Harold</firstName>
+  <lastName>Webster</lastName>
+</employee>;
+        }
+
+        private function anotherFunc(a:int, arg2:uint, arg3:Function, ... args) {
+
+        }
+
+        [Embed(source="sound1.mp3")] public var soundCls:Class;
+        public function SoundAssetExample()
+        {
+            var mySound:SoundAsset = new soundCls() as SoundAsset;
+            var sndChannel:SoundChannel = mySound.play();
+        }
+    }
+}

tests/syntax-tests/highlighted/Apache/httpd.conf

@@ -0,0 +1,42 @@
+# This is a comment
+#
+ServerRoot ""
+Listen 80
+LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
+<IfModule unixd_module>
+User daemon
+Group daemon
+</IfModule>
+ServerAdmin you@example.com
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+DocumentRoot "/usr/share/apache2/default-site/htdocs"
+<Directory "/usr/share/apache2/default-site/htdocs">
+    Options Indexes FollowSymLinks
+    AllowOverride None
+    Require all granted
+</Directory>
+<Files ".ht*">
+    Require all denied
+</Files>
+ErrorLog "/var/log/apache2/error_log"
+LogLevel warn
+<IfModule log_config_module>
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    CustomLog "/var/log/apache2/access_log" common
+</IfModule>
+
+<IfModule alias_module>
+    ScriptAlias /cgi-bin/ "/usr/lib/cgi-bin/"
+</IfModule>
+
+<IfModule mime_module>
+    TypesConfig /etc/apache2/mime.types
+    AddType application/x-compress .Z
+    AddOutputFilter INCLUDES .shtml
+</IfModule>
+<IfModule proxy_html_module>
+Include /etc/apache2/extra/proxy-html.conf
+</IfModule>

tests/syntax-tests/highlighted/AppleScript/test.applescript

@@ -0,0 +1,25 @@
+-- This is a comment
+
+property defaultClientName : "Mary Smith"
+
+on greetClient(nameOfClient)
+    display dialog ("Hello " & nameOfClient & "!")
+end greetClient
+
+
+script testGreet
+    greetClient(defaultClientName)
+end script
+
+run testGreet
+greetClient("Joe Jones")
+
+set myList to {1, "what", 3}
+set beginning of myList to 0
+set end of myList to "four"
+
+myList
+
+tell application "TextEdit"
+    paragraph 1 of document 1
+end tell

tests/syntax-tests/highlighted/AsciiDoc/test.adoc

@@ -0,0 +1,173 @@
+= This is the document title
+Author McAuthorson <author@author.org>
+
+== Table of Content
+
+:toc:
+
+== Paragraphs
+
+[.lead]
+This text will be styled as a lead paragraph with a larger font.
+
+This is a normal paragraph.
+
+ This is a literal paragraph that is offset by one space, 
+ it will be rendered in a fixed-width font.
+
+NOTE: This is an admonition paragraph
+
+TIP: This is another admonition paragraph
+
+== Formatted text
+
+*bold text*
+
+_italic text_
+
+*_bold italic text_*
+
+`monospace text`
+
+`*bold monospace*`
+
+`_italic monospace_`
+
+`*_bold and italic monospace_*`
+
+The following word is #highlighted#
+
+The following words are [.small]#small print#
+
+The following word is [.underline]#underlined#
+
+The following word is [.line-through]#line-through#
+
+The following word is [.big]#big#
+
+The following word is printed in ^superscript^
+
+The following word is printed in ~sub-script~
+
+== Include
+
+include::not_existing.adoc[]
+
+== Breaks
+Here we have a +
+line break.
+
+Below is a horizontal rule.
+
+'''
+
+And below here is a page break.
+
+<<<
+
+== Lists
+
+* This is
+* an unordered
+* list
+** with nested
+*** elements
+
+'''
+
+- This is also an
+- unordered
+- list
+
+'''
+
+. And this is
+. an ordered
+. list
+.. with nested
+... elements
+
+'''
+
+//* [*] checked
+* [x] also checked
+* [ ] not checked
+*     normal list item
+
+'''
+
+[qanda]
+What is this?::
+  This is a Q&A
+And what is this?:: Also a Q&A
+
+== Links
+The following link will be created automatically: https://asciidoctor.org
+
+.An image caption
+image::not_existing.jpg[alt text]
+
+.A video caption
+video::not_existing.mp4[alt text]
+
+== Source Code
+The following word is `monospace`.
+
+....
+This is a literal block
+where linebreaks are rendered
+....
+
+.example.java
+[source,java]
+----
+public class Example { // <1>
+    private static boolean isExample = true; // <2>
+}
+----
+<1> This is a callout
+<2> This is another callout
+
+== Misc
+
+.A sidebar
+****
+This will be rendered like a sidebar
+****
+
+____
+This is a random blockquote
+____
+
+[quote, Albert Einstein, 'Scientist']
+____
+This is not actually something Einstein said
+____
+
+// here we have a single line comment
+
+////
+and this is a
+multiline comment
+////
+
+.A Table
+[%header]
+|===
+|Header Column 1 |Header Column 2 |And the last header column
+|Cell in col1
+|Cell in col2
+|Cell in col3
+
+|Cell in col1, row2
+|Cell in col2, row2
+|Cell in col3, row2
+|===
+
+.A Table from CSV
+[%header, format=csv]
+|===
+header col1, header col2, header col3
+This,is the first, row
+This, is the second, row
+|===

tests/syntax-tests/highlighted/Assembly (x86_64)/test.nasm

@@ -0,0 +1,86 @@
+global enlight
+
+section .data
+  red dq 0 ; some comment
+  green dq 0
+  blue dq 0
+  data dq 0
+  N dd 0
+  M dd 0
+  change dd 0
+  delta db 0
+
+section .text
+enlight:
+  call assign_arguments
+  call set_data
+  call make_deltas
+  ret
+
+assign_arguments:
+  mov qword[red], rdi
+  mov qword[green], rsi
+  mov qword[blue], rdx
+  mov dword[N], ecx
+  mov dword[M], r8d
+  mov dword[change], r9d
+  mov al, byte[rsp + 16]
+  mov byte[delta], al
+  ret
+
+set_data:
+  mov eax, dword[change]
+  cmp eax, 1
+  jne not_1
+  mov rax, qword[red]
+  mov qword[data], rax
+  ret
+not_1:
+  cmp eax, 2
+  jne not_2
+  mov rax, qword[green]
+  mov qword[data], rax
+  ret
+not_2:
+  mov rax, qword[blue]
+  mov qword[data], rax
+  ret
+
+
+make_deltas:
+  mov ecx, dword[N]
+  mov eax, dword[M]
+  imul ecx, eax
+loop_start:
+  call make_delta
+  loop loop_start
+  ret
+
+make_delta:
+  mov rax, qword[data]
+  add rax, rcx
+  dec rax
+  mov dl, byte[delta]
+  cmp dl, 0
+  jl substracting
+adding:
+  add dl, byte[rax]
+  jc adding_overflow
+  mov byte[rax], dl
+  ret
+adding_overflow:
+  mov byte[rax], 255 
+  ret
+substracting:
+  mov r9b, dl
+  mov dl, 0
+  sub dl, r9b
+  mov r8b, byte[rax]
+  sub r8b, dl
+  jc substracting_overflow
+  mov byte[rax], r8b
+  ret
+; another comment
+substracting_overflow:
+  mov byte[rax], 0
+  ret

tests/syntax-tests/highlighted/Bash/batgrep.sh

@@ -0,0 +1,511 @@
+#!/usr/bin/env bash
+# -----------------------------------------------------------------------------
+# bat-extras | Copyright (C) 2020 eth-p and contributors | MIT License
+#
+# Repository: https://github.com/eth-p/bat-extras
+# Issues:     https://github.com/eth-p/bat-extras/issues
+# -----------------------------------------------------------------------------
+printc(){
+printf "$(sed "$_PRINTC_PATTERN" <<<"$1")" "${@:2}"
+}
+printc_init(){
+case "$1" in
+true)_PRINTC_PATTERN="$_PRINTC_PATTERN_ANSI";;
+false)_PRINTC_PATTERN="$_PRINTC_PATTERN_PLAIN";;
+"[DEFINE]"){
+_PRINTC_PATTERN_ANSI=""
+_PRINTC_PATTERN_PLAIN=""
+local name
+local ansi
+while read -r name ansi;do
+if [[ -z $name && -z $ansi ]]||[[ ${name:0:1} == "#" ]];then
+continue
+fi
+ansi="${ansi/\\/\\\\}"
+_PRINTC_PATTERN_PLAIN="${_PRINTC_PATTERN_PLAIN}s/%{$name}//g;"
+_PRINTC_PATTERN_ANSI="${_PRINTC_PATTERN_ANSI}s/%{$name}/$ansi/g;"
+done
+if [ -t 1 ];then
+_PRINTC_PATTERN="$_PRINTC_PATTERN_ANSI"
+else
+_PRINTC_PATTERN="$_PRINTC_PATTERN_PLAIN"
+fi
+}
+esac
+}
+print_warning(){
+printc "%{YELLOW}[%s warning]%{CLEAR}: $1%{CLEAR}\n" "batgrep" "${@:2}" 1>&2
+}
+print_error(){
+printc "%{RED}[%s error]%{CLEAR}: $1%{CLEAR}\n" "batgrep" "${@:2}" 1>&2
+}
+printc_init "[DEFINE]" <<END
+	CLEAR	\x1B[0m
+	RED		\x1B[31m
+	GREEN	\x1B[32m
+	YELLOW	\x1B[33m
+	BLUE	\x1B[34m
+	MAGENTA	\x1B[35m
+	CYAN	\x1B[36m
+
+	DEFAULT \x1B[39m
+	DIM		\x1B[2m
+END
+is_pager_less(){
+[[ "$(pager_name)" == "less" ]]
+return $?
+}
+is_pager_disabled(){
+[[ -z "$(pager_name)" ]]
+return $?
+}
+pager_name(){
+_detect_pager 1>&2
+echo "$_SCRIPT_PAGER_NAME"
+}
+pager_version(){
+_detect_pager 1>&2
+echo "$_SCRIPT_PAGER_VERSION"
+}
+pager_exec(){
+if [[ -n $SCRIPT_PAGER_CMD ]];then
+"$@"|pager_display
+return $?
+else
+"$@"
+return $?
+fi
+}
+pager_display(){
+if [[ -n $SCRIPT_PAGER_CMD ]];then
+if [[ -n $SCRIPT_PAGER_ARGS ]];then
+"${SCRIPT_PAGER_CMD[@]}" "${SCRIPT_PAGER_ARGS[@]}"
+return $?
+else
+"${SCRIPT_PAGER_CMD[@]}"
+return $?
+fi
+else
+cat
+return $?
+fi
+}
+_detect_pager(){
+if [[ $_SCRIPT_PAGER_DETECTED == "true" ]];then return;fi
+_SCRIPT_PAGER_DETECTED=true
+if [[ -z ${SCRIPT_PAGER_CMD[0]} ]];then
+_SCRIPT_PAGER_VERSION=0
+_SCRIPT_PAGER_NAME=""
+return
+fi
+local output
+local output1
+output="$("${SCRIPT_PAGER_CMD[0]}" --version 2>&1)"
+output1="$(head -n 1 <<<"$output")"
+if [[ $output1 =~ ^less[[:blank:]]([[:digit:]]+) ]];then
+_SCRIPT_PAGER_VERSION="${BASH_REMATCH[1]}"
+_SCRIPT_PAGER_NAME="less"
+else
+_SCRIPT_PAGER_VERSION=0
+_SCRIPT_PAGER_NAME="$(basename "${SCRIPT_PAGER_CMD[0]}")"
+fi
+}
+_configure_pager(){
+SCRIPT_PAGER_CMD=($PAGER)
+SCRIPT_PAGER_ARGS=()
+if [[ -n ${BAT_PAGER+x} ]];then
+SCRIPT_PAGER_CMD=($BAT_PAGER)
+SCRIPT_PAGER_ARGS=()
+return
+fi
+if is_pager_less;then
+SCRIPT_PAGER_CMD=("${SCRIPT_PAGER_CMD[0]}" -R --quit-if-one-screen)
+if [[ "$(pager_version)" -lt 500 ]];then
+SCRIPT_PAGER_CMD+=(--no-init)
+fi
+fi
+}
+if [[ -t 1 ]];then
+_configure_pager
+else
+SCRIPT_PAGER_CMD=()
+SCRIPT_PAGER_ARGS=()
+fi
+SHIFTOPT_HOOKS=()
+setargs(){
+_ARGV=("$@")
+_ARGV_LAST="$((${#_ARGV[@]}-1))"
+_ARGV_INDEX=0
+}
+shiftopt(){
+[[ $_ARGV_INDEX -gt $_ARGV_LAST ]]&&return 1
+OPT="${_ARGV[$_ARGV_INDEX]}"
+unset OPT_VAL
+if [[ $OPT =~ ^--[a-zA-Z0-9_-]+=.* ]];then
+OPT_VAL="${OPT#*=}"
+OPT="${OPT%%=*}"
+fi
+((_ARGV_INDEX++))
+local hook
+for hook in "${SHIFTOPT_HOOKS[@]}";do
+if "$hook";then
+shiftopt
+return $?
+fi
+done
+return 0
+}
+shiftval(){
+if [[ -n ${OPT_VAL+x} ]];then
+return 0
+fi
+if [[ $OPT =~ ^-[[:alpha:]][[:digit:]]{1,}$ ]];then
+OPT_VAL="${OPT:2}"
+return
+fi
+OPT_VAL="${_ARGV[$_ARGV_INDEX]}"
+((_ARGV_INDEX++))
+if [[ $OPT_VAL =~ -.* ]];then
+printc "%{RED}%s: '%s' requires a value%{CLEAR}\n" "batgrep" "$ARG"
+exit 1
+fi
+}
+setargs "$@"
+hook_color(){
+SHIFTOPT_HOOKS+=("__shiftopt_hook__color")
+__shiftopt_hook__color(){
+case "$OPT" in
+--no-color)OPT_COLOR=false;;
+--color){
+case "$OPT_VAL" in
+"")OPT_COLOR=true;;
+always|true)OPT_COLOR=true;;
+never|false)OPT_COLOR=false;;
+auto)return 0;;
+*)printc "%{RED}%s: '--color' expects value of 'auto', 'always', or 'never'%{CLEAR}\n" "batgrep"
+exit 1
+esac
+};;
+*)return 1
+esac
+printc_init "$OPT_COLOR"
+return 0
+}
+if [[ -z $OPT_COLOR ]];then
+if [[ -t 1 ]];then
+OPT_COLOR=true
+else
+OPT_COLOR=false
+fi
+printc_init "$OPT_COLOR"
+fi
+}
+hook_pager(){
+SHIFTOPT_HOOKS+=("__shiftopt_hook__pager")
+__shiftopt_hook__pager(){
+case "$OPT" in
+\
+--no-pager)shiftval
+SCRIPT_PAGER_CMD=''
+;;
+--paging){
+shiftval
+case "$OPT_VAL" in
+auto):;;
+always):;;
+never)SCRIPT_PAGER_CMD='';;
+*)printc "%{RED}%s: '--paging' expects value of 'auto', 'always', or 'never'%{CLEAR}\n" "batgrep"
+exit 1
+esac
+};;
+\
+--pager){
+shiftval
+{
+SCRIPT_PAGER_CMD=($OPT_VAL)
+PAGER_ARGS=()
+}
+};;
+*)return 1
+esac
+}
+}
+hook_version(){
+SHIFTOPT_HOOKS+=("__shiftopt_hook__version")
+__shiftopt_hook__version(){
+if [[ $OPT == "--version" ]];then
+printf "%s %s\n\n%s\n%s\n" \
+"batgrep" \
+"2020.10.04" \
+"Copyright (C) 2019-2020 eth-p | MIT License" \
+"https://github.com/eth-p/bat-extras"
+exit 0
+fi
+return 1
+}
+}
+term_width(){
+local width="$({ stty size 2>/dev/null||echo "22 80";}|cut -d ' ' -f2)"
+if [[ $width -ne 0 ]];then
+echo "$width"
+else
+echo "80"
+fi
+return 0
+}
+hook_width(){
+SHIFTOPT_HOOKS+=("__shiftopt_hook__width")
+__shiftopt_hook__width(){
+case "$OPT" in
+--terminal-width)shiftval
+OPT_TERMINAL_WIDTH="$OPT_VAL"
+;;
+*)return 1
+esac
+return 0
+}
+OPT_TERMINAL_WIDTH="$(term_width)"
+}
+bat_version(){
+"bat" --version|cut -d ' ' -f 2
+return
+}
+version_compare(){
+local version="$1"
+local compare="$3"
+if ! [[ $version =~ \.$ ]];then
+version="$version."
+fi
+if ! [[ $compare =~ \.$ ]];then
+compare="$compare."
+fi
+version_compare__recurse "$version" "$2" "$compare"
+return $?
+}
+version_compare__recurse(){
+local version="$1"
+local operator="$2"
+local compare="$3"
+local v_major="${version%%.*}"
+local c_major="${compare%%.*}"
+local v_minor="${version#*.}"
+local c_minor="${compare#*.}"
+if [[ -z $v_minor && -z $c_minor ]];then
+[ "$v_major" $operator "$c_major" ]
+return $?
+fi
+if [[ -z $v_minor ]];then
+v_minor="0."
+fi
+if [[ -z $c_minor ]];then
+c_minor="0."
+fi
+case "$operator" in
+-eq)[[ $v_major -ne $c_major ]]&&return 1;;
+-ne)[[ $v_major -ne $c_major ]]&&return 0;;
+-ge|-gt)[[ $v_major -lt $c_major ]]&&return 1
+[[ $v_major -gt $c_major ]]&&return 0
+;;
+-le|-lt)[[ $v_major -gt $c_major ]]&&return 1
+[[ $v_major -lt $c_major ]]&&return 0
+esac
+version_compare__recurse "$v_minor" "$operator" "$c_minor"
+}
+hook_color
+hook_pager
+hook_version
+hook_width
+RG_ARGS=()
+BAT_ARGS=()
+PATTERN=""
+FILES=()
+OPT_CASE_SENSITIVITY=''
+OPT_CONTEXT_BEFORE=2
+OPT_CONTEXT_AFTER=2
+OPT_FOLLOW=true
+OPT_SNIP=""
+OPT_HIGHLIGHT=true
+OPT_SEARCH_PATTERN=false
+OPT_FIXED_STRINGS=false
+BAT_STYLE="header,numbers"
+if version_compare "$(bat_version)" -gt "0.12";then
+OPT_SNIP=",snip"
+fi
+if [[ -n $RIPGREP_CONFIG_PATH && -e $RIPGREP_CONFIG_PATH ]];then
+for arg in $(cat "$RIPGREP_CONFIG_PATH");do
+case "$arg" in
+--context=*)val="${arg:10}"
+OPT_CONTEXT_BEFORE="$val"
+OPT_CONTEXT_AFTER="$val"
+;;
+--before-context=*)val="${arg:17}"
+OPT_CONTEXT_BEFORE="$val"
+;;
+--after-context=*)val="${arg:16}"
+OPT_CONTEXT_AFTER="$val"
+;;
+-C*)val="${arg:2}"
+OPT_CONTEXT_BEFORE="$val"
+OPT_CONTEXT_AFTER="$val"
+;;
+-B*)val="${arg:2}"
+OPT_CONTEXT_BEFORE="$val"
+;;
+-A*)val="${arg:2}"
+OPT_CONTEXT_AFTER="$val"
+esac
+done
+fi
+while shiftopt;do
+case "$OPT" in
+\
+-i|--ignore-case)OPT_CASE_SENSITIVITY="--ignore-case";;
+-s|--case-sensitive)OPT_CASE_SENSITIVITY="--case-sensitive";;
+-S|--smart-case)OPT_CASE_SENSITIVITY="--smart-case";;
+-A*|--after-context)shiftval
+OPT_CONTEXT_AFTER="$OPT_VAL"
+;;
+-B*|--before-context)shiftval
+OPT_CONTEXT_BEFORE="$OPT_VAL"
+;;
+-C*|--context)shiftval
+OPT_CONTEXT_BEFORE="$OPT_VAL"
+OPT_CONTEXT_AFTER="$OPT_VAL"
+;;
+-F|--fixed-strings)OPT_FIXED_STRINGS=true
+RG_ARGS+=("$OPT")
+;;
+-U|--multiline|\
+-P|--pcre2|\
+-z|--search-zip|\
+-w|--word-regexp|\
+--one-file-system|\
+--multiline-dotall|\
+--ignore|--no-ignore|\
+--crlf|--no-crlf|\
+--hidden|--no-hidden)RG_ARGS+=("$OPT")
+;;
+-E|--encoding|\
+-g|--glob|\
+-t|--type|\
+-T|--type-not|\
+-m|--max-count|\
+--max-depth|\
+--iglob|\
+--ignore-file)shiftval
+RG_ARGS+=("$OPT" "$OPT_VAL")
+;;
+\
+\
+\
+--no-follow)OPT_FOLLOW=false;;
+--no-snip)OPT_SNIP="";;
+--no-highlight)OPT_HIGHLIGHT=false;;
+-p|--search-pattern)OPT_SEARCH_PATTERN=true;;
+--no-search-pattern)OPT_SEARCH_PATTERN=false;;
+\
+--rg:*){
+if [[ ${OPT:5:1} == "-" ]];then
+RG_ARGS+=("${OPT:5}")
+else
+RG_ARGS+=("--${OPT:5}")
+fi
+if [[ -n $OPT_VAL ]];then
+RG_ARGS+=("$OPT_VAL")
+fi
+};;
+\
+-*){
+printc "%{RED}%s: unknown option '%s'%{CLEAR}\n" "batgrep" "$OPT" 1>&2
+exit 1
+};;
+\
+*){
+if [ -z "$PATTERN" ];then
+PATTERN="$OPT"
+else
+FILES+=("$OPT")
+fi
+}
+esac
+done
+if [[ -z $PATTERN ]];then
+print_error "no pattern provided"
+exit 1
+fi
+SEP="$(printc "%{DIM}%${OPT_TERMINAL_WIDTH}s%{CLEAR}"|sed "s/ /─/g")"
+if [[ -n $OPT_CASE_SENSITIVITY ]];then
+RG_ARGS+=("$OPT_CASE_SENSITIVITY")
+fi
+if "$OPT_FOLLOW";then
+RG_ARGS+=("--follow")
+fi
+if "$OPT_COLOR";then
+BAT_ARGS+=("--color=always")
+else
+BAT_ARGS+=("--color=never")
+fi
+if [[ $OPT_CONTEXT_BEFORE -eq 0 && $OPT_CONTEXT_AFTER -eq 0 ]];then
+OPT_SNIP=""
+OPT_HIGHLIGHT=false
+fi
+if "$OPT_SEARCH_PATTERN";then
+if is_pager_less;then
+if "$OPT_FIXED_STRINGS";then
+SCRIPT_PAGER_ARGS+=(-p $'\x12'"$PATTERN")
+else
+SCRIPT_PAGER_ARGS+=(-p "$PATTERN")
+fi
+elif is_pager_disabled;then
+print_error "%s %s %s" \
+"The -p/--search-pattern option requires a pager, but" \
+'the pager was explicitly disabled by $BAT_PAGER or the' \
+"--paging option."
+exit 1
+else
+print_error "Unsupported pager '%s' for option -p/--search-pattern" \
+"$(pager_name)"
+exit 1
+fi
+fi
+main(){
+FOUND_FILES=()
+FOUND=0
+FIRST_PRINT=true
+LAST_LR=()
+LAST_LH=()
+LAST_FILE=''
+do_print(){
+[[ -z $LAST_FILE ]]&&return 0
+"$FIRST_PRINT"&&echo "$SEP"
+FIRST_PRINT=false
+"bat" "${BAT_ARGS[@]}" \
+"${LAST_LR[@]}" \
+"${LAST_LH[@]}" \
+--style="$BAT_STYLE$OPT_SNIP" \
+--paging=never \
+--terminal-width="$OPT_TERMINAL_WIDTH" \
+"$LAST_FILE"
+echo "$SEP"
+}
+while IFS=':' read -r file line column text;do
+((FOUND++))
+if [[ $LAST_FILE != "$file" ]];then
+do_print
+LAST_FILE="$file"
+LAST_LR=()
+LAST_LH=()
+fi
+line_start=$((line-OPT_CONTEXT_BEFORE))
+line_end=$((line+OPT_CONTEXT_AFTER))
+[[ $line_start -gt 0 ]]||line_start=''
+LAST_LR+=("--line-range=$line_start:$line_end")
+[[ $OPT_HIGHLIGHT == "true" ]]&&LAST_LH+=("--highlight-line=$line")
+done < <(rg --with-filename --vimgrep "${RG_ARGS[@]}" --context=0 --no-context-separator --sort path "$PATTERN" "${FILES[@]}")
+do_print
+if [[ $FOUND -eq 0 ]];then
+exit 2
+fi
+}
+pager_exec main
+exit $?

tests/syntax-tests/highlighted/Bash/simple.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+function incompatible_function() {
+	:
+}
+
+compatible_function() {
+	if ! [ "$1" == "yes" ]
+	then
+		return 3;:;
+	fi
+	
+	(
+		exec 3>&1
+		echo "finished! $@? $*." >&3 \
+			| cat | bat - | cat
+		exit 4
+	) || exit $?
+}
+
+if command -v bat &> /dev/null; then
+	var=1
+	printf "%s...\n" "$(echo some text)"
+	while true; do
+		echo $var
+
+		if { [[ "$var" -eq 1 && ( true || false ) ]] || false 2>&1 1> /dev/null; } &> /dev/null; then
+			var="$(cat <<< "two")"
+			continue 1
+		fi
+
+		case "$var" in
+			"two") var="three" ;;
+			three) var="four" ;;
+			fo*r)
+				var=five
+				;;
+
+			"fi"ve)
+				var="$(
+					cat       << END
+six > $var
+END
+				)"
+				;;
+
+			$'six\n' | *six*)
+				echo "?"
+				seven=seven
+				while read -r line
+				do
+					var="$line"
+				done << "HEREDOC"
+1
+2
+$seven
+HEREDOC
+				;;
+
+			*'sev'*)
+				export var=eight
+				unset var
+				;;
+
+			'')
+				{ incompatible_function && false; } || compatible_function "yes"
+				break
+				;;
+		esac
+
+		continue
+	done
+fi

tests/syntax-tests/highlighted/Batch/build.bat

@@ -0,0 +1,59 @@
+@echo off
+
+
+:: Change to your LLVM installation
+set "LLVMPath=C:\Program Files\LLVM"
+:: Change to your Visual Studio 2017 installation
+set "VSPath=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
+set "VSVersion=14.10.25017"
+:: Change to your Windows Kit version & installation
+set "WinSDKVersion=10.0.15063.0"
+set "WinSDKPath=C:\Program Files (x86)\Windows Kits\10"
+:: Change this to your resulting exe
+set "OUTPUT=test.exe"
+
+
+:: Setup
+set "VSBasePath=%VSPath%\VC\Tools\MSVC\%VSVersion%"
+set "PATH=%PATH%;%LLVMPath%\bin;%VSBasePath%\bin\HostX64\x64"
+
+:: Compiler Flags
+set CFLAGS= ^
+ -std=c++14 -Wall -Wextra
+
+set CPPFLAGS= ^
+  -I "%VSBasePath%\include" ^
+  -I "%WinSDKPath%\Include\%WinSDKVersion%\shared" ^
+  -I "%WinSDKPath%\Include\%WinSDKVersion%\ucrt" ^
+  -I "%WinSDKPath%\Include\%WinSDKVersion%\um"
+
+
+:: Linker Libs
+set LDFLAGS= ^
+ -machine:x64 ^
+ -nodefaultlib ^
+ -subsystem:console
+
+set LDLIBS= ^
+ -libpath:"%VSBasePath%\lib\x64" ^
+ -libpath:"%WinSDKPath%\Lib\%WinSDKVersion%\ucrt\x64" ^
+ -libpath:"%WinSDKPath%\Lib\%WinSDKVersion%\um\x64" ^
+ libucrt.lib libvcruntime.lib libcmt.lib libcpmt.lib ^
+ legacy_stdio_definitions.lib oldnames.lib ^
+ legacy_stdio_wide_specifiers.lib ^
+ kernel32.lib User32.lib
+
+
+:: Compiling
+@echo on
+@for %%f in (*.cc) do (
+    clang++.exe "%%~f" -o "%%~nf.o" -c %CFLAGS%
+)
+
+:: Linking
+@set "LINK_FILES="
+@for %%f in (*.o) do (
+    @set "LINK_FILES=%LINK_FILES% %%~f"
+)
+
+lld-link.exe %LINK_FILES% -out:"%OUTPUT%" %LDFLAGS% %LDLIBS%

tests/syntax-tests/highlighted/BibTeX/test.bib

@@ -0,0 +1,18 @@
+@book{knuth1997art,
+  title={The art of computer programming},
+  author={Knuth, Donald Ervin},
+  volume={3},
+  year={1997},
+  publisher={Pearson Education}
+}
+
+@article{egholm1993pna,
+  title={PNA hybridizes to complementary oligonucleotides obeying the Watson--Crick hydrogen-bonding rules},
+  author={Egholm, Michael and Buchardt, Ole and Christensen, Leif and Behrens, Carsten and Freier, Susan M and Driver, David A and Berg, Rolf H and Kim, Seog K and Norden, Bengt and Nielsen, Peter E},
+  journal={Nature},
+  volume={365},
+  number={6446},
+  pages={566--568},
+  year={1993},
+  publisher={Springer}
+}

tests/syntax-tests/highlighted/C-Sharp/Stack.cs

@@ -0,0 +1,64 @@
+namespace StackImplementation
+{
+    internal class Stack<T>
+    {
+        private int _top;
+        private const int Capacity = 4;
+        private readonly T[] _stack = new T[Capacity];
+
+        public Stack()
+        {
+            _top = -1;
+        }
+
+        private bool IsEmpty()
+        {
+            return _top < 0;
+        }
+        private bool IsFull()
+        {
+            return _top == Capacity - 1;
+        }
+
+        public void Peek()
+        {
+            System.Console.WriteLine(!IsEmpty() ? $"The topmost element is: {_stack[_top]}" : "The stack is empty.");
+        }
+
+        public T Pop()
+        {
+            return !IsEmpty() ? _stack[_top--] : default;
+        }
+
+        public void Push(T element)
+        {
+            if (!IsFull())
+            {
+                _stack[++_top] = element;
+            }
+            else
+            {
+                System.Console.WriteLine("Cannot push - the stack is full.");
+            }
+        }
+
+        public override string ToString()
+        {
+            if (IsEmpty())
+            {
+                return "The stack is empty.";
+            }
+
+            var depiction = "";
+
+            for (var index = 0; index < _top; index++)
+            {
+                depiction += _stack[index].ToString() + ' ';
+            }
+
+            depiction += _stack[_top].ToString();
+
+            return $"Stack: [{depiction}]";
+        }
+    }
+}

tests/syntax-tests/highlighted/C/test.c

@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+void test_function()
+{
+#define TEST
+#ifdef TEST
+    printf("TEST is defined\n");
+#endif
+}
+
+struct Node
+{
+    int val;
+    struct Node *next;
+};
+
+int main(int argc, char **argv)
+{
+    /* This C program was written to help bat
+     * with its syntax highlighting tests
+     */
+
+    // Calling test function
+    test_function();
+    struct Node *head = NULL;
+    head = (struct Node *)malloc(sizeof(struct Node *));
+    head->val = -1;
+    if (head->val == 1 * -1)
+    {
+        head->val = 10;
+    }
+    else
+    {
+        head->val = argc;
+    }
+    int t = head->val, count = 0;
+    free(head);
+    while (t--)
+    {
+        count++;
+    }
+    for (int i = t; i < count; ++i)
+    {
+        do
+        {
+            --count;
+        } while (false);
+    }
+    enum chars
+    {
+        M,
+        I,
+        T,
+        H,
+        L
+    };
+    char *string = "string";
+    printf("true is #define true %d\n", true);
+    return 0;
+}

tests/syntax-tests/highlighted/CMake/CMakeLists.txt

@@ -0,0 +1,16 @@
+# This is a file for testing syntax highlighting.
+cmake_minimum_required(VERSION 3.13)
+project(hello-bat VERSION 0.0.1 LANGUAGES C)
+
+set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/")
+file(GLOB_RECURSE SOURCES "${SOURCE_DIR}/*.c")
+
+add_executable(hello-bat SOURCES)
+
+find_package(assimp CONFIG)
+target_link_libraries(hello-bat assimp)
+
+option("ENABLE_TESTS" OFF)
+if(ENABLE_TESTS)
+  add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests/")
+endif()

tests/syntax-tests/highlighted/CSS/style.css

@@ -0,0 +1,115 @@
+/*Scrolling*/
+html { scroll-behavior: smooth; }
+
+/*Header text*/
+.jumbotron {
+    background-image: linear-gradient(90deg, #849EB5, #30394A);
+    padding-bottom: 20px;
+    padding-top: 20px;
+    text-shadow: 0px 2px 4px #000000;
+}
+
+.container {
+    margin-top: -25px;
+}
+
+/*Background related*/
+body {
+    background: #161616;
+}
+
+/*Text related CSS*/
+h4 {
+    font-size: 70px;
+    color: #FFFFFF;
+    font-family: News Cycle, serif;
+}
+
+h3 {
+    color: #e5e5e5;
+}
+
+p {
+    font-size: 17px;
+    font-family: News Cycle, serif;
+    color: #DEDEDE;
+}
+
+p2 {
+    font-size: 24px;
+    color: #DEDEDE;
+    font-family: News Cycle, serif;
+}
+
+date {
+    font-family: News Cycle, serif;
+    font-style: italic;
+    font-size: 17px;
+    color: #DEDEDE;
+}
+
+jobtitle {
+    font-size: 17px;
+    font-weight: bold;
+    font-family: News Cycle, serif;
+    color: #DEDEDE;
+}
+
+jobtilenolink {
+    font-size: 17px;
+    font-weight: bold;
+    font-family: News Cycle, serif;
+    color: #DEDEDE;
+}
+
+li {
+    font-family: News Cycle, serif;
+    color: #DEDEDE;
+}
+
+
+
+a {
+    color: #4A8ECC;
+}
+
+p a:visited {
+    color: #4A8ECC;
+}
+
+.href {
+    color: #4A8ECC;
+}
+
+a:visited {
+    color: #4A8ECC;
+}
+
+p a:hover {
+    color: #4FB1F4;
+}
+
+a:hover {
+    color: #4FB1F4;
+}
+
+jobtitle:hover {
+    color: #4FB1F4;
+}
+
+/*Section*/
+section {
+    background-color: #1B1B1B;
+    padding: 20px;
+    margin: -5px;
+    margin-bottom: 30px;
+    box-shadow: 0px 2px 4px rgba(0,0,0,0.3);
+}
+
+
+/*Icon related*/
+.icon {
+    position: relative;
+    top: 3px;
+    right: 5px;
+}

tests/syntax-tests/highlighted/CSV/comma_in_quotes.csv

@@ -0,0 +1,7 @@
+first,last,address,city,zip
+John,Doe,120 any st.,"Anytown, WW",08123
+a,b
+1,"ha 
+""ha"" 
+ha",120 any st.,"Anytown, WW",08123
+3,4,120 any st.,"Anytown, WW",08123

tests/syntax-tests/highlighted/Clojure/test.clj

@@ -0,0 +1,58 @@
+(ns clojure-sample.core
+    (:gen-class))
+  
+  (require '[clj-time.core :as t])
+  (require '[clj-time.format :as f])
+  
+  ;; Product record
+  (defrecord Product [id name available price])
+  
+  ;; Positional constructor
+  (def product1 (->Product "1" "T-Shirt 1" true 15.00))
+  
+  ;; Map constructor
+  (def product2 (map->Product
+                 {:id "2"
+                  :name "T-Shirt 2"
+                  :available true
+                  :price 20.00}))
+  
+  ;; Nested
+  (def product3 {:id "1"
+                 :name "Product 1"
+                 :available true
+                 :sellers [{:id "1"
+                            :name "Seller 1"
+                            :stock 3},
+                           {:id 2
+                            :name "Seller 2"
+                            :stock 5}]})
+  
+  ;; Set
+  (def categories #{"shirts" "shoes" "belts"})
+  
+  ;; List
+  (def wishlist '(1 2))
+  
+  ;; Recursion
+  (defn factorial [value] (cond
+                            (<= value 1) 1
+                            :else (* value (factorial (- value 1)))))
+  
+  (def basic-formatter (f/formatter "YYYY-MM-dd hh:mm:ss"))
+  (defn now [] (f/unparse basic-formatter (t/now)))
+  (defn log
+    ([] (println (now) "No message"))
+    ([message] (println (now)  message)))
+  
+  (defn -main
+    [& args]
+    (println (:id product1))
+    (println (:name product2))
+    (println (:name (get (:sellers product3) 0)))
+    (println (first categories))
+    (println wishlist)
+    (println (factorial 5))
+    (log)
+    (log "Message"))
+  

tests/syntax-tests/highlighted/Cpp/test.cpp

@@ -0,0 +1,79 @@
+#include <bits/stdc++.h> // includes most of the useful libraries
+#include "mainwindow.h"
+
+using namespace std;
+
+/* This C program was submitted to help bat
+ * with its syntax highlighting tests
+ */
+
+bool test_function(int x, int y)
+{
+    return (x == y || x + y == x * y);
+}
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent), ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+    resize(560, 420);
+    // Image menu
+    connect(ui->actionOpen, &QAction::triggered, this, &MainWindow::open);
+    MainWindow::~MainWindow()
+    {
+        delete ui;
+    }
+    int y = ui->graphicsView->size().height() - image.height();
+    int x = ui->graphicsView->size().width() - image.width();
+
+    void MainWindow::showImage()
+    {
+        // Reset scale
+        ui->graphicsView->resetMatrix();
+
+        statusBar()->showMessage(QString("%1 %2x%3px %4 kB").arg(file.fileName()).arg(image.width()).arg(image.height()).arg(QFile(currentFile).size() / 1000.0));
+    }
+}
+
+int main()
+{
+    int tc;
+    cin >> tc;
+    while (tc--) // for each test case
+    {
+        int n;
+        cin >> n; // take n
+        vector<pair<int, string>> v;
+
+        int a[n], b[n];
+
+        for (int i = 0; i < n; i++)
+            cin >> a[i]; // take arrays
+        for (int i = 0; i < n; i++)
+            cin >> b[i];
+
+        priority_queue<int> pq; // inbuilt data structure - max heap (available in the bits/stdc++)
+
+        for (int i = 0; i < n; i++)
+            pq.push(a[i]); // push elements into heap
+
+        for (int i = 0; i < n; i++) // for each element in B
+        {
+            int top_ele = pq.top();  // max element in heap
+            pq.pop();                // deletion
+            pq.push(top_ele ^ b[i]); // push after operation
+        }
+
+        for (int i = n - 1; i >= 0; i--) // restore A in ascending order
+        {
+            a[i] = pq.top();
+            pq.pop();
+        }
+
+        for (int i = 0; i < n; i++)
+            cout << a[i] << " "; // print A
+
+        cout << endl;
+    }
+    return 0;
+}

tests/syntax-tests/highlighted/CpuInfo/test.CpuInfo

@@ -0,0 +1,45 @@
+processor    : 0
+model name    : ARMv7 Processor rev 3 (v7l)
+BogoMIPS    : 270.00
+Features    : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32
+CPU implementer    : 0x41
+CPU architecture: 7
+CPU variant    : 0x0
+CPU part    : 0xd08
+CPU revision    : 3
+
+processor    : 1
+model name    : ARMv7 Processor rev 3 (v7l)
+BogoMIPS    : 270.00
+Features    : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32
+CPU implementer    : 0x41
+CPU architecture: 7
+CPU variant    : 0x0
+CPU part    : 0xd08
+CPU revision    : 3
+
+processor    : 2
+model name    : ARMv7 Processor rev 3 (v7l)
+BogoMIPS    : 270.00
+Features    : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32
+CPU implementer    : 0x41
+CPU architecture: 7
+CPU variant    : 0x0
+CPU part    : 0xd08
+CPU revision    : 3
+
+processor    : 3
+model name    : ARMv7 Processor rev 3 (v7l)
+BogoMIPS    : 270.00
+Features    : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm crc32
+CPU implementer    : 0x41
+CPU architecture: 7
+CPU variant    : 0x0
+CPU part    : 0xd08
+CPU revision    : 3
+
+Hardware    : BCM2711
+Revision    : b03111
+Serial        : 1000000095fd9fc5
+Model        : Raspberry Pi 4 Model B Rev 1.1
+

tests/syntax-tests/highlighted/Crystal/test.cr

@@ -0,0 +1,117 @@
+# An example file to test Crystal syntax highlighting in bat
+my_var : Nil = nil
+my_var_also : Int32 = 42
+my_other_var = 4.0
+another_float = 4.0_f32
+another_float_2 = 4e10
+another_float_3 = -0.5
+big_one = 1_000_000.111_111e-4
+ternary = 1 > 2 : 3 ? 4
+my_symbol = :ThisOne?
+my_other_symbol = :No_That_One!
+plus = :+
+minus = :-
+my_string : String = "this string right here, with an interpolated value of #{my_var_also}"
+my_array : Array(Int32) = [1,2,3,4]
+my_tuple : Tuple(Int32, Int32, Int32, Int32) = {1,2,3,4}
+my_named_tuple : NamedTuple(one: Int32, two: Int32) = {"one": 1, "two": 2}
+my_hash : Hash(String, Int32) = {"one" => 1, "two" => 2}
+my_proc : Proc(Int32, Int32) = ->(x : Int32){ x * x}
+my_other_proc : Proc(String) = ->{ "Wow, neat!" }
+puts my_string
+puts(my_string)
+
+enum Colors
+  Red
+  Green
+  Blue
+end
+
+class Greeter
+  @instance_field = Colors::Red
+  @@class_field = Colors::Green
+
+  def initialize(@name = "world")
+  end
+
+  def greet 
+    puts "Hello, #{@name}"
+  end
+
+  def render_greeting : String
+    "Hello, #{@name}"
+  end
+
+  def with_greeting
+    yield render_greeting
+  end
+
+  def is_color_default?
+    @instance_field == @@class_field
+  end
+
+  def self.greet_static(name : String) : Unit
+    puts "Hello, #{name}"
+  end
+end
+
+greeter = Greeter.new("bat")
+greeter.with_greeting do |greeting|
+  puts greeting
+end
+
+puts <<-EOF
+  this is a heredoc and it has a value in it of #{greeter.render_greeting}!
+EOF
+
+# This is a command:
+`echo yay!`
+$?.success?
+
+my_color = Colors::Red
+
+puts 
+  case my_color
+  when Colors::Red, .red?
+    "Red"
+  when Colors::Green, .green?
+    "Green"
+  when Colors::Blue, .blue?
+    "Blue"
+  else
+    "I dunno, man. Chartreuse? Maroon?"
+  end
+
+class MyGenericClass(T)
+  def initialize(@wrapped_value : T)
+  end
+
+  def get
+    return @wrapped_value
+  end
+end
+
+
+def do_stuff_with_range(r : Range(Int|String))
+  return if r.empty?
+  return unless !(r.empty?)
+  r.each do |item|
+    if /e/.match(item.to_s)
+      puts "#{item} contains the letter e!"
+    elsif item.to_s.empty?
+      break
+    else
+      next # this is unnecessary, but whatever
+    end
+  end
+end
+
+
+macro print_range(range)
+  {% for i in range %}
+    puts {{i.id}}
+  {% end %}
+end
+
+print_range(1..3)
+print_range(1...3)

tests/syntax-tests/highlighted/D/test.d

@@ -0,0 +1,44 @@
+// selective import
+import std.stdio : writeln, writefln;
+// non-selective import
+import std.algorithm;
+
+/* a multiline comment
+*
+* this function is safe because it doesn't use pointer arithmetic
+*/
+int the_ultimate_answer() @safe {
+	// assert1on
+	assert(1 != 2);
+        // now we can safely return our answer	
+	return 42;
+}
+
+void main()
+{
+    // function call with string literal
+    writeln("Hello World!");
+
+    // an int array declaration
+    int[] arr1 = [1, 2, 3];
+    // an immutable double
+    immutable double pi = 3.14;
+    // a mutable double
+    double d1 = pi;
+    // a pointer
+    double* dp1 = &d1;
+    // another pointer to the same thingy
+    auto a1 = &d1;
+    // a constant bool
+    const bool b1 = true;
+    if (b1) {
+	    // another function call 
+	    writefln("%s\n%s\n%s\n", arr1, d1, the_ultimate_answer());
+    }
+    else if (!b1) {
+	    writeln("this seems wrong");
+    }
+    else {
+	    writeln("I'm giving up, this is too crazy for me");
+    }
+}

tests/syntax-tests/highlighted/Dart/test.dart

@@ -0,0 +1,133 @@
+/* array sorting alogorithm */
+int partition(List list, int low, int high) {
+  if (list == null || list.length == 0) return 0;
+  int pivot = list[high];
+  int i = low - 1;
+
+  void swap(List list, int i, int j) {
+    int temp = list[i];
+    list[i] = list[j];
+    list[j] = temp;
+  }
+
+  for (int j = low; j < high; j++) {
+    if (list[j] <= pivot) {
+      i++;
+      swap(list, i, j);
+    }
+    swap(list, i + 1, high);
+    return i + 1;
+  }
+}
+
+void quickSort(List list, int low, int high) {
+  if (low < high) {
+    int pi = partition(list, low, high);
+    quickSort(list, low, pi - 1);
+    quickSort(list, pi + 1, high);
+  }
+}
+
+void merge(List list, int leftIndex, int middleIndex, int rightIndex) {
+  int leftSize = middleIndex - leftIndex + 1;
+  int rightSize = rightIndex - middleIndex;
+
+  List leftList = new List(leftSize);
+  List rightList = new List(rightSize);
+
+  for (int i = 0; i < leftSize; i++) leftList[i] = list[leftIndex + i];
+  for (int j = 0; j < rightSize; j++) rightList[j] = list[middleIndex + j + 1];
+
+  int i = 0, j = 0;
+  int k = leftIndex;
+
+  while (i < leftSize && j < rightSize) {
+    if (leftList[i] <= rightList[j]) {
+      list[k] = leftList[i];
+      i++;
+    } else {
+      list[k] = rightList[j];
+      j++;
+    }
+    k++;
+  }
+
+  while (i < leftSize) {
+    list[k] = leftList[i];
+    i++;
+    k++;
+  }
+
+  while (j < rightSize) {
+    list[k] = rightList[j];
+    j++;
+    k++;
+  }
+}
+
+void mergeSort(List list, int leftIndex, int rightIndex) {
+  if (leftIndex < rightIndex) {
+    int middleIndex = (rightIndex + leftIndex) ~/ 2;
+
+    mergeSort(list, leftIndex, middleIndex);
+    mergeSort(list, middleIndex + 1, rightIndex);
+
+    merge(list, leftIndex, middleIndex, rightIndex);
+  }
+}
+
+/* variables */
+var name = 'Voyager I';
+var year = 1977;
+var antennaDiameter = 3.7;
+var flybyObjects = ['Jupiter', 'Saturn', 'Uranus', 'Neptune'];
+var image = {
+  'tags': ['saturn'],
+  'url': '//path/to/saturn.jpg'
+};
+
+/*classes */
+class Spacecraft {
+  String name;
+  DateTime launchDate;
+  Spacecraft(this.name, this.launchDate) {}
+
+  // Named constructor that forwards to the default one.
+  Spacecraft.unlaunched(String name) : this(name, null);
+
+  int get launchYear => launchDate?.year;
+
+  void describe() {
+    print('Spacecraft: $name');
+    if (launchDate != null) {
+      int years = DateTime.now().difference(launchDate).inDays ~/ 365;
+      print('Launched: $launchYear ($years years ago)');
+    } else {
+      print('Unlaunched');
+    }
+  }
+}
+
+/* Mixins */
+class PilotedCraft extends Spacecraft with Piloted {
+  // ···
+}
+
+/* Interfaces and abstract classes */
+class MockSpaceship implements Spacecraft {
+  // ···
+}
+
+/* async */
+Future<void> printWithDelay(String message) {
+  return Future.delayed(const Duration(seconds: 2)).then((_) {
+    print(message);
+  });
+}
+
+Stream<String> report(Spacecraft craft, Iterable<String> objects) async* {
+  for (var object in objects) {
+    await Future.delayed(const Duration(seconds: 2));
+    yield '${craft.name} flies by $object';
+  }
+}

tests/syntax-tests/highlighted/Diff/82e7786e747b1fcfac1f963ae6415a22ec9caae1.diff

@@ -0,0 +1,353 @@
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index ced88213..973eba9a 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -2,6 +2,11 @@
+ 
+ 
+ ## Features
++
++- Add a new `--diff` 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
+ ## Other
+ ## `bat` as a library
+diff --git a/src/bin/bat/app.rs b/src/bin/bat/app.rs
+index e5221455..f0f519ea 100644
+--- a/src/bin/bat/app.rs
++++ b/src/bin/bat/app.rs
+@@ -15,7 +15,7 @@ use console::Term;
+ 
+ use bat::{
+     assets::HighlightingAssets,
+-    config::Config,
++    config::{Config, VisibleLines},
+     error::*,
+     input::Input,
+     line_range::{HighlightedLineRanges, LineRange, LineRanges},
+@@ -196,13 +196,23 @@ impl App {
+                     }
+                 })
+                 .unwrap_or_else(|| String::from(HighlightingAssets::default_theme())),
+-            line_ranges: self
+-                .matches
+-                .values_of("line-range")
+-                .map(|vs| vs.map(LineRange::from).collect())
+-                .transpose()?
+-                .map(LineRanges::from)
+-                .unwrap_or_default(),
++            visible_lines: if self.matches.is_present("diff") {
++                VisibleLines::DiffContext(
++                    self.matches
++                        .value_of("diff-context")
++                        .and_then(|t| t.parse().ok())
++                        .unwrap_or(2),
++                )
++            } else {
++                VisibleLines::Ranges(
++                    self.matches
++                        .values_of("line-range")
++                        .map(|vs| vs.map(LineRange::from).collect())
++                        .transpose()?
++                        .map(LineRanges::from)
++                        .unwrap_or_default(),
++                )
++            },
+             style_components,
+             syntax_mapping,
+             pager: self.matches.value_of("pager"),
+diff --git a/src/bin/bat/clap_app.rs b/src/bin/bat/clap_app.rs
+index c7344991..85edefde 100644
+--- a/src/bin/bat/clap_app.rs
++++ b/src/bin/bat/clap_app.rs
+@@ -105,6 +105,34 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
+                             data to bat from STDIN when bat does not otherwise know \
+                             the filename."),
+         )
++        .arg(
++            Arg::with_name("diff")
++                .long("diff")
++                .help("Only show lines that have been added/removed/modified.")
++                .long_help(
++                    "Only show lines that have been added/removed/modified with respect \
++                     to the Git index. Use --diff-context=N to control how much context you want to see.",
++                ),
++        )
++        .arg(
++            Arg::with_name("diff-context")
++                .long("diff-context")
++                .overrides_with("diff-context")
++                .takes_value(true)
++                .value_name("N")
++                .validator(
++                    |n| {
++                        n.parse::<usize>()
++                            .map_err(|_| "must be a number")
++                            .map(|_| ()) // Convert to Result<(), &str>
++                            .map_err(|e| e.to_string())
++                    }, // Convert to Result<(), String>
++                )
++                .hidden_short_help(true)
++                .long_help(
++                    "Include N lines of context around added/removed/modified lines when using '--diff'.",
++                ),
++        )
+         .arg(
+             Arg::with_name("tabs")
+                 .long("tabs")
+@@ -339,6 +367,7 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
+                 .takes_value(true)
+                 .number_of_values(1)
+                 .value_name("N:M")
++                .conflicts_with("diff")
+                 .help("Only print the lines from N to M.")
+                 .long_help(
+                     "Only print the specified range of lines for each file. \
+diff --git a/src/config.rs b/src/config.rs
+index d5df9910..3c24b77f 100644
+--- a/src/config.rs
++++ b/src/config.rs
+@@ -5,6 +5,32 @@ use crate::style::StyleComponents;
+ use crate::syntax_mapping::SyntaxMapping;
+ use crate::wrapping::WrappingMode;
+ 
++#[derive(Debug, Clone)]
++pub enum VisibleLines {
++    /// Show all lines which are included in the line ranges
++    Ranges(LineRanges),
++
++    #[cfg(feature = "git")]
++    /// Only show lines surrounding added/deleted/modified lines
++    DiffContext(usize),
++}
++
++impl VisibleLines {
++    pub fn diff_context(&self) -> bool {
++        match self {
++            Self::Ranges(_) => false,
++            #[cfg(feature = "git")]
++            Self::DiffContext(_) => true,
++        }
++    }
++}
++
++impl Default for VisibleLines {
++    fn default() -> Self {
++        VisibleLines::Ranges(LineRanges::default())
++    }
++}
++
+ #[derive(Debug, Clone, Default)]
+ pub struct Config<'a> {
+     /// The explicitly configured language, if any
+@@ -39,8 +65,8 @@ pub struct Config<'a> {
+     #[cfg(feature = "paging")]
+     pub paging_mode: PagingMode,
+ 
+-    /// Specifies the lines that should be printed
+-    pub line_ranges: LineRanges,
++    /// Specifies which lines should be printed
++    pub visible_lines: VisibleLines,
+ 
+     /// The syntax highlighting theme
+     pub theme: String,
+@@ -62,10 +88,7 @@ pub struct Config<'a> {
+ fn default_config_should_include_all_lines() {
+     use crate::line_range::RangeCheckResult;
+ 
+-    assert_eq!(
+-        Config::default().line_ranges.check(17),
+-        RangeCheckResult::InRange
+-    );
++    assert_eq!(LineRanges::default().check(17), RangeCheckResult::InRange);
+ }
+ 
+ #[test]
+diff --git a/src/controller.rs b/src/controller.rs
+index 09c6ec2a..f636d5fd 100644
+--- a/src/controller.rs
++++ b/src/controller.rs
+@@ -1,9 +1,13 @@
+ use std::io::{self, Write};
+ 
+ use crate::assets::HighlightingAssets;
+-use crate::config::Config;
++use crate::config::{Config, VisibleLines};
++#[cfg(feature = "git")]
++use crate::diff::{get_git_diff, LineChanges};
+ use crate::error::*;
+ use crate::input::{Input, InputReader, OpenedInput};
++#[cfg(feature = "git")]
++use crate::line_range::LineRange;
+ use crate::line_range::{LineRanges, RangeCheckResult};
+ use crate::output::OutputType;
+ #[cfg(feature = "paging")]
+@@ -68,6 +72,32 @@ impl<'b> Controller<'b> {
+                     no_errors = false;
+                 }
+                 Ok(mut opened_input) => {
++                    #[cfg(feature = "git")]
++                    let line_changes = if self.config.visible_lines.diff_context()
++                        || (!self.config.loop_through && self.config.style_components.changes())
++                    {
++                        if let crate::input::OpenedInputKind::OrdinaryFile(ref path) =
++                            opened_input.kind
++                        {
++                            let diff = get_git_diff(path);
++
++                            if self.config.visible_lines.diff_context()
++                                && diff
++                                    .as_ref()
++                                    .map(|changes| changes.is_empty())
++                                    .unwrap_or(false)
++                            {
++                                continue;
++                            }
++
++                            diff
++                        } else {
++                            None
++                        }
++                    } else {
++                        None
++                    };
++
+                     let mut printer: Box<dyn Printer> = if self.config.loop_through {
+                         Box::new(SimplePrinter::new())
+                     } else {
+@@ -75,10 +105,18 @@ impl<'b> Controller<'b> {
+                             &self.config,
+                             &self.assets,
+                             &mut opened_input,
++                            #[cfg(feature = "git")]
++                            &line_changes,
+                         ))
+                     };
+ 
+-                    let result = self.print_file(&mut *printer, writer, &mut opened_input);
++                    let result = self.print_file(
++                        &mut *printer,
++                        writer,
++                        &mut opened_input,
++                        #[cfg(feature = "git")]
++                        &line_changes,
++                    );
+ 
+                     if let Err(error) = result {
+                         handle_error(&error);
+@@ -96,13 +134,31 @@ impl<'b> Controller<'b> {
+         printer: &mut dyn Printer,
+         writer: &mut dyn Write,
+         input: &mut OpenedInput,
++        #[cfg(feature = "git")] line_changes: &Option<LineChanges>,
+     ) -> Result<()> {
+         if !input.reader.first_line.is_empty() || self.config.style_components.header() {
+             printer.print_header(writer, input)?;
+         }
+ 
+         if !input.reader.first_line.is_empty() {
+-            self.print_file_ranges(printer, writer, &mut input.reader, &self.config.line_ranges)?;
++            let line_ranges = match self.config.visible_lines {
++                VisibleLines::Ranges(ref line_ranges) => line_ranges.clone(),
++                #[cfg(feature = "git")]
++                VisibleLines::DiffContext(context) => {
++                    let mut line_ranges: Vec<LineRange> = vec![];
++
++                    if let Some(line_changes) = line_changes {
++                        for line in line_changes.keys() {
++                            let line = *line as usize;
++                            line_ranges.push(LineRange::new(line - context, line + context));
++                        }
++                    }
++
++                    LineRanges::from(line_ranges)
++                }
++            };
++
++            self.print_file_ranges(printer, writer, &mut input.reader, &line_ranges)?;
+         }
+         printer.print_footer(writer, input)?;
+ 
+diff --git a/src/pretty_printer.rs b/src/pretty_printer.rs
+index 0c78ea90..13bd5dbc 100644
+--- a/src/pretty_printer.rs
++++ b/src/pretty_printer.rs
+@@ -6,7 +6,7 @@ use syntect::parsing::SyntaxReference;
+ 
+ use crate::{
+     assets::HighlightingAssets,
+-    config::Config,
++    config::{Config, VisibleLines},
+     controller::Controller,
+     error::Result,
+     input::Input,
+@@ -205,7 +205,7 @@ impl<'a> PrettyPrinter<'a> {
+ 
+     /// Specify the lines that should be printed (default: all)
+     pub fn line_ranges(&mut self, ranges: LineRanges) -> &mut Self {
+-        self.config.line_ranges = ranges;
++        self.config.visible_lines = VisibleLines::Ranges(ranges);
+         self
+     }
+ 
+diff --git a/src/printer.rs b/src/printer.rs
+index 5eed437e..2b245cfd 100644
+--- a/src/printer.rs
++++ b/src/printer.rs
+@@ -24,7 +24,7 @@ use crate::config::Config;
+ use crate::decorations::LineChangesDecoration;
+ use crate::decorations::{Decoration, GridBorderDecoration, LineNumberDecoration};
+ #[cfg(feature = "git")]
+-use crate::diff::{get_git_diff, LineChanges};
++use crate::diff::LineChanges;
+ use crate::error::*;
+ use crate::input::OpenedInput;
+ use crate::line_range::RangeCheckResult;
+@@ -90,7 +90,7 @@ pub(crate) struct InteractivePrinter<'a> {
+     ansi_prefix_sgr: String,
+     content_type: Option<ContentType>,
+     #[cfg(feature = "git")]
+-    pub line_changes: Option<LineChanges>,
++    pub line_changes: &'a Option<LineChanges>,
+     highlighter: Option<HighlightLines<'a>>,
+     syntax_set: &'a SyntaxSet,
+     background_color_highlight: Option<Color>,
+@@ -101,6 +101,7 @@ impl<'a> InteractivePrinter<'a> {
+         config: &'a Config,
+         assets: &'a HighlightingAssets,
+         input: &mut OpenedInput,
++        #[cfg(feature = "git")] line_changes: &'a Option<LineChanges>,
+     ) -> Self {
+         let theme = assets.get_theme(&config.theme);
+ 
+@@ -145,9 +146,6 @@ impl<'a> InteractivePrinter<'a> {
+             panel_width = 0;
+         }
+ 
+-        #[cfg(feature = "git")]
+-        let mut line_changes = None;
+-
+         let highlighter = if input
+             .reader
+             .content_type
+@@ -155,18 +153,6 @@ impl<'a> InteractivePrinter<'a> {
+         {
+             None
+         } else {
+-            // Get the Git modifications
+-            #[cfg(feature = "git")]
+-            {
+-                use crate::input::OpenedInputKind;
+-
+-                if config.style_components.changes() {
+-                    if let OpenedInputKind::OrdinaryFile(ref path) = input.kind {
+-                        line_changes = get_git_diff(path);
+-                    }
+-                }
+-            }
+-
+             // Determine the type of syntax for highlighting
+             let syntax = assets.get_syntax(config.language, input, &config.syntax_mapping);
+             Some(HighlightLines::new(syntax, theme))

tests/syntax-tests/highlighted/Dockerfile/Dockerfile

@@ -0,0 +1,19 @@
+ARG architecture=amd64
+FROM $architecture/centos:7
+LABEL com.example.version="0.2.1-beta"
+ARG architecture
+
+ENV INTERESTING_PATH /usr/bin/interesting-software
+
+
+COPY entrypoint.sh /usr/bin/entrypoint.sh
+
+RUN if [ "$architecture" = "i386" ]; then echo "Building i386 docker image" && \
+    linux32 yum update -y && linux32 yum install -y mysql ; \
+    else yum update -y && yum install -y mysql
+
+EXPOSE 80/tcp
+
+VOLUME [/var/lib/mysql/data]
+
+ENTRYPOINT ["/usr/bin/entrypoint.sh"]

tests/syntax-tests/highlighted/DotENV/.env

@@ -0,0 +1,57 @@
+# Keyword
+export TEST_KEYWORD="bar"
+export TEST_KEYWORD=12345
+export TEST_KEYWORD=TRUE
+
+# Variable
+TEST_VARIABLE="Hello"
+
+# String interpolation
+TEST_INTERPOLATION_VARIABLE="$VAR1 test test$VAR2test test"
+TEST_INTERPOLATION_SYNTAX_ONE="test test{$NVAR1}test{$NVAR2}test test"
+TEST_INTERPOLATION_SYNTAX_TWO="test test${NVAR1}test${NVAR2}test test"
+TEST_INTERPOLATION_SYNTAX_ALL="test$VAR1test test {VAR2}test test${VAR3}test"
+
+# Unquoted
+TEST_UNQUOTED=bar
+TEST_UNQUOTED_NO_VALUE=
+
+# White spaced
+TEST_WHITE_SPACE =
+TEST_WHITE_SPACE_STRING = "Hello"
+TEST_WHITE_SPACE_UNQUOTED = bar
+TEST_WHITE_SPACE_UNQUOTED_BOOL = false
+TEST_WHITE_SPACE_UNQUOTED_NUM = 20
+
+# language constants
+TEST_TRUE=true
+TEST_FALSE=false
+TEST_NULL=null
+TEST_TRUE_CAPITAL=TRUE
+TEST_FALSE_CAPITAL=FALSE
+TEST_NULL_CAPITAL=NULL
+
+# Numerical values
+TEST_NUM_DECIMAL=54
+TEST_NUM_FLOAT=5.3
+TEST_NUM=1e10
+TEST_NUM_NEGATIVE=-42
+TEST_NUM_OCTAL=057
+TEST_NUM_HEX=0x1A
+
+# Comments
+#TEST_ONE=foobar
+# TEST_TWO='foobar'
+# TEST_THREE="foobar" # a comment on a commented row
+TEST_FOUR="test test test" # this is a comment
+TEST_FIVE="comment symbol # inside string" # this is a comment
+TEST_SIX="comment symbol # and quotes \" \' inside quotes" # " this is a comment
+
+# Escape sequences
+TEST_ESCAPE="escaped characters \n \t \r \" \' \$ or maybe a backslash \\..."
+
+# Double Quotes
+TEST_DOUBLE="Lorem {$VAR1} ${VAR2} $VAR3 ipsum dolor sit amet\n\r\t\\"
+
+# Single Quotes
+TEST_SINGLE='Lorem {$VAR1} ${VAR2} $VAR3 ipsum dolor sit amet\n\r\t\\'

tests/syntax-tests/highlighted/Elixir/command.ex

@@ -0,0 +1,31 @@
+defmodule Charlex.Command do
+  @callback usage() :: [String.t()]
+
+  @callback description() :: String.t()
+
+  @callback parse_args(args :: String.t()) :: any()
+
+  @callback run(context :: Map.t(), args :: [String.t()] | any()) :: String.t() | any()
+
+  @optional_callbacks usage: 0, description: 0, parse_args: 1
+
+  defmacro __using__(_opts) do
+    quote do
+      @behaviour unquote(__MODULE__)
+
+      @impl true
+      def usage, do: "This command is without usage, will add it soon"
+
+      @impl true
+      def description, do: "This command is without description, will add it soon"
+
+      @impl true
+      def run(_context, _args), do: :ok
+
+      @impl true
+      def parse_args(args), do: args |> String.split() |> Kernel.tl()
+
+      defoverridable parse_args: 1, description: 0, run: 2, usage: 0
+    end
+  end
+end

tests/syntax-tests/highlighted/Elm/test.elm

@@ -0,0 +1,137 @@
+-- elm install elm-explorations/linear-algebra
+-- elm install elm-explorations/webgl
+
+
+import Browser
+import Browser.Events as E
+import Html exposing (Html)
+import Html.Attributes exposing (width, height, style)
+import Math.Matrix4 as Mat4 exposing (Mat4)
+import Math.Vector3 as Vec3 exposing (Vec3, vec3)
+import WebGL
+
+
+
+-- MAIN
+
+
+main =
+  Browser.element
+    { init = init
+    , view = view
+    , update = update
+    , subscriptions = subscriptions
+    }
+
+
+
+-- MODEL
+
+
+type alias Model =
+  Float
+
+
+init : () -> (Model, Cmd Msg)
+init () =
+  ( 0, Cmd.none )
+
+
+
+-- UPDATE
+
+
+type Msg
+  = TimeDelta Float
+
+
+update : Msg -> Model -> (Model, Cmd Msg)
+update msg currentTime =
+  case msg of
+    TimeDelta delta ->
+      ( delta + currentTime, Cmd.none )
+
+
+
+-- SUBSCRIPTIONS
+
+
+subscriptions : Model -> Sub Msg
+subscriptions _ =
+  E.onAnimationFrameDelta TimeDelta
+
+
+
+-- VIEW
+
+
+view : Model -> Html msg
+view t =
+  WebGL.toHtml
+    [ width 400, height 400, style "display" "block"
+    ]
+    [ WebGL.entity vertexShader fragmentShader mesh { perspective = perspective (t / 1000) }
+    ]
+
+
+perspective : Float -> Mat4
+perspective t =
+  Mat4.mul
+    (Mat4.makePerspective 45 1 0.01 100)
+    (Mat4.makeLookAt (vec3 (4 * cos t) 0 (4 * sin t)) (vec3 0 0 0) (vec3 0 1 0))
+
+
+
+-- MESH
+
+
+type alias Vertex =
+  { position : Vec3
+  , color : Vec3
+  }
+
+
+mesh : WebGL.Mesh Vertex
+mesh =
+  WebGL.triangles
+    [ ( Vertex (vec3 0 0 0) (vec3 1 0 0)
+      , Vertex (vec3 1 1 0) (vec3 0 1 0)
+      , Vertex (vec3 1 -1 0) (vec3 0 0 1)
+      )
+    ]
+
+
+
+-- SHADERS
+
+
+type alias Uniforms =
+  { perspective : Mat4
+  }
+
+
+vertexShader : WebGL.Shader Vertex Uniforms { vcolor : Vec3 }
+vertexShader =
+    [glsl|
+        attribute vec3 position;
+        attribute vec3 color;
+        uniform mat4 perspective;
+        varying vec3 vcolor;
+
+        void main () {
+            gl_Position = perspective * vec4(position, 1.0);
+            vcolor = color;
+        }
+    |]
+
+
+fragmentShader : WebGL.Shader {} Uniforms { vcolor : Vec3 }
+fragmentShader =
+    [glsl|
+        precision mediump float;
+        varying vec3 vcolor;
+
+        void main () {
+            gl_FragColor = vec4(vcolor, 1.0);
+        }
+    |]

tests/syntax-tests/highlighted/Erlang/bat_erlang.erl

@@ -0,0 +1,72 @@
+-module(bat_erlang).
+
+-export([main/0]).
+
+-record(test, {
+    name :: list(),
+    data :: binary()
+}).
+
+-define(TESTMACRO, "testmacro").
+
+-spec main() -> ok.
+main() ->
+    %% Handling Lists and Numbers
+    List = [1, 2, 3, 4, $6, 2#00111],
+    _Sum = lists:sum(List),
+    _ = [(N * N) + N / N - N || N <- List, N > 2],
+    [_Head, _SecondHead | _Tail] = List,
+    _ = [1, atom, [list], <<"binary">>, {tuple, tuple}, #{map => key}, #test{name = "record"}],
+
+    %% Handling Binaries 
+    BinHelloWorld = <<"Hello World">>,
+    <<X || <<X:1/binary>> <= BinHelloWorld >>,
+    <<0,0,0,0,0,0,0,151>> = <<151:64/signed-integer>>,
+
+    %% Handling Boolean and Atoms
+    true = true andalso true,
+    true = false orelse true,
+    _ = true =:= true,
+    _ = false =/= true,
+    _ = 'HELLO' /= hello,
+    _ = hello == world,
+
+    %% Handling Maps and Records
+    TestMap = #{a => 1, b => 2, c => 3},
+    #{a := _Value, c := _} = TestMap,
+    _ = TestMap#{d => 4},
+    Record = #test{name = ?TESTMACRO},
+    _ = Record#test.name,
+
+    %% Conditionals
+    case TestMap of
+        #{b := B} ->
+            B;
+        _ ->
+            ok
+    end,
+    if
+        erlang:is_map(TestMap) ->
+            map;
+        true ->
+            test_function(1)
+    end,
+
+    %% Messaging
+    Self = erlang:self(),
+    Self ! hello_world,
+    receive
+        hello_world ->
+            ok;
+        _ ->
+            io:format("unknown message")
+    after 1000 ->
+        timeout
+    end,
+    ok.
+
+test_function(N) when erlang:is_integer(N) -> integer;
+test_function([_|_]) -> list;
+test_function(<<_/binary>>) ->  binary;
+test_function(_) ->
+    undefined.

tests/syntax-tests/highlighted/EtcGroup/test.group

@@ -0,0 +1,67 @@
+root:x:0:root
+sys:x:3:bin
+mem:x:8:
+ftp:x:11:
+mail:x:12:
+log:x:19:
+smmsp:x:25:
+proc:x:26:polkitd
+games:x:50:
+lock:x:54:
+network:x:90:
+floppy:x:94:
+scanner:x:96:
+power:x:98:
+adm:x:999:daemon
+wheel:x:998:username
+kmem:x:997:
+tty:x:5:
+utmp:x:996:
+audio:x:995:mpd,username
+disk:x:994:
+input:x:993:
+kvm:x:992:
+lp:x:991:
+optical:x:990:username
+render:x:989:
+storage:x:988:username
+uucp:x:987:
+video:x:986:username
+users:x:985:
+systemd-journal:x:984:
+rfkill:x:983:
+bin:x:1:daemon
+daemon:x:2:bin
+http:x:33:
+nobody:x:65534:
+dbus:x:81:
+systemd-journal-remote:x:982:
+systemd-network:x:981:
+systemd-resolve:x:980:
+systemd-timesync:x:979:
+systemd-coredump:x:978:
+uuidd:x:68:
+username:x:1000:
+git:x:977:
+avahi:x:976:
+colord:x:975:
+polkitd:x:102:
+mpd:x:45:
+rtkit:x:133:
+transmission:x:169:
+wireshark:x:150:username
+lightdm:x:974:
+geoclue:x:973:
+usbmux:x:140:
+dhcpcd:x:972:
+brlapi:x:971:
+gdm:x:120:
+libvirt:x:970:
+flatpak:x:969:
+gluster:x:968:
+rpc:x:32:
+tor:x:43:
+rslsync:x:967:
+docker:x:966:username
+sambashare:x:1002:username
+named:x:40:

tests/syntax-tests/highlighted/Fish/test.fish

@@ -0,0 +1,77 @@
+set fish_greeting ""
+
+begin
+    set --local AUTOJUMP_PATH $XDG_CONFIG_HOME/fish/functions/autojump.fish
+    if test -e $AUTOJUMP_PATH
+        source $AUTOJUMP_PATH
+    end
+end
+
+fish_vi_key_bindings
+
+
+function fish_prompt
+    set_color brblack
+    echo -n "["(date "+%H:%M")"] "
+    set_color blue
+    echo -n (hostname)
+    if [ $PWD != $HOME ]
+        set_color brblack
+        echo -n ':'
+        set_color yellow
+        echo -n (basename $PWD)
+    end
+    set_color green
+    printf '%s ' (__fish_git_prompt)
+    set_color red
+    echo -n '| '
+    set_color normal
+end
+
+function fish_greeting
+    echo
+    echo -e (uname -ro | awk '{print " \\\\e[1mOS: \\\\e[0;32m"$0"\\\\e[0m"}')
+    echo -e (uptime -p | sed 's/^up //' | awk '{print " \\\\e[1mUptime: \\\\e[0;32m"$0"\\\\e[0m"}')
+    echo -e (uname -n | awk '{print " \\\\e[1mHostname: \\\\e[0;32m"$0"\\\\e[0m"}')
+    echo -e " \\e[1mDisk usage:\\e[0m"
+    echo
+    echo -ne (\
+        df -l -h | grep -E 'dev/(xvda|sd|mapper)' | \
+        awk '{printf "\\\\t%s\\\\t%4s / %4s  %s\\\\n\n", $6, $3, $2, $5}' | \
+        sed -e 's/^\(.*\([8][5-9]\|[9][0-9]\)%.*\)$/\\\\e[0;31m\1\\\\e[0m/' -e 's/^\(.*\([7][5-9]\|[8][0-4]\)%.*\)$/\\\\e[0;33m\1\\\\e[0m/' | \
+        paste -sd ''\
+    )
+    echo
+
+    echo -e " \\e[1mNetwork:\\e[0m"
+    echo
+    # http://tdt.rocks/linux_network_interface_naming.html
+    echo -ne (\
+        ip addr show up scope global | \
+            grep -E ': <|inet' | \
+            sed \
+                -e 's/^[[:digit:]]\+: //' \
+                -e 's/: <.*//' \
+                -e 's/.*inet[[:digit:]]* //' \
+                -e 's/\/.*//'| \
+            awk 'BEGIN {i=""} /\.|:/ {print i" "$0"\\\n"; next} // {i = $0}' | \
+            sort | \
+            column -t -R1 | \
+            # public addresses are underlined for visibility \
+            sed 's/ \([^ ]\+\)$/ \\\e[4m\1/' | \
+            # private addresses are not \
+            sed 's/m\(\(10\.\|172\.\(1[6-9]\|2[0-9]\|3[01]\)\|192\.168\.\).*\)/m\\\e[24m\1/' | \
+            # unknown interfaces are cyan \
+            sed 's/^\( *[^ ]\+\)/\\\e[36m\1/' | \
+            # ethernet interfaces are normal \
+            sed 's/\(\(en\|em\|eth\)[^ ]* .*\)/\\\e[39m\1/' | \
+            # wireless interfaces are purple \
+            sed 's/\(wl[^ ]* .*\)/\\\e[35m\1/' | \
+            # wwan interfaces are yellow \
+            sed 's/\(ww[^ ]* .*\).*/\\\e[33m\1/' | \
+            sed 's/$/\\\e[0m/' | \
+            sed 's/^/\t/' \
+        )
+    echo
+    set_color normal
+end

tests/syntax-tests/highlighted/GLSL/test.glsl

@@ -0,0 +1,42 @@
+#version 330 core
+
+#ifdef TEST
+layout (location = 0) in vec4 vertex;
+#else
+layout (location = 6) in vec4 vertex;
+#endif
+
+out vec2 p_textureVertex;
+
+/*
+ * This stores offsets
+ */
+struct Data
+{
+    double offsetX;
+    double offsetY;
+}
+
+uniform mat4 projectionMatrix;
+uniform bool test;
+uniform Data data;
+
+double calc()
+{
+    if (test)
+    {
+        return 1.0;
+    }
+    else
+    {
+        return 0.0;
+    }
+}
+
+void main()
+{
+    // This GLSL code serves the purpose of bat syntax highlighting tests
+    double x = data.offsetX + calc();
+    gl_Position = projectionMatrix * vec4(vertex.xy, data.offsetX, data.offsetY);
+    p_textureVertex = vertex.zw;
+}

tests/syntax-tests/highlighted/Git Attributes/example.gitattributes

@@ -0,0 +1,16 @@
+#
+# Comment
+
+[attr]binary -diff -merge -text
+
+*          text=auto
+*.c        diff=c
+*.cc       text diff=cpp
+*.o        binary
+*.bat      text eol=crlf
+*.lock     text -diff
+*.*ignore  text
+*.patch    -text
+
+.gitattributes linguist-language=gitattributes
+.gitkeep       export-ignore