All of my changes rebased on dev

.gitignore

@@ -372,3 +372,5 @@ tutorial/*.bbl
 tutorial/*.blg
 *.o.d
 compile_commands.json
+
+qrc_resources.cpp

README.md

@@ -27,7 +27,7 @@ Distro | Link | Maintainer
 Flathub | [sioyek](https://flathub.org/apps/details/com.github.ahrm.sioyek) | [@nbenitez](https://flathub.org/apps/details/com.github.ahrm.sioyek)
 Alpine | [sioyek](https://pkgs.alpinelinux.org/packages?name=sioyek) | [@jirutka](https://github.com/jirutka)
 Arch | [AUR sioyek](https://aur.archlinux.org/packages/sioyek) | [@goggle](https://github.com/goggle)
-Arch | [AUR Sioyek-git](https://aur.archlinux.org/packages/sioyek-git/) | [@randomn4me](https://github.com/randomn4me)
+Arch | [AUR sioyek-git](https://aur.archlinux.org/packages/sioyek-git/) | [@hrdl-github](https://github.com/hrdl-github)
 Arch | [AUR sioyek-appimage](https://aur.archlinux.org/packages/sioyek-appimage/) | [@DhruvaSambrani](https://github.com/DhruvaSambrani)
 Debian | [sioyek](https://packages.debian.org/sioyek) | [@viccie30](https://github.com/viccie30)
 NixOS | [sioyek](https://search.nixos.org/packages?channel=unstable&show=sioyek&from=0&size=50&sort=relevance&type=packages&query=sioyek) | [@podocarp](https://github.com/podocarp)
@@ -151,13 +151,27 @@ build_windows.bat
 ```
 
 ### Mac
-1. Install Xcode and Qt 5.
-2. Clone the repository and build:
-```
+1. Install Xcode.
+2. Clone the repository and build: (The code below is in Zsh, which is the default shell on macOS.)
+```zsh
+(
+setopt PIPE_FAIL PRINT_EXIT_VALUE ERR_RETURN SOURCE_TRACE XTRACE
+
 git clone --recursive https://github.com/ahrm/sioyek
 cd sioyek
 chmod +x build_mac.sh
-./build_mac.sh
+
+brew install 'qt@5' freeglut mesa harfbuzz
+
+export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"
+#: The above is needed to make =qmake= from =qt= be found.
+#: Find the path using =brew info 'qt@5'=.
+
+MAKE_PARALLEL=8 ./build_mac.sh
+
+mv build/sioyek.app /Applications/
+sudo codesign --force --sign - --deep /Applications/sioyek.app
+)
 ```
 
 ## Donation

build_mac.sh

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
-set -e
-# prerequisite: brew install qt@5 freeglut mesa harfbuzz
+set -exo pipefail
+
+# prerequisite: brew install qt qt@5 freeglut mesa harfbuzz hiredis
+export INCLUDE_PATH=/opt/homebrew/include
+export LIBRARY_PATH=/opt/homebrew/lib
+
+incremental_p="${SIOYEK_BUILD_INCREMENTAL_P}"
+# Using `SIOYEK_BUILD_INCREMENTAL_P=y` will cause the build script to become optimized for the local development builds and not publishing the app.
 
 #sys_glut_clfags=`pkg-config --cflags glut gl`
 #sys_glut_libs=`pkg-config --libs glut gl`
@@ -12,15 +18,20 @@ echo "MAKE_PARALLEL set to $MAKE_PARALLEL"
 
 cd mupdf
 #make USE_SYSTEM_HARFBUZZ=yes USE_SYSTEM_GLUT=yes SYS_GLUT_CFLAGS="${sys_glut_clfags}" SYS_GLUT_LIBS="${sys_glut_libs}" SYS_HARFBUZZ_CFLAGS="${sys_harfbuzz_clfags}" SYS_HARFBUZZ_LIBS="${sys_harfbuzz_libs}" -j 4
-make
+make XLIBS="-L${LIBRARY_PATH}"
 cd ..
 
+qmake_opts=()
+if test -n "${SIOYEK_NIGHT_P}" ; then
+    qmake_opts+=("DEFINES+=NIGHT_P")
+fi
+
 if [[ $1 == portable ]]; then
-	qmake pdf_viewer_build_config.pro
-else
-	qmake "CONFIG+=non_portable" pdf_viewer_build_config.pro
+    qmake_opts+=("CONFIG+=non_portable")
 fi
 
+qmake "${qmake_opts[@]}" pdf_viewer_build_config.pro
+
 make -j$MAKE_PARALLEL
 
 rm -rf build 2> /dev/null
@@ -34,5 +45,17 @@ cp pdf_viewer/keys.config build/sioyek.app/Contents/MacOS/keys.config
 cp pdf_viewer/keys_user.config build/sioyek.app/Contents/MacOS/keys_user.config
 cp tutorial.pdf build/sioyek.app/Contents/MacOS/tutorial.pdf
 
-macdeployqt build/sioyek.app -dmg
-zip -r sioyek-release-mac.zip build/sioyek.dmg
+if test -z "${incremental_p}" ; then
+	# Capture the current PATH
+	CURRENT_PATH=$(echo $PATH)
+
+	# Define the path to the Info.plist file inside the app bundle
+	INFO_PLIST="resources/Info.plist"
+
+	# Add LSEnvironment key with PATH to Info.plist
+	/usr/libexec/PlistBuddy -c "Add :LSEnvironment dict" "$INFO_PLIST" || echo "LSEnvironment already exists"
+	/usr/libexec/PlistBuddy -c "Add :LSEnvironment:PATH string $CURRENT_PATH" "$INFO_PLIST" || /usr/libexec/PlistBuddy -c "Set :LSEnvironment:PATH $CURRENT_PATH" "$INFO_PLIST"
+
+	macdeployqt build/sioyek.app -dmg
+	zip -r sioyek-release-mac.zip build/sioyek.dmg
+fi

build_windows.bat

@@ -14,21 +14,21 @@ if %1 == portable (
 )
 
 msbuild -maxcpucount sioyek.vcxproj /property:Configuration=Release
-rm -r sioyek-release-windows 2> NUL
+rmdir /S sioyek-release-windows
 mkdir sioyek-release-windows
-cp release\sioyek.exe sioyek-release-windows\sioyek.exe
-cp pdf_viewer\keys.config sioyek-release-windows\keys.config
-cp pdf_viewer\prefs.config sioyek-release-windows\prefs.config
-cp -r pdf_viewer\shaders sioyek-release-windows\shaders
-cp tutorial.pdf sioyek-release-windows\tutorial.pdf
+copy release\sioyek.exe sioyek-release-windows\sioyek.exe
+copy pdf_viewer\keys.config sioyek-release-windows\keys.config
+copy pdf_viewer\prefs.config sioyek-release-windows\prefs.config
+xcopy /E /I pdf_viewer\shaders sioyek-release-windows\shaders\
+copy tutorial.pdf sioyek-release-windows\tutorial.pdf
 windeployqt sioyek-release-windows\sioyek.exe
-cp windows_runtime\vcruntime140_1.dll sioyek-release-windows\vcruntime140_1.dll
-cp windows_runtime\libssl-1_1-x64.dll sioyek-release-windows\libssl-1_1-x64.dll
-cp windows_runtime\libcrypto-1_1-x64.dll sioyek-release-windows\libcrypto-1_1-x64.dll
+copy windows_runtime\vcruntime140_1.dll sioyek-release-windows\vcruntime140_1.dll
+copy windows_runtime\libssl-1_1-x64.dll sioyek-release-windows\libssl-1_1-x64.dll
+copy windows_runtime\libcrypto-1_1-x64.dll sioyek-release-windows\libcrypto-1_1-x64.dll
 
 if %1 == portable (
-    cp pdf_viewer\keys_user.config sioyek-release-windows\keys_user.config
-    cp pdf_viewer\prefs_user.config sioyek-release-windows\prefs_user.config
+    copy pdf_viewer\keys_user.config sioyek-release-windows\keys_user.config
+    copy pdf_viewer\prefs_user.config sioyek-release-windows\prefs_user.config
     7z a sioyek-release-windows-portable.zip sioyek-release-windows
 
 ) else (

pdf_viewer/config.cpp

@@ -6,6 +6,7 @@
 //#include <ui.h>
 
 extern float ZOOM_INC_FACTOR;
+extern float SCROLL_ZOOM_INC_FACTOR;
 extern float GAMMA;
 extern float VERTICAL_MOVE_AMOUNT;
 extern float HORIZONTAL_MOVE_AMOUNT;
@@ -15,6 +16,7 @@ extern float UNSELECTED_SEARCH_HIGHLIGHT_COLOR[3];
 extern float DARK_MODE_BACKGROUND_COLOR[3];
 extern float CUSTOM_COLOR_MODE_EMPTY_BACKGROUND_COLOR[3];
 extern float DARK_MODE_CONTRAST;
+extern bool KEYBOARD_SELECT_COPY_P;
 extern bool FLAT_TABLE_OF_CONTENTS;
 extern bool SMALL_TOC;
 extern bool SHOULD_USE_MULTIPLE_MONITORS;
@@ -167,6 +169,7 @@ extern bool SHOULD_HIGHLIGHT_LINKS;
 extern bool SHOULD_HIGHLIGHT_UNSELECTED_SEARCH;
 extern int KEYBOARD_SELECT_FONT_SIZE;
 extern bool FUZZY_SEARCHING;
+extern bool REGEX_SEARCHING;
 extern float CUSTOM_COLOR_CONTRAST;
 extern bool DEBUG;
 extern bool DEBUG_DISPLAY_FREEHAND_POINTS;
@@ -718,6 +721,15 @@ ConfigManager::ConfigManager(const Path& default_path, const Path& auto_path, co
         nullptr,
         FloatExtras{1.0f, 2.0f}
         });
+    configs.push_back({
+        L"scroll_zoom_inc_factor",
+        ConfigType::Float,
+        &SCROLL_ZOOM_INC_FACTOR,
+        float_serializer,
+        float_deserializer,
+        nullptr,
+        FloatExtras{1.0f, 6.0f}
+        });
     configs.push_back({
         L"vertical_move_amount",
         ConfigType::Float,
@@ -1861,6 +1873,22 @@ ConfigManager::ConfigManager(const Path& default_path, const Path& auto_path, co
         bool_deserializer,
         bool_validator
         });
+    configs.push_back({
+        L"regex_searching",
+        ConfigType::Bool,
+        &REGEX_SEARCHING,
+        bool_serializer,
+        bool_deserializer,
+        bool_validator
+        });
+    configs.push_back({
+        L"keyboard_select_copy_p",
+        ConfigType::Bool,
+        &KEYBOARD_SELECT_COPY_P,
+        bool_serializer,
+        bool_deserializer,
+        bool_validator
+        });
     configs.push_back({
         L"debug",
         ConfigType::Bool,

pdf_viewer/coordinates.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <algorithm>
+
 #include <qpoint.h>
 #include <mupdf/fitz.h>
 #include <qopengl.h>

pdf_viewer/document.cpp

@@ -471,6 +471,15 @@ void Document::delete_highlight_with_index(int index) {
     is_annotations_dirty = true;
 }
 
+void Document::delete_last_highlight() {
+	if (!highlights.empty()) {
+
+		int last_index = highlights.size() - 1;
+
+		delete_highlight_with_index(last_index);
+	}
+}
+
 void Document::delete_highlight(Highlight hl) {
     for (size_t i = (highlights.size() - 1); i >= 0; i--) {
         if (highlights[i] == hl) {
@@ -803,20 +812,20 @@ void Document::convert_toc_tree(fz_outline* root, std::vector<TocNode*>& output)
             break;
         }
 
-        TocNode* current_node = new TocNode;
-        current_node->title = utf8_decode(root->title);
-        current_node->x = root->x;
-        current_node->y = root->y;
-        if (root->page.page == -1) {
-            float xp, yp;
-            fz_location loc = fz_resolve_link(context, doc, root->uri, &xp, &yp);
-            int chapter_page = accum_chapter_pages[loc.chapter];
-            current_node->page = chapter_page + loc.page;
-        }
-        else {
-            current_node->page = root->page.page;
-        }
-        convert_toc_tree(root->down, current_node->children);
+		TocNode* current_node = new TocNode;
+		current_node->title = utf8_decode(root->title);
+		current_node->x = std::isnan(root->x) ? 0.0 : root->x;
+		current_node->y = std::isnan(root->y) ? 0.0 : root->y;
+		if (root->page.page == -1) {
+			float xp, yp;
+			fz_location loc = fz_resolve_link(context, doc, root->uri, &xp, &yp);
+			int chapter_page = accum_chapter_pages[loc.chapter];
+			current_node->page = chapter_page + loc.page;
+		}
+		else {
+			current_node->page = root->page.page;
+		}
+		convert_toc_tree(root->down, current_node->children);
 
 
         output.push_back(current_node);

pdf_viewer/document.h

@@ -180,6 +180,7 @@ class Document {
     std::string add_highlight(const std::wstring& desc, const std::vector<AbsoluteRect>& highlight_rects, AbsoluteDocumentPos selection_begin, AbsoluteDocumentPos selection_end, char type);
     std::string add_highlight(const std::wstring& annot, AbsoluteDocumentPos selection_begin, AbsoluteDocumentPos selection_end, char type);
     void delete_highlight_with_index(int index);
+	void delete_last_highlight();
     void delete_highlight(Highlight hl);
     int get_bookmark_index_at_pos(AbsoluteDocumentPos abspos);
     int get_portal_index_at_pos(AbsoluteDocumentPos abspos);