preparation for the merge into main

Author: Hana Dusíková

Makefile

@@ -59,7 +59,10 @@ mtent12.txt: mtent12.zip
 	unzip -o mtent12.zip
 	touch mtent12.txt
 
-single-header: single-header/ctre.hpp
+single-header: single-header/ctre.hpp single-header/ctre-unicode.hpp single-header/unicode-db.hpp
+
+single-header/unicode-db.hpp: include/unicode-db/unicode-db.hpp
+	cp $+ $@
 
 single-header/ctre.hpp:
 	python3 -m quom include/ctre.hpp ctre.hpp.tmp
@@ -68,6 +71,14 @@ single-header/ctre.hpp:
 	echo "*/" >> single-header/ctre.hpp
 	cat ctre.hpp.tmp >> single-header/ctre.hpp
 	rm ctre.hpp.tmp
+
+single-header/ctre-unicode.hpp:
+	python3 -m quom include/ctre-unicode.hpp ctre-unicode.hpp.tmp
+	echo "/*" > single-header/ctre-unicode.hpp
+	cat LICENSE >> single-header/ctre-unicode.hpp
+	echo "*/" >> single-header/ctre-unicode.hpp
+	cat ctre-unicode.hpp.tmp >> single-header/ctre-unicode.hpp
+	rm ctre-unicode.hpp.tmp
 
 REPEAT:=10
 

README.md

@@ -44,6 +44,14 @@ More documentation on [pcre.org](https://www.pcre.org/current/doc/html/pcre2synt
 * `std::string`-like object (`std::string_view` or your own string if it's providing `begin`/`end` functions with forward iterators)
 * pair of forward iterators
 
+### Unicode support
+
+To enable you need to include:
+* `<ctre-unicode.hpp>`
+* or `<ctre.hpp>` and `<unicode-db.hpp>`
+
+Otherwise you will get missing symbols if you try to use the unicode support without enabling it.
+
 ## Supported compilers
 
 * clang 6.0+ (template UDL, C++17 syntax)

include/ctre-unicode.hpp

@@ -0,0 +1,7 @@
+#ifndef CTRE_V2__CTRE_UNICODE__HPP
+#define CTRE_V2__CTRE_UNICODE__HPP
+
+#include "ctre.hpp"
+#include "unicode-db/unicode-db.hpp"
+
+#endif

include/unicode-db/unicode.hpp include/unicode-db/unicode-db.hppinclude/unicode-db/unicode.hpp renamed to include/unicode-db/unicode-db.hpp

@@ -102,11 +102,6 @@ namespace uni
 #include <algorithm>
 #include <string_view>
 
-#ifndef UNI_SINGLE_HEADER
-#    pragma once
-#    include "synopsys.h"
-#endif
-
 namespace uni::detail {
 
 template<class ForwardIt, class T, class Compare>
@@ -393,11 +388,6 @@ constexpr numeric_value::numeric_value(long long n, int16_t d) : _n(n), _d(d) {}
 
 }    // namespace uni
 
-#ifndef UNI_SINGLE_HEADER
-#    pragma once
-#    include "base.h"
-#endif
-
 namespace uni {
 enum class version : uint8_t {
     unassigned,
@@ -7447,10 +7437,6 @@ constexpr bool cp_is<property::xids>(char32_t c) {
 }
 }    // namespace uni
 #include <iterator>
-#ifndef UNI_SINGLE_HEADER
-#    pragma once
-#    include "props.h"
-#endif
 
 namespace uni {
 
@@ -7732,10 +7718,7 @@ namespace std
         using iterator_category = std::forward_iterator_tag;
     };
 }
-#ifndef UNI_SINGLE_HEADER
-#    pragma once
-#    include "unicode.h"
-#endif
+
 namespace uni::detail {
 enum class binary_prop {
     ahex,
@@ -9663,9 +9646,6 @@ namespace tables {
         string_with_idx{"zzzz", 243}};
 }
 }    // namespace uni::detail
-#ifndef UNI_SINGLE_HEADER
-#    pragma once
-#endif
 
 // More regex support for ctre