diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/.clang-format contour-0.3.0~develop-2021-12-14-17-23-b4392579/.clang-format
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/.clang-format	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/.clang-format	2021-12-14 17:23:29.000000000 +0000
@@ -83,11 +83,17 @@
     Priority:  6
   - Regex:     '^<(yaml-cpp)/'
     Priority:  7
-  - Regex:     '^(<|"(QtCore|QtGui|QtWidgets)/)'
+  - Regex:     '^<(range)/'
     Priority:  8
+  - Regex:     '^<fontconfig/'
+    Priority:  9
+  - Regex:     '^<harfbuzz/'
+    Priority:  10
+  - Regex:     '^(<|"(QtCore|QtGui|QtWidgets)/)'
+    Priority:  11
   - Regex:     '^(<|"(gtest|gmock|range|gsl|json)/)'
-    Priority:  8
+    Priority:  12
   - Regex:     '<[[:alnum:].]+>'
-    Priority:  9
+    Priority:  13
   - Regex:     '.*'
-    Priority:  10
+    Priority:  14
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/debian/changelog contour-0.3.0~develop-2021-12-14-17-23-b4392579/debian/changelog
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/debian/changelog	2021-12-14 15:28:43.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/debian/changelog	2021-12-14 17:24:25.000000000 +0000
@@ -1,8 +1,8 @@
-contour (1:0.3.0~develop-2021-12-14-13-49-b7e29f68-0ubuntu1~focal) focal; urgency=medium
+contour (1:0.3.0~develop-2021-12-14-17-23-b4392579-0ubuntu1~focal) focal; urgency=medium
 
-  * git build of b7e29f68
+  * git build of b4392579
 
- -- Christian Parpart <christian@parpart.family>  Tue, 14 Dec 2021 15:28:43 +0000
+ -- Christian Parpart <christian@parpart.family>  Tue, 14 Dec 2021 17:24:25 +0000
 
 contour (0.0.0-1) focal; urgency=low
 
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/contour/opengl/OpenGLRenderer.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/contour/opengl/OpenGLRenderer.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/contour/opengl/OpenGLRenderer.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/contour/opengl/OpenGLRenderer.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -20,9 +20,10 @@
 #include <crispy/algorithm.h>
 #include <crispy/utils.h>
 
+#include <range/v3/all.hpp>
+
 #include <algorithm>
 #include <array>
-#include <range/v3/all.hpp>
 #include <utility>
 #include <vector>
 
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/contour/opengl/TerminalWidget.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/contour/opengl/TerminalWidget.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/contour/opengl/TerminalWidget.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/contour/opengl/TerminalWidget.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -47,9 +47,10 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
+#include <range/v3/all.hpp>
+
 #include <algorithm>
 #include <cstring>
-#include <range/v3/all.hpp>
 // #include <execution>
 #include <fstream>
 #include <stdexcept>
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/contour/TerminalSession.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/contour/TerminalSession.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/contour/TerminalSession.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/contour/TerminalSession.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -21,6 +21,8 @@
 
 #include <crispy/StackTrace.h>
 
+#include <range/v3/all.hpp>
+
 #include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
 #include <QtCore/QMetaObject>
@@ -37,7 +39,6 @@
 #include <QtWidgets/QMessageBox>
 #include <algorithm>
 #include <fstream>
-#include <range/v3/all.hpp>
 
 #if defined(CONTOUR_BLUR_PLATFORM_KWIN)
     #include <KWindowEffects>
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/crispy/CLI.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/crispy/CLI.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/crispy/CLI.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/crispy/CLI.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -15,10 +15,11 @@
 
 #include <crispy/times.h>
 
+#include <range/v3/view/iota.hpp>
+
 #include <algorithm>
 #include <cassert>
 #include <deque>
-#include <range/v3/view/iota.hpp>
 #include <sstream>
 
 #if 0 // !defined(NDEBUG)
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Capabilities.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Capabilities.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Capabilities.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Capabilities.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -20,6 +20,7 @@
 #include <range/v3/algorithm/copy.hpp>
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/transform.hpp>
+
 #include <sstream>
 
 using std::nullopt;
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Grid.h contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Grid.h
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Grid.h	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Grid.h	2021-12-14 17:23:29.000000000 +0000
@@ -23,13 +23,14 @@
 
 #include <unicode/convert.h>
 
+#include <range/v3/algorithm/copy.hpp>
+#include <range/v3/iterator/insert_iterators.hpp>
+#include <range/v3/view/iota.hpp>
+
 #include <algorithm>
 #include <array>
 #include <gsl/span>
 #include <gsl/span_ext>
-#include <range/v3/algorithm/copy.hpp>
-#include <range/v3/iterator/insert_iterators.hpp>
-#include <range/v3/view/iota.hpp>
 #include <sstream>
 #include <string>
 #include <string_view>
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Screen.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Screen.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Screen.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Screen.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -29,11 +29,12 @@
 #include <unicode/utf8.h>
 #include <unicode/word_segmenter.h>
 
+#include <range/v3/view/iota.hpp>
+
 #include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <iterator>
