From b07f3b4e74b104b40b4b79e2a7094cd18b9ec1c2 Mon Sep 17 00:00:00 2001
From: ubaumann <github@m.ubaumann.ch>
Date: Fri, 23 Oct 2020 17:04:56 +0000
Subject: [PATCH 01/41] Add Salt State (SLS) test file

---
 tests/syntax-tests/highlighted/SLS/test.sls | 57 +++++++++++++++++++++
 tests/syntax-tests/source/SLS/test.sls      | 57 +++++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/SLS/test.sls
 create mode 100644 tests/syntax-tests/source/SLS/test.sls

diff --git a/tests/syntax-tests/highlighted/SLS/test.sls b/tests/syntax-tests/highlighted/SLS/test.sls
new file mode 100644
index 00000000..3e4c6386
--- /dev/null
+++ b/tests/syntax-tests/highlighted/SLS/test.sls
@@ -0,0 +1,57 @@
+required_packages:
+  pkg.installed:
+    - pkgs:
+      - git
+      - perl
+      - fortune
+
+cowsay_source:
+  git.latest:
+    - name: https://github.com/jasonm23/cowsay.git
+    - target: /root/cowsay
+
+run_installer:
+  cmd.run:
+    - name: ./install.sh /usr/local
+    - cwd: /root/cowsay
+    - onchanges:
+      - git: cowsay_source
+
+{% set cowfiles = salt.cmd.run('cowsay -l').split('\n')[1:] %}
+{% set ascii_arts = cowfiles | join(' ') %}
+
+{% for ascii_art in ascii_arts.split(' ') %}
+run_cowsay_{{ ascii_art }}: # name must be unique
+  cmd.run:
+    {% if ascii_art is in ['head-in', 'sodomized', 'telebears'] %}
+    - name: echo cowsay -f {{ ascii_art }} should not be used
+    {% else %}
+    - name: fortune | cowsay -f {{ ascii_art }}
+    {% endif %}
+{% endfor %}
+
+echo_pillar_demo_1:
+  cmd.run:
+    - name: "echo {{ pillar.demo_text | default('pillar not defined') }}"
+
+echo_pillar_demo_2:
+  cmd.run:
+    - name: "echo {{ pillar.demo.text | default('pillar not defined') }}"
+
+# Comment
+{% set rand = salt['random.get_str'](20) %}
+{% set IP_Address = pillar['IP_Address'] %}
+
+wait:
+  cmd.run:
+    - name: sleep 210  # another comment
+
+create_roster_file:
+  file.managed:
+    - name: /tmp/salt-roster-{{ rand }}
+    - contents:
+      - 'switch:'
+      - '  host: {{ IP_Address }}'
+      - "  user: test"
+      - "  passwd: {{ passwd }}"
+
diff --git a/tests/syntax-tests/source/SLS/test.sls b/tests/syntax-tests/source/SLS/test.sls
new file mode 100644
index 00000000..a116e6d7
--- /dev/null
+++ b/tests/syntax-tests/source/SLS/test.sls
@@ -0,0 +1,57 @@
+required_packages:
+  pkg.installed:
+    - pkgs:
+      - git
+      - perl
+      - fortune
+
+cowsay_source:
+  git.latest:
+    - name: https://github.com/jasonm23/cowsay.git
+    - target: /root/cowsay
+
+run_installer:
+  cmd.run:
+    - name: ./install.sh /usr/local
+    - cwd: /root/cowsay
+    - onchanges:
+      - git: cowsay_source
+
+{% set cowfiles = salt.cmd.run('cowsay -l').split('\n')[1:] %}
+{% set ascii_arts = cowfiles | join(' ') %}
+
+{% for ascii_art in ascii_arts.split(' ') %}
+run_cowsay_{{ ascii_art }}: # name must be unique
+  cmd.run:
+    {% if ascii_art is in ['head-in', 'sodomized', 'telebears'] %}
+    - name: echo cowsay -f {{ ascii_art }} should not be used
+    {% else %}
+    - name: fortune | cowsay -f {{ ascii_art }}
+    {% endif %}
+{% endfor %}
+
+echo_pillar_demo_1:
+  cmd.run:
+    - name: "echo {{ pillar.demo_text | default('pillar not defined') }}"
+
+echo_pillar_demo_2:
+  cmd.run:
+    - name: "echo {{ pillar.demo.text | default('pillar not defined') }}"
+
+# Comment
+{% set rand = salt['random.get_str'](20) %}
+{% set IP_Address = pillar['IP_Address'] %}
+
+wait:
+  cmd.run:
+    - name: sleep 210  # another comment
+
+create_roster_file:
+  file.managed:
+    - name: /tmp/salt-roster-{{ rand }}
+    - contents:
+      - 'switch:'
+      - '  host: {{ IP_Address }}'
+      - "  user: test"
+      - "  passwd: {{ passwd }}"
+

From be84682bcb1e5ef3aba7ccc355f32f9820aebc86 Mon Sep 17 00:00:00 2001
From: Stefano Probst <senden9@gmail.com>
Date: Sat, 24 Oct 2020 10:24:13 +0200
Subject: [PATCH 02/41] Add MATLAB syntax test file

cc sharkdp/bat#1213
---
 .../highlighted/MATLAB/test.matlab            | 34 +++++++++++++++++++
 tests/syntax-tests/source/MATLAB/LICENSE.md   | 27 +++++++++++++++
 tests/syntax-tests/source/MATLAB/test.matlab  | 34 +++++++++++++++++++
 3 files changed, 95 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/MATLAB/test.matlab
 create mode 100644 tests/syntax-tests/source/MATLAB/LICENSE.md
 create mode 100644 tests/syntax-tests/source/MATLAB/test.matlab

diff --git a/tests/syntax-tests/highlighted/MATLAB/test.matlab b/tests/syntax-tests/highlighted/MATLAB/test.matlab
new file mode 100644
index 00000000..51c37f76
--- /dev/null
+++ b/tests/syntax-tests/highlighted/MATLAB/test.matlab
@@ -0,0 +1,34 @@
+function zz=sample(aa)
+%%%%%%%%%%%%%%%%%%
+% some comments
+%%%%%%%%%%%%%%%%%%
+
+x = 'a string';    % some 'ticks' in a comment
+y = 'a string with ''interal'' quotes';
+
+for i=1:20
+  disp(i);
+end
+
+a = rand(30);
+b = rand(30);
+
+c = a .* b ./ a \ ... comment at end of line and continuation
+    (b .* a + b - a);
+
+c = a' * b';  % note: these ticks are for transpose, not quotes.
+
+disp('a comment symbol, %, in a string');
+
+!echo abc % this isn't a comment - it's passed to system command
+
+function y=myfunc(x)
+y = exp(x);
+
+%{
+  a block comment
+%}
+
+function no_arg_func
+fprintf('%s\n', 'function with no args')
+end
diff --git a/tests/syntax-tests/source/MATLAB/LICENSE.md b/tests/syntax-tests/source/MATLAB/LICENSE.md
new file mode 100644
index 00000000..be753683
--- /dev/null
+++ b/tests/syntax-tests/source/MATLAB/LICENSE.md
@@ -0,0 +1,27 @@
+The `test.matlab` file is a modified version of https://github.com/pygments/pygments/blob/3e1b79c82d2df318f63f24984d875fd2a3400808/tests/test_matlab.py under the following license: 
+
+Copyright (c) 2006-2020 by the respective authors (see AUTHORS file).
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/tests/syntax-tests/source/MATLAB/test.matlab b/tests/syntax-tests/source/MATLAB/test.matlab
new file mode 100644
index 00000000..f27cde62
--- /dev/null
+++ b/tests/syntax-tests/source/MATLAB/test.matlab
@@ -0,0 +1,34 @@
+function zz=sample(aa)
+%%%%%%%%%%%%%%%%%%
+% some comments
+%%%%%%%%%%%%%%%%%%
+
+x = 'a string';    % some 'ticks' in a comment
+y = 'a string with ''interal'' quotes';
+
+for i=1:20
+  disp(i);
+end
+
+a = rand(30);
+b = rand(30);
+
+c = a .* b ./ a \ ... comment at end of line and continuation
+    (b .* a + b - a);
+
+c = a' * b';  % note: these ticks are for transpose, not quotes.
+
+disp('a comment symbol, %, in a string');
+
+!echo abc % this isn't a comment - it's passed to system command
+
+function y=myfunc(x)
+y = exp(x);
+
+%{
+  a block comment
+%}
+
+function no_arg_func
+fprintf('%s\n', 'function with no args')
+end

From 5ec4936a4f60f604436a32995b4d9995cecbbf15 Mon Sep 17 00:00:00 2001
From: Stefano Probst <senden9@gmail.com>
Date: Sat, 24 Oct 2020 11:20:09 +0200
Subject: [PATCH 03/41] Add Graphviz DOT example files

cc sharkdp/bat#1213
---
 .../highlighted/Graphviz DOT/test_digraph.dot | 41 +++++++++++++++++++
 .../highlighted/Graphviz DOT/test_graph.dot   |  3 ++
 .../source/Graphviz DOT/LICENSE.md            | 22 ++++++++++
 .../source/Graphviz DOT/test_digraph.dot      | 41 +++++++++++++++++++
 .../source/Graphviz DOT/test_graph.dot        |  3 ++
 5 files changed, 110 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/Graphviz DOT/test_digraph.dot
 create mode 100644 tests/syntax-tests/highlighted/Graphviz DOT/test_graph.dot
 create mode 100644 tests/syntax-tests/source/Graphviz DOT/LICENSE.md
 create mode 100644 tests/syntax-tests/source/Graphviz DOT/test_digraph.dot
 create mode 100644 tests/syntax-tests/source/Graphviz DOT/test_graph.dot

diff --git a/tests/syntax-tests/highlighted/Graphviz DOT/test_digraph.dot b/tests/syntax-tests/highlighted/Graphviz DOT/test_digraph.dot
new file mode 100644
index 00000000..dddc1366
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Graphviz DOT/test_digraph.dot	
@@ -0,0 +1,41 @@
+digraph {
+	label = <Label <font color='red'><b>formating</b></font>,<br/> test <font point-size='20'>is</font> done<br/> here <i>now.</i>>;
+
+	node [shape=box]
+	rankdir=LR
+	margin=0.1
+	a->b
+
+	// http://www.graphviz.org/doc/info/colors.html
+	// note: style=filled!
+	node [shape=box colorscheme=paired12 style=filled]
+	margin=0.1
+	a2[fillcolor=1]
+	b2[fillcolor=3]
+	a2->b2->x2
+
+	// http://www.graphviz.org/doc/info/colors.html
+	// note: style=filled!
+	node [shape=box colorscheme=paired12 style=filled]
+	rankdir=LR
+	margin=0.1
+	c1[fillcolor=1]
+	c2[fillcolor=2]
+	c3[fillcolor=3]
+	c4[fillcolor=4]
+	c5[fillcolor=5]
+	c6[fillcolor=6]
+	c7[fillcolor=7]
+	c8[fillcolor=8]
+	c9[fillcolor=9]
+	c10[fillcolor=10]
+	c11[fillcolor=11]
+	c12[fillcolor=12]
+	c->{c1 c3 c5 c7 c9 c11}
+	c1->c2
+	c3->c4
+	c5->c6
+	c7->c8
+	c9->c10
+	c11->c12
+}
diff --git a/tests/syntax-tests/highlighted/Graphviz DOT/test_graph.dot b/tests/syntax-tests/highlighted/Graphviz DOT/test_graph.dot
new file mode 100644
index 00000000..205c2981
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Graphviz DOT/test_graph.dot	
@@ -0,0 +1,3 @@
+graph {
+	a--b
+}
diff --git a/tests/syntax-tests/source/Graphviz DOT/LICENSE.md b/tests/syntax-tests/source/Graphviz DOT/LICENSE.md
new file mode 100644
index 00000000..3f166cbe
--- /dev/null
+++ b/tests/syntax-tests/source/Graphviz DOT/LICENSE.md	
@@ -0,0 +1,22 @@
+The files `test_digraph.dot` and `test_graph.dot` are modified versions the files from https://github.com/scriptum/graphviz-examples/tree/a7762875efa32f90f6f1a37d866b2c26d362202a under the following license:
+
+The MIT License (MIT)
+
+Copyright (c) 2014 Pavel Roschin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/tests/syntax-tests/source/Graphviz DOT/test_digraph.dot b/tests/syntax-tests/source/Graphviz DOT/test_digraph.dot
new file mode 100644
index 00000000..11e383b4
--- /dev/null
+++ b/tests/syntax-tests/source/Graphviz DOT/test_digraph.dot	
@@ -0,0 +1,41 @@
+digraph {
+	label = <Label <font color='red'><b>formating</b></font>,<br/> test <font point-size='20'>is</font> done<br/> here <i>now.</i>>;
+
+	node [shape=box]
+	rankdir=LR
+	margin=0.1
+	a->b
+
+	// http://www.graphviz.org/doc/info/colors.html
+	// note: style=filled!
+	node [shape=box colorscheme=paired12 style=filled]
+	margin=0.1
+	a2[fillcolor=1]
+	b2[fillcolor=3]
+	a2->b2->x2
+
+	// http://www.graphviz.org/doc/info/colors.html
+	// note: style=filled!
+	node [shape=box colorscheme=paired12 style=filled]
+	rankdir=LR
+	margin=0.1
+	c1[fillcolor=1]
+	c2[fillcolor=2]
+	c3[fillcolor=3]
+	c4[fillcolor=4]
+	c5[fillcolor=5]
+	c6[fillcolor=6]
+	c7[fillcolor=7]
+	c8[fillcolor=8]
+	c9[fillcolor=9]
+	c10[fillcolor=10]
+	c11[fillcolor=11]
+	c12[fillcolor=12]
+	c->{c1 c3 c5 c7 c9 c11}
+	c1->c2
+	c3->c4
+	c5->c6
+	c7->c8
+	c9->c10
+	c11->c12
+}
diff --git a/tests/syntax-tests/source/Graphviz DOT/test_graph.dot b/tests/syntax-tests/source/Graphviz DOT/test_graph.dot
new file mode 100644
index 00000000..34eb0c57
--- /dev/null
+++ b/tests/syntax-tests/source/Graphviz DOT/test_graph.dot	
@@ -0,0 +1,3 @@
+graph {
+	a--b
+}

From cc6f6fdb1d524bcb9ccaab45675a2c6581f01d71 Mon Sep 17 00:00:00 2001
From: Tommaso Pifferi <tommaso.pifferi@prima.it>
Date: Tue, 20 Oct 2020 09:43:45 +0200
Subject: [PATCH 04/41] Add tests for Vue component syntax

---
 .../syntax-tests/highlighted/Vue/example.vue  | 55 +++++++++++++++++++
 tests/syntax-tests/source/Vue/example.vue     | 55 +++++++++++++++++++
 2 files changed, 110 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/Vue/example.vue
 create mode 100644 tests/syntax-tests/source/Vue/example.vue

