build(deps): bump actions/checkout from 6 to 7

Bumps [actions/checkout](https://github.com/actions/checkout) from 6 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Merge pull request #3816 from adnrivera/fix/ignored-suffix-firstline
2026-08-03 18:51:44 +00:00 · 2026-07-01 02:03:45 +00:00 · 2026-07-01 00:40:18 +03:00 · 2026-06-30 12:20:14 -07:00 · 2026-06-28 22:25:36 +03:00 · 2026-06-28 22:15:42 +03:00
100 changed files with 5408 additions and 1693 deletions
@@ -0,0 +1,11 @@
+# On Windows MSVC, statically link the C runtime so that the resulting EXE does
+# not depend on the vcruntime DLL.
+#
+# See: https://github.com/sharkdp/bat/issues/3634
+
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
+[target.i686-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
+[target.aarch64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
@@ -0,0 +1 @@
+use flake
@@ -35,7 +35,7 @@ jobs:
    name: Extract crate metadata
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
    - name: Extract crate information
      id: crate_metadata
      run: |
@@ -58,7 +58,7 @@ jobs:
    - uses: dtolnay/rust-toolchain@stable
      with:
        components: rustfmt,clippy
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
    - run: cargo fmt -- --check
    - run: cargo clippy --locked --all-targets --all-features -- -D warnings

@@ -68,7 +68,7 @@ jobs:
    needs: crate_metadata
    steps:
    - name: Checkout source code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v7
    - name: Install rust toolchain (v${{ needs.crate_metadata.outputs.msrv }})
      uses: dtolnay/rust-toolchain@master
      with:
@@ -80,7 +80,7 @@ jobs:
    name: License checks
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v7
      with:
        submodules: true # we especially want to perform license checks on submodules
    - run: tests/scripts/license-checks.sh
@@ -90,7 +90,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v7
      with:
        submodules: true # we need all syntax and theme submodules
    - name: Install Rust toolchain
@@ -119,7 +119,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v7
    - name: Prepare environment variables
      run: |
        echo "BAT_SYSTEM_CONFIG_PREFIX=$GITHUB_WORKSPACE/tests/examples/system_config" >> $GITHUB_ENV
@@ -135,7 +135,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - name: Git checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v7
    - name: Install Rust toolchain
      uses: dtolnay/rust-toolchain@stable
    - name: Check documentation
@@ -150,7 +150,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - run: cargo install cargo-audit --locked
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
      - run: cargo audit

  build:
@@ -161,12 +161,12 @@ jobs:
      fail-fast: false
      matrix:
        job:
-          - { target: aarch64-unknown-linux-musl  , os: ubuntu-latest , dpkg_arch: arm64,            use-cross: true }
+          - { target: aarch64-unknown-linux-musl  , os: ubuntu-latest , dpkg_arch: musl-linux-arm64, use-cross: true }
          - { target: aarch64-unknown-linux-gnu   , os: ubuntu-latest , dpkg_arch: arm64,            use-cross: true }
          - { target: arm-unknown-linux-gnueabihf , os: ubuntu-latest , dpkg_arch: armhf,            use-cross: true }
          - { target: arm-unknown-linux-musleabihf, os: ubuntu-latest , dpkg_arch: musl-linux-armhf, use-cross: true }
          - { target: i686-pc-windows-msvc        , os: windows-2025  ,                                              }
-          - { target: i686-unknown-linux-gnu      , os: ubuntu-latest , dpkg_arch: i686,             use-cross: true }
+          - { target: i686-unknown-linux-gnu      , os: ubuntu-latest , dpkg_arch: i386,             use-cross: true }
          - { target: i686-unknown-linux-musl     , os: ubuntu-latest , dpkg_arch: musl-linux-i686,  use-cross: true }
          - { target: x86_64-apple-darwin         , os: macos-15-intel,                                              }
          - { target: aarch64-apple-darwin        , os: macos-latest  ,                                              }
@@ -178,7 +178,7 @@ jobs:
      BUILD_CMD: cargo
    steps:
    - name: Checkout source code
-      uses: actions/checkout@v5
+      uses: actions/checkout@v7

    - name: Install prerequisites
      shell: bash
@@ -195,9 +195,7 @@ jobs:

    - name: Install cross
      if: matrix.job.use-cross
-      uses: taiki-e/install-action@v2
-      with:
-        tool: cross
+      run: cargo install cross --git https://github.com/cross-rs/cross --rev 588b3c99db52b5a9c5906fab96cfadcf1bde7863

    - name: Overwrite build command env variable
      if: matrix.job.use-cross
@@ -335,7 +333,7 @@ jobs:

        DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}
        DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }}-musl
-        case ${{ matrix.job.target }} in *-musl) DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-musl ; DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }} ;; esac;
+        case ${{ matrix.job.target }} in *-musl*) DPKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-musl ; DPKG_CONFLICTS=${{ needs.crate_metadata.outputs.name }} ;; esac;
        DPKG_VERSION=${{ needs.crate_metadata.outputs.version }}
        DPKG_ARCH="${{ matrix.job.dpkg_arch }}"
        DPKG_NAME="${DPKG_BASENAME}_${DPKG_VERSION}_${DPKG_ARCH}.deb"
@@ -13,7 +13,7 @@ jobs:
      PR_NUMBER: ${{ github.event.number }}
      PR_BASE: ${{ github.base_ref }}
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
      - name: Fetch PR base
        run: git fetch --no-tags --prune --depth=1 origin

@@ -1,6 +1,11 @@
+.direnv/
 /target/
 **/*.rs.bk

+# Editors
+.idea/
+.vscode/
+
 # Generated files
 /assets/completions/_bat.ps1
 /assets/completions/bat.bash
@@ -8,3 +13,5 @@
 /assets/completions/bat.zsh
 /assets/manual/bat.1
 /assets/metadata.yaml
+
+
@@ -49,9 +49,6 @@
 [submodule "assets/themes/zenburn"]
 	path = assets/themes/zenburn
 	url = https://github.com/colinta/zenburn.git
-[submodule "assets/syntaxes/Kotlin"]
-	path = assets/syntaxes/02_Extra/Kotlin
-	url = https://github.com/vkostyukov/kotlin-sublime-package
 [submodule "assets/syntaxes/Elm"]
 	path = assets/syntaxes/02_Extra/Elm
 	url = https://github.com/elm-community/SublimeElmLanguageSupport
@@ -130,7 +127,7 @@
 	url = https://github.com/djuretic/SublimeStrace
 [submodule "assets/syntaxes/Jinja2"]
 	path = assets/syntaxes/02_Extra/Jinja2
-	url = https://github.com/Martin819/sublime-jinja2
+	url = https://github.com/ltrzesniewski/sublime-jinja2.git
 [submodule "assets/syntaxes/SLS"]
 	path = assets/syntaxes/02_Extra/SLS
 	url = https://github.com/saltstack/sublime-text
@@ -196,16 +193,13 @@
 	url = https://github.com/leanprover/vscode-lean4.git
 [submodule "assets/syntaxes/02_Extra/Zig"]
 	path = assets/syntaxes/02_Extra/Zig
-	url = https://github.com/ziglang/sublime-zig-language.git
+	url = https://codeberg.org/ziglang/sublime-zig-language.git
 [submodule "assets/syntaxes/02_Extra/gnuplot"]
 	path = assets/syntaxes/02_Extra/gnuplot
 	url = https://github.com/hesstobi/sublime_gnuplot
 [submodule "assets/syntaxes/02_Extra/SystemVerilog"]
 	path = assets/syntaxes/02_Extra/SystemVerilog
 	url = https://github.com/TheClams/SystemVerilog.git
-[submodule "assets/themes/visual-studio-dark-plus"]
-	path = assets/themes/visual-studio-dark-plus
-	url = https://github.com/vidann1/visual-studio-dark-plus.git
 [submodule "assets/syntaxes/02_Extra/SublimeEthereum"]
 	path = assets/syntaxes/02_Extra/SublimeEthereum
 	url = https://github.com/davidhq/SublimeEthereum.git
@@ -281,3 +275,12 @@
 [submodule "assets/syntaxes/02_Extra/Gomod"]
 	path = assets/syntaxes/02_Extra/Gomod
 	url = https://github.com/mitranim/sublime-gomod
+[submodule "assets/syntaxes/02_Extra/COBOL"]
+	path = assets/syntaxes/02_Extra/COBOL
+	url = https://github.com/adukhan99/sublime_cobol.git
+[submodule "assets/syntaxes/02_Extra/Kotlin"]
+	path = assets/syntaxes/02_Extra/Kotlin
+	url = https://github.com/guille/sublime-kotlin
+[submodule "assets/syntaxes/02_Extra/Caddy"]
+	path = assets/syntaxes/02_Extra/Caddy
+	url = https://github.com/caddyserver/sublimetext.git
@@ -1,3 +1,84 @@
+# unreleased
+
+
+## Other
+
+- Add instructions for removing fish help abbreviations to README, see #3655 (@claw-explorer). Closes #3536
+- Add .NET slnx extension, see #3682 (@ltrzesniewski)
+
+## Features
+
+- Map justfile, Justfile, .justfile, and *.justfile to Makefile syntax highlighting, see #3623 (@zachvalenta)
+- Preserve `--diff` change markers and snip separators when `--plain` is set. Closes #3630, see #3643 (@mvanhorn)
+- Added support for `hidden_file_extensions` from `.sublime-syntax` files, see #3613 (@Matei02355)
+- Add word wrapping mode via `--wrap=word`, see #3597 (@veeceey)
+- Support configuring `--terminal-width` via `BAT_WIDTH`, see #3679 (@officialasishkumar)
+- Implement `--unbuffered` mode for streaming input, allowing partial lines to display immediately (e.g. `tail -f | bat -u`). Closes #3555, see #3583 (@mainnebula)
+- Added an initial `flake.nix` for a ready made development environment; see #3578 (@vorburger)
+- Add `--quiet-empty` (`-E`) flag to suppress output when input is empty. Closes #1936, see #3563 (@NORMAL-EX)
+- Improve native man pages and command help syntax highlighting by stripping overstriking, see #3517 (@akirk)
+- Add `--fallback-syntax`/`--fallback-language` to apply syntax highlighting only when auto-detection fails, see #1341 (@Xavrir)
+- Map `BUILD` case sensitively to Python (Starlark) for Bazel, see #3576 (@vorburger)
+- Syntax highlighting for Python files using uv as script runner in shebang #3689 (@janlarres)
+
+## Bugfixes
+- Fix `--ignored-suffix` not falling back to first-line/shebang detection when the ignored suffix is also a registered extension (e.g. `--ignored-suffix .txt` on a shebang script), see #2745 and #3816 (@adnrivera)
+- Fix `capacity overflow` panic when printing a snip separator at `--terminal-width=1` with multiple line ranges. Closes #3803, see #3804 (@leeewee)
+- Pass `--no-paging` to `bat` invocations inside the bash / zsh / fish / PowerShell shell completion scripts so that shell-level pager wiring (e.g. `LESSOPEN='|-bat -f -pp %s'`) cannot inject ANSI escape sequences into the completion candidates. Closes #3760 (@mvanhorn)
+- Quote filenames before substituting them into `$LESSOPEN` / `$LESSCLOSE` templates, preventing shell injection when a filename contains shell metacharacters, see #3726 (@curious-rabbit)
+- Fix `--list-themes` unconditionally probing the terminal via OSC 10/11 even when `--theme` was set to an explicit value, see #3700 (regression introduced in bc42149a). (@optimistiCli)
+- Fix inverted `$LESSCLOSE` warning so bat warns on nonzero exit, not on success. See #3654 (@cuiweixie)
+- Sanitize control characters in filenames before displaying them in the file header, error messages, and the terminal title, preventing ANSI escape injection via crafted filenames. Closes #3054, see #3691 (@curious-rabbit)
+- Report initial input read errors instead of treating them as empty input. Closes #3002, see #3706 (@lawrence3699)
+- Treat ZIP archives as binary content based on their magic header, see #3686 (@officialasishkumar)
+- Fix i686 `.deb` package using incorrect architecture name (`i686` instead of `i386`), preventing installation on Debian. Closes #3611, see #3650 (@Sim-hu)
+- Fix inconsistent `.deb` MUSL package names (aarch64-musl used `arm64` instead of `musl-linux-arm64`, and `musleabihf` target missed `bat-musl` prefix). Closes #3482, see #3642 (@mvanhorn)
+- Fix incorrect text width computation when using `--binary=as-text` with non-printable characters in caret notation, see #3640 and #3631 (@eyupcanakman)
+- Fix `BAT_CONFIG_DIR` pointing at system config directory causing duplicate flag errors. Closes #3589, see #3620 (@Xavrir)
+- Fix syntax highlighting for symlinked files when the symlink name has no extension but the target does. Closes #1001, see #3621 (@Xavrir)
+- Report error when pager is missing instead of silently falling back, see #3588 (@IMaloney)
+- Fix `--wrap=never` and `-S` flags being ignored when piping to pager, see #3592 (@IMaloney)
+- Fix crash with BusyBox `less` on Windows, see #3527 (@Anchal-T)
+- Fix `bat cache --help` failing with 'unexpected argument' error, see #3580 and #3560 (@NORMAL-EX)
+- `--help` now correctly honors `--pager=builtin`. See #3516 (@keith-hall)
+- `--help` now correctly honors custom themes. See #3524 (@keith-hall)
+- Fixed test compatibility with future Cargo build directory changes, see #3550 (@nmacl)
+- Fixed bug caused by using `--plain` and `--terminal-width=N` flags simultaneously, see #3529 (@H4k1l)
+- Fixed syntax tests path, see #3610 (@foxfromworld)
+- Fix zsh tab completion word-splitting language names containing spaces (e.g. `HTML (Jinja2)`, `Apache Conf`), see #3693 (@YoshKoz)
+- Fix zsh tab completion offering invalid `-l` arguments (file globs, paths, hidden filenames) sourced from the second column of `--list-languages`. Closes #3735, see #3737 (@truffle-dev)
+- Fix `usize` underflow in `--list-languages` when `--terminal-width` is smaller than the longest language name, see #3812 (@greymoth-jp)
+
+## Other
+- Use git version of cross. See #3533 (@OctopusET)
+- Bump MSRV to 1.88, update `time` crate to 0.3.47 to fix RUSTSEC-2026-0009, see #3581 (@NORMAL-EX)
+- Allow home and end keys to be used with builtin pager, see #3651 (@keith-hall)
+- Builtin syntax mapping: cleanup matcher glob parsing logic #3652 (@cyqsimon)
+- Statically link the CRT for MSVC builds via Cargo config to avoid runtime DLL dependencies. Closes #3634, see #3692 (@barry3406)
+- Replace `libgit2` with a pure Rust implementation of git called `gitoxide`, see PR #3703 (@blinxen)
+
+## Syntaxes
+
+- Add shebang-based detection for Tcl (`tclsh`, `wish`) and Expect (`expect`) scripts, see #3647 (@mvanhorn)
+- Change the URL of Zig submodule from GitHub to Codeberg, see #3519 (@sorairolake)
+- Don't color strings inside CSV files, to make it easier to tell which column they belong to, see #3521 (@keith-hall)
+- Add syntax highlighting support for COBOL, see #3584 (@adukhan99)
+- Fixed manpage syntax so that ANSI escape codes don't get incorrectly highlighted and thus broken, see #3586 (@BlueElectivire)
+- Map several Google Cloud CLI config files to their appropriate syntax #3635 (@victor-gp)
+- Map all ignore dotfiles to Git Ignore syntax #3636 (@victor-gp)
+- Improved Kotlin syntax, see #3699 (@guille)
+- Include subdirectories in SSH Config syntax mapping, see #3758 (@injust)
+- Add Ghostty syntax mapping, see #3759 (@injust)
+- Add syntax highlighting for `Caddyfile` #3789 (@CosmicHorrorDev)
+- Include `.code-workspace` as a JSON extension #3809 (@dhruvkb)
+- Add syntax mapping for DNF repo configuration files, see #3814 (@injust)
+
+## Themes
+
+- Remove the Visual Studio Dark+ theme, see #3552 (@CosmicHorrorDev)
+
+## `bat` as a library
+
 # v0.26.1

 ## Features
@@ -68,6 +68,8 @@ users, please read the corresponding
 [documentation](https://github.com/sharkdp/bat/blob/master/doc/assets.md)
 first.

+To map a file name pattern to an existing syntax, read [the documentation here](https://github.com/sharkdp/bat/blob/master/src/syntax_mapping/builtins/README.md).
+
 Note: We are currently not accepting new default themes.


@@ -91,3 +93,29 @@ To learn how to write regression tests for theme and syntax changes, read the
 [Syntax
 tests](https://github.com/sharkdp/bat/blob/master/doc/assets.md#syntax-tests)
 section in `assets.md`.
+
+### Ensuring bat is available for Syntax tests
+
+The syntax test script (`tests/syntax-tests/update.sh`) calls `bat` from your PATH and regenerates the highlighted output files under
+`tests/syntax-tests/highlighted/`. These files are used to verify that syntax highlighting works as expected.
+
+- If you only built the binaries with:
+  ```bash
+  cargo build --bins
+  ```
+
+  you need to add the debug build to your PATH from the bat project root before running the tests.
+  See also step 5 in [Syntax
+tests](https://github.com/sharkdp/bat/blob/master/doc/assets.md#syntax-tests) for related instructions.
+  ```bash
+  export PATH="$PATH:$(pwd)/target/debug"
+  ```
+  Otherwise, you will see:
+  ```bash
+  Error: Could not execute 'bat'. Please make sure that the executable is available on the PATH.
+  ```
+- If you installed bat with:
+  ```bash
+  cargo install --path . --locked
+  ```
+  then bat will be available in ~/.cargo/bin (usually already in PATH), and the tests will run without issues.
@@ -11,7 +11,7 @@ exclude = ["assets/syntaxes/*", "assets/themes/*"]
 build = "build/main.rs"
 edition = '2021'
 # You are free to bump MSRV as soon as a reason for bumping emerges.
-rust-version = "1.87"
+rust-version = "1.88"

 [features]
 default = ["application", "git"]
@@ -31,8 +31,7 @@ minimal-application = [
    "regex-onig",
    "wild",
 ]
-git = ["git2"] # Support indicating git modifications
-vendored-libgit2 = ["git2/vendored-libgit2"]
+git = ["gix"] # Support indicating git modifications
 paging = [ "shell-words", "grep-cli", "minus"] # Support applying a pager on the output
 lessopen = ["execute"] # Support $LESSOPEN preprocessor
 build-assets = ["syntect/yaml-load", "syntect/plist-load", "regex", "walkdir"]
@@ -42,21 +41,21 @@ regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
 regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine

 [dependencies]
-nu-ansi-term = "0.50.0"
+nu-ansi-term = "0.50.3"
 ansi_colours = "^1.2"
 bincode = "1.0"
-console = "0.16.0"
+console = "0.16.2"
 flate2 = "1.1"
 once_cell = "1.20"
 thiserror = "2.0"
 wild = { version = "2.2", optional = true }
 content_inspector = "0.2.4"
-shell-words = { version = "1.1.0", optional = true }
-minus = { version = "5.6", optional = true, features = [
+shell-words = { version = "1.1.1", optional = true }
+minus = { version = "5.7", optional = true, features = [
  "dynamic_output",
  "search",
 ] }
-unicode-width = "0.2.1"
+unicode-width = "0.2.2"
 globset = "0.4"
 serde = "1.0"
 serde_derive = "1.0"
@@ -64,22 +63,23 @@ serde_yaml = "0.9.28"
 semver = "1.0"
 path_abs = { version = "0.5", default-features = false }
 clircle = { version = "0.6.1", default-features = false }
-bugreport = { version = "0.5.0", optional = true }
+bugreport = { version = "0.6.0", optional = true }
 etcetera = { version = "0.11.0", optional = true }
-grep-cli = { version = "0.1.11", optional = true }
-regex = { version = "1.12.2", optional = true }
+grep-cli = { version = "0.1.12", optional = true }
+regex = { version = "1.12.3", optional = true }
 walkdir = { version = "2.5", optional = true }
-bytesize = { version = "1.3.0" }
+bytesize = { version = "2.3.1" }
 encoding_rs = "0.8.35"
-execute = { version = "0.2.13", optional = true }
+execute = { version = "0.2.15", optional = true }
 terminal-colorsaurus = "1.0"
-unicode-segmentation = "1.12.0"
+unicode-segmentation = "1.13.2"
 itertools = "0.14.0"

-[dependencies.git2]
-version = "0.20"
+[dependencies.gix]
+version = "0.85"
 optional = true
 default-features = false
+features = ["sha1", "blob-diff"]

 [dependencies.syntect]
 version = "5.3.0"
@@ -87,43 +87,43 @@ default-features = false
 features = ["parsing"]

 [dependencies.clap]
-version = "4.5.46"
+version = "4.6.1"
 optional = true
 features = ["wrap_help", "cargo"]

 [target.'cfg(target_os = "macos")'.dependencies]
-plist = "1.7.0"
+plist = "1.9.0"

 [dev-dependencies]
-assert_cmd = "2.0.12"
+assert_cmd = "2.0.16"
 expect-test = "1.5.0"
 serial_test = { version = "2.0.0", default-features = false }
-predicates = "3.1.3"
+predicates = "3.1.4"
 wait-timeout = "0.2.1"
-tempfile = "3.16.0"
+tempfile = "3.27.0"
 serde = { version = "1.0", features = ["derive"] }

 [target.'cfg(unix)'.dev-dependencies]
-nix = { version = "0.30", default-features = false, features = ["term"] }
+nix = { version = "0.31", default-features = false, features = ["term"] }

 [build-dependencies]
 anyhow = "1.0.97"
-indexmap = { version = "2.8.0", features = ["serde"] }
+indexmap = { version = "2.14.0", features = ["serde"] }
 itertools = "0.14.0"
 once_cell = "1.20"
 prettyplease = "0.2.37"
-proc-macro2 = "1.0.95"
-quote = "1.0.40"
-regex = "1.12.2"
+proc-macro2 = "1.0.106"
+quote = "1.0.45"
+regex = "1.12.3"
 serde = "1.0"
 serde_derive = "1.0"
-serde_with = { version = "3.15.1", default-features = false, features = ["macros"] }
+serde_with = { version = "3.17.0", default-features = false, features = ["macros"] }
 syn = { version = "2.0.104", features = ["full"] }
-toml = { version = "0.9.1", features = ["preserve_order"] }
+toml = { version = "1.1.1", features = ["preserve_order"] }
 walkdir = "2.5"

 [build-dependencies.clap]
-version = "4.5.46"
+version = "4.6.1"
 optional = true
 features = ["wrap_help", "cargo"]

@@ -19,26 +19,6 @@
  [<a href="doc/README-ru.md">Русский</a>]
 </p>

-### Sponsors
-
-A special *thank you* goes to our biggest <a href="doc/sponsors.md">sponsors</a>:<br>
-
-<p>
-<a href="https://www.warp.dev/bat">
-  <img src="doc/sponsors/warp-logo.png" width="200" alt="Warp">
-  <br>
-  <strong>Warp, the intelligent terminal</strong>
-  <br>
-  <sub>Available on MacOS, Linux, Windows</sub>
-</a>
-</p><p>
-<a href="https://graphite.dev/?utm_source=github&utm_medium=repo&utm_campaign=bat">
-  <img src="doc/sponsors/graphite-logo.jpeg" width="200" alt="Graphite">
-  <br>
-  <strong>Graphite is the AI developer productivity platform helping<br>teams on GitHub ship higher quality software, faster</strong>
-</a>
-</p>
-
 ### Syntax highlighting

 `bat` supports syntax highlighting for a large number of programming and markup
@@ -49,7 +29,7 @@ languages:
 ### Git integration

 `bat` communicates with `git` to show modifications with respect to the index
-(see left side bar):
+(see left sidebar):

 ![Git integration example](https://i.imgur.com/2lSW4RE.png)

@@ -201,30 +181,19 @@ bat main.cpp | xclip
 `MANPAGER` environment variable:

 ```bash
-export MANPAGER="sh -c 'awk '\''{ gsub(/\x1B\[[0-9;]*m/, \"\", \$0); gsub(/.\x08/, \"\", \$0); print }'\'' | bat -p -lman'"
+export MANPAGER="bat -plman"
 man 2 select
 ```
-(replace `bat` with `batcat` if you are on Debian or Ubuntu)
+(on some older Debian or Ubuntu releases, the executable is named `batcat` instead of `bat`)

 If you prefer to have this bundled in a new command, you can also use [`batman`](https://github.com/eth-p/bat-extras/blob/master/doc/batman.md).

-> [!WARNING]  
-> This will [not work](https://github.com/sharkdp/bat/issues/1145) out of the box with Mandoc's `man` implementation.
->
-> Please either use `batman`, or convert the shell script to a [shebang executable](https://en.wikipedia.org/wiki/Shebang_(Unix)) and point `MANPAGER` to that.
-
 Note that the [Manpage syntax](assets/syntaxes/02_Extra/Manpage.sublime-syntax) is developed in this repository and still needs some work.

 #### `prettier` / `shfmt` / `rustfmt`

 The [`prettybat`](https://github.com/eth-p/bat-extras/blob/master/doc/prettybat.md) script is a wrapper that will format code and print it with `bat`.

-#### `Warp`
-
-<a href="https://app.warp.dev/drive/folder/-Bat-Warp-Pack-lxhe7HrEwgwpG17mvrFSz1">
-  <img src="doc/sponsors/warp-pack-header.png" alt="Warp">
-</a>
-
 #### Highlighting `--help` messages

 You can use `bat` to colorize help text: `$ cp --help | bat -plhelp`
@@ -257,6 +226,14 @@ abbr -a --position anywhere -- -h '-h | bat -plhelp'

 This way, you can keep on using `cp --help`, but get colorized help pages.

+> [!TIP]
+> To remove these abbreviations later, run:
+> ```fish
+> abbr -e -- --help
+> abbr -e -- -h
+> ```
+> The `--` before the abbreviation name is required because `--help` and `-h` start with dashes, which would otherwise be interpreted as flags to `abbr` itself.
+
 Be aware that in some cases, `-h` may not be a shorthand of `--help` (for example with `ls`). In cases where you need to use `-h` 
 as a command argument you can prepend `\` to the argument (eg. `ls \-h`) to escape the aliasing defined above. 

@@ -287,8 +264,8 @@ If your Ubuntu/Debian installation is new enough you can simply run:
 sudo apt install bat
 ```

-**Important**: If you install `bat` this way, please note that the executable may be installed as `batcat` instead of `bat` (due to [a name
-clash with another package](https://github.com/sharkdp/bat/issues/982)). You can set up a `bat -> batcat` symlink or alias to prevent any issues that may come up because of this and to be consistent with other distributions:
+**Important**: On some older Ubuntu/Debian releases, the executable is installed as `batcat` instead of `bat` (due to [a name
+clash with another package](https://github.com/sharkdp/bat/issues/982)). On newer releases, the executable is available as `bat`. If `bat --version` does not work after installation, try `batcat --version` instead. You can set up a `bat -> batcat` symlink or alias to prevent any issues that may come up because of this and to be consistent with other distributions:
 ``` bash
 mkdir -p ~/.local/bin
 ln -s /usr/bin/batcat ~/.local/bin/bat
@@ -330,7 +307,7 @@ pacman -S bat

 ### On Fedora

-You can install [the `bat` package](https://koji.fedoraproject.org/koji/packageinfo?packageID=27506) from the official [Fedora Modular](https://docs.fedoraproject.org/en-US/modularity/using-modules/) repository.
+You can install [the `bat` package](https://packages.fedoraproject.org/pkgs/rust-bat/bat/) from the official sources:

 ```bash
 dnf install bat
@@ -530,6 +507,30 @@ and line numbers but no grid and no file header. Set the `BAT_STYLE` environment
 variable to make these changes permanent or use `bat`'s
 [configuration file](#configuration-file).

+By default, `bat` enables `changes`, `grid`, `header-filename`, `numbers`, and `snip`.
+
+The available pre-defined styles are:
+
+| Style | Description |
+|-------|-------------|
+| `default` | Enables the recommended style components listed above. |
+| `full` | Enables all available components. |
+| `auto` | Same as `default`, unless the output is piped. |
+| `plain` | Disables all available components. |
+
+The available individual components are:
+
+| Component | Description |
+|-----------|-------------|
+| `changes` | Show Git modification markers. |
+| `header` | Alias for `header-filename`. |
+| `header-filename` | Show filenames before the content. |
+| `header-filesize` | Show file sizes before the content. |
+| `grid` | Vertical/horizontal lines to separate the side bar and header from the content. |
+| `rule` | Horizontal lines to delimit files. |
+| `numbers` | Show line numbers in the side bar. |
+| `snip` | Draw separation lines between distinct line ranges. |
+
 >[!tip]
 > If you specify a default style in `bat`'s config file, you can change which components
 > are displayed during a single run of `bat` using the `--style` command-line argument.
@@ -592,7 +593,8 @@ syntax:

 This works very similar to how we add new syntax definitions.
 > [!NOTE]
-> Themes are stored in [`.tmTheme` files](https://www.sublimetext.com/docs/color_schemes_tmtheme.html).
+> Custom themes must be stored in [`.tmTheme` files](https://www.sublimetext.com/docs/color_schemes_tmtheme.html).
+> Newer `.sublime-color-scheme` files are currently not supported.

 First, create a folder with the new syntax highlighting themes:
 ```bash
@@ -9,17 +9,17 @@ Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -Script
    $ArrayCompletion = @('bash', 'fish', 'zsh', 'ps1')
    $ArrayWhen       = @('auto', 'never', 'always')
    $ArrayYesNo      = @('never', 'always')
-    $ArrayWrap       = @('always', 'never', 'character')
+    $ArrayWrap       = @('always', 'never', 'character', 'word')
    $ArrayBinary     = @('no-printing', 'as-text')
    $ArrayPrint      = @('unicode', 'caret')

    function Get-MyThemes(){
-        $themes = {{PROJECT_EXECUTABLE}} --list-themes | ForEach-Object {$_  -replace "^(.*)$", '''$1'''} | select-object
+        $themes = {{PROJECT_EXECUTABLE}} --no-paging --list-themes | ForEach-Object {$_  -replace "^(.*)$", '''$1'''} | select-object
        return $themes
    }

    function Get-MyLanguages(){
-        $themes = {{PROJECT_EXECUTABLE}} --list-languages | ForEach-Object{[pscustomobject]@{MyParameter=$_.Substring(0,$_.IndexOf(":")).Trim();MyDescription=$_.Substring($_.IndexOf(":")+1)}} | select-object
+        $themes = {{PROJECT_EXECUTABLE}} --no-paging --list-languages | ForEach-Object{[pscustomobject]@{MyParameter=$_.Substring(0,$_.IndexOf(":")).Trim();MyDescription=$_.Substring($_.IndexOf(":")+1)}} | select-object
        return $themes
    }

@@ -135,7 +135,7 @@ Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -Script
            [CompletionResult]::new('--file-name'             , 'file-name'             , [CompletionResultType]::ParameterName, 'Specify the name to display for a file.')
            [CompletionResult]::new('--diff-context'          , 'diff-context'          , [CompletionResultType]::ParameterName, 'diff-context')
            [CompletionResult]::new('--tabs'                  , 'tabs'                  , [CompletionResultType]::ParameterName, 'Set the tab width to T spaces.')
-            [CompletionResult]::new('--wrap'                  , 'wrap'                  , [CompletionResultType]::ParameterName, 'Specify the text-wrapping mode (*auto*, character).')
+            [CompletionResult]::new('--wrap'                  , 'wrap'                  , [CompletionResultType]::ParameterName, 'Specify the text-wrapping mode (*auto*, never, character, word).')
            [CompletionResult]::new('--terminal-width'        , 'terminal-width'        , [CompletionResultType]::ParameterName, 'Explicitly set the width of the terminal instead of determining it automatically. If prefixed with ''+'' or ''-'', the value will be treated as an offset to the actual terminal width. See also: ''--wrap''.')
            [CompletionResult]::new('--color'                 , 'color'                 , [CompletionResultType]::ParameterName, 'When to use colors (*auto*, never, always).')
            [CompletionResult]::new('--italic-text'           , 'italic-text'           , [CompletionResultType]::ParameterName, 'Use italics in output (always, *never*)')
@@ -173,7 +173,7 @@ Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -Script
        #   [CompletionResult]::new('-L'                      , 'L'                     , [CompletionResultType]::ParameterName, 'Display all supported languages.')
            [CompletionResult]::new('--list-languages'        , 'list-languages'        , [CompletionResultType]::ParameterName, 'Display all supported languages.')
        #   [CompletionResult]::new('-u'                      , 'u'                     , [CompletionResultType]::ParameterName, 'u')
-            [CompletionResult]::new('--unbuffered'            , 'unbuffered'            , [CompletionResultType]::ParameterName, 'unbuffered')
+            [CompletionResult]::new('--unbuffered'            , 'unbuffered'            , [CompletionResultType]::ParameterName, 'Enable unbuffered input reading for streaming use cases')
            [CompletionResult]::new('--completion'            , 'completion'            , [CompletionResultType]::ParameterName, 'Show shell completion for a certain shell. [possible values: bash, fish, zsh, ps1]')
            [CompletionResult]::new('--no-config'             , 'no-config'             , [CompletionResultType]::ParameterName, 'Do not use the configuration file')
            [CompletionResult]::new('--no-custom-assets'      , 'no-custom-assets'      , [CompletionResultType]::ParameterName, 'Do not load custom assets')
@@ -186,6 +186,7 @@ Register-ArgumentCompleter -Native -CommandName '{{PROJECT_EXECUTABLE}}' -Script
            [CompletionResult]::new('--acknowledgements'      , 'acknowledgements'      , [CompletionResultType]::ParameterName, 'Show acknowledgements.')
            [CompletionResult]::new('--set-terminal-title'    , 'set-terminal-title'    , [CompletionResultType]::ParameterName, 'Sets terminal title to filenames when using a pager.')
            [CompletionResult]::new('--diagnostic'            , 'diagnostic'            , [CompletionResultType]::ParameterName, 'Show diagnostic information for bug reports.')
+            [CompletionResult]::new('--quiet-empty'           , 'quiet-empty'           , [CompletionResultType]::ParameterName, 'Do not produce any output when the input is empty.')
        #   [CompletionResult]::new('-h'                      , 'h'                     , [CompletionResultType]::ParameterName, 'Print this help message.')
            [CompletionResult]::new('--help'                  , 'help'                  , [CompletionResultType]::ParameterName, 'Print this help message.')
        #   [CompletionResult]::new('-V'                      , 'V'                     , [CompletionResultType]::ParameterName, 'Show version information.')
@@ -80,7 +80,7 @@ _bat() {
 	-l | --language)
 		local IFS=$'\n'
 		COMPREPLY=($(compgen -W "$(
-			"$1" --list-languages | while IFS=: read -r lang _; do
+			"$1" --no-paging --list-languages | while IFS=: read -r lang _; do
 				printf "%s\n" "$lang"
 			done
 		)" -- "$cur"))
@@ -100,6 +100,7 @@ _bat() {
 	--lessopen | \
 	--no-paging | \
 	--diagnostic | \
+	--quiet-empty | \
 	--acknowledgements | \
 	-h | --help | \
 	-V | --version | \
@@ -116,7 +117,7 @@ _bat() {
 		return 0
 		;;
 	--wrap)
-		COMPREPLY=($(compgen -W "auto never character" -- "$cur"))
+		COMPREPLY=($(compgen -W "auto never character word" -- "$cur"))
 		return 0
 		;;
 	--binary)
@@ -149,14 +150,14 @@ _bat() {
 		;;
 	--theme)
 		local IFS=$'\n'
-		COMPREPLY=($(compgen -W "auto${IFS}auto:always${IFS}auto:system${IFS}dark${IFS}light${IFS}$("$1" --list-themes)" -- "$cur"))
+		COMPREPLY=($(compgen -W "auto${IFS}auto:always${IFS}auto:system${IFS}dark${IFS}light${IFS}$("$1" --no-paging --list-themes)" -- "$cur"))
 		__bat_escape_completions
 		return 0
 		;;
 	--theme-dark | \
 	--theme-light)
 		local IFS=$'\n'
-		COMPREPLY=($(compgen -W "$("$1" --list-themes)" -- "$cur"))
+		COMPREPLY=($(compgen -W "$("$1" --no-paging --list-themes)" -- "$cur"))
 		__bat_escape_completions
 		return 0
 		;;
@@ -189,8 +190,8 @@ _bat() {
 	$split && return 0

 	if [[ $cur == -* ]]; then
-		# --unbuffered excluded intentionally (no-op)
 		COMPREPLY=($(compgen -W "
+			--unbuffered
 			--show-all
 			--nonprintable-notation
 			--binary
@@ -227,6 +228,7 @@ _bat() {
 			--lessopen
 			--completion
 			--diagnostic
+			--quiet-empty
 			--acknowledgements
 			--set-terminal-title
 			--help
@@ -15,11 +15,11 @@ function __bat_complete_files -a token
 end

 function __bat_complete_one_language -a comp
-    command $bat --list-languages | string split -f1 : | string match -e "$comp"
+    command $bat --no-paging --list-languages | string split -f1 : | string match -e "$comp"
 end

 function __bat_complete_list_languages
-    for spec in (command $bat --list-languages)
+    for spec in (command $bat --no-paging --list-languages)
        set -l name (string split -f1 : $spec)
        for ext in (string split -f2 : $spec | string split ,)
            test -n "$ext"; or continue
@@ -61,7 +61,7 @@ function __bat_no_excl_args
        -s V -l version \
        -l acknowledgements \
        -l config-dir -l config-file \
-        -l diagnostic \
+        -l diagnostic -l quiet-empty \
        -l list-languages -l list-themes
 end

@@ -118,6 +118,7 @@ set -l wrap_opts '
    auto\tdefault
    never\t
    character\t
+    word\t
 '

 # While --tabs theoretically takes any number, most people should be OK with these.
@@ -159,6 +160,7 @@ complete -c $bat -l config-file -f -d "Display location of configuration file" -
 complete -c $bat -l decorations -x -a "$decorations_opts" -d "When to use --style decorations" -n __bat_no_excl_args

 complete -c $bat -l diagnostic -d "Print diagnostic info for bug reports" -n __fish_is_first_arg
+complete -c $bat -l quiet-empty -d "Do not produce any output when the input is empty" -n __fish_is_first_arg

 complete -c $bat -s d -l diff -d "Only show lines with Git changes" -n __bat_no_excl_args

@@ -232,13 +234,13 @@ complete -c $bat -l tabs -x -a "$tabs_opts" -d "Set tab width" -n __bat_no_excl_

 complete -c $bat -l terminal-width -x -d "Set terminal <width>, +<offset>, or -<offset>" -n __bat_no_excl_args

-complete -c $bat -l theme -x -a "$special_themes(command $bat --list-themes | command cat)" -d "Set the syntax highlighting theme" -n __bat_no_excl_args
+complete -c $bat -l theme -x -a "$special_themes(command $bat --no-paging --list-themes | command cat)" -d "Set the syntax highlighting theme" -n __bat_no_excl_args

-complete -c $bat -l theme-dark -x -a "(command $bat --list-themes | command cat)" -d "Set the syntax highlighting theme for dark backgrounds" -n __bat_no_excl_args
+complete -c $bat -l theme-dark -x -a "(command $bat --no-paging --list-themes | command cat)" -d "Set the syntax highlighting theme for dark backgrounds" -n __bat_no_excl_args

-complete -c $bat -l theme-light -x -a "(command $bat --list-themes | command cat)" -d "Set the syntax highlighting theme for light backgrounds" -n __bat_no_excl_args
+complete -c $bat -l theme-light -x -a "(command $bat --no-paging --list-themes | command cat)" -d "Set the syntax highlighting theme for light backgrounds" -n __bat_no_excl_args

-complete -c $bat -s u -l unbuffered -d "This option exists for POSIX-compliance reasons" -n __bat_no_excl_args
+complete -c $bat -s u -l unbuffered -d "Enable unbuffered input reading for streaming use cases" -n __bat_no_excl_args

 complete -c $bat -s V -l version -f -d "Show version information" -n __fish_is_first_arg

@@ -34,7 +34,7 @@ _{{PROJECT_EXECUTABLE}}_main() {
        '(-d --diff)'--diff'[only show lines that have been added/removed/modified]'
        --diff-context='[specify lines of context around added/removed/modified lines when using `--diff`]:lines'
        --tabs='[set the tab width]:tab width [4]'
-        --wrap='[specify the text-wrapping mode]:mode [auto]:(auto never character)'
+        --wrap='[specify the text-wrapping mode]:mode [auto]:(auto never character word)'
        '!(--wrap)'{-S,--chop-long-lines}
        --terminal-width='[explicitly set the width of the terminal instead of determining it automatically]:width'
        '(-n --number --diff --diff-context)'{-n,--number}'[show line numbers]'
@@ -58,10 +58,11 @@ _{{PROJECT_EXECUTABLE}}_main() {
            default auto full plain changes header header-filename header-filesize grid rule numbers snip'
        \*{-r+,--line-range=}'[only print the specified line range]:start\:end'
        '(* -)'{-L,--list-languages}'[display all supported languages]'
-        '(-u --unbuffered)'--unbuffered'[this option exists for POSIX-compliance reasons]'
+        '(-u --unbuffered)'--unbuffered'[enable unbuffered input reading for streaming use cases]'
        --completion='[show shell completion for a certain shell]:shell:(bash fish zsh ps1)'
        --set-terminal-title'[sets terminal title to filenames when using a pager]'
        --diagnostic'[show diagnostic information for bug reports]'
+        --quiet-empty'[do not produce any output when the input is empty]'
        -P'[disable paging]'
        "--no-config[don't use the configuration file]"
        "--no-custom-assets[don't load custom assets]"
@@ -89,20 +90,25 @@ _{{PROJECT_EXECUTABLE}}_main() {
        languages)
            local IFS=$'\n'
            local -a languages
-            languages=( $({{PROJECT_EXECUTABLE}} --list-languages | awk -F':|,' '{ for (i = 1; i <= NF; ++i) printf("%s:%s\n", $i, $1) }') )
+            # `--list-languages` emits one `name:matchers` line per language,
+            # which `_describe` parses as `value:description`. Only the
+            # language name is offered as the completion value; the matchers
+            # show up as the menu description. See
+            # https://github.com/sharkdp/bat/issues/3735.
+            languages=( ${(f)"$({{PROJECT_EXECUTABLE}} --no-paging --color=never --decorations=never --list-languages)"} )

            _describe 'language' languages && ret=0
        ;;

        themes)
            local -a themes expl
-            themes=(${(f)"$(_call_program themes {{PROJECT_EXECUTABLE}} --list-themes)"} )
+            themes=(${(f)"$(_call_program themes {{PROJECT_EXECUTABLE}} --no-paging --color=never --decorations=never --list-themes)"} )

            _wanted themes expl 'theme' compadd -a themes && ret=0
        ;;
        theme_preferences)
            local -a themes expl
-            themes=(auto dark light auto:always auto:system ${(f)"$(_call_program themes {{PROJECT_EXECUTABLE}} --list-themes)"} )
+            themes=(auto dark light auto:always auto:system ${(f)"$(_call_program themes {{PROJECT_EXECUTABLE}} --no-paging --color=never --decorations=never --list-themes)"} )

            _wanted themes expl 'theme' compadd -a themes && ret=0
        ;;
@@ -102,8 +102,10 @@ Set the tab width to T spaces. Use a width of 0 to pass tabs through directly
 .HP
 \fB\-\-wrap\fR <mode>
 .IP
-Specify the text\-wrapping mode (*auto*, never, character). The '\-\-terminal\-width' option
-can be used in addition to control the output width.
+Specify the text\-wrapping mode (*auto*, never, character, word). The '\-\-terminal\-width' option
+can be used in addition to control the output width. In \fBword\fR mode, lines are broken at
+whitespace boundaries. If a single word exceeds the terminal width, it falls back to
+character wrapping.
 .HP
 \fB\-S\fR, \fB\-\-chop\-long\-lines\fR
 .IP
@@ -263,8 +265,10 @@ Display a list of supported languages for syntax highlighting.
 .HP
 \fB\-u\fR, \fB\-\-unbuffered\fR
 .IP
-This option exists for POSIX\-compliance reasons ('u' is for 'unbuffered'). The output is
-always unbuffered \- this option is simply ignored.
+Enable unbuffered input reading. When this flag is set, bat will display data as soon as it
+is available, without waiting for a complete line. This is useful for streaming use cases like
+\&'tail \-f logfile | bat \-u \-\-paging=never'. Note that line numbers are automatically disabled
+in unbuffered mode, and syntax highlighting may be imperfect on partial lines.
 .HP
 \fB\-\-no\-custom\-assets\fR
 .IP
@@ -282,6 +286,10 @@ Show bat's cache directory.
 .IP
 Show diagnostic information for bug reports.
 .HP
+\fB\-\-quiet\-empty\fR
+.IP
+Do not produce any output when the input is empty (e.g. an empty file or empty stdin). This is useful in scripts where silent behavior is preferred for empty input.
+.HP
 \fB\-\-acknowledgements\fR
 .IP
 Show acknowledgements.
@@ -2,6 +2,15 @@ diff --git syntaxes/01_Packages/Python/Python.sublime-syntax syntaxes/01_Package
 index 2acd86d8..86257f7b 100644
 --- syntaxes/01_Packages/Python/Python.sublime-syntax
 +++ syntaxes/01_Packages/Python/Python.sublime-syntax
+@@ -25,7 +31,7 @@ file_extensions:
+   - wscript
+   - bazel
+   - bzl
+-first_line_match: ^#!\s*/.*\bpython(\d(\.\d)?)?\b
+first_line_match: ^#!\s*/.*\b(python(\d(\.\d)?)?|uv)\b
+ scope: source.python
+
+ variables:
@@ -988,10 +988,6 @@ contexts:
         - match: \}
           scope: punctuation.section.mapping-or-set.end.python
@@ -0,0 +1,12 @@
+diff --git syntaxes/01_Packages/TCL/Tcl.sublime-syntax syntaxes/01_Packages/TCL/Tcl.sublime-syntax
+index 1234567..abcdefg 100644
+--- syntaxes/01_Packages/TCL/Tcl.sublime-syntax
+++ syntaxes/01_Packages/TCL/Tcl.sublime-syntax
+@@ -3,6 +3,7 @@
+ # http://www.sublimetext.com/docs/3/syntax.html
+ name: Tcl
+ file_extensions:
+   - tcl
+first_line_match: ^\#!.*\b(tclsh|wish|expect)\b
+ scope: source.tcl
+ variables:
@@ -79,7 +79,7 @@ contexts:

  double_quoted_string:
    - meta_include_prototype: false
-    - meta_scope: string.quoted.double.csv
+    - meta_scope: meta.string.quoted.double.csv
    - match: '""'
      scope: constant.character.escape.csv
    - match: '"'
@@ -1,398 +0,0 @@
-%YAML 1.2
---
-# http://www.sublimetext.com/docs/3/syntax.html
-name: Kotlin
-file_extensions:
-  - kt
-  - kts
-scope: source.Kotlin
-contexts:
-  main:
-    - include: comments
-    - match: '^\s*(package)\b(?:\s*([^ ;$]+)\s*)?'
-      captures:
-        1: keyword.other.kotlin
-        2: entity.name.package.kotlin
-    - include: imports
-    - include: statements
-  classes:
-    - match: (?<!::)(?=\b(?:companion|class|object|interface)\b)
-      push:
-        - match: '(?=$|\})'
-          pop: true
-        - include: comments
-        - match: \b(companion\s*)?(class|object|interface)\b
-          captures:
-            1: storage.modifier.kotlin
-            2: storage.modifier.kotlin
-          push:
-            - match: '(?=<|\{|\(|:|$)'
-              pop: true
-            - include: comments
-            - match: \w+
-              scope: entity.name.type.class.kotlin
-        - match: <
-          push:
-            - match: ">"
-              pop: true
-            - include: generics
-        - match: \(
-          push:
-            - match: \)
-              pop: true
-            - include: parameters
-        - match: (:)
-          captures:
-            1: keyword.operator.declaration.kotlin
-          push:
-            - match: "(?={|$)"
-              pop: true
-            - match: \w+
-              scope: entity.other.inherited-class.kotlin
-            - match: \(
-              push:
-                - match: \)
-                  pop: true
-                - include: expressions
-        - match: '\{'
-          push:
-            - match: '\}'
-              pop: true
-            - include: statements
-  comments:
-    - match: /\*
-      captures:
-        0: punctuation.definition.comment.kotlin
-      push:
-        - meta_scope: comment.block.kotlin
-        - match: \*/
-          captures:
-            0: punctuation.definition.comment.kotlin
-          pop: true
-    - match: \s*((//).*$\n?)
-      captures:
-        1: comment.line.double-slash.kotlin
-        2: punctuation.definition.comment.kotlin
-  constants:
-    - match: \b(true|false|null|this|super)\b
-      scope: constant.language.kotlin
-    - match: '\b((0(x|X)[0-9a-fA-F]*)|(([0-9]+\.?[0-9]*)|(\.[0-9]+))((e|E)(\+|-)?[0-9]+)?)([LlFf])?\b'
-      scope: constant.numeric.kotlin
-    - match: '\b([A-Z][A-Z0-9_]+)\b'
-      scope: constant.other.kotlin
-  expressions:
-    - match: \(
-      push:
-        - match: \)
-          pop: true
-        - include: expressions
-    - include: types
-    - include: strings
-    - include: constants
-    - include: comments
-    - include: keywords
-  functions:
-    - match: (?=\s*\b(?:fun)\b)
-      push:
-        - match: '(?=$|\})'
-          pop: true
-        - match: \b(fun)\b
-          captures:
-            1: keyword.other.kotlin
-          push:
-            - match: (?=\()
-              pop: true
-            - match: <
-              push:
-                - match: ">"
-                  pop: true
-                - include: generics
-            - match: '([\.<\?>\w]+\.)?(\w+)'
-              captures:
-                2: entity.name.function.kotlin
-        - match: \(
-          push:
-            - match: \)
-              pop: true
-            - include: parameters
-        - match: (:)
-          captures:
-            1: keyword.operator.declaration.kotlin
-          push:
-            - match: "(?={|=|$)"
-              pop: true
-            - include: types
-        - match: '\{'
-          push:
-            - match: '(?=\})'
-              pop: true
-            - include: statements
-        - match: (=)
-          captures:
-            1: keyword.operator.assignment.kotlin
-          push:
-            - match: (?=$)
-              pop: true
-            - include: expressions
-  generics:
-    - match: (:)
-      captures:
-        1: keyword.operator.declaration.kotlin
-      push:
-        - match: (?=,|>)
-          pop: true
-        - include: types
-    - include: keywords
-    - match: \w+
-      scope: storage.type.generic.kotlin
-  getters-and-setters:
-    - match: \b(get)\b\s*\(\s*\)
-      captures:
-        1: entity.name.function.kotlin
-      push:
-        - match: '\}|(?=\bset\b)|$'
-          pop: true
-        - match: (=)
-          captures:
-            1: keyword.operator.assignment.kotlin
-          push:
-            - match: (?=$|\bset\b)
-              pop: true
-            - include: expressions
-        - match: '\{'
-          push:
-            - match: '\}'
-              pop: true
-            - include: expressions
-    - match: \b(set)\b\s*(?=\()
-      captures:
-        1: entity.name.function.kotlin
-      push:
-        - match: '\}|(?=\bget\b)|$'
-          pop: true
-        - match: \(
-          push:
-            - match: \)
-              pop: true
-            - include: parameters
-        - match: (=)
-          captures:
-            1: keyword.operator.assignment.kotlin
-          push:
-            - match: (?=$|\bset\b)
-              pop: true
-            - include: expressions
-        - match: '\{'
-          push:
-            - match: '\}'
-              pop: true
-            - include: expressions
-  imports:
-    - match: '^\s*(import)\s+[^ $]+\s+(as)?'
-      captures:
-        1: keyword.other.kotlin
-        2: keyword.other.kotlin
-  keywords:
-    - match: \b(var|val|public|private|protected|abstract|final|sealed|enum|open|attribute|annotation|override|inline|vararg|in|out|internal|data|tailrec|operator|infix|const|yield|typealias|typeof|reified|suspend)\b
-      scope: storage.modifier.kotlin
-    - match: \b(try|catch|finally|throw)\b
-      scope: keyword.control.catch-exception.kotlin
-    - match: \b(if|else|while|for|do|return|when|where|break|continue)\b
-      scope: keyword.control.kotlin
-    - match: \b(in|is|!in|!is|as|as\?|assert)\b
-      scope: keyword.operator.kotlin
-    - match: (==|!=|===|!==|<=|>=|<|>)
-      scope: keyword.operator.comparison.kotlin
-    - match: (=)
-      scope: keyword.operator.assignment.kotlin
-    - match: (::)
-      scope: keyword.operator.kotlin
-    - match: (:)
-      scope: keyword.operator.declaration.kotlin
-    - match: \b(by)\b
-      scope: keyword.other.by.kotlin
-    - match: (\?\.)
-      scope: keyword.operator.safenav.kotlin
-    - match: (\.)
-      scope: keyword.operator.dot.kotlin
-    - match: (\?:)
-      scope: keyword.operator.elvis.kotlin
-    - match: (\-\-|\+\+)
-      scope: keyword.operator.increment-decrement.kotlin
-    - match: (\+=|\-=|\*=|\/=)
-      scope: keyword.operator.arithmetic.assign.kotlin
-    - match: (\.\.)
-      scope: keyword.operator.range.kotlin
-    - match: (\-|\+|\*|\/|%)
-      scope: keyword.operator.arithmetic.kotlin
-    - match: (!|&&|\|\|)
-      scope: keyword.operator.logical.kotlin
-    - match: (;)
-      scope: punctuation.terminator.kotlin
-  namespaces:
-    - match: \b(namespace)\b
-      scope: keyword.other.kotlin
-    - match: '\{'
-      push:
-        - match: '\}'
-          pop: true
-        - include: statements
-  parameters:
-    - match: (:)
-      captures:
-        1: keyword.operator.declaration.kotlin
-      push:
-        - match: (?=,|\)|=)
-          pop: true
-        - include: types
-    - match: (=)
-      captures:
-        1: keyword.operator.declaration.kotlin
-      push:
-        - match: (?=,|\))
-          pop: true
-        - include: expressions
-    - include: keywords
-    - match: \w+
-      scope: variable.parameter.function.kotlin
-  statements:
-    - include: namespaces
-    - include: typedefs
-    - include: classes
-    - include: functions
-    - include: variables
-    - include: getters-and-setters
-    - include: expressions
-  strings:
-    - match: '"""'
-      captures:
-        0: punctuation.definition.string.begin.kotlin
-      push:
-        - meta_scope: string.quoted.third.kotlin
-        - match: '"""'
-          captures:
-            0: punctuation.definition.string.end.kotlin
-          pop: true
-        - match: '(\$\w+|\$\{[^\}]+\})'
-          scope: variable.parameter.template.kotlin
-        - match: \\.
-          scope: constant.character.escape.kotlin
-    - match: '"'
-      captures:
-        0: punctuation.definition.string.begin.kotlin
-      push:
-        - meta_scope: string.quoted.double.kotlin
-        - match: '"'
-          captures:
-            0: punctuation.definition.string.end.kotlin
-          pop: true
-        - match: '(\$\w+|\$\{[^\}]+\})'
-          scope: variable.parameter.template.kotlin
-        - match: \\.
-          scope: constant.character.escape.kotlin
-    - match: "'"
-      captures:
-        0: punctuation.definition.string.begin.kotlin
-      push:
-        - meta_scope: string.quoted.single.kotlin
-        - match: "'"
-          captures:
-            0: punctuation.definition.string.end.kotlin
-          pop: true
-        - match: \\.
-          scope: constant.character.escape.kotlin
-    - match: "`"
-      captures:
-        0: punctuation.definition.string.begin.kotlin
-      push:
-        - meta_scope: string.quoted.single.kotlin
-        - match: "`"
-          captures:
-            0: punctuation.definition.string.end.kotlin
-          pop: true
-  typedefs:
-    - match: (?=\s*(?:type))
-      push:
-        - match: (?=$)
-          pop: true
-        - match: \b(type)\b
-          scope: keyword.other.kotlin
-        - match: <
-          push:
-            - match: ">"
-              pop: true
-            - include: generics
-        - include: expressions
-  types:
-    - match: \b(Nothing|Any|Unit|String|CharSequence|Int|Boolean|Char|Long|Double|Float|Short|Byte|dynamic)\b
-      scope: storage.type.buildin.kotlin
-    - match: \b(IntArray|BooleanArray|CharArray|LongArray|DoubleArray|FloatArray|ShortArray|ByteArray)\b
-      scope: storage.type.buildin.array.kotlin
-    - match: \b(Array|Collection|List|Map|Set|MutableList|MutableMap|MutableSet|Sequence)<\b
-      captures:
-        1: storage.type.buildin.collection.kotlin
-      push:
-        - match: ">"
-          pop: true
-        - include: types
-        - include: keywords
-    - match: \w+<
-      push:
-        - match: ">"
-          pop: true
-        - include: types
-        - include: keywords
-    - match: '\{'
-      push:
-        - match: '\}'
-          pop: true
-        - include: statements
-    - match: \(
-      push:
-        - match: \)
-          pop: true
-        - include: types
-    - match: (->)
-      scope: keyword.operator.declaration.kotlin
-  variables:
-    - match: (?=\s*\b(?:var|val)\b)
-      push:
-        - match: (?=:|=|(\b(by)\b)|$)
-          pop: true
-        - match: \b(var|val)\b
-          captures:
-            1: keyword.other.kotlin
-          push:
-            - match: (?=:|=|(\b(by)\b)|$)
-              pop: true
-            - match: <
-              push:
-                - match: ">"
-                  pop: true
-                - include: generics
-            - match: '([\.<\?>\w]+\.)?(\w+)'
-              captures:
-                2: entity.name.variable.kotlin
-        - match: (:)
-          captures:
-            1: keyword.operator.declaration.kotlin
-          push:
-            - match: (?==|$)
-              pop: true
-            - include: types
-            - include: getters-and-setters
-        - match: \b(by)\b
-          captures:
-            1: keyword.other.kotlin
-          push:
-            - match: (?=$)
-              pop: true
-            - include: expressions
-        - match: (=)
-          captures:
-            1: keyword.operator.assignment.kotlin
-          push:
-            - match: (?=$)
-              pop: true
-            - include: expressions
-            - include: getters-and-setters
@@ -9,6 +9,7 @@ scope: source.man
 variables:
  section_heading: '^(?!#)\S.*$'
  command_line_option: '(--?[A-Za-z0-9][_A-Za-z0-9-]*)'
+  ansi_escape_sequence: '\e\[[\?=]?(?:\d+;?)*[A-Za-z]'

 contexts:
  prototype:
@@ -69,7 +70,7 @@ contexts:
      escape: '(?={{section_heading}})'

  function-call:
-    - match: '\b([A-Za-z0-9_\-]+\.)?([A-Za-z0-9_\-]+)(\()([^)]*)(\))'
+    - match: '(?<!\e\[)(?:\b|\s)(?:{{ansi_escape_sequence}})?([A-Za-z0-9_\-]+\.)?([A-Za-z0-9_\-]+)(?:{{ansi_escape_sequence}})?(\()([^)]*)(\))'
      captures:
        1: entity.name.function.man
        2: entity.name.function.man
@@ -47,12 +47,49 @@ impl ToTokens for MappingTarget {
    }
 }

-#[derive(Clone, Debug, PartialEq, Eq, Hash, DeserializeFromStr)]
+/// Helper type for deserializing a `Matcher` from either a plain string or a
+/// `{ glob = "...", case_sensitive = true }` struct.
+#[derive(Deserialize)]
+#[serde(untagged)]
+enum RawMatcher {
+    Simple(String),
+    Full {
+        glob: String,
+        case_sensitive: Option<bool>,
+    },
+}
+
+/// Whether a glob pattern should be matched case-sensitively or case-insensitively.
+///
+/// Mirrors the runtime `Case` type in `src/syntax_mapping.rs`.
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+enum Case {
+    Sensitive,
+    Insensitive,
+}
+impl ToTokens for Case {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let t = match self {
+            Self::Sensitive => quote! { Case::Sensitive },
+            Self::Insensitive => quote! { Case::Insensitive },
+        };
+        tokens.append_all(t);
+    }
+}
+
 /// A single matcher.
 ///
 /// Codegen converts this into a `Lazy<Option<GlobMatcher>>`.
-struct Matcher(Vec<MatcherSegment>);
-/// Parse a matcher.
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize)]
+#[serde(try_from = "RawMatcher")]
+struct Matcher {
+    segments: Vec<MatcherSegment>,
+    /// Whether the glob pattern should be matched case-sensitively.
+    ///
+    /// Defaults to `Case::Insensitive` for backwards compatibility.
+    case: Case,
+}
+/// Parse the glob pattern of a matcher.
 ///
 /// Note that this implementation is rather strict: it will greedily interpret
 /// every valid environment variable replacement as such, then immediately
@@ -66,68 +103,95 @@ struct Matcher(Vec<MatcherSegment>);
 ///
 /// Revision history:
 /// - 2024-02-20: allow `{` and `}` (glob brace expansion)
-impl FromStr for Matcher {
-    type Err = anyhow::Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        use MatcherSegment as Seg;
-        static VAR_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\$\{([\w\d_]+)\}").unwrap());
+fn parse_glob(s: &str) -> Result<Vec<MatcherSegment>, anyhow::Error> {
+    use MatcherSegment as Seg;
+    static VAR_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\$\{([\w\d_]+)\}").unwrap());

-        let mut segments = vec![];
-        let mut text_start = 0;
-        for capture in VAR_REGEX.captures_iter(s) {
-            let match_0 = capture.get(0).unwrap();
+    let mut segments = vec![];
+    let mut text_start = 0;
+    for capture in VAR_REGEX.captures_iter(s) {
+        let match_0 = capture.get(0).unwrap();

-            // text before this var
-            let text_end = match_0.start();
-            segments.push(Seg::Text(s[text_start..text_end].into()));
-            text_start = match_0.end();
+        // text before this var
+        let text_end = match_0.start();
+        segments.push(Seg::Text(s[text_start..text_end].into()));
+        text_start = match_0.end();

-            // this var
-            segments.push(Seg::Env(capture.get(1).unwrap().as_str().into()));
+        // this var
+        segments.push(Seg::Env(capture.get(1).unwrap().as_str().into()));
+    }
+    // possible trailing text
+    segments.push(Seg::Text(s[text_start..].into()));
+
+    // cleanup empty text segments
+    let non_empty_segments = segments
+        .into_iter()
+        .filter(|seg| seg.text().map(|t| !t.is_empty()).unwrap_or(true))
+        .collect_vec();
+
+    // sanity check
+    if non_empty_segments
+        .windows(2)
+        .any(|segs| segs[0].is_text() && segs[1].is_text())
+    {
+        unreachable!("Parsed into consecutive text segments: {non_empty_segments:?}");
+    }
+
+    // guard empty case
+    if non_empty_segments.is_empty() {
+        bail!(r#"Parsed an empty matcher: "{s}""#);
+    }
+
+    // guard variable syntax leftover fragments
+    if non_empty_segments
+        .iter()
+        .filter_map(Seg::text)
+        .any(|t| t.contains('$'))
+    {
+        bail!(r#"Invalid matcher: "{s}""#);
+    }
+
+    Ok(non_empty_segments)
+}
+impl TryFrom<RawMatcher> for Matcher {
+    type Error = anyhow::Error;
+    fn try_from(raw: RawMatcher) -> Result<Self, Self::Error> {
+        const DEFAULT_CASE: Case = Case::Insensitive;
+        match &raw {
+            RawMatcher::Simple(s) => {
+                let segments = parse_glob(s)?;
+                Ok(Self {
+                    segments,
+                    case: DEFAULT_CASE,
+                })
+            }
+            RawMatcher::Full {
+                glob,
+                case_sensitive,
+            } => {
+                let segments = parse_glob(glob)?;
+                let case = match case_sensitive {
+                    None => DEFAULT_CASE,
+                    Some(false) => Case::Insensitive,
+                    Some(true) => Case::Sensitive,
+                };
+                Ok(Self { segments, case })
+            }
        }
-        // possible trailing text
-        segments.push(Seg::Text(s[text_start..].into()));
-
-        // cleanup empty text segments
-        let non_empty_segments = segments
-            .into_iter()
-            .filter(|seg| seg.text().map(|t| !t.is_empty()).unwrap_or(true))
-            .collect_vec();
-
-        // sanity check
-        if non_empty_segments
-            .windows(2)
-            .any(|segs| segs[0].is_text() && segs[1].is_text())
-        {
-            unreachable!("Parsed into consecutive text segments: {non_empty_segments:?}");
-        }
-
-        // guard empty case
-        if non_empty_segments.is_empty() {
-            bail!(r#"Parsed an empty matcher: "{s}""#);
-        }
-
-        // guard variable syntax leftover fragments
-        if non_empty_segments
-            .iter()
-            .filter_map(Seg::text)
-            .any(|t| t.contains('$'))
-        {
-            bail!(r#"Invalid matcher: "{s}""#);
-        }
-
-        Ok(Self(non_empty_segments))
    }
 }
 impl ToTokens for Matcher {
    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let t = match self.0.as_slice() {
+        let case = &self.case;
+        let t = match self.segments.as_slice() {
            [] => unreachable!("0-length matcher should never be created"),
            [MatcherSegment::Text(text)] => {
-                quote! { Lazy::new(|| Some(build_matcher_fixed(#text))) }
+                quote! { Lazy::new(|| Some(build_matcher_fixed(#text, #case))) }
            }
            // parser logic ensures that this case can only happen when there are dynamic segments
-            segs @ [_, ..] => quote! { Lazy::new(|| build_matcher_dynamic(&[ #(#segs),* ])) },
+            segs @ [_, ..] => {
+                quote! { Lazy::new(|| build_matcher_dynamic(&[ #(#segs),* ], #case)) }
+            }
        };
        tokens.append_all(t);
    }
@@ -175,6 +239,7 @@ impl MatcherSegment {
 /// A struct that models a single .toml file in /src/syntax_mapping/builtins/.
 #[derive(Clone, Debug, Deserialize)]
 struct MappingDefModel {
+    #[serde(default)]
    mappings: IndexMap<MappingTarget, Vec<Matcher>>,
 }
 impl MappingDefModel {
@@ -97,7 +97,7 @@ The following files have been manually modified after converting from a `.tmLang
   as it is not kept in a standalone repository. The file is generated from
   https://github.com/open-policy-agent/opa/blob/master/misc/syntax/textmate/Rego.tmLanguage
 * `SML.sublime_syntax` has been added manually from
-   https://github.com/seanjames777/SML-Language-Definitiona as it is not
+   https://github.com/seanjames777/SML-Language-Definition as it is not
   kept in a standalone repository. The file generated is from
   https://github.com/seanjames777/SML-Language-Definition/blob/master/sml.tmLanguage
 * `Cabal.sublime_syntax` has been added manually from
@@ -37,6 +37,13 @@ Options:
          name (like 'C++' or 'LaTeX') or possible file extension (like 'cpp', 'hpp' or 'md'). Use
          '--list-languages' to show all supported language names and file extensions.

+      --fallback-syntax <fallback-syntax>
+          Set a fallback language for syntax highlighting when auto-detection fails. Unlike
+          '--language', this is only used when no syntax could be detected from filename, custom
+          syntax mappings, or first-line detection.
+          
+          [aliases: --fallback-language]
+
  -H, --highlight-line <N:M>
          Highlight the specified line ranges with a different background color For example:
            '--highlight-line 40' highlights line 40
@@ -61,8 +68,8 @@ Options:
          Set the tab width to T spaces. Use a width of 0 to pass tabs through directly

      --wrap <mode>
-          Specify the text-wrapping mode (*auto*, never, character). The '--terminal-width' option
-          can be used in addition to control the output width.
+          Specify the text-wrapping mode (*auto*, never, character, word). The '--terminal-width'
+          option can be used in addition to control the output width.

  -S, --chop-long-lines
          Truncate all lines longer than screen width. Alias for '--wrap=never'.
@@ -70,7 +77,8 @@ Options:
      --terminal-width <width>
          Explicitly set the width of the terminal instead of determining it automatically. If
          prefixed with '+' or '-', the value will be treated as an offset to the actual terminal
-          width. See also: '--wrap'.
+          width. This can also be configured via the BAT_WIDTH environment variable (e.g. export
+          BAT_WIDTH="100"). See also: '--wrap'.

  -n, --number
          Only show line numbers, no other decorations. This is an alias for '--style=numbers'
@@ -203,8 +211,11 @@ Options:
          Display a list of supported languages for syntax highlighting.

  -u, --unbuffered
-          This option exists for POSIX-compliance reasons ('u' is for 'unbuffered'). The output is
-          always unbuffered - this option is simply ignored.
+          Enable unbuffered input reading. When this flag is set, bat will display data as soon as
+          it is available, without waiting for a complete line. This is useful for streaming use
+          cases like 'tail -f logfile | bat -u --paging=never'. Note that line numbers are
+          automatically disabled in unbuffered mode, and syntax highlighting may be imperfect on
+          partial lines.

      --completion <SHELL>
          Show shell completion for a certain shell. [possible values: bash, fish, zsh, ps1]
@@ -212,6 +223,10 @@ Options:
      --diagnostic
          Show diagnostic information for bug reports.

+  -E, --quiet-empty
+          When this flag is set, bat will produce no output at all when the input is empty. This is
+          useful when piping commands that may produce empty output, like 'git diff'.
+
      --acknowledgements
          Show acknowledgements.

@@ -17,6 +17,8 @@ Options:
          Show plain style (alias for '--style=plain').
  -l, --language <language>
          Set the language for syntax highlighting.
+      --fallback-syntax <fallback-syntax>
+          Set a fallback language for undetected syntaxes. [aliases: --fallback-language]
  -H, --highlight-line <N:M>
          Highlight lines N through M.
      --file-name <name>
@@ -26,7 +28,7 @@ Options:
      --tabs <T>
          Set the tab width to T spaces.
      --wrap <mode>
-          Specify the text-wrapping mode (*auto*, never, character).
+          Specify the text-wrapping mode (*auto*, never, character, word).
  -S, --chop-long-lines
          Truncate all lines longer than screen width. Alias for '--wrap=never'.
  -n, --number
@@ -58,8 +60,12 @@ Options:
          Only print the lines from N to M.
  -L, --list-languages
          Display all supported languages.
+  -u, --unbuffered
+          Enable unbuffered input reading for streaming use cases.
      --completion <SHELL>
          Show shell completion for a certain shell. [possible values: bash, fish, zsh, ps1]
+  -E, --quiet-empty
+          Produce no output when the input is empty.
  -h, --help
          Print help (see more with '--help')
  -V, --version
@@ -10,5 +10,3 @@ No issue will have a different priority based on sponsorship status of the
 reporter.

 Contributions from anybody are most welcomed, please see our [`CONTRIBUTING.md`](../CONTRIBUTING.md) guide.
-
-If you want to see our biggest sponsors, check the top of [`README.md`](../README.md#sponsors).
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1769789167,
+        "narHash": "sha256-kKB3bqYJU5nzYeIROI82Ef9VtTbu4uA3YydSk/Bioa8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "62c8382960464ceb98ea593cb8321a2cf8f9e3e5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
@@ -0,0 +1,40 @@
+{
+  description = "bat";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+  outputs =
+    { self, ... }@inputs:
+    let
+      supportedSystems = [
+        "x86_64-linux" # 64-bit Intel/AMD Linux
+        "aarch64-linux" # 64-bit ARM Linux
+        "aarch64-darwin" # 64-bit ARM macOS
+        "x86_64-darwin" # 64-bit Intel macOS
+      ];
+
+      forEachSupportedSystem =
+        f:
+        inputs.nixpkgs.lib.genAttrs supportedSystems (
+          system:
+          f {
+            inherit system;
+            pkgs = import inputs.nixpkgs {
+              inherit system;
+            };
+          }
+        );
+    in
+    {
+      devShells = forEachSupportedSystem (
+        { pkgs, system }:
+        {
+          default = pkgs.mkShellNoCC {
+            packages = with pkgs; [
+              cargo
+            ];
+          };
+        }
+      );
+    };
+}
@@ -158,7 +158,9 @@ impl HighlightingAssets {
        let syntax_match = mapping.get_syntax_for(path);

        if let Some(MappingTarget::MapToUnknown) = syntax_match {
-            return Err(Error::UndetectedSyntax(path.to_string_lossy().into()));
+            return Err(Error::UndetectedSyntax(
+                crate::preprocessor::sanitize_for_terminal(&path.to_string_lossy()),
+            ));
        }

        if let Some(MappingTarget::MapTo(syntax_name)) = syntax_match {
@@ -175,13 +177,17 @@ impl HighlightingAssets {
        ) {
            (Some(syntax), _) => Ok(syntax),

-            (_, Some(MappingTarget::MapExtensionToUnknown)) => {
-                Err(Error::UndetectedSyntax(path.to_string_lossy().into()))
-            }
+            (_, Some(MappingTarget::MapExtensionToUnknown)) => Err(Error::UndetectedSyntax(
+                crate::preprocessor::sanitize_for_terminal(&path.to_string_lossy()),
+            )),

            _ => self
                .get_syntax_for_file_extension(file_name, &mapping.ignored_suffixes)?
-                .ok_or_else(|| Error::UndetectedSyntax(path.to_string_lossy().into())),
+                .ok_or_else(|| {
+                    Error::UndetectedSyntax(crate::preprocessor::sanitize_for_terminal(
+                        &path.to_string_lossy(),
+                    ))
+                }),
        }
    }

@@ -210,6 +216,7 @@ impl HighlightingAssets {
    pub(crate) fn get_syntax(
        &self,
        language: Option<&str>,
+        fallback_syntax: Option<&str>,
        input: &mut OpenedInput,
        mapping: &SyntaxMapping,
    ) -> Result<SyntaxReferenceInSet<'_>> {
@@ -222,21 +229,50 @@ impl HighlightingAssets {
        }

        let path = input.path();
-        let path_syntax = if let Some(path) = path {
-            self.get_syntax_for_path(
-                PathAbs::new(path).map_or_else(|_| path.to_owned(), |p| p.as_path().to_path_buf()),
-                mapping,
-            )
+        let absolute_path = path.and_then(|p| {
+            PathAbs::new(p)
+                .ok()
+                .map(|abs| abs.as_path().to_path_buf())
+                .or_else(|| Some(p.to_owned()))
+        });
+
+        let path_syntax = if let Some(ref path) = absolute_path {
+            self.get_syntax_for_path(path, mapping).or_else(|e| {
+                // If syntax detection failed on the given path, retry with the
+                // canonicalized path (which resolves symlinks). This handles
+                // cases like `Aliases/0install -> ../Formula/zero-install.rb`
+                // where the symlink name has no extension but the target does.
+                // See #1001.
+                if matches!(e, Error::UndetectedSyntax(_)) {
+                    if let Ok(resolved) = fs::canonicalize(path) {
+                        if resolved != *path {
+                            return match self.get_syntax_for_path(&resolved, mapping) {
+                                Ok(syntax) => Ok(syntax),
+                                Err(Error::UndetectedSyntax(_)) => Err(e),
+                                Err(err) => Err(err),
+                            };
+                        }
+                    }
+                }
+                Err(e)
+            })
        } else {
            Err(Error::UndetectedSyntax("[unknown]".into()))
        };

+        // If a path wasn't provided, or if path based syntax detection
+        // above failed, we fall back to first-line syntax detection.
        match path_syntax {
-            // If a path wasn't provided, or if path based syntax detection
-            // above failed, we fall back to first-line syntax detection.
-            Err(Error::UndetectedSyntax(path)) => self
-                .get_first_line_syntax(&mut input.reader)?
-                .ok_or(Error::UndetectedSyntax(path)),
+            Err(Error::UndetectedSyntax(path)) => {
+                if let Some(syntax_in_set) = self.get_first_line_syntax(&mut input.reader)? {
+                    Ok(syntax_in_set)
+                } else if let Some(language) = fallback_syntax {
+                    self.find_syntax_by_token(language)?
+                        .ok_or_else(|| Error::UnknownSyntax(language.to_owned()))
+                } else {
+                    Err(Error::UndetectedSyntax(path))
+                }
+            }
            _ => path_syntax,
        }
    }
@@ -262,6 +298,24 @@ impl HighlightingAssets {
            .map(|syntax| SyntaxReferenceInSet { syntax, syntax_set }))
    }

+    fn find_syntax_by_hidden_file_name(
+        &self,
+        file_name: &OsStr,
+    ) -> Result<Option<SyntaxReferenceInSet<'_>>> {
+        let Some(hidden_file_extension) = file_name
+            .to_str()
+            .and_then(|name| name.strip_prefix('.'))
+            .filter(|name| !name.is_empty())
+        else {
+            return Ok(None);
+        };
+
+        // syntect stores `hidden_file_extensions` in the same extension list as
+        // regular file extensions, but dotfiles must be queried without the
+        // leading period.
+        self.find_syntax_by_extension(Some(OsStr::new(hidden_file_extension)))
+    }
+
    fn find_syntax_by_token(&self, token: &str) -> Result<Option<SyntaxReferenceInSet<'_>>> {
        let syntax_set = self.get_syntax_set()?;
        Ok(syntax_set
@@ -275,6 +329,9 @@ impl HighlightingAssets {
        ignored_suffixes: &IgnoredSuffixes,
    ) -> Result<Option<SyntaxReferenceInSet<'_>>> {
        let mut syntax = self.find_syntax_by_extension(Some(file_name))?;
+        if syntax.is_none() {
+            syntax = self.find_syntax_by_hidden_file_name(file_name)?;
+        }
        if syntax.is_none() {
            syntax =
                ignored_suffixes.try_with_stripped_suffix(file_name, |stripped_file_name| {
@@ -290,15 +347,15 @@ impl HighlightingAssets {
        file_name: &OsStr,
        ignored_suffixes: &IgnoredSuffixes,
    ) -> Result<Option<SyntaxReferenceInSet<'_>>> {
-        let mut syntax = self.find_syntax_by_extension(Path::new(file_name).extension())?;
-        if syntax.is_none() {
-            syntax =
-                ignored_suffixes.try_with_stripped_suffix(file_name, |stripped_file_name| {
-                    // Note: recursion
-                    self.get_syntax_for_file_extension(stripped_file_name, ignored_suffixes)
-                })?;
+        let stripped =
+            ignored_suffixes.try_with_stripped_suffix(file_name, |stripped_file_name| {
+                self.get_syntax_for_file_extension(stripped_file_name, ignored_suffixes)
+                    .map(Some)
+            })?;
+        match stripped {
+            Some(syntax) => Ok(syntax),
+            None => self.find_syntax_by_extension(Path::new(file_name).extension()),
        }
-        Ok(syntax)
    }

    fn get_first_line_syntax(
@@ -395,11 +452,12 @@ mod tests {
        fn get_syntax_name(
            &self,
            language: Option<&str>,
+            fallback_syntax: Option<&str>,
            input: &mut OpenedInput,
            mapping: &SyntaxMapping,
        ) -> String {
            self.assets
-                .get_syntax(language, input, mapping)
+                .get_syntax(language, fallback_syntax, input, mapping)
                .map(|syntax_in_set| syntax_in_set.syntax.name.clone())
                .unwrap_or_else(|_| "!no syntax!".to_owned())
        }
@@ -419,7 +477,7 @@ mod tests {
            let dummy_stdin: &[u8] = &[];
            let mut opened_input = input.open(dummy_stdin, None).unwrap();

-            self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
+            self.get_syntax_name(None, None, &mut opened_input, &self.syntax_mapping)
        }

        fn syntax_for_file_with_content_os(&self, file_name: &OsStr, first_line: &str) -> String {
@@ -429,7 +487,7 @@ mod tests {
            let dummy_stdin: &[u8] = &[];
            let mut opened_input = input.open(dummy_stdin, None).unwrap();

-            self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
+            self.get_syntax_name(None, None, &mut opened_input, &self.syntax_mapping)
        }

        #[cfg(unix)]
@@ -449,7 +507,7 @@ mod tests {
            let input = Input::stdin().with_name(Some(file_name));
            let mut opened_input = input.open(content, None).unwrap();

-            self.get_syntax_name(None, &mut opened_input, &self.syntax_mapping)
+            self.get_syntax_name(None, None, &mut opened_input, &self.syntax_mapping)
        }

        fn syntax_is_same_for_inputkinds(&self, file_name: &str, content: &str) -> bool {
@@ -628,6 +686,48 @@ mod tests {
        );
    }

+    #[test]
+    fn syntax_detection_ignored_suffix_falls_back_to_first_line() {
+        let mut test = SyntaxDetectionTest::new();
+
+        // By default a `.txt` file uses Plain Text, even with a shebang: the
+        // `.txt` extension wins and first-line detection is not reached.
+        assert_eq!(
+            test.syntax_for_file_with_content("test.txt", "#!/usr/bin/env bash"),
+            "Plain Text"
+        );
+
+        // Once `.txt` is an ignored suffix it is stripped before detection. The
+        // stripped name (`test`) has no extension, so detection falls back to the
+        // first line -- even though `.txt` is itself a registered extension that
+        // would otherwise match as Plain Text. See #2745.
+        test.syntax_mapping.insert_ignored_suffix(".txt");
+        assert_eq!(
+            test.syntax_for_file_with_content("test.txt", "#!/usr/bin/env bash"),
+            "Bourne Again Shell (bash)"
+        );
+        assert_eq!(
+            test.syntax_for_file_with_content("test.txt", "<?php"),
+            "PHP"
+        );
+
+        // A `.txt` file without a recognizable first line keeps no syntax (the
+        // caller renders it as plain text); we must not resurrect the shadowed
+        // `.txt` -> Plain Text match here.
+        assert_eq!(
+            test.syntax_for_file_with_content("notes.txt", "just some prose"),
+            "!no syntax!"
+        );
+
+        // Stripping that exposes a real extension still works: `.dev` is ignored,
+        // and the remaining `.json` extension is detected as usual.
+        test.syntax_mapping.insert_ignored_suffix(".dev");
+        assert_eq!(
+            test.syntax_for_file_with_content("config.json.dev", ""),
+            "JSON"
+        );
+    }
+
    #[test]
    fn syntax_detection_is_case_insensitive() {
        let mut test = SyntaxDetectionTest::new();
@@ -661,6 +761,55 @@ mod tests {
        );
    }

+    #[cfg(feature = "build-assets")]
+    #[test]
+    fn syntax_detection_hidden_file_extensions() {
+        let source_dir = TempDir::new().expect("creation of temporary source directory");
+        let cache_dir = TempDir::new().expect("creation of temporary cache directory");
+        let syntax_dir = source_dir.path().join("syntaxes");
+
+        std::fs::create_dir_all(&syntax_dir).expect("creation of syntax directory succeeds");
+        std::fs::write(
+            syntax_dir.join("HiddenFileExtension.sublime-syntax"),
+            r#"%YAML 1.2
+---
+name: Hidden File Extension
+hidden_file_extensions:
+  - testrc
+scope: source.hiddenfileextension
+
+contexts:
+  main:
+    - match: .
+      scope: source.hiddenfileextension
+"#,
+        )
+        .expect("custom syntax can be written");
+
+        build(
+            source_dir.path(),
+            false,
+            false,
+            cache_dir.path(),
+            env!("CARGO_PKG_VERSION"),
+        )
+        .expect("custom assets can be built");
+
+        let test = SyntaxDetectionTest {
+            assets: HighlightingAssets::from_cache(cache_dir.path())
+                .expect("custom syntax cache can be loaded"),
+            syntax_mapping: SyntaxMapping::new(),
+            temp_dir: TempDir::new().expect("creation of temporary directory"),
+        };
+
+        assert_eq!(test.syntax_for_file(".testrc"), "Hidden File Extension");
+        assert_eq!(
+            test.syntax_for_stdin_with_content(".testrc", b""),
+            "Hidden File Extension"
+        );
+        assert!(test.syntax_is_same_for_inputkinds(".testrc", ""));
+    }
+
    #[cfg(unix)]
    #[test]
    fn syntax_detection_for_symlinked_file() {
@@ -682,8 +831,35 @@ mod tests {
        let mut opened_input = input.open(dummy_stdin, None).unwrap();

        assert_eq!(
-            test.get_syntax_name(None, &mut opened_input, &test.syntax_mapping),
+            test.get_syntax_name(None, None, &mut opened_input, &test.syntax_mapping),
            "SSH Config"
        );
    }
+
+    #[cfg(unix)]
+    #[test]
+    fn syntax_detection_for_symlinked_file_by_target_extension() {
+        use std::os::unix::fs::symlink;
+
+        let test = SyntaxDetectionTest::new();
+
+        let formula_dir = test.temp_dir.path().join("Formula");
+        std::fs::create_dir(&formula_dir).unwrap();
+        let target = formula_dir.join("zero-install.rb");
+        File::create(&target).unwrap();
+
+        let aliases_dir = test.temp_dir.path().join("Aliases");
+        std::fs::create_dir(&aliases_dir).unwrap();
+        let link = aliases_dir.join("0install");
+        symlink(&target, &link).unwrap();
+
+        let input = Input::ordinary_file(&link);
+        let dummy_stdin: &[u8] = &[];
+        let mut opened_input = input.open(dummy_stdin, None).unwrap();
+
+        assert_eq!(
+            test.get_syntax_name(None, None, &mut opened_input, &test.syntax_mapping),
+            "Ruby"
+        );
+    }
 }
@@ -110,16 +110,18 @@ impl App {
                _ => interactive_output, // auto: use color if interactive
            };

-            let custom_pager = matches.get_one::<String>("pager").map(|s| s.to_string());
+            let pager = matches.get_one::<String>("pager").map(|s| s.as_str());
            let theme_options = Self::theme_options_from_matches(&matches);
+            let use_custom_assets = !matches.get_flag("no-custom-assets");

            Self::display_help(
                interactive_output,
                help_type,
                use_pager,
                use_color,
-                custom_pager,
+                pager,
                theme_options,
+                use_custom_assets,
            )?;
            std::process::exit(0);
        }
@@ -136,8 +138,9 @@ impl App {
        help_type: HelpType,
        use_pager: bool,
        use_color: bool,
-        custom_pager: Option<String>,
+        pager: Option<&str>,
        theme_options: ThemeOptions,
+        use_custom_assets: bool,
    ) -> Result<()> {
        use crate::assets::assets_from_cache_or_binary;
        use crate::directories::PROJECT_DIRS;
@@ -164,12 +167,10 @@ impl App {
            PagingMode::Never
        };

-        let pager = bat::config::get_pager_executable(custom_pager.as_deref());
-
        let help_config = Config {
            style_components: StyleComponents::new(StyleComponent::Plain.components(false)),
            paging_mode,
-            pager: pager.as_deref(),
+            pager,
            colored_output: use_color,
            true_color: use_color,
            language: if use_color { Some("help") } else { None },
@@ -178,7 +179,7 @@ impl App {
        };

        let cache_dir = PROJECT_DIRS.cache_dir();
-        let assets = assets_from_cache_or_binary(false, cache_dir)?;
+        let assets = assets_from_cache_or_binary(use_custom_assets, cache_dir)?;
        Controller::new(&help_config, &assets)
            .run(inputs, None)
            .ok();
@@ -383,6 +384,10 @@ impl App {
                        None
                    }
                }),
+            fallback_syntax: self
+                .matches
+                .get_one::<String>("fallback-syntax")
+                .map(|s| s.as_str()),
            show_nonprintable: self.matches.get_flag("show-all"),
            nonprintable_notation: match self
                .matches
@@ -398,27 +403,30 @@ impl App {
                Some("no-printing") => BinaryBehavior::NoPrinting,
                _ => unreachable!("other values for --binary are not allowed"),
            },
-            wrapping_mode: if self.interactive_output || maybe_term_width.is_some() {
-                if !self.matches.get_flag("chop-long-lines") {
+            wrapping_mode: {
+                if self.matches.get_flag("chop-long-lines") {
+                    WrappingMode::NoWrapping(true)
+                } else {
                    match self.matches.get_one::<String>("wrap").map(|s| s.as_str()) {
                        Some("character") => WrappingMode::Character,
+                        Some("word") => WrappingMode::Word,
                        Some("never") => WrappingMode::NoWrapping(true),
                        Some("auto") | None => {
-                            if style_components.plain() {
-                                WrappingMode::NoWrapping(false)
+                            if self.interactive_output || maybe_term_width.is_some() {
+                                if style_components.plain() && maybe_term_width.is_none() {
+                                    WrappingMode::NoWrapping(false)
+                                } else {
+                                    WrappingMode::Character
+                                }
                            } else {
-                                WrappingMode::Character
+                                // We don't have the tty width when piping to another program.
+                                // There's no point in wrapping when this is the case.
+                                WrappingMode::NoWrapping(false)
                            }
                        }
                        _ => unreachable!("other values for --wrap are not allowed"),
                    }
-                } else {
-                    WrappingMode::NoWrapping(true)
                }
-            } else {
-                // We don't have the tty width when piping to another program.
-                // There's no point in wrapping when this is the case.
-                WrappingMode::NoWrapping(false)
            },
            colored_output: self.matches.get_flag("force-colorization")
                || match self.matches.get_one::<String>("color").map(|s| s.as_str()) {
@@ -460,6 +468,8 @@ impl App {
                Some("auto") => StripAnsiMode::Auto,
                _ => unreachable!("other values for --strip-ansi are not allowed"),
            },
+            quiet_empty: self.matches.get_flag("quiet-empty"),
+            unbuffered: self.matches.get_flag("unbuffered"),
            theme: theme(self.theme_options()).to_string(),
            visible_lines: match self.matches.try_contains_id("diff").unwrap_or_default()
                && self.matches.get_flag("diff")
@@ -580,7 +590,17 @@ impl App {

        // Plain if `--plain` is specified at least once.
        if self.matches.get_count("plain") > 0 {
-            return Some(StyleComponents(HashSet::from([StyleComponent::Plain])));
+            let mut components = HashSet::from([StyleComponent::Plain]);
+            // When --diff is active, preserve change markers and snip separators
+            // so that diff output remains visually useful.
+            if self.matches.try_contains_id("diff").unwrap_or_default()
+                && self.matches.get_flag("diff")
+            {
+                #[cfg(feature = "git")]
+                components.insert(StyleComponent::Changes);
+                components.insert(StyleComponent::Snip);
+            }
+            return Some(StyleComponents(components));
        }

        // Default behavior.
@@ -617,10 +637,15 @@ impl App {
            bat_warning!("Style 'rule' is a subset of style 'grid', 'rule' will not be visible.");
        }

+        // Auto-disable line numbers in unbuffered mode to avoid confusion with partial lines
+        if self.matches.get_flag("unbuffered") {
+            styled_components.0.remove(&StyleComponent::LineNumbers);
+        }
+
        Ok(styled_components)
    }

-    fn theme_options(&self) -> ThemeOptions {
+    pub(crate) fn theme_options(&self) -> ThemeOptions {
        Self::theme_options_from_matches(&self.matches)
    }

@@ -1,7 +1,5 @@
 use bat::style::StyleComponentList;
-use clap::{
-    crate_name, crate_version, value_parser, Arg, ArgAction, ArgGroup, ColorChoice, Command,
-};
+use clap::{crate_name, crate_version, value_parser, Arg, ArgAction, ColorChoice, Command};
 use once_cell::sync::Lazy;
 use std::env;
 use std::path::{Path, PathBuf};
@@ -122,6 +120,17 @@ pub fn build_app(interactive_output: bool) -> Command {
                     language names and file extensions.",
                ),
        )
+        .arg(
+            Arg::new("fallback-syntax")
+                .long("fallback-syntax")
+                .visible_alias("fallback-language")
+                .help("Set a fallback language for undetected syntaxes.")
+                .long_help(
+                    "Set a fallback language for syntax highlighting when auto-detection fails. \
+                     Unlike '--language', this is only used when no syntax could be detected from \
+                     filename, custom syntax mappings, or first-line detection.",
+                ),
+        )
        .arg(
            Arg::new("highlight-line")
                .long("highlight-line")
@@ -213,11 +222,11 @@ pub fn build_app(interactive_output: bool) -> Command {
                .long("wrap")
                .overrides_with("wrap")
                .value_name("mode")
-                .value_parser(["auto", "never", "character"])
+                .value_parser(["auto", "never", "character", "word"])
                .default_value("auto")
                .hide_default_value(true)
-                .help("Specify the text-wrapping mode (*auto*, never, character).")
-                .long_help("Specify the text-wrapping mode (*auto*, never, character). \
+                .help("Specify the text-wrapping mode (*auto*, never, character, word).")
+                .long_help("Specify the text-wrapping mode (*auto*, never, character, word). \
                           The '--terminal-width' option can be used in addition to \
                           control the output width."),
        )
@@ -231,6 +240,7 @@ pub fn build_app(interactive_output: bool) -> Command {
        .arg(
            Arg::new("terminal-width")
                .long("terminal-width")
+                .overrides_with("terminal-width")
                .value_name("width")
                .hide_short_help(true)
                .allow_hyphen_values(true)
@@ -246,10 +256,13 @@ pub fn build_app(interactive_output: bool) -> Command {
                            })
                            .map_err(|e| e.to_string())
                    })
-                .help(
+                .help("Explicitly set the width of the terminal instead of determining it automatically.")
+                .long_help(
                    "Explicitly set the width of the terminal instead of determining it \
                     automatically. If prefixed with '+' or '-', the value will be treated \
-                     as an offset to the actual terminal width. See also: '--wrap'.",
+                     as an offset to the actual terminal width. This can also be configured \
+                     via the BAT_WIDTH environment variable (e.g. export BAT_WIDTH=\"100\"). \
+                     See also: '--wrap'.",
                ),
        )
        .arg(
@@ -550,11 +563,14 @@ pub fn build_app(interactive_output: bool) -> Command {
                .short('u')
                .long("unbuffered")
                .action(ArgAction::SetTrue)
-                .hide_short_help(true)
+                .help("Enable unbuffered input reading for streaming use cases.")
                .long_help(
-                    "This option exists for POSIX-compliance reasons ('u' is for \
-                     'unbuffered'). The output is always unbuffered - this option \
-                     is simply ignored.",
+                    "Enable unbuffered input reading. When this flag is set, bat will \
+                     display data as soon as it is available, without waiting for a \
+                     complete line. This is useful for streaming use cases like \
+                     'tail -f logfile | bat -u --paging=never'. Note that line numbers \
+                     are automatically disabled in unbuffered mode, and syntax \
+                     highlighting may be imperfect on partial lines.",
                ),
        )
        .arg(
@@ -643,6 +659,18 @@ pub fn build_app(interactive_output: bool) -> Command {
                .hide_short_help(true)
                .help("Show diagnostic information for bug reports."),
        )
+        .arg(
+            Arg::new("quiet-empty")
+                .long("quiet-empty")
+                .short('E')
+                .action(ArgAction::SetTrue)
+                .help("Produce no output when the input is empty.")
+                .long_help(
+                    "When this flag is set, bat will produce no output at all when \
+                     the input is empty. This is useful when piping commands that may \
+                     produce empty output, like 'git diff'.",
+                ),
+        )
        .arg(
            Arg::new("acknowledgements")
                .long("acknowledgements")
@@ -682,11 +710,20 @@ pub fn build_app(interactive_output: bool) -> Command {
            Command::new("cache")
                .hide(true)
                .about("Modify the syntax-definition and theme cache")
+                .arg_required_else_help(true)
+                .arg(
+                    Arg::new("help")
+                        .short('h')
+                        .long("help")
+                        .action(ArgAction::Help)
+                        .help("Print help"),
+                )
                .arg(
                    Arg::new("build")
                        .long("build")
                        .short('b')
                        .action(ArgAction::SetTrue)
+                        .conflicts_with("clear")
                        .help("Initialize (or update) the syntax/theme cache.")
                        .long_help(
                            "Initialize (or update) the syntax/theme cache by loading from \
@@ -698,13 +735,9 @@ pub fn build_app(interactive_output: bool) -> Command {
                        .long("clear")
                        .short('c')
                        .action(ArgAction::SetTrue)
+                        .conflicts_with("build")
                        .help("Remove the cached syntax definitions and themes."),
                )
-                .group(
-                    ArgGroup::new("cache-actions")
-                        .args(["build", "clear"])
-                        .required(true),
-                )
                .arg(
                    Arg::new("source")
                        .long("source")
@@ -2,7 +2,7 @@ use std::env;
 use std::ffi::OsString;
 use std::fs;
 use std::io::{self, Write};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};

 use crate::directories::PROJECT_DIRS;

@@ -104,18 +104,32 @@ pub fn generate_config_file() -> bat::error::Result<()> {
 pub fn get_args_from_config_file() -> Result<Vec<OsString>, shell_words::ParseError> {
    let mut config = String::new();

-    if let Ok(c) = fs::read_to_string(system_config_file()) {
+    let system_config = system_config_file();
+    let user_config = config_file();
+
+    if let Ok(c) = fs::read_to_string(&system_config) {
        config.push_str(&c);
        config.push('\n');
    }

-    if let Ok(c) = fs::read_to_string(config_file()) {
-        config.push_str(&c);
+    // Skip the user config if it resolves to the same file as the system config,
+    // which can happen when BAT_CONFIG_DIR is set to e.g. "/etc/bat". See #3589.
+    if !same_file(&system_config, &user_config) {
+        if let Ok(c) = fs::read_to_string(&user_config) {
+            config.push_str(&c);
+        }
    }

    get_args_from_str(&config)
 }

+fn same_file(a: &Path, b: &Path) -> bool {
+    match (fs::canonicalize(a), fs::canonicalize(b)) {
+        (Ok(a), Ok(b)) => a == b,
+        _ => a == b,
+    }
+}
+
 pub fn get_args_from_env_opts_var() -> Option<Result<Vec<OsString>, shell_words::ParseError>> {
    env::var("BAT_OPTS").ok().map(|s| get_args_from_str(&s))
 }
@@ -139,6 +153,7 @@ fn get_args_from_str(content: &str) -> Result<Vec<OsString>, shell_words::ParseE
 pub fn get_args_from_env_vars() -> Vec<OsString> {
    [
        ("--tabs", "BAT_TABS"),
+        ("--terminal-width", "BAT_WIDTH"),
        ("--theme", bat::theme::env::BAT_THEME),
        ("--theme-dark", bat::theme::env::BAT_THEME_DARK),
        ("--theme-light", bat::theme::env::BAT_THEME_LIGHT),
@@ -214,3 +229,40 @@ fn comments() {
        get_args_from_str(config).unwrap()
    );
 }
+
+#[test]
+fn same_file_identical_paths() {
+    let dir = tempfile::tempdir().unwrap();
+    let file = dir.path().join("config");
+    fs::write(&file, "").unwrap();
+    assert!(same_file(&file, &file));
+}
+
+#[test]
+fn same_file_different_paths() {
+    let dir = tempfile::tempdir().unwrap();
+    let a = dir.path().join("a");
+    let b = dir.path().join("b");
+    fs::write(&a, "").unwrap();
+    fs::write(&b, "").unwrap();
+    assert!(!same_file(&a, &b));
+}
+
+#[test]
+fn same_file_nonexistent() {
+    let dir = tempfile::tempdir().unwrap();
+    let a = dir.path().join("a");
+    let b = dir.path().join("b");
+    assert!(!same_file(&a, &b));
+}
+
+#[cfg(unix)]
+#[test]
+fn same_file_via_symlink() {
+    let dir = tempfile::tempdir().unwrap();
+    let original = dir.path().join("config");
+    let link = dir.path().join("link");
+    fs::write(&original, "").unwrap();
+    std::os::unix::fs::symlink(&original, &link).unwrap();
+    assert!(same_file(&original, &link));
+}
@@ -17,7 +17,6 @@ use std::path::Path;
 use std::process;

 use bat::output::{OutputHandle, OutputType};
-use bat::theme::DetectColorScheme;
 use nu_ansi_term::Color::Green;
 use nu_ansi_term::Style;

@@ -39,7 +38,7 @@ use bat::{
    error::*,
    input::Input,
    style::{StyleComponent, StyleComponents},
-    theme::{color_scheme, default_theme, ColorScheme},
+    theme::{default_theme, theme, ColorScheme, ThemeOptions},
    MappingTarget, PagingMode,
 };

@@ -153,7 +152,14 @@ pub fn get_languages(config: &Config, cache_dir: &Path) -> Result<String> {
        let comma_separator = ", ";
        let separator = " ";
        // Line-wrapping for the possible file extension overflow.
-        let desired_width = config.term_width - longest - separator.len();
+        // Clamp instead of subtracting: a tiny `--terminal-width` (smaller than the
+        // longest language name) would otherwise underflow `usize` and wrap to a huge
+        // value, silently disabling wrapping (and panicking in debug/overflow-checked
+        // builds). Mirrors the `saturating_sub` fix applied to `print_snip` in #3804.
+        let desired_width = config
+            .term_width
+            .saturating_sub(longest)
+            .saturating_sub(separator.len());

        let style = if config.colored_output {
            Green.normal()
@@ -197,7 +203,7 @@ pub fn list_themes(
    cfg: &Config,
    config_dir: &Path,
    cache_dir: &Path,
-    detect_color_scheme: DetectColorScheme,
+    theme_options: ThemeOptions,
 ) -> Result<()> {
    let assets = assets_from_cache_or_binary(cfg.use_custom_assets, cache_dir)?;
    let mut config = cfg.clone();
@@ -206,7 +212,7 @@ pub fn list_themes(
    config.language = Some("Rust");
    config.style_components = StyleComponents(style);

-    let default_theme_name = default_theme(color_scheme(detect_color_scheme).unwrap_or_default());
+    let default_theme_name = theme(theme_options).to_string();
    let mut buf = String::new();
    let mut handle = OutputHandle::FmtWrite(&mut buf);

@@ -259,7 +265,9 @@ pub fn list_themes(
 fn set_terminal_title_to(new_terminal_title: String) {
    let osc_command_for_setting_terminal_title = "\x1b]0;";
    let osc_end_command = "\x07";
-    print!("{osc_command_for_setting_terminal_title}{new_terminal_title}{osc_end_command}");
+    // Prevent BEL/ESC/C1 bytes in the title from terminating or nesting the OSC.
+    let safe_title = bat::sanitize_for_terminal(&new_terminal_title);
+    print!("{osc_command_for_setting_terminal_title}{safe_title}{osc_end_command}");
    io::stdout().flush().unwrap();
 }

@@ -285,7 +293,28 @@ fn run_controller(inputs: Vec<Input>, config: &Config, cache_dir: &Path) -> Resu

 #[cfg(feature = "bugreport")]
 fn invoke_bugreport(app: &App, cache_dir: &Path) {
-    use bugreport::{bugreport, collector::*, format::Markdown};
+    use bugreport::{bugreport, collector::*, format::Markdown, report::ReportEntry};
+
+    struct ColorSchemeCollector;
+
+    impl Collector for ColorSchemeCollector {
+        fn description(&self) -> &str {
+            "Detected terminal color scheme"
+        }
+
+        fn collect(
+            &mut self,
+            _: &bugreport::CrateInfo,
+        ) -> std::result::Result<ReportEntry, CollectionError> {
+            let color_scheme = bat::theme::color_scheme(bat::theme::DetectColorScheme::Always);
+            let text = match color_scheme {
+                Some(bat::theme::ColorScheme::Dark) => "dark",
+                Some(bat::theme::ColorScheme::Light) => "light",
+                None => "not detected",
+            };
+            Ok(ReportEntry::Text(text.to_string()))
+        }
+    }
    let pager = bat::config::get_pager_executable(
        app.matches.get_one::<String>("pager").map(|s| s.as_str()),
    )
@@ -307,6 +336,9 @@ fn invoke_bugreport(app: &App, cache_dir: &Path) {
            "BAT_STYLE",
            "BAT_TABS",
            "BAT_THEME",
+            "BAT_WIDTH",
+            bat::theme::env::BAT_THEME_DARK,
+            bat::theme::env::BAT_THEME_LIGHT,
            "COLORTERM",
            "LANG",
            "LC_ALL",
@@ -326,6 +358,7 @@ fn invoke_bugreport(app: &App, cache_dir: &Path) {
            custom_assets_metadata,
        ))
        .info(DirectoryEntries::new("Custom assets", cache_dir))
+        .info(ColorSchemeCollector)
        .info(CompileTimeInformation::default());

    #[cfg(feature = "paging")]
@@ -401,7 +434,7 @@ fn run() -> Result<bool> {
                };
                run_controller(inputs, &plain_config, cache_dir)
            } else if app.matches.get_flag("list-themes") {
-                list_themes(&config, config_dir, cache_dir, DetectColorScheme::default())?;
+                list_themes(&config, config_dir, cache_dir, app.theme_options())?;
                Ok(true)
            } else if app.matches.get_flag("config-file") {
                println!("{}", config_file().to_string_lossy());
@@ -38,6 +38,9 @@ pub struct Config<'a> {
    /// The explicitly configured language, if any
    pub language: Option<&'a str>,

+    /// The fallback syntax used when auto-detection fails
+    pub fallback_syntax: Option<&'a str>,
+
    /// Whether or not to show/replace non-printable characters like space, tab and newline.
    pub show_nonprintable: bool,

@@ -99,14 +102,20 @@ pub struct Config<'a> {
    #[cfg(feature = "lessopen")]
    pub use_lessopen: bool,

-    // Weather or not to set terminal title when using a pager
+    // Whether or not to set terminal title when using a pager
    pub set_terminal_title: bool,

    /// The maximum number of consecutive empty lines to display
    pub squeeze_lines: Option<usize>,

-    // Weather or not to set terminal title when using a pager
+    // Whether or not to strip ANSI escape codes from the input
    pub strip_ansi: StripAnsiMode,
+
+    /// Whether or not to produce no output when input is empty
+    pub quiet_empty: bool,
+
+    /// Whether or not to use unbuffered input reading for streaming use cases
+    pub unbuffered: bool,
 }

 #[cfg(all(feature = "minimal-application", feature = "paging"))]
@@ -158,6 +158,7 @@ impl Controller<'_> {
            #[cfg(not(feature = "lessopen"))]
            input.open(stdin, stdout_identifier)?
        };
+        opened_input.reader.unbuffered = self.config.unbuffered;
        #[cfg(feature = "git")]
        let line_changes = if self.config.visible_lines.diff_mode()
            || (!self.config.loop_through && self.config.style_components.changes())
@@ -327,6 +328,9 @@ impl Controller<'_> {
                    }

                    printer.print_line(false, writer, line_nr, &line, max_buffered_line_number)?;
+                    if self.config.unbuffered {
+                        writer.flush()?;
+                    }
                }
                RangeCheckResult::AfterLastRange => {
                    break;
@@ -1,12 +1,13 @@
 #![cfg(feature = "git")]

+use gix::diff::blob::pipeline::{Mode, WorktreeRoots};
+use gix::diff::blob::{Algorithm, HunkIter, ResourceKind};
+use gix::object::tree::EntryKind;
+use path_abs::PathInfo;
 use std::collections::HashMap;
-use std::fs;
 use std::path::Path;

-use git2::{DiffOptions, IntoCString, Repository};
-
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum LineChange {
    Added,
    RemovedAbove,
@@ -16,68 +17,181 @@ pub enum LineChange {

 pub type LineChanges = HashMap<u32, LineChange>;

-pub fn get_git_diff(filename: &Path) -> Option<LineChanges> {
-    let repo = Repository::discover(filename).ok()?;
-
-    let repo_path_absolute = fs::canonicalize(repo.workdir()?).ok()?;
-
-    let filepath_absolute = fs::canonicalize(filename).ok()?;
-    let filepath_relative_to_repo = filepath_absolute.strip_prefix(&repo_path_absolute).ok()?;
-
-    let mut diff_options = DiffOptions::new();
-    let pathspec = filepath_relative_to_repo.into_c_string().ok()?;
-    diff_options.pathspec(pathspec);
-    diff_options.context_lines(0);
-
-    let diff = repo
-        .diff_index_to_workdir(None, Some(&mut diff_options))
-        .ok()?;
-
-    let mut line_changes: LineChanges = HashMap::new();
-
-    let mark_section =
-        |line_changes: &mut LineChanges, start: u32, end: i32, change: LineChange| {
-            for line in start..=end as u32 {
-                line_changes.insert(line, change);
+fn collect_changes_from_hunks(hunks: HunkIter) -> Option<LineChanges> {
+    let mut changes: LineChanges = HashMap::new();
+    for hunk in hunks {
+        if hunk.before.is_empty() && !hunk.after.is_empty() {
+            for line in hunk.after {
+                changes.insert(line + 1, LineChange::Added);
            }
-        };
-
-    let _ = diff.foreach(
-        &mut |_, _| true,
-        None,
-        Some(&mut |delta, hunk| {
-            let path = delta.new_file().path().unwrap_or_else(|| Path::new(""));
-
-            if filepath_relative_to_repo != path {
-                return false;
-            }
-
-            let old_lines = hunk.old_lines();
-            let new_start = hunk.new_start();
-            let new_lines = hunk.new_lines();
-            let new_end = (new_start + new_lines) as i32 - 1;
-
-            if old_lines == 0 && new_lines > 0 {
-                mark_section(&mut line_changes, new_start, new_end, LineChange::Added);
-            } else if new_lines == 0 && old_lines > 0 {
-                if new_start == 0 {
-                    mark_section(&mut line_changes, 1, 1, LineChange::RemovedAbove);
-                } else {
-                    mark_section(
-                        &mut line_changes,
-                        new_start,
-                        new_start as i32,
-                        LineChange::RemovedBelow,
-                    );
-                }
+        } else if hunk.after.is_empty() && !hunk.before.is_empty() {
+            if hunk.after.start == 0 {
+                changes.insert(1, LineChange::RemovedAbove);
            } else {
-                mark_section(&mut line_changes, new_start, new_end, LineChange::Modified);
+                changes.insert(hunk.after.start, LineChange::RemovedBelow);
            }
+        } else {
+            for line in hunk.after {
+                changes.insert(line + 1, LineChange::Modified);
+            }
+        }
+    }

-            true
-        }),
-        None,
+    Some(changes)
+}
+
+pub fn get_git_diff(filename: &Path) -> Option<LineChanges> {
+    let filepath_absolute = filename.canonicalize().ok()?;
+    let repository = gix::discover(filepath_absolute.parent().ok()?).ok()?;
+    let repo_path_absolute = repository.workdir()?.canonicalize().ok()?;
+    let filepath_relative_to_repo = gix::path::to_unix_separators_on_windows(gix::path::into_bstr(
+        filepath_absolute.strip_prefix(&repo_path_absolute).ok()?,
+    ));
+    let index = repository.index_or_load_from_head_or_empty().ok()?;
+    let index_entry = index.entry_by_path(filepath_relative_to_repo.as_ref())?;
+    let mut cache = repository
+        .diff_resource_cache(
+            Mode::ToGit,
+            WorktreeRoots {
+                old_root: None,
+                new_root: repository.workdir().map(Path::to_path_buf),
+            },
+        )
+        .ok()?;
+    cache
+        .set_resource(
+            index_entry.id,
+            index_entry.mode.to_tree_entry_mode()?.kind(),
+            filepath_relative_to_repo.as_ref(),
+            ResourceKind::OldOrSource,
+            &repository,
+        )
+        .ok()?;
+    cache
+        .set_resource(
+            repository.object_hash().null(),
+            EntryKind::Blob,
+            filepath_relative_to_repo.as_ref(),
+            ResourceKind::NewOrDestination,
+            &repository,
+        )
+        .ok()?;
+    let diff = gix::diff::blob::diff_with_slider_heuristics(
+        Algorithm::Histogram,
+        &cache.prepare_diff().ok()?.interned_input(),
    );

-    Some(line_changes)
+    collect_changes_from_hunks(diff.hunks())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::{get_git_diff, LineChange};
+    use std::path::{Path, PathBuf};
+    use std::process::Command;
+
+    fn git(repo: &Path, args: &[&str]) {
+        let output = Command::new("git")
+            .args(args)
+            .current_dir(repo)
+            .output()
+            .expect("git command can run");
+        assert!(
+            output.status.success(),
+            "git {args:?} failed\nstdout: {}\nstderr: {}",
+            String::from_utf8_lossy(&output.stdout),
+            String::from_utf8_lossy(&output.stderr)
+        );
+    }
+
+    fn setup_repo() -> tempfile::TempDir {
+        let dir = tempfile::tempdir().expect("can create temporary directory");
+        let repo = dir.path();
+        git(repo, &["init"]);
+        git(repo, &["config", "user.email", "test@test.test"]);
+        git(repo, &["config", "user.name", "Test"]);
+        dir
+    }
+
+    fn create_and_track_file(repo: &tempfile::TempDir, filename: &str) -> PathBuf {
+        let filepath = repo.path().join(filename);
+        std::fs::write(&filepath, "file\n").expect("can write file");
+        git(repo.path(), &["add", filename]);
+        git(repo.path(), &["commit", "-m", "initial"]);
+
+        filepath.to_owned()
+    }
+
+    #[test]
+    fn not_a_git_repository() {
+        let dir = tempfile::tempdir().expect("can create temporary directory");
+        let file = dir.path().join("file.txt");
+        std::fs::write(&file, "line 1\n").expect("can write file");
+
+        assert_eq!(get_git_diff(&file), None);
+    }
+
+    #[test]
+    fn diff_is_calculated_against_index() {
+        let repo = setup_repo();
+        let file = create_and_track_file(&repo, "file.txt");
+
+        std::fs::write(&file, "line 1\nline 2 modified\n").expect("can write file");
+        // Add modified file to index -> should find 0 changes but not none
+        git(repo.path(), &["add", "file.txt"]);
+
+        assert_eq!(get_git_diff(&file).expect("empty map").len(), 0);
+    }
+
+    #[test]
+    fn diff_is_calculated_against_index_2() {
+        let repo = setup_repo();
+        let file = create_and_track_file(&repo, "file.txt");
+
+        std::fs::write(&file, "line 1\nline 2 modified\n").expect("can write file");
+        git(repo.path(), &["add", "file.txt"]);
+        // modify the second line again which should show a single change
+        std::fs::write(&file, "line 1\nline 2 modified again\n").expect("can write file");
+
+        assert_eq!(get_git_diff(&file).expect("one change").len(), 1);
+    }
+
+    #[test]
+    fn diff_is_calculated_correctly() {
+        let repo = setup_repo();
+        create_and_track_file(&repo, "committed.txt");
+        let filename = "committed2.txt";
+        let file = create_and_track_file(&repo, filename);
+
+        std::fs::write(&file, "file\nline 2 added\n").expect("can write file");
+        let mut changes = get_git_diff(&file).expect("multiple changes");
+        assert_eq!(changes.get(&2), Some(&LineChange::Added));
+        git(repo.path(), &["add", filename]);
+
+        std::fs::write(&file, "file\nline 2 modified\n").expect("can write file");
+        changes = get_git_diff(&file).expect("multiple changes");
+        assert_eq!(changes.get(&2), Some(&LineChange::Modified));
+        git(repo.path(), &["add", filename]);
+
+        std::fs::write(&file, "line 2 modified\nline 3 added").expect("can write file");
+        changes = get_git_diff(&file).expect("multiple changes");
+        assert_eq!(changes.get(&1), Some(&LineChange::RemovedAbove));
+        assert_eq!(changes.get(&2), Some(&LineChange::Added));
+    }
+
+    #[test]
+    fn faulty_git_version_does_not_panic() {
+        let repo = setup_repo();
+        let file = create_and_track_file(&repo, "file.txt");
+        std::fs::write(&file, "line 1\nline 2 modified\n").expect("can write file");
+        // changes are detected
+        assert_eq!(get_git_diff(&file).expect("one change").len(), 2);
+        // write invalid repositoryformatversion
+        git(
+            repo.path(),
+            &["config", "core.repositoryformatversion", "one"],
+        );
+        // changes are no longer detected
+        assert_eq!(get_git_diff(&file), None);
+    }
 }
@@ -207,7 +207,7 @@ impl<'a> Input<'a> {
                    kind: OpenedInputKind::StdIn,
                    description,
                    metadata: self.metadata,
-                    reader: InputReader::new(stdin),
+                    reader: InputReader::try_new(stdin)?,
                })
            }

@@ -216,34 +216,34 @@ impl<'a> Input<'a> {
                description,
                metadata: self.metadata,
                reader: {
-                    let mut file = File::open(&path)
-                        .map_err(|e| format!("'{}': {e}", path.to_string_lossy()))?;
+                    let path_display =
+                        crate::preprocessor::sanitize_for_terminal(&path.to_string_lossy());
+                    let mut file =
+                        File::open(&path).map_err(|e| format!("'{path_display}': {e}"))?;
                    if file.metadata()?.is_dir() {
-                        return Err(format!("'{}' is a directory.", path.to_string_lossy()).into());
+                        return Err(format!("'{path_display}' is a directory.").into());
                    }

                    if let Some(stdout) = stdout_identifier {
-                        let input_identifier = Identifier::try_from(file).map_err(|e| {
-                            format!("{}: Error identifying file: {e}", path.to_string_lossy())
-                        })?;
+                        let input_identifier = Identifier::try_from(file)
+                            .map_err(|e| format!("{path_display}: Error identifying file: {e}"))?;
                        if stdout.surely_conflicts_with(&input_identifier) {
                            return Err(format!(
-                                "IO circle detected. The input from '{}' is also an output. Aborting to avoid infinite loop.",
-                                path.to_string_lossy()
+                                "IO circle detected. The input from '{path_display}' is also an output. Aborting to avoid infinite loop.",
                            )
                            .into());
                        }
                        file = input_identifier.into_inner().expect("The file was lost in the clircle::Identifier, this should not have happened...");
                    }

-                    InputReader::new(BufReader::new(file))
+                    InputReader::try_new(BufReader::new(file))?
                },
            }),
            InputKind::CustomReader(reader) => Ok(OpenedInput {
                description,
                kind: OpenedInputKind::CustomReader,
                metadata: self.metadata,
-                reader: InputReader::new(BufReader::new(reader)),
+                reader: InputReader::try_new(BufReader::new(reader))?,
            }),
        }
    }
@@ -253,30 +253,33 @@ pub(crate) struct InputReader<'a> {
    inner: Box<dyn BufRead + 'a>,
    pub(crate) first_line: Vec<u8>,
    pub(crate) content_type: Option<ContentType>,
+    pub(crate) unbuffered: bool,
 }

 impl<'a> InputReader<'a> {
-    pub(crate) fn new<R: BufRead + 'a>(mut reader: R) -> InputReader<'a> {
-        let mut first_line = vec![];
-        reader.read_until(b'\n', &mut first_line).ok();
+    #[cfg(test)]
+    pub(crate) fn new<R: BufRead + 'a>(reader: R) -> InputReader<'a> {
+        Self::try_new(reader).expect("reading the first line failed")
+    }

-        let content_type = if first_line.is_empty() {
-            None
-        } else {
-            Some(content_inspector::inspect(&first_line[..]))
-        };
+    pub(crate) fn try_new<R: BufRead + 'a>(mut reader: R) -> io::Result<InputReader<'a>> {
+        let mut first_line = vec![];
+        reader.read_until(b'\n', &mut first_line)?;
+
+        let content_type = inspect_content_type(&first_line);

        if content_type == Some(ContentType::UTF_16LE) {
-            read_utf16_line(&mut reader, &mut first_line, 0x00, 0x0A).ok();
+            read_utf16_line(&mut reader, &mut first_line, 0x00, 0x0A)?;
        } else if content_type == Some(ContentType::UTF_16BE) {
-            read_utf16_line(&mut reader, &mut first_line, 0x0A, 0x00).ok();
+            read_utf16_line(&mut reader, &mut first_line, 0x0A, 0x00)?;
        }

-        InputReader {
+        Ok(InputReader {
            inner: Box::new(reader),
            first_line,
            content_type,
-        }
+            unbuffered: false,
+        })
    }

    pub(crate) fn read_line(&mut self, buf: &mut Vec<u8>) -> io::Result<bool> {
@@ -292,9 +295,48 @@ impl<'a> InputReader<'a> {
            return read_utf16_line(&mut self.inner, buf, 0x0A, 0x00);
        }

+        if self.unbuffered {
+            return self.read_line_unbuffered(buf);
+        }
+
        let res = self.inner.read_until(b'\n', buf).map(|size| size > 0)?;
        Ok(res)
    }
+
+    fn read_line_unbuffered(&mut self, buf: &mut Vec<u8>) -> io::Result<bool> {
+        let available = self.inner.fill_buf()?;
+        if available.is_empty() {
+            return Ok(!buf.is_empty());
+        }
+        if let Some(pos) = available.iter().position(|&b| b == b'\n') {
+            buf.extend_from_slice(&available[..=pos]);
+            self.inner.consume(pos + 1);
+        } else {
+            let len = available.len();
+            buf.extend_from_slice(available);
+            self.inner.consume(len);
+        }
+        Ok(true)
+    }
+}
+
+fn inspect_content_type(first_line: &[u8]) -> Option<ContentType> {
+    if first_line.is_empty() {
+        return None;
+    }
+
+    let content_type = content_inspector::inspect(first_line);
+    if content_type == ContentType::UTF_8 && has_zip_signature(first_line) {
+        Some(ContentType::BINARY)
+    } else {
+        Some(content_type)
+    }
+}
+
+fn has_zip_signature(bytes: &[u8]) -> bool {
+    [b"PK\x03\x04", b"PK\x05\x06", b"PK\x07\x08"]
+        .into_iter()
+        .any(|signature| bytes.starts_with(signature))
 }

 fn read_utf16_line<R: BufRead>(
@@ -352,6 +394,43 @@ fn basic() {
    assert!(buffer.is_empty());
 }

+#[test]
+fn zip_magic_headers_are_treated_as_binary() {
+    for content in [b"PK\x03\x04hello", b"PK\x05\x06hello", b"PK\x07\x08hello"] {
+        let reader = InputReader::new(&content[..]);
+        assert_eq!(Some(ContentType::BINARY), reader.content_type);
+    }
+}
+
+#[test]
+fn non_zip_pk_prefix_is_not_treated_as_binary() {
+    assert_eq!(
+        Some(ContentType::UTF_8),
+        inspect_content_type(b"PK\x03\x03hello")
+    );
+}
+
+#[test]
+fn input_open_returns_initial_read_errors() {
+    struct FailingRead;
+
+    impl Read for FailingRead {
+        fn read(&mut self, _buf: &mut [u8]) -> io::Result<usize> {
+            Err(io::Error::other("initial read failed"))
+        }
+    }
+
+    let input = Input::from_reader(Box::new(FailingRead));
+    let result = input.open(io::empty(), None);
+
+    assert!(result.is_err());
+    assert!(result
+        .err()
+        .unwrap()
+        .to_string()
+        .contains("initial read failed"));
+}
+
 #[test]
 fn utf16le() {
    let content = b"\xFF\xFE\x73\x00\x0A\x00\x64\x00";
@@ -381,6 +460,89 @@ fn utf16le() {
    assert!(buffer.is_empty());
 }

+#[test]
+fn unbuffered_returns_partial_data() {
+    use std::io::Cursor;
+
+    let content = b"first line\npartial";
+    let mut reader = InputReader::new(Cursor::new(&content[..]));
+    reader.unbuffered = true;
+
+    // First call returns first_line (buffered during new())
+    let mut buffer = vec![];
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(res.unwrap());
+    assert_eq!(b"first line\n", &buffer[..]);
+
+    // Subsequent calls use unbuffered reading
+    buffer.clear();
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(res.unwrap());
+    assert_eq!(b"partial", &buffer[..]);
+
+    // EOF
+    buffer.clear();
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(!res.unwrap());
+    assert!(buffer.is_empty());
+}
+
+#[test]
+fn unbuffered_returns_complete_lines() {
+    use std::io::Cursor;
+
+    let content = b"line1\nline2\n";
+    let mut reader = InputReader::new(Cursor::new(&content[..]));
+    reader.unbuffered = true;
+
+    // First call returns first_line
+    let mut buffer = vec![];
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(res.unwrap());
+    assert_eq!(b"line1\n", &buffer[..]);
+
+    // Second call returns line2 (complete line with newline)
+    buffer.clear();
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(res.unwrap());
+    assert_eq!(b"line2\n", &buffer[..]);
+
+    // EOF
+    buffer.clear();
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(!res.unwrap());
+    assert!(buffer.is_empty());
+}
+
+#[test]
+fn unbuffered_eof_handling() {
+    use std::io::Cursor;
+
+    let content = b"only line\n";
+    let mut reader = InputReader::new(Cursor::new(&content[..]));
+    reader.unbuffered = true;
+
+    // First call returns first_line
+    let mut buffer = vec![];
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(res.unwrap());
+    assert_eq!(b"only line\n", &buffer[..]);
+
+    // EOF - empty buffer returns false
+    buffer.clear();
+    let res = reader.read_line(&mut buffer);
+    assert!(res.is_ok());
+    assert!(!res.unwrap());
+    assert!(buffer.is_empty());
+}
+
 #[test]
 fn utf16le_issue3367() {
    let content = b"\xFF\xFE\x0A\x4E\x00\x4E\x0A\x4F\x00\x52\x0A\x00\
@@ -14,6 +14,53 @@ use crate::{
    input::{Input, InputKind, InputReader, OpenedInput, OpenedInputKind},
 };

+/// Wrap `s` in POSIX single quotes. An embedded `'` is encoded as `'\''`
+/// (close, escaped quote, reopen) since `'...'` has no escape character.
+fn shell_quote(s: &str) -> String {
+    if !s.contains('\'') {
+        let mut quoted = String::with_capacity(s.len() + 2);
+        quoted.push('\'');
+        quoted.push_str(s);
+        quoted.push('\'');
+        return quoted;
+    }
+    let mut quoted = String::with_capacity(s.len() + 2);
+    quoted.push('\'');
+    for c in s.chars() {
+        if c == '\'' {
+            quoted.push_str("'\\''");
+        } else {
+            quoted.push(c);
+        }
+    }
+    quoted.push('\'');
+    quoted
+}
+
+/// Substitute the first `%s` in a $LESSOPEN/$LESSCLOSE template with a quoted value.
+fn shell_substitute(template: &str, replacement: &str) -> String {
+    template.replacen("%s", &shell_quote(replacement), 1)
+}
+
+/// Substitute the first two `%s` occurrences positionally in one pass; chaining
+/// `shell_substitute` twice would mis-target if `first` itself contains `%s`.
+fn shell_substitute_two(template: &str, first: &str, second: &str) -> String {
+    let mut out = String::with_capacity(template.len() + first.len() + second.len() + 4);
+    let mut remaining = template;
+    let mut to_substitute = [Some(first), Some(second)];
+    for slot in &mut to_substitute {
+        if let Some(idx) = remaining.find("%s") {
+            out.push_str(&remaining[..idx]);
+            out.push_str(&shell_quote(slot.take().unwrap()));
+            remaining = &remaining[idx + 2..];
+        } else {
+            break;
+        }
+    }
+    out.push_str(remaining);
+    out
+}
+
 /// Preprocess files and/or stdin using $LESSOPEN and $LESSCLOSE
 pub(crate) struct LessOpenPreprocessor {
    lessopen: String,
@@ -87,7 +134,7 @@ impl LessOpenPreprocessor {
                    None => return input.open(stdin, stdout_identifier),
                };

-                let mut lessopen_command = shell(self.lessopen.replacen("%s", path_str, 1));
+                let mut lessopen_command = shell(shell_substitute(&self.lessopen, path_str));
                lessopen_command.stdout(Stdio::piped());

                let lessopen_output = match lessopen_command.execute_output() {
@@ -122,7 +169,7 @@ impl LessOpenPreprocessor {
                    let mut stdin_buffer = Vec::new();
                    stdin.read_to_end(&mut stdin_buffer)?;

-                    let mut lessopen_command = shell(self.lessopen.replacen("%s", "-", 1));
+                    let mut lessopen_command = shell(shell_substitute(&self.lessopen, "-"));
                    lessopen_command.stdout(Stdio::piped());

                    let lessopen_output = match lessopen_command.execute_input_output(&stdin_buffer)
@@ -155,7 +202,7 @@ impl LessOpenPreprocessor {

        Ok(OpenedInput {
            kind,
-            reader: InputReader::new(BufReader::new(
+            reader: InputReader::try_new(BufReader::new(
                if matches!(self.kind, LessOpenKind::TempFile) {
                    let lessopen_string = match String::from_utf8(lessopen_stdout) {
                        Ok(string) => string,
@@ -181,7 +228,7 @@ impl LessOpenPreprocessor {
                        lessclose: self
                            .lessclose
                            .as_ref()
-                            .map(|s| s.replacen("%s", &path_str, 1).replacen("%s", &stdout, 1)),
+                            .map(|s| shell_substitute_two(s, &path_str, &stdout)),
                    }
                } else {
                    Preprocessed {
@@ -189,10 +236,10 @@ impl LessOpenPreprocessor {
                        lessclose: self
                            .lessclose
                            .as_ref()
-                            .map(|s| s.replacen("%s", &path_str, 1).replacen("%s", "-", 1)),
+                            .map(|s| shell_substitute_two(s, &path_str, "-")),
                    }
                },
-            )),
+            ))?,
            metadata: input.metadata,
            description: input.description,
        })
@@ -261,7 +308,7 @@ impl Drop for Preprocessed {
                }
            };

-            if lessclose_output.status.success() {
+            if !lessclose_output.status.success() {
                bat_warning!("$LESSCLOSE exited with nonzero exit code",)
            };
        }
@@ -384,4 +431,65 @@ mod tests {

        Ok(())
    }
+
+    #[test]
+    fn shell_quote_plain_filename() {
+        assert_eq!(super::shell_quote("file.txt"), "'file.txt'");
+        assert_eq!(super::shell_quote("with space.txt"), "'with space.txt'");
+        assert_eq!(super::shell_quote(""), "''");
+        assert_eq!(super::shell_quote("-"), "'-'");
+    }
+
+    #[test]
+    fn shell_quote_metacharacters_neutralised() {
+        assert_eq!(super::shell_quote("; rm -rf ~ ;"), "'; rm -rf ~ ;'");
+        assert_eq!(super::shell_quote("$(payload)"), "'$(payload)'");
+        assert_eq!(super::shell_quote("`payload`"), "'`payload`'");
+        assert_eq!(super::shell_quote("a|b&c;d"), "'a|b&c;d'");
+        assert_eq!(super::shell_quote("..>/dev/null"), "'..>/dev/null'");
+        assert_eq!(super::shell_quote("\n\t"), "'\n\t'");
+    }
+
+    #[test]
+    fn shell_quote_embedded_single_quote() {
+        assert_eq!(super::shell_quote("it's"), "'it'\\''s'");
+        assert_eq!(super::shell_quote("'"), "''\\'''");
+        assert_eq!(super::shell_quote("a'b'c"), "'a'\\''b'\\''c'");
+    }
+
+    #[test]
+    fn shell_substitute_only_replaces_first_percent_s() {
+        assert_eq!(super::shell_substitute("echo %s", "x"), "echo 'x'");
+        assert_eq!(super::shell_substitute("echo %s %s", "x"), "echo 'x' %s");
+    }
+
+    #[test]
+    fn shell_substitute_protects_against_filename_injection() {
+        let template = "|preproc %s";
+        let attacker_filename = "; rm -rf ~ ;";
+        let result = super::shell_substitute(template, attacker_filename);
+        assert_eq!(result, "|preproc '; rm -rf ~ ;'");
+    }
+
+    #[test]
+    fn shell_substitute_two_replaces_first_two_placeholders() {
+        assert_eq!(
+            super::shell_substitute_two("echo %s and %s done", "a", "b"),
+            "echo 'a' and 'b' done"
+        );
+        // A third %s is left alone.
+        assert_eq!(
+            super::shell_substitute_two("echo %s %s %s", "a", "b"),
+            "echo 'a' 'b' %s"
+        );
+    }
+
+    #[test]
+    fn shell_substitute_two_handles_percent_s_in_first_argument() {
+        // The chained-substitute approach would replace the injected `%s` here.
+        assert_eq!(
+            super::shell_substitute_two("a %s b %s c", "%s", "second"),
+            "a '%s' b 'second' c"
+        );
+    }
 }
@@ -54,6 +54,7 @@ mod vscreen;
 pub(crate) mod wrapping;

 pub use nonprintable_notation::{BinaryBehavior, NonprintableNotation};
+pub use preprocessor::sanitize_for_terminal;
 pub use preprocessor::StripAnsiMode;
 pub use pretty_printer::{Input, PrettyPrinter, Syntax};
 pub use syntax_mapping::{MappingTarget, SyntaxMapping};
@@ -23,6 +23,18 @@ pub struct BuiltinPager {
 impl BuiltinPager {
    fn new() -> Self {
        let pager = minus::Pager::new();
+
+        let mut input_register = minus::input::HashedEventRegister::default();
+        input_register.add_key_events(&["home"], |_, _| {
+            minus::input::InputEvent::UpdateUpperMark(0)
+        });
+        input_register.add_key_events(&["end"], |_, _| {
+            minus::input::InputEvent::UpdateUpperMark(usize::MAX)
+        });
+        pager
+            .set_input_classifier(Box::new(input_register))
+            .expect("failed to set input classifier on newly created pager");
+
        let handle = {
            let pager = pager.clone();
            Some(spawn(move || {
@@ -105,6 +117,10 @@ impl OutputType {
        let resolved_path = match grep_cli::resolve_binary(&pager.bin) {
            Ok(path) => path,
            Err(_) => {
+                crate::bat_warning!(
+                    "Pager '{}' not found, outputting to stdout instead",
+                    pager.bin
+                );
                return Ok(OutputType::stdout());
            }
        };
@@ -131,8 +147,13 @@ impl OutputType {
                    p.arg("-S"); // Short version of --chop-long-lines for compatibility
                }

+                let less_version = retrieve_less_version(&pager.bin);
+
                // Ensures that 'less' quits together with 'bat'
-                p.arg("-K"); // Short version of '--quit-on-intr'
+                // The BusyBox version of less does not support -K
+                if less_version != Some(LessVersion::BusyBox) {
+                    p.arg("-K"); // Short version of '--quit-on-intr'
+                }

                // Passing '--no-init' fixes a bug with '--quit-if-one-screen' in older
                // versions of 'less'. Unfortunately, it also breaks mouse-wheel support.
@@ -142,7 +163,7 @@ impl OutputType {
                // For newer versions (530 or 558 on Windows), we omit '--no-init' as it
                // is not needed anymore.
                if single_screen_action == SingleScreenAction::Quit {
-                    match retrieve_less_version(&pager.bin) {
+                    match less_version {
                        None => {
                            p.arg("--no-init");
                        }
@@ -169,7 +190,13 @@ impl OutputType {
        Ok(p.stdin(Stdio::piped())
            .spawn()
            .map(OutputType::Pager)
-            .unwrap_or_else(|_| OutputType::stdout()))
+            .unwrap_or_else(|_| {
+                crate::bat_warning!(
+                    "Pager '{}' not found, outputting to stdout instead",
+                    &pager.bin
+                );
+                OutputType::stdout()
+            }))
    }

    pub(crate) fn stdout() -> Self {
@@ -210,8 +237,8 @@ impl Drop for OutputType {
                let _ = command.wait();
            }
            OutputType::BuiltinPager(ref mut pager) => {
-                if pager.handle.is_some() {
-                    let _ = pager.handle.take().unwrap().join().unwrap();
+                if let Some(handle) = pager.handle.take() {
+                    let _ = handle.join();
                }
            }
            OutputType::Stdout(_) => (),
@@ -231,4 +258,11 @@ impl OutputHandle<'_> {
            Self::FmtWrite(handle) => handle.write_fmt(args).map_err(Into::into),
        }
    }
+
+    pub fn flush(&mut self) -> Result<()> {
+        match self {
+            Self::IoWrite(handle) => handle.flush().map_err(Into::into),
+            Self::FmtWrite(_) => Ok(()),
+        }
+    }
 }
@@ -149,6 +149,64 @@ pub fn strip_ansi(line: &str) -> String {
    buffer
 }

+/// Escape C0, DEL, and C1 control characters so a string from an untrusted
+/// filename or path can be safely written to the terminal.
+pub fn sanitize_for_terminal(input: &str) -> String {
+    if !input
+        .chars()
+        .any(|c| matches!(c, '\x00'..='\x08' | '\x0A'..='\x1F' | '\x7F'..='\u{9F}'))
+    {
+        return input.to_owned();
+    }
+
+    let mut out = String::with_capacity(input.len() + 8);
+    for c in input.chars() {
+        match c {
+            '\t' => out.push('\t'),
+            '\x00'..='\x1F' => {
+                out.push('^');
+                out.push(char::from_u32(0x40 + c as u32).unwrap_or('?'));
+            }
+            '\x7F' => out.push_str("^?"),
+            '\u{80}'..='\u{9F}' => {
+                use std::fmt::Write as _;
+                let _ = write!(out, "\\u{{{:x}}}", c as u32);
+            }
+            other => out.push(other),
+        }
+    }
+    out
+}
+
+/// Strips overstrike sequences (backspace formatting) from input.
+///
+/// Overstrike formatting is used by man pages and some help output:
+/// - Bold: `X\x08X` (character, backspace, same character)
+/// - Underline: `_\x08X` (underscore, backspace, character)
+///
+/// This function removes these sequences, keeping only the visible character.
+/// `first_backspace` is the position of the first backspace in the line.
+pub fn strip_overstrike(line: &str, first_backspace: usize) -> String {
+    let mut output = String::with_capacity(line.len());
+    output.push_str(&line[..first_backspace]);
+    output.pop();
+
+    let mut remaining = &line[first_backspace + 1..];
+
+    loop {
+        if let Some(pos) = remaining.find('\x08') {
+            output.push_str(&remaining[..pos]);
+            output.pop();
+            remaining = &remaining[pos + 1..];
+        } else {
+            output.push_str(remaining);
+            break;
+        }
+    }
+
+    output
+}
+
 #[derive(Debug, PartialEq, Clone, Copy, Default)]
 pub enum StripAnsiMode {
    #[default]
@@ -211,3 +269,61 @@ fn test_strip_ansi() {
        "multiple sequences"
    );
 }
+
+#[test]
+fn test_strip_overstrike() {
+    // Bold: X\x08X (same char repeated)
+    assert_eq!(strip_overstrike("H\x08Hello", 1), "Hello");
+
+    // Underline: _\x08X (underscore before char)
+    assert_eq!(strip_overstrike("_\x08Hello", 1), "Hello");
+
+    // Multiple overstrike sequences
+    assert_eq!(strip_overstrike("B\x08Bo\x08ol\x08ld\x08d", 1), "Bold");
+
+    // Backspace at start of line (nothing to pop)
+    assert_eq!(strip_overstrike("\x08Hello", 0), "Hello");
+
+    // Multiple consecutive backspaces
+    assert_eq!(strip_overstrike("ABC\x08\x08\x08XYZ", 3), "XYZ");
+
+    // Unicode with overstrike
+    assert_eq!(strip_overstrike("ä\x08äöü", 2), "äöü");
+}
+
+#[test]
+fn test_sanitize_for_terminal_passthrough() {
+    assert_eq!(sanitize_for_terminal(""), "");
+    assert_eq!(sanitize_for_terminal("hello.txt"), "hello.txt");
+    assert_eq!(sanitize_for_terminal("résumé.pdf"), "résumé.pdf");
+    assert_eq!(sanitize_for_terminal("日本語.md"), "日本語.md");
+    assert_eq!(
+        sanitize_for_terminal("path/with spaces/file.log"),
+        "path/with spaces/file.log"
+    );
+    assert_eq!(sanitize_for_terminal("a\tb"), "a\tb");
+}
+
+#[test]
+fn test_sanitize_for_terminal_c0_controls() {
+    assert_eq!(
+        sanitize_for_terminal("\x1b[31mINJECTED\x1b[0m.txt"),
+        "^[[31mINJECTED^[[0m.txt"
+    );
+    assert_eq!(sanitize_for_terminal("bad\x07rest"), "bad^Grest");
+    assert_eq!(sanitize_for_terminal("\x00\x08\n\r\x7F"), "^@^H^J^M^?");
+    assert_eq!(sanitize_for_terminal("\u{9b}31m"), "\\u{9b}31m");
+    assert_eq!(
+        sanitize_for_terminal("\u{9d}0;pwned\x07"),
+        "\\u{9d}0;pwned^G"
+    );
+}
+
+#[test]
+fn test_sanitize_for_terminal_idempotent_on_sanitized() {
+    let dirty = "\x1b]0;pwned\x07file.txt";
+    let clean = sanitize_for_terminal(dirty);
+    assert_eq!(sanitize_for_terminal(&clean), clean);
+    assert!(!clean.contains('\x1b'));
+    assert!(!clean.contains('\x07'));
+}
@@ -29,8 +29,9 @@ use crate::error::*;
 use crate::input::OpenedInput;
 use crate::line_range::{MaxBufferedLineNumber, RangeCheckResult};
 use crate::output::OutputHandle;
-use crate::preprocessor::strip_ansi;
-use crate::preprocessor::{expand_tabs, replace_nonprintable};
+use crate::preprocessor::{
+    expand_tabs, replace_nonprintable, sanitize_for_terminal, strip_ansi, strip_overstrike,
+};
 use crate::style::StyleComponent;
 use crate::terminal::{as_terminal_escaped, to_ansi_color};
 use crate::vscreen::{AnsiStyle, EscapeSequence, EscapeSequenceIterator};
@@ -38,6 +39,16 @@ use crate::wrapping::WrappingMode;
 use crate::BinaryBehavior;
 use crate::StripAnsiMode;

+// Return the displayed width of a character.
+//
+// Control characters (0x00..=0x1F and 0x7F) are rendered by the terminal
+// in caret notation (e.g. ^@, ^A, ..., ^?), which occupies two columns.
+// UnicodeWidthChar::width() returns None for these, so we map them to 2
+// here instead of the previous default of 0.
+fn char_width(c: char) -> usize {
+    c.width().unwrap_or(if c.is_control() { 2 } else { 0 })
+}
+
 const ANSI_UNDERLINE_ENABLE: EscapeSequence = EscapeSequence::CSI {
    raw_sequence: "\x1B[4m",
    parameters: "4",
@@ -199,6 +210,7 @@ pub(crate) struct InteractivePrinter<'a> {
    background_color_highlight: Option<Color>,
    consecutive_empty_lines: usize,
    strip_ansi: bool,
+    strip_overstrike: bool,
 }

 impl<'a> InteractivePrinter<'a> {
@@ -263,17 +275,27 @@ impl<'a> InteractivePrinter<'a> {
            || matches!(config.binary, BinaryBehavior::AsText))
            && (config.colored_output || config.strip_ansi == StripAnsiMode::Auto);

-        let (is_plain_text, highlighter_from_set) = if needs_to_match_syntax {
+        let (is_plain_text, strip_overstrike, highlighter_from_set) = if needs_to_match_syntax {
            // Determine the type of syntax for highlighting
            const PLAIN_TEXT_SYNTAX: &str = "Plain Text";
-            match assets.get_syntax(config.language, input, &config.syntax_mapping) {
+            const MANPAGE_SYNTAX: &str = "Manpage";
+            const COMMAND_HELP_SYNTAX: &str = "Command Help";
+            match assets.get_syntax(
+                config.language,
+                config.fallback_syntax,
+                input,
+                &config.syntax_mapping,
+            ) {
                Ok(syntax_in_set) => (
                    syntax_in_set.syntax.name == PLAIN_TEXT_SYNTAX,
+                    syntax_in_set.syntax.name == MANPAGE_SYNTAX
+                        || syntax_in_set.syntax.name == COMMAND_HELP_SYNTAX,
                    Some(HighlighterFromSet::new(syntax_in_set, theme)),
                ),

                Err(Error::UndetectedSyntax(_)) => (
                    true,
+                    false,
                    Some(
                        assets
                            .find_syntax_by_name(PLAIN_TEXT_SYNTAX)?
@@ -285,7 +307,7 @@ impl<'a> InteractivePrinter<'a> {
                Err(e) => return Err(e),
            }
        } else {
-            (false, None)
+            (false, false, None)
        };

        // Determine when to strip ANSI sequences
@@ -310,6 +332,7 @@ impl<'a> InteractivePrinter<'a> {
            background_color_highlight,
            consecutive_empty_lines: 0,
            strip_ansi,
+            strip_overstrike,
        })
    }

@@ -448,6 +471,11 @@ impl Printer for InteractivePrinter<'_> {
        input: &OpenedInput,
        add_header_padding: bool,
    ) -> Result<()> {
+        // If input is empty and quiet_empty is enabled, skip all output
+        if self.content_type.is_none() && self.config.quiet_empty {
+            return Ok(());
+        }
+
        if add_header_padding && self.config.style_components.rule() {
            self.print_horizontal_line_term(handle, self.colors.rule)?;
        }
@@ -463,7 +491,7 @@ impl Printer for InteractivePrinter<'_> {
                     (but will be present if the output of 'bat' is piped). You can use 'bat -A' \
                     to show the binary file contents.",
                    Yellow.paint("[bat warning]"),
-                    input.description.summary(),
+                    sanitize_for_terminal(&input.description.summary()),
                )?;
            } else if self.config.style_components.grid() {
                self.print_horizontal_line(handle, '┬')?;
@@ -517,9 +545,11 @@ impl Printer for InteractivePrinter<'_> {
                        "{}{}{mode}",
                        description
                            .kind()
-                            .map(|kind| format!("{kind}: "))
+                            .map(|kind| format!("{}: ", sanitize_for_terminal(kind)))
                            .unwrap_or_else(|| "".into()),
-                        self.colors.header_value.paint(description.title()),
+                        self.colors
+                            .header_value
+                            .paint(sanitize_for_terminal(description.title())),
                    );
                    self.print_header_multiline_component(handle, &header_filename)
                }
@@ -550,6 +580,11 @@ impl Printer for InteractivePrinter<'_> {
    }

    fn print_footer(&mut self, handle: &mut OutputHandle, _input: &OpenedInput) -> Result<()> {
+        // If input is empty and quiet_empty is enabled, skip footer
+        if self.content_type.is_none() && self.config.quiet_empty {
+            return Ok(());
+        }
+
        if self.config.style_components.grid()
            && (self.content_type.is_some_and(|c| c.is_text())
                || self.config.show_nonprintable
@@ -568,11 +603,23 @@ impl Printer for InteractivePrinter<'_> {
        let title = "8<";
        let title_count = title.chars().count();

-        let snip_left = "─ ".repeat((self.config.term_width - panel_count - (title_count / 2)) / 4);
+        let snip_left = "─ ".repeat(
+            self.config
+                .term_width
+                .saturating_sub(panel_count)
+                .saturating_sub(title_count / 2)
+                / 4,
+        );
        let snip_left_count = snip_left.chars().count(); // Can't use .len() with Unicode.

-        let snip_right =
-            " ─".repeat((self.config.term_width - panel_count - snip_left_count - title_count) / 2);
+        let snip_right = " ─".repeat(
+            self.config
+                .term_width
+                .saturating_sub(panel_count)
+                .saturating_sub(snip_left_count)
+                .saturating_sub(title_count)
+                / 2,
+        );

        writeln!(
            handle,
@@ -622,6 +669,12 @@ impl Printer for InteractivePrinter<'_> {
                }
            };

+            if self.strip_overstrike {
+                if let Some(pos) = line.find('\x08') {
+                    line = strip_overstrike(&line, pos).into();
+                }
+            }
+
            // If ANSI escape sequences are supposed to be stripped, do it before syntax highlighting.
            if self.strip_ansi {
                line = strip_ansi(&line).into()
@@ -759,11 +812,21 @@ impl Printer for InteractivePrinter<'_> {
                            // Displayed width of line_buf
                            let mut current_width = 0;

+                            let word_wrap = matches!(self.config.wrapping_mode, WrappingMode::Word);
+
+                            // For word wrapping, track last whitespace position.
+                            let mut last_ws_idx: Option<usize> = None;
+
                            for c in text.chars() {
                                // calculate the displayed width for next character
-                                let cw = c.width().unwrap_or(0);
+                                let cw = char_width(c);
                                current_width += cw;

+                                // Track whitespace positions for word wrapping.
+                                if word_wrap && c.is_whitespace() {
+                                    last_ws_idx = Some(line_buf.len());
+                                }
+
                                // if next character cannot be printed on this line,
                                // flush the buffer.
                                if current_width > max_width {
@@ -785,13 +848,37 @@ impl Printer for InteractivePrinter<'_> {
                                        }
                                    }

+                                    // Determine the break point and remainder
+                                    // for word wrapping.
+                                    let (emit_end, rest_start) = if word_wrap {
+                                        if let Some(ws_idx) = last_ws_idx {
+                                            // Skip the whitespace character itself
+                                            // and carry the rest to the next line.
+                                            let rs = ws_idx
+                                                + line_buf[ws_idx..]
+                                                    .chars()
+                                                    .next()
+                                                    .map(|ch| ch.len_utf8())
+                                                    .unwrap_or(0);
+                                            (ws_idx, Some(rs))
+                                        } else {
+                                            (line_buf.len(), None)
+                                        }
+                                    } else {
+                                        (line_buf.len(), None)
+                                    };
+
                                    // It wraps.
                                    write!(
                                        handle,
                                        "{}{}\n{}",
                                        as_terminal_escaped(
                                            style,
-                                            &format!("{}{line_buf}", self.ansi_style),
+                                            &format!(
+                                                "{}{}",
+                                                self.ansi_style,
+                                                &line_buf[..emit_end]
+                                            ),
                                            self.config.true_color,
                                            self.config.colored_output,
                                            self.config.use_italic_text,
@@ -804,8 +891,19 @@ impl Printer for InteractivePrinter<'_> {
                                    cursor = 0;
                                    max_width = cursor_max;

-                                    line_buf.clear();
-                                    current_width = cw;
+                                    if let Some(rs) = rest_start {
+                                        // Word wrap: carry remainder to next line.
+                                        let remainder = line_buf[rs..].to_string();
+                                        let rem_width: usize =
+                                            remainder.chars().map(char_width).sum();
+                                        line_buf.clear();
+                                        line_buf.push_str(&remainder);
+                                        current_width = rem_width + cw;
+                                    } else {
+                                        line_buf.clear();
+                                        current_width = cw;
+                                    }
+                                    last_ws_idx = None;
                                }

                                line_buf.push(c);
@@ -17,9 +17,16 @@ use ignored_suffixes::IgnoredSuffixes;
 mod builtin;
 pub mod ignored_suffixes;

-fn make_glob_matcher(from: &str) -> Result<GlobMatcher> {
+/// Whether a glob pattern should be matched case-sensitively or case-insensitively.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) enum Case {
+    Sensitive,
+    Insensitive,
+}
+
+fn make_glob_matcher(from: &str, case: Case) -> Result<GlobMatcher> {
    let matcher = GlobBuilder::new(from)
-        .case_insensitive(true)
+        .case_insensitive(matches!(case, Case::Insensitive))
        .literal_separator(true)
        .build()?
        .compile_matcher();
@@ -97,7 +104,14 @@ impl<'a> SyntaxMapping<'a> {
    }

    pub fn insert(&mut self, from: &str, to: MappingTarget<'a>) -> Result<()> {
-        let matcher = make_glob_matcher(from)?;
+        let matcher = make_glob_matcher(from, Case::Insensitive)?;
+        self.custom_mappings.push((matcher, to));
+        Ok(())
+    }
+
+    /// Like [`Self::insert`], but the glob pattern is matched case-sensitively.
+    pub fn insert_case_sensitive(&mut self, from: &str, to: MappingTarget<'a>) -> Result<()> {
+        let matcher = make_glob_matcher(from, Case::Sensitive)?;
        self.custom_mappings.push((matcher, to));
        Ok(())
    }
@@ -261,4 +275,41 @@ mod tests {
            Some(MappingTarget::MapTo("alpha"))
        );
    }
+
+    #[test]
+    fn case_sensitive_custom_mappings_work() {
+        let mut map = SyntaxMapping::new();
+        map.insert_case_sensitive("MY_SPECIAL_FILE", MappingTarget::MapTo("Python"))
+            .ok();
+
+        // Exact case matches
+        assert_eq!(
+            map.get_syntax_for("/path/to/MY_SPECIAL_FILE"),
+            Some(MappingTarget::MapTo("Python"))
+        );
+        // Different case should NOT match the case-sensitive rule
+        assert_eq!(map.get_syntax_for("/path/to/my_special_file"), None);
+        assert_eq!(map.get_syntax_for("/path/to/My_Special_File"), None);
+    }
+
+    #[test]
+    fn builtin_mappings_build_is_case_sensitive() {
+        let map = SyntaxMapping::new();
+
+        // "BUILD" (uppercase) should map to Python via case-sensitive builtin
+        assert_eq!(
+            map.get_syntax_for("/path/to/BUILD"),
+            Some(MappingTarget::MapTo("Python"))
+        );
+        // "build" (lowercase) should still map to MapToUnknown
+        assert_eq!(
+            map.get_syntax_for("/path/to/build"),
+            Some(MappingTarget::MapToUnknown)
+        );
+        // Mixed case should NOT match the Python rule
+        assert_eq!(
+            map.get_syntax_for("/path/to/Build"),
+            Some(MappingTarget::MapToUnknown)
+        );
+    }
 }
@@ -3,7 +3,7 @@ use std::env;
 use globset::GlobMatcher;
 use once_cell::sync::Lazy;

-use crate::syntax_mapping::{make_glob_matcher, MappingTarget};
+use crate::syntax_mapping::{make_glob_matcher, Case, MappingTarget};

 // Static syntax mappings generated from /src/syntax_mapping/builtins/ by the
 // build script (/build/syntax_mapping.rs).
@@ -53,8 +53,8 @@ include!(concat!(
 /// A failure to compile is a fatal error.
 ///
 /// Used internally by `Lazy<Option<GlobMatcher>>`'s lazy evaluation closure.
-fn build_matcher_fixed(from: &str) -> GlobMatcher {
-    make_glob_matcher(from).expect("A builtin fixed glob matcher failed to compile")
+fn build_matcher_fixed(from: &str, case: Case) -> GlobMatcher {
+    make_glob_matcher(from, case).expect("A builtin fixed glob matcher failed to compile")
 }

 /// Join a list of matcher segments to create a glob string, replacing all
@@ -64,7 +64,7 @@ fn build_matcher_fixed(from: &str) -> GlobMatcher {
 /// to compile.
 ///
 /// Used internally by `Lazy<Option<GlobMatcher>>`'s lazy evaluation closure.
-fn build_matcher_dynamic(segs: &[MatcherSegment]) -> Option<GlobMatcher> {
+fn build_matcher_dynamic(segs: &[MatcherSegment], case: Case) -> Option<GlobMatcher> {
    // join segments
    let mut buf = String::new();
    for seg in segs {
@@ -77,7 +77,7 @@ fn build_matcher_dynamic(segs: &[MatcherSegment]) -> Option<GlobMatcher> {
        }
    }
    // compile glob matcher
-    let matcher = make_glob_matcher(&buf).ok()?;
+    let matcher = make_glob_matcher(&buf, case).ok()?;
    Some(matcher)
 }

@@ -20,12 +20,10 @@ syntax mappings defined by all TOML files, and embed them into the binary.

 ## File syntax

-Each TOML file should contain a single section named `mappings`, with each of
-its keys being a language identifier (first column of `bat -L`; also referred to
-as "target").
+Each TOML file should contain a single section named `mappings`, with each of its keys being a language
+identifier (first column of `bat -L`; also referred to as "target").

-The value of each key should be an array of strings, with each item being a glob
-matcher. We will call each of these items a "rule".
+The value of each key should be an array of "rules". The rules are expected to be objects with a `glob` string and a `case_sensitive` boolean. For simplification, a rule can be just a glob string, which is shorthand for the default case insensitive mode.

 For example, if `foo-application` uses both TOML and YAML configuration files,
 we could write something like this:
@@ -98,6 +96,15 @@ like this:
 ]
 ```

+### Case sensitivity
+
+By default, all glob patterns are matched case-insensitively. To match a pattern case-sensitively, use the object form of the rule with the `case_sensitive` option:
+
+```toml
+[mappings]
+"Python" = [{ glob = "BUILD", case_sensitive = true }]
+```
+
 ## Ordering

 At compile time, all TOML files applicable to the target are processed in
@@ -0,0 +1,2 @@
+[mappings]
+"Python" = [{ glob = "BUILD", case_sensitive = true }]
@@ -1,2 +1,2 @@
 [mappings]
-"XML" = ["*.csproj", "*.vbproj", "*.props", "*.targets"]
+"XML" = ["*.csproj", "*.vbproj", "*.props", "*.targets", "*.slnx"]
@@ -0,0 +1,3 @@
+[mappings]
+"INI" = [".boto", "**/gcloud/configurations/config_*"]
+"Git Ignore" = [".gcloudignore"]
@@ -1,3 +1,3 @@
 # JSON Lines is a simple variation of JSON #2535
 [mappings]
-"JSON" = ["*.jsonl", "*.jsonc", "*.jsonld", "*.geojson", "*.ndjson"]
+"JSON" = ["*.jsonl", "*.jsonc", "*.jsonld", "*.geojson", "*.ndjson", "*.code-workspace"]
@@ -0,0 +1,2 @@
+[mappings]
+"Makefile" = ["justfile", "Justfile", ".justfile", "*.justfile"]
@@ -1,2 +1,2 @@
 [mappings]
-"SSH Config" = ["**/.ssh/config"]
+"SSH Config" = ["**/.ssh/**/config"]
@@ -0,0 +1,2 @@
+[mappings]
+"Git Ignore" = [".?*ignore"]
@@ -0,0 +1,2 @@
+[mappings]
+"INI" = ["/etc/dnf/dnf.conf", "/etc/yum.repos.d/*.repo"]
@@ -0,0 +1,2 @@
+[mappings]
+"INI" = ["**/ghostty/**/*.ghostty", "**/ghostty/themes/*"]
@@ -1,6 +1,7 @@
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum WrappingMode {
    Character,
+    Word,
    // The bool specifies whether wrapping has been explicitly disabled by the user via --wrap=never
    NoWrapping(bool),
 }
@@ -34,7 +34,6 @@ fn all_themes_are_present() {
            "Solarized (light)",
            "Sublime Snazzy",
            "TwoDark",
-            "Visual Studio Dark+",
            "ansi",
            "base16",
            "base16-256",
@@ -0,0 +1,30 @@
+GIT-COMMIT(1)                     Git Manual                     GIT-COMMIT(1)
+
+NNAAMMEE
+       git-commit - Record changes to the repository
+
+SSYYNNOOPPSSIISS
+       ggiitt ccoommmmiitt [--aa | ----iinntteerraaccttiivvee | ----ppaattcchh] [--ss] [--vv] [--uu[_<_m_o_d_e_>]] [----aammeenndd]
+               [----ddrryy--rruunn] [(--cc | --CC | ----ssqquuaasshh) _<_c_o_m_m_i_t_> | ----ffiixxuupp [(aammeenndd|rreewwoorrdd)::]_<_c_o_m_m_i_t_>]
+               [--FF _<_f_i_l_e_> | --mm _<_m_s_g_>] [----rreesseett--aauutthhoorr] [----aallllooww--eemmppttyy]
+               [----aallllooww--eemmppttyy--mmeessssaaggee] [----nnoo--vveerriiffyy] [--ee] [----aauutthhoorr==_<_a_u_t_h_o_r_>]
+               [----ddaattee==_<_d_a_t_e_>] [----cclleeaannuupp==_<_m_o_d_e_>] [----[nnoo--]ssttaattuuss]
+               [--ii | --oo] [----ppaatthhssppeecc--ffrroomm--ffiillee==_<_f_i_l_e_> [----ppaatthhssppeecc--ffiillee--nnuull]]
+               [(----ttrraaiilleerr _<_t_o_k_e_n_>[(==|::)_<_v_a_l_u_e_>])...] [--SS[_<_k_e_y_i_d_>]]
+               [----] [_<_p_a_t_h_s_p_e_c_>...]
+
+DDEESSCCRRIIPPTTIIOONN
+       Create a new commit containing the current contents of the index and
+       the given log message describing the changes. The new commit is a
+       direct child of HEAD, usually the tip of the current branch, and the
+       branch is updated to point to it (unless no branch is associated with
+       the working tree, in which case HHEEAADD is "detached" as described in ggiitt--
+       cchheecckkoouutt(1)).
+
+       The content to be committed can be specified in several ways:
+
+        1. by using ggiitt--aadddd(1) to incrementally "add" changes to the index
+           before using the ccoommmmiitt command (Note: even modified files must be
+           "added");
+
+        2. by using ggiitt--rrmm(1) to remove files from the working tree and the
@@ -0,0 +1 @@
+BBold tteexxtt and _u_n_d_e_r_l_i_n_e
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+NAME="${0##*/}"
+for i in {1..3}; do
+    echo "hello $NAME $i"
+done
@@ -0,0 +1,2 @@
+#!/usr/bin/expect -f
+set timeout 30
@@ -0,0 +1,2 @@
+#!/usr/bin/env tclsh
+puts "Hello from tclsh"
@@ -0,0 +1,2 @@
+#!/usr/bin/wish
+button .b -text "Click"
@@ -0,0 +1,3 @@
+The quick brown fox jumps over the lazy dog and then runs away
+superlongwordthatdefinitelyexceedstheterminalwidthandshouldfallbacktocharacterwrapping
+short words here
@@ -305,6 +305,19 @@ fn line_range_multiple() {
        .stdout("line 1\nline 2\nline 4\n");
 }

+#[test]
+fn snip_at_terminal_width_one_does_not_panic() {
+    bat()
+        .arg("multiline.txt")
+        .arg("--style=snip")
+        .arg("--color=always")
+        .arg("--terminal-width=1")
+        .arg("--line-range=1:2")
+        .arg("--line-range=4:4")
+        .assert()
+        .success();
+}
+
 #[test]
 fn line_range_multiple_with_context() {
    bat()
@@ -1047,6 +1060,57 @@ fn tabs_4_arg_overrides_env_noconfig() {
        );
 }

+#[test]
+fn terminal_width_env_var_is_respected() {
+    let tmp_dir = tempdir().expect("can create temporary directory");
+    let tmp_path = tmp_dir.path().join("long.txt");
+    std::fs::write(
+        &tmp_path,
+        "0123456789abcdef0123456789abcdef0123456789abcdef\n",
+    )
+    .expect("can write temporary file");
+
+    bat()
+        .env("BAT_WIDTH", "20")
+        .arg(&tmp_path)
+        .arg("--paging=never")
+        .arg("--color=never")
+        .arg("--style=numbers")
+        .arg("--decorations=always")
+        .arg("--wrap=character")
+        .assert()
+        .success()
+        .stdout("   1 0123456789abcde\n     f0123456789abcd\n     ef0123456789abc\n     def\n")
+        .stderr("");
+}
+
+#[test]
+fn terminal_width_arg_overrides_env() {
+    let tmp_dir = tempdir().expect("can create temporary directory");
+    let tmp_path = tmp_dir.path().join("long.txt");
+    std::fs::write(
+        &tmp_path,
+        "0123456789abcdef0123456789abcdef0123456789abcdef\n",
+    )
+    .expect("can write temporary file");
+
+    bat()
+        .env("BAT_WIDTH", "20")
+        .arg(&tmp_path)
+        .arg("--paging=never")
+        .arg("--color=never")
+        .arg("--style=numbers")
+        .arg("--decorations=always")
+        .arg("--wrap=character")
+        .arg("--terminal-width=10")
+        .assert()
+        .success()
+        .stdout(
+            "   1 01234\n     56789\n     abcde\n     f0123\n     45678\n     9abcd\n     ef012\n     34567\n     89abc\n     def\n",
+        )
+        .stderr("");
+}
+
 #[test]
 fn fail_non_existing() {
    bat().arg("non-existing-file").assert().failure();
@@ -1357,27 +1421,33 @@ fn disable_pager_if_pp_flag_comes_after_paging() {
 }

 #[test]
+#[serial]
 fn enable_pager_if_disable_paging_flag_comes_before_paging() {
-    bat()
-        .env("PAGER", "echo pager-output")
-        .arg("-P")
-        .arg("--paging=always")
-        .arg("test.txt")
-        .assert()
-        .success()
-        .stdout(predicate::eq("pager-output\n").normalize());
+    mocked_pagers::with_mocked_versions_of_more_and_most_in_path(|| {
+        bat()
+            .env("PAGER", mocked_pagers::from("echo pager-output"))
+            .arg("-P")
+            .arg("--paging=always")
+            .arg("test.txt")
+            .assert()
+            .success()
+            .stdout(predicate::str::contains("pager-output\n").normalize());
+    });
 }

 #[test]
+#[serial]
 fn enable_pager_if_pp_flag_comes_before_paging() {
-    bat()
-        .env("PAGER", "echo pager-output")
-        .arg("-pp")
-        .arg("--paging=always")
-        .arg("test.txt")
-        .assert()
-        .success()
-        .stdout(predicate::eq("pager-output\n").normalize());
+    mocked_pagers::with_mocked_versions_of_more_and_most_in_path(|| {
+        bat()
+            .env("PAGER", mocked_pagers::from("echo pager-output"))
+            .arg("-pp")
+            .arg("--paging=always")
+            .arg("test.txt")
+            .assert()
+            .success()
+            .stdout(predicate::str::contains("pager-output\n").normalize());
+    });
 }

 #[test]
@@ -1394,15 +1464,18 @@ fn paging_does_not_override_simple_plain() {
 }

 #[test]
+#[serial]
 fn simple_plain_does_not_override_paging() {
-    bat()
-        .env("PAGER", "echo pager-output")
-        .arg("--paging=always")
-        .arg("--plain")
-        .arg("test.txt")
-        .assert()
-        .success()
-        .stdout(predicate::eq("pager-output\n"));
+    mocked_pagers::with_mocked_versions_of_more_and_most_in_path(|| {
+        bat()
+            .env("PAGER", mocked_pagers::from("echo pager-output"))
+            .arg("--paging=always")
+            .arg("--plain")
+            .arg("test.txt")
+            .assert()
+            .success()
+            .stdout(predicate::str::contains("pager-output\n").normalize());
+    });
 }

 #[test]
@@ -1416,6 +1489,21 @@ fn pager_failed_to_parse() {
        .stderr(predicate::str::contains("Could not parse pager command"));
 }

+#[test]
+#[serial]
+fn pager_missing_warning() {
+    bat()
+        .env("BAT_PAGER", "nonexistent-pager-xyz-missing")
+        .arg("--paging=always")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stderr(predicate::str::contains("[bat warning]"))
+        .stderr(predicate::str::contains("not found"))
+        .stderr(predicate::str::contains("nonexistent-pager-xyz-missing"))
+        .stdout(predicate::str::contains("hello world\n"));
+}
+
 #[test]
 #[serial]
 fn env_var_bat_paging() {
@@ -1433,6 +1521,7 @@ fn env_var_bat_paging() {
 #[test]
 fn basic_set_terminal_title() {
    bat()
+        .env("BAT_PAGER", "cat")
        .arg("--paging=always")
        .arg("--set-terminal-title")
        .arg("test.txt")
@@ -1449,6 +1538,7 @@ fn diagnostic_sanity_check() {
        .assert()
        .success()
        .stdout(predicate::str::contains("BAT_PAGER="))
+        .stdout(predicate::str::contains("BAT_WIDTH="))
        .stderr("");
 }

@@ -2068,6 +2158,24 @@ fn header_binary() {
        .stderr("");
 }

+#[test]
+fn header_zip_file_is_binary() {
+    let tmp_dir = tempdir().expect("can create temporary directory");
+    let tmp_path = tmp_dir.path().join("test.zip");
+    std::fs::write(&tmp_path, b"PK\x03\x04hello").expect("can write temporary file");
+
+    bat()
+        .arg(&tmp_path)
+        .arg("--decorations=always")
+        .arg("--style=header")
+        .arg("-r=0:0")
+        .arg("--file-name=test.zip")
+        .assert()
+        .success()
+        .stdout("File: test.zip   <BINARY>\n")
+        .stderr("");
+}
+
 #[test]
 fn header_full_binary() {
    bat()
@@ -2445,6 +2553,121 @@ fn no_first_line_fallback_when_mapping_to_invalid_syntax() {
        .stderr(predicate::str::contains("unknown syntax: 'InvalidSyntax'"));
 }

+#[test]
+fn fallback_syntax_is_used_when_no_syntax_is_detected() {
+    let content = "# comment\nfoo=bar\n";
+
+    let fallback_output = bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--file-name=unknown.fallbacksyntax")
+        .arg("--fallback-syntax=bash")
+        .write_stdin(content)
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    let explicit_output = bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--language=bash")
+        .arg("--file-name=unknown.fallbacksyntax")
+        .write_stdin(content)
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    assert_eq!(
+        from_utf8(&fallback_output).expect("output is valid utf-8"),
+        from_utf8(&explicit_output).expect("output is valid utf-8")
+    );
+}
+
+#[test]
+fn fallback_syntax_does_not_override_detected_syntax() {
+    let content = "fn main() { println!(\"hello\"); }\n";
+
+    let with_fallback = bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--file-name=test.rs")
+        .arg("--fallback-syntax=json")
+        .write_stdin(content)
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    let without_fallback = bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--file-name=test.rs")
+        .write_stdin(content)
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    assert_eq!(
+        from_utf8(&with_fallback).expect("output is valid utf-8"),
+        from_utf8(&without_fallback).expect("output is valid utf-8")
+    );
+}
+
+#[test]
+fn fallback_syntax_does_not_override_explicit_language() {
+    let content = "{\"a\": 1}\n";
+
+    let with_fallback = bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--language=json")
+        .arg("--fallback-syntax=rust")
+        .arg("--file-name=unknown.fallbacksyntax")
+        .write_stdin(content)
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    let without_fallback = bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--language=json")
+        .arg("--file-name=unknown.fallbacksyntax")
+        .write_stdin(content)
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    assert_eq!(
+        from_utf8(&with_fallback).expect("output is valid utf-8"),
+        from_utf8(&without_fallback).expect("output is valid utf-8")
+    );
+}
+
+#[test]
+fn invalid_fallback_syntax_returns_error() {
+    bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--file-name=unknown.fallbacksyntax")
+        .arg("--fallback-syntax=InvalidSyntax")
+        .write_stdin("foo\n")
+        .assert()
+        .failure()
+        .stderr(predicate::str::contains("unknown syntax: 'InvalidSyntax'"));
+}
+
 #[test]
 fn show_all_mode() {
    bat()
@@ -2541,6 +2764,92 @@ fn binary_as_text() {
        .stderr("");
 }

+#[test]
+fn binary_as_text_control_char_width() {
+    // Control characters are displayed as caret notation (e.g. ^@) by the
+    // terminal, occupying 2 columns each. With 20 NUL bytes (40 columns) +
+    // "END" (3 columns) = 43 columns, wrapping at terminal width 40 must
+    // produce 2 lines, not 1. See #3631.
+    bat()
+        .arg("--binary=as-text")
+        .arg("--wrap=character")
+        .arg("--terminal-width=40")
+        .arg("--decorations=always")
+        .arg("--style=plain")
+        .arg("--color=never")
+        .arg("regression_tests/issue_3631.txt")
+        .assert()
+        .success()
+        .stdout(predicate::function(|s: &str| s.lines().count() == 2));
+}
+
+#[test]
+fn no_strip_overstrike_for_plain_text() {
+    // Overstrike is preserved for plain text files (no syntax highlighting)
+    bat()
+        .arg("--color=never")
+        .arg("--decorations=never")
+        .arg("overstrike.txt")
+        .assert()
+        .success()
+        .stdout("B\x08Bold t\x08te\x08ex\x08xt\x08t and _\x08u_\x08n_\x08d_\x08e_\x08r_\x08l_\x08i_\x08n_\x08e\n")
+        .stderr("");
+}
+
+#[test]
+fn strip_overstrike_with_syntax_highlighting() {
+    // Overstrike is stripped for certain syntax highlighting like command help.
+    bat()
+        .arg("--force-colorization")
+        .arg("--language=help")
+        .arg("overstrike.txt")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("Bold text and underline"))
+        .stderr("");
+}
+
+#[test]
+fn strip_overstrike_for_manpage_syntax() {
+    // Overstrike is stripped for .man files (Manpage syntax)
+    bat()
+        .arg("--force-colorization")
+        .arg("git-commit.man")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("NAME"))
+        .stdout(predicate::str::contains("git-commit - Record changes"))
+        .stdout(predicate::str::is_match(r"\x1b\[38;[0-9;]+m--interactive\x1b\[").unwrap())
+        .stderr("");
+}
+
+#[test]
+fn no_strip_overstrike_for_other_syntax() {
+    // Overstrike is NOT stripped for other syntaxes (e.g., Rust)
+    bat()
+        .arg("--force-colorization")
+        .arg("--language=rust")
+        .arg("overstrike.txt")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("\x08"))
+        .stderr("");
+}
+
+#[test]
+fn show_all_shows_backspace_with_caret_notation() {
+    // --show-all should display backspace characters (not strip them)
+    bat()
+        .arg("--show-all")
+        .arg("--nonprintable-notation=caret")
+        .arg("--decorations=never")
+        .arg("overstrike.txt")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains("^H"))
+        .stderr("");
+}
+
 #[test]
 fn no_paging_arg() {
    bat()
@@ -2808,6 +3117,44 @@ fn no_wrapping_with_chop_long_lines() {
    wrapping_test("--chop-long-lines", false);
 }

+#[test]
+#[serial]
+fn wrap_never_flag_respected_with_paging_always() {
+    mocked_pagers::with_mocked_versions_of_more_and_most_in_path(|| {
+        bat()
+            .arg("--pager=cat")
+            .arg("--paging=always")
+            .arg("--wrap=never")
+            .arg("--color=never")
+            .arg("--decorations=never")
+            .arg("--style=plain")
+            .write_stdin("abcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyz\n")
+            .assert()
+            .success()
+            .stdout(predicate::str::contains("abcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyz").normalize())
+            .stderr("");
+    });
+}
+
+#[test]
+#[serial]
+fn s_flag_respected_with_paging_always() {
+    mocked_pagers::with_mocked_versions_of_more_and_most_in_path(|| {
+        bat()
+            .arg("--pager=cat")
+            .arg("--paging=always")
+            .arg("-S")
+            .arg("--color=never")
+            .arg("--decorations=never")
+            .arg("--style=plain")
+            .write_stdin("abcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyz\n")
+            .assert()
+            .success()
+            .stdout(predicate::str::contains("abcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyzabcdefghigklmnopqrstuvxyz").normalize())
+            .stderr("");
+    });
+}
+
 #[test]
 fn theme_arg_overrides_env() {
    bat()
@@ -3564,3 +3911,374 @@ fn style_components_will_merge_with_env_var() {
        .stdout("     STDIN\n   1 test\n")
        .stderr("");
 }
+
+// Test for https://github.com/sharkdp/bat/issues/3526
+#[test]
+fn plain_with_sized_terminal_width() {
+    bat()
+        .arg("--plain")
+        .arg("--terminal-width=6")
+        .arg("--decorations=always")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout("hello \nworld\n")
+        .stderr("");
+}
+
+#[test]
+fn quiet_empty_suppresses_output_on_empty_stdin() {
+    bat()
+        .arg("--quiet-empty")
+        .write_stdin("")
+        .assert()
+        .success()
+        .stdout("");
+}
+
+#[test]
+fn quiet_empty_does_not_affect_non_empty_input() {
+    bat()
+        .arg("--quiet-empty")
+        .write_stdin("hello\n")
+        .assert()
+        .success()
+        .stdout("hello\n");
+}
+
+#[test]
+fn quiet_empty_suppresses_output_on_empty_file() {
+    bat()
+        .arg("--quiet-empty")
+        .arg("empty.txt")
+        .assert()
+        .success()
+        .stdout("");
+}
+
+#[test]
+fn cache_help_shows_help_message() {
+    // Test that `bat cache --help` works (fixes #3560)
+    // Run in cache_source directory which doesn't have a file named "cache"
+    bat_with_config()
+        .current_dir(Path::new(EXAMPLES_DIR).join("cache_source"))
+        .arg("cache")
+        .arg("--help")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains(
+            "Modify the syntax-definition and theme cache",
+        ))
+        .stdout(predicate::str::contains("--build"))
+        .stdout(predicate::str::contains("--clear"));
+}
+
+#[test]
+fn unbuffered_flag_is_accepted() {
+    bat()
+        .arg("--unbuffered")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout("hello world\n");
+}
+
+#[test]
+fn unbuffered_mode_disables_line_numbers() {
+    // When --unbuffered is used, line numbers should be auto-disabled even if requested
+    bat()
+        .arg("--unbuffered")
+        .arg("--style=numbers")
+        .arg("--decorations=always")
+        .arg("--color=never")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout(predicate::str::starts_with("   1").not());
+}
+
+#[test]
+fn unbuffered_mode_plain_output() {
+    bat()
+        .arg("--unbuffered")
+        .arg("--color=never")
+        .arg("--decorations=never")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout("hello world\n");
+}
+
+#[test]
+fn word_wrap_breaks_at_word_boundaries() {
+    bat()
+        .arg("word-wrap.txt")
+        .arg("--wrap=word")
+        .arg("--terminal-width=40")
+        .arg("--style=plain")
+        .arg("--decorations=always")
+        .arg("--color=never")
+        .assert()
+        .success()
+        .stdout(
+            "\
+The quick brown fox jumps over the lazy
+dog and then runs away
+superlongwordthatdefinitelyexceedstheter
+minalwidthandshouldfallbacktocharacterwr
+apping
+short words here
+",
+        );
+}
+
+#[test]
+fn word_wrap_with_line_numbers() {
+    bat()
+        .arg("word-wrap.txt")
+        .arg("--wrap=word")
+        .arg("--terminal-width=40")
+        .arg("--style=numbers")
+        .arg("--decorations=always")
+        .arg("--color=never")
+        .assert()
+        .success()
+        .stdout(
+            "   1 The quick brown fox jumps over the
+     lazy dog and then runs away
+   2 superlongwordthatdefinitelyexceedst
+     heterminalwidthandshouldfallbacktoc
+     haracterwrapping
+   3 short words here
+",
+        );
+}
+
+#[test]
+fn word_wrap_short_line_no_wrap() {
+    bat()
+        .arg("--wrap=word")
+        .arg("--terminal-width=80")
+        .arg("--style=plain")
+        .arg("--decorations=always")
+        .arg("--color=never")
+        .arg("single-line.txt")
+        .assert()
+        .success()
+        .stdout("Single Line\n");
+}
+
+#[cfg(unix)]
+#[cfg(feature = "git")]
+fn setup_diff_test_repo() -> tempfile::TempDir {
+    use std::process::Command;
+
+    let dir = tempfile::tempdir().expect("can create temporary directory");
+    let repo = dir.path();
+
+    // Initialize a git repo and commit a file
+    Command::new("git")
+        .args(["init"])
+        .current_dir(repo)
+        .output()
+        .expect("git init");
+
+    Command::new("git")
+        .args(["config", "user.email", "test@test.com"])
+        .current_dir(repo)
+        .output()
+        .expect("git config email");
+
+    Command::new("git")
+        .args(["config", "user.name", "Test"])
+        .current_dir(repo)
+        .output()
+        .expect("git config name");
+
+    std::fs::write(repo.join("test.txt"), "line 1\nline 2\nline 3\n").expect("can write test file");
+
+    Command::new("git")
+        .args(["add", "test.txt"])
+        .current_dir(repo)
+        .output()
+        .expect("git add");
+
+    Command::new("git")
+        .args(["commit", "-m", "initial"])
+        .current_dir(repo)
+        .output()
+        .expect("git commit");
+
+    // Modify the file so --diff has something to show
+    std::fs::write(
+        repo.join("test.txt"),
+        "line 1\nline 2 modified\nline 3\nline 4 added\n",
+    )
+    .expect("can write modified test file");
+
+    dir
+}
+
+#[cfg(unix)]
+#[cfg(feature = "git")]
+#[test]
+fn diff_plain_preserves_change_markers() {
+    let repo = setup_diff_test_repo();
+
+    // With --diff --plain, output should contain the change marker column
+    // but not other decorations like line numbers or grid
+    let output = bat()
+        .current_dir(repo.path())
+        .arg("--diff")
+        .arg("--plain")
+        .arg("--color=never")
+        .arg("--decorations=always")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    let stdout = std::str::from_utf8(&output).expect("valid utf-8");
+
+    // The output should contain the modified and added lines
+    assert!(
+        stdout.contains("line 2 modified"),
+        "diff plain output should contain modified line, got: {stdout}"
+    );
+    assert!(
+        stdout.contains("line 4 added"),
+        "diff plain output should contain added line, got: {stdout}"
+    );
+
+    // Should NOT contain line numbers (a decoration that --plain disables)
+    assert!(
+        !stdout.contains("   1"),
+        "diff plain output should not contain line numbers, got: {stdout}"
+    );
+}
+
+#[cfg(unix)]
+#[cfg(feature = "git")]
+#[test]
+fn diff_plain_does_not_show_grid_or_header() {
+    let repo = setup_diff_test_repo();
+
+    let output = bat()
+        .current_dir(repo.path())
+        .arg("--diff")
+        .arg("--plain")
+        .arg("--color=never")
+        .arg("--decorations=always")
+        .arg("--terminal-width=80")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .get_output()
+        .stdout
+        .clone();
+
+    let stdout = std::str::from_utf8(&output).expect("valid utf-8");
+
+    // Grid lines use box-drawing characters
+    assert!(
+        !stdout.contains('─'),
+        "diff plain output should not contain grid lines, got: {stdout}"
+    );
+    assert!(
+        !stdout.contains('│'),
+        "diff plain output should not contain grid separators, got: {stdout}"
+    );
+
+    // Header shows "File: <filename>"
+    assert!(
+        !stdout.contains("File:"),
+        "diff plain output should not contain file header, got: {stdout}"
+    );
+}
+
+#[cfg(unix)]
+#[cfg(feature = "git")]
+#[test]
+fn plain_without_diff_still_works() {
+    let repo = setup_diff_test_repo();
+
+    // --plain without --diff should output file content with no decorations at all
+    bat()
+        .current_dir(repo.path())
+        .arg("--plain")
+        .arg("--color=never")
+        .arg("--decorations=always")
+        .arg("test.txt")
+        .assert()
+        .success()
+        .stdout("line 1\nline 2 modified\nline 3\nline 4 added\n");
+}
+
+#[test]
+fn tcl_shebang_detection_tclsh() {
+    bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--decorations=always")
+        .arg("regression_tests/issue_3647_tclsh")
+        .assert()
+        .success();
+}
+
+#[test]
+fn tcl_shebang_detection_wish() {
+    bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--decorations=always")
+        .arg("regression_tests/issue_3647_wish")
+        .assert()
+        .success();
+}
+
+#[test]
+fn tcl_shebang_detection_expect() {
+    bat()
+        .arg("--color=always")
+        .arg("--style=plain")
+        .arg("--decorations=always")
+        .arg("regression_tests/issue_3647_expect")
+        .assert()
+        .success();
+}
+
+#[test]
+fn ignored_suffix_enables_first_line_detection() {
+    // A shebang shell script saved with a `.txt` extension is Plain Text by
+    // default (the extension wins). With `--ignored-suffix .txt` the suffix is
+    // stripped before detection, so it falls back to the first line and is
+    // highlighted exactly as if its language were forced to bash. See #2745.
+    let fixture = "regression_tests/issue_2745.txt";
+    let common = ["--color=always", "--decorations=never", "--style=plain"];
+
+    let stdout = |args: &[&str]| -> Vec<u8> {
+        let assert = bat()
+            .args(common)
+            .args(args)
+            .arg(fixture)
+            .assert()
+            .success();
+        assert.get_output().stdout.clone()
+    };
+
+    let forced_bash = stdout(&["--language", "bash"]);
+    let with_ignored_suffix = stdout(&["--ignored-suffix", ".txt"]);
+    let default = stdout(&[]);
+
+    // The fixture really is being highlighted (forcing bash is not a no-op).
+    assert!(
+        forced_bash.windows(2).any(|w| w == b"\x1b["),
+        "forced-bash output should contain ANSI color codes"
+    );
+    // With the ignored suffix, detection matches forced bash highlighting...
+    assert_eq!(with_ignored_suffix, forced_bash);
+    // ...while the default (extension wins) stays plain and differs.
+    assert_ne!(default, forced_bash);
+}
@@ -4,6 +4,7 @@ import itertools
 import subprocess
 import pathlib
 import shutil
+from typing import Iterable


 def generate_snapshots():
@@ -19,22 +20,23 @@ def generate_snapshots():


 def generate_style_snapshot(style):
-    generate_snapshot(style.replace(",", "_"), "--style={}".format(style))
+    generate_snapshot(style.replace(",", "_"), ["--style={}".format(style)])


-def generate_snapshot(name, arguments):
-    command = "cargo run -- --paging=never --color=never --decorations=always "
-    command += "{args} sample.rs > output/{name}.snapshot.txt".format(
-        name=name,
-        args=arguments
-    )
+def generate_snapshot(name: str, arguments: Iterable[str]):
+    output_file = "output/{name}.snapshot.txt".format(name=name)
+    command = [
+        "cargo", "run", "--", "--paging=never", "--color=never",
+        "--decorations=always", *arguments, "sample.rs"
+    ]
    print("generating snapshot for {}".format(name))
-    subprocess.call(command, shell=True)
+    with open(output_file, "w") as f:
+        subprocess.call(command, stdout=f)


 def build_bat():
    print("building bat")
-    subprocess.call("cargo build", cwd="../..", shell=True)
+    subprocess.call(["cargo", "build"], cwd="../..")


 def prepare_output_dir():
@@ -49,7 +51,7 @@ def modify_sample_file():

 def undo_sample_file_modification():
    print("undoing sample.rs modifications")
-    subprocess.call("git checkout -- sample.rs", shell=True)
+    subprocess.call(["git", "checkout", "--", "sample.rs"])


 build_bat()
@@ -0,0 +1,61 @@
+[38;2;249;38;114mIDENTIFICATION DIVISION[0m[38;2;248;248;242m.[0m
+[38;2;249;38;114mPROGRAM-ID[0m[38;2;248;248;242m. [0m[38;2;248;248;242mPAYROLL-CALC[0m[38;2;248;248;242m.[0m
+
+[38;2;249;38;114mDATA DIVISION[0m[38;2;248;248;242m.[0m
+[38;2;249;38;114mWORKING-STORAGE SECTION[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;190;132;255m01[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-DETAILS[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-NAME[0m[38;2;248;248;242m      [0m[3;38;2;102;217;239mPIC X(30).[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m       [0m[3;38;2;102;217;239mPIC 99V9[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m        [0m[3;38;2;102;217;239mPIC 99V99[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;190;132;255m01[0m[38;2;248;248;242m [0m[38;2;248;248;242mPAY-CALCULATIONS[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m          [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-HOURS[0m[38;2;248;248;242m     [0m[3;38;2;102;217;239mPIC 99V9[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-PAY[0m[38;2;248;248;242m       [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-RATE[0m[38;2;248;248;242m           [0m[3;38;2;102;217;239mPIC V99[0m[38;2;248;248;242m [0m[38;2;249;38;114mVALUE[0m[38;2;248;248;242m [0m[38;2;190;132;255m0.10[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m         [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mNET-PAY[0m[38;2;248;248;242m            [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+
+[38;2;249;38;114mPROCEDURE DIVISION[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242mMAIN-LOGIC[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116m--- COBOL Payroll Calculator ---[0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEnter Employee Name: [0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mACCEPT[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-NAME[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEnter Hours Worked (e.g., 40.5): [0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mACCEPT[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEnter Hourly Rate (e.g., 15.75): [0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mACCEPT[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mCALCULATE-GROSS-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mCALCULATE-TAX[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mCALCULATE-NET-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mDISPLAY-RESULTS[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mSTOP RUN[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mCALCULATE-GROSS-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mIF[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m [0m[38;2;249;38;114m>[0m[38;2;248;248;242m [0m[38;2;190;132;255m40[0m[38;2;248;248;242m [0m[38;2;249;38;114mTHEN[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-HOURS[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m [0m[38;2;249;38;114m-[0m[38;2;248;248;242m [0m[38;2;190;132;255m40[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-HOURS[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;190;132;255m1.5[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m ([0m[38;2;190;132;255m40[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m) [0m[38;2;249;38;114m+[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-PAY[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mELSE[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mEND-IF[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mCALCULATE-TAX[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-RATE[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mCALCULATE-NET-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mNET-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m-[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mDISPLAY-RESULTS[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116m----------------------------------[0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEmployee Name: [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-NAME[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mHours Worked:  [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mHourly Rate:   [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mGross Pay:     [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mTax (10%):     [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mNet Pay:       [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mNET-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116m----------------------------------[0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
@@ -0,0 +1,61 @@
+[38;2;249;38;114mIDENTIFICATION DIVISION[0m[38;2;248;248;242m.[0m
+[38;2;249;38;114mPROGRAM-ID[0m[38;2;248;248;242m. [0m[38;2;248;248;242mPAYROLL-CALC[0m[38;2;248;248;242m.[0m
+
+[38;2;249;38;114mDATA DIVISION[0m[38;2;248;248;242m.[0m
+[38;2;249;38;114mWORKING-STORAGE SECTION[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;190;132;255m01[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-DETAILS[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-NAME[0m[38;2;248;248;242m      [0m[3;38;2;102;217;239mPIC X(30).[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m       [0m[3;38;2;102;217;239mPIC 99V9[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m        [0m[3;38;2;102;217;239mPIC 99V99[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;190;132;255m01[0m[38;2;248;248;242m [0m[38;2;248;248;242mPAY-CALCULATIONS[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m          [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-HOURS[0m[38;2;248;248;242m     [0m[3;38;2;102;217;239mPIC 99V9[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-PAY[0m[38;2;248;248;242m       [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-RATE[0m[38;2;248;248;242m           [0m[3;38;2;102;217;239mPIC V99[0m[38;2;248;248;242m [0m[38;2;249;38;114mVALUE[0m[38;2;248;248;242m [0m[38;2;190;132;255m0.10[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m         [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+[38;2;248;248;242m        [0m[38;2;190;132;255m05[0m[38;2;248;248;242m [0m[38;2;248;248;242mNET-PAY[0m[38;2;248;248;242m            [0m[3;38;2;102;217;239mPIC 9(5)V99.[0m
+
+[38;2;249;38;114mPROCEDURE DIVISION[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242mMAIN-LOGIC[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116m--- COBOL Payroll Calculator ---[0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEnter Employee Name: [0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mACCEPT[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-NAME[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEnter Hours Worked (e.g., 40.5): [0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mACCEPT[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEnter Hourly Rate (e.g., 15.75): [0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mACCEPT[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mCALCULATE-GROSS-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mCALCULATE-TAX[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mCALCULATE-NET-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mPERFORM[0m[38;2;248;248;242m [0m[38;2;248;248;242mDISPLAY-RESULTS[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242m    [0m[38;2;249;38;114mSTOP RUN[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mCALCULATE-GROSS-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mIF[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m [0m[38;2;249;38;114m>[0m[38;2;248;248;242m [0m[38;2;190;132;255m40[0m[38;2;248;248;242m [0m[38;2;249;38;114mTHEN[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-HOURS[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m [0m[38;2;249;38;114m-[0m[38;2;248;248;242m [0m[38;2;190;132;255m40[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-HOURS[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;190;132;255m1.5[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m ([0m[38;2;190;132;255m40[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m) [0m[38;2;249;38;114m+[0m[38;2;248;248;242m [0m[38;2;248;248;242mOVERTIME-PAY[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mELSE[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mEND-IF[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mCALCULATE-TAX[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-RATE[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mCALCULATE-NET-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mCOMPUTE[0m[38;2;248;248;242m [0m[38;2;248;248;242mNET-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m [0m[38;2;249;38;114m-[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m.[0m
+
+[38;2;248;248;242mDISPLAY-RESULTS[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116m----------------------------------[0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mEmployee Name: [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mEMPLOYEE-NAME[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mHours Worked:  [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURS-WORKED[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mHourly Rate:   [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mHOURLY-RATE[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mGross Pay:     [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mGROSS-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mTax (10%):     [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mTAX-AMOUNT[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mNet Pay:       [0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242mNET-PAY[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mDISPLAY[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116m----------------------------------[0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m
@@ -1,7 +1,7 @@
 [3;38;2;253;151;31mfirst[0m[38;2;253;151;31m,[0m[38;2;102;217;239mlast[0m[38;2;253;151;31m,[0m[38;2;190;132;255maddress[0m[38;2;253;151;31m,[0m[38;2;249;38;114mcity[0m[38;2;253;151;31m,[0m[38;2;230;219;116mzip[0m
-[3;38;2;253;151;31mJohn[0m[38;2;253;151;31m,[0m[38;2;102;217;239mDoe[0m[38;2;253;151;31m,[0m[38;2;190;132;255m120 any st.[0m[38;2;253;151;31m,[0m[38;2;230;219;116m"[0m[38;2;230;219;116mAnytown, WW[0m[38;2;230;219;116m"[0m[38;2;253;151;31m,[0m[38;2;230;219;116m08123[0m
+[3;38;2;253;151;31mJohn[0m[38;2;253;151;31m,[0m[38;2;102;217;239mDoe[0m[38;2;253;151;31m,[0m[38;2;190;132;255m120 any st.[0m[38;2;253;151;31m,[0m[38;2;249;38;114m"[0m[38;2;249;38;114mAnytown, WW[0m[38;2;249;38;114m"[0m[38;2;253;151;31m,[0m[38;2;230;219;116m08123[0m
 [3;38;2;253;151;31ma[0m[38;2;253;151;31m,[0m[38;2;102;217;239mb[0m
-[3;38;2;253;151;31m1[0m[38;2;253;151;31m,[0m[38;2;230;219;116m"[0m[38;2;230;219;116mha [0m
-[38;2;190;132;255m""[0m[38;2;230;219;116mha[0m[38;2;190;132;255m""[0m[38;2;230;219;116m [0m
-[38;2;230;219;116mha[0m[38;2;230;219;116m"[0m[38;2;253;151;31m,[0m[38;2;190;132;255m120 any st.[0m[38;2;253;151;31m,[0m[38;2;230;219;116m"[0m[38;2;230;219;116mAnytown, WW[0m[38;2;230;219;116m"[0m[38;2;253;151;31m,[0m[38;2;230;219;116m08123[0m
-[3;38;2;253;151;31m3[0m[38;2;253;151;31m,[0m[38;2;102;217;239m4[0m[38;2;253;151;31m,[0m[38;2;190;132;255m120 any st.[0m[38;2;253;151;31m,[0m[38;2;230;219;116m"[0m[38;2;230;219;116mAnytown, WW[0m[38;2;230;219;116m"[0m[38;2;253;151;31m,[0m[38;2;230;219;116m08123[0m
+[3;38;2;253;151;31m1[0m[38;2;253;151;31m,[0m[38;2;102;217;239m"[0m[38;2;102;217;239mha [0m
+[38;2;190;132;255m""[0m[38;2;102;217;239mha[0m[38;2;190;132;255m""[0m[38;2;102;217;239m [0m
+[38;2;102;217;239mha[0m[38;2;102;217;239m"[0m[38;2;253;151;31m,[0m[38;2;190;132;255m120 any st.[0m[38;2;253;151;31m,[0m[38;2;249;38;114m"[0m[38;2;249;38;114mAnytown, WW[0m[38;2;249;38;114m"[0m[38;2;253;151;31m,[0m[38;2;230;219;116m08123[0m
+[3;38;2;253;151;31m3[0m[38;2;253;151;31m,[0m[38;2;102;217;239m4[0m[38;2;253;151;31m,[0m[38;2;190;132;255m120 any st.[0m[38;2;253;151;31m,[0m[38;2;249;38;114m"[0m[38;2;249;38;114mAnytown, WW[0m[38;2;249;38;114m"[0m[38;2;253;151;31m,[0m[38;2;230;219;116m08123[0m
@@ -1,3 +1,3 @@
 [3;38;2;253;151;31mfoo[0m[38;2;253;151;31m	[0m[38;2;102;217;239mbar[0m[38;2;253;151;31m	[0m[38;2;190;132;255mbaz|;,[0m[38;2;253;151;31m	[0m[38;2;249;38;114mtest[0m[38;2;253;151;31m	[0m[38;2;230;219;116mhello world[0m[38;2;253;151;31m	[0m[3;38;2;253;151;31mtsv[0m
 [3;38;2;253;151;31m1,2[0m[38;2;253;151;31m	[0m[38;2;102;217;239m1,7[0m[38;2;253;151;31m	[0m[38;2;190;132;255m2,7[0m[38;2;253;151;31m	[0m[38;2;249;38;114ma b c[0m[38;2;253;151;31m	[0m[38;2;230;219;116m"[0m[38;2;230;219;116mhello	again[0m[38;2;230;219;116m"[0m[38;2;253;151;31m	[0m[3;38;2;253;151;31mtsv[0m
-[3;38;2;230;219;116m"[0m[3;38;2;230;219;116m;|,[0m[3;38;2;230;219;116m"[0m[38;2;253;151;31m	[0m[38;2;102;217;239m;|,[0m[38;2;253;151;31m	[0m[38;2;190;132;255mbaz[0m[38;2;253;151;31m	[0m[38;2;249;38;114mtest[0m[38;2;253;151;31m	[0m[38;2;230;219;116m"[0m[38;2;230;219;116mhello world[0m[38;2;230;219;116m"[0m[38;2;253;151;31m	[0m[3;38;2;253;151;31mtsv[0m
+[3;38;2;253;151;31m"[0m[3;38;2;253;151;31m;|,[0m[3;38;2;253;151;31m"[0m[38;2;253;151;31m	[0m[38;2;102;217;239m;|,[0m[38;2;253;151;31m	[0m[38;2;190;132;255mbaz[0m[38;2;253;151;31m	[0m[38;2;249;38;114mtest[0m[38;2;253;151;31m	[0m[38;2;230;219;116m"[0m[38;2;230;219;116mhello world[0m[38;2;230;219;116m"[0m[38;2;253;151;31m	[0m[3;38;2;253;151;31mtsv[0m
@@ -0,0 +1,25 @@
+[38;2;248;248;242m([0m[38;2;255;255;255mlogging[0m[38;2;248;248;242m)[0m[38;2;248;248;242m {[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mlog[0m[38;2;248;248;242m {[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114moutput[0m[38;2;248;248;242m file /var/log/caddy.log[0m
+[38;2;248;248;242m    }[0m
+[38;2;248;248;242m}[0m
+
+[38;2;117;113;94m# a comment[0m
+[38;2;255;255;255mlocalhost:8080[0m[38;2;249;38;114m,[0m[38;2;248;248;242m [0m[38;2;255;255;255mexample.com[0m[38;2;248;248;242m {[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mroot[0m[38;2;248;248;242m * /var/www/site[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mfile_server[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mreverse_proxy[0m[38;2;248;248;242m /.well-known/matrix/* localhost:8008[0m[38;2;248;248;242m {[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mheader_up[0m[38;2;248;248;242m Host [0m[38;2;190;132;255m{upstream_hostport}[0m
+[38;2;248;248;242m    }[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mimport[0m[38;2;248;248;242m logging[0m
+[38;2;248;248;242m}[0m
+
+[38;2;255;255;255mwww.example.com[0m[38;2;248;248;242m {[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mredir[0m[38;2;248;248;242m https://example.com[0m[38;2;190;132;255m{uri}[0m[38;2;248;248;242m permanent[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mimport[0m[38;2;248;248;242m logging[0m
+[38;2;248;248;242m}[0m
+
+[38;2;255;255;255mstatus.example.com[0m[38;2;248;248;242m {[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mreverse_proxy[0m[38;2;248;248;242m localhost:3002[0m
+[38;2;248;248;242m    [0m[38;2;102;217;239mimport[0m[38;2;248;248;242m logging[0m
+[38;2;248;248;242m}[0m
@@ -1,85 +1,85 @@
-[38;2;249;38;114mimport[0m[38;2;248;248;242m kotlin.math.*[0m
+[38;2;249;38;114mimport[0m[38;2;248;248;242m [0m[38;2;248;248;242mkotlin[0m[38;2;248;248;242m.[0m[38;2;248;248;242mmath[0m[38;2;248;248;242m.[0m[38;2;249;38;114m*[0m

-[38;2;249;38;114mdata[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[38;2;166;226;46mExample[0m[38;2;248;248;242m([0m
-[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mname[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mString[0m[38;2;248;248;242m,[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mnumbers[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mList[0m[38;2;248;248;242m<[0m[3;38;2;102;217;239mInt[0m[38;2;248;248;242m?>[0m
+[38;2;249;38;114mdata[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mExample[0m[38;2;248;248;242m([0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mname[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mString[0m[38;2;248;248;242m,[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mnumbers[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mList[0m[38;2;248;248;242m<[0m[3;38;2;166;226;46mInt[0m[38;2;249;38;114m?[0m[38;2;248;248;242m>[0m
 [38;2;248;248;242m)[0m

-[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46minterface[0m[38;2;248;248;242m [0m[38;2;166;226;46mJokeInterface[0m[38;2;248;248;242m {[0m
-[38;2;248;248;242m    [0m[38;2;166;226;46mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46misFunny[0m[38;2;248;248;242m()[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mBoolean[0m
+[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46minterface[0m[38;2;248;248;242m [0m[38;2;248;248;242mJokeInterface[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46misFunny[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mBoolean[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mabstract[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[38;2;166;226;46mAbstractJoke[0m[38;2;248;248;242m [0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mJokeInterface[0m[38;2;248;248;242m {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46misFunny[0m[38;2;248;248;242m() [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;190;132;255mfalse[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114mabstract[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46mcontent[0m[38;2;248;248;242m()[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mString[0m
+[38;2;249;38;114mabstract[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mAbstractJoke[0m[38;2;248;248;242m [0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mJokeInterface[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46misFunny[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;190;132;255mfalse[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mabstract[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46mcontent[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mString[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[38;2;166;226;46mJoke[0m[38;2;248;248;242m [0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mAbstractJoke[0m[38;2;248;248;242m() {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46misFunny[0m[38;2;248;248;242m()[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mBoolean[0m[38;2;248;248;242m {[0m
+[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mJoke[0m[38;2;248;248;242m [0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mAbstractJoke[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46misFunny[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mBoolean[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
 [38;2;248;248;242m        [0m[38;2;249;38;114mreturn[0m[38;2;248;248;242m [0m[38;2;190;132;255mtrue[0m
-[38;2;248;248;242m    }[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46mcontent[0m[38;2;248;248;242m()[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mString[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mcontent of joke here, haha[0m[38;2;230;219;116m"[0m
+[38;2;248;248;242m    [0m[38;2;248;248;242m}[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46mcontent[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mString[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mcontent of joke here, haha[0m[38;2;230;219;116m"[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[38;2;166;226;46mDelegatedJoke[0m[38;2;248;248;242m([0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mjoke[0m[38;2;249;38;114m:[0m[38;2;248;248;242m Joke) [0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mJokeInterface[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mby[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mjoke[0m[38;2;248;248;242m {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;166;226;46mnumber[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mLong[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;190;132;255m123L[0m
+[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mDelegatedJoke[0m[38;2;248;248;242m([0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mjoke[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mJoke[0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mJokeInterface[0m[38;2;248;248;242m [0m[38;2;249;38;114mby[0m[38;2;248;248;242m [0m[38;2;255;255;255mjoke[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;255;255;255mnumber[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mLong[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;190;132;255m123L[0m

-[38;2;248;248;242m    [0m[38;2;249;38;114mcompanion [0m[38;2;249;38;114mobject[0m[38;2;248;248;242m {[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114mconst[0m[38;2;248;248;242m [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;166;226;46msomeConstant[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116msome constant text[0m[38;2;230;219;116m"[0m
-[38;2;248;248;242m    }[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mcompanion[0m[38;2;248;248;242m [0m[38;2;249;38;114mobject[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mconst[0m[38;2;248;248;242m [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;255;255;255msomeConstant[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116msome constant text[0m[38;2;230;219;116m"[0m
+[38;2;248;248;242m    [0m[38;2;248;248;242m}[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mobject[0m[38;2;248;248;242m [0m[38;2;166;226;46mSomeSingleton[0m
+[38;2;249;38;114mobject[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mSomeSingleton[0m

-[38;2;249;38;114msealed[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[38;2;166;226;46mShape[0m[38;2;248;248;242m {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114mabstract[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m()[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mDouble[0m
+[38;2;249;38;114msealed[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mShape[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mabstract[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mDouble[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mdata[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[38;2;166;226;46mSquare[0m[38;2;248;248;242m([0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31msideLength[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mDouble[0m[38;2;248;248;242m) [0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mShape[0m[38;2;248;248;242m() {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m()[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mDouble[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m sideLength[0m[38;2;249;38;114m.[0m[38;2;248;248;242mpow([0m[38;2;190;132;255m2[0m[38;2;248;248;242m)[0m
+[38;2;249;38;114mdata[0m[38;2;248;248;242m [0m[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mSquare[0m[38;2;248;248;242m([0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31msideLength[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mDouble[0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mShape[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mDouble[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;255;255;255msideLength[0m[38;2;248;248;242m.[0m[38;2;248;248;242mpow[0m[38;2;248;248;242m([0m[38;2;190;132;255m2[0m[38;2;248;248;242m)[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mobject[0m[38;2;248;248;242m [0m[38;2;166;226;46mPoint[0m[38;2;248;248;242m [0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mShape[0m[38;2;248;248;242m() {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m() [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;249;38;114m.[0m[38;2;190;132;255m0[0m
+[38;2;249;38;114mobject[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mPoint[0m[38;2;248;248;242m [0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mShape[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;190;132;255m.0[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[38;2;166;226;46mCircle[0m[38;2;248;248;242m([0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mradius[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mDouble[0m[38;2;248;248;242m) [0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;4;38;2;166;226;46mShape[0m[38;2;248;248;242m() {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m()[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mDouble[0m[38;2;248;248;242m {[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114mreturn[0m[38;2;248;248;242m [0m[38;2;190;132;255mPI[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m radius [0m[38;2;249;38;114m*[0m[38;2;248;248;242m radius[0m
-[38;2;248;248;242m    }[0m
+[38;2;249;38;114mclass[0m[38;2;248;248;242m [0m[4;38;2;102;217;239mCircle[0m[38;2;248;248;242m([0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mradius[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mDouble[0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mShape[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114moverride[0m[38;2;248;248;242m [0m[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46marea[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mDouble[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m        [0m[38;2;249;38;114mreturn[0m[38;2;248;248;242m [0m[38;2;255;255;255mPI[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;255;255;255mradius[0m[38;2;248;248;242m [0m[38;2;249;38;114m*[0m[38;2;248;248;242m [0m[38;2;255;255;255mradius[0m
+[38;2;248;248;242m    [0m[38;2;248;248;242m}[0m
 [38;2;248;248;242m}[0m

-[38;2;249;38;114mfun[0m[38;2;248;248;242m String.[0m[38;2;166;226;46mextensionMethod[0m[38;2;248;248;242m() [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mtest[0m[38;2;230;219;116m"[0m
+[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mString[0m[38;2;248;248;242m.[0m[38;2;166;226;46mextensionMethod[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mtest[0m[38;2;230;219;116m"[0m

-[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46mmain[0m[38;2;248;248;242m() {[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;166;226;46mname[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"""[0m
+[38;2;249;38;114mfun[0m[38;2;248;248;242m [0m[38;2;166;226;46mmain[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;255;255;255mname[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;230;219;116m"""[0m
 [38;2;230;219;116m       multiline[0m
 [38;2;230;219;116m       string[0m
 [38;2;230;219;116m       [0m
 [38;2;230;219;116m       some numbers: 123123 42[0m
-[38;2;230;219;116m    [0m[38;2;230;219;116m"""[0m[38;2;249;38;114m.[0m[38;2;248;248;242mtrimIndent()[0m
-[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;166;226;46mexample[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m Example(name [0m[38;2;249;38;114m=[0m[38;2;248;248;242m name, numbers [0m[38;2;249;38;114m=[0m[38;2;248;248;242m listOf([0m[38;2;190;132;255m512[0m[38;2;248;248;242m, [0m[38;2;190;132;255m42[0m[38;2;248;248;242m, [0m[38;2;190;132;255mnull[0m[38;2;248;248;242m, [0m[38;2;249;38;114m-[0m[38;2;190;132;255m1[0m[38;2;248;248;242m))[0m
+[38;2;230;219;116m    [0m[38;2;230;219;116m"""[0m[38;2;248;248;242m.[0m[38;2;248;248;242mtrimIndent[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mval[0m[38;2;248;248;242m [0m[38;2;255;255;255mexample[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mExample[0m[38;2;248;248;242m([0m[38;2;255;255;255mname[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;255;255;255mname[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[38;2;255;255;255mnumbers[0m[38;2;248;248;242m [0m[38;2;249;38;114m=[0m[38;2;248;248;242m [0m[38;2;248;248;242mlistOf[0m[38;2;248;248;242m([0m[38;2;190;132;255m512[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[38;2;190;132;255m42[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[38;2;190;132;255mnull[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[38;2;249;38;114m-[0m[38;2;190;132;255m1[0m[38;2;248;248;242m)[0m[38;2;248;248;242m)[0m

-[38;2;248;248;242m    example[0m[38;2;249;38;114m.[0m[38;2;248;248;242mnumbers[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242mfilterNotNull()[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242mforEach { println(it) }[0m
+[38;2;248;248;242m    [0m[38;2;255;255;255mexample[0m[38;2;248;248;242m.[0m[38;2;255;255;255mnumbers[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242mfilterNotNull[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242mforEach[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m[38;2;248;248;242m [0m[38;2;248;248;242mprintln[0m[38;2;248;248;242m([0m[38;2;255;255;255mit[0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m}[0m

-[38;2;248;248;242m    setOf(Joke(), DelegatedJoke(Joke())[0m[38;2;249;38;114m.[0m[38;2;248;248;242mjoke)[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242mfilter(JokeInterface[0m[38;2;249;38;114m::[0m[38;2;248;248;242misFunny)[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242mmap(AbstractJoke[0m[38;2;249;38;114m::[0m[38;2;248;248;242mcontent)[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242mforEachIndexed { index[0m[38;2;249;38;114m:[0m[38;2;248;248;242m [0m[3;38;2;102;217;239mInt[0m[38;2;248;248;242m, joke [0m[38;2;249;38;114m->[0m
-[38;2;248;248;242m            println([0m[38;2;230;219;116m"[0m[38;2;230;219;116mI heard a funny joke(#[0m[3;38;2;253;151;31m${index + 1}[0m[38;2;230;219;116m): [0m[3;38;2;253;151;31m$joke[0m[38;2;230;219;116m"[0m[38;2;248;248;242m)[0m
-[38;2;248;248;242m        }[0m
+[38;2;248;248;242m    [0m[38;2;248;248;242msetOf[0m[38;2;248;248;242m([0m[38;2;248;248;242mJoke[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[38;2;248;248;242mDelegatedJoke[0m[38;2;248;248;242m([0m[38;2;248;248;242mJoke[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m)[0m[38;2;248;248;242m.[0m[38;2;255;255;255mjoke[0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242mfilter[0m[38;2;248;248;242m([0m[38;2;255;255;255mJokeInterface[0m[38;2;248;248;242m::[0m[38;2;248;248;242misFunny[0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242mmap[0m[38;2;248;248;242m([0m[38;2;255;255;255mAbstractJoke[0m[38;2;248;248;242m::[0m[38;2;248;248;242mcontent[0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242mforEachIndexed[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m[38;2;248;248;242m [0m[38;2;255;255;255mindex[0m[38;2;248;248;242m:[0m[38;2;248;248;242m [0m[3;38;2;166;226;46mInt[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[3;38;2;253;151;31mjoke[0m[38;2;248;248;242m [0m[38;2;249;38;114m->[0m
+[38;2;248;248;242m            [0m[38;2;248;248;242mprintln[0m[38;2;248;248;242m([0m[38;2;230;219;116m"[0m[38;2;230;219;116mI heard a funny joke(#[0m[38;2;248;248;242m${[0m[38;2;255;255;255mindex[0m[38;2;248;248;242m [0m[38;2;249;38;114m+[0m[38;2;248;248;242m [0m[38;2;190;132;255m1[0m[38;2;248;248;242m}[0m[38;2;230;219;116m): [0m[38;2;255;255;255m$joke[0m[38;2;230;219;116m"[0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m}[0m

-[38;2;248;248;242m    listOf(Square([0m[38;2;190;132;255m12.3[0m[38;2;248;248;242m), Point, Circle([0m[38;2;190;132;255m5.2[0m[38;2;248;248;242m))[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242massociateWith(Shape[0m[38;2;249;38;114m::[0m[38;2;248;248;242marea)[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242mtoList()[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242msortedBy { it[0m[38;2;249;38;114m.[0m[38;2;248;248;242msecond }[0m
-[38;2;248;248;242m        [0m[38;2;249;38;114m.[0m[38;2;248;248;242mforEach {[0m
-[38;2;248;248;242m            println([0m[38;2;230;219;116m"[0m[3;38;2;253;151;31m${it.first}[0m[38;2;230;219;116m: [0m[3;38;2;253;151;31m${it.second}[0m[38;2;230;219;116m"[0m[38;2;248;248;242m)[0m
-[38;2;248;248;242m        }[0m
+[38;2;248;248;242m    [0m[38;2;248;248;242mlistOf[0m[38;2;248;248;242m([0m[38;2;248;248;242mSquare[0m[38;2;248;248;242m([0m[38;2;190;132;255m12.3[0m[38;2;248;248;242m)[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[38;2;255;255;255mPoint[0m[38;2;248;248;242m,[0m[38;2;248;248;242m [0m[38;2;248;248;242mCircle[0m[38;2;248;248;242m([0m[38;2;190;132;255m5.2[0m[38;2;248;248;242m)[0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242massociateWith[0m[38;2;248;248;242m([0m[38;2;255;255;255mShape[0m[38;2;248;248;242m::[0m[38;2;248;248;242marea[0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242mtoList[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242msortedBy[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m[38;2;248;248;242m [0m[38;2;255;255;255mit[0m[38;2;248;248;242m.[0m[38;2;255;255;255msecond[0m[38;2;248;248;242m [0m[38;2;248;248;242m}[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m.[0m[38;2;248;248;242mforEach[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m            [0m[38;2;248;248;242mprintln[0m[38;2;248;248;242m([0m[38;2;230;219;116m"[0m[38;2;248;248;242m${[0m[38;2;255;255;255mit[0m[38;2;248;248;242m.[0m[38;2;255;255;255mfirst[0m[38;2;248;248;242m}[0m[38;2;230;219;116m: [0m[38;2;248;248;242m${[0m[38;2;255;255;255mit[0m[38;2;248;248;242m.[0m[38;2;255;255;255msecond[0m[38;2;248;248;242m}[0m[38;2;230;219;116m"[0m[38;2;248;248;242m)[0m
+[38;2;248;248;242m        [0m[38;2;248;248;242m}[0m

-[38;2;248;248;242m    println([0m[38;2;230;219;116m"[0m[38;2;230;219;116msome string[0m[38;2;230;219;116m"[0m[38;2;249;38;114m.[0m[38;2;248;248;242mextensionMethod())[0m
+[38;2;248;248;242m    [0m[38;2;248;248;242mprintln[0m[38;2;248;248;242m([0m[38;2;230;219;116m"[0m[38;2;230;219;116msome string[0m[38;2;230;219;116m"[0m[38;2;248;248;242m.[0m[38;2;248;248;242mextensionMethod[0m[38;2;248;248;242m([0m[38;2;248;248;242m)[0m[38;2;248;248;242m)[0m

-[38;2;248;248;242m    require(SomeSingleton[0m[38;2;249;38;114m::[0m[38;2;248;248;242mclass[0m[38;2;249;38;114m.[0m[38;2;248;248;242msimpleName [0m[38;2;249;38;114m==[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mSomeSingletonName[0m[38;2;230;219;116m"[0m[38;2;248;248;242m) { [0m[38;2;230;219;116m"[0m[38;2;230;219;116msomething does not seem right...[0m[38;2;230;219;116m"[0m[38;2;248;248;242m }[0m
+[38;2;248;248;242m    [0m[38;2;248;248;242mrequire[0m[38;2;248;248;242m([0m[38;2;255;255;255mSomeSingleton[0m[38;2;248;248;242m::[0m[38;2;249;38;114mclass[0m[38;2;248;248;242m.[0m[38;2;255;255;255msimpleName[0m[38;2;248;248;242m [0m[38;2;249;38;114m==[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mSomeSingletonName[0m[38;2;230;219;116m"[0m[38;2;248;248;242m)[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116msomething does not seem right...[0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;248;248;242m}[0m
 [38;2;248;248;242m}[0m
@@ -0,0 +1,399 @@
+[38;2;190;132;255mUWSM[0m[38;2;249;38;114m([0m[38;2;230;219;116m1[0m[38;2;249;38;114m)[0m[38;2;248;248;242m                                 [0m[38;2;253;151;31mGeneral[0m[38;2;253;151;31m [0m[38;2;253;151;31mCommands[0m[38;2;253;151;31m [0m[38;2;253;151;31mManual[0m[38;2;248;248;242m                                [0m[38;2;190;132;255mUWSM[0m[38;2;249;38;114m([0m[38;2;230;219;116m1[0m[38;2;249;38;114m)[0m
+
+[38;2;253;151;31mNAME[0m
+[38;2;248;248;242m       UWSM - Universal Wayland Session Manager.[0m
+
+[38;2;253;151;31mSYNOPSIS[0m
+[38;2;248;248;242m       uwsm [0m[38;2;248;248;242m[[0m[38;2;166;226;46m-h[0m[38;2;249;38;114m|[0m[38;2;166;226;46m-v[0m[38;2;248;248;242m][0m[38;2;248;248;242m {subcommand} [0m[38;2;248;248;242m[[0m[38;2;248;248;242moptions ...[0m[38;2;248;248;242m][0m
+
+[38;2;253;151;31mDESCRIPTION[0m
+[38;2;248;248;242m       Launches arbitrary wayland compositor via a set of systemd user units to provide graphical user[0m
+[38;2;248;248;242m       session  with  environment  management, XDG autostart support, clean shutdown. Provides helpers[0m
+[38;2;248;248;242m       for launching applications as scopes or services.[0m
+
+[38;2;253;151;31mSUBCOMMANDS[0m
+[38;2;248;248;242m       select     Select default compositor Entry.[0m
+[38;2;248;248;242m       start      Start compositor and graphical session.[0m
+[38;2;248;248;242m       finalize   Send compositor-set variables and unit startup notification to systemd user manager.[0m
+[38;2;248;248;242m       stop       Stop graphical session and compositor.[0m
+[38;2;248;248;242m       app        Application unit launcher (with Desktop Entry support).[0m
+[38;2;248;248;242m       check      Perform state checks (for scripting and info).[0m
+[38;2;248;248;242m       aux        Technical functions for use inside units.[0m
+
+[38;2;248;248;242m       See corresponding SUBCOMMANDS subsections below for further info.[0m
+
+[38;2;248;248;242m       Help for each subcommand is accessible by running "uwsm {subcommand} [0m[38;2;166;226;46m-h[0m[38;2;248;248;242m".[0m
+
+[38;2;253;151;31mCONFIGURATION[0m
+[38;2;248;248;242m   Files[0m
+[38;2;248;248;242m       In XDG config hierarchy:[0m
+[38;2;248;248;242m       uwsm/env[0m
+[38;2;248;248;242m       uwsm/env.d/*[0m
+[38;2;248;248;242m       uwsm/env-${compositor}[0m
+[38;2;248;248;242m       uwsm/env-${compositor}.d/*   Environment (shell) to  be  sourced  for  the  graphical  session.[0m
+[38;2;248;248;242m                                    Sourced from directories of increasing priority, in each directory[0m
+[38;2;248;248;242m                                    common  file is sourced first, then suffixed files in the order of[0m
+[38;2;248;248;242m                                    items listed in XDG_CURRENT_SESSION var (lowercased).[0m
+[38;2;248;248;242m       uwsm/default-id              Stores Desktop Entry ID of default compositor.[0m
+
+[38;2;248;248;242m       Fallback is also extended into the system part of XDG data hierarchy, this can be used for dis‐[0m
+[38;2;248;248;242m       tro level defaults.[0m
+
+[38;2;248;248;242m   Environment vars[0m
+[38;2;248;248;242m       UWSM_UNIT_RUNG                  (run|home)[0m
+[38;2;248;248;242m                                       Which rung of systemd/user/ hierarchy to manage generated  unit[0m
+[38;2;248;248;242m                                       and drop-in files in: [0m[38;2;255;255;255m$[0m[38;2;190;132;255mXDG_RUNTIME_DIR[0m[38;2;248;248;242m or [0m[38;2;255;255;255m$[0m[38;2;190;132;255mXDG_CONFIG_HOME[0m[38;2;248;248;242m.[0m
+[38;2;248;248;242m       UWSM_TWEAKS                     (boolean value)[0m
+[38;2;248;248;242m                                       Set  to  False  to  remove  and not generate tweak drop-ins for[0m
+[38;2;248;248;242m                                       other software.[0m
+[38;2;248;248;242m       UWSM_FINALIZE_VARNAMES          (whitespace-separated names of env vars)[0m
+[38;2;248;248;242m                                       Additional variables for "uwsm finalize".[0m
+[38;2;248;248;242m       UWSM_WAIT_VARNAMES              (whitespace-separated names of env vars)[0m
+[38;2;248;248;242m                                       Variables to wait for in activation environment before proceed‐[0m
+[38;2;248;248;242m                                       ing to graphical session (in addition to WAYLAND_DISPLAY).[0m
+[38;2;248;248;242m       UWSM_WAIT_VARNAMES_TIMEOUT      (int value)[0m
+[38;2;248;248;242m                                       Seconds to wait for variables to appear in activation  environ‐[0m
+[38;2;248;248;242m                                       ment. Essentially, startup timeout (default: 10).[0m
+[38;2;248;248;242m       UWSM_WAIT_VARNAMES_SETTLETIME   (float value)[0m
+[38;2;248;248;242m                                       Seconds  to  pause  after all expected vars found in activation[0m
+[38;2;248;248;242m                                       environment (default: 0.2).[0m
+[38;2;248;248;242m       UWSM_APP_UNIT_TYPE              (scope|service)[0m
+[38;2;248;248;242m                                       Default unit type for launching apps (default: scope).[0m
+[38;2;248;248;242m       UWSM_SILENT_START               (int or boolean value)[0m
+[38;2;248;248;242m                                       True or 1 to inhibit stdout messages from "uwsm  start".  2  to[0m
+[38;2;248;248;242m                                       also inhibit warnings.[0m
+[38;2;248;248;242m       DEBUG                           (int or boolean value)[0m
+[38;2;248;248;242m                                       True or positive number to dump debug info to stderr.[0m
+
+[38;2;253;151;31mOPERATION OVERVIEW[0m
+[38;2;248;248;242m   Login Sequence Integration[0m
+[38;2;248;248;242m       uwsm  can  be  launched  by using conditional exec in shell profile to replace login shell (see[0m
+[38;2;248;248;242m       Shell Profile Integration section).[0m
+
+[38;2;248;248;242m       Alternatively "uwsm start ..." command can be put into wayland session's Desktop  Entry  to  be[0m
+[38;2;248;248;242m       launched by a display manager (see Use Inside Desktop Entry section).[0m
+
+[38;2;248;248;242m   Compositor Selection[0m
+[38;2;248;248;242m       uwsm  can  run arbitrary compositor command line or a Desktop Entry by ID (specifying Action ID[0m
+[38;2;248;248;242m       is also supported).[0m
+
+[38;2;248;248;242m       Desktop Entry can also be selected via a whiptail menu (see select subcommand section).[0m
+
+[38;2;248;248;242m   Startup[0m
+[38;2;248;248;242m       See start subcommand section for command syntax.[0m
+
+[38;2;248;248;242m       UWSM uses a set of units bound to standard user session targets:[0m
+
+[38;2;248;248;242m       •   wayland-session-pre@.target (bound to graphical-session-pre.target)[0m
+[38;2;248;248;242m           •   wayland-wm-env@.service (environment preloader service)[0m
+[38;2;248;248;242m       •   wayland-session@.target (bound to graphical-session.target)[0m
+[38;2;248;248;242m           •   wayland-wm@.service (service for the selected compositor)[0m
+[38;2;248;248;242m       •   wayland-session-xdg-autostart@.target (bound to xdg-desktop-autostart.target)[0m
+[38;2;248;248;242m       •   wayland-session-envelope@.target (lives through entire lifecycle)[0m
+[38;2;248;248;242m       •   wayland-session-shutdown.target (conflicts with targets above for shutdown)[0m
+[38;2;248;248;242m       •   wayland-session-bindpid@.service (PID-tracking session killswitch)[0m
+[38;2;248;248;242m       •   wayland-session-waitenv.service (delays graphical session until vars appear)[0m
+
+[38;2;248;248;242m       Compositor ID (Desktop Entry ID or executable name) becomes the  specifier  for  all  templated[0m
+[38;2;248;248;242m       units.[0m
+
+[38;2;248;248;242m       At  the  stage of graphical-session-pre.target, the environment saved from "uwsm start" context[0m
+[38;2;248;248;242m       is loaded (or POSIX shell profile is sourced), uwsm environment files are sourced. The delta is[0m
+[38;2;248;248;242m       exported to the systemd and D-Bus activation environments by the environment preloader  service[0m
+[38;2;248;248;242m       and  is  marked  for  cleanup  at  shutdown  stage. Preloader shell context for convenience has[0m
+[38;2;248;248;242m       IN_UWSM_ENV_PRELOADER var set to true.[0m
+
+[38;2;248;248;242m       At the stage  of  graphical-session.target  (before  it)  the  main  compositor  unit  wayland-[0m
+[38;2;248;248;242m       wm@${ID}.service and wayland-session-waitenv.service are started.[0m
+
+[38;2;248;248;242m       Compositor should at least put WAYLAND_DISPLAY variable to systemd activation environment. This[0m
+[38;2;248;248;242m       will  trigger  uwsm's automatic finalization logic. Without WAYLAND_DISPLAY in activation envi‐[0m
+[38;2;248;248;242m       ronment startup will timeout in 10 seconds.[0m
+
+[38;2;248;248;242m       Manual finalization is possible by running "uwsm finalize" (see finalize  subcommand  section),[0m
+[38;2;248;248;242m       also  in  combination  with  tweaking UWSM_WAIT_VARNAMES and UWSM_WAIT_VARNAMES_SETTLETIME vars[0m
+[38;2;248;248;242m       (see Environment vars section).[0m
+
+[38;2;248;248;242m       Successful activation of compositor unit and existence of WAYLAND_DISPLAY in  activation  envi‐[0m
+[38;2;248;248;242m       ronment will allow graphical-session.target to be declared reached.[0m
+
+[38;2;248;248;242m       Finally, xdg-desktop-autostart.target is activated.[0m
+
+[38;2;248;248;242m   Inside session[0m
+[38;2;248;248;242m       It  is  highly recommended to configure the compositor or app launcher to launch apps as scopes[0m
+[38;2;248;248;242m       or services in special user session slices (app.slice, background.slice,  session.slice).  uwsm[0m
+[38;2;248;248;242m       provides custom nested slices for apps to live in and be terminated on session end:[0m
+[38;2;248;248;242m       •   app-graphical.slice[0m
+[38;2;248;248;242m       •   background-graphical.slice[0m
+[38;2;248;248;242m       •   session-graphical.slice[0m
+
+[38;2;248;248;242m       A  helper app subcommand is provided to handle all the systemd-run invocations for you (see app[0m
+[38;2;248;248;242m       subcommand section).[0m
+
+[38;2;248;248;242m       The compositor is launched in session.slice by default (as recommended by [0m[38;2;166;226;46msystemd.[0m[38;2;166;226;46mspecial[0m[38;2;249;38;114m([0m[38;2;190;132;255m7[0m[38;2;249;38;114m)[0m[38;2;248;248;242m).[0m
+
+[38;2;248;248;242m   Shutdown[0m
+[38;2;248;248;242m       Can be initiated by either:[0m
+[38;2;248;248;242m       •   running uwsm stop[0m
+[38;2;248;248;242m       •   stopping wayland-wm@*.service or wayland-session-envelope@*.target[0m
+[38;2;248;248;242m       •   starting wayland-session-shutdown.target[0m
+
+[38;2;248;248;242m       Systemd stops all user units in reverse, as it usually does. During deactivation of  graphical-[0m
+[38;2;248;248;242m       session-pre.target,  the environment preloader service cleans activation environments by unset‐[0m
+[38;2;248;248;242m       ting all variables that were marked for removal during startup and finalization stages.[0m
+
+[38;2;248;248;242m       Do not use compositor's native exit mechanism or kill its process directly.[0m
+
+[38;2;253;151;31mSUBCOMMANDS[0m
+[38;2;248;248;242m   select[0m
+[38;2;248;248;242m       Selects default wayland session compositor Desktop Entry.[0m
+
+[38;2;248;248;242m           uwsm select[0m
+
+[38;2;248;248;242m       Invokes a whiptail menu to select default session among Desktop Entries in wayland-sessions XDG[0m
+[38;2;248;248;242m       data hierarchy. Writes to ${XDG_CONFIG_HOME}/uwsm/default-id. Nothing else is done.  Returns  1[0m
+[38;2;248;248;242m       if selection is cancelled. Can be used for scripting launch condition in shell profile.[0m
+
+[38;2;248;248;242m   check[0m
+[38;2;248;248;242m       Performs tests, returns 0 on success, 1 on failure.[0m
+
+[38;2;248;248;242m       is-active:[0m
+
+[38;2;248;248;242m           uwsm check is-active [[0m[38;2;166;226;46m-h[0m[38;2;248;248;242m] [[0m[38;2;166;226;46m-v[0m[38;2;248;248;242m] [compositor][0m
+
+[38;2;248;248;242m           [0m[38;2;166;226;46m-v[0m[38;2;248;248;242m           show additional info[0m
+[38;2;248;248;242m           compositor   check for specific compositor[0m
+
+[38;2;248;248;242m       Checks  if  unit of specific compositor or graphical-session*.target in general is in active or[0m
+[38;2;248;248;242m       activating state.[0m
+
+[38;2;248;248;242m       may-start:[0m
+
+[38;2;248;248;242m           uwsm check may-start [[0m[38;2;166;226;46m-h[0m[38;2;248;248;242m] [[0m[38;2;166;226;46m-g[0m[38;2;248;248;242m [S]] [[0m[38;2;166;226;46m-v[0m[38;2;248;248;242m|[0m[38;2;166;226;46m-q[0m[38;2;248;248;242m] [N ...][0m
+
+[38;2;248;248;242m           N ...   allowed VT numbers (default: 1)[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-g[0m[38;2;248;248;242m S    wait S seconds for graphical.target in queue  (default:  60;  0  or  less  disables[0m
+[38;2;248;248;242m                   check).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-i[0m[38;2;248;248;242m      do not check for login shell[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-r[0m[38;2;248;248;242m      do not check for local session (allow remote session)[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-v[0m[38;2;248;248;242m      show all failed tests[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-q[0m[38;2;248;248;242m      be quiet[0m
+
+[38;2;248;248;242m       Checks whether it is OK to launch a wayland session via the following conditions:[0m
+[38;2;248;248;242m       •   DBUS_SESSION_BUS_ADDRESS is set[0m
+[38;2;248;248;242m       •   Running from login shell[0m
+[38;2;248;248;242m       •   System is at graphical.target[0m
+[38;2;248;248;242m       •   User graphical-session*.target units are not yet active[0m
+[38;2;248;248;242m       •   Foreground VT is among allowed (default: 1)[0m
+[38;2;248;248;242m       •   Login session's VT is matching[0m
+
+[38;2;248;248;242m   start[0m
+[38;2;248;248;242m       Generates units for given compositor command line or Desktop Entry and starts them.[0m
+
+[38;2;248;248;242m           uwsm  start  [[0m[38;2;166;226;46m-h[0m[38;2;248;248;242m]  [[0m[38;2;166;226;46m-D[0m[38;2;248;248;242m  name[:name...]] [[0m[38;2;166;226;46m-a[0m[38;2;248;248;242m|[0m[38;2;166;226;46m-e[0m[38;2;248;248;242m] [[0m[38;2;166;226;46m-N[0m[38;2;248;248;242m Name] [[0m[38;2;166;226;46m-C[0m[38;2;248;248;242m Comment] [[0m[38;2;166;226;46m-U[0m[38;2;248;248;242m {run|home}] [[0m[38;2;166;226;46m-t[0m[38;2;248;248;242m][0m
+[38;2;248;248;242m           [[0m[38;2;166;226;46m-o[0m[38;2;248;248;242m] [[0m[38;2;166;226;46m-n[0m[38;2;248;248;242m] -- compositor [args ...][0m
+
+[38;2;248;248;242m           [0m[38;2;166;226;46m-F[0m[38;2;248;248;242m                  Hardcode mode, always write command line to unit drop-ins and use  full[0m
+[38;2;248;248;242m                               paths.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-D[0m[38;2;248;248;242m name[:name...]   Names to fill XDG_CURRENT_DESKTOP with (:[0m[38;2;166;226;46m-separated[0m[38;2;248;248;242m). Existing var con‐[0m
+[38;2;248;248;242m                               tent is a starting point if no active session is running.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-a[0m[38;2;248;248;242m                  Append desktop names set by [0m[38;2;166;226;46m-D[0m[38;2;248;248;242m to other sources (default).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-e[0m[38;2;248;248;242m                  Use desktop names set by [0m[38;2;166;226;46m-D[0m[38;2;248;248;242m exclusively, discard other sources.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-N[0m[38;2;248;248;242m Name             Fancy name for compositor (filled from Desktop Entry by default).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-C[0m[38;2;248;248;242m Comment          Fancy  description  for  compositor  (filled  from Desktop Entry by de‐[0m
+[38;2;248;248;242m                               fault).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-U[0m[38;2;248;248;242m {run|home}       Select  rung  for  generated  unit  files:  run:  [0m[38;2;255;255;255m$[0m[38;2;190;132;255mXDG_RUNTIME_DIR[0m[38;2;248;248;242m/sys‐[0m
+[38;2;248;248;242m                               temd/user  (default), or home: [0m[38;2;255;255;255m$[0m[38;2;190;132;255mXDG_CONFIG_HOME[0m[38;2;248;248;242m/systemd/user. Permanent[0m
+[38;2;248;248;242m                               destination will save some time by removing need for reloading systemd.[0m
+[38;2;248;248;242m                               Managed files from other rung will  be  removed.  Can  be  preset  with[0m
+[38;2;248;248;242m                               UWSM_UNIT_RUNG environment var.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-t[0m[38;2;248;248;242m                  Do  not  generate  (and  remove)  tweak  unit files. Can be preset with[0m
+[38;2;248;248;242m                               UWSM_TWEAKS=false environment var.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-T[0m[38;2;248;248;242m                  Generate tweak unit files for other software. This is default behavior.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-g[0m[38;2;248;248;242m S                Wait for S seconds for system graphical.target in  queue  and  warn  if[0m
+[38;2;248;248;242m                               timed out or not in queue (default: 60, negative to disable).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-G[0m[38;2;248;248;242m S                Wait  for  S  seconds for system graphical.target in queue and abort if[0m
+[38;2;248;248;242m                               timed out or not in queue (overrides [0m[38;2;166;226;46m-g[0m[38;2;248;248;242m, default: [0m[38;2;166;226;46m-1[0m[38;2;248;248;242m, (disabled)).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-o[0m[38;2;248;248;242m                  Only generate units, but do not start.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-n[0m[38;2;248;248;242m                  Dry run, do not write or start anything.[0m
+
+[38;2;248;248;242m       The first argument of the compositor command line acts as an ID and should be either one of:[0m
+[38;2;248;248;242m       •   Executable name[0m
+[38;2;248;248;242m       •   Desktop Entry ID (optionally with ":"[0m[38;2;166;226;46m-delimited[0m[38;2;248;248;242m action ID)[0m
+[38;2;248;248;242m       •   Special value:[0m
+[38;2;248;248;242m           •   select - invoke menu to select compositor.[0m
+[38;2;248;248;242m           •   default - run previously selected compositor (or select if no selection was saved).[0m
+
+[38;2;248;248;242m       If given as path, hardcode mode will be used implicitly.[0m
+
+[38;2;248;248;242m       Always use "--" to disambiguate dashed arguments intended for compositor itself.[0m
+
+[38;2;248;248;242m       After units are (re)generated, wayland-session-bindpid@${PID}.service is started, to track  the[0m
+[38;2;248;248;242m       PID  of  invoking  uwsm, then uwsm process replaces itself with systemctl execution that starts[0m
+[38;2;248;248;242m       wayland-wm@${ID}.service and waits for it to finish.[0m
+
+[38;2;248;248;242m       In order to complete the startup sequence, the compositor has to put WAYLAND_DISPLAY  into  the[0m
+[38;2;248;248;242m       systemd  activation environment. This can be done explicitly by making compositor run "uwsm fi‐[0m
+[38;2;248;248;242m       nalize" command (see the next subsection).[0m
+
+[38;2;248;248;242m   finalize[0m
+[38;2;248;248;242m       For running by a compositor on startup.[0m
+
+[38;2;248;248;242m           uwsm finalize [[0m[38;2;166;226;46m-h[0m[38;2;248;248;242m] [VAR_NAME ...][0m
+
+[38;2;248;248;242m       Exports WAYLAND_DISPLAY, DISPLAY and any defined vars mentioned by names  in  arguments  or  in[0m
+[38;2;248;248;242m       UWSM_FINALIZE_VARNAMES variable (whitespace-separated). Then sends startup notification for the[0m
+[38;2;248;248;242m       unit to systemd user manager.[0m
+
+[38;2;248;248;242m       This  is required if compositor itself does not put WAYLAND_DISPLAY to systemd activation envi‐[0m
+[38;2;248;248;242m       ronment, otherwise wayland-session@.service unit or a dedicated wayland-session-waitenv.service[0m
+[38;2;248;248;242m       unit will terminate due to startup timeout.[0m
+
+[38;2;248;248;242m       UWSM_FINALIZE_VARNAMES variable can be prefilled by plugins.[0m
+
+[38;2;248;248;242m       Direct assignment as VAR_NAME=value is also possible, but recommended only for  creating  flags[0m
+[38;2;248;248;242m       for UWSM_WAIT_VARNAMES mechanism.[0m
+
+[38;2;248;248;242m   stop[0m
+[38;2;248;248;242m       Stops compositor and optionally removes generated units.[0m
+
+[38;2;248;248;242m           uwsm stop [[0m[38;2;166;226;46m-h[0m[38;2;248;248;242m] [[0m[38;2;166;226;46m-r[0m[38;2;248;248;242m [compositor] [[0m[38;2;166;226;46m-U[0m[38;2;248;248;242m {run|home}] [[0m[38;2;166;226;46m-n[0m[38;2;248;248;242m][0m
+
+[38;2;248;248;242m           [0m[38;2;166;226;46m-r[0m[38;2;248;248;242m [compositor]   Also remove units (all or only compositor-specific).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-U[0m[38;2;248;248;242m {run|home}     Select  rung for generated unit files: run: [0m[38;2;255;255;255m$[0m[38;2;190;132;255mXDG_RUNTIME_DIR[0m[38;2;248;248;242m/systemd/user[0m
+[38;2;248;248;242m                             (default), or home: [0m[38;2;255;255;255m$[0m[38;2;190;132;255mXDG_CONFIG_HOME[0m[38;2;248;248;242m/systemd/user. Permanent  destination[0m
+[38;2;248;248;242m                             will save some time by removing need for reloading systemd. Managed files[0m
+[38;2;248;248;242m                             from  other rung will be removed. Can be preset with UWSM_UNIT_RUNG envi‐[0m
+[38;2;248;248;242m                             ronment var.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-n[0m[38;2;248;248;242m                Dry run, do not stop or remove anything.[0m
+
+[38;2;248;248;242m   app[0m
+[38;2;248;248;242m       Application-to-unit launcher with Desktop Entry support.[0m
+
+[38;2;248;248;242m           uwsm app [[0m[38;2;166;226;46m-h[0m[38;2;248;248;242m] [[0m[38;2;166;226;46m-s[0m[38;2;248;248;242m {a,b,s,custom.slice}] [[0m[38;2;166;226;46m-t[0m[38;2;248;248;242m {scope,service}] [[0m[38;2;166;226;46m-a[0m[38;2;248;248;242m app_name]  [[0m[38;2;166;226;46m-u[0m[38;2;248;248;242m  unit_name][0m
+[38;2;248;248;242m           [[0m[38;2;166;226;46m-d[0m[38;2;248;248;242m unit_description] [[0m[38;2;166;226;46m-S[0m[38;2;248;248;242m ] [[0m[38;2;166;226;46m-T[0m[38;2;248;248;242m] -- application [args ...][0m
+
+[38;2;248;248;242m           [0m[38;2;166;226;46m-s[0m[38;2;248;248;242m {a,b,s,custom.slice}   Slice selector (default: a):[0m
+[38;2;248;248;242m                                        a - app-graphical.slice[0m
+[38;2;248;248;242m                                        b - background-graphical.slice[0m
+[38;2;248;248;242m                                        s - session-graphical.slice[0m
+[38;2;248;248;242m                                        any slice by full name[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-t[0m[38;2;248;248;242m {scope,service}        Type  of  unit  to  launch  (default:  scope,  can  be  preset by[0m
+[38;2;248;248;242m                                     UWSM_APP_UNIT_TYPE env var).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-a[0m[38;2;248;248;242m app_name               Override app name (a substring in unit name).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-u[0m[38;2;248;248;242m unit_name              Override the whole autogenerated unit name.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-d[0m[38;2;248;248;242m unit_description       Unit Description.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-p[0m[38;2;248;248;242m Property=value         Set additional unit property (option is repeatable).[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-S[0m[38;2;248;248;242m {out,err,both}         Silence stdout, stderr, or both.[0m
+[38;2;248;248;242m           [0m[38;2;166;226;46m-T[0m[38;2;248;248;242m                        Launch app in a terminal. Allows command  to  be  empty  to  just[0m
+[38;2;248;248;242m                                     launch a terminal.[0m
+
+[38;2;248;248;242m       Application  can  be  provided as a command with optional arguments, or a Desktop Entry ID, op‐[0m
+[38;2;248;248;242m       tionally suffixed with ":"[0m[38;2;166;226;46m-delimited[0m[38;2;248;248;242m Action ID. If Desktop Entry is being  launched,  arguments[0m
+[38;2;248;248;242m       should be compatible with it.[0m
+
+[38;2;248;248;242m       Always use "--" to disambiguate dashed arguments intended for application itself.[0m
+
+[38;2;248;248;242m   aux[0m
+[38;2;248;248;242m       For use in systemd user services. Can only be called by systemd user manager.[0m
+
+[38;2;248;248;242m       prepare-env   Prepares  environment  (for  use in ExecStart in wayland-wm-env@.service bound to[0m
+[38;2;248;248;242m                     wayland-session-pre@.target).[0m
+[38;2;248;248;242m       cleanup-env   Cleans up environment (for use ExecStop in in  wayland-wm-env@.service  bound  to[0m
+[38;2;248;248;242m                     wayland-session-pre@.target).[0m
+[38;2;248;248;242m       exec          Executes a command with arguments or a desktop entry (for use in Exec in wayland-[0m
+[38;2;248;248;242m                     wm@.service bound to wayland-session@.target).[0m
+[38;2;248;248;242m       app-daemon    Daemon for faster app argument generation, used by uwsm-app client.[0m
+
+[38;2;253;151;31mAPP DAEMON[0m
+[38;2;248;248;242m       Provided as wayland-wm-app-daemon.service to be started on-demand.[0m
+
+[38;2;248;248;242m       Daemon  receives app arguments from ${XDG_RUNTIME_DIR}/uwsm-app-daemon-in pipe. Resulting argu‐[0m
+[38;2;248;248;242m       ments are formatted as shell code and written to ${XDG_RUNTIME_DIR}/uwsm-app-daemon-out pipe.[0m
+
+[38;2;248;248;242m       Arguments are expected to be \0-delimited, leading \0 are stripped. One command is received per[0m
+[38;2;248;248;242m       write+close.[0m
+
+[38;2;248;248;242m       The first argument determines the behavior:[0m
+
+[38;2;248;248;242m       •   app  the rest is processed the same as in "uwsm app"[0m
+[38;2;248;248;242m       •   ping just "pong" is returnedn[0m
+[38;2;248;248;242m       •   stop daemon is stoppedn[0m
+
+[38;2;248;248;242m       Single commands are prepended with exec, iterated commands are assembled with trailing &  each,[0m
+[38;2;248;248;242m       followed by wait.[0m
+
+[38;2;248;248;242m       The  purpose  of  all this is to skip all the expensive Python startup and import routines that[0m
+[38;2;248;248;242m       slow things down every time "uwsm app" is called. Instead the daemon does it once and then lis‐[0m
+[38;2;248;248;242m       tens for requests, while a simple shell script may dump arguments to one pipe and run the  code[0m
+[38;2;248;248;242m       received from another via eval, which is much faster.[0m
+
+[38;2;248;248;242m       The simplest script is:[0m
+
+[38;2;248;248;242m                #!/bin/sh[0m
+[38;2;248;248;242m                printf '0%s' app "$@" > "${XDG_RUNTIME_DIR}/uwsm-app-daemon-in"[0m
+[38;2;248;248;242m                IFS='' read [0m[38;2;166;226;46m-r[0m[38;2;248;248;242m cmd < "${XDG_RUNTIME_DIR}/uwsm-app-daemon-out"[0m
+[38;2;248;248;242m                eval "[0m[38;2;255;255;255m$[0m[38;2;190;132;255mcmd[0m[38;2;248;248;242m"[0m
+
+[38;2;248;248;242m       Provided  uwsm-app  client  script is a bit smarter: it can start the daemon, applies timeouts,[0m
+[38;2;248;248;242m       and supports newlines in returned args.[0m
+
+[38;2;253;151;31mSHELL PROFILE INTEGRATION[0m
+[38;2;248;248;242m       To launch uwsm automatically on login, add one of constructs below (or similar) to  shell  pro‐[0m
+[38;2;248;248;242m       file.[0m
+
+[38;2;248;248;242m       This asks to select a compositor (or refuse and continue with login shell) when logged in on VT[0m
+[38;2;248;248;242m       1:[0m
+
+[38;2;248;248;242m                if uwsm check may-start && uwsm select; then[0m
+[38;2;248;248;242m                     exec systemd-cat [0m[38;2;166;226;46m-t[0m[38;2;248;248;242m uwsm_start uwsm start default[0m
+[38;2;248;248;242m                fi[0m
+
+[38;2;248;248;242m       This just starts a specific compositor depending on foreground VT:[0m
+
+[38;2;248;248;242m                if uwsm check may-start 1; then[0m
+[38;2;248;248;242m                     exec systemd-cat [0m[38;2;166;226;46m-t[0m[38;2;248;248;242m uwsm_start uwsm start sway.desktop[0m
+[38;2;248;248;242m                elif uwsm check may-start 2; then[0m
+[38;2;248;248;242m                     exec systemd-cat [0m[38;2;166;226;46m-t[0m[38;2;248;248;242m uwsm_start uwsm start labwc.desktop[0m
+[38;2;248;248;242m                fi[0m
+
+[38;2;248;248;242m       Using  "uwsm  check  may-start"  as  a  condition  is essential, not only to prevent accidental[0m
+[38;2;248;248;242m       startup attempts where they are not expected, but also since startup may involve sourcing shell[0m
+[38;2;248;248;242m       profile, which might lead to nasty loops.[0m
+
+[38;2;248;248;242m       See check subcommand section for info on may-start checker.[0m
+
+[38;2;248;248;242m       exec allows uwsm to replace login shell in order to properly bind to user  session  and  handle[0m
+[38;2;248;248;242m       session termination.[0m
+
+[38;2;248;248;242m       "systemd-cat  [0m[38;2;166;226;46m-t[0m[38;2;248;248;242m uwsm_start" (optional) executes the command given to it (uwsm) with its stdout[0m
+[38;2;248;248;242m       and stderr connected to the systemd journal, tagged with identifier "uwsm_start". See  systemd-[0m
+[38;2;248;248;242m       [0m[38;2;166;226;46mcat[0m[38;2;249;38;114m([0m[38;2;190;132;255m1[0m[38;2;249;38;114m)[0m[38;2;248;248;242m for more options.[0m
+
+[38;2;253;151;31mUSE INSIDE DESKTOP ENTRY[0m
+[38;2;248;248;242m       To  launch  uwsm from a display/login manager, "uwsm start" can be used inside Desktop Entries.[0m
+[38;2;248;248;242m       Example /usr/local/share/wayland-sessions/my-compositor.desktop:[0m
+
+[38;2;248;248;242m                [Desktop Entry][0m
+[38;2;248;248;242m                Name=My compositor (with UWSM)[0m
+[38;2;248;248;242m                Comment=My cool compositor[0m
+[38;2;248;248;242m                Exec=uwsm start [0m[38;2;166;226;46m-N[0m[38;2;248;248;242m "My compositor" [0m[38;2;166;226;46m-D[0m[38;2;248;248;242m mycompositor [0m[38;2;166;226;46m-C[0m[38;2;248;248;242m "My cool compositor" mywm[0m
+[38;2;248;248;242m                DesktopNames=mycompositor[0m
+[38;2;248;248;242m                Type=Application[0m
+
+[38;2;248;248;242m       Things to keep in mind:[0m
+
+[38;2;248;248;242m       •   For consistency, command line arguments should mirror the keys of the entry[0m
+[38;2;248;248;242m       •   Command in Exec= should start with "uwsm start"[0m
+[38;2;248;248;242m       •   It should not point to itself (as a combination of Desktop Entry ID and Action ID)[0m
+[38;2;248;248;242m       •   It should not point to a Desktop Entry ID and Action ID that also uses ‘uwsm‘[0m
+
+[38;2;248;248;242m       Potentially such entries may be found and used by uwsm itself, i.e. in shell  profile  integra‐[0m
+[38;2;248;248;242m       tion  situation,  or  when  launched manually. Following the principles above ensures uwsm will[0m
+[38;2;248;248;242m       properly recognize itself and parse requested arguments inside the entry without any  side  ef‐[0m
+[38;2;248;248;242m       fects.[0m
+
+[38;2;253;151;31mSEE ALSO[0m
+[38;2;248;248;242m       [0m[38;2;166;226;46muwsm-plugins[0m[38;2;249;38;114m([0m[38;2;190;132;255m3[0m[38;2;249;38;114m)[0m[38;2;248;248;242m, [0m[38;2;166;226;46msystemd-run[0m[38;2;249;38;114m([0m[38;2;190;132;255m1[0m[38;2;249;38;114m)[0m[38;2;248;248;242m, [0m[38;2;166;226;46msystemd-cat[0m[38;2;249;38;114m([0m[38;2;190;132;255m1[0m[38;2;249;38;114m)[0m[38;2;248;248;242m, [0m[38;2;166;226;46msystemd.[0m[38;2;166;226;46mspecial[0m[38;2;249;38;114m([0m[38;2;190;132;255m7[0m[38;2;249;38;114m)[0m
+
+[38;2;248;248;242m                                              2026-02-14                                       [0m[38;2;166;226;46mUWSM[0m[38;2;249;38;114m([0m[38;2;190;132;255m1[0m[38;2;249;38;114m)[0m
@@ -0,0 +1,7 @@
+[38;2;117;113;94m#[0m[38;2;117;113;94m!/usr/bin/expect -f[0m
+[38;2;117;113;94m#[0m[38;2;117;113;94m Expect script detected via expect shebang[0m
+[38;2;249;38;114mset[0m[38;2;248;248;242m timeout [0m[38;2;190;132;255m30[0m
+[38;2;248;248;242mspawn[0m[38;2;248;248;242m ssh user@host[0m
+[38;2;248;248;242mexpect[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mpassword:[0m[38;2;230;219;116m"[0m
+[38;2;248;248;242msend[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116msecret[0m[38;2;190;132;255m\r[0m[38;2;230;219;116m"[0m
+[38;2;248;248;242mexpect[0m[38;2;248;248;242m [0m[38;2;249;38;114meof[0m
@@ -0,0 +1,7 @@
+[38;2;117;113;94m#[0m[38;2;117;113;94m!/usr/bin/env tclsh[0m
+[38;2;117;113;94m#[0m[38;2;117;113;94m Tcl script detected via tclsh shebang[0m
+[38;2;249;38;114mputs[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mHello from tclsh[0m[38;2;230;219;116m"[0m
+[38;2;249;38;114mset[0m[38;2;248;248;242m x [0m[38;2;190;132;255m42[0m
+[38;2;249;38;114mif[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m[38;2;255;255;255m$[0m[38;2;255;255;255mx[0m[38;2;248;248;242m [0m[38;2;249;38;114m>[0m[38;2;248;248;242m [0m[38;2;190;132;255m0[0m[38;2;248;248;242m}[0m[38;2;248;248;242m [0m[38;2;248;248;242m{[0m
+[38;2;248;248;242m    [0m[38;2;249;38;114mputs[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mpositive[0m[38;2;230;219;116m"[0m
+[38;2;248;248;242m}[0m
@@ -0,0 +1,5 @@
+[38;2;117;113;94m#[0m[38;2;117;113;94m!/usr/bin/wish[0m
+[38;2;117;113;94m#[0m[38;2;117;113;94m Tk script detected via wish shebang[0m
+[38;2;249;38;114mpackage[0m[38;2;248;248;242m require Tk[0m
+[38;2;248;248;242mbutton[0m[38;2;248;248;242m .b [0m[38;2;249;38;114m-[0m[38;2;248;248;242mtext [0m[38;2;230;219;116m"[0m[38;2;230;219;116mClick[0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;249;38;114m-[0m[38;2;248;248;242mcommand [0m[38;2;248;248;242m{[0m[38;2;249;38;114mputs[0m[38;2;248;248;242m [0m[38;2;230;219;116m"[0m[38;2;230;219;116mclicked[0m[38;2;230;219;116m"[0m[38;2;248;248;242m}[0m
+[38;2;248;248;242mpack[0m[38;2;248;248;242m .b[0m
@@ -0,0 +1,7 @@
+[38;2;255;255;255m<[0m[38;2;249;38;114mSolution[0m[38;2;255;255;255m>[0m
+[38;2;248;248;242m  [0m[38;2;255;255;255m<[0m[38;2;249;38;114mFolder[0m[38;2;248;248;242m [0m[38;2;166;226;46mName[0m[38;2;248;248;242m=[0m[38;2;230;219;116m"[0m[38;2;230;219;116m/Build/[0m[38;2;230;219;116m"[0m[38;2;255;255;255m>[0m
+[38;2;248;248;242m    [0m[38;2;255;255;255m<[0m[38;2;249;38;114mFile[0m[38;2;248;248;242m [0m[38;2;166;226;46mPath[0m[38;2;248;248;242m=[0m[38;2;230;219;116m"[0m[38;2;230;219;116mDirectory.Build.props[0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;255;255;255m/>[0m
+[38;2;248;248;242m    [0m[38;2;255;255;255m<[0m[38;2;249;38;114mFile[0m[38;2;248;248;242m [0m[38;2;166;226;46mPath[0m[38;2;248;248;242m=[0m[38;2;230;219;116m"[0m[38;2;230;219;116mprojectname.targets[0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;255;255;255m/>[0m
+[38;2;248;248;242m  [0m[38;2;255;255;255m</[0m[38;2;249;38;114mFolder[0m[38;2;255;255;255m>[0m
+[38;2;248;248;242m  [0m[38;2;255;255;255m<[0m[38;2;249;38;114mProject[0m[38;2;248;248;242m [0m[38;2;166;226;46mPath[0m[38;2;248;248;242m=[0m[38;2;230;219;116m"[0m[38;2;230;219;116mconsole.csproj[0m[38;2;230;219;116m"[0m[38;2;248;248;242m [0m[38;2;255;255;255m/>[0m
+[38;2;255;255;255m</[0m[38;2;249;38;114mSolution[0m[38;2;255;255;255m>[0m
@@ -0,0 +1,61 @@
+IDENTIFICATION DIVISION.
+PROGRAM-ID. PAYROLL-CALC.
+
+DATA DIVISION.
+WORKING-STORAGE SECTION.
+    01 EMPLOYEE-DETAILS.
+        05 EMPLOYEE-NAME      PIC X(30).
+        05 HOURS-WORKED       PIC 99V9.
+        05 HOURLY-RATE        PIC 99V99.
+    01 PAY-CALCULATIONS.
+        05 GROSS-PAY          PIC 9(5)V99.
+        05 OVERTIME-HOURS     PIC 99V9.
+        05 OVERTIME-PAY       PIC 9(5)V99.
+        05 TAX-RATE           PIC V99 VALUE 0.10.
+        05 TAX-AMOUNT         PIC 9(5)V99.
+        05 NET-PAY            PIC 9(5)V99.
+
+PROCEDURE DIVISION.
+MAIN-LOGIC.
+    DISPLAY "--- COBOL Payroll Calculator ---".
+
+    DISPLAY "Enter Employee Name: ".
+    ACCEPT EMPLOYEE-NAME.
+
+    DISPLAY "Enter Hours Worked (e.g., 40.5): ".
+    ACCEPT HOURS-WORKED.
+
+    DISPLAY "Enter Hourly Rate (e.g., 15.75): ".
+    ACCEPT HOURLY-RATE.
+
+    PERFORM CALCULATE-GROSS-PAY.
+    PERFORM CALCULATE-TAX.
+    PERFORM CALCULATE-NET-PAY.
+    PERFORM DISPLAY-RESULTS.
+
+    STOP RUN.
+
+CALCULATE-GROSS-PAY.
+    IF HOURS-WORKED > 40 THEN
+        COMPUTE OVERTIME-HOURS = HOURS-WORKED - 40
+        COMPUTE OVERTIME-PAY = OVERTIME-HOURS * HOURLY-RATE * 1.5
+        COMPUTE GROSS-PAY = (40 * HOURLY-RATE) + OVERTIME-PAY
+    ELSE
+        COMPUTE GROSS-PAY = HOURS-WORKED * HOURLY-RATE
+    END-IF.
+
+CALCULATE-TAX.
+    COMPUTE TAX-AMOUNT = GROSS-PAY * TAX-RATE.
+
+CALCULATE-NET-PAY.
+    COMPUTE NET-PAY = GROSS-PAY - TAX-AMOUNT.
+
+DISPLAY-RESULTS.
+    DISPLAY "----------------------------------".
+    DISPLAY "Employee Name: " EMPLOYEE-NAME.
+    DISPLAY "Hours Worked:  " HOURS-WORKED.
+    DISPLAY "Hourly Rate:   " HOURLY-RATE.
+    DISPLAY "Gross Pay:     " GROSS-PAY.
+    DISPLAY "Tax (10%):     " TAX-AMOUNT.
+    DISPLAY "Net Pay:       " NET-PAY.
+    DISPLAY "----------------------------------".
@@ -0,0 +1,61 @@
+IDENTIFICATION DIVISION.
+PROGRAM-ID. PAYROLL-CALC.
+
+DATA DIVISION.
+WORKING-STORAGE SECTION.
+    01 EMPLOYEE-DETAILS.
+        05 EMPLOYEE-NAME      PIC X(30).
+        05 HOURS-WORKED       PIC 99V9.
+        05 HOURLY-RATE        PIC 99V99.
+    01 PAY-CALCULATIONS.
+        05 GROSS-PAY          PIC 9(5)V99.
+        05 OVERTIME-HOURS     PIC 99V9.
+        05 OVERTIME-PAY       PIC 9(5)V99.
+        05 TAX-RATE           PIC V99 VALUE 0.10.
+        05 TAX-AMOUNT         PIC 9(5)V99.
+        05 NET-PAY            PIC 9(5)V99.
+
+PROCEDURE DIVISION.
+MAIN-LOGIC.
+    DISPLAY "--- COBOL Payroll Calculator ---".
+
+    DISPLAY "Enter Employee Name: ".
+    ACCEPT EMPLOYEE-NAME.
+
+    DISPLAY "Enter Hours Worked (e.g., 40.5): ".
+    ACCEPT HOURS-WORKED.
+
+    DISPLAY "Enter Hourly Rate (e.g., 15.75): ".
+    ACCEPT HOURLY-RATE.
+
+    PERFORM CALCULATE-GROSS-PAY.
+    PERFORM CALCULATE-TAX.
+    PERFORM CALCULATE-NET-PAY.
+    PERFORM DISPLAY-RESULTS.
+
+    STOP RUN.
+
+CALCULATE-GROSS-PAY.
+    IF HOURS-WORKED > 40 THEN
+        COMPUTE OVERTIME-HOURS = HOURS-WORKED - 40
+        COMPUTE OVERTIME-PAY = OVERTIME-HOURS * HOURLY-RATE * 1.5
+        COMPUTE GROSS-PAY = (40 * HOURLY-RATE) + OVERTIME-PAY
+    ELSE
+        COMPUTE GROSS-PAY = HOURS-WORKED * HOURLY-RATE
+    END-IF.
+
+CALCULATE-TAX.
+    COMPUTE TAX-AMOUNT = GROSS-PAY * TAX-RATE.
+
+CALCULATE-NET-PAY.
+    COMPUTE NET-PAY = GROSS-PAY - TAX-AMOUNT.
+
+DISPLAY-RESULTS.
+    DISPLAY "----------------------------------".
+    DISPLAY "Employee Name: " EMPLOYEE-NAME.
+    DISPLAY "Hours Worked:  " HOURS-WORKED.
+    DISPLAY "Hourly Rate:   " HOURLY-RATE.
+    DISPLAY "Gross Pay:     " GROSS-PAY.
+    DISPLAY "Tax (10%):     " TAX-AMOUNT.
+    DISPLAY "Net Pay:       " NET-PAY.
+    DISPLAY "----------------------------------".
@@ -0,0 +1,25 @@
+(logging) {
+    log {
+        output file /var/log/caddy.log
+    }
+}
+
+# a comment
+localhost:8080, example.com {
+    root * /var/www/site
+    file_server
+    reverse_proxy /.well-known/matrix/* localhost:8008 {
+        header_up Host {upstream_hostport}
+    }
+    import logging
+}
+
+www.example.com {
+    redir https://example.com{uri} permanent
+    import logging
+}
+
+status.example.com {
+    reverse_proxy localhost:3002
+    import logging
+}
@@ -0,0 +1,399 @@
+UWSM(1)                                 General Commands Manual                                UWSM(1)
+
+NAME
+       UWSM - Universal Wayland Session Manager.
+
+SYNOPSIS
+       uwsm [-h|-v] {subcommand} [options ...]
+
+DESCRIPTION
+       Launches arbitrary wayland compositor via a set of systemd user units to provide graphical user
+       session  with  environment  management, XDG autostart support, clean shutdown. Provides helpers
+       for launching applications as scopes or services.
+
+SUBCOMMANDS
+       select     Select default compositor Entry.
+       start      Start compositor and graphical session.
+       finalize   Send compositor-set variables and unit startup notification to systemd user manager.
+       stop       Stop graphical session and compositor.
+       app        Application unit launcher (with Desktop Entry support).
+       check      Perform state checks (for scripting and info).
+       aux        Technical functions for use inside units.
+
+       See corresponding SUBCOMMANDS subsections below for further info.
+
+       Help for each subcommand is accessible by running "uwsm {subcommand} -h".
+
+CONFIGURATION
+   Files
+       In XDG config hierarchy:
+       uwsm/env
+       uwsm/env.d/*
+       uwsm/env-${compositor}
+       uwsm/env-${compositor}.d/*   Environment (shell) to  be  sourced  for  the  graphical  session.
+                                    Sourced from directories of increasing priority, in each directory
+                                    common  file is sourced first, then suffixed files in the order of
+                                    items listed in XDG_CURRENT_SESSION var (lowercased).
+       uwsm/default-id              Stores Desktop Entry ID of default compositor.
+
+       Fallback is also extended into the system part of XDG data hierarchy, this can be used for dis‐
+       tro level defaults.
+
+   Environment vars
+       UWSM_UNIT_RUNG                  (run|home)
+                                       Which rung of systemd/user/ hierarchy to manage generated  unit
+                                       and drop-in files in: $XDG_RUNTIME_DIR or $XDG_CONFIG_HOME.
+       UWSM_TWEAKS                     (boolean value)
+                                       Set  to  False  to  remove  and not generate tweak drop-ins for
+                                       other software.
+       UWSM_FINALIZE_VARNAMES          (whitespace-separated names of env vars)
+                                       Additional variables for "uwsm finalize".
+       UWSM_WAIT_VARNAMES              (whitespace-separated names of env vars)
+                                       Variables to wait for in activation environment before proceed‐
+                                       ing to graphical session (in addition to WAYLAND_DISPLAY).
+       UWSM_WAIT_VARNAMES_TIMEOUT      (int value)
+                                       Seconds to wait for variables to appear in activation  environ‐
+                                       ment. Essentially, startup timeout (default: 10).
+       UWSM_WAIT_VARNAMES_SETTLETIME   (float value)
+                                       Seconds  to  pause  after all expected vars found in activation
+                                       environment (default: 0.2).
+       UWSM_APP_UNIT_TYPE              (scope|service)
+                                       Default unit type for launching apps (default: scope).
+       UWSM_SILENT_START               (int or boolean value)
+                                       True or 1 to inhibit stdout messages from "uwsm  start".  2  to
+                                       also inhibit warnings.
+       DEBUG                           (int or boolean value)
+                                       True or positive number to dump debug info to stderr.
+
+OPERATION OVERVIEW
+   Login Sequence Integration
+       uwsm  can  be  launched  by using conditional exec in shell profile to replace login shell (see
+       Shell Profile Integration section).
+
+       Alternatively "uwsm start ..." command can be put into wayland session's Desktop  Entry  to  be
+       launched by a display manager (see Use Inside Desktop Entry section).
+
+   Compositor Selection
+       uwsm  can  run arbitrary compositor command line or a Desktop Entry by ID (specifying Action ID
+       is also supported).
+
+       Desktop Entry can also be selected via a whiptail menu (see select subcommand section).
+
+   Startup
+       See start subcommand section for command syntax.
+
+       UWSM uses a set of units bound to standard user session targets:
+
+       •   wayland-session-pre@.target (bound to graphical-session-pre.target)
+           •   wayland-wm-env@.service (environment preloader service)
+       •   wayland-session@.target (bound to graphical-session.target)
+           •   wayland-wm@.service (service for the selected compositor)
+       •   wayland-session-xdg-autostart@.target (bound to xdg-desktop-autostart.target)
+       •   wayland-session-envelope@.target (lives through entire lifecycle)
+       •   wayland-session-shutdown.target (conflicts with targets above for shutdown)
+       •   wayland-session-bindpid@.service (PID-tracking session killswitch)
+       •   wayland-session-waitenv.service (delays graphical session until vars appear)
+
+       Compositor ID (Desktop Entry ID or executable name) becomes the  specifier  for  all  templated
+       units.
+
+       At  the  stage of graphical-session-pre.target, the environment saved from "uwsm start" context
+       is loaded (or POSIX shell profile is sourced), uwsm environment files are sourced. The delta is
+       exported to the systemd and D-Bus activation environments by the environment preloader  service
+       and  is  marked  for  cleanup  at  shutdown  stage. Preloader shell context for convenience has
+       IN_UWSM_ENV_PRELOADER var set to true.
+
+       At the stage  of  graphical-session.target  (before  it)  the  main  compositor  unit  wayland-
+       wm@${ID}.service and wayland-session-waitenv.service are started.
+
+       Compositor should at least put WAYLAND_DISPLAY variable to systemd activation environment. This
+       will  trigger  uwsm's automatic finalization logic. Without WAYLAND_DISPLAY in activation envi‐
+       ronment startup will timeout in 10 seconds.
+
+       Manual finalization is possible by running "uwsm finalize" (see finalize  subcommand  section),
+       also  in  combination  with  tweaking UWSM_WAIT_VARNAMES and UWSM_WAIT_VARNAMES_SETTLETIME vars
+       (see Environment vars section).
+
+       Successful activation of compositor unit and existence of WAYLAND_DISPLAY in  activation  envi‐
+       ronment will allow graphical-session.target to be declared reached.
+
+       Finally, xdg-desktop-autostart.target is activated.
+
+   Inside session
+       It  is  highly recommended to configure the compositor or app launcher to launch apps as scopes
+       or services in special user session slices (app.slice, background.slice,  session.slice).  uwsm
+       provides custom nested slices for apps to live in and be terminated on session end:
+       •   app-graphical.slice
+       •   background-graphical.slice
+       •   session-graphical.slice
+
+       A  helper app subcommand is provided to handle all the systemd-run invocations for you (see app
+       subcommand section).
+
+       The compositor is launched in session.slice by default (as recommended by systemd.special(7)).
+
+   Shutdown
+       Can be initiated by either:
+       •   running uwsm stop
+       •   stopping wayland-wm@*.service or wayland-session-envelope@*.target
+       •   starting wayland-session-shutdown.target
+
+       Systemd stops all user units in reverse, as it usually does. During deactivation of  graphical-
+       session-pre.target,  the environment preloader service cleans activation environments by unset‐
+       ting all variables that were marked for removal during startup and finalization stages.
+
+       Do not use compositor's native exit mechanism or kill its process directly.
+
+SUBCOMMANDS
+   select
+       Selects default wayland session compositor Desktop Entry.
+
+           uwsm select
+
+       Invokes a whiptail menu to select default session among Desktop Entries in wayland-sessions XDG
+       data hierarchy. Writes to ${XDG_CONFIG_HOME}/uwsm/default-id. Nothing else is done.  Returns  1
+       if selection is cancelled. Can be used for scripting launch condition in shell profile.
+
+   check
+       Performs tests, returns 0 on success, 1 on failure.
+
+       is-active:
+
+           uwsm check is-active [-h] [-v] [compositor]
+
+           -v           show additional info
+           compositor   check for specific compositor
+
+       Checks  if  unit of specific compositor or graphical-session*.target in general is in active or
+       activating state.
+
+       may-start:
+
+           uwsm check may-start [-h] [-g [S]] [-v|-q] [N ...]
+
+           N ...   allowed VT numbers (default: 1)
+           -g S    wait S seconds for graphical.target in queue  (default:  60;  0  or  less  disables
+                   check).
+           -i      do not check for login shell
+           -r      do not check for local session (allow remote session)
+           -v      show all failed tests
+           -q      be quiet
+
+       Checks whether it is OK to launch a wayland session via the following conditions:
+       •   DBUS_SESSION_BUS_ADDRESS is set
+       •   Running from login shell
+       •   System is at graphical.target
+       •   User graphical-session*.target units are not yet active
+       •   Foreground VT is among allowed (default: 1)
+       •   Login session's VT is matching
+
+   start
+       Generates units for given compositor command line or Desktop Entry and starts them.
+
+           uwsm  start  [-h]  [-D  name[:name...]] [-a|-e] [-N Name] [-C Comment] [-U {run|home}] [-t]
+           [-o] [-n] -- compositor [args ...]
+
+           -F                  Hardcode mode, always write command line to unit drop-ins and use  full
+                               paths.
+           -D name[:name...]   Names to fill XDG_CURRENT_DESKTOP with (:-separated). Existing var con‐
+                               tent is a starting point if no active session is running.
+           -a                  Append desktop names set by -D to other sources (default).
+           -e                  Use desktop names set by -D exclusively, discard other sources.
+           -N Name             Fancy name for compositor (filled from Desktop Entry by default).
+           -C Comment          Fancy  description  for  compositor  (filled  from Desktop Entry by de‐
+                               fault).
+           -U {run|home}       Select  rung  for  generated  unit  files:  run:  $XDG_RUNTIME_DIR/sys‐
+                               temd/user  (default), or home: $XDG_CONFIG_HOME/systemd/user. Permanent
+                               destination will save some time by removing need for reloading systemd.
+                               Managed files from other rung will  be  removed.  Can  be  preset  with
+                               UWSM_UNIT_RUNG environment var.
+           -t                  Do  not  generate  (and  remove)  tweak  unit files. Can be preset with
+                               UWSM_TWEAKS=false environment var.
+           -T                  Generate tweak unit files for other software. This is default behavior.
+           -g S                Wait for S seconds for system graphical.target in  queue  and  warn  if
+                               timed out or not in queue (default: 60, negative to disable).
+           -G S                Wait  for  S  seconds for system graphical.target in queue and abort if
+                               timed out or not in queue (overrides -g, default: -1, (disabled)).
+           -o                  Only generate units, but do not start.
+           -n                  Dry run, do not write or start anything.
+
+       The first argument of the compositor command line acts as an ID and should be either one of:
+       •   Executable name
+       •   Desktop Entry ID (optionally with ":"-delimited action ID)
+       •   Special value:
+           •   select - invoke menu to select compositor.
+           •   default - run previously selected compositor (or select if no selection was saved).
+
+       If given as path, hardcode mode will be used implicitly.
+
+       Always use "--" to disambiguate dashed arguments intended for compositor itself.
+
+       After units are (re)generated, wayland-session-bindpid@${PID}.service is started, to track  the
+       PID  of  invoking  uwsm, then uwsm process replaces itself with systemctl execution that starts
+       wayland-wm@${ID}.service and waits for it to finish.
+
+       In order to complete the startup sequence, the compositor has to put WAYLAND_DISPLAY  into  the
+       systemd  activation environment. This can be done explicitly by making compositor run "uwsm fi‐
+       nalize" command (see the next subsection).
+
+   finalize
+       For running by a compositor on startup.
+
+           uwsm finalize [-h] [VAR_NAME ...]
+
+       Exports WAYLAND_DISPLAY, DISPLAY and any defined vars mentioned by names  in  arguments  or  in
+       UWSM_FINALIZE_VARNAMES variable (whitespace-separated). Then sends startup notification for the
+       unit to systemd user manager.
+
+       This  is required if compositor itself does not put WAYLAND_DISPLAY to systemd activation envi‐
+       ronment, otherwise wayland-session@.service unit or a dedicated wayland-session-waitenv.service
+       unit will terminate due to startup timeout.
+
+       UWSM_FINALIZE_VARNAMES variable can be prefilled by plugins.
+
+       Direct assignment as VAR_NAME=value is also possible, but recommended only for  creating  flags
+       for UWSM_WAIT_VARNAMES mechanism.
+
+   stop
+       Stops compositor and optionally removes generated units.
+
+           uwsm stop [-h] [-r [compositor] [-U {run|home}] [-n]
+
+           -r [compositor]   Also remove units (all or only compositor-specific).
+           -U {run|home}     Select  rung for generated unit files: run: $XDG_RUNTIME_DIR/systemd/user
+                             (default), or home: $XDG_CONFIG_HOME/systemd/user. Permanent  destination
+                             will save some time by removing need for reloading systemd. Managed files
+                             from  other rung will be removed. Can be preset with UWSM_UNIT_RUNG envi‐
+                             ronment var.
+           -n                Dry run, do not stop or remove anything.
+
+   app
+       Application-to-unit launcher with Desktop Entry support.
+
+           uwsm app [-h] [-s {a,b,s,custom.slice}] [-t {scope,service}] [-a app_name]  [-u  unit_name]
+           [-d unit_description] [-S ] [-T] -- application [args ...]
+
+           -s {a,b,s,custom.slice}   Slice selector (default: a):
+                                        a - app-graphical.slice
+                                        b - background-graphical.slice
+                                        s - session-graphical.slice
+                                        any slice by full name
+           -t {scope,service}        Type  of  unit  to  launch  (default:  scope,  can  be  preset by
+                                     UWSM_APP_UNIT_TYPE env var).
+           -a app_name               Override app name (a substring in unit name).
+           -u unit_name              Override the whole autogenerated unit name.
+           -d unit_description       Unit Description.
+           -p Property=value         Set additional unit property (option is repeatable).
+           -S {out,err,both}         Silence stdout, stderr, or both.
+           -T                        Launch app in a terminal. Allows command  to  be  empty  to  just
+                                     launch a terminal.
+
+       Application  can  be  provided as a command with optional arguments, or a Desktop Entry ID, op‐
+       tionally suffixed with ":"-delimited Action ID. If Desktop Entry is being  launched,  arguments
+       should be compatible with it.
+
+       Always use "--" to disambiguate dashed arguments intended for application itself.
+
+   aux
+       For use in systemd user services. Can only be called by systemd user manager.
+
+       prepare-env   Prepares  environment  (for  use in ExecStart in wayland-wm-env@.service bound to
+                     wayland-session-pre@.target).
+       cleanup-env   Cleans up environment (for use ExecStop in in  wayland-wm-env@.service  bound  to
+                     wayland-session-pre@.target).
+       exec          Executes a command with arguments or a desktop entry (for use in Exec in wayland-
+                     wm@.service bound to wayland-session@.target).
+       app-daemon    Daemon for faster app argument generation, used by uwsm-app client.
+
+APP DAEMON
+       Provided as wayland-wm-app-daemon.service to be started on-demand.
+
+       Daemon  receives app arguments from ${XDG_RUNTIME_DIR}/uwsm-app-daemon-in pipe. Resulting argu‐
+       ments are formatted as shell code and written to ${XDG_RUNTIME_DIR}/uwsm-app-daemon-out pipe.
+
+       Arguments are expected to be \0-delimited, leading \0 are stripped. One command is received per
+       write+close.
+
+       The first argument determines the behavior:
+
+       •   app  the rest is processed the same as in "uwsm app"
+       •   ping just "pong" is returnedn
+       •   stop daemon is stoppedn
+
+       Single commands are prepended with exec, iterated commands are assembled with trailing &  each,
+       followed by wait.
+
+       The  purpose  of  all this is to skip all the expensive Python startup and import routines that
+       slow things down every time "uwsm app" is called. Instead the daemon does it once and then lis‐
+       tens for requests, while a simple shell script may dump arguments to one pipe and run the  code
+       received from another via eval, which is much faster.
+
+       The simplest script is:
+
+                #!/bin/sh
+                printf '0%s' app "$@" > "${XDG_RUNTIME_DIR}/uwsm-app-daemon-in"
+                IFS='' read -r cmd < "${XDG_RUNTIME_DIR}/uwsm-app-daemon-out"
+                eval "$cmd"
+
+       Provided  uwsm-app  client  script is a bit smarter: it can start the daemon, applies timeouts,
+       and supports newlines in returned args.
+
+SHELL PROFILE INTEGRATION
+       To launch uwsm automatically on login, add one of constructs below (or similar) to  shell  pro‐
+       file.
+
+       This asks to select a compositor (or refuse and continue with login shell) when logged in on VT
+       1:
+
+                if uwsm check may-start && uwsm select; then
+                     exec systemd-cat -t uwsm_start uwsm start default
+                fi
+
+       This just starts a specific compositor depending on foreground VT:
+
+                if uwsm check may-start 1; then
+                     exec systemd-cat -t uwsm_start uwsm start sway.desktop
+                elif uwsm check may-start 2; then
+                     exec systemd-cat -t uwsm_start uwsm start labwc.desktop
+                fi
+
+       Using  "uwsm  check  may-start"  as  a  condition  is essential, not only to prevent accidental
+       startup attempts where they are not expected, but also since startup may involve sourcing shell
+       profile, which might lead to nasty loops.
+
+       See check subcommand section for info on may-start checker.
+
+       exec allows uwsm to replace login shell in order to properly bind to user  session  and  handle
+       session termination.
+
+       "systemd-cat  -t uwsm_start" (optional) executes the command given to it (uwsm) with its stdout
+       and stderr connected to the systemd journal, tagged with identifier "uwsm_start". See  systemd-
+       cat(1) for more options.
+
+USE INSIDE DESKTOP ENTRY
+       To  launch  uwsm from a display/login manager, "uwsm start" can be used inside Desktop Entries.
+       Example /usr/local/share/wayland-sessions/my-compositor.desktop:
+
+                [Desktop Entry]
+                Name=My compositor (with UWSM)
+                Comment=My cool compositor
+                Exec=uwsm start -N "My compositor" -D mycompositor -C "My cool compositor" mywm
+                DesktopNames=mycompositor
+                Type=Application
+
+       Things to keep in mind:
+
+       •   For consistency, command line arguments should mirror the keys of the entry
+       •   Command in Exec= should start with "uwsm start"
+       •   It should not point to itself (as a combination of Desktop Entry ID and Action ID)
+       •   It should not point to a Desktop Entry ID and Action ID that also uses ‘uwsm‘
+
+       Potentially such entries may be found and used by uwsm itself, i.e. in shell  profile  integra‐
+       tion  situation,  or  when  launched manually. Following the principles above ensures uwsm will
+       properly recognize itself and parse requested arguments inside the entry without any  side  ef‐
+       fects.
+
+SEE ALSO
+       uwsm-plugins(3), systemd-run(1), systemd-cat(1), systemd.special(7)
+
+                                              2026-02-14                                       UWSM(1)
@@ -0,0 +1,7 @@
+#!/usr/bin/expect -f
+# Expect script detected via expect shebang
+set timeout 30
+spawn ssh user@host
+expect "password:"
+send "secret\r"
+expect eof
@@ -0,0 +1,7 @@
+#!/usr/bin/env tclsh
+# Tcl script detected via tclsh shebang
+puts "Hello from tclsh"
+set x 42
+if {$x > 0} {
+    puts "positive"
+}
@@ -0,0 +1,5 @@
+#!/usr/bin/wish
+# Tk script detected via wish shebang
+package require Tk
+button .b -text "Click" -command {puts "clicked"}
+pack .b
@@ -0,0 +1,7 @@
+<Solution>
+  <Folder Name="/Build/">
+    <File Path="Directory.Build.props" />
+    <File Path="projectname.targets" />
+  </Folder>
+  <Project Path="console.csproj" />
+</Solution>
@@ -1,15 +1,17 @@
+use gix::actor::SignatureRef;
+use gix::bstr::BString;
+use gix::bstr::ByteSlice;
+use gix::date::time::Format;
+use gix::date::Time;
+use gix::objs::tree;
 use std::env;
 use std::fs::{self, File};
 use std::io::Read;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::process::Command;

 use tempfile::TempDir;

-use git2::build::CheckoutBuilder;
-use git2::Repository;
-use git2::Signature;
-
 pub struct BatTester {
    /// Temporary working directory
    temp_dir: TempDir,
@@ -53,50 +55,48 @@ impl Default for BatTester {
    fn default() -> Self {
        let temp_dir = create_sample_directory().expect("sample directory");

-        let root = env::current_exe()
-            .expect("tests executable")
-            .parent()
-            .expect("tests executable directory")
-            .parent()
-            .expect("bat executable directory")
-            .to_path_buf();
-
-        let exe_name = if cfg!(windows) { "bat.exe" } else { "bat" };
-        let exe = root.join(exe_name);
+        let exe = assert_cmd::cargo::cargo_bin!("bat").to_path_buf();

        BatTester { temp_dir, exe }
    }
 }

-fn create_sample_directory() -> Result<TempDir, git2::Error> {
+fn create_sample_directory() -> Result<TempDir, Box<dyn std::error::Error>> {
    // Create temp directory and initialize repository
    let temp_dir = TempDir::new().expect("Temp directory");
-    let repo = Repository::init(&temp_dir)?;
+    let repo = gix::init(&temp_dir)?;
+    let mut tree = gix::objs::Tree::empty();

-    // Copy over `sample.rs`
-    let sample_path = temp_dir.path().join("sample.rs");
-    println!("{sample_path:?}");
-    fs::copy("tests/snapshots/sample.rs", &sample_path).expect("successful copy");
+    // Create sample.rs from snapshot file
+    let blob_id = repo.write_blob_stream(File::open("tests/snapshots/sample.rs")?)?;
+    let entry = tree::Entry {
+        mode: tree::EntryMode::from(tree::EntryKind::Blob),
+        oid: blob_id.object()?.id,
+        filename: BString::from("sample.rs"),
+    };
+    tree.entries.push(entry);
+    let tree_id = repo.write_object(tree)?;

-    // Commit
-    let mut index = repo.index()?;
-    index.add_path(Path::new("sample.rs"))?;
-
-    let oid = index.write_tree()?;
-    let signature = Signature::now("bat test runner", "bat@test.runner")?;
-    let tree = repo.find_tree(oid)?;
-    let _ = repo.commit(
-        Some("HEAD"), //  point HEAD to our new commit
-        &signature,   // author
-        &signature,   // committer
+    let author = SignatureRef {
+        name: "test".as_bytes().as_bstr(),
+        email: "test@test.test".as_bytes().as_bstr(),
+        time: &Time::now_local_or_utc().format_or_unix(Format::Raw),
+    };
+    let commit_id = repo.commit_as(
+        author,
+        author,
+        "HEAD",
        "initial commit",
-        &tree,
-        &[],
-    );
-    let mut opts = CheckoutBuilder::new();
-    repo.checkout_head(Some(opts.force()))?;
+        tree_id,
+        gix::commit::NO_PARENT_IDS,
+    )?;
+    assert_eq!(commit_id, repo.head_id()?);

-    fs::copy("tests/snapshots/sample.modified.rs", &sample_path).expect("successful copy");
+    fs::copy(
+        "tests/snapshots/sample.modified.rs",
+        temp_dir.path().join("sample.rs"),
+    )
+    .expect("successful copy");

    Ok(temp_dir)
 }
@@ -4,7 +4,7 @@ use assert_cmd::cargo::CommandCargoExt;
 use std::process::Command;

 pub fn bat_raw_command_with_config() -> Command {
-    let mut cmd = Command::cargo_bin("bat").unwrap();
+    let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("bat"));
    cmd.current_dir("tests/examples");
    cmd.env_remove("BAT_CACHE_PATH");
    cmd.env_remove("BAT_CONFIG_DIR");