-#include <range/v3/view/iota.hpp>
 #include <sstream>
 #include <string_view>
 #include <tuple>
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Screen_test.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Screen_test.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal/Screen_test.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal/Screen_test.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -17,8 +17,9 @@
 
 #include <crispy/escape.h>
 
-#include <catch2/catch_all.hpp>
 #include <range/v3/view/iota.hpp>
+
+#include <catch2/catch_all.hpp>
 #include <string_view>
 
 using crispy::escape;
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal_renderer/BoxDrawingRenderer.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal_renderer/BoxDrawingRenderer.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal_renderer/BoxDrawingRenderer.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal_renderer/BoxDrawingRenderer.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -19,11 +19,12 @@
 
 #include <fmt/format.h>
 
-#include <array>
 #include <range/v3/view/filter.hpp>
 #include <range/v3/view/iota.hpp>
 #include <range/v3/view/zip.hpp>
 
+#include <array>
+
 using namespace std;
 
 using crispy::Point;
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal_renderer/Pixmap.h contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal_renderer/Pixmap.h
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal_renderer/Pixmap.h	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal_renderer/Pixmap.h	2021-12-14 17:23:29.000000000 +0000
@@ -19,9 +19,10 @@
 
 #include <fmt/format.h>
 
+#include <range/v3/view/iota.hpp>
+
 #include <algorithm>
 #include <functional>
-#include <range/v3/view/iota.hpp>
 
 namespace terminal::renderer
 {
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal_renderer/utils.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal_renderer/utils.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/terminal_renderer/utils.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/terminal_renderer/utils.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -13,9 +13,10 @@
  */
 #include <terminal_renderer/utils.h>
 
+#include <range/v3/view/iota.hpp>
+
 #include <algorithm> // max?
 #include <cassert>
-#include <range/v3/view/iota.hpp>
 
 namespace terminal::renderer
 {
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/directwrite_locator.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/directwrite_locator.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/directwrite_locator.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/directwrite_locator.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -16,6 +16,7 @@
 #include <text_shaper/font.h>
 
 #include <range/v3/view/iota.hpp>
+
 #include <string_view>
 
 // {{{ TODO: replace with libunicode
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/fontconfig_locator.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/fontconfig_locator.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/fontconfig_locator.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/fontconfig_locator.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -14,8 +14,10 @@
 #include <text_shaper/font.h>
 #include <text_shaper/fontconfig_locator.h>
 
-#include <fontconfig/fontconfig.h>
 #include <range/v3/view/iota.hpp>
+
+#include <fontconfig/fontconfig.h>
+
 #include <string_view>
 
 using std::nullopt;
@@ -30,7 +32,7 @@
 namespace text
 {
 
-namespace // {{{ support
+namespace
 {
 
     constexpr string_view fcSpacingStr(int _value) noexcept
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/open_shaper.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/open_shaper.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/open_shaper.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/open_shaper.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -11,28 +11,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// clang-format off
-#include <text_shaper/open_shaper.h>
 #include <text_shaper/font.h>
 #include <text_shaper/font_locator.h>
+#include <text_shaper/open_shaper.h>
 
-#include <crispy/assert.h>
 #include <crispy/algorithm.h>
-#include <crispy/times.h>
+#include <crispy/assert.h>
 #include <crispy/indexed.h>
+#include <crispy/times.h>
 
-#include <range/v3/view/iota.hpp>
 #include <range/v3/algorithm/any_of.hpp>
+#include <range/v3/view/iota.hpp>
 
+// clang-format off
 #include <ft2build.h>
 #include FT_BITMAP_H
 #include FT_ERRORS_H
 #include FT_FREETYPE_H
 #include FT_LCD_FILTER_H
+// clang-format on
 
 #include <fontconfig/fontconfig.h>
-#include <harfbuzz/hb.h>
+
 #include <harfbuzz/hb-ft.h>
+#include <harfbuzz/hb.h>
 
 #include <algorithm>
 #include <cmath>
@@ -40,7 +42,6 @@
 #include <tuple>
 #include <unordered_map>
 #include <utility>
-// clang-format on
 
 using ranges::views::iota;
 using std::get;
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/shaper.cpp contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/shaper.cpp
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/src/text_shaper/shaper.cpp	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/src/text_shaper/shaper.cpp	2021-12-14 17:23:29.000000000 +0000
@@ -17,6 +17,7 @@
 #include <crispy/logstore.h>
 
 #include <range/v3/view/iota.hpp>
+
 #include <utility>
 #include <vector>
 
diff -Nru contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/version.txt contour-0.3.0~develop-2021-12-14-17-23-b4392579/version.txt
--- contour-0.3.0~develop-2021-12-14-13-49-b7e29f68/version.txt	2021-12-14 15:27:39.000000000 +0000
+++ contour-0.3.0~develop-2021-12-14-17-23-b4392579/version.txt	2021-12-14 17:23:29.000000000 +0000
@@ -1 +1 @@
-0.3.0-unreleased-master-b7e29f6
\ No newline at end of file
+0.3.0-unreleased-master-b439257
\ No newline at end of file