diff --git a/tests/syntax-tests/highlighted/Vue/example.vue b/tests/syntax-tests/highlighted/Vue/example.vue
new file mode 100644
index 00000000..d8da0852
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Vue/example.vue
@@ -0,0 +1,55 @@
+<template>
+  <div id="app" class="container-fluid">
+    <AppHeader></AppHeader>
+    <transition name="page" mode="out-in" v-if="!isLoading">
+      <router-view></router-view>
+    </transition>
+    <AppLoadingIndicator></AppLoadingIndicator>
+  </div>
+</template>
+
+<script>
+import AppHeader from "@/components/AppHeader";
+import AppLoadingIndicator from "@/components/AppLoadingIndicator";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "App",
+  components: {
+    AppHeader,
+    AppLoadingIndicator,
+  },
+  beforeCreate() {
+    this.$store.dispatch("fetchData");
+  },
+  data: {
+    message: "Hello!"
+  },
+  computed: {
+    ...mapGetters({
+      isLoading: "isLoading",
+    }),
+  },
+};
+</script>
+
+<style>
+body {
+  background-color: rgba(72, 163, 184, 0.05) !important;
+}
+
+.page-enter-active,
+.page-leave-active {
+  transition: opacity 0.2s;
+}
+
+.page-enter,
+.page-leave-active {
+  opacity: 0;
+}
+
+.page-enter:hover {
+    opacity: 1;
+}
+
+</style>
diff --git a/tests/syntax-tests/source/Vue/example.vue b/tests/syntax-tests/source/Vue/example.vue
new file mode 100644
index 00000000..5e0467f1
--- /dev/null
+++ b/tests/syntax-tests/source/Vue/example.vue
@@ -0,0 +1,55 @@
+<template>
+  <div id="app" class="container-fluid">
+    <AppHeader></AppHeader>
+    <transition name="page" mode="out-in" v-if="!isLoading">
+      <router-view></router-view>
+    </transition>
+    <AppLoadingIndicator></AppLoadingIndicator>
+  </div>
+</template>
+
+<script>
+import AppHeader from "@/components/AppHeader";
+import AppLoadingIndicator from "@/components/AppLoadingIndicator";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "App",
+  components: {
+    AppHeader,
+    AppLoadingIndicator,
+  },
+  beforeCreate() {
+    this.$store.dispatch("fetchData");
+  },
+  data: {
+    message: "Hello!"
+  },
+  computed: {
+    ...mapGetters({
+      isLoading: "isLoading",
+    }),
+  },
+};
+</script>
+
+<style>
+body {
+  background-color: rgba(72, 163, 184, 0.05) !important;
+}
+
+.page-enter-active,
+.page-leave-active {
+  transition: opacity 0.2s;
+}
+
+.page-enter,
+.page-leave-active {
+  opacity: 0;
+}
+
+.page-enter:hover {
+    opacity: 1;
+}
+
+</style>

From 8a2122b4a483a903fb286987e0f23d6e709882db Mon Sep 17 00:00:00 2001
From: henil <dedaniahenil@gmail.com>
Date: Mon, 19 Oct 2020 13:50:28 +0530
Subject: [PATCH 05/41] Add test file for `/etc/group`

---
 .../highlighted/EtcGroup/test.group           | 67 +++++++++++++++++++
 tests/syntax-tests/source/EtcGroup/test.group | 67 +++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/EtcGroup/test.group
 create mode 100644 tests/syntax-tests/source/EtcGroup/test.group

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

From 3729aefb6fb659d6eda9051016798542f7e3d5ac Mon Sep 17 00:00:00 2001
From: R1tschY <r1tschy@posteo.de>
Date: Mon, 19 Oct 2020 21:11:50 +0200
Subject: [PATCH 06/41] Add QML syntax test

---
 .../highlighted/QML/BatSyntaxTest.qml         | 219 ++++++++++++++++++
 .../syntax-tests/source/QML/BatSyntaxTest.qml | 219 ++++++++++++++++++
 2 files changed, 438 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/QML/BatSyntaxTest.qml
 create mode 100644 tests/syntax-tests/source/QML/BatSyntaxTest.qml

diff --git a/tests/syntax-tests/highlighted/QML/BatSyntaxTest.qml b/tests/syntax-tests/highlighted/QML/BatSyntaxTest.qml
new file mode 100644
index 00000000..1d1ada1d
--- /dev/null
+++ b/tests/syntax-tests/highlighted/QML/BatSyntaxTest.qml
@@ -0,0 +1,219 @@
+import QtQuick 2.0
+import "../components"
+
+Page {
+    id: page
+
+    // properties
+
+    property bool startup: true
+    readonly property var var1: null
+    readonly property QtObject var2: null
+
+    allowedOrientations: Orientation.All
+
+    /* components */
+
+    DBusServiceWatcher {
+        id: dbusService
+        service: "org.bat.service"
+
+        onRegisteredChanged: {
+            if (dbusService.registered) {
+                announcedNameField.text = daemon.announcedName()
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        console.debug("completed")
+    }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: column.height
+        visible: dbusService.registered
+
+        ViewPlaceholder {
+            enabled: !startup
+                     && trustedDevices.count == 0
+                     && nearDevices.count == 0
+            text: qsTr("Install Bat.")
+        }
+
+        Column {
+            id: column
+
+            width: page.width
+            spacing: Theme.paddingLarge
+
+            PageHeader {
+                title: qsTr("Syntax Test")
+            }
+
+            TextField {
+                id: announcedNameField
+                width: parent.width
+                label: qsTr("Device Name")
+                text: dbusService.registered ? daemon.announcedName() : ""
+
+                onActiveFocusChanged: {
+                    if (activeFocus)
+                        return
+
+                    if (text.length === 0) {
+                        text = daemon.announcedName()
+                    } else {
+                        daemon.setAnnouncedName(text)
+                        placeholderText = text
+                    }
+                }
+
+                EnterKey.onClicked: announcedNameField.focus = false
+                EnterKey.iconSource: "image://theme/icon-m-enter-close"
+            }
+
+
+            Component {
+                id: deviceDelegate
+
+                ListItem {
+                    id: listItem
+
+                    property bool showStatus: deviceStatusLabel.text.length
+
+                    width: page.width
+                    height: Theme.itemSizeMedium
+
+                    Image {
+                        id: icon
+                        source: iconUrl
+
+                        x: Theme.horizontalPageMargin
+                        anchors.verticalCenter: parent.verticalCenter
+                        sourceSize.width: Theme.iconSizeMedium
+                        sourceSize.height: Theme.iconSizeMedium
+                    }
+
+                    Label {
+                        id: deviceNameLabel
+                        anchors {
+                            left: icon.right
+                            leftMargin: Theme.paddingLarge
+                            right: parent.right
+                            rightMargin: Theme.horizontalPageMargin
+                        }
+                        y: listItem.contentHeight / 2 - implicitHeight / 2
+                           - showStatus * (deviceStatusLabel.implicitHeight / 2)
+
+                        text: name
+                        color: listItem.highlighted
+                               ? Theme.highlightColor
+                               : Theme.primaryColor
+                        truncationMode: TruncationMode.Fade
+                        textFormat: Text.PlainText
+
+                        Behavior on y { NumberAnimation {} }
+                    }
+
+                    Label {
+                        id: deviceStatusLabel
+                        anchors {
+                            left: deviceNameLabel.left
+                            top: deviceNameLabel.bottom
+                            right: parent.right
+                            rightMargin: Theme.horizontalPageMargin
+                        }
+
+                        text: (trusted && reachable)
+                              ? qsTr("Connected")
+                              : (hasPairingRequests || waitsForPairing
+                                 ? qsTr("Pending pairing request ...") : "")
+                        color: listItem.highlighted
+                               ? Theme.secondaryHighlightColor
+                               : Theme.secondaryColor
+                        truncationMode: TruncationMode.Fade
+                        font.pixelSize: Theme.fontSizeExtraSmall
+                        opacity: showStatus ? 1.0 : 0.0
+                        width: parent.width
+                        textFormat: Text.PlainText
+
+                        Behavior on opacity { FadeAnimation {} }
+                    }
+
+                    onClicked: {
+                        pageStack.push(
+                            Qt.resolvedUrl("DevicePage.qml"),
+                            { deviceId: id })
+                    }
+                }
+            }
+
+            DeviceListModel {
+                id: devicelistModel
+            }
+
+            ColumnView {
+                id: devicesView
+                width: page.width
+                itemHeight: Theme.itemSizeMedium
+
+
+                model: trustedDevicesModel
+                delegate: deviceDelegate
+                visible: devicesView.count > 0
+            }
+        }
+
+        PullDownMenu {
+//            MenuItem {
+//                text: qsTr("About ...")
+//                onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
+//            }
+
+            MenuItem {
+                text: qsTr("Settings ...")
+                onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+            }
+        }
+
+        VerticalScrollDecorator {}
+    }
+
+    /*
+    Connections {
+        target: ui
+        onOpeningDevicePage: openDevicePage(deviceId)
+    }*/
+
+    Timer {
+        interval: 1000
+        running: true
+        repeat: false
+        onTriggered: startup = false
+    }
+
+    function openDevicePage(deviceId) {
+        if (typeof pageStack === "undefined")
+            return;
+
+        console.log("opening device " + deviceId)
+
+        window.activate()
+
+        var devicePage = pageStack.find(function(page) {
+            return page.objectName === "DevicePage"
+        })
+        if (devicePage !== null && devicePage.deviceId === deviceId) {
+            pageStack.pop(devicePage)
+            ui.showMainWindow()
+            return
+        }
+
+        pageStack.pop(page, PageStackAction.Immediate)
+        pageStack.push(
+            Qt.resolvedUrl("DevicePage.qml"),
+            { deviceId: deviceId },
+            PageStackAction.Immediate)
+    }
+}
diff --git a/tests/syntax-tests/source/QML/BatSyntaxTest.qml b/tests/syntax-tests/source/QML/BatSyntaxTest.qml
new file mode 100644
index 00000000..175e48eb
--- /dev/null
+++ b/tests/syntax-tests/source/QML/BatSyntaxTest.qml
@@ -0,0 +1,219 @@
+import QtQuick 2.0
+import "../components"
+
+Page {
+    id: page
+
+    // properties
+
+    property bool startup: true
+    readonly property var var1: null
+    readonly property QtObject var2: null
+
+    allowedOrientations: Orientation.All
+
+    /* components */
+
+    DBusServiceWatcher {
+        id: dbusService
+        service: "org.bat.service"
+
+        onRegisteredChanged: {
+            if (dbusService.registered) {
+                announcedNameField.text = daemon.announcedName()
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        console.debug("completed")
+    }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: column.height
+        visible: dbusService.registered
+
+        ViewPlaceholder {
+            enabled: !startup
+                     && trustedDevices.count == 0
+                     && nearDevices.count == 0
+            text: qsTr("Install Bat.")
+        }
+
+        Column {
+            id: column
+
+            width: page.width
+            spacing: Theme.paddingLarge
+
+            PageHeader {
+                title: qsTr("Syntax Test")
+            }
+
+            TextField {
+                id: announcedNameField
+                width: parent.width
+                label: qsTr("Device Name")
+                text: dbusService.registered ? daemon.announcedName() : ""
+
+                onActiveFocusChanged: {
+                    if (activeFocus)
+                        return
+
+                    if (text.length === 0) {
+                        text = daemon.announcedName()
+                    } else {
+                        daemon.setAnnouncedName(text)
+                        placeholderText = text
+                    }
+                }
+
+                EnterKey.onClicked: announcedNameField.focus = false
+                EnterKey.iconSource: "image://theme/icon-m-enter-close"
+            }
+
+
+            Component {
+                id: deviceDelegate
+
+                ListItem {
+                    id: listItem
+
+                    property bool showStatus: deviceStatusLabel.text.length
+
+                    width: page.width
+                    height: Theme.itemSizeMedium
+
+                    Image {
+                        id: icon
+                        source: iconUrl
+
+                        x: Theme.horizontalPageMargin
+                        anchors.verticalCenter: parent.verticalCenter
+                        sourceSize.width: Theme.iconSizeMedium
+                        sourceSize.height: Theme.iconSizeMedium
+                    }
+
+                    Label {
+                        id: deviceNameLabel
+                        anchors {
+                            left: icon.right
+                            leftMargin: Theme.paddingLarge
+                            right: parent.right
+                            rightMargin: Theme.horizontalPageMargin
+                        }
+                        y: listItem.contentHeight / 2 - implicitHeight / 2
+                           - showStatus * (deviceStatusLabel.implicitHeight / 2)
+
+                        text: name
+                        color: listItem.highlighted
+                               ? Theme.highlightColor
+                               : Theme.primaryColor
+                        truncationMode: TruncationMode.Fade
+                        textFormat: Text.PlainText
+
+                        Behavior on y { NumberAnimation {} }
+                    }
+
+                    Label {
+                        id: deviceStatusLabel
+                        anchors {
+                            left: deviceNameLabel.left
+                            top: deviceNameLabel.bottom
+                            right: parent.right
+                            rightMargin: Theme.horizontalPageMargin
+                        }
+
+                        text: (trusted && reachable)
+                              ? qsTr("Connected")
+                              : (hasPairingRequests || waitsForPairing
+                                 ? qsTr("Pending pairing request ...") : "")
+                        color: listItem.highlighted
+                               ? Theme.secondaryHighlightColor
+                               : Theme.secondaryColor
+                        truncationMode: TruncationMode.Fade
+                        font.pixelSize: Theme.fontSizeExtraSmall
+                        opacity: showStatus ? 1.0 : 0.0
+                        width: parent.width
+                        textFormat: Text.PlainText
+
+                        Behavior on opacity { FadeAnimation {} }
+                    }
+
+                    onClicked: {
+                        pageStack.push(
+                            Qt.resolvedUrl("DevicePage.qml"),
+                            { deviceId: id })
+                    }
+                }
+            }
+
+            DeviceListModel {
+                id: devicelistModel
+            }
+
+            ColumnView {
+                id: devicesView
+                width: page.width
+                itemHeight: Theme.itemSizeMedium
+
+
+                model: trustedDevicesModel
+                delegate: deviceDelegate
+                visible: devicesView.count > 0
+            }
+        }
+
+        PullDownMenu {
+//            MenuItem {
+//                text: qsTr("About ...")
+//                onClicked: pageStack.push(Qt.resolvedUrl("AboutPage.qml"))
+//            }
+
+            MenuItem {
+                text: qsTr("Settings ...")
+                onClicked: pageStack.push(Qt.resolvedUrl("SettingsPage.qml"))
+            }
+        }
+
+        VerticalScrollDecorator {}
+    }
+
+    /*
+    Connections {
+        target: ui
+        onOpeningDevicePage: openDevicePage(deviceId)
+    }*/
+
+    Timer {
+        interval: 1000
+        running: true
+        repeat: false
+        onTriggered: startup = false
+    }
+
+    function openDevicePage(deviceId) {
+        if (typeof pageStack === "undefined")
+            return;
+
+        console.log("opening device " + deviceId)
+
+        window.activate()
+
+        var devicePage = pageStack.find(function(page) {
+            return page.objectName === "DevicePage"
+        })
+        if (devicePage !== null && devicePage.deviceId === deviceId) {
+            pageStack.pop(devicePage)
+            ui.showMainWindow()
+            return
+        }
+
+        pageStack.pop(page, PageStackAction.Immediate)
+        pageStack.push(
+            Qt.resolvedUrl("DevicePage.qml"),
+            { deviceId: deviceId },
+            PageStackAction.Immediate)
+    }
+}

From 5e0a608ea60e51d3115ce239042063c929d78a7f Mon Sep 17 00:00:00 2001
From: Frank Schmitt <frankschmitt@gmx.de>
Date: Mon, 19 Oct 2020 22:53:10 +0200
Subject: [PATCH 07/41] #1213 added very basic test file for D

---
 tests/syntax-tests/highlighted/D/test.d | 23 +++++++++++++++++++++++
 tests/syntax-tests/source/D/test.d      | 23 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/D/test.d
 create mode 100644 tests/syntax-tests/source/D/test.d

diff --git a/tests/syntax-tests/highlighted/D/test.d b/tests/syntax-tests/highlighted/D/test.d
new file mode 100644
index 00000000..ef56cf18
--- /dev/null
+++ b/tests/syntax-tests/highlighted/D/test.d
@@ -0,0 +1,23 @@
+import std.stdio;
+import std.algorithm;
+import std.range;
+
+/* a multiline comment
+*
+*/
+int the_ultimate_answer() {
+	return 42;
+}
+
+void main()
+{
+    // function call with string literal
+    writeln("Hello World!");
+
+    // an int array declaration
+    int[] arr1 = [1, 2, 3];
+    // a double
+    double d1 = 3.14;
+    // another function call 
+    writefln("%s\n%s\n%s\n", arr1, d1, the_ultimate_answer());
+}
diff --git a/tests/syntax-tests/source/D/test.d b/tests/syntax-tests/source/D/test.d
new file mode 100644
index 00000000..c9bd263c
--- /dev/null
+++ b/tests/syntax-tests/source/D/test.d
@@ -0,0 +1,23 @@
+import std.stdio;
+import std.algorithm;
+import std.range;
+
+/* a multiline comment
+*
+*/
+int the_ultimate_answer() {
+	return 42;
+}
+
+void main()
+{
+    // function call with string literal
+    writeln("Hello World!");
+
+    // an int array declaration
+    int[] arr1 = [1, 2, 3];
+    // a double
+    double d1 = 3.14;
+    // another function call 
+    writefln("%s\n%s\n%s\n", arr1, d1, the_ultimate_answer());
+}

From 5b2da2b08d5f34ca8e0fdf133f081f9b97c7bf92 Mon Sep 17 00:00:00 2001
From: Frank Schmitt <frankschmitt@gmx.de>
Date: Mon, 19 Oct 2020 23:03:46 +0200
Subject: [PATCH 08/41] #1213 expanded D test file

---
 tests/syntax-tests/highlighted/D/test.d | 35 ++++++++++++++++++++-----
 tests/syntax-tests/source/D/test.d      | 35 ++++++++++++++++++++-----
 2 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/tests/syntax-tests/highlighted/D/test.d b/tests/syntax-tests/highlighted/D/test.d
index ef56cf18..da347147 100644
--- a/tests/syntax-tests/highlighted/D/test.d
+++ b/tests/syntax-tests/highlighted/D/test.d
@@ -1,11 +1,16 @@
-import std.stdio;
+// selective import
+import std.stdio : writeln, writefln;
+// non-selective import
 import std.algorithm;
-import std.range;
 
 /* a multiline comment
 *
+* this function is safe because it doesn't use pointer arithmetic
 */
-int the_ultimate_answer() {
+int the_ultimate_answer() @safe {
+	// assert1on
+	assert(1 != 2);
+        // now we can safely return our answer	
 	return 42;
 }
 
@@ -16,8 +21,24 @@
 
     // an int array declaration
     int[] arr1 = [1, 2, 3];
-    // a double
-    double d1 = 3.14;
-    // another function call 
-    writefln("%s\n%s\n%s\n", arr1, d1, the_ultimate_answer());
+    // an immutable double
+    immutable double pi = 3.14;
+    // a mutable double
+    double d1 = pi;
+    // a pointer
+    double* dp1 = &d1;
+    // another pointer to the same thingy
+    auto a1 = &d1;
+    // a constant bool
+    const bool b1 = true;
+    if (b1) {
+	    // another function call 
+	    writefln("%s\n%s\n%s\n", arr1, d1, the_ultimate_answer());
+    }
+    else if (!b1) {
+	    writeln("this seems wrong");
+    }
+    else {
+	    writeln("I'm giving up, this is too crazy for me");
+    }
 }
diff --git a/tests/syntax-tests/source/D/test.d b/tests/syntax-tests/source/D/test.d
index c9bd263c..534132f5 100644
--- a/tests/syntax-tests/source/D/test.d
+++ b/tests/syntax-tests/source/D/test.d
@@ -1,11 +1,16 @@
-import std.stdio;
+// selective import
+import std.stdio : writeln, writefln;
+// non-selective import
 import std.algorithm;
-import std.range;
 
 /* a multiline comment
 *
+* this function is safe because it doesn't use pointer arithmetic
 */
-int the_ultimate_answer() {
+int the_ultimate_answer() @safe {
+	// assert1on
+	assert(1 != 2);
+        // now we can safely return our answer	
 	return 42;
 }
 
@@ -16,8 +21,24 @@ void main()
 
     // an int array declaration
     int[] arr1 = [1, 2, 3];
-    // a double
-    double d1 = 3.14;
-    // another function call 
-    writefln("%s\n%s\n%s\n", arr1, d1, the_ultimate_answer());
+    // an immutable double
+    immutable double pi = 3.14;
+    // a mutable double
+    double d1 = pi;
+    // a pointer
+    double* dp1 = &d1;
+    // another pointer to the same thingy
+    auto a1 = &d1;
+    // a constant bool
+    const bool b1 = true;
+    if (b1) {
+	    // another function call 
+	    writefln("%s\n%s\n%s\n", arr1, d1, the_ultimate_answer());
+    }
+    else if (!b1) {
+	    writeln("this seems wrong");
+    }
+    else {
+	    writeln("I'm giving up, this is too crazy for me");
+    }
 }

From 41e857ea1650e216932fca057b46fed5566e26a2 Mon Sep 17 00:00:00 2001
From: Keith Hall <kingkeith+github@gmail.com>
Date: Sat, 17 Oct 2020 18:45:23 +0300
Subject: [PATCH 09/41] Highlight C code in all man pages sections

---
 .../syntaxes/02_Extra/Manpage.sublime-syntax  |  6 ++-
 assets/syntaxes/02_Extra/syntax_test_man.man  |  4 ++
 .../highlighted/Manpage/bat-0.16.man          | 54 +++++++++----------
 .../highlighted/Manpage/select-2.man          |  2 +-
 4 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/assets/syntaxes/02_Extra/Manpage.sublime-syntax b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
index ea0bcb3c..96d1eee8 100644
--- a/assets/syntaxes/02_Extra/Manpage.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
@@ -83,6 +83,7 @@ contexts:
         - match: ''
           pop: true
     - include: function-call
+    - include: c-code
 
   expect-command-line-option:
     - match: '[A-Za-z0-9-]+'
@@ -127,9 +128,12 @@ contexts:
     - match: '$|(?=[],]|{{command_line_option}})'
       pop: true
 
-  synopsis:
+  c-code:
     - match: '^(?=\s+(?:#include|/\*))'
       push: scope:source.c
+
+  synopsis:
+    - include: c-code
     - match: \[
       scope: punctuation.section.brackets.begin.man
       push: command-line-option-or-pipe
diff --git a/assets/syntaxes/02_Extra/syntax_test_man.man b/assets/syntaxes/02_Extra/syntax_test_man.man
index a4c8f91d..286f8b37 100644
--- a/assets/syntaxes/02_Extra/syntax_test_man.man
+++ b/assets/syntaxes/02_Extra/syntax_test_man.man
@@ -123,3 +123,7 @@ OPTIONS
 #                             ^^^ variable.parameter
 #                                ^^ - variable
               output NUM (default 3) lines of copied context
+
+EXAMPLE
+       #include <stdio.h>
+#      ^^^^^^^^ source meta.preprocessor.include keyword.control.import.include
diff --git a/tests/syntax-tests/highlighted/Manpage/bat-0.16.man b/tests/syntax-tests/highlighted/Manpage/bat-0.16.man
index 921fe261..853a2250 100644
--- a/tests/syntax-tests/highlighted/Manpage/bat-0.16.man
+++ b/tests/syntax-tests/highlighted/Manpage/bat-0.16.man
@@ -1,7 +1,7 @@
-BAT(1)                      General Commands Manual                     BAT(1)
+BAT(1)                      General Commands Manual                     BAT(1)
 
 NAME
-       bat - a cat(1) clone with syntax highlighting and Git integration.
+       bat - a cat(1) clone with syntax highlighting and Git integration.
 
 USAGE
        bat [OPTIONS] [FILE]...
@@ -28,19 +28,19 @@
        values  can  be  specified  as  either  '--language   value',   '--lan‐
        guage=value', '-l value' or '-lvalue'.
 
-       -A, --show-all
+       -A, --show-all
 
               Show  non-printable  characters  like space, tab or newline. Use
               '--tabs' to control the width of the tab-placeholders.
 
-       -p, --plain
+       -p, --plain
 
               Only show plain style, no decorations.  This  is  an  alias  for
-              '--style=plain'.  When  '-p' is used twice ('-pp'), it also dis‐
+              '--style=plain'.  When  '-p' is used twice ('-pp'), it also dis‐
               ables    automatic    paging    (alias    for     '--style=plain
-              --pager=never').
+              --pager=never').
 
-       -l, --language <language>
+       -l, --language <language>
 
               Explicitly  set  the  language for syntax highlighting. The lan‐
               guage can be specified as a name (like 'C++' or 'LaTeX') or pos‐
@@ -65,54 +65,54 @@
               --highlight-line 40:
                      highlights lines 40 to the end of the file
 
-       --tabs <T>
+       --tabs <T>
 
               Set the tab width to T spaces. Use a width of  0  to  pass  tabs
               through directly
 
-       --wrap <mode>
+       --wrap <mode>
 
               Specify  the  text-wrapping mode (*auto*, never, character). The
               '--terminal-width' option can be used in addition to control the
               output width.
 
-       --terminal-width <width>
+       --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'.
 
-       -n, --number
+       -n, --number
 
               Only show line numbers, no other decorations. This is  an  alias
-              for '--style=numbers'
+              for '--style=numbers'
 
-       --color <when>
+       --color <when>
 
               Specify  when to use colored output. The automatic mode only en‐
               ables colors if an interactive terminal  is  detected.  Possible
               values: *auto*, never, always.
 
-       --italic-text <when>
+       --italic-text <when>
 
               Specify  when  to use ANSI sequences for italic text in the out‐
               put. Possible values: always, *never*.
 
-       --decorations <when>
+       --decorations <when>
 
               Specify when to use the decorations that have been specified via
               '--style'. The automatic mode only enables decorations if an in‐
               teractive terminal is detected. Possible values: *auto*,  never,
               always.
 
-       -f, --force-colorization
+       -f, --force-colorization
 
-              Alias  for '--decorations=always --color=always'. This is useful
+              Alias  for '--decorations=always --color=always'. This is useful
               if the output of bat is piped to another program, but  you  want
               to keep the colorization/decorations.
 
-       --paging <when>
+       --paging <when>
 
               Specify when to use the pager. To disable the pager, use '--pag‐
               ing=never' or its alias, -P. To disable the  pager  permanently,
@@ -120,7 +120,7 @@
               used, see the '--pager' option. Possible values: *auto*,  never,
               always.
 
-       --pager <command>
+       --pager <command>
 
               Determine  which  pager  is  used. This option will override the
               PAGER and BAT_PAGER environment variables. The default pager  is
@@ -135,24 +135,24 @@
               '*.build:Python'.  To highlight files named '.myignore' with the
               Git Ignore syntax, use -m '.myignore:Git Ignore'.
 
-       --theme <theme>
+       --theme <theme>
 
               Set the theme for syntax highlighting.  Use  '--list-themes'  to
               see  all  available  themes.   To  set  a default theme, add the
-              '--theme="..."' option to the configuration file or  export  the
+              '--theme="..."' option to the configuration file or  export  the
               BAT_THEME environment variable (e.g.: export BAT_THEME="...").
 
        --list-themes
 
               Display a list of supported themes for syntax highlighting.
 
-       --style <style-components>
+       --style <style-components>
 
               Configure  which elements (line numbers, file headers, grid bor‐
               ders, Git modifications, ..) to display in addition to the  file
               contents.  The  argument is a comma-separated list of components
               to display (e.g. 'numbers,changes,grid') or a pre-defined  style
-              ('full').  To set a default style, add the '--style=".."' option
+              ('full').  To set a default style, add the '--style=".."' option
               to the configuration file or export  the  BAT_STYLE  environment
               variable (e.g.: export BAT_STYLE=".."). Possible values: *auto*,
               full, plain, changes, header, grid, numbers, snip.
@@ -171,21 +171,21 @@
               --line-range 40:
                      prints lines 40 to the end of the file
 
-       -L, --list-languages
+       -L, --list-languages
 
               Display a list of supported languages for syntax highlighting.
 
-       -u, --unbuffered
+       -u, --unbuffered
 
               This option exists for POSIX-compliance reasons ('u' is for 'un‐
               buffered'). The output is always unbuffered  -  this  option  is
               simply ignored.
 
-       -h, --help
+       -h, --help
 
               Print this help message.
 
-       -V, --version
+       -V, --version
 
               Show version information.
 
diff --git a/tests/syntax-tests/highlighted/Manpage/select-2.man b/tests/syntax-tests/highlighted/Manpage/select-2.man
index e01db209..5ca67908 100644
--- a/tests/syntax-tests/highlighted/Manpage/select-2.man
+++ b/tests/syntax-tests/highlighted/Manpage/select-2.man
@@ -1,4 +1,4 @@
-SELECT(2)                                             Linux Programmer's Manual                                             SELECT(2)
+SELECT(2)                                             Linux Programmer's Manual                                             SELECT(2)
 
 NAME
        select, pselect, FD_CLR, FD_ISSET, FD_SET, FD_ZERO - synchronous I/O multiplexing

From cfdb853ea60e8d6ff3eb56530079447777216d8b Mon Sep 17 00:00:00 2001
From: Keith Hall <kingkeith+github@gmail.com>
Date: Mon, 19 Oct 2020 11:24:15 +0300
Subject: [PATCH 10/41] End highlighting of C code in man pages when no longer
 relevant

---
 .../syntaxes/02_Extra/Manpage.sublime-syntax  |  21 ++--
 assets/syntaxes/02_Extra/syntax_test_man.man  |  30 +++++-
 .../highlighted/Manpage/bat-0.16.man          |  56 +++++-----
 .../highlighted/Manpage/select-2.man          | 100 +++++++++---------
 4 files changed, 118 insertions(+), 89 deletions(-)

diff --git a/assets/syntaxes/02_Extra/Manpage.sublime-syntax b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
index 96d1eee8..d721259f 100644
--- a/assets/syntaxes/02_Extra/Manpage.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
@@ -34,28 +34,30 @@ contexts:
           scope: markup.heading.title.man
         - match: \s\s
           pop: true
-        - match: '(?=\S)'
+        - match: '(?=\S|$)'
           pop: true
 
     - match: '$'
-      push: body
+      set: body
 
   body:
     # English, ..., ..., ..., Russian, ...
 
-    - match: '^(?:SYNOPSIS|SYNTAX|SINTASSI|SKŁADNIA|СИНТАКСИС|書式)'
+    - match: '^(?:SYNOPSIS|SYNTAX|SINTASSI|SK\u0141ADNIA|\u0421\u0418\u041d\u0422\u0410\u041a\u0421\u0418\u0421|\u66f8\u5f0f)'
       scope: markup.heading.synopsis.man
       embed: synopsis
       escape: '(?={{section_heading}})'
 
+    - match: '^(?:USAGE)'
+      scope: markup.heading.synopsis.man
+      embed: synopsis
+      escape: '(?={{section_heading}})'
 
     - match: '{{section_heading}}'
       scope: markup.heading.other.man
       embed: options # some man pages put command line options under the description heading
       escape: '(?={{section_heading}})'
 
-    - include: function-call
-
   function-call:
     - match: '\b([A-Za-z0-9_\-]+)(\()([^)]*)(\))'
       captures:
@@ -129,8 +131,12 @@ contexts:
       pop: true
 
   c-code:
-    - match: '^(?=\s+(?:#include|/\*))'
-      push: scope:source.c
+    #- match: '^(\s+)(?=#include\b|#define\b|/\*|struct\s+\w+\s*\{)'
+    - match: '^(?=\s+(?:#include\b|#define\b|/\*|struct\s+(\w+\s*)?\{))'
+      embed: scope:source.c
+      #embed_scope: source.c.embedded.man
+      #escape: ^(?!#|\1|\s*(?:$|/\*|#include\b|#define\b))
+      escape: ^(?=\s*(?:\(.*\.\)\s*$|[A-Z](?![A-Z])))
 
   synopsis:
     - include: c-code
@@ -144,6 +150,7 @@ contexts:
       captures:
         1: keyword.operator.logical.man
     #- match: (?={{command_line_option}})
+    - match: \w+-\w+
     - match: (?=-)
       push:
         - match: (?=\s*\|)
diff --git a/assets/syntaxes/02_Extra/syntax_test_man.man b/assets/syntaxes/02_Extra/syntax_test_man.man
index 286f8b37..ee8bada3 100644
--- a/assets/syntaxes/02_Extra/syntax_test_man.man
+++ b/assets/syntaxes/02_Extra/syntax_test_man.man
@@ -5,7 +5,7 @@ SOMETHING(8)                System Manager's Manual               SOMETHING(8)
 #                                                                   ^^^^^^^ meta.preprocessor
 
 NAME
-#^^^ markup.heading.title
+#^^^ markup.heading.other
        example - do something useful
 
 SYNOPSIS
@@ -45,9 +45,16 @@ SYNOPSIS
        [--quiet] [--debug] [--help|-h]  [--version]  [--conf FILE]
 
         /* According to POSIX.1-2001, POSIX.1-2008 */
-#       ^^ source comment.block punctuation.definition.comment
+#       ^^ source.c comment.block punctuation.definition.comment
        #include <sys/select.h>
-#      ^^^^^^^^ source meta.preprocessor.include keyword.control.import.include
+#      ^^^^^^^^ source.c meta.preprocessor.include keyword.control.import.include
+           struct timeval {
+#          ^^^^^^ source.c storage.type
+            
+               time_t         tv_sec;     /* seconds */
+               suseconds_t    tv_usec;    /* microseconds */
+           };
+
 
 
 DESCRIPTION
@@ -126,4 +133,19 @@ OPTIONS
 
 EXAMPLE
        #include <stdio.h>
-#      ^^^^^^^^ source meta.preprocessor.include keyword.control.import.include
+#      ^^^^^^^^ source.c meta.preprocessor.include keyword.control.import.include
+
+    (This is not C code.)
+#   ^^^^^^^^^^^^^^^^^^^^^^ - source.c
+
+           struct timeval {
+               time_t      tv_sec;         /* seconds */
+               suseconds_t tv_usec;        /* microseconds */
+           };
+#           ^ source.c punctuation.terminator
+
+       The corresponding argument for pselect() has the following type:
+#^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - source.c
+           #define POLLIN_SET  (EPOLLRDNORM | EPOLLRDBAND | EPOLLIN |
+                                EPOLLHUP | EPOLLERR)
+#                                                  ^ source.c meta.preprocessor.macro meta.group punctuation.section.group.end
diff --git a/tests/syntax-tests/highlighted/Manpage/bat-0.16.man b/tests/syntax-tests/highlighted/Manpage/bat-0.16.man
index 853a2250..92485f84 100644
--- a/tests/syntax-tests/highlighted/Manpage/bat-0.16.man
+++ b/tests/syntax-tests/highlighted/Manpage/bat-0.16.man
@@ -1,12 +1,12 @@
-BAT(1)                      General Commands Manual                     BAT(1)
+BAT(1)                      General Commands Manual                     BAT(1)
 
 NAME
        bat - a cat(1) clone with syntax highlighting and Git integration.
 
 USAGE
-       bat [OPTIONS] [FILE]...
+       bat [OPTIONS] [FILE]...
 
-       bat cache [CACHE-OPTIONS] [--build|--clear]
+       bat cache [CACHE-OPTIONS] [--build|--clear]
 
 DESCRIPTION
        bat  prints  the syntax-highlighted content of a collection of FILEs to
@@ -28,19 +28,19 @@
        values  can  be  specified  as  either  '--language   value',   '--lan‐
        guage=value', '-l value' or '-lvalue'.
 
-       -A, --show-all
+       -A, --show-all
 
               Show  non-printable  characters  like space, tab or newline. Use
               '--tabs' to control the width of the tab-placeholders.
 
-       -p, --plain
+       -p, --plain
 
               Only show plain style, no decorations.  This  is  an  alias  for
-              '--style=plain'.  When  '-p' is used twice ('-pp'), it also dis‐
+              '--style=plain'.  When  '-p' is used twice ('-pp'), it also dis‐
               ables    automatic    paging    (alias    for     '--style=plain
-              --pager=never').
+              --pager=never').
 
-       -l, --language <language>
+       -l, --language <language>
 
               Explicitly  set  the  language for syntax highlighting. The lan‐
               guage can be specified as a name (like 'C++' or 'LaTeX') or pos‐
@@ -65,54 +65,54 @@
               --highlight-line 40:
                      highlights lines 40 to the end of the file
 
-       --tabs <T>
+       --tabs <T>
 
               Set the tab width to T spaces. Use a width of  0  to  pass  tabs
               through directly
 
-       --wrap <mode>
+       --wrap <mode>
 
               Specify  the  text-wrapping mode (*auto*, never, character). The
               '--terminal-width' option can be used in addition to control the
               output width.
 
-       --terminal-width <width>
+       --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'.
 
-       -n, --number
+       -n, --number
 
               Only show line numbers, no other decorations. This is  an  alias
-              for '--style=numbers'
+              for '--style=numbers'
 
-       --color <when>
+       --color <when>
 
               Specify  when to use colored output. The automatic mode only en‐
               ables colors if an interactive terminal  is  detected.  Possible
               values: *auto*, never, always.
 
-       --italic-text <when>
+       --italic-text <when>
 
               Specify  when  to use ANSI sequences for italic text in the out‐
               put. Possible values: always, *never*.
 
-       --decorations <when>
+       --decorations <when>
 
               Specify when to use the decorations that have been specified via
               '--style'. The automatic mode only enables decorations if an in‐
               teractive terminal is detected. Possible values: *auto*,  never,
               always.
 
-       -f, --force-colorization
+       -f, --force-colorization
 
-              Alias  for '--decorations=always --color=always'. This is useful
+              Alias  for '--decorations=always --color=always'. This is useful
               if the output of bat is piped to another program, but  you  want
               to keep the colorization/decorations.
 
-       --paging <when>
+       --paging <when>
 
               Specify when to use the pager. To disable the pager, use '--pag‐
               ing=never' or its alias, -P. To disable the  pager  permanently,
@@ -120,7 +120,7 @@
               used, see the '--pager' option. Possible values: *auto*,  never,
               always.
 
-       --pager <command>
+       --pager <command>
 
               Determine  which  pager  is  used. This option will override the
               PAGER and BAT_PAGER environment variables. The default pager  is
@@ -135,24 +135,24 @@
               '*.build:Python'.  To highlight files named '.myignore' with the
               Git Ignore syntax, use -m '.myignore:Git Ignore'.
 
-       --theme <theme>
+       --theme <theme>
 
               Set the theme for syntax highlighting.  Use  '--list-themes'  to
               see  all  available  themes.   To  set  a default theme, add the
-              '--theme="..."' option to the configuration file or  export  the
+              '--theme="..."' option to the configuration file or  export  the
               BAT_THEME environment variable (e.g.: export BAT_THEME="...").
 
        --list-themes
 
               Display a list of supported themes for syntax highlighting.
 
-       --style <style-components>
+       --style <style-components>
 
               Configure  which elements (line numbers, file headers, grid bor‐
               ders, Git modifications, ..) to display in addition to the  file
               contents.  The  argument is a comma-separated list of components
               to display (e.g. 'numbers,changes,grid') or a pre-defined  style
-              ('full').  To set a default style, add the '--style=".."' option
+              ('full').  To set a default style, add the '--style=".."' option
               to the configuration file or export  the  BAT_STYLE  environment
               variable (e.g.: export BAT_STYLE=".."). Possible values: *auto*,
               full, plain, changes, header, grid, numbers, snip.
@@ -171,21 +171,21 @@
               --line-range 40:
                      prints lines 40 to the end of the file
 
-       -L, --list-languages
+       -L, --list-languages
 
               Display a list of supported languages for syntax highlighting.
 
-       -u, --unbuffered
+       -u, --unbuffered
 
               This option exists for POSIX-compliance reasons ('u' is for 'un‐
               buffered'). The output is always unbuffered  -  this  option  is
               simply ignored.
 
-       -h, --help
+       -h, --help
 
               Print this help message.
 
-       -V, --version
+       -V, --version
 
               Show version information.
 
diff --git a/tests/syntax-tests/highlighted/Manpage/select-2.man b/tests/syntax-tests/highlighted/Manpage/select-2.man
index 5ca67908..a746c365 100644
--- a/tests/syntax-tests/highlighted/Manpage/select-2.man
+++ b/tests/syntax-tests/highlighted/Manpage/select-2.man
@@ -1,4 +1,4 @@
-SELECT(2)                                             Linux Programmer's Manual                                             SELECT(2)
+SELECT(2)                                             Linux Programmer's Manual                                             SELECT(2)
 
 NAME
        select, pselect, FD_CLR, FD_ISSET, FD_SET, FD_ZERO - synchronous I/O multiplexing
@@ -18,9 +18,9 @@
                    fd_set *exceptfds, const struct timespec *timeout,
                    const sigset_t *sigmask);
 
-   Feature Test Macro Requirements for glibc (see feature_test_macros(7)):
+   Feature Test Macro Requirements for glibc (see feature_test_macros(7)):
 
-       pselect(): _POSIX_C_SOURCE >= 200112L
+       pselect(): _POSIX_C_SOURCE >= 200112L
 
 DESCRIPTION
        select()  allows  a  program  to  monitor  multiple file descriptors, waiting until one or more of the file descriptors become
@@ -142,17 +142,17 @@
    The timeout
        The timeout argument for select() is a structure of the following type:
 
-           struct timeval {
-               time_t      tv_sec;         /* seconds */
-               suseconds_t tv_usec;        /* microseconds */
-           };
+           struct timeval {
+               time_t      tv_sec;         /* seconds */
+               suseconds_t tv_usec;        /* microseconds */
+           };
 
        The corresponding argument for pselect() has the following type:
 
-           struct timespec {
-               time_t      tv_sec;         /* seconds */
-               long        tv_nsec;        /* nanoseconds */
-           };
+           struct timespec {
+               time_t      tv_sec;         /* seconds */
+               long        tv_nsec;        /* nanoseconds */
+           };
 
        On  Linux,  select()  modifies  timeout  to  reflect  the amount of time not slept; most other implementations do not do this.
        (POSIX.1 permits either behavior.)  This causes problems both when Linux code which reads timeout is ported to other operating
@@ -213,14 +213,14 @@
        Within  the  Linux  kernel  source,  we  find  the  following  definitions which show the correspondence between the readable,
        writable, and exceptional condition notifications of select() and the event notifications provided by poll(2) and epoll(7):
 
-           #define POLLIN_SET  (EPOLLRDNORM | EPOLLRDBAND | EPOLLIN |
-                                EPOLLHUP | EPOLLERR)
-                              /* Ready for reading */
-           #define POLLOUT_SET (EPOLLWRBAND | EPOLLWRNORM | EPOLLOUT |
-                                EPOLLERR)
-                              /* Ready for writing */
-           #define POLLEX_SET  (EPOLLPRI)
-                              /* Exceptional condition */
+           #define POLLIN_SET  (EPOLLRDNORM | EPOLLRDBAND | EPOLLIN |
+                                EPOLLHUP | EPOLLERR)
+                              /* Ready for reading */
+           #define POLLOUT_SET (EPOLLWRBAND | EPOLLWRNORM | EPOLLOUT |
+                                EPOLLERR)
+                              /* Ready for writing */
+           #define POLLEX_SET  (EPOLLPRI)
+                              /* Exceptional condition */
 
    Multithreaded applications
        If a file descriptor being monitored by select() is closed in another thread, the result is unspecified.  On  some  UNIX  sys‐
@@ -242,11 +242,11 @@
 
        The final argument of the pselect6() system call is not a sigset_t * pointer, but is instead a structure of the form:
 
-           struct {
-               const kernel_sigset_t *ss;   /* Pointer to signal set */
-               size_t ss_len;               /* Size (in bytes) of object
-                                               pointed to by 'ss' */
-           };
+           struct {
+               const kernel_sigset_t *ss;   /* Pointer to signal set */
+               size_t ss_len;               /* Size (in bytes) of object
+                                               pointed to by 'ss' */
+           };
 
        This allows the system call to obtain both a pointer to the signal set and its size, while allowing for the fact that most ar‐
        chitectures  support a maximum of 6 arguments to a system call.  See sigprocmask(2) for a discussion of the difference between
@@ -283,40 +283,40 @@
        by internally copying the timeout to a local variable and passing that variable to the system call.
 
 EXAMPLES
-       #include <stdio.h>
-       #include <stdlib.h>
-       #include <sys/select.h>
+       #include <stdio.h>
+       #include <stdlib.h>
+       #include <sys/select.h>
 
-       int
-       main(void)
-       {
-           fd_set rfds;
-           struct timeval tv;
-           int retval;
+       int
+       main(void)
+       {
+           fd_set rfds;
+           struct timeval tv;
+           int retval;
 
-           /* Watch stdin (fd 0) to see when it has input. */
+           /* Watch stdin (fd 0) to see when it has input. */
 
-           FD_ZERO(&rfds);
-           FD_SET(0, &rfds);
+           FD_ZERO(&rfds);
+           FD_SET(0, &rfds);
 
-           /* Wait up to five seconds. */
+           /* Wait up to five seconds. */
 
-           tv.tv_sec = 5;
-           tv.tv_usec = 0;
+           tv.tv_sec = 5;
+           tv.tv_usec = 0;
 
-           retval = select(1, &rfds, NULL, NULL, &tv);
-           /* Don't rely on the value of tv now! */
+           retval = select(1, &rfds, NULL, NULL, &tv);
+           /* Don't rely on the value of tv now! */
 
-           if (retval == -1)
-               perror("select()");
-           else if (retval)
-               printf("Data is available now.\n");
-               /* FD_ISSET(0, &rfds) will be true. */
-           else
-               printf("No data within five seconds.\n");
+           if (retval == -1)
+               perror("select()");
+           else if (retval)
+               printf("Data is available now.\n");
+               /* FD_ISSET(0, &rfds) will be true. */
+           else
+               printf("No data within five seconds.\n");
 
-           exit(EXIT_SUCCESS);
-       }
+           exit(EXIT_SUCCESS);
+       }
 
 SEE ALSO
        accept(2), connect(2), poll(2), read(2), recv(2), restart_syscall(2), send(2), sigprocmask(2), write(2), epoll(7), time(7)

From 9ab0801ee19a59d9ffa96f8c3ab5804d6e3737b2 Mon Sep 17 00:00:00 2001
From: Keith Hall <kingkeith+github@gmail.com>
Date: Mon, 19 Oct 2020 12:29:54 +0300
Subject: [PATCH 11/41] Revert accidental regex literal -> unicode char change
 in Manpage syntax

---
 assets/syntaxes/02_Extra/Manpage.sublime-syntax | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/assets/syntaxes/02_Extra/Manpage.sublime-syntax b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
index d721259f..d92eea22 100644
--- a/assets/syntaxes/02_Extra/Manpage.sublime-syntax
+++ b/assets/syntaxes/02_Extra/Manpage.sublime-syntax
@@ -43,7 +43,7 @@ contexts:
   body:
     # English, ..., ..., ..., Russian, ...
 
-    - match: '^(?:SYNOPSIS|SYNTAX|SINTASSI|SK\u0141ADNIA|\u0421\u0418\u041d\u0422\u0410\u041a\u0421\u0418\u0421|\u66f8\u5f0f)'
+    - match: '^(?:SYNOPSIS|SYNTAX|SINTASSI|SKŁADNIA|СИНТАКСИС|書式)'
       scope: markup.heading.synopsis.man
       embed: synopsis
       escape: '(?={{section_heading}})'
@@ -131,7 +131,6 @@ contexts:
       pop: true
 
   c-code:
-    #- match: '^(\s+)(?=#include\b|#define\b|/\*|struct\s+\w+\s*\{)'
     - match: '^(?=\s+(?:#include\b|#define\b|/\*|struct\s+(\w+\s*)?\{))'
       embed: scope:source.c
       #embed_scope: source.c.embedded.man

From efab00a9de08266bd4d47d4d076e6e1c6c405fab Mon Sep 17 00:00:00 2001
From: R1tschY <r1tschy@posteo.de>
Date: Sat, 24 Oct 2020 12:47:28 +0200
Subject: [PATCH 12/41] Add Git Attributes syntax test

---
 .../Git Attributes/example.gitattributes         | 16 ++++++++++++++++
 .../source/Git Attributes/example.gitattributes  | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/Git Attributes/example.gitattributes
 create mode 100644 tests/syntax-tests/source/Git Attributes/example.gitattributes

diff --git a/tests/syntax-tests/highlighted/Git Attributes/example.gitattributes b/tests/syntax-tests/highlighted/Git Attributes/example.gitattributes
new file mode 100644
index 00000000..178bc759
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Git Attributes/example.gitattributes	
@@ -0,0 +1,16 @@
+#
+# Comment
+
+[attr]binary -diff -merge -text
+
+*          text=auto
+*.c        diff=c
+*.cc       text diff=cpp
+*.o        binary
+*.bat      text eol=crlf
+*.lock     text -diff
+*.*ignore  text
+*.patch    -text
+
+.gitattributes linguist-language=gitattributes
+.gitkeep       export-ignore
diff --git a/tests/syntax-tests/source/Git Attributes/example.gitattributes b/tests/syntax-tests/source/Git Attributes/example.gitattributes
new file mode 100644
index 00000000..9b8e58b8
--- /dev/null
+++ b/tests/syntax-tests/source/Git Attributes/example.gitattributes	
@@ -0,0 +1,16 @@
+#
+# Comment
+
+[attr]binary -diff -merge -text
+
+*          text=auto
+*.c        diff=c
+*.cc       text diff=cpp
+*.o        binary
+*.bat      text eol=crlf
+*.lock     text -diff
+*.*ignore  text
+*.patch    -text
+
+.gitattributes linguist-language=gitattributes
+.gitkeep       export-ignore
\ No newline at end of file

From 99ac5c30456b01d70c35b7f35cdfe3a3c2213907 Mon Sep 17 00:00:00 2001
From: Alan Berndt <alan@eatabrick.org>
Date: Sat, 24 Oct 2020 04:09:52 -0700
Subject: [PATCH 13/41] Add fairly complex nginx config.

This is to contribute to issue #1213.  I took some of the more
complicated servers I am running as examples.  Everything looks to be
correctly highlighted compared to vim's syntax highlighting.
---
 .../syntax-tests/highlighted/nginx/nginx.conf | 140 ++++++++++++++++++
 tests/syntax-tests/source/nginx/nginx.conf    | 140 ++++++++++++++++++
 2 files changed, 280 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/nginx/nginx.conf
 create mode 100644 tests/syntax-tests/source/nginx/nginx.conf

diff --git a/tests/syntax-tests/highlighted/nginx/nginx.conf b/tests/syntax-tests/highlighted/nginx/nginx.conf
new file mode 100644
index 00000000..4b2f9da9
--- /dev/null
+++ b/tests/syntax-tests/highlighted/nginx/nginx.conf
@@ -0,0 +1,140 @@
+#user  nobody;
+worker_processes  1;
+#pid        logs/nginx.pid;
+
+load_module "/usr/local/libexec/nginx/ngx_http_xslt_filter_module.so";
+load_module "/usr/local/libexec/nginx/ngx_rtmp_module.so";
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+    gzip  on;
+    gzip_disable "msie6";
+
+    include /usr/local/etc/nginx/sites.d/*;
+}
+
+rtmp {
+  server {
+    listen 1935;
+    max_message 10M;
+
+    application wnob {
+      live on;
+      record off;
+    }
+
+    application strim {
+      live on;
+      hls on;
+
+      hls_path /usr/local/www/hls/;
+
+      hls_variant _low BANDWIDTH=250000;
+      hls_variant _mid BANDWIDTH=500000;
+      hls_variant _high BANDWIDTH=1000000;
+      hls_variant _hd720 BANDWIDTH=1500000;
+      hls_variant _src BANDWIDTH=2000000;
+    }
+  }
+}
+
+server {
+  listen 443 ssl;
+  server_name host.example.com
+  root /usr/local/www/host.example.com/;
+  error_page 404 /404.html;
+
+  index index.html;
+  autoindex on;
+  autoindex_localtime off;
+  autoindex_format xml;
+
+  location / {
+    xslt_stylesheet /usr/local/www/host.example.com/index.xslt;
+  }
+
+  location ~ /\..* {
+    return 404;
+  }
+
+  location ~ /.+/ {
+    xslt_stylesheet /usr/local/www/host.example.com/project.xslt;
+  }
+
+  location ~ /.*\.xslt/ {
+    return 404;
+  }
+
+  location ~ \.thumb\.png$ {
+    error_page 404 /404.thumb.png;
+  }
+    ssl_certificate /usr/local/etc/letsencrypt/live/host.example.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /usr/local/etc/letsencrypt/live/host.example.com/privkey.pem; # managed by Certbot
+
+  include /usr/local/etc/letsencrypt/options-ssl-nginx.conf;
+  ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem;
+
+  add_header Strict-Transport-Security "max-age=31536000" always;
+
+}
+
+server {
+  listen 80;
+  server_name host.example.com;
+
+  if ($host = host.example.com) {
+    return 301 https://$host$request_uri;
+  }
+
+  return 404;
+}
+
+server {
+  listen 443 ssl;
+  server_name other.example.com;
+
+  ssl_certificate /usr/local/etc/letsencrypt/live/other.example.com/fullchain.pem;
+  ssl_certificate_key /usr/local/etc/letsencrypt/live/other.example.com/privkey.pem;
+
+  include /usr/local/etc/letsencrypt/options-ssl-nginx.conf;
+  ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem;
+
+  add_header Strict-Transport-Security "max-age=31536000" always;
+
+  access_log /home/otherapp/logs/access.log;
+  error_log /home/otherapp/logs/error.log;
+
+  client_max_body_size 5M;
+
+  location / {
+    root /home/otherapp/app/static;
+    index man.txt;
+    try_files $uri @proxy;
+  }
+
+  location @proxy {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://unix:/var/run/otherapp/sock:;
+  }
+}
+
+server {
+  listen 80;
+  server_name other.example.com;
+
+  if ($host = other.example.com) {
+    return 301 https://$host$request_uri;
+  }
+
+  return 404;
+}
diff --git a/tests/syntax-tests/source/nginx/nginx.conf b/tests/syntax-tests/source/nginx/nginx.conf
new file mode 100644
index 00000000..02ee8a4b
--- /dev/null
+++ b/tests/syntax-tests/source/nginx/nginx.conf
@@ -0,0 +1,140 @@
+#user  nobody;
+worker_processes  1;
+#pid        logs/nginx.pid;
+
+load_module "/usr/local/libexec/nginx/ngx_http_xslt_filter_module.so";
+load_module "/usr/local/libexec/nginx/ngx_rtmp_module.so";
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+    gzip  on;
+    gzip_disable "msie6";
+
+    include /usr/local/etc/nginx/sites.d/*;
+}
+
+rtmp {
+  server {
+    listen 1935;
+    max_message 10M;
+
+    application wnob {
+      live on;
+      record off;
+    }
+
+    application strim {
+      live on;
+      hls on;
+
+      hls_path /usr/local/www/hls/;
+
+      hls_variant _low BANDWIDTH=250000;
+      hls_variant _mid BANDWIDTH=500000;
+      hls_variant _high BANDWIDTH=1000000;
+      hls_variant _hd720 BANDWIDTH=1500000;
+      hls_variant _src BANDWIDTH=2000000;
+    }
+  }
+}
+
+server {
+  listen 443 ssl;
+  server_name host.example.com
+  root /usr/local/www/host.example.com/;
+  error_page 404 /404.html;
+
+  index index.html;
+  autoindex on;
+  autoindex_localtime off;
+  autoindex_format xml;
+
+  location / {
+    xslt_stylesheet /usr/local/www/host.example.com/index.xslt;
+  }
+
+  location ~ /\..* {
+    return 404;
+  }
+
+  location ~ /.+/ {
+    xslt_stylesheet /usr/local/www/host.example.com/project.xslt;
+  }
+
+  location ~ /.*\.xslt/ {
+    return 404;
+  }
+
+  location ~ \.thumb\.png$ {
+    error_page 404 /404.thumb.png;
+  }
+    ssl_certificate /usr/local/etc/letsencrypt/live/host.example.com/fullchain.pem; # managed by Certbot
+    ssl_certificate_key /usr/local/etc/letsencrypt/live/host.example.com/privkey.pem; # managed by Certbot
+
+  include /usr/local/etc/letsencrypt/options-ssl-nginx.conf;
+  ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem;
+
+  add_header Strict-Transport-Security "max-age=31536000" always;
+
+}
+
+server {
+  listen 80;
+  server_name host.example.com;
+
+  if ($host = host.example.com) {
+    return 301 https://$host$request_uri;
+  }
+
+  return 404;
+}
+
+server {
+  listen 443 ssl;
+  server_name other.example.com;
+
+  ssl_certificate /usr/local/etc/letsencrypt/live/other.example.com/fullchain.pem;
+  ssl_certificate_key /usr/local/etc/letsencrypt/live/other.example.com/privkey.pem;
+
+  include /usr/local/etc/letsencrypt/options-ssl-nginx.conf;
+  ssl_dhparam /usr/local/etc/letsencrypt/ssl-dhparams.pem;
+
+  add_header Strict-Transport-Security "max-age=31536000" always;
+
+  access_log /home/otherapp/logs/access.log;
+  error_log /home/otherapp/logs/error.log;
+
+  client_max_body_size 5M;
+
+  location / {
+    root /home/otherapp/app/static;
+    index man.txt;
+    try_files $uri @proxy;
+  }
+
+  location @proxy {
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Forwarded-Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_pass http://unix:/var/run/otherapp/sock:;
+  }
+}
+
+server {
+  listen 80;
+  server_name other.example.com;
+
+  if ($host = other.example.com) {
+    return 301 https://$host$request_uri;
+  }
+
+  return 404;
+}

From 7a7bb80e234e346dbee109cae7c443b1666f427f Mon Sep 17 00:00:00 2001
From: Stefano Probst <senden9@gmail.com>
Date: Sat, 24 Oct 2020 10:03:49 +0200
Subject: [PATCH 14/41] Add Git Config syntax test file

cc sharkdp/bat#1213
---
 .../highlighted/Git Config/text.gitconfig     | 107 ++++++++++++++++++
 .../syntax-tests/source/Git Config/LICENSE.md |   1 +
 .../source/Git Config/text.gitconfig          | 107 ++++++++++++++++++
 3 files changed, 215 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/Git Config/text.gitconfig
 create mode 100644 tests/syntax-tests/source/Git Config/LICENSE.md
 create mode 100644 tests/syntax-tests/source/Git Config/text.gitconfig

diff --git a/tests/syntax-tests/highlighted/Git Config/text.gitconfig b/tests/syntax-tests/highlighted/Git Config/text.gitconfig
new file mode 100644
index 00000000..91f3b08c
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Git Config/text.gitconfig	
@@ -0,0 +1,107 @@
+[alias]
+	br = branch
+	branch = branch -a
+	c = clone --recursive
+	ci = commit
+	cl = clone
+	co = checkout
+	contributors = shortlog --summary --numbered
+	lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
+	remote = remote -v
+	st = status
+	tag = tag -l
+[apply]
+	whitespace = fix
+[color]
+	ui = true
+[color "branch"]
+	current = yellow
+	local = yellow
+	remote = green
+[color "diff"]
+	commit = yellow bold
+	frag = magenta bold
+	meta = yellow
+	new = green bold
+	old = red bold
+	whitespace = red reverse
+[color "diff-highlight"]
+	newHighlight = green bold 22
+	newNormal = green bold
+	oldHighlight = red bold 52
+	oldNormal = red bold
+[color "status"]
+	added = green
+	changed = yellow
+	untracked = cyan
+[commit]
+	gpgsign = true
+[core]
+	editor = /usr/bin/vim
+	# global exclude
+	excludesfile = /home/frank/.config/git/ignore
+	pager = delta
+	; broken on old machines
+	untrackedCache = true
+[credential]
+	helper = store
+[delta]
+	features = line-numbers decorations
+	max-line-length = 1024
+	whitespace-error-style = 22 reverse
+[delta "decorations"]
+	commit-decoration-style = bold yellow box ul
+	file-decoration-style = none
+	file-style = bold yellow
+	syntax-theme = gruvbox
+[diff]
+	submodule = diff
+	algorithm = histogram
+	renames = copies
+[difftool]
+	prompt = false
+[difftool "wrapper"]
+	binary = true
+	cmd = git-difftool-wrapper \"$LOCAL\" \"$REMOTE\"
+[diff "pdfconv"]
+	textconv = pdftohtml -stdout
+[fetch]
+	negotiationAlgorithm = skipping
+	parallel = 0
+[help]
+	autocorrect = 1
+[index]
+	version = 4
+[interactive]
+	diffFilter = delta --color-only
+[merge]
+	log = true
+[protocol]
+	version = 2
+[pull]
+	rebase = true
+[push]
+	default = current
+	recurseSubmodules = on-demand
+[rebase]
+	autoStash = true
+[rerere]
+	autoUpdate = true
+	enabled = true
+[sequence]
+	editor = interactive-rebase-tool
+[submodule]
+	fetchJobs = 0
+[tag]
+	gpgSign = true
+	sort = -version:refname
+[url "git@gist.github.com:"]
+	insteadOf = gist:
+	pushInsteadOf = https://gist.github.com/
+[url "git@github.com:"]
+	insteadOf = gh:
+	pushInsteadOf = https://github.com/
+[user]
+	email = f.nord@example.com
+	name = Frank Nord
+	signingkey = AAAAAAAAAAAAAAAA
diff --git a/tests/syntax-tests/source/Git Config/LICENSE.md b/tests/syntax-tests/source/Git Config/LICENSE.md
new file mode 100644
index 00000000..4d51ec63
--- /dev/null
+++ b/tests/syntax-tests/source/Git Config/LICENSE.md	
@@ -0,0 +1 @@
+The `test.gitconfig` file has been added from https://github.com/sharkdp/bat/pull/1336#issuecomment-715905807. Its "free to use".
\ No newline at end of file
diff --git a/tests/syntax-tests/source/Git Config/text.gitconfig b/tests/syntax-tests/source/Git Config/text.gitconfig
new file mode 100644
index 00000000..45de0fe5
--- /dev/null
+++ b/tests/syntax-tests/source/Git Config/text.gitconfig	
@@ -0,0 +1,107 @@
+[alias]
+	br = branch
+	branch = branch -a
+	c = clone --recursive
+	ci = commit
+	cl = clone
+	co = checkout
+	contributors = shortlog --summary --numbered
+	lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
+	remote = remote -v
+	st = status
+	tag = tag -l
+[apply]
+	whitespace = fix
+[color]
+	ui = true
+[color "branch"]
+	current = yellow
+	local = yellow
+	remote = green
+[color "diff"]
+	commit = yellow bold
+	frag = magenta bold
+	meta = yellow
+	new = green bold
+	old = red bold
+	whitespace = red reverse
+[color "diff-highlight"]
+	newHighlight = green bold 22
+	newNormal = green bold
+	oldHighlight = red bold 52
+	oldNormal = red bold
+[color "status"]
+	added = green
+	changed = yellow
+	untracked = cyan
+[commit]
+	gpgsign = true
+[core]
+	editor = /usr/bin/vim
+	# global exclude
+	excludesfile = /home/frank/.config/git/ignore
+	pager = delta
+	; broken on old machines
+	untrackedCache = true
+[credential]
+	helper = store
+[delta]
+	features = line-numbers decorations
+	max-line-length = 1024
+	whitespace-error-style = 22 reverse
+[delta "decorations"]
+	commit-decoration-style = bold yellow box ul
+	file-decoration-style = none
+	file-style = bold yellow
+	syntax-theme = gruvbox
+[diff]
+	submodule = diff
+	algorithm = histogram
+	renames = copies
+[difftool]
+	prompt = false
+[difftool "wrapper"]
+	binary = true
+	cmd = git-difftool-wrapper \"$LOCAL\" \"$REMOTE\"
+[diff "pdfconv"]
+	textconv = pdftohtml -stdout
+[fetch]
+	negotiationAlgorithm = skipping
+	parallel = 0
+[help]
+	autocorrect = 1
+[index]
+	version = 4
+[interactive]
+	diffFilter = delta --color-only
+[merge]
+	log = true
+[protocol]
+	version = 2
+[pull]
+	rebase = true
+[push]
+	default = current
+	recurseSubmodules = on-demand
+[rebase]
+	autoStash = true
+[rerere]
+	autoUpdate = true
+	enabled = true
+[sequence]
+	editor = interactive-rebase-tool
+[submodule]
+	fetchJobs = 0
+[tag]
+	gpgSign = true
+	sort = -version:refname
+[url "git@gist.github.com:"]
+	insteadOf = gist:
+	pushInsteadOf = https://gist.github.com/
+[url "git@github.com:"]
+	insteadOf = gh:
+	pushInsteadOf = https://github.com/
+[user]
+	email = f.nord@example.com
+	name = Frank Nord
+	signingkey = AAAAAAAAAAAAAAAA
\ No newline at end of file

From ec8072d51fa943569ebdace5c79d9f8452cf2d8f Mon Sep 17 00:00:00 2001
From: Dobe Peter <dobepeter@gmail.com>
Date: Sun, 25 Oct 2020 02:19:07 +0100
Subject: [PATCH 15/41] Add PowerShell syntax test

Part of the work for issue #1213.

A short PowerShell script and the corresponding syntax-highlighted output
has been added. The script exhibits many of the peculiarities of the
PowerShell syntax.
---
 .../highlighted/PowerShell/test.ps1           |  25 ++++++++++++++++++
 tests/syntax-tests/source/PowerShell/test.ps1 | Bin 0 -> 1430 bytes
 2 files changed, 25 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/PowerShell/test.ps1
 create mode 100755 tests/syntax-tests/source/PowerShell/test.ps1

diff --git a/tests/syntax-tests/highlighted/PowerShell/test.ps1 b/tests/syntax-tests/highlighted/PowerShell/test.ps1
new file mode 100644
index 00000000..915b6072
--- /dev/null
+++ b/tests/syntax-tests/highlighted/PowerShell/test.ps1
@@ -0,0 +1,25 @@
+# PowerShell script for testing syntax highlighting
+
+function Get-FutureTime {
+    param (
+        [Int32] $Minutes
+    )
+    
+    $time = Get-Date | % { $_.AddMinutes($Minutes) }
+    "{0:d2}:{1:d2}:{2:d2}" -f @($time.hour, $time.minute, $time.second)
+}
+
+if ($env:PATH -match '.*rust.*') {
+   'Path contains Rust'
+    try {
+        & "cargo" "--version"
+    } catch {
+        Write-Error "Failed to run cargo"
+    }
+} else {
+   'Path does not contain Rust'
+}
+
+(5..30) | ? { $_ % (2 * 2 + 1) -eq 0 } | % {"In {0} minutes, the time will be {1}." -f $_, $( Get-FutureTime $_ )}
+$later =  Get-FutureTime -Minutes $( Get-Random -Minimum 60 -Maximum 120 )
+"The time will be " + $later + " later."
diff --git a/tests/syntax-tests/source/PowerShell/test.ps1 b/tests/syntax-tests/source/PowerShell/test.ps1
new file mode 100755
index 0000000000000000000000000000000000000000..434414df4059c3b1eac568be7515ce1c43aea629
GIT binary patch
literal 1430
zcmai!U279T6o${W;C~p_XtwGuNs3++L<PTkA(UG1LPRua(?HVH?8aJZ|9bU#&tyy{
z3T2s{kMlY2dC%PZwtE)rz~**g$F{H!cFH{E3)a|>lZl;M%kBi71#^qM;Xko68@tve
ztJc2SPj;uAkNHnmbJDwOcTD5NmS_*%e$Fb`Tl}?F*&8G+W5NCi>lt&fE4K=)^qmuB
z!I-fwGfC3;Wc!}Yt_|!nS{-}unaa2FRt`ybC);gGI-Xz5;2HWU$5+IbpJ2Zj_Ze4=
zj(xG(UfPH+k5>K@e+T{REN+31p6y{fK(fcKpX~;JcLlZ;2nKt>?bkWh;5~Qb9(y*z
zT)Ef$Ri$|MZCQiH5W6!XM<ili!eQc36yq5A4>CC5en<AsGnhFFL!t)j66GN^Svn`Q
z?&2-4TNi8LCjA&uY*A(nCx<KBZiY&W&&w@8scyj@ASv)AHjKH0kSV~XB3H4v!Mko&
zWInIal1<BBx#ZkR-aleL@hVsLn)L!t;(Y-_mGzVeBla!l0g3n={ia+tnG`WqWObD=
z&*N@lGs2@d8t^#B|2A6NSgq?-+7s$f+b&EJ`eNsEMq+2=Y6-&v6$(B-V(z<kMbz)?
zdJJW{=62!TBtJcuZ1SlwF-ld{of78)?}#wc`|)jc+dj6n*C?`A{Sw(&qLq5<|NSrB
zK$h{Y9sI@)R7KR8x7k-)9jR{JjCzPab->);l%%cxS^CLSM@8p)-`3}SFce;~a|(Ln
THXOuJVV>VXCz7o11yX+im<G-w

literal 0
HcmV?d00001


From 6d3cb5f99f347c3c9cec727f936d961851a88650 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armandphilippot.com>
Date: Tue, 20 Oct 2020 16:10:42 +0200
Subject: [PATCH 16/41] Add Coldark themes

---
 .gitmodules           | 3 +++
 assets/themes/Coldark | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 assets/themes/Coldark

diff --git a/.gitmodules b/.gitmodules
index 1d94f27e..09ef55f3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -197,3 +197,6 @@
 [submodule "assets/syntaxes/02_Extra/Apache"]
 	path = assets/syntaxes/02_Extra/Apache
 	url = https://github.com/colinta/ApacheConf.tmLanguage
+[submodule "assets/themes/Coldark"]
+	path = assets/themes/Coldark
+	url = https://github.com/ArmandPhilippot/coldark-bat.git
diff --git a/assets/themes/Coldark b/assets/themes/Coldark
new file mode 160000
index 00000000..b4a1c74d
--- /dev/null
+++ b/assets/themes/Coldark
@@ -0,0 +1 @@
+Subproject commit b4a1c74d8d5bdd136ec530e5905b810272472545

From 2ecebf8ff2fa167efb0dce4e1ff692acde0d4a66 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armandphilippot.com>
Date: Tue, 20 Oct 2020 16:10:57 +0200
Subject: [PATCH 17/41] Add Coldark themes to unit test

---
 tests/assets.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/assets.rs b/tests/assets.rs
index 7ced769c..ff61850b 100644
--- a/tests/assets.rs
+++ b/tests/assets.rs
@@ -12,6 +12,8 @@ fn all_themes_are_present() {
         themes,
         vec![
             "1337",
+            "Coldark-Cold",
+            "Coldark-Dark",
             "DarkNeon",
             "Dracula",
             "GitHub",

From 9dd807344c55751654174f4685ea1b8dc957b3f2 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Sat, 24 Oct 2020 14:45:13 +0200
Subject: [PATCH 18/41] Ignore 'all_themes_are_present' unit test by default

---
 .github/workflows/CICD.yml | 5 +++++
 tests/assets.rs            | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index 5ff77927..19d4e927 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -58,6 +58,11 @@ jobs:
       with:
         command: test
         args: --release
+    - name: Run ignored-by-default unit tests with new syntaxes and themes
+      uses: actions-rs/cargo@v1
+      with:
+        command: test
+        args: --release -- --ignored
     - name: Syntax highlighting regression test
       run: tests/syntax-tests/regression_test.sh
     - name: List of languages
diff --git a/tests/assets.rs b/tests/assets.rs
index ff61850b..55b5399e 100644
--- a/tests/assets.rs
+++ b/tests/assets.rs
@@ -1,7 +1,9 @@
 use bat::assets::HighlightingAssets;
 
 /// This test ensures that we are not accidentally removing themes due to submodule updates.
+/// It is 'ignore'd by default because it requires themes.bin to be up-to-date.
 #[test]
+#[ignore]
 fn all_themes_are_present() {
     let assets = HighlightingAssets::from_binary();
 

From dae66645555580ad37be6b7d0fd9e12a7cbf2433 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armandphilippot.com>
Date: Sat, 24 Oct 2020 16:34:23 +0200
Subject: [PATCH 19/41] Update themes.bin - Coldark themes

---
 assets/themes.bin | Bin 16672 -> 18538 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/themes.bin b/assets/themes.bin
index b8683424475ab698841caa2e2d6f482f502e9c2b..bc291724f69177c7b3d5d281c87bebe06171c02d 100644
GIT binary patch
literal 18538
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
aQ|Cfo(WMCrTCGHc;=w#8=l=txLT{@7Eo27(

literal 16672
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
L2ITxF*K5*LC~a&J


From a707f8172637dcae94667c346e9cdc3bc599312c Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armandphilippot.com>
Date: Sat, 24 Oct 2020 19:21:06 +0200
Subject: [PATCH 20/41] Add Coldark in New Themes

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0971c859..9d3cbc4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
 
 ## New themes
 
+- Coldark, see #1329 (@armandphilippot)
+
 ## `bat` as a library
 
 ## Packaging

From 95954b7c57d117a13c49781e3eae9ddf989468a5 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Sun, 25 Oct 2020 19:09:52 +0100
Subject: [PATCH 21/41] Update CHANGELOG

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d3cbc4e..f67e3bf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,5 @@
 # unreleased
 
-- Add Note to refer to see detailed help with --help (and vice versa with -h). see #1215 (@henil)
-
 ## Features
 
 - Adjust pager configuration to comply with `--wrap=never`, see #1255 (@gahag)
@@ -10,6 +8,8 @@
 
 ## Other
 
+- Add note to refer to see detailed help with `--help` (and vice versa with `-h`), see #1215 (@henil)
+
 ## Syntaxes
 
 - Manpage syntax highlighting has been improved, see #1315 (@keith-hall)

From 0a9744ac95d37b4c1bd7008e08ff5d269432e4aa Mon Sep 17 00:00:00 2001
From: Horki <ivanzvonimirhorvat@gmail.com>
Date: Sun, 25 Oct 2020 19:06:05 +0100
Subject: [PATCH 22/41] add nix highligh

---
 tests/syntax-tests/highlighted/nix/test.nix | 17 +++++++++++++++++
 tests/syntax-tests/source/nix/test.nix      | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/nix/test.nix
 create mode 100644 tests/syntax-tests/source/nix/test.nix

diff --git a/tests/syntax-tests/highlighted/nix/test.nix b/tests/syntax-tests/highlighted/nix/test.nix
new file mode 100644
index 00000000..b210bc63
--- /dev/null
+++ b/tests/syntax-tests/highlighted/nix/test.nix
@@ -0,0 +1,17 @@
+{ nixpkgs ? <nixpkgs>
+, nixpkgs' ? import nixpkgs {}}: with nixpkgs';
+
+# some comment
+stdenv.mkDerivation rec {
+  pname = "test";
+  version = "0.2.3";
+  name = "${pname}-${version}";
+
+  src = ./;
+
+  buildInputs = {
+    gzip
+    bzip2
+    python27
+  };
+}
diff --git a/tests/syntax-tests/source/nix/test.nix b/tests/syntax-tests/source/nix/test.nix
new file mode 100644
index 00000000..e6fed002
--- /dev/null
+++ b/tests/syntax-tests/source/nix/test.nix
@@ -0,0 +1,17 @@
+{ nixpkgs ? <nixpkgs>
+, nixpkgs' ? import nixpkgs {}}: with nixpkgs';
+
+# some comment
+stdenv.mkDerivation rec {
+  pname = "test";
+  version = "0.2.3";
+  name = "${pname}-${version}";
+
+  src = ./;
+
+  buildInputs = {
+    gzip
+    bzip2
+    python27
+  };
+}
\ No newline at end of file

From 8348c1b7468d03b5ccabc38175059873da393847 Mon Sep 17 00:00:00 2001
From: Horki <ivanzvonimirhorvat@gmail.com>
Date: Sun, 25 Oct 2020 19:13:12 +0100
Subject: [PATCH 23/41] 1213: nix; fix buildInputs arr

---
 tests/syntax-tests/highlighted/nix/test.nix | 8 ++++----
 tests/syntax-tests/source/nix/test.nix      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/syntax-tests/highlighted/nix/test.nix b/tests/syntax-tests/highlighted/nix/test.nix
index b210bc63..ebec9ba9 100644
--- a/tests/syntax-tests/highlighted/nix/test.nix
+++ b/tests/syntax-tests/highlighted/nix/test.nix
@@ -9,9 +9,9 @@
 
   src = ./;
 
-  buildInputs = {
+  buildInputs = [
     gzip
-    bzip2
-    python27
-  };
+    bzip2
+    python27
+  ];
 }
diff --git a/tests/syntax-tests/source/nix/test.nix b/tests/syntax-tests/source/nix/test.nix
index e6fed002..dc14537a 100644
--- a/tests/syntax-tests/source/nix/test.nix
+++ b/tests/syntax-tests/source/nix/test.nix
@@ -9,9 +9,9 @@ stdenv.mkDerivation rec {
 
   src = ./;
 
-  buildInputs = {
+  buildInputs = [
     gzip
     bzip2
     python27
-  };
+  ];
 }
\ No newline at end of file

From bf9f6e872d2e93e47d58894b058470f27d5bd981 Mon Sep 17 00:00:00 2001
From: Horki <ivanzvonimirhorvat@gmail.com>
Date: Sun, 25 Oct 2020 19:18:52 +0100
Subject: [PATCH 24/41] 1312: nix; fixed src

---
 tests/syntax-tests/highlighted/nix/test.nix | 2 --
 tests/syntax-tests/source/nix/test.nix      | 2 --
 2 files changed, 4 deletions(-)

diff --git a/tests/syntax-tests/highlighted/nix/test.nix b/tests/syntax-tests/highlighted/nix/test.nix
index ebec9ba9..bf86676a 100644
--- a/tests/syntax-tests/highlighted/nix/test.nix
+++ b/tests/syntax-tests/highlighted/nix/test.nix
@@ -7,8 +7,6 @@
   version = "0.2.3";
   name = "${pname}-${version}";
 
-  src = ./;
-
   buildInputs = [
     gzip
     bzip2
diff --git a/tests/syntax-tests/source/nix/test.nix b/tests/syntax-tests/source/nix/test.nix
index dc14537a..91788996 100644
--- a/tests/syntax-tests/source/nix/test.nix
+++ b/tests/syntax-tests/source/nix/test.nix
@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
   version = "0.2.3";
   name = "${pname}-${version}";
 
-  src = ./;
-
   buildInputs = [
     gzip
     bzip2

From e571cb553b5dcdbb032e84a5d7a404cd35b5b934 Mon Sep 17 00:00:00 2001
From: Horki <ivanzvonimirhorvat@gmail.com>
Date: Sun, 25 Oct 2020 20:48:26 +0100
Subject: [PATCH 25/41] 1213: nix; added trailing new line

---
 tests/syntax-tests/source/nix/test.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/syntax-tests/source/nix/test.nix b/tests/syntax-tests/source/nix/test.nix
index 91788996..fea16963 100644
--- a/tests/syntax-tests/source/nix/test.nix
+++ b/tests/syntax-tests/source/nix/test.nix
@@ -12,4 +12,4 @@ stdenv.mkDerivation rec {
     bzip2
     python27
   ];
-}
\ No newline at end of file
+}

From cc6cf482563327957e09c1792e018d4862b08c5e Mon Sep 17 00:00:00 2001
From: Horki <ivanzvonimirhorvat@gmail.com>
Date: Tue, 27 Oct 2020 16:41:12 +0100
Subject: [PATCH 26/41] 1213: org mode highlight testing

---
 .../syntax-tests/highlighted/orgmode/test.org | 38 +++++++++++++++++++
 tests/syntax-tests/source/orgmode/test.org    | 38 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 tests/syntax-tests/highlighted/orgmode/test.org
 create mode 100644 tests/syntax-tests/source/orgmode/test.org

diff --git a/tests/syntax-tests/highlighted/orgmode/test.org b/tests/syntax-tests/highlighted/orgmode/test.org
new file mode 100644
index 00000000..82a9041f
--- /dev/null
+++ b/tests/syntax-tests/highlighted/orgmode/test.org
@@ -0,0 +1,38 @@
+* This is header
+** sub header
+*** sub sub header
+**** sub sub sub header
+
+* Table representation
+| Name    | Age |
+|---------+-----|
+| Milli   |  23 |
+| Vanilli |  22 |
+
+* Spreadsheets
+| n | n + 2 | n ^ 2 |
+|---+-------+-------|
+| 1 |     3 |     1 |
+| 2 |     4 |     4 |
+| 3 |     5 |     9 |
+#+TBLFM: $2=$1+2::$3=$1*$1
+
+* Source Code
+
+#+BEGIN_SRC rust
+  # recursive fibonacci
+  fn fib(n: u32) -> u32 {
+    match n {
+      0 | 1 => 1,
+      _ => fib(n - 1) + fib(n - 2),
+    }
+  }
+#+END_SRC
+
+* ToDo and Checkboxes Example
+** DONE Write source example
+** TODO Generate highlighted example [1/3]
+   - [X] run update script
+   - [-] get code review
+   - [ ] merge into master
+
diff --git a/tests/syntax-tests/source/orgmode/test.org b/tests/syntax-tests/source/orgmode/test.org
new file mode 100644
index 00000000..2e1c8e63
--- /dev/null
+++ b/tests/syntax-tests/source/orgmode/test.org
@@ -0,0 +1,38 @@
+* This is header
+** sub header
+*** sub sub header
+**** sub sub sub header
+
+* Table representation
+| Name    | Age |
+|---------+-----|
+| Milli   |  23 |
+| Vanilli |  22 |
+
+* Spreadsheets
+| n | n + 2 | n ^ 2 |
+|---+-------+-------|
+| 1 |     3 |     1 |
+| 2 |     4 |     4 |
+| 3 |     5 |     9 |
+#+TBLFM: $2=$1+2::$3=$1*$1
+
+* Source Code
+
+#+BEGIN_SRC rust
+  # recursive fibonacci
+  fn fib(n: u32) -> u32 {
+    match n {
+      0 | 1 => 1,
+      _ => fib(n - 1) + fib(n - 2),
+    }
+  }
+#+END_SRC
+
+* ToDo and Checkboxes Example
+** DONE Write source example
+** TODO Generate highlighted example [1/3]
+   - [X] run update script
+   - [-] get code review
+   - [ ] merge into master
+

From 88eba5660746e3caba334402398a66d340321ee6 Mon Sep 17 00:00:00 2001
From: Jesse Vermeulen <43927190+JesseVermeulen123@users.noreply.github.com>
Date: Tue, 27 Oct 2020 17:40:40 +0100
Subject: [PATCH 27/41] Add git diff example to Integration docs

Part of https://github.com/sharkdp/bat/issues/448

Thanks to https://github.com/sharkdp/bat/pull/940
---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b2f7e74f..ed33b2ea 100644
--- a/README.md
+++ b/README.md
@@ -131,7 +131,13 @@ highlighting:
 git show v0.6.0:src/main.rs | bat -l rs
 ```
 
-Note that syntax highlighting within diffs is currently not supported. If you are looking for this, check out [`delta`](https://github.com/dandavison/delta).
+#### `git diff`
+
+You can combine `bat` with `git diff` to view lines around code changes with proper syntax
+highlighting:
+```bash
+git diff --name-only --diff-filter=d | xargs bat --diff
+```
 
 #### `xclip`
 

From 85594956cfd0874849e08bf45320c98acb4adb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jess=C3=A9=20Vermeulen?=
 <43927190+JesseVermeulen123@users.noreply.github.com>
Date: Thu, 29 Oct 2020 17:40:17 +0100
Subject: [PATCH 28/41] Bring back delta to me to me

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ed33b2ea..617f6842 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,8 @@ highlighting:
 git diff --name-only --diff-filter=d | xargs bat --diff
 ```
 
+If you are looking for more support for git and diff operations, check out [`delta`](https://github.com/dandavison/delta).
+
 #### `xclip`
 
 The line numbers and Git modification markers in the output of `bat` can make it hard to copy

From 072fb380d82df11e167d34b6a37dfe9fe1a2fb19 Mon Sep 17 00:00:00 2001
From: Kyle Hubert <kjmph@users.noreply.github.com>
Date: Thu, 29 Oct 2020 14:33:09 -0400
Subject: [PATCH 29/41] Add Svelte as a syntax

---
 .gitmodules                                   |  3 +
 CHANGELOG.md                                  |  1 +
 assets/syntaxes/02_Extra/Svelte               |  1 +
 .../highlighted/Svelte/App.svelte             | 57 +++++++++++++++++++
 tests/syntax-tests/source/Svelte/App.svelte   | 57 +++++++++++++++++++
 tests/syntax-tests/source/Svelte/LICENSE      | 14 +++++
 6 files changed, 133 insertions(+)
 create mode 160000 assets/syntaxes/02_Extra/Svelte
 create mode 100644 tests/syntax-tests/highlighted/Svelte/App.svelte
 create mode 100644 tests/syntax-tests/source/Svelte/App.svelte
 create mode 100644 tests/syntax-tests/source/Svelte/LICENSE

diff --git a/.gitmodules b/.gitmodules
index 09ef55f3..e25256f1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -197,6 +197,9 @@
 [submodule "assets/syntaxes/02_Extra/Apache"]
 	path = assets/syntaxes/02_Extra/Apache
 	url = https://github.com/colinta/ApacheConf.tmLanguage
+[submodule "assets/syntaxes/02_Extra/Svelte"]
+	path = assets/syntaxes/02_Extra/Svelte
+	url = https://github.com/corneliusio/svelte-sublime
 [submodule "assets/themes/Coldark"]
 	path = assets/themes/Coldark
 	url = https://github.com/ArmandPhilippot/coldark-bat.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f67e3bf8..f374dd3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 ## Syntaxes
 
 - Manpage syntax highlighting has been improved, see #1315 (@keith-hall)
+- Add Svelte file syntax, see #1285 (@kjmph)
 
 ## New themes
 
diff --git a/assets/syntaxes/02_Extra/Svelte b/assets/syntaxes/02_Extra/Svelte
new file mode 160000
index 00000000..bf92f5b7
--- /dev/null
+++ b/assets/syntaxes/02_Extra/Svelte
@@ -0,0 +1 @@
+Subproject commit bf92f5b7b69c8ea641d6822fd6d12cc2d9341956
diff --git a/tests/syntax-tests/highlighted/Svelte/App.svelte b/tests/syntax-tests/highlighted/Svelte/App.svelte
new file mode 100644
index 00000000..aff961d5
--- /dev/null
+++ b/tests/syntax-tests/highlighted/Svelte/App.svelte
@@ -0,0 +1,57 @@
+<script>
+	import { onMount } from 'svelte';
+	import List from './List.svelte';
+	import Item from './Item.svelte';
+
+	let item;
+	let page;
+
+	async function hashchange() {
+		// the poor man's router!
+		const path = window.location.hash.slice(1);
+
+		if (path.startsWith('/item')) {
+			const id = path.slice(6);
+			item = await fetch(`https://node-hnapi.herokuapp.com/item/${id}`).then(r => r.json());
+
+			window.scrollTo(0,0);
+		} else if (path.startsWith('/top')) {
+			page = +path.slice(5);
+			item = null;
+		} else {
+			window.location.hash = '/top/1';
+		}
+	}
+
+	onMount(hashchange);
+</script>
+
+<style>
+	main {
+		position: relative;
+		max-width: 800px;
+		margin: 0 auto;
+		min-height: 101vh;
+		padding: 1em;
+	}
+
+	main :global(.meta) {
+		color: #999;
+		font-size: 12px;
+		margin: 0 0 1em 0;
+	}
+
+	main :global(a) {
+		color: rgb(0,0,150);
+	}
+</style>
+
+<svelte:window on:hashchange={hashchange}/>
+
+<main>
+	{#if item}
+		<Item {item} returnTo="#/top/{page}"/>
+	{:else if page}
+		<List {page}/>
+	{/if}
+</main>
diff --git a/tests/syntax-tests/source/Svelte/App.svelte b/tests/syntax-tests/source/Svelte/App.svelte
new file mode 100644
index 00000000..0ede0a00
--- /dev/null
+++ b/tests/syntax-tests/source/Svelte/App.svelte
@@ -0,0 +1,57 @@
+<script>
+	import { onMount } from 'svelte';
+	import List from './List.svelte';
+	import Item from './Item.svelte';
+
+	let item;
+	let page;
+
+	async function hashchange() {
+		// the poor man's router!
+		const path = window.location.hash.slice(1);
+
+		if (path.startsWith('/item')) {
+			const id = path.slice(6);
+			item = await fetch(`https://node-hnapi.herokuapp.com/item/${id}`).then(r => r.json());
+
+			window.scrollTo(0,0);
+		} else if (path.startsWith('/top')) {
+			page = +path.slice(5);
+			item = null;
+		} else {
+			window.location.hash = '/top/1';
+		}
+	}
+
+	onMount(hashchange);
+</script>
+
+<style>
+	main {
+		position: relative;
+		max-width: 800px;
+		margin: 0 auto;
+		min-height: 101vh;
+		padding: 1em;
+	}
+
+	main :global(.meta) {
+		color: #999;
+		font-size: 12px;
+		margin: 0 0 1em 0;
+	}
+
+	main :global(a) {
+		color: rgb(0,0,150);
+	}
+</style>
+
+<svelte:window on:hashchange={hashchange}/>
+
+<main>
+	{#if item}
+		<Item {item} returnTo="#/top/{page}"/>
+	{:else if page}
+		<List {page}/>
+	{/if}
+</main>
diff --git a/tests/syntax-tests/source/Svelte/LICENSE b/tests/syntax-tests/source/Svelte/LICENSE
new file mode 100644
index 00000000..91bf34d4
--- /dev/null
+++ b/tests/syntax-tests/source/Svelte/LICENSE
@@ -0,0 +1,14 @@
+The `App.svelte` file has been added from:
+
+https://github.com/sveltejs/svelte/blob/master/site/content/examples/21-miscellaneous/01-hacker-news/App.svelte
+
+Under the following license:
+
+
+Copyright (c) 2016-20 [these people](https://github.com/sveltejs/svelte/graphs/contributors)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

From 9837948c3a7d59b0629ed5f176cd2861eb340af0 Mon Sep 17 00:00:00 2001
From: Adrian Rivera <adrian.rivera.dev@gmail.com>
Date: Sun, 25 Oct 2020 02:13:57 -0700
Subject: [PATCH 30/41] Throws an error when `bat` is being user as pager.

As mentioned on #1334 `bat` should not be used as a value for `pager`,
this change checks both the balue of `bat` provided as a parameter or
as an environment variable.
---
 src/error.rs               |  4 ++++
 src/output.rs              |  4 ++--
 tests/integration_tests.rs | 10 ++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index 2e73b85b..3e5b3711 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -20,6 +20,10 @@ error_chain! {
             description("unknown syntax"),
             display("unknown syntax: '{}'", name)
         }
+        InvalidPagerValueBat {
+            description("invalid value `bat` for pager property"),
+            display("Use of bat as a pager is disallowed in order to avoid infinite recursion problems")
+        }
     }
 }
 
diff --git a/src/output.rs b/src/output.rs
index b0d5974e..689371b9 100644
--- a/src/output.rs
+++ b/src/output.rs
@@ -85,10 +85,10 @@ impl OutputType {
 
         match pagerflags.split_first() {
             Some((pager_name, args)) => {
-                let mut pager_path = PathBuf::from(pager_name);
+                let pager_path = PathBuf::from(pager_name);
 
                 if pager_path.file_stem() == Some(&OsString::from("bat")) {
-                    pager_path = PathBuf::from("less");
+                    return Err(ErrorKind::InvalidPagerValueBat.into());
                 }
 
                 let is_less = pager_path.file_stem() == Some(&OsString::from("less"));
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index da0690ef..09ac8498 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -405,6 +405,16 @@ fn pager_disable() {
         .stdout(predicate::eq("hello world\n").normalize());
 }
 
+#[test]
+fn pager_value_bat() {
+    bat()
+        .arg("--pager=bat")
+        .arg("--paging=always")
+        .arg("test.txt")
+        .assert()
+        .failure();
+}
+
 #[test]
 fn alias_pager_disable() {
     bat()

From c747ac181d1843c30891f14bafbbd0e27478e0c2 Mon Sep 17 00:00:00 2001
From: Adrian Rivera <adrian.rivera.dev@gmail.com>
Date: Mon, 26 Oct 2020 21:12:19 -0700
Subject: [PATCH 31/41] Updates CHANGELOG entry

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f374dd3a..dafe5a57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
 
 ## Bugfixes
 
+- Throws an error when `bat` is being used as `pager`, see #1343 (@adrian-rivera)
+
 ## Other
 
 - Add note to refer to see detailed help with `--help` (and vice versa with `-h`), see #1215 (@henil)

From dade4cc6f36075e6a9872220cb640be049382e6c Mon Sep 17 00:00:00 2001
From: David Peter <sharkdp@users.noreply.github.com>
Date: Thu, 29 Oct 2020 19:37:12 +0100
Subject: [PATCH 32/41] Add reference to batdiff

---
 README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 617f6842..ba34eea6 100644
--- a/README.md
+++ b/README.md
@@ -136,8 +136,11 @@ git show v0.6.0:src/main.rs | bat -l rs
 You can combine `bat` with `git diff` to view lines around code changes with proper syntax
 highlighting:
 ```bash
-git diff --name-only --diff-filter=d | xargs bat --diff
+batdiff() {
+    git diff --name-only --diff-filter=d | xargs bat --diff
+}
 ```
+If you prefer to use this as a separate tool, check out `batdiff` in [`bat-extras`](https://github.com/eth-p/bat-extras).
 
 If you are looking for more support for git and diff operations, check out [`delta`](https://github.com/dandavison/delta).
 

From 49d7bf8c3908262115e15830111bd6ae511b9e84 Mon Sep 17 00:00:00 2001
From: Adrian Rivera <adrian.rivera.dev@gmail.com>
Date: Mon, 26 Oct 2020 20:48:52 -0700
Subject: [PATCH 33/41] From a TODO in #1211. Add documentation for
 contributors.

This changes the README file and adds a new section `Contributors`.
This section includes instructions to remind contributors to make an
update to the changelog.
---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index ba34eea6..9357a30c 100644
--- a/README.md
+++ b/README.md
@@ -676,6 +676,22 @@ bash assets/create.sh
 cargo install --path . --locked --force
 ```
 
+## Contributors
+
+Please don't forget to update `CHANGELOG.md` and describe your changes, this makes the release of a new `bat` version much easier.
+
+Each entry should follow the next format:
+- Short description of the change (one line)
+- Number of the pull request
+- Github's username
+
+See the next examples taken from `CHANGELOG.md`
+```
+- Added support for the `NO_COLOR` environment variable, see #1021 and #1031 (@eth-p)
+- Adjust pager configuration to comply with `--wrap=never`, see #1255 (@gahag)
+- Fixed non-printable characters display for redirected output, see #1061 (@gsomix)
+```
+
 ## Maintainers
 
 - [sharkdp](https://github.com/sharkdp)

From 456216ab379c69947240f4f644bc9801614094d8 Mon Sep 17 00:00:00 2001
From: Adrian Rivera <adrian.rivera.dev@gmail.com>
Date: Mon, 26 Oct 2020 20:59:52 -0700
Subject: [PATCH 34/41] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dafe5a57..478324c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # unreleased
 
+
 ## Features
 
 - Adjust pager configuration to comply with `--wrap=never`, see #1255 (@gahag)
@@ -11,6 +12,7 @@
 ## Other
 
 - Add note to refer to see detailed help with `--help` (and vice versa with `-h`), see #1215 (@henil)
+- Add a `Contributors` section to `README`, see #1348 (@adrian-rivera)
 
 ## Syntaxes
 

From 1c1ba04c41376a823167a56f888d04f9f4145c54 Mon Sep 17 00:00:00 2001
From: Adrian Rivera <adrian.rivera.dev@gmail.com>
Date: Tue, 27 Oct 2020 21:35:35 -0700
Subject: [PATCH 35/41] Adds a CONTRIBUTORS file

---
 CONTRIBUTORS.md | 11 +++++++++++
 README.md       | 14 +-------------
 2 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 CONTRIBUTORS.md

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 00000000..7690f7d2
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,11 @@
+# Contributors
+
+## Add an entry to the changelog
+
+Please don't forget to update [CHANGELOG.md](CHANGELOG.md) and describe your changes (in the "unreleased" section), this makes the release of a new `bat` version much easier.
+
+Each entry should follow the following format:
+- Short description of what has been changed, see #123 (@user)
+
+Where #123 links to the PR and @user is you Github's username. 
+
diff --git a/README.md b/README.md
index 9357a30c..6f2a2b67 100644
--- a/README.md
+++ b/README.md
@@ -678,19 +678,7 @@ cargo install --path . --locked --force
 
 ## Contributors
 
-Please don't forget to update `CHANGELOG.md` and describe your changes, this makes the release of a new `bat` version much easier.
-
-Each entry should follow the next format:
-- Short description of the change (one line)
-- Number of the pull request
-- Github's username
-
-See the next examples taken from `CHANGELOG.md`
-```
-- Added support for the `NO_COLOR` environment variable, see #1021 and #1031 (@eth-p)
-- Adjust pager configuration to comply with `--wrap=never`, see #1255 (@gahag)
-- Fixed non-printable characters display for redirected output, see #1061 (@gsomix)
-```
+Take a look to this [guide](CONTRIBUTORS.md)
 
 ## Maintainers
 

From 47ea99090f3d817d4a677195b7d2dcb86e7e831e Mon Sep 17 00:00:00 2001
From: Adrian Rivera <adrian.rivera.dev@gmail.com>
Date: Tue, 27 Oct 2020 21:39:54 -0700
Subject: [PATCH 36/41] Style changes on CONTRIBUTORS

---
 CONTRIBUTORS.md => CONTRIBUTING.md | 8 +++++---
 README.md                          | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename CONTRIBUTORS.md => CONTRIBUTING.md (67%)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTING.md
similarity index 67%
rename from CONTRIBUTORS.md
rename to CONTRIBUTING.md
index 7690f7d2..ccaf528a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTING.md
@@ -1,11 +1,13 @@
-# Contributors
+# Contributing
 
-## Add an entry to the changelog
+### Add an entry to the changelog
 
 Please don't forget to update [CHANGELOG.md](CHANGELOG.md) and describe your changes (in the "unreleased" section), this makes the release of a new `bat` version much easier.
 
 Each entry should follow the following format:
+```
 - Short description of what has been changed, see #123 (@user)
+```
 
-Where #123 links to the PR and @user is you Github's username. 
+Where `#123` is your PR's number or ticket and `@user` is you Github's username. 
 
diff --git a/README.md b/README.md
index 6f2a2b67..6b5e01ed 100644
--- a/README.md
+++ b/README.md
@@ -676,9 +676,9 @@ bash assets/create.sh
 cargo install --path . --locked --force
 ```
 
-## Contributors
+## Contributing
 
-Take a look to this [guide](CONTRIBUTORS.md)
+Take a look to this [guide](CONTRIBUTING.md)
 
 ## Maintainers
 

From 2889e017cd05c02628ed47f253d210de832942cc Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Thu, 29 Oct 2020 19:46:36 +0100
Subject: [PATCH 37/41] More detailed description for CHANGELOG section

---
 CONTRIBUTING.md | 22 ++++++++++++++++------
 README.md       |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ccaf528a..8e943eb0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,13 +1,23 @@
 # Contributing
 
-### Add an entry to the changelog
+Thank you for considering to contribute to `bat`!
 
-Please don't forget to update [CHANGELOG.md](CHANGELOG.md) and describe your changes (in the "unreleased" section), this makes the release of a new `bat` version much easier.
 
-Each entry should follow the following format:
+
+## Add an entry to the changelog
+
+If your contribution changes the behavior of `bat` (as opposed to a typo-fix
+in the documentation), please update the [`CHANGELOG.md`](CHANGELOG.md) file
+and describe your changes. This makes the release proess much easier and
+therefore helps to get your changes into a new `bat` release faster.
+
+The top of the `CHANGELOG` contains a *"unreleased"* section with a few
+subsections (Features, Bugfixes, …). Please add your entry to the subsection
+that best describes your change
+
+Entries follow this format:
 ```
 - Short description of what has been changed, see #123 (@user)
 ```
-
-Where `#123` is your PR's number or ticket and `@user` is you Github's username. 
-
+Here, `#123` is the number of the original issue and/or your pull request.
+Please replace `@user` by your GitHub username.
diff --git a/README.md b/README.md
index 6b5e01ed..f04e6a1c 100644
--- a/README.md
+++ b/README.md
@@ -678,7 +678,7 @@ cargo install --path . --locked --force
 
 ## Contributing
 
-Take a look to this [guide](CONTRIBUTING.md)
+Take a look at the [`CONTRIBUTING.md`](CONTRIBUTING.md) guide.
 
 ## Maintainers
 

From c15b88f250a1a47f2042fab040970ebdec23b286 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Thu, 29 Oct 2020 19:51:16 +0100
Subject: [PATCH 38/41] Add new section on Development and New syntaxes/themes

---
 CONTRIBUTING.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8e943eb0..f0e35a2c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,3 +21,21 @@ Entries follow this format:
 ```
 Here, `#123` is the number of the original issue and/or your pull request.
 Please replace `@user` by your GitHub username.
+
+
+## Development
+
+Please check out the [Development](https://github.com/sharkdp/bat#development)
+section in the README.
+
+
+## Adding new syntaxes/languages or themes
+
+Before you make a pull request that adds a new syntax or theme, please read
+the [Customization](https://github.com/sharkdp/bat#customization) section
+in the README first.
+
+If you really think that a particular syntax or theme should be added for all
+users, please read the corresponding
+[documentation](https://github.com/sharkdp/bat/blob/master/doc/assets.md)
+first.

From 877d9120c90743d9f837e45bf89cf5f2ee50fb11 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Thu, 29 Oct 2020 19:52:55 +0100
Subject: [PATCH 39/41] Add a new 'Feature request' section

---
 CONTRIBUTING.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f0e35a2c..dca1d0f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,6 +29,13 @@ Please check out the [Development](https://github.com/sharkdp/bat#development)
 section in the README.
 
 
+## Adding a new feature
+
+Please consider opening a
+[feature request ticket](https://github.com/sharkdp/bat/issues/new?assignees=&labels=feature-request&template=feature_request.md)
+first in order to give us a chance to discuss the feature first.
+
+
 ## Adding new syntaxes/languages or themes
 
 Before you make a pull request that adds a new syntax or theme, please read

From 3acfe790b94bac518d19cb75540ba56a83976d36 Mon Sep 17 00:00:00 2001
From: Nicholas L <nicholas-l@users.noreply.github.com>
Date: Thu, 29 Oct 2020 21:40:32 +0000
Subject: [PATCH 40/41] Add extra themes help to output

---
 src/bin/bat/main.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

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

From 8e8131590ca9922c996c33ad7a5076f57a619e42 Mon Sep 17 00:00:00 2001
From: Nicholas L <nicholas-l@users.noreply.github.com>
Date: Thu, 29 Oct 2020 21:51:32 +0000
Subject: [PATCH 41/41] Use platform based path concatenation

---
 src/bin/bat/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs
index 0be0de7e..eb6f75bc 100644
--- a/src/bin/bat/main.rs
+++ b/src/bin/bat/main.rs
@@ -207,11 +207,11 @@ pub fn list_themes(cfg: &Config) -> Result<()> {
     }
     writeln!(
         stdout,
-        "Further themes can be installed to '{}/themes', \
+        "Further themes can be installed to '{}', \
         and are added to the cache with `bat cache --build`. \
         For more information, see:\n\n  \
         https://github.com/sharkdp/bat#adding-new-themes",
-        config_file().to_string_lossy()
+        config_file().join("themes").to_string_lossy()
     )?;
 
     Ok